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

fix display in all trainings calendar

Browse Source
This commit is contained in:
Sylvain 2017-02-23 13:50:45 +01:00
parent 59384698f7
commit 1efd506a5d
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/javascripts/controllers/trainings.coffee.erb
View File

@ -132,9 +132,12 @@ Application.Controllers.controller "ReserveTrainingController", ["$scope", '$sta
## the moment when the plan selection changed for the last time, used to trigger changes in the cart
$scope.planSelectionTime = null
## Selected training unless 'all' trainings are displayed
## Selected training
$scope.training = trainingPromise
## 'all' OR training's slug
$scope.mode = $stateParams.id
## fullCalendar (v2) configuration
$scope.calendarConfig = CalendarConfig
minTime: moment.duration(moment(settingsPromise.booking_window_start).format('HH:mm:ss'))

6
app/assets/templates/trainings/reserve.html.erb
View File

@ -7,15 +7,15 @@
</div>
<div class="col-xs-10 col-sm-10 col-md-8 b-l b-r-md">
<section class="heading-title">
<h1 ng-hide="training" translate>{{ 'trainings_planning' }}</h1>
<h1 ng-show="training"><span translate>{{ 'planning_of' }}</span> {{training.name}}</h1>
<h1 ng-show="mode == 'all'" translate>{{ 'trainings_planning' }}</h1>
<h1 ng-hide="mode == 'all'"><span translate>{{ 'planning_of' }}</span> {{training.name}}</h1>
</section>
</div>
<div class="col-xs-12 col-sm-12 col-md-3 b-t hide-b-md">
<section class="heading-actions wrapper">
<a class="btn btn-lg btn-warning bg-white b-2x rounded m-t-xs"
ui-sref="app.logged.trainings_reserve({id:'all'})"
ng-show="training"
ng-hide="mode == 'all'"
role="button"
translate>{{ 'all_trainings' }}</a>
</section>