CDPP / AMDA_IHM

Commit 84db3b67036385ecb83d8ff01479f61b87499779

Authored by Nathanael Jourdane
1 parent 3c093c1c
Exists in master and in 110 other branches 10098, 10178, 5390, 6629, 6728, 6920, 7494, 7497, 7616, 8459, 8528, 8928, 9014, 9016Bis, 9017, 9049, 9084, 9259, 9326, 9345, 9505, 9660, 9750, 9750.bck, 9800, 9980, FER_10285, FER_10400, FER_10435, FER_10557, FER_10663, FER_10765, FER_10828, FER_10828_2, FER_10829, FER_10836, FER_10852, FER_10934, FER_11100, FER_11242, FER_11478, FER_11500, FER_11537, FER_11586, FER_11588, FER_5119, FER_5165, FER_6265, FER_6860, FER_6899, FER_6951, FER_7618, FER_7862, FER_8455, FER_9629, FER_9660, FER_9915, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, MAZ_10936, MAZ_11362, MAZ_11427, MAZ_6018, MAZ_9016_New, MAZ_FIX_9016, New_ColorMaps, SpeasyGet, alias, amdadev, amdadev_test, anr_tempete, catalog-histo, create-user, cu2022, data-activities, density_maps, develop, epn-tap, expression-parser-bre, frames-transformation, hapi, homePage, install-rework, master_vge, minimize, mlplasmas, multiplot, new-save-plot-request, openam, plot-request, plot-request-update, plot-tt-catalog, remoteData, rm_5118, rm_5776, rm_6912, rm_6912_bis, rm_7926, rm_8932, save-other-requests, save-plot, save-plot-request, shared-objects-updater, special-params, sum-components-indexes, test-merge, ws_get_catalog

Improve job tooltip for getTree

Showing 1 changed file with 28 additions and 3 deletions   Show diff stats
Inline Side-by-side
php/classes/AmdaAction.php
  Diff comments   View file @84db3b6
... ... @@ -102,6 +102,7 @@ class AmdaAction
102 102 $xmlName = SHAREDPATH.'/SharedObjectTree.xml';
103 103 break;
104 104 case 'bkgWorks':
  105 + // data/<user>/JOBS/jobs.xml
105 106 $xmlName = USERJOBDIR.$this->xmlFiles[$nodeType];
106 107 break;
107 108 case 'source':
... ... @@ -157,12 +158,34 @@ class AmdaAction
157 158 switch ($nodeType)
158 159 {
159 160 case 'bkgWorks':
  161 +// $fileSize = get USERJOBDIR. result_J9ixT5
160 162 $specialNode = true;
161 163 $status = $child->getAttribute('status');
162 164 // if ($status == 'done') continue;
163   - $childrenToReturn[] = array('text' => $name, 'id' => $id,'nodeType' => $nodeType, 'leaf' => $isLeaf,
164   - 'pid' => $child->getAttribute('pid'), 'status' => $status,
165   - 'jobType' => $child->getAttribute('jobType'), 'info' => $child->getAttribute('info'));
  165 + $res_dir = USERWORKINGDIR . $child->getAttribute('folder') . '/';
  166 + $fileSize = filesize ( $res_dir . $child->getAttribute('result') . '.xml');
  167 + $req = new DomDocument("1.0");
  168 + $req->load($res_dir . 'request_0.xml');
  169 + $ddStart = $req->getElementsByTagName('startTime')->item(0)->nodeValue;
  170 + $ddInterval = $req->getElementsByTagName('timeInterval')->item(0)->nodeValue;
  171 + $startTime = CommonClass::DDTimeToIso($ddStart);
  172 + $stopTime = CommonClass::DDStartIntervalToStopIso($ddStart, $ddInterval);
  173 +
  174 + $info = '<b>condition</b>: ' . $child->getAttribute('info') . '<br/>' .
  175 + '<b>start time</b>: ' . $startTime . '<br/>' .
  176 + '<b>stop time</b>: ' . $stopTime . '<br/>' .
  177 + '<b>file size</b>: ' . number_format(intval($fileSize)/1024, 1, '.', ' ') . 'kb';
  178 +
  179 + $childrenToReturn[] = [
  180 + 'text' => $name,
  181 + 'id' => $id,
  182 + 'nodeType' => $nodeType,
  183 + 'leaf' => $isLeaf,
  184 + 'pid' => $child->getAttribute('pid'),
  185 + 'status' => $status,
  186 + 'jobType' => $child->getAttribute('jobType'),
  187 + 'info' => $info
  188 + ];
166 189 break;
167 190  
168 191 case 'condition':
... ... @@ -568,6 +591,8 @@ class AmdaAction
568 591 {
569 592 $childrenToReturn = array('nodeType' => $nodeType, 'text' => null);
570 593 }
  594 +
  595 +// $childrenToReturn[count($childrenToReturn) - 1]['info'] = 'yolo';
571 596 }
572 597 return $childrenToReturn;
573 598 }
... ...