From 2b83ab1a46229532bbfd1d3f6bf652552287b36f Mon Sep 17 00:00:00 2001
From: Nathanaël Jourdane <nathanael.jourdane@irap.omp.eu>
Date: Tue, 13 Mar 2018 14:41:21 +0100
Subject: [PATCH] improve job tooltip
---
src/InputOutput/IHMImpl/Tools/IHMJobsManagerClass.php | 50 ++++++++++++++++++++++++++++++++++++++------------
1 file changed, 38 insertions(+), 12 deletions(-)
diff --git a/src/InputOutput/IHMImpl/Tools/IHMJobsManagerClass.php b/src/InputOutput/IHMImpl/Tools/IHMJobsManagerClass.php
index 307dab5..81146bc 100644
--- a/src/InputOutput/IHMImpl/Tools/IHMJobsManagerClass.php
+++ b/src/InputOutput/IHMImpl/Tools/IHMJobsManagerClass.php
@@ -274,7 +274,9 @@ class IHMJobsManagerClass {
// Data mining
case 'condition':
$name = 'datamining_'.time();
- $infos['Name'] = $obj['name'];
+ if($obj['name'] != '') {
+ $infos['Name'] = $obj['name'];
+ }
$infos['Condition'] = $obj['expression'];
$infos['Start date'] = $obj['startDate'];
$infos['Stop date'] = $obj['stopDate'];
@@ -282,9 +284,36 @@ class IHMJobsManagerClass {
case 'statistics':
$name = 'statistics_'.time();
- $infos['Name'] = $obj['name'];
- $infos['Start date'] = $obj['startDate'];
- $infos['Stop date'] = $obj['stopDate'];
+ $infos['Name'] = $obj['name']; // TODO: name toujours égal à 'test' (?)
+
+ // TODO : lire data/user/TT/tt_0.xml -> trouver ttname + nbIntervals
+
+ 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'])) {
+ $infos['Time tables'] = $tt->timeTableName . '(' . $ttIntervals[$tt->timeTableName] . ' int.)';
+ } else {
+ $infos['Time tables'] .= ', ' . $tt->timeTableName . '(' . $ttIntervals[$tt->timeTableName] . ' int.)';
+ }
+ }
+ }
+ } else {
+ $infos['Start date'] = $obj['startDate'];
+ $infos['Stop date'] = $obj['stopDate'];
+ }
+
if(array_key_exists('expression', $obj)) {
$infos['Expression'] = $obj['expression'];
}
@@ -325,16 +354,13 @@ class IHMJobsManagerClass {
$infos['Stop date'] = $tab->stopDate;
$strPanels = [];
+
foreach ($tab->panels as $panel) {
- $axes = [];
- foreach ($panel->axes as $axe) {
- $axes[] = $axe->id;
- }
- $params = [];
+ $strParams = '';
foreach ($panel->params as $param) {
- $params[] = $param->paramid;
+ $strParams .= $param->paramid . ($param === end($panel->params) ? '' : ', ');
}
- $strPanels[] = join(', ', $params) . ' (' . join(', ', $axes) . ')';
+ $strPanels[] = $strParams;
}
if(count($strPanels) == 1) {
@@ -355,7 +381,7 @@ class IHMJobsManagerClass {
$strInfo = '';
foreach ($infos as $key => $info) {
- $strInfo .= '<b>' . $key . '</b>: ' . $info . '<br/>';
+ $strInfo .= ($key == 'Started at' ? '<hr/>' : '') . '<b>' . $key . '</b>: ' . $info . '<br/>';
}
$newJob = $this->jobXml->createElement('job');
--
libgit2 0.21.2