Commit Graph

351 Commits

Author SHA1 Message Date
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
Stella Rouzi
5e9bc683ae Move reports to separate controller 2017-03-20 17:51:37 +02:00
Siddhant Bajaj
dcfc25a541 Show vote versions in event history 2017-03-02 17:07:19 +05:30
Ana
bde2ee3d7d Delete Eventschedules out of conference hours 2017-02-22 09:17:34 +01:00
Ana
9b9d255e3b Add fields in conference edit form for hours
Make possible to change the start and end hours.
2017-02-22 09:09:29 +01:00
shlok007
3065766da9 ability to track resources used in conference 2017-02-07 14:58:45 +05:30
Stella Rouzi
46101228e7 Merge pull request #1169 from nishanthvijayan/reports
Add new page with organizer reports
2017-01-15 12:28:38 +02:00
Christian Bruckmayer
c4938166f5 Merge pull request #1228 from Ana06/fix_multichoice
Fix multiple choice questions
2016-12-19 17:40:38 +01:00
Ana María Martínez Gómez
50410f6e4f Fix multiple choice questions 2016-12-15 11:50:23 +01:00
AnithaPal
68d447f023 added events, confirmed events and events with comments export features with xlsx, pdf and csv format 2016-10-19 10:48:58 -04:00
AnithaPal
3da3fcccbb exporting events to pdf, excel, and csv format 2016-10-19 10:48:39 -04:00
richiethomas
daf1f805bd Rename 'ConferenceController' to 'ConferencesController', and 'ProposalController' to 'ProposalsController' 2016-09-30 18:49:44 -04:00
Nishanth Vijayan
d954059947 Show missing speakers in reports 2016-09-28 03:03:01 +05:30
Nishanth Vijayan
fabe29d2ed Add new page with organizer reports 2016-09-27 21:24:49 +05:30
Ana
7f843a3a13 Remove unnecessary code from conference_controller
Remove unnecessary code from conference_controller#update.
2016-09-26 13:36:44 +02:00
Nishanth Vijayan
2785902dba Remove ununsed code from events_controller#index 2016-08-19 00:01:50 +05:30
Stella Rouzi
99992750bb Merge pull request #1128 from nishanthvijayan/event-changelog
Improve event history page
2016-08-16 18:23:56 +03:00
Nishanth Vijayan
a02060b665 cfp team users should have access to event commercials only 2016-08-16 18:56:54 +05:30
shlok007
c50e8c0466 Implemented ability of admins to manually confirm users 2016-08-16 02:23:41 -04:00
Nishanth Vijayan
e2659ae907 Show changes to event commercials in event changelog 2016-08-15 18:18:03 +05:30
Nishanth Vijayan
c80f37f3ff Change look of event history page similar to changelog 2016-08-15 16:48:10 +05:30
Stella Rouzi
86ba2d005e Merge pull request #1019 from nishanthvijayan/changelog
Changelog/Revision History page
2016-08-15 14:16:12 +03:00
Ana
1636b458ee Inform that there are no rooms in the schedule
Inform that there are no rooms when creating the schedule with a message instead of creating a room with the title "No rooms". The message also include a link to the place where rooms are created.
2016-08-12 11:33:49 +02:00
Nishanth Vijayan
a45e537bac Setup basic Revision History page
Sets up paper_trail tracking in important models

and add conference_id to versions for storing conference_id
of conference related objects  as metadata.This will help in querying
for versions related to conferences.

Fix issues with factories & event types initialization.Import paper_trail testing helpers
Fix bug: Creating an event creates a useless version with event update

Add revert and view changes features to revision history
2016-08-12 13:35:56 +05:30
Ana
a1c7f67735 Render errors in JSON in the schedule correctly 2016-08-11 15:11:27 +02:00
Ana
e8261d41bc Improve Error messages
- Improve error messages in event schedules, schedules and program controller.
- Two respond_to blocks in the update method of program controller.
2016-08-11 15:11:27 +02:00
Ana
5761e0f7a4 Using flash instead of alerts in the schedule
Using flash instead of alerts in the schedule to notify errors.

Also, a message shown when a schedule is successfully created.
2016-08-11 15:11:27 +02:00
Ana
81108290e5 Schedule update moved to program update
Schedule update updated a program attribute
2016-08-11 15:11:27 +02:00
Ana
310c521790 EventSchedulesController when something goes wrong
Consider that create, update or destroy can fails in EventSchedulesController

Params in remove deleted because they were not used
2016-08-11 15:11:27 +02:00
Ana
c469f4f415 Event schedule controller pluralized 2016-08-11 15:11:27 +02:00
Ana
29b920d746 Corrections in SchedulesController
- Controler file name pluralized
- Load and authorization fixed and improved
- Consider that save can fail in create action
- Eliminate unnecessary if in update action
- Ability and tests related to the schedules link in the admin sidebar fixed
2016-08-11 15:11:27 +02:00