CDPP / AMDA_IHM

Commit d5088c34a7296169b2e5cfa01969e32f90ea67db

Authored by Elena.Budnik
1 parent 6207ec14
Exists in master and in 110 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, data-activities, density_maps, develop, epn-tap, expression-parser-bre, frames-transformation, hapi, homePage, install-rework, 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

correct info on Time Format for uploaded Time table

Showing 2 changed files with 20 additions and 13 deletions   Show diff stats
Inline Side-by-side
help/ttTimeFormat 0 → 100644
  Diff comments   View file @d5088c3
... ... @@ -0,0 +1,15 @@
  1 +<h3>ASCII Time Table Time Format</h3>
  2 +<i>Year Month Day Hour Minute Second</i> => with different separators ("-", ":", "/", " ").
  3 +<br/><i>Milliseconds</i> are not taken in to account.
  4 +<br/><br/>
  5 +Examples:
  6 + <ul>
  7 + <li> 2001-01-01T00:00:00
  8 + <li> 2001-01-01 00:00:00
  9 + <li> 2001 01 01 00 00 00
  10 + <li> 2001/01/01 00:00:00
  11 + </ul>
  12 +<br/>
  13 +If you plan to use uploaded time table to work with data note that :<br/>
  14 +<b>Valid time range: 1970-01-01 - 2038-01-19</b>
  15 +
... ...
js/app/views/UploadPanelUI.js
  Diff comments   View file @d5088c3
... ... @@ -19,7 +19,7 @@ Ext.define(&#39;amdaUI.UploadPanelUI&#39;, {
19 19 isFile : true,
20 20 isTimeTable : false,
21 21 tmpNode : null,
22   -
  22 +
23 23 constructor: function(config)
24 24 {
25 25 this.init(config);
... ... @@ -310,16 +310,9 @@ Ext.define(&#39;amdaUI.UploadPanelUI&#39;, {
310 310 {
311 311 var title = 'Time Table';
312 312 var items = [
313   - { boxLabel: 'ASCII', name: 'ttfrmt', inputValue: 'ASCII', checked: true,
314   - listeners: {
315   - change: function (cb, nv, ov) {
316   - if (nv) Ext.getCmp('tf_tt').show();
317   - else Ext.getCmp('tf_tt').hide();
318   - }
319   - }
320   - },
321   - { boxLabel: 'VOTable', name: 'ttfrmt', inputValue: 'VOT'}];
322   -
  313 + { boxLabel: 'ASCII&nbsp;<img amda_clicktip="ttTimeFormat" style="vertical-align:bottom" src="js/resources/images/16x16/info_mini.png"', name: 'ttfrmt', inputValue: 'ASCII', checked: true},
  314 + { boxLabel: 'VOTable', name: 'ttfrmt', inputValue: 'VOT'}
  315 + ];
323 316 var timeFormatId = 'tf_tt';
324 317 this.formatId = 'nsf_tt';
325 318 this.localUploadId = 'form-uploadtt';
... ... @@ -467,12 +460,11 @@ Ext.define(&#39;amdaUI.UploadPanelUI&#39;, {
467 460 }
468 461 }
469 462 };
470   - var isCatalog = !(this.isFile || this.isTimeTable);
471 463  
472 464 var timeFormat = Ext.create('Ext.form.FieldSet', {
473 465 id: timeFormatId,
474 466 title: 'Time Settings',
475   - hidden : isCatalog,
  467 + hidden : !this.isFile,
476 468 items : [
477 469 {
478 470 xtype: 'radiogroup',
... ...