CDPP / AMDA_IHM

Commit f4ca7ea30893989e30a99d6aec0977ec7a98b712

Authored by Myriam Bouchemit
2 parents 3993a03b e3dab642
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

Merge branch 'master' of https://gitlab.irap.omp.eu/CDPP/AMDA_IHM

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 @f4ca7ea
... ... @@ -228,12 +228,16 @@ class AmdaAction
228 228  
229 229 if ($child->hasAttribute('dataStart') && $child->hasAttribute('dataStop')) {
230 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 237 if ($child->getAttribute('dataStart') == 'depending on mission') {
234 238 $info .= "<br/>Time Range: ".$child->getAttribute('dataStart');
235 239 }
236   -
  240 +
237 241 // if ($child->getAttribute('restriction') > 1) {
238 242 // $restricted = $child->getAttribute('restriction');
239 243 // $info .= "<br/><b>Time Restriction</b>: -$restricted days";
... ...
update_amda/updateAmda
  Diff comments   View file @f4ca7ea
... ... @@ -101,7 +101,7 @@
101 101 cp $RemoteData/PARAMS/* $PARAMS_LOCALDB_DIR/
102 102 fi
103 103 fi
104   - # Update StartStop only
  104 + # Update StartStop & Help only
105 105 if [ $UPDATE ]
106 106 then
107 107 echo "Updating...."
... ... @@ -114,6 +114,11 @@
114 114 fi
115 115  
116 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 123 echo "making Tree..."
119 124 php $UPDATEDIR/makeTree.php
... ...