CDPP / AMDA_Integration

Commit 6e9bb13dd1e6ee7dde95e49471567f2751bd762c

Authored by Nathanaël Jourdane
1 parent 3945ae76
Exists in master and in 64 other branches 10098, 4797, 5390, 6728, 7616, 8528, 8928, 9016Bis, 9049, 9084, 9259, 9326, FER_10400, FER_10663, FER_11100, FER_11242, FER_11500, FER_11586, FER_11588, FER_6265, FER_6860, FER_6951, FER_7618, FER_8455, FER_9629, FER_9915, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, MAZ_10936, MAZ_11362, MAZ_6018, MAZ_9016_New, MAZ_FIX_9016, New_ColorMaps, SpeasyGet, akka-scatter-multi-xparams, amdadev, anr_tempete, cu2022, density_maps, develop, evol-6371, expression-parser-bre, frames-transformation, install-rework, master_vge, mlplasmas, multiplot, new-save-plot-request, plot-request, plot-tt-catalog, rm_5357, rm_6595, rm_6912, rm_7926, rm_8932, save-other-requests, shared-objects-updater, sum-components-indexes, test-merge, ws_get_catalog

improve job tooltip plots

Showing 1 changed file with 8 additions and 12 deletions   Show diff stats
Inline Side-by-side
src/InputOutput/IHMImpl/Tools/IHMJobsManagerClass.php
  Diff comments   View file @6e9bb13
@@ -255,6 +255,12 @@ class IHMJobsManagerClass { @@ -255,6 +255,12 @@ class IHMJobsManagerClass {
255 ); 255 );
256 } 256 }
257 257
  258 + private function logObj($obj) {
  259 + $f = fopen('/AMDA/AMDA_Integration/test/serialise.json', 'w') or die("Unable to open debug file!");
  260 + fwrite($f, json_encode($obj, JSON_PRETTY_PRINT));
  261 + fclose($f);
  262 + }
  263 +
258 /* 264 /*
259 * @brief Add a new job 265 * @brief Add a new job
260 */ 266 */
@@ -265,10 +271,6 @@ class IHMJobsManagerClass { @@ -265,10 +271,6 @@ class IHMJobsManagerClass {
265 if (!$res['success']) 271 if (!$res['success'])
266 return $res; 272 return $res;
267 273
268 -// $f = fopen('/AMDA/AMDA_Integration/debug/serialise.json', 'w') or die("Unable to open file!");  
269 -// fwrite($f, json_encode($obj, JSON_PRETTY_PRINT));  
270 -// fclose($f);  
271 -  
272 $infos = []; 274 $infos = [];
273 switch ($obj['nodeType']) { 275 switch ($obj['nodeType']) {
274 // Data mining 276 // Data mining
@@ -360,13 +362,7 @@ class IHMJobsManagerClass { @@ -360,13 +362,7 @@ class IHMJobsManagerClass {
360 foreach ($panel->params as $param) { 362 foreach ($panel->params as $param) {
361 $strParams .= $param->paramid . ($param === end($panel->params) ? '' : ', '); 363 $strParams .= $param->paramid . ($param === end($panel->params) ? '' : ', ');
362 } 364 }
363 - $strPanels[] = $strParams;  
364 - }  
365 -  
366 - if(count($strPanels) == 1) {  
367 - $infos['Parameters'] = $strPanels[0];  
368 - } else {  
369 - $infos['Panels'] = '<ul><li>' . join('</li><li>', $strPanels) . '</li></ul>'; 365 + $infos['• Panel ' . $panel->id] = $strParams;
370 } 366 }
371 367
372 continue; 368 continue;
@@ -466,7 +462,7 @@ class IHMJobsManagerClass { @@ -466,7 +462,7 @@ class IHMJobsManagerClass {
466 $infos['Job duration'] = $interval->format('%Hh %Im %Ss'); 462 $infos['Job duration'] = $interval->format('%Hh %Im %Ss');
467 463
468 $res_dir = USERWORKINGDIR . $job->getAttribute('folder') . '/'; 464 $res_dir = USERWORKINGDIR . $job->getAttribute('folder') . '/';
469 - $fileSize = filesize ( glob($res_dir.'/' . $job->getAttribute('result') . '.*')[0]); 465 + $fileSize = filesize ( glob($res_dir.'/' . $job->getAttribute('result') . '*')[0]);
470 if ($fileSize < 1024) { 466 if ($fileSize < 1024) {
471 $strSize = number_format($fileSize, 2, '.', ' ') . 'b'; 467 $strSize = number_format($fileSize, 2, '.', ' ') . 'b';
472 } else if($fileSize < 1024*1024) { 468 } else if($fileSize < 1024*1024) {