CDPP / AMDA_Integration

Commit a125e4f0f06a314b71a5ba6ce385805363e97f3f

Authored by Nathanaël Jourdane
1 parent 01c17a02
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

Remove interval duration

Showing 1 changed file with 1 additions and 5 deletions   Show diff stats
Inline Side-by-side
src/InputOutput/IHMImpl/Tools/IHMJobsManagerClass.php
  Diff comments   View file @a125e4f
@@ -278,7 +278,6 @@ class IHMJobsManagerClass { @@ -278,7 +278,6 @@ class IHMJobsManagerClass {
278 $infos['Condition'] = $obj['expression']; 278 $infos['Condition'] = $obj['expression'];
279 $infos['Start date'] = $obj['startDate']; 279 $infos['Start date'] = $obj['startDate'];
280 $infos['Stop date'] = $obj['stopDate']; 280 $infos['Stop date'] = $obj['stopDate'];
281 - $infos['Duration'] = $obj['durationDay'] . 'd ' . $obj['durationHour'] . 'h ' . $obj['durationMin'] . 'm ' . $obj['durationSec'] . 's';  
282 break; 281 break;
283 282
284 case 'statistics': 283 case 'statistics':
@@ -286,7 +285,6 @@ class IHMJobsManagerClass { @@ -286,7 +285,6 @@ class IHMJobsManagerClass {
286 $infos['Name'] = $obj['name']; 285 $infos['Name'] = $obj['name'];
287 $infos['Start date'] = $obj['startDate']; 286 $infos['Start date'] = $obj['startDate'];
288 $infos['Stop date'] = $obj['stopDate']; 287 $infos['Stop date'] = $obj['stopDate'];
289 - $infos['Duration'] = $obj['durationDay'] . 'd ' . $obj['durationHour'] . 'h ' . $obj['durationMin'] . 'm ' . $obj['durationSec'] . 's';  
290 if(array_key_exists('expression', $obj)) { 288 if(array_key_exists('expression', $obj)) {
291 $infos['Expression'] = $obj['expression']; 289 $infos['Expression'] = $obj['expression'];
292 } 290 }
@@ -314,7 +312,6 @@ class IHMJobsManagerClass { @@ -314,7 +312,6 @@ class IHMJobsManagerClass {
314 } 312 }
315 $infos['Start date'] = $obj['startDate']; 313 $infos['Start date'] = $obj['startDate'];
316 $infos['Stop date'] = $obj['stopDate']; 314 $infos['Stop date'] = $obj['stopDate'];
317 - $infos['Duration'] = $obj['durationDay'] . 'd ' . $obj['durationHour'] . 'h ' . $obj['durationMin'] . 'm ' . $obj['durationSec'] . 's';  
318 break; 315 break;
319 316
320 // Plot 317 // Plot
@@ -326,7 +323,6 @@ class IHMJobsManagerClass { @@ -326,7 +323,6 @@ class IHMJobsManagerClass {
326 if($tab->id == $obj['last-plotted-tab']) { 323 if($tab->id == $obj['last-plotted-tab']) {
327 $infos['Start date'] = $tab->startDate; 324 $infos['Start date'] = $tab->startDate;
328 $infos['Stop date'] = $tab->stopDate; 325 $infos['Stop date'] = $tab->stopDate;
329 - $infos['Duration'] = $tab->durationDay . 'd ' . $tab->durationHour . 'h ' . $tab->durationMin . 'm ' . $tab->durationSec . 's';  
330 326
331 $strPanels = []; 327 $strPanels = [];
332 foreach ($tab->panels as $panel) { 328 foreach ($tab->panels as $panel) {
@@ -355,7 +351,7 @@ class IHMJobsManagerClass { @@ -355,7 +351,7 @@ class IHMJobsManagerClass {
355 default: 351 default:
356 $name = "unknown_".time(); 352 $name = "unknown_".time();
357 } 353 }
358 - $infos['Started at'] = gmdate("Y-m-d\TH:i:s\Z", $start); 354 + $infos['Started at'] = gmdate("Y-m-d H:i:s", $start);
359 355
360 $strInfo = ''; 356 $strInfo = '';
361 foreach ($infos as $key => $info) { 357 foreach ($infos as $key => $info) {