rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2025-01-29 18:52:22 +01:00
Code Issues Releases Activity

alert about slots division on availability creation

Browse Source
This commit is contained in:
Sylvain 2020-02-26 15:58:41 +01:00
parent 0ea7e774d3
commit c111fca980
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -486,7 +486,7 @@ Application.Controllers.controller('AdminCalendarController', ['$scope', '$state
*/
Application.Controllers.controller('CreateEventModalController', ['$scope', '$uibModalInstance', '$sce', 'moment', 'start', 'end', 'machinesPromise', 'Availability', 'trainingsPromise', 'spacesPromise', 'tagsPromise', 'growl', '_t',
function ($scope, $uibModalInstance, $sce, moment, start, end, machinesPromise, Availability, trainingsPromise, spacesPromise, tagsPromise, growl, _t) {
// $uibModal parameter
// $uibModal parameter
$scope.start = start;
// $uibModal parameter
@ -553,6 +553,9 @@ Application.Controllers.controller('CreateEventModalController', ['$scope', '$ui
// localized name(s) of the selected tag(s)
$scope.tagsName = '';
// make the duration available for display
$scope.slotDuration = Fablab.slotDuration;
/**
* Adds or removes the provided machine from the current slot
* @param machine {Object}

1
app/assets/templates/admin/calendar/eventModal.html.erb
View File

@ -159,6 +159,7 @@
<ul>
<li ng-repeat="slot in occurrences">{{slot.start_at | amDateFormat:'L LT'}} - {{slot.end_at | amDateFormat:'LT'}}</li>
</ul>
<div class="alert alert-warning" translate translate-values="{DURATION: slotDuration}"> {{ 'app.admin.calendar.divided_in_slots' }} </div>
<div>
<span class="underline" translate>{{ 'app.admin.calendar.reservable' }}</span>
<span ng-bind-html="reservableName"></span>

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

@ -58,6 +58,7 @@ fr:
select_nb_period: "Veuillez choisir un nombre de périodes pour la récurrence"
select_end_date: "Veuillez choisir la date de dernière occurrence"
about_to_create: "Vous vous apprêtez à créer {NUMBER, plural, one{le créneau} other{les créneaux}} {TYPE, select, machines{machine} training{formation} space{espace} other{autre}} suivant :"
divided_in_slots: "Ce créneau sera proposé à la réservation par tranches de {DURATION} minutes. Contactez votre administrateur système pour modifier ce paramètre."
reservable: "Réservable(s) :"
labels: "Étiquette(s) :"
none: "Aucune"