Commit graph

211 commits

Author SHA1 Message Date
rahul
3f3cdef520 Fix decimal limit of total to 2
Decimal limit is fixed to 2 as earlier at some values the decimal limit were crossing this limit
2017-10-14 21:41:54 +05:30
rahul
a07df4bdb0 Fix decimal numbers limit to 2
while calculating the row total, javascript was called and on some quantity, a number with a big decimal part was appearing.In this PR it is fixed
Fixes https://github.com/opensuse/osem/issues/1709
2017-09-20 21:53:55 +05:30
rahul
82b5f9083a Fix total price for tickets
While buying the ticket, user was only able to see the integer part in total.So in javascript parseInt was replaced with parseFloat to show the decimal part too
Fixes https://github.com/openSUSE/osem/issues/1702
2017-09-18 20:39:41 +05:30
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
Ana María Martínez Gómez
84522a999a Merge pull request #1606 from siddhantbajaj/ticket-purchase
Refactor ticket purchase
2017-08-22 14:07:57 +02:00
siddhantbajaj
4b735cff69 Added qr code
Added qr code on ticket pdf and ticket show page.
2017-08-21 16:49:50 +05:30
nikhilgupta1211
d0a9610992 Made Sidebar collapsible for small screens
Added a hamburger button in _admin_html.haml for navbar collapse

Fixes #853
2017-08-21 12:52:33 +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
Wexpo Lyu
033dbe4c40 Fix the dropdown to get enough bottom padding. 2017-08-07 13:41:10 +03:00
siddhantbajaj
34456fa205 Remove float point number on y axis 2017-07-21 04:13:23 +05:30
Moisés Déniz Alemán
121192d21a Merge branch 'master' into ticket-show-page 2017-07-18 12:04:21 +02:00
Svante
f9d8c9715c Add bootstrap styling to sign in form
Add class `.form-control` to inputs and remove additional width styling
2017-07-15 16:15:01 +03:00
siddhantbajaj
c5db5dba1e Ticket show page 2017-07-12 14:49:02 +05:30
Eugene Dubinin
790e2fd3a2 implement manual event management and support for multiple speakers per event 2017-04-13 17:15:21 +03:00
gotens1211
9c2a09eaf2 changed dropdown for small devices 2017-03-11 08:48:21 +05:30
gotens1211
db2d776c3b Sign in Ui improved in mobile
hover fix for sign_in btn

improved osem-navbar.css.scss

removed class black
2017-03-08 21:20:11 +05:30
hitman
226d16dc63 fix markdown issue 2017-03-06 20:57:04 +05:30
gotens1211
c1b81755c9 Implementing Countable.js to count words.
Changed the words_count method to work with countable.js

Added the gem for countable.js
2017-03-01 19:15:19 +05:30
gotens1211
82db583217 Default date removed from conference registrations. 2017-02-20 08:57:27 +05:30
Eugene Dubinin
ff9ca4a817 implements configurable schedule granularity and improves the schedule grid for denser schedule grids on smaller screens 2017-01-31 16:24:45 +02:00
desantonop
c0b7a70e6e Load template loads subject
Change variable names in admin/emails#index to more descriptive ones. Geia soy Stella :*
Change attributes "data-name" to "data-body-input-id" and "data-template" to "data-body-text"
2017-01-10 12:24:04 +02:00
Christian Bruckmayer
5f080cf6db Merge pull request #1134 from Ana06/all-events-links
Make links inside event-panel work with ctrl+click
2017-01-09 17:54:30 +01:00
Ana
cf5d4e4dbe Make links inside event-panel work with ctrl+click
Function introduce to be used in links inside event-panel to make ctrl + click work.
2016-12-30 13:36:05 +01:00
Hernán Schmidt
32019a11e1 Merge pull request #1108 from rishabhs95/stripe
Online payment feature - direct stripe integration
2016-08-18 16:04:11 +02:00
Stella Rouzi
86ba2d005e Merge pull request #1019 from nishanthvijayan/changelog
Changelog/Revision History page
2016-08-15 14:16:12 +03:00
Rishabh Saxena
922440fb77 improve payment view styling 2016-08-15 10:59:35 +05:30
Rishabh Saxena
a9ab1186f8 change rails initialisation.
repair abilities. add ticket purchasing check.
2016-08-15 10:59:35 +05:30
Rishabh Saxena
52c30af642 generalise application icon for Stripe iFrame 2016-08-15 10:59:34 +05:30
Rishabh Saxena
ab262ecb46 add payment views and styling 2016-08-15 10:59:34 +05:30
Christian Bruckmayer
72531c799a Merge pull request #1125 from Ana06/schedule-tags
Schedule tags improved
2016-08-12 11:53:05 +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
Christian Bruckmayer
3b1a474ee0 Merge pull request #1094 from Ana06/schedule-versioning
Schedule versioning
2016-08-12 09:56:31 +02:00
Ana
d1392c1cba Restore css removed
Restore css which was removed in https://github.com/openSUSE/osem/pull/1132 as it is used in the public schedule.
2016-08-12 01:23:54 +02:00
Ana
0e9b8b598f Use jquery-ui-rails gem 2016-08-11 15:11:27 +02:00
Ana
aebd5f20a1 Remove unnecessary attributes in osem-schedule.js
Remove unnecessary attributes (schedule and event id) in osem-schedule.js used for update an event.
2016-08-11 15:11:27 +02:00
Ana
a1c7f67735 Render errors in JSON in the schedule correctly 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
2e1cd164a4 Load event schedule fixed
It was needed to use the id instead of the guid in the html attributes of the events in the admin schedule
2016-08-11 15:11:27 +02:00
Ana
57d2a05b7f Use of Rails usl helper instead of interpolation
I also eliminated a duplicated attribute in params
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
42848f929b Several schedules in the backend && routes changed
- Introduce plural resources for Schedule in routes.rb
- Introduce #index and #create actions for ScheduleController
- Make it possible to set a schedule as selected_schedule
2016-08-11 15:11:27 +02:00
Ana
3f114629f9 javascript for the admin schedule moved to a .js
Inline javascript for the admin schedule moved to a dedicated .js file.
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
96337ed081 Make the whole event panel clickable in all events
Make the whole event panel clickable in all events in the public schedule. It didn't work properly when having links inside the panel.

It also works with ctrl + click openning the event page in a new tab.
2016-08-11 11:19:05 +02:00
Ana
7f3ee13358 Schedule tags improved
Schedule tags introduced in https://github.com/openSUSE/osem/pull/1082
improved.
2016-08-07 21:49:35 +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