Commit graph

616 commits

Author SHA1 Message Date
Stella Rouzi
32fa0bde6b Add mass import of commercials
Fix #1055
2017-12-12 12:23:16 +02:00
AEtherC0r3
efaf07178f Upgrade to Rails 5
Update config with rails app:update
Update schema.rb rails db:migrate
Add puma
Make jobs and models inherit from ApplicationJob and ApplicationRecord
Update acts_as_list to 0.9.7 in order to fix
"undefined method `sanitize_sql_hash_for_conditions'" error
Update web-console to 2.3.0 to fix a 500 internal server error
Replace before_filter with before_action
Add rails-controller-testing gem
Add prepend: :true to protect_from_forgery in ApplicationController to
avoid ActionController::InvalidAuthenticityToken exceptions
Remove activeuuid
Update formtastic to 3.1.5 to fix deprecation warnings and issues
with the Input class
Update ahoy_matey to 1.6.0
Update cancancan to 2.0.0 to fix issues with malformed sql queries
Fix program spec
Fix issue with the picture being nil in admin/Organizations#new and #edit
and Organizations#show
Fix ActiveRecord::Base.raise_in_transactional_callbacks= deprecation
warning by removing an unnecessary line in application.rb
Fix failing versions specs
2017-12-11 20:58:04 +02:00
Sidharth
93fcf8893a Fix Style/UnneededInterpolation
Exclusions from .rubocop_todo.yml deleted.
This cop checks for string interpolated expressions. It supports autocorrection.
Fixes #1823
2017-12-04 23:45:37 +05:30
James Mason
7f369507d2
Merge branch 'master' into test-fix 2017-11-14 12:37:33 -08:00
ViditChitkara
bd045c2976 added description field to cfps
closes #1650

done some changes

minor changes

added markdown format to cfp#show

fixed description text  position in proposals

fixed truncated description text in show action

minor changes on non-admin side
2017-11-14 17:31:08 +02:00
James Mason
906c05ec4e
Merge branch 'master' into test-fix 2017-11-09 08:39:59 -08:00
Naman Gupta
d0dbb7d29e tests are fixed 2017-11-09 02:39:41 +05:30
James Mason
20b849d9ce
Merge branch 'master' into test-fix 2017-11-08 09:32:19 -08:00
James Mason
574ac63a05 Fix a flaky test. 2017-11-07 17:59:11 -08:00
James Mason
aca8adf6e8
Merge branch 'master' into include_speaker_email_in_events 2017-11-07 17:19:42 -08:00
James Mason
1c623b1c8a
Merge branch 'master' into organization-link 2017-11-07 14:32:35 -08:00
James Mason
714f89f6ba
Fix missing link on public organizations page
When viewing a conference, the Instance Name in the header points to
/organizations. On the organizations index, there's a button to see
conferences, but it does nothing. This makes it easy for public users to
get lost.

This commit:
* Adds a function to the organizations controller to show child
  conferences
* Adds a public permission to see conferences through an organization
* Represents a subset of conferences, reusing conferences/index view,
  for the organization
2017-11-07 14:11:13 -08:00
James Mason
1b8f864feb
Use organization name for title link if available, but link to / 2017-11-07 13:51:10 -08:00
Naman Gupta
94de2e813c test is fixed 2017-11-08 01:41:42 +05:30
Ana María Martínez Gómez
1d07125e7d Merge pull request #1701 from rahul2240/amount
Add paid option in physical ticket#index
2017-10-27 14:22:40 +02:00
James Mason
e96a5338e2 Attempting to stabilize another flaky test. 2017-10-17 15:33:04 +03:00
rahul
0d70832f5b Add total amount spent by user
User can see the total amount that he paid for the tickets and total amount spent by him on each ticket
2017-10-14 23:07:08 +05:30
James Mason
fc64542202 Stabilizing a randomly failing test 2017-10-13 15:21:34 +03:00
James Mason
d95a786d9f
Fix intermittent failures in track tests
Boostrap's off-screen rendering was interfering with finding links
in the page layout.

The included approach should be bulletproof.
2017-10-10 20:23:54 -07:00
rishabhptr
568d89b620 Changed physical_ticket to plural 2017-10-02 09:53:10 +03:00
siddhantbajaj
69e30e7ba9 Improving check-in process
mark user as present for the conference when user's registration ticket for that conference is scanned
2017-09-13 22:47:22 +05:30
Ana María Martínez Gómez
135241a56c Merge pull request #1635 from siddhantbajaj/user-registration-ticket
One user one registration ticket
2017-09-07 10:30:50 +02:00
siddhantbajaj
27bf79996d One user one registration ticket
A user cannot have more than one registration ticket per conference.
2017-09-04 03:14:24 +05:30
rahul
fbd11a1402 Remove datatables if there is no data 2017-08-29 22:09:40 +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
AEtherC0r3
c4eec6a3de Validate room and start_time for EventSchedule
Don't allow an event to be scheduled outside of it's track's room and
time slot
2017-08-26 00:31:44 +03:00
AEtherC0r3
7067803cb9 Validate that tracks don't overlap
Also, add scope for accepted tracks
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
Ana María Martínez Gómez
5985daf677 Merge pull request #1643 from rahul2240/fix-rspec
Fix warning in rspec
2017-08-24 08:57:40 +02:00
shlok007
835859e350 refactored DomainConstraint and conference_controller_spec
use params id instead of OSEM_HOSTNAME to load conference
2017-08-22 21:18:58 +00:00
shlok007
66b48be968 controller tests for custom domain 2017-08-22 21:18:58 +00:00
shlok007
1a5aa14e2c Mention organization name while creating a conference 2017-08-22 18:33:05 +00:00
rahul
48accd02ae Fix warning in rspec 2017-08-22 21:42:56 +05:30
shlok007
c596a9fda7 add tests to assign and unassign organization admin role 2017-08-22 12:52:47 +00:00
siddhantbajaj
157c270497 Registration tickets to be set for registration period
Admin must create at least one registration ticket before creating registration period.
2017-08-22 15:20:37 +05:30
nasia
703813248d Request a booth only when cfp is open 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
divyanshumehta
b4be83e3a6 Removed delete action from abiltiy.rb and other places
There was no delete action defined for proposals, but it was there in ability.rb So the ability was deleted. Fixes #1608
2017-08-11 18:10:25 +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
2ff4c6d6b2 Add relevance field for track requests
The requester can now provide more info about the track and himself
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
f9903eba16 Change Cfp scopes to class methods
When no record matches the requested criteria a scope will return all
the records
In this case, if no record can be found we want the result to be nil

Also, make some readability fixes in specs
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
2f9eb04219 Enable track requests 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