Commit graph

381 commits

Author SHA1 Message Date
shlok007
db8fdb3d38 add permissions and actions to assign and unassign organization admin role 2017-08-22 12:52:47 +00:00
nasia
52cde784fa Add :accept booth to ability 2017-08-18 23:41:38 +03:00
nasia
e73218b5ca Add booth limit 2017-08-18 23:41:38 +03:00
nasia
8b5ebb3dd7 Add confirmed booths to splashpage 2017-08-16 16:51:52 +03:00
Ana María Martínez Gómez
3f324d4e6f Merge pull request #1613 from siddhantbajaj/read-qr
Scan QR code.
2017-08-16 10:05:06 +02:00
siddhantbajaj
1391668c0f Add routes and controller to scan Qr code
Added TicketScanning controller and routes to scan qr code on PhysicalTickets. Added test for the same
2017-08-15 13:16:46 +05:30
nasia
7107f9a35f Add emails for booth's acceptance and rejection 2017-08-14 22:34:17 +03:00
AEtherC0r3
b717018b31 Track related fixes
Make the message in admin/Tracks form more visible by making it bold and
adding links to venue and rooms
Make papertrail track changes for all the track's attributes
Add validation to require presence of description for self-organized
tracks
Add ID column to admin/Tracks#index
Make the cfp inclusion column sortable
Show success/error flash messages after toggling cfp inclusion
2017-08-11 16:25:21 +03:00
AEtherC0r3
3d250ecf75 UI/UX changes related to tracks
Add confirmed and cfp_active scopes to Track
Render markdown in track's description
Make the views more similar to the proposal/events views
Change the sequence of columns in admin/Tracks#index
Remove the short_name column from the index views
Add button "My Tracks" in the user menu
Fix track count in proposals
Add details of track in admin/Tracks#show
Use tabs to show track details and events
2017-08-11 16:25:21 +03:00
AEtherC0r3
d9faffc96a Implement track request acceptance
Allow track submitter to request specific dates
Redirect to Tracks#edit if a track doesn't have a room or start/end date
before accepting it

Don't allow the submitter or the track organizers to edit the request
after it has been accepted or confirmed

Restrict track selection in proposals and move track selection from
Proposals form to events helper

Mark cfp_active of the tracks table as not null and fill in true if nil
2017-08-11 16:25:21 +03:00
AEtherC0r3
0f154d07c9 Mark track state as not null and add default value
The regular tracks are marked as 'confirmed'
2017-08-11 16:25:21 +03:00
AEtherC0r3
fd93b04f16 Add room and dates to tracks
They are required only for accepted and confirmed self-organized tracks
2017-08-11 16:25:21 +03:00
Ana María Martínez Gómez
6efcd04de1 Merge pull request #1627 from siddhantbajaj/registration-ticket
Added registration-ticket
2017-08-11 10:02:28 +02:00
siddhantbajaj
f31651ad9c Added registration-ticket
Added registration type tickets that will used in the check-in process
2017-08-10 21:15:54 +05:30
nasia
32c5af2a17 Add booths to non admin 2017-08-08 16:18:07 +03:00
nasia
f7c0b64eb5 Introduce Booths for admin 2017-07-18 14:18:42 +03:00
Hernan Schmidt
d9a3b0de72 Fix Style/ConditionalAssignment errors
They did not get excluded by `--auto-gen-config`
2017-07-14 15:16:43 +02:00
AEtherC0r3
9671696adf Add to_param to the Track model
And update the urls
2017-07-14 12:38:53 +03:00
AEtherC0r3
68fc750e9f Implement track requests and add the track organizer role
About track requests:
Create migration that adds the fields submitter_id, state, and
cfp_active to Tracks
Add validations and the self_organized? method to the Track model
Create a new TracksController outide of the admin namespace
Create the relevant views for index, show, new and edit
Modify the admin views for tracks to include extra info for
self-organized tracks

About track organizers:
Create the role when a self-organized track is created
Define track organizer abilities
Modify the roles views and controller to handle the new role

The route for Roles#edit needs to have higher priority than the nested
routes for track roles, otherwise, the word edit in the url is matched
as a track with short_name edit
2017-07-14 12:38:53 +03:00
shlok007
366fced200 Move abilities for admin views in separate model 2017-07-13 23:45:13 +05:30
siddhantbajaj
dd52a9b2ab Make ticket layout configurable
Added option for conference organizer to switch between ticket layouts (horizontal or vertical). Added test for the same.
2017-07-07 14:19:51 +05:30
AEtherC0r3
95fbd10153 Friendly urls for tracks
Don't use tracks ids in urls
Add short_name to tracks and use that in urls as the identifier
2017-07-04 20:42:10 +03:00
Hernán Schmidt
85a021ef05 Merge branch 'master' into org-admins-backend 2017-07-04 15:30:30 +02:00
siddhantbajaj
3d4adb5683 Allow admin to show/generate ticket
Created physical ticket controller and views for admin.
2017-07-03 06:17:27 +05:30
shlok007
7d408ee33c suggested changes
change description of organization_admin
remove assign_role callback
2017-06-28 06:55:30 +05:30
shlok007
8839a928ed mending failing tests 2017-06-28 06:55:30 +05:30
shlok007
ad3d6f2f95 modify admin/conference_controller_spec and not authorized error messages 2017-06-28 06:55:30 +05:30
shlok007
b72e64b238 Introduce organization admins 2017-06-28 06:55:30 +05:30
AEtherC0r3
2bff918556 Add index view for the cfp and modify existing ones
Add cfp_type to the form partial
Refactor Cfps#show to use partials for the different cfp types
Modify the rest of the view, where the cfp was used
2017-06-27 21:16:46 +03:00
AEtherC0r3
c3eb178546 Modify CFP to accept proposals for other things
Add field cfp_type and relevant validations
Add Program#cfp to preserve backwards compatibility
Add 'for_events' scope to the cfp, in order for it to be used like
program.cfps.events
Add useful methods
Add rspec test for the new code
The supported cfp types can be viewed via Cfp::TYPES
2017-06-27 21:16:46 +03:00
shlok007
cc5d47e6de suggested changes 2017-06-12 19:43:44 +05:30
shlok007
b29856a122 suggested changes 2017-06-12 19:43:44 +05:30
shlok007
cce3ff7aea creating default organization while creating a conference 2017-06-12 19:43:44 +05:30
shlok007
e0d8e85808 suggested changes 2017-06-12 19:43:44 +05:30
shlok007
8edf896d86 introduce organizations 2017-06-12 19:43:44 +05:30
AEtherC0r3
41503bb7a0 Compute ticket statistics
And exclude admin/ConferencesController from rubocop_todo.yml
2017-06-12 15:24:27 +03:00
hitman
b36d02ceec change to can_manage_volunteers? 2017-05-26 15:47:01 +03:00
hitman
d9925f00e9 add volunteers helper 2017-05-26 15:47:01 +03:00
AEtherC0r3
fa56ff7f6d Add helper function for speaker selection
The line '@users = User.all.order(:name)' is replicated a lot of times
in EventsController and ProposalsController.
So, this commit removes it and adds a helper function
'speaker_selector_input' that generates the field where the @users
variable was used.
Also, it makes the query more specific.

Fix #1455

Other changes:
* Include the username in the drop down menu
* Add .active scope to User and corresponding tests
* Add :disabled trait to User factory
2017-05-20 18:27:07 +03:00
Siddhant Bajaj
1c12200003 Fixed paper trail inconsistent results for numeric values
There is a known issue in paper_trail that whenever we Query the
'versions.object' column it evaluates inconsistent results for numeric
values due to limitations of SQL wildcard matchers against the
serialized objects. So to fix this issue I have manually formed the where
query instead of using where_object and where_object_changes. I have
also added test for the same.
Fixes #1307
2017-05-11 14:01:52 +03:00
Eugene Dubinin
93404d543f implement user creation by admin 2017-05-08 22:54:02 +03:00
Siddhant Bajaj
7ce816e146 Fixed DeleteEventSchedules issue
Issues with DeleteEventSchedules method in conference controller:
1.It deletes EventSchedules of all the conferences that are not in the
hours range. Instead it should delete EventSchedules of those events
only that belong to that particular conference only.
2.If we set invalid start or end hour attribute of a conference then
also EventSchedules gets deleted even though conference is not
successfully updated.
Fixed both the issues and added test for the same.
2017-04-25 18:00:24 +05:30
nasia
a6e8283bcf Fix commercial option for users in dashboard#show #1390 2017-04-24 10:16:39 +03:00
Eugene Dubinin
790e2fd3a2 implement manual event management and support for multiple speakers per event 2017-04-13 17:15:21 +03:00
Ana María Martínez Gómez
fd6d0bf39b Merge pull request #1446 from sunny-b/master
Enable Style/DotPosition Rubocop cop
2017-04-07 11:21:34 +02:00
Sunny
03fa299058 enable style/dotposition rubocop cop 2017-04-06 23:19:58 -04:00
Christian Bruckmayer
dae9aca2c5 Merge pull request #1434 from nasia-sam/admin_resources
Fix admin/resources inherit
2017-04-05 13:17:31 +02:00
nasia
6414631a32 Fix admin/resources inherit 2017-04-04 21:30:16 +03:00
Eugene Dubinin
b7bdb29cbe use flash.now instead of flash where page is rendered in the same controller methods 2017-04-03 20:15:51 +03:00
JewelSam
f6e74461ba Add schedule interval as attribute of a program
Also, the part of the schedule event is deleted and the length of the event types
changes to the nearest suitable after changing the length of the interval.

This closes #1220
2017-04-01 21:39:20 +03:00