rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2025-02-17 11:54:22 +01:00
Code Issues Releases Activity

[bug] month navigation in client calendar (#59)

Browse Source
This commit is contained in:
Sylvain 2017-03-01 17:23:41 +01:00
parent b9dcf5a512
commit f5ac9b1913
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -2,13 +2,13 @@
## next release ## next release
- TODO export availabilities (taiga#57) - TODO export availabilities (taiga#57)
- TODO bug: calendar (github#59)
- Ability to create, manage and reserve spaces - Ability to create, manage and reserve spaces
- Improved admin's interface to create availabilities - Improved admin's interface to create availabilities
- Complete rewrote of the reservation cart functionality with improved stability, performance and sustainability - Complete rewrote of the reservation cart functionality with improved stability, performance and sustainability
- Fix a bug: trainings reservations are not shown in the admin's calendar - Fix a bug: trainings reservations are not shown in the admin's calendar
- Fix a bug: unable to delete an administrator from the system - Fix a bug: unable to delete an administrator from the system
- Fix a bug: unable to delete an event with a linked custom price (#61) - Fix a bug: unable to delete an event with a linked custom price (#61)
- Fix a bug: navigation in client calendar is bogus when browsing months (#59)
- [TODO DEPLOY] `rake db:migrate`, then `rake db:seed` - [TODO DEPLOY] `rake db:migrate`, then `rake db:seed`
- [TODO DEPLOY] add the `FABLAB_WITHOUT_SPACES` environment variable - [TODO DEPLOY] add the `FABLAB_WITHOUT_SPACES` environment variable
- [TODO DEPLOY] `rake fablab:es_add_spaces` - [TODO DEPLOY] `rake fablab:es_add_spaces`

4
app/assets/javascripts/controllers/calendar.coffee
View File

@ -124,10 +124,10 @@ Application.Controllers.controller "CalendarController", ["$scope", "$state", "$
# ui-calendar will trigger rerender calendar # ui-calendar will trigger rerender calendar
$scope.calendarConfig.defaultView = view.type $scope.calendarConfig.defaultView = view.type
today = if currentMachineEvent then currentMachineEvent.start else moment().utc().startOf('day') today = if currentMachineEvent then currentMachineEvent.start else moment().utc().startOf('day')
if today > view.start and today < view.end and today != view.start if today > view.intervalStart and today < view.intervalEnd and today != view.intervalStart
$scope.calendarConfig.defaultDate = today $scope.calendarConfig.defaultDate = today
else else
$scope.calendarConfig.defaultDate = view.start $scope.calendarConfig.defaultDate = view.intervalStart
if view.type == 'agendaDay' if view.type == 'agendaDay'
$scope.calendarConfig.slotEventOverlap = false $scope.calendarConfig.slotEventOverlap = false
else else