diff --git a/src/InputOutput/IHMImpl/Tools/IHMJobsManagerClass.php b/src/InputOutput/IHMImpl/Tools/IHMJobsManagerClass.php
index abd6fb0..3f96729 100644
--- a/src/InputOutput/IHMImpl/Tools/IHMJobsManagerClass.php
+++ b/src/InputOutput/IHMImpl/Tools/IHMJobsManagerClass.php
@@ -403,9 +403,19 @@ class IHMJobsManagerClass {
} else {
foreach ($obj['timeTables'] as $tt) {
if($tt === reset($obj['timeTables'])) {
- $infos['Time tables'] = $tt->timeTableName . '(' . $ttIntervals[$tt->timeTableName] . ' int.)';
+ $intervalNb = $ttIntervals[$tt->timeTableName];
+ if(isset($intervalNb)){
+ $infos['Time tables'] = $tt->timeTableName . '(' .$intervalNb . ' int.)';
+ }else{
+ $infos['Time tables'] = $tt->timeTableName;
+ }
} else {
- $infos['Time tables'] .= ', ' . $tt->timeTableName . '(' . $ttIntervals[$tt->timeTableName] . ' int.)';
+ $intervalNb = $ttIntervals[$tt->timeTableName];
+ if(isset($intervalNb)){
+ $infos['Time tables'] .= ', ' . $tt->timeTableName . '(' .$intervalNb. ' int.)';
+ }else{
+ $infos['Time tables'] .= ', ' . $tt->timeTableName;
+ }
}
}
}
@@ -445,8 +455,43 @@ class IHMJobsManagerClass {
$name = "request_".time();
$infos['Output'] = strtolower($obj['file-format']) . ' (' . strtolower($obj['file-output']) . ')';
- $infos['Start date'] = $obj->startDate;
- $infos['Stop date'] = $obj->stopDate;
+
+ if(array_key_exists('timeTables', $obj)) {
+ $ttXml = new DomDocument();
+ $ttXml->load(USERWSDIR . 'Tt.xml');
+
+ $ttIntervals = [];
+ foreach ($ttXml->getElementsByTagName('timetab') as $tt) {
+ $ttIntervals[$tt->getAttribute('name')] = $tt->getAttribute('intervals');
+ }
+
+ if(count($obj['timeTables']) == 1) {
+ $infos['Time table'] = $obj['timeTables'][0]->timeTableName;
+ $infos['Nb Intervals'] = $ttIntervals[$infos['Time table']];
+ } else {
+ foreach ($obj['timeTables'] as $tt) {
+ if($tt === reset($obj['timeTables'])) {
+ $intervalNb = $ttIntervals[$tt->timeTableName];
+ if(isset($intervalNb)){
+ $infos['Time tables'] = $tt->timeTableName . '(' .$intervalNb . ' int.)';
+ }else{
+ $infos['Time tables'] = $tt->timeTableName;
+ }
+ } else {
+ $intervalNb = $ttIntervals[$tt->timeTableName];
+ if(isset($intervalNb)){
+ $infos['Time tables'] .= ', ' . $tt->timeTableName . '(' .$intervalNb. ' int.)';
+ }else{
+ $infos['Time tables'] .= ', ' . $tt->timeTableName;
+ }
+ }
+ }
+ }
+ } else {
+ $infos['Start date'] = $obj['startDate'];
+ $infos['Stop date'] = $obj['stopDate'];
+ }
+
foreach ($obj->panels as $panel) {
$strParams = '';
--
libgit2 0.21.2