Skip to content
Snippets Groups Projects
Commit a2e226ff authored by adiouf's avatar adiouf
Browse files

add the view of differents choices during the holding device process in bokeh

parent 69f0a071
Branches
Tags
3 merge requests!896Master,!816Stable,!812Dev#18020 fix multimedia
......@@ -621,6 +621,7 @@ class AbonneController extends ZendAfi_Controller_Action {
/* Vérification du quota sur le jour choisi */
$day = $this->_getParam('day');
$this->view->location = $bean->getLocation()->getLibelleBib();
$quotaErrorType = null;
if (null != $day) {
$quotaErrorType = $this->_user->getMultimediaQuotaErrorForDay($day);
......@@ -689,6 +690,7 @@ class AbonneController extends ZendAfi_Controller_Action {
return result;';
$this->view->beforeShowDay = $beforeShowDay;
$this->view->location = $bean->getLocation()->getLibelleBib();
$this->view->timelineActions = $this->_getTimelineActions('day');
}
......@@ -722,6 +724,7 @@ class AbonneController extends ZendAfi_Controller_Action {
$this->view->timelineActions = $this->_getTimelineActions('hours');
$this->view->form = $this->multimediaHoldHoursForm($bean, $location);
$this->view->day = strftime('%d %B %Y', strtotime($bean->day));
}
......@@ -744,6 +747,10 @@ class AbonneController extends ZendAfi_Controller_Action {
$this->view->groups = $bean->getGroups();
$this->view->timelineActions = $this->_getTimelineActions('group');
$this->view->location = $bean->getLocation()->getLibelleBib();
$this->view->day = strftime('%d %B %Y', strtotime($bean->day));
$this->view->time = str_replace(':', 'h', $bean->time);
$this->view->duration = $bean->duration . 'mn';
}
......@@ -755,6 +762,11 @@ class AbonneController extends ZendAfi_Controller_Action {
$this->view->devices = $bean->getGroup()->getHoldableDevicesForDateTimeAndDuration($bean->day,
$bean->time,
$bean->duration);
$this->view->location = $bean->getLocation()->getLibelleBib();
$this->view->day = strftime('%d %B %Y', strtotime($bean->day));
$this->view->time = str_replace(':', 'h', $bean->time);
$this->view->duration = $bean->duration . 'mn';
$this->view->group = $bean->getGroup()->getLibelle();
}
......
......@@ -2,6 +2,11 @@
<?php echo $this->timeline($this->timelineActions);?>
<div class="workflow_step">
<div>
<ul>
<li><?php echo sprintf('%s : %s', $this->_('Lieu'), $this->escape($this->location));?></li>
</ul>
</div>
<h2><?php echo $this->_('Pour quel jour ?');?></h2>
<?php if ($this->quotaError) { ?>
<div class="error"><?php echo $this->quotaError;?></div>
......@@ -21,4 +26,4 @@
<div id="hold-day" class="calendar"></div>
</div>
<?php $this->closeBoite();?>
\ No newline at end of file
<?php $this->closeBoite();?>
......@@ -3,6 +3,16 @@
<div class="workflow_step">
<div>
<ul>
<li><?php echo sprintf('%s : %s', $this->_('Lieu'), $this->escape($this->location));?></li>
<li><?php echo sprintf('%s : %s', $this->_('Jour'), $this->escape($this->day));?></li>
<li><?php echo sprintf('%s : %s', $this->_('À partir de'), $this->escape($this->time));?></li>
<li><?php echo sprintf('%s : %s', $this->_('Durée'), $this->escape($this->duration));?></li>
<li><?php echo sprintf('%s : %s', $this->_('Secteur'), $this->escape($this->group));?></li>
</ul>
</div>
<h2><?php echo $this->_('Quel poste ?') ?></h2>
<ul>
<?php
......@@ -12,4 +22,4 @@
</ul>
</div>
<?php $this->closeBoite();?>
\ No newline at end of file
<?php $this->closeBoite();?>
......@@ -2,6 +2,15 @@
<?php echo $this->timeline($this->timelineActions);?>
<div class="workflow_step">
<div>
<ul>
<li><?php echo sprintf('%s : %s', $this->_('Lieu'), $this->escape($this->location));?></li>
<li><?php echo sprintf('%s : %s', $this->_('Jour'), $this->escape($this->day));?></li>
<li><?php echo sprintf('%s : %s', $this->_('À partir de'), $this->escape($this->time));?></li>
<li><?php echo sprintf('%s : %s', $this->_('Durée'), $this->escape($this->duration));?></li>
</ul>
</div>
<h2><?php echo $this->_('Quel secteur ?') ?></h2>
<ul>
<?php
......@@ -13,4 +22,4 @@
</ul>
</div>
<?php $this->closeBoite();?>
\ No newline at end of file
<?php $this->closeBoite();?>
......@@ -2,6 +2,13 @@
<?php echo $this->timeline($this->timelineActions);?>
<div class="workflow_step">
<div>
<ul>
<li><?php echo sprintf('%s : %s', $this->_('Lieu'), $this->escape($this->location));?></li>
<li><?php echo sprintf('%s : %s', $this->_('Jour'), $this->escape($this->day));?></li>
</ul>
</div>
<h2><?php echo $this->_('Quand ?') ?></h2>
<?php if ($this->error) { ?>
<div class="error">
......@@ -12,4 +19,4 @@
<?php echo $this->renderForm($this->form) ?>
</div>
<?php $this->closeBoite();?>
\ No newline at end of file
<?php $this->closeBoite();?>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment