CDPP / AMDA_IHM

Commit 3197b3e2175f48959b289b7ba1e3572f4a3c8adc

Authored by Elena.Budnik
1 parent 13ad9448
Exists in master and in 112 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, akkodis/amdadev, alias, amdadev, amdadev_test, anr_tempete, catalog-histo, create-user, cu2022, data-activities, density_maps, develop, epn-tap, expression-parser-bre, frames-transformation, hapi, homePage, install-rework, livraison-akka, master_vge, minimize, mlplasmas, multiplot, new-save-plot-request, openam, plot-request, plot-request-update, 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, shared-objects-updater, special-params, sum-components-indexes, test-merge, ws_get_catalog

globalStart, Global stop to description added in AmdaAction; error in H format

Showing 2 changed files with 18 additions and 21 deletions   Show diff stats
Inline Side-by-side
js/app/models/InteractiveNode.js
  Diff comments   View file @3197b3e
... ... @@ -483,7 +483,7 @@ Ext.define('amdaModel.InteractiveNode', {
483 483 var stopDate = new Date(stopString.replace(/\-/g,'\/').replace(/[T|Z]/g,' '));
484 484 if (stopDate - startDate > 86400000 ) {
485 485 var startTime = Ext.Date.add(stopDate, Ext.Date.DAY, -1);
486   - var timeObj = {start: Ext.Date.format(startTime, 'Y/m/d h:i:s'), stop: Ext.Date.format(stopDate, 'Y/m/d h:i:s')};
  486 + var timeObj = {start: Ext.Date.format(startTime, 'Y/m/d H:i:s'), stop: Ext.Date.format(stopDate, 'Y/m/d H:i:s')};
487 487 }
488 488 else {
489 489 var timeObj = {start: node.get('globalStart'), stop: node.get('globalStop')};
... ...
php/classes/AmdaAction.php
  Diff comments   View file @3197b3e
... ... @@ -208,27 +208,24 @@ class AmdaAction {
208 208 $isSpectra = false;
209 209 $isStack = false;
210 210  
211   - if ($child->hasAttribute('desc')) $info = $child->getAttribute('desc');
212   -
213   - if ($child->hasAttribute('sampling'))
214   - {
215   - $info = "Sampling: ".$child->getAttribute('sampling')."<br/>";
216   - if ($child->getAttribute('dataStart') == 'depending on mission')
217   - {
218   - $info .= "Time Range: ".$child->getAttribute('dataStart')."<br/>";
219   - }
220   - else
221   - {
222   - $info .= "Time Range: ".$child->getAttribute('dataStart')."-".$child->getAttribute('dataStop')."<br/>";
223   - }
224   -
225   - if ($child->getAttribute('restriction') > 1) {
226   - $restricted = $child->getAttribute('restriction');
227   - $info .= "<b>Time Restriction</b>: -$restricted days<br/>";
228   - }
  211 + if ($child->hasAttribute('desc')) {
  212 +
  213 + $info = $child->getAttribute('desc');
  214 +
  215 + if ($child->hasAttribute('dataStart') && $child->hasAttribute('dataStop')) {
  216 + $info .= "<br/>Time Range: ".$child->getAttribute('dataStart')."-".$child->getAttribute('dataStop');
  217 + }
  218 +
  219 + if ($child->getAttribute('dataStart') == 'depending on mission'){
  220 + $info .= "<br/>Time Range: ".$child->getAttribute('dataStart');
  221 + }
  222 +
  223 + if ($child->getAttribute('restriction') > 1) {
  224 + $restricted = $child->getAttribute('restriction');
  225 + $info .= "<br/><b>Time Restriction</b>: -$restricted days";
  226 + }
  227 + }
229 228  
230   - $info .= "Source: ".$child->getAttribute('dataSource');
231   - }
232 229  
233 230 if ($child->hasAttribute('units')) $info = $child->getAttribute('units');
234 231  
... ...