diff --git a/js/app/models/Catalog.js b/js/app/models/Catalog.js index 83c5671..45670a2 100644 --- a/js/app/models/Catalog.js +++ b/js/app/models/Catalog.js @@ -43,6 +43,14 @@ Ext.define('amdaModel.Catalog', { values.parameters = this.get('parameters'); values.leaf = true; values.nodeType = amdaModel.CatalogNode.nodeType; + + if (this.get('contact').match(/[a-z,0-9]/gi) != null) { + values.contact = this.get('contact'); + } + values.surveyStart = this.get('surveyStart'); + values.surveyStop = this.get('surveyStop'); + + return values; } diff --git a/js/app/models/Download.js b/js/app/models/Download.js index da4d771..3254dc5 100644 --- a/js/app/models/Download.js +++ b/js/app/models/Download.js @@ -37,7 +37,8 @@ Ext.define('amdaModel.DownloadConfig', { ], fileformatTTData: [ ['text', 'plain text'], - ['vot', 'VOTable'] + ['vot', 'VOTable'], + ['space', 'HPEvent'] ], filecompressData: [ ['zip', 'zip'], diff --git a/js/app/models/TimeTable.js b/js/app/models/TimeTable.js index a693eda..a6b6963 100644 --- a/js/app/models/TimeTable.js +++ b/js/app/models/TimeTable.js @@ -134,6 +134,9 @@ Ext.define('amdaModel.TimeTable', { {name: 'fromPlugin', type: 'boolean', defaultValue: false}, {name: 'created', type: 'date'}, {name: 'description', type: 'string'}, + {name: 'contact', type: 'string'}, + {name: 'surveyStart', type: 'date'}, + {name: 'surveyStop', type: 'date'}, {name: 'history', type: 'string'}, {name: 'nbIntervals', type: 'int'}, {name: 'objName', type: 'string', defaultValue: ""}, @@ -184,6 +187,12 @@ Ext.define('amdaModel.TimeTable', { values.leaf = true; values.nodeType = amdaModel.TimeTableNode.nodeType; + + if (this.get('contact').match(/[a-z,0-9]/gi) != null) { + values.contact = this.get('contact'); + } + values.surveyStart = this.get('surveyStart'); + values.surveyStop = this.get('surveyStop'); return values; } diff --git a/js/app/views/CatalogUI.js b/js/app/views/CatalogUI.js index a185a8f..8bdf103 100644 --- a/js/app/views/CatalogUI.js +++ b/js/app/views/CatalogUI.js @@ -156,6 +156,9 @@ Ext.define('amdaUI.CatalogUI', { date = Ext.Date.format(creatDate, 'Y-m-d\\TH:i:s'); descr = 'Generated by CDPP/Amda Catalog Module \n' + 'From Catalog: ' + this.object.get('name') + '\nOn: ' + date + '\n'; ttObj.set('description', descr + this.object.get('description')); + ttObj.set('contact', this.object.get('contact')); + ttObj.set('surveyStart', this.object.get('surveyStart')); + ttObj.set('surveyStop', this.object.get('surveyStop')); timeTabNode.set('object', ttObj); var explorerTree = Ext.getCmp(amdaUI.ExplorerUI.RESRC_TAB.TREE_ID); var ttRootNode = explorerTree.getRootNode().findChild('id', 'timeTable-treeRootNode', true); @@ -954,14 +957,49 @@ Ext.define('amdaUI.CatalogUI', { ] }, { + xtype:'fieldset', + columnWidth: 0.5, + title: 'Survey Period', + collapsible: true, + defaultType: 'datefield', + defaults: {anchor: '100%'}, + layout: 'anchor', + items :[{ + fieldLabel: 'Start Time', + name: 'surveyStart', + emptyText: 'YYYY/MM/DDThh:mm:ss', + format: 'Y-m-d\\TH:i:s', + enforceMaxLength: true, + maxLength: 19, + labelWidth: 60, + labelAlign: 'left' + }, { + fieldLabel: 'Stop Time', + name: 'surveyStop', + emptyText: 'YYYY/MM/DDThh:mm:ss', + format: 'Y-m-d\\TH:i:s', + labelAlign: 'left', + enforceMaxLength: true, + maxLength: 19, + labelWidth: 60, + align: 'left' + }] + }, + { + xtype: 'textarea', + name: 'contact', + fieldLabel: 'Contact', + height:50 + }, + { xtype: 'textarea', name: 'description', fieldLabel: 'Description', - height: 200 + height: 150 }, { xtype: 'component', - height: 90 + height: 20 }], dockedItems: [ { -- libgit2 0.21.2