Commit 3e513d4625eb409666bfca32e34ccf7507235f87
1 parent
63878d61
Exists in
master
and in
43 other branches
ok for plot
Showing
1 changed file
with
49 additions
and
4 deletions
Show diff stats
src/InputOutput/IHMImpl/Tools/IHMJobsManagerClass.php
| ... | ... | @@ -403,9 +403,19 @@ class IHMJobsManagerClass { |
| 403 | 403 | } else { |
| 404 | 404 | foreach ($obj['timeTables'] as $tt) { |
| 405 | 405 | if($tt === reset($obj['timeTables'])) { |
| 406 | - $infos['Time tables'] = $tt->timeTableName . '(' . $ttIntervals[$tt->timeTableName] . ' int.)'; | |
| 406 | + $intervalNb = $ttIntervals[$tt->timeTableName]; | |
| 407 | + if(isset($intervalNb)){ | |
| 408 | + $infos['Time tables'] = $tt->timeTableName . '(' .$intervalNb . ' int.)'; | |
| 409 | + }else{ | |
| 410 | + $infos['Time tables'] = $tt->timeTableName; | |
| 411 | + } | |
| 407 | 412 | } else { |
| 408 | - $infos['Time tables'] .= ', ' . $tt->timeTableName . '(' . $ttIntervals[$tt->timeTableName] . ' int.)'; | |
| 413 | + $intervalNb = $ttIntervals[$tt->timeTableName]; | |
| 414 | + if(isset($intervalNb)){ | |
| 415 | + $infos['Time tables'] .= ', ' . $tt->timeTableName . '(' .$intervalNb. ' int.)'; | |
| 416 | + }else{ | |
| 417 | + $infos['Time tables'] .= ', ' . $tt->timeTableName; | |
| 418 | + } | |
| 409 | 419 | } |
| 410 | 420 | } |
| 411 | 421 | } |
| ... | ... | @@ -445,8 +455,43 @@ class IHMJobsManagerClass { |
| 445 | 455 | $name = "request_".time(); |
| 446 | 456 | |
| 447 | 457 | $infos['Output'] = strtolower($obj['file-format']) . ' (' . strtolower($obj['file-output']) . ')'; |
| 448 | - $infos['Start date'] = $obj->startDate; | |
| 449 | - $infos['Stop date'] = $obj->stopDate; | |
| 458 | + | |
| 459 | + if(array_key_exists('timeTables', $obj)) { | |
| 460 | + $ttXml = new DomDocument(); | |
| 461 | + $ttXml->load(USERWSDIR . 'Tt.xml'); | |
| 462 | + | |
| 463 | + $ttIntervals = []; | |
| 464 | + foreach ($ttXml->getElementsByTagName('timetab') as $tt) { | |
| 465 | + $ttIntervals[$tt->getAttribute('name')] = $tt->getAttribute('intervals'); | |
| 466 | + } | |
| 467 | + | |
| 468 | + if(count($obj['timeTables']) == 1) { | |
| 469 | + $infos['Time table'] = $obj['timeTables'][0]->timeTableName; | |
| 470 | + $infos['Nb Intervals'] = $ttIntervals[$infos['Time table']]; | |
| 471 | + } else { | |
| 472 | + foreach ($obj['timeTables'] as $tt) { | |
| 473 | + if($tt === reset($obj['timeTables'])) { | |
| 474 | + $intervalNb = $ttIntervals[$tt->timeTableName]; | |
| 475 | + if(isset($intervalNb)){ | |
| 476 | + $infos['Time tables'] = $tt->timeTableName . '(' .$intervalNb . ' int.)'; | |
| 477 | + }else{ | |
| 478 | + $infos['Time tables'] = $tt->timeTableName; | |
| 479 | + } | |
| 480 | + } else { | |
| 481 | + $intervalNb = $ttIntervals[$tt->timeTableName]; | |
| 482 | + if(isset($intervalNb)){ | |
| 483 | + $infos['Time tables'] .= ', ' . $tt->timeTableName . '(' .$intervalNb. ' int.)'; | |
| 484 | + }else{ | |
| 485 | + $infos['Time tables'] .= ', ' . $tt->timeTableName; | |
| 486 | + } | |
| 487 | + } | |
| 488 | + } | |
| 489 | + } | |
| 490 | + } else { | |
| 491 | + $infos['Start date'] = $obj['startDate']; | |
| 492 | + $infos['Stop date'] = $obj['stopDate']; | |
| 493 | + } | |
| 494 | + | |
| 450 | 495 | |
| 451 | 496 | foreach ($obj->panels as $panel) { |
| 452 | 497 | $strParams = ''; |
| ... | ... |