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

fix bug: cant click machines event in < today and > first day of week

Browse Source
This commit is contained in:
Peng DU 2016-07-01 13:16:01 +02:00
parent 066458ca70
commit dbc9a388a8
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,6 +13,7 @@ Application.Controllers.controller "CalendarController", ["$scope", "$state", "$
availabilitySource = availabilitySource =
url: "/api/availabilities/public?#{$.param({available_type: availableTypes})}" url: "/api/availabilities/public?#{$.param({available_type: availableTypes})}"
textColor: 'black' textColor: 'black'
currentMachineEvent = null
### PUBLIC SCOPE ### ### PUBLIC SCOPE ###
@ -53,6 +54,7 @@ Application.Controllers.controller "CalendarController", ["$scope", "$state", "$
## current calendar object ## current calendar object
calendar = uiCalendarConfig.calendars.calendar calendar = uiCalendarConfig.calendars.calendar
if event.available_type == 'machines' if event.available_type == 'machines'
currentMachineEvent = event
calendar.fullCalendar('changeView', 'agendaDay') calendar.fullCalendar('changeView', 'agendaDay')
calendar.fullCalendar('gotoDate', event.start) calendar.fullCalendar('gotoDate', event.start)
else else
@ -68,7 +70,7 @@ Application.Controllers.controller "CalendarController", ["$scope", "$state", "$
# set defaultView, because when we change slotEventOverlap # set defaultView, because when we change slotEventOverlap
# ui-calendar will trigger rerender calendar # ui-calendar will trigger rerender calendar
$scope.calendarConfig.defaultView = view.type $scope.calendarConfig.defaultView = view.type
today = moment().utc().startOf('day') today = currentMachineEvent or moment().utc().startOf('day')
if today > view.start and today <= view.end and today != view.start if today > view.start and today <= view.end and today != view.start
$scope.calendarConfig.defaultDate = today $scope.calendarConfig.defaultDate = today
else else