CDPP / AMDA_Integration

Commit b7ef53c2a40ebca192b7bef77caab698ca6bc615

Authored by Benjamin Renard
2 parents c73bd535 4dd48d61
Exists in master and in 41 other branches 10098, 5390, 7616, 8528, 9016Bis, 9084, 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, amdadev, anr_tempete, cu2022, density_maps, develop, master_vge, mlplasmas, test-merge

Merge branch 'develop' into amdadev

Showing 1 changed file with 59 additions and 40 deletions   Show diff stats
Inline Side-by-side
src/InputOutput/IHMImpl/Tools/IHMJobsManagerClass.php
  Diff comments   View file @b7ef53c
... ... @@ -374,46 +374,18 @@ class IHMJobsManagerClass {
374 374 $infos = [];
375 375 switch ($obj['nodeType']) {
376 376 case 'condition':
377   - $name = 'datamining_'.time();
378   - if($obj['name'] != '') {
379   - $infos['Name'] = $obj['name'];
380   - }
381   - $infos['Condition'] = $obj['expression'];
382   - $infos['Start date'] = $obj['startDate'];
383   - $infos['Stop date'] = $obj['stopDate'];
384   - break;
  377 + $name = 'datamining_'.time();
  378 + if($obj['name'] != '') {
  379 + $infos['Name'] = $obj['name'];
  380 + }
  381 + $infos['Condition'] = $obj['expression'];
  382 + break;
385 383 case 'statistic':
386 384 $name = 'statistics_'.time();
387 385 if($obj['name'] != '') {
388 386 $infos['Name'] = $obj['name'];
389 387 }
390 388  
391   - if(array_key_exists('timeTables', $obj)) {
392   - $ttXml = new DomDocument();
393   - $ttXml->load(USERWSDIR . 'Tt.xml');
394   -
395   - $ttIntervals = [];
396   - foreach ($ttXml->getElementsByTagName('timetab') as $tt) {
397   - $ttIntervals[$tt->getAttribute('name')] = $tt->getAttribute('intervals');
398   - }
399   -
400   - if(count($obj['timeTables']) == 1) {
401   - $infos['Time table'] = $obj['timeTables'][0]->timeTableName;
402   - $infos['Nb Intervals'] = $ttIntervals[$infos['Time table']];
403   - } else {
404   - foreach ($obj['timeTables'] as $tt) {
405   - if($tt === reset($obj['timeTables'])) {
406   - $infos['Time tables'] = $tt->timeTableName . '(' . $ttIntervals[$tt->timeTableName] . ' int.)';
407   - } else {
408   - $infos['Time tables'] .= ', ' . $tt->timeTableName . '(' . $ttIntervals[$tt->timeTableName] . ' int.)';
409   - }
410   - }
411   - }
412   - } else {
413   - $infos['Start date'] = $obj['startDate'];
414   - $infos['Stop date'] = $obj['stopDate'];
415   - }
416   -
417 389 if(array_key_exists('expression', $obj)) {
418 390 $infos['Expression'] = $obj['expression'];
419 391 }
... ... @@ -423,7 +395,7 @@ class IHMJobsManagerClass {
423 395 }
424 396 if(count($params) == 1) {
425 397 $infos['Parameter'] = $params[0];
426   - } else {
  398 + } else if(count($params) >1){
427 399 $infos['Parameters'] = '<ul><li>' . join('</li><li>', $params) . '</li></ul>';
428 400 }
429 401 break;
... ... @@ -438,16 +410,12 @@ class IHMJobsManagerClass {
438 410 } else {
439 411 $infos['Parameters'] = join(', ', $params);
440 412 }
441   - $infos['Start date'] = $obj['startDate'];
442   - $infos['Stop date'] = $obj['stopDate'];
443 413 break;
444 414 case 'request':
445 415 $name = "request_".time();
446 416  
447 417 $infos['Output'] = strtolower($obj['file-format']) . ' (' . strtolower($obj['file-output']) . ')';
448   - $infos['Start date'] = $obj->startDate;
449   - $infos['Stop date'] = $obj->stopDate;
450   -
  418 +
451 419 foreach ($obj->panels as $panel) {
452 420 $strParams = '';
453 421 foreach ($panel->params as $param) {
... ... @@ -459,6 +427,57 @@ class IHMJobsManagerClass {
459 427 default:
460 428 $name = "unknown_".time();
461 429 }
  430 + if(array_key_exists('timeTables', $obj)) {
  431 + $ttXml = new DomDocument();
  432 + $ttXml->load(USERWSDIR . 'Tt.xml');
  433 +
  434 + $sharedTtXml = new DomDocument();
  435 + $sharedTtXml->load(SHAREDPATH . 'SharedObjectTree.xml');
  436 +
  437 +
  438 + $ttIntervals = [];
  439 + // TT/Cat
  440 + foreach ($ttXml->getElementsByTagName('timetab') as $tt) {
  441 + $ttIntervals[$tt->getAttribute('name')] = $tt->getAttribute('intervals');
  442 + }
  443 + foreach ($ttXml->getElementsByTagName('catalog') as $cat) {
  444 + $ttIntervals[$cat->getAttribute('name')] = $cat->getAttribute('intervals');
  445 + }
  446 +
  447 + // shared TT/Cat
  448 + foreach ($sharedTtXml->getElementsByTagName('timeTable') as $tt) {
  449 + $ttIntervals[$tt->getAttribute('name')] = $tt->getAttribute('nbIntervals');
  450 + }
  451 + foreach ($sharedTtXml->getElementsByTagName('catalog') as $cat) {
  452 + $ttIntervals[$cat->getAttribute('name')] = $cat->getAttribute('nbIntervals');
  453 + }
  454 +
  455 + if(count($obj['timeTables']) == 1) {
  456 + $infos['Time table'] = $obj['timeTables'][0]->timeTableName;
  457 + $infos['Nb Intervals'] = $ttIntervals[$infos['Time table']];
  458 + } else {
  459 + foreach ($obj['timeTables'] as $tt) {
  460 + if($tt === reset($obj['timeTables'])) {
  461 + $intervalNb = $ttIntervals[$tt->timeTableName];
  462 + if(isset($intervalNb)){
  463 + $infos['Time tables'] = $tt->timeTableName . '(' .$intervalNb . ' int.)';
  464 + }else{
  465 + $infos['Time tables'] = $tt->timeTableName;
  466 + }
  467 + } else {
  468 + $intervalNb = $ttIntervals[$tt->timeTableName];
  469 + if(isset($intervalNb)){
  470 + $infos['Time tables'] .= ', ' . $tt->timeTableName . '(' .$intervalNb. ' int.)';
  471 + }else{
  472 + $infos['Time tables'] .= ', ' . $tt->timeTableName;
  473 + }
  474 + }
  475 + }
  476 + }
  477 + } else {
  478 + $infos['Start date'] = $obj['startDate'];
  479 + $infos['Stop date'] = $obj['stopDate'];
  480 + }
462 481  
463 482 $infos['Started at'] = gmdate("Y-m-d H:i:s", $start);
464 483  
... ...