Rishabh Saxena
e2d42fbbbb
modify ticket and ticket_purchases models
2016-08-15 10:59:34 +05:30
Rishabh Saxena
8f39fc83d2
add resource, ability and controller for payments
2016-08-15 10:59:33 +05:30
Rishabh Saxena
ee0a575a6f
add payment model and its associations
2016-08-15 10:59:33 +05:30
Ana
a578167cf5
Event model improvements
...
- Drop selected_event_schedule function
- Rename scheduled_room and scheduled_start_time to room and time as if there is no selected_schedule, the event is not scheduled.
2016-08-11 15:11:27 +02:00
Ana
5001848af7
Introduce an Admin::EventScheduleController
...
- move SchedulesController#update action
- split it into an #create/#update and #destroy action and use these actions in the JS code
2016-08-11 15:11:27 +02:00
Ana
a394293500
Do not use JS to initialize the schedule
...
- Only use JS for the drag&drop functionality and to the set/alter the time and rooms of the EventSchedule object.
- Introduce has_many :events, through: :event_schedules association to get unscheduled event easily
2016-08-11 15:11:27 +02:00
Ana
71dab6b79c
SchedulesController introduced
...
The actions #schedule and #events were moved from conference controller to the new controller
2016-08-11 15:11:27 +02:00
Ana
b037a5eb7c
Load and authorize schedule in ScheduleController
2016-08-11 15:11:27 +02:00
Ana
3897ec79ca
Repeated sentence moved to a function
...
program.selected_schedule.event_schedules.order(start_time: :asc) was repeated several times and it has been moved to conference#selected_event_schedules
2016-08-11 15:11:27 +02:00
Ana
beb17165a2
Introduce an association for the selected_schedule
...
Association in Program fot the selected_schedule
2016-08-11 15:11:27 +02:00
Ana
0b26ed5c35
EventSchedule validations
...
event, schedule, room and start_time are mandatory in EventSchedule.
2016-08-11 15:11:27 +02:00
Ana
354e15a76d
Public schedule adapted to the new relations
...
Public schedule and all events adapted to the new relations and models to allow having several schedules in the admin shcedule.
2016-08-11 15:11:27 +02:00
Ana
dfd64a4510
Integrate the schedule in the admin interface
...
Integrate the schedule in the admin interface while adapting it to the new associations and models.
2016-08-11 15:06:52 +02:00
Ana
c047ffd699
New associations and models: schedule versioning
...
For the schedule versioning in the admin interface (having multiple possible shcedules) we need to change some models and associations. It has also been create a rake:move_events_attributes task to migrate the data.
User Interface addapted to make use of the introduced associations and models
2016-08-11 15:06:52 +02:00
Ana
7e5d20c89d
style: if ! changed by unless
...
- if ! changed by unless as it is more readable
- !object.blank? is equivalent to object.present?, also more readable
2016-08-06 00:57:07 +02:00
Henne Vogelsang
96155eb87f
Merge pull request #1082 from nishanthvijayan/handle-cancelled-events
...
Handle cancellation of scheduled events
2016-07-25 15:52:53 +02:00
Henne Vogelsang
5edc6123f4
Merge pull request #987 from differentreality/blind_voting
...
Blind voting
2016-07-25 15:49:01 +02:00
Nishanth Vijayan
a071d4497b
Handle cancelation of scheduled events
2016-07-25 17:34:06 +05:30
Henne Vogelsang
63750345e7
Merge pull request #1032 from Ana06/all-events
...
All events grouped by date and time
2016-07-25 11:47:28 +02:00
Ana
bf7f5ce09f
The schedule takes you to the current day and time
...
The schedule takes you to the current day and time in case that the current date belongs to the conference schedule.
Closes https://github.com/openSUSE/osem/issues/1057
2016-07-25 11:33:30 +02:00
Ana
39c4261859
All events takes you to the current day
2016-07-25 11:33:30 +02:00
Ana
6d9eabcc0e
All events moved to a different controller method
...
All events moved to a different controller method and css changed to put together things with the same css attributes.
2016-07-25 11:33:30 +02:00
Ana
70f30fcb1f
Dropdown with date tags in all events
...
Dropdown with date tags in all events of the schedule
2016-07-25 11:33:28 +02:00
Ana
cc031b9f3a
Unscheduled events added to all events
...
Unscheduled events added to all events of the schedule
2016-07-25 11:33:28 +02:00
Ana
69043e1549
All events grouped by date and time
...
The events are ordered by date and time in the all events section of the schedule. The event schdule definition in program has been changed to order the events.
2016-07-25 11:33:25 +02:00
Stella Rouzi
59eeb7edbd
Enable blind voting
2016-07-22 12:21:54 +03:00
Ana
a0fc9dd950
Default value for length in as_json fixed
...
The default value for length in as_json should be a multiple of EventType::LENGTH_STEP.
2016-07-18 11:45:59 +02:00
Christian Bruckmayer
28f0973fc4
Merge pull request #1079 from Ana06/suggest_track_color
...
Different colors for new tracks, types and levels
2016-07-11 15:10:26 +02:00
Ana
8d9bb56f06
Hexadecimal color changed to capital letters
...
The default colors in event_types and difficulty levels are in capital letters and the ones that comes from the color picker were not. Now colors are capitalized before saving the track, level or type. A rake task has also been created to capitalize color from old tracks, levels or types.
2016-07-11 13:46:02 +02:00
Ana
0deaf1abc7
Different colors for new tracks, types and levels
...
Every time a new track, event type or difficulty level is created, the color picker has a different color by default.
Closes https://github.com/openSUSE/osem/issues/1077
2016-07-11 13:46:01 +02:00
Stella Rouzi
eb312f139e
Merge pull request #1084 from arun1595/define-singular-resource
...
Modify conference registration to a singular resource
2016-07-11 13:40:56 +03:00
Ana
9d4a82b062
Name validation repeated in Track
...
The validation to check that the name is present in track.rb is twice.
2016-07-05 10:13:41 +02:00
Arun Kumar
0675572e05
Modify conference registration to a singular resource
2016-07-05 01:15:32 +05:30
Henne Vogelsang
5d5ad9348c
Merge pull request #1034 from Ana06/statistic
...
Statistics
2016-06-30 12:25:59 +02:00
Henne Vogelsang
92e9043a57
Merge pull request #1030 from Ana06/public-schedule
...
New schedule
2016-06-30 12:13:51 +02:00
Ana
028d430885
Schedule height fits a 600px screen and the schedule is hiden if there is only one room
2016-06-27 18:24:47 +02:00
Ana
53b02d6a74
Adapting number of columns in the carousel schedule taking screen width into account
2016-06-27 18:16:13 +02:00
Ana
d8f9de9363
new schedule
2016-06-27 18:16:13 +02:00
Ana
866e58b5bf
registration_limit check moved to ability file
2016-06-27 18:11:21 +02:00
Ana
460d117d7a
making next_color function more readable
2016-06-25 15:36:43 +02:00
Ana
62c3ee1631
Statistics on top of Registrations#index
2016-06-25 14:39:45 +02:00
Ana
f5701f2e77
Statistics on top of Events#index
2016-06-25 14:39:45 +02:00
Stella Rouzi
15076b11f1
XML export fix tests. Add not nil room for scheduled events.
2016-06-20 21:05:08 +03:00
Henne Vogelsang
dcae196d2b
Merge pull request #905 from Ana06/languages
...
Languages
2016-06-15 16:55:12 +02:00
Ana
6c87995050
Configure language of events
2016-06-03 14:09:37 +02:00
Ana
55c41810b2
Limit event types lenght
2016-05-31 16:51:12 +02:00
Henne Vogelsang
81ddb76c24
Merge pull request #994 from differentreality/allow_nil_max_attendees
...
allow max_attendees to be nil
2016-05-19 12:03:43 +02:00
Christian Bruckmayer
406e37a1d8
Adapt ability to allow proposal creation if cfp is open
...
This was not possible before when iChain was enabled.
- Initialize @event object now with load_and_autorize before filter
- Remove not necessary event_users initilization in :new action
- Adapt ability and feature tests
2016-05-19 11:47:41 +02:00
Stella Rouzi
528243c8b9
Allow max_attendees to be nil
2016-05-15 14:01:36 +03:00
Henne Vogelsang
4d38305110
Program<->cfp is already a one to one relation
2016-05-02 16:06:32 +02:00
