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

Improved user experience in defining slots in the calendar management

Browse Source
This commit is contained in:
Sylvain 2019-10-23 17:48:31 +02:00
parent d7aed3fa1f
commit 35fb991cdb
6 changed files with 53 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -1,5 +1,6 @@
# Changelog Fab Manager
- Improved user experience in defining slots in the calendar management
- Improved notification email to the member when a rolling subscription is taken
- Handle Ctrl^C in upgrade scripts
- Updated moment-timezone

20
app/assets/javascripts/controllers/admin/calendar.js.erb
View File

@ -275,10 +275,22 @@ Application.Controllers.controller('AdminCalendarController', ['$scope', '$state
var calendarSelectCb = function (start, end, jsEvent, view) {
start = moment.tz(start.toISOString(), Fablab.timezone);
end = moment.tz(end.toISOString(), Fablab.timezone);
// first we check that the selected slot is an N-hours multiple (ie. not decimal)
if (Number.isInteger(parseInt((end.valueOf() - start.valueOf()) / (SLOT_MULTIPLE * 1000), 10) / SLOT_MULTIPLE)) {
// check if slot is not in the past
const today = new Date();
if (parseInt((start.valueOf() - today) / (60 * 1000), 10) >= 0) {
if (Math.trunc((start.valueOf() - today) / (60 * 1000)) < 0) {
growl.warning(_t('admin_calendar.event_in_the_past'));
return uiCalendarConfig.calendars.calendar.fullCalendar('unselect');
}
// check that the selected slot is an N-hours multiple (ie. not decimal)
const slots = Math.trunc((end.valueOf() - start.valueOf()) / (60 * 1000)) / SLOT_MULTIPLE;
if (!Number.isInteger(slots)) {
// otherwise, round it to nearest decimal
const nearest = Math.round(slots) * SLOT_MULTIPLE;
end = moment(start).add(nearest, 'minutes');
}
// then we open a modal window to let the admin specify the slot type
const modalInstance = $uibModal.open({
templateUrl: '<%= asset_path "admin/calendar/eventModal.html" %>',
@ -312,8 +324,6 @@ Application.Controllers.controller('AdminCalendarController', ['$scope', '$state
},
function () { uiCalendarConfig.calendars.calendar.fullCalendar('unselect'); }
);
}
}
return uiCalendarConfig.calendars.calendar.fullCalendar('unselect');
};

1
config/locales/app.admin.en.yml
View File

@ -61,6 +61,7 @@ en:
unlockable_because_reservations: "Unable to block booking on this slot because some uncancelled reservations exist on it."
delete_slot: "Delete this slot"
do_you_really_want_to_delete_this_slot: "Do you really want to delete this slot?"
event_in_the_past: "Unable to create a slot in the past."
project_elements:
# management of the projects' components

1
config/locales/app.admin.es.yml
View File

@ -61,6 +61,7 @@ es:
unlockable_because_reservations: "No se puede bloquear la reserva en esta ranura porque existen algunas reservas no canceladas."
delete_slot: "Delete this slot" # translation_missing
do_you_really_want_to_delete_this_slot: "Do you really want to delete this slot?"
event_in_the_past: "Unable to create a slot in the past." # translation_missing
project_elements:
# management of the projects' components

1
config/locales/app.admin.fr.yml
View File

@ -61,6 +61,7 @@ fr:
unlockable_because_reservations: "Impossible de bloquer les réservations sur ce créneau car il existe des réservations non annulées sur celui-ci."
delete_slot: "Supprimer le créneau"
do_you_really_want_to_delete_this_slot: "Êtes vous sur de vouloir supprimer ce créneau ?"
event_in_the_past: "Impossible de créer un créneau dans le passé."
project_elements:
# gestion des éléments constituant les projets

1
config/locales/app.admin.pt.yml
View File

@ -61,6 +61,7 @@ pt:
unlockable_because_reservations: "Não é possível bloquear a reserva neste slot porque existem algumas reservas não cancelados nele."
delete_slot: "Exclua o slot"
do_you_really_want_to_delete_this_slot: "Você realmente quer excluir esse slot?"
event_in_the_past: "Unable to create a slot in the past." # translation_missing
project_elements:
# management of the projects' components