CDPP / AMDA_IHM

Commit 67bd6ed6df806fce68c1e326820b3eccd89c0e95

Authored by Elena.Budnik
1 parent e8c7b544
Exists in master and in 94 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, amdadev, amdadev_test, anr_tempete, create-user, cu2022, density_maps, develop, epn-tap, expression-parser-bre, frames-transformation, hapi, master_vge, mlplasmas, multiplot, openam, remoteData, rm_6912, rm_6912_bis, rm_7926, rm_8932, save-other-requests, special-params, test-merge, ws_get_catalog

rm 8375

Showing 1 changed file with 17 additions and 8 deletions   Show diff stats
Inline Side-by-side
php/classes/AmdaAction.php
  Diff comments   View file @67bd6ed
... ... @@ -250,17 +250,24 @@ class AmdaAction
250 250 $info = $child->getAttribute('desc');
251 251  
252 252 if ($child->hasAttribute('dataStart') && $child->hasAttribute('dataStop')) {
253   - $info .= "<br/>Time Range: ".$child->getAttribute('dataStart')."-".$child->getAttribute('dataStop');
254   -
  253 + $dataStart = $child->getAttribute('dataStart');
  254 + // check UTC format
  255 + if ( !preg_match('/\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z/', $dataStart ) ) {
  256 + if ( $dataStart == "MissionDependent" )
  257 + $info .= "<br/>Time Range : depending on mission selection";
  258 + else
  259 + $info .= "<br/>Time Range : undefined";
  260 + $child->setAttribute('dataStart', date("Y-m-d\TH:i:s\Z", strtotime(' -1 day')));
  261 + $child->setAttribute('dataStop', date("Y-m-d\TH:i:s\Z", time()));
  262 + } else {
  263 + $info .= "<br/>Time Range: ".$child->getAttribute('dataStart')."-".$child->getAttribute('dataStop');
  264 + }
  265 +
255 266 if ($child->hasAttribute('lastUpdate')) {
256 267 $info .= "<br/>Last Updated: : ".$child->getAttribute('lastUpdate');
257 268 }
258 269 }
259   -
260   - if ($child->getAttribute('dataStart') == 'depending on mission') {
261   - $info .= "<br/>Time Range: ".$child->getAttribute('dataStart');
262   - }
263   -
  270 +
264 271 // if ($child->getAttribute('restriction') > 1) {
265 272 // $restricted = $child->getAttribute('restriction');
266 273 // $info .= "<br/><b>Time Restriction</b>: -$restricted days";
... ... @@ -279,7 +286,9 @@ class AmdaAction
279 286  
280 287 if ($child->tagName == 'parameter') {
281 288 $isParameter = true;
282   -
  289 + if ($child->hasAttribute('TemplatedParameter'))
  290 + $needsArgs = true;
  291 +
283 292 if ($child->parentNode->hasAttribute('dataStart')) {
284 293 $globalStart = $child->parentNode->getAttribute('dataStart');
285 294 $globalStop = $child->parentNode->getAttribute('dataStop');
... ...