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

(bug) availability slot date error in calendar when user pc timezone is different from server timezone

Browse Source
This commit is contained in:
Du Peng 2024-04-24 16:57:28 +02:00
parent f83c976fd9
commit c9557c7f58
3 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -3,6 +3,7 @@
## Next release
- Fix a bug: unable to show Fabmanager network project picture
- Fix a bug: availability slot date error in calendar when user pc timezone is different from server timezone
## v6.3.20 2024 Avril 15

17
app/frontend/src/javascript/controllers/admin/calendar.js
View File

@ -715,6 +715,9 @@ Application.Controllers.controller('CreateEventModalController', ['$scope', '$ui
// $uibModal parameter
$scope.end = end;
$scope.startTime = moment(start).format('YYYY-MM-DD HH:mm:ss');
$scope.endTime = moment(end).format('YYYY-MM-DD HH:mm:ss');
// machines list
$scope.machines = machinesPromise.filter(function (m) { return !m.disabled && m.reservable; });
@ -959,6 +962,7 @@ Application.Controllers.controller('CreateEventModalController', ['$scope', '$ui
const startSlot = moment($scope.start);
startSlot.add(newValue * $scope.slots_nb, 'minutes');
$scope.end = startSlot.toDate();
$scope.endTime = moment($scope.end).format('YYYY-MM-DD HH:mm:ss');
});
// When the number of slot changes, we increment the availability to match the value
@ -966,6 +970,7 @@ Application.Controllers.controller('CreateEventModalController', ['$scope', '$ui
const startSlot = moment($scope.start);
startSlot.add($scope.availability.slot_duration * newValue, 'minutes');
$scope.end = startSlot.toDate();
$scope.endTime = moment($scope.end).format('YYYY-MM-DD HH:mm:ss');
});
// When we configure a machine/space availability, do not let the user change the end time, as the total
@ -981,6 +986,7 @@ Application.Controllers.controller('CreateEventModalController', ['$scope', '$ui
const upperSlots = Math.ceil(slotsCurrentRange);
const upper = upperSlots * $scope.availability.slot_duration;
$scope.end = moment($scope.start).add(upper, 'minutes').toDate();
$scope.endTime = moment($scope.end).format('YYYY-MM-DD HH:mm:ss');
$scope.slots_nb = upperSlots;
} else {
$scope.slots_nb = slotsCurrentRange;
@ -1014,6 +1020,17 @@ Application.Controllers.controller('CreateEventModalController', ['$scope', '$ui
$scope.availability.end_at = $scope.end;
}
});
$scope.$watch('startTime', function (newValue, oldValue, scope) {
// adjust the start/endTime
const start = moment($scope.start);
const endTime = moment($scope.endTime);
const diff = moment.tz(newValue, moment.tz.guess()).diff(moment.tz(oldValue, moment.tz.guess()));
start.add(diff, 'milliseconds');
endTime.add(diff, 'milliseconds');
$scope.start = start.toDate();
$scope.endTime = endTime.toDate();
});
};
/*

4
app/frontend/templates/admin/calendar/eventModal.html
View File

@ -102,11 +102,11 @@
<p class="text-center font-sbold" translate>{{ 'app.admin.calendar.adjust_the_opening_hours' }}</p>
<div class="row">
<div class="col-md-3 col-md-offset-2">
<uib-timepicker ng-model="start" hour-step="timepickers.start.hstep" readonly-input="true" minute-step="timepickers.start.mstep" show-meridian="false"></uib-timepicker>
<uib-timepicker ng-model="startTime" hour-step="timepickers.start.hstep" readonly-input="true" minute-step="timepickers.start.mstep" show-meridian="false"></uib-timepicker>
</div>
<span class="col-md-1 m-t-xl m-l" translate>{{ 'app.admin.calendar.to_time' }}</span>
<fieldset ng-disabled="endDateReadOnly" class="col-md-5">
<uib-timepicker ng-model="end" hour-step="timepickers.end.hstep" readonly-input="true" minute-step="timepickers.end.mstep" show-meridian="false"></uib-timepicker>
<uib-timepicker ng-model="endTime" hour-step="timepickers.end.hstep" readonly-input="true" minute-step="timepickers.end.mstep" show-meridian="false"></uib-timepicker>
</fieldset>
</div>
</div>