Commit Graph

392 Commits

Author SHA1 Message Date
Your Name
e99287d18a export feature for tracks and booths are done 2017-11-07 19:14:47 +02:00
rishabhptr
568d89b620 Changed physical_ticket to plural 2017-10-02 09:53:10 +03:00
rahul
89509519ef Replace flash with flash.now 2017-08-29 00:00:17 +05:30
AEtherC0r3
27fa79a826 Track related refactoring
Add roles as nested routes to track (for the track organizer role)
Allow transition from to_accept to to_reject and backwards
Split Track#valid_dates validation to many independent ones
Show all the confirmed tracks in the conference's splashpage
Add comment in admin/Tracks#toggle_cfp_inclusion
Rewrite admin/TracksController#accept spec
Add feature spec for track requests
Change 'In' to 'Room' in Tracks#index
Rewrite Track#overlapping
Refactor code in ProposalsController
Fix typos
2017-08-27 18:20:16 +03:00
AEtherC0r3
7eea930269 Implement track scheduling
Add track association to schedule
Show schedules in admin sidebar to track organizers
Allow track organizers to manage the schedules of their tracks
Don't allow self-organized track events to be dragged or unscheduled in
a conference schedule
Make scheduled events of self-organized tracks appear semitransparent in
conference schedules
Make the rooms of confirmed self_organized tracks appear semitransparent
and don't allow events to be scheduled to it in the conference schedules
during the dates of its track
Create admin/SchedulesController#new action
Add a button in admin/Schedules#index to create schedules for tracks
Add self_organized scope to Track
Modify Schedules#show to handle track schedules and show a unified
schedule
Allow track organizers to create new schedules for their tracks
Correctly identify scheduled and unscheduled events in Schedules#events
Fix Event#room and Event#time for when the event is scheduled in a track
schedule
Modify Program#selected_event_schedules to include the event_schedules
of selected track schedules
Modify Track#revoke_role_and_cleanup to destroy the track's schedules
and revert its events' state to new
Add tabs for conference and track schedules in admin/Schedules#index
Add button to Create/Show a tracks schedule in Tracks#index and #show
Fix concurrent_events in application_helper because of changes in
Program#selected_event_schedules
Do not take into account cfp_active in Event#valid_track
Modify EventsController#get_tracks accordingly
Enforce cfp_active of track to be enabled for proposals in
ProposalsController#create and #update
Add support for multiple schedules per track
Add selected_schedule_id to Track
Load EventSchedules of selected track schedules for conference schedules
in admin/SchedulesController#show
Modify SchedulesController#show to take into account only the selected
track schedules
Create Event#selected_schedule_id and use it in Event#scheduled? and
Event#time
Validate that an EventSchedule for an event of a self-organized track
belongs to one of the track's schedules
Add 'Manage' button in Tracks#index, #show that sends you to the admin
side of things
Add admin/TracksController#update_selected_schedule to update the
selected_schedule_id of tracks
2017-08-26 00:31:44 +03:00
AEtherC0r3
af7efdb6fe Allow the track organizer to manage events
He/She can manage the events of his/her tracks and their commercials
2017-08-26 00:31:44 +03:00
AEtherC0r3
a87c6e55f7 Remove unnecessary ability from adminAbilities
CanCanCan can load @events and @event in EventsController by itself
2017-08-26 00:31:44 +03:00
shlok007
16f294f3e8 minor inprovements and included organizations in changelog 2017-08-24 10:24:13 +00:00
Nishanth Vijayan
68788ce9fc Show conference changelog
Use load_and_authorize_resource in versions controlller
Add conference specifc route to revision history page
Users with role can view revision_history only for the versions they have access to
Handle versions where conference_id is not set (records before papertrail was introduced)
2017-08-24 10:24:13 +00:00
nasia
834e9d96e4 Add booths to admin sidebar 2017-08-23 14:09:34 +03:00
shlok007
1a5aa14e2c Mention organization name while creating a conference 2017-08-22 18:33:05 +00:00
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