From d5088c34a7296169b2e5cfa01969e32f90ea67db Mon Sep 17 00:00:00 2001
From: Elena.Budnik <ebudnik@irap.omp.eu>
Date: Thu, 22 Mar 2018 11:54:48 +0100
Subject: [PATCH] correct info on Time Format for uploaded Time table
---
help/ttTimeFormat | 15 +++++++++++++++
js/app/views/UploadPanelUI.js | 18 +++++-------------
2 files changed, 20 insertions(+), 13 deletions(-)
create mode 100644 help/ttTimeFormat
diff --git a/help/ttTimeFormat b/help/ttTimeFormat
new file mode 100644
index 0000000..e619784
--- /dev/null
+++ b/help/ttTimeFormat
@@ -0,0 +1,15 @@
+<h3>ASCII Time Table Time Format</h3>
+<i>Year Month Day Hour Minute Second</i> => with different separators ("-", ":", "/", " ").
+<br/><i>Milliseconds</i> are not taken in to account.
+<br/><br/>
+Examples:
+ <ul>
+ <li> 2001-01-01T00:00:00
+ <li> 2001-01-01 00:00:00
+ <li> 2001 01 01 00 00 00
+ <li> 2001/01/01 00:00:00
+ </ul>
+<br/>
+If you plan to use uploaded time table to work with data note that :<br/>
+<b>Valid time range: 1970-01-01 - 2038-01-19</b>
+
diff --git a/js/app/views/UploadPanelUI.js b/js/app/views/UploadPanelUI.js
index 0c12b13..11833c4 100644
--- a/js/app/views/UploadPanelUI.js
+++ b/js/app/views/UploadPanelUI.js
@@ -19,7 +19,7 @@ Ext.define('amdaUI.UploadPanelUI', {
isFile : true,
isTimeTable : false,
tmpNode : null,
-
+
constructor: function(config)
{
this.init(config);
@@ -310,16 +310,9 @@ Ext.define('amdaUI.UploadPanelUI', {
{
var title = 'Time Table';
var items = [
- { boxLabel: 'ASCII', name: 'ttfrmt', inputValue: 'ASCII', checked: true,
- listeners: {
- change: function (cb, nv, ov) {
- if (nv) Ext.getCmp('tf_tt').show();
- else Ext.getCmp('tf_tt').hide();
- }
- }
- },
- { boxLabel: 'VOTable', name: 'ttfrmt', inputValue: 'VOT'}];
-
+ { boxLabel: 'ASCII <img amda_clicktip="ttTimeFormat" style="vertical-align:bottom" src="js/resources/images/16x16/info_mini.png"', name: 'ttfrmt', inputValue: 'ASCII', checked: true},
+ { boxLabel: 'VOTable', name: 'ttfrmt', inputValue: 'VOT'}
+ ];
var timeFormatId = 'tf_tt';
this.formatId = 'nsf_tt';
this.localUploadId = 'form-uploadtt';
@@ -467,12 +460,11 @@ Ext.define('amdaUI.UploadPanelUI', {
}
}
};
- var isCatalog = !(this.isFile || this.isTimeTable);
var timeFormat = Ext.create('Ext.form.FieldSet', {
id: timeFormatId,
title: 'Time Settings',
- hidden : isCatalog,
+ hidden : !this.isFile,
items : [
{
xtype: 'radiogroup',
--
libgit2 0.21.2