Skip to content
Snippets Groups Projects
Commit 5eb2e4b9 authored by Ghislain Loas's avatar Ghislain Loas
Browse files

Merge branch 'dev#65552_rendre_les_reservation_afimultimedia_plus_visible' into 'stable'

dev #65552 fix timeline params

See merge request !2408
parents 9591be79 334f2e0c
Branches
Tags
4 merge requests!2420Hotline master,!2415Master,!2414Hotline master,!2408dev #65552 fix timeline params
Pipeline #2924 passed with stage
in 26 minutes and 26 seconds
- ticket #65552 : AFI Multimedia : correction de la frire chronologique des réservations.
\ No newline at end of file
......@@ -46,18 +46,19 @@ class ZendAfi_View_Helper_TagTimeline extends ZendAfi_View_Helper_BaseHelper {
json_encode(['startDatetime' => $this->_getFirstDate($nodes),
'range' => $this->_getDaysToLastNode($nodes),
'rangeAlign' => 'current',
'minGridSize' => 40,
'minGridSize' => 70,
'minuteInterval' => 15,
'scale' => 'days',
'rows' => count($nodes_data) + 1,
'langsDir' => Class_Url::baseUrl() . '/public/opac/java/jquery.timeline-master/dist/langs/',
'httpLnaguage' => true])));
return $this->_tag('div',
$this->_tag('ul',
implode($nodes_data),
['class' => 'timeline-events']),
['id' => $instance->getId()])
. $this->_tag('div', '', ['class' => 'timeline-event-view']);
return
$this->_tag('div', '', ['class' => 'timeline-event-view'])
. $this->_tag('div',
$this->_tag('ul',
implode($nodes_data),
['class' => 'timeline-events']),
['id' => $instance->getId()]);
}
......@@ -98,7 +99,7 @@ class ZendAfi_View_Helper_TagTimeline extends ZendAfi_View_Helper_BaseHelper {
->getArrayCopy();
$today = $this->getTimeSource()->time();
$max = ($max = max($timestamps) > $today)
$max = (($max = max($timestamps)) > $today)
? $max
: $today;
......
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