Commit d5088c34a7296169b2e5cfa01969e32f90ea67db
1 parent
6207ec14
Exists in
master
and in
110 other branches
correct info on Time Format for uploaded Time table
Showing
2 changed files
with
20 additions
and
13 deletions
Show diff stats
@@ -0,0 +1,15 @@ | @@ -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
@@ -19,7 +19,7 @@ Ext.define('amdaUI.UploadPanelUI', { | @@ -19,7 +19,7 @@ Ext.define('amdaUI.UploadPanelUI', { | ||
19 | isFile : true, | 19 | isFile : true, |
20 | isTimeTable : false, | 20 | isTimeTable : false, |
21 | tmpNode : null, | 21 | tmpNode : null, |
22 | - | 22 | + |
23 | constructor: function(config) | 23 | constructor: function(config) |
24 | { | 24 | { |
25 | this.init(config); | 25 | this.init(config); |
@@ -310,16 +310,9 @@ Ext.define('amdaUI.UploadPanelUI', { | @@ -310,16 +310,9 @@ Ext.define('amdaUI.UploadPanelUI', { | ||
310 | { | 310 | { |
311 | var title = 'Time Table'; | 311 | var title = 'Time Table'; |
312 | var items = [ | 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 <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 | var timeFormatId = 'tf_tt'; | 316 | var timeFormatId = 'tf_tt'; |
324 | this.formatId = 'nsf_tt'; | 317 | this.formatId = 'nsf_tt'; |
325 | this.localUploadId = 'form-uploadtt'; | 318 | this.localUploadId = 'form-uploadtt'; |
@@ -467,12 +460,11 @@ Ext.define('amdaUI.UploadPanelUI', { | @@ -467,12 +460,11 @@ Ext.define('amdaUI.UploadPanelUI', { | ||
467 | } | 460 | } |
468 | } | 461 | } |
469 | }; | 462 | }; |
470 | - var isCatalog = !(this.isFile || this.isTimeTable); | ||
471 | 463 | ||
472 | var timeFormat = Ext.create('Ext.form.FieldSet', { | 464 | var timeFormat = Ext.create('Ext.form.FieldSet', { |
473 | id: timeFormatId, | 465 | id: timeFormatId, |
474 | title: 'Time Settings', | 466 | title: 'Time Settings', |
475 | - hidden : isCatalog, | 467 | + hidden : !this.isFile, |
476 | items : [ | 468 | items : [ |
477 | { | 469 | { |
478 | xtype: 'radiogroup', | 470 | xtype: 'radiogroup', |