CDPP / AMDA_IHM

Commit e3dab6425398de0a6922e007d34c1e52a5836a61

Authored by Elena Budnik
2 parents 3e9f7a84 a7316784
Exists in master and in 106 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, density_maps, develop, epn-tap, expression-parser-bre, frames-transformation, hapi, homePage, master_vge, minimize, mlplasmas, multiplot, new-save-plot-request, openam, plot-request, 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, special-params, sum-components-indexes, test-merge, ws_get_catalog

Merge branch 'data-version' into 'master' 

Data version

See merge request !37
Showing 2 changed files with 11 additions and 2 deletions   Show diff stats
Inline Side-by-side
php/classes/AmdaAction.php
  Diff comments   View file @e3dab64
@@ -228,12 +228,16 @@ class AmdaAction @@ -228,12 +228,16 @@ class AmdaAction
228 228
229 if ($child->hasAttribute('dataStart') && $child->hasAttribute('dataStop')) { 229 if ($child->hasAttribute('dataStart') && $child->hasAttribute('dataStop')) {
230 $info .= "<br/>Time Range: ".$child->getAttribute('dataStart')."-".$child->getAttribute('dataStop'); 230 $info .= "<br/>Time Range: ".$child->getAttribute('dataStart')."-".$child->getAttribute('dataStop');
  231 +
  232 + if ($child->hasAttribute('lastUpdate')) {
  233 + $info .= "<br/>Last Updated: : ".$child->getAttribute('lastUpdate');
  234 + }
231 } 235 }
232 236
233 if ($child->getAttribute('dataStart') == 'depending on mission') { 237 if ($child->getAttribute('dataStart') == 'depending on mission') {
234 $info .= "<br/>Time Range: ".$child->getAttribute('dataStart'); 238 $info .= "<br/>Time Range: ".$child->getAttribute('dataStart');
235 } 239 }
236 - 240 +
237 // if ($child->getAttribute('restriction') > 1) { 241 // if ($child->getAttribute('restriction') > 1) {
238 // $restricted = $child->getAttribute('restriction'); 242 // $restricted = $child->getAttribute('restriction');
239 // $info .= "<br/><b>Time Restriction</b>: -$restricted days"; 243 // $info .= "<br/><b>Time Restriction</b>: -$restricted days";
update_amda/updateAmda
  Diff comments   View file @e3dab64
@@ -101,7 +101,7 @@ @@ -101,7 +101,7 @@
101 cp $RemoteData/PARAMS/* $PARAMS_LOCALDB_DIR/ 101 cp $RemoteData/PARAMS/* $PARAMS_LOCALDB_DIR/
102 fi 102 fi
103 fi 103 fi
104 - # Update StartStop only 104 + # Update StartStop & Help only
105 if [ $UPDATE ] 105 if [ $UPDATE ]
106 then 106 then
107 echo "Updating...." 107 echo "Updating...."
@@ -114,6 +114,11 @@ @@ -114,6 +114,11 @@
114 fi 114 fi
115 115
116 echo 'update in NEWMETA/dd_missions: done' 116 echo 'update in NEWMETA/dd_missions: done'
  117 + echo 'update in NEWMETA/help: done'
  118 +
  119 + cp $NEWMETA/help/* $HelpAuto
  120 +
  121 + echo "copy $NEWMETA/help/ to $HelpAuto : done"
117 122
118 echo "making Tree..." 123 echo "making Tree..."
119 php $UPDATEDIR/makeTree.php 124 php $UPDATEDIR/makeTree.php