CDPP / AMDA_IHM

Commit a4acaf46f603e346a5d17c21a658ffe7f7d0f4d3

Authored by Hacene SI HADJ MOHAND
1 parent d34525e2
Exists in master and in 81 other branches 10098, 10178, 5390, 6629, 7494, 7616, 8459, 8528, 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, amdadev, amdadev_test, anr_tempete, cu2022, density_maps, develop, epn-tap, master_vge, mlplasmas, openam, rm_6912_bis, special-params, test-merge, ws_get_catalog

IHM progess

Showing 4 changed files with 59 additions and 3 deletions   Show diff stats
Inline Side-by-side
js/app/models/Catalog.js
  Diff comments   View file @a4acaf4
... ... @@ -43,6 +43,14 @@ Ext.define('amdaModel.Catalog', {
43 43 values.parameters = this.get('parameters');
44 44 values.leaf = true;
45 45 values.nodeType = amdaModel.CatalogNode.nodeType;
  46 +
  47 + if (this.get('contact').match(/[a-z,0-9]/gi) != null) {
  48 + values.contact = this.get('contact');
  49 + }
  50 + values.surveyStart = this.get('surveyStart');
  51 + values.surveyStop = this.get('surveyStop');
  52 +
  53 +
46 54 return values;
47 55 }
48 56  
... ...
js/app/models/Download.js
  Diff comments   View file @a4acaf4
... ... @@ -37,7 +37,8 @@ Ext.define('amdaModel.DownloadConfig', {
37 37 ],
38 38 fileformatTTData: [
39 39 ['text', 'plain text'],
40   - ['vot', 'VOTable']
  40 + ['vot', 'VOTable'],
  41 + ['space', 'HPEvent']
41 42 ],
42 43 filecompressData: [
43 44 ['zip', 'zip'],
... ...
js/app/models/TimeTable.js
  Diff comments   View file @a4acaf4
... ... @@ -134,6 +134,9 @@ Ext.define('amdaModel.TimeTable', {
134 134 {name: 'fromPlugin', type: 'boolean', defaultValue: false},
135 135 {name: 'created', type: 'date'},
136 136 {name: 'description', type: 'string'},
  137 + {name: 'contact', type: 'string'},
  138 + {name: 'surveyStart', type: 'date'},
  139 + {name: 'surveyStop', type: 'date'},
137 140 {name: 'history', type: 'string'},
138 141 {name: 'nbIntervals', type: 'int'},
139 142 {name: 'objName', type: 'string', defaultValue: ""},
... ... @@ -184,6 +187,12 @@ Ext.define('amdaModel.TimeTable', {
184 187  
185 188 values.leaf = true;
186 189 values.nodeType = amdaModel.TimeTableNode.nodeType;
  190 +
  191 + if (this.get('contact').match(/[a-z,0-9]/gi) != null) {
  192 + values.contact = this.get('contact');
  193 + }
  194 + values.surveyStart = this.get('surveyStart');
  195 + values.surveyStop = this.get('surveyStop');
187 196 return values;
188 197 }
189 198  
... ...
js/app/views/CatalogUI.js
  Diff comments   View file @a4acaf4
... ... @@ -156,6 +156,9 @@ Ext.define('amdaUI.CatalogUI', {
156 156 date = Ext.Date.format(creatDate, 'Y-m-d\\TH:i:s');
157 157 descr = 'Generated by CDPP/Amda Catalog Module \n' + 'From Catalog: ' + this.object.get('name') + '\nOn: ' + date + '\n';
158 158 ttObj.set('description', descr + this.object.get('description'));
  159 + ttObj.set('contact', this.object.get('contact'));
  160 + ttObj.set('surveyStart', this.object.get('surveyStart'));
  161 + ttObj.set('surveyStop', this.object.get('surveyStop'));
159 162 timeTabNode.set('object', ttObj);
160 163 var explorerTree = Ext.getCmp(amdaUI.ExplorerUI.RESRC_TAB.TREE_ID);
161 164 var ttRootNode = explorerTree.getRootNode().findChild('id', 'timeTable-treeRootNode', true);
... ... @@ -954,14 +957,49 @@ Ext.define('amdaUI.CatalogUI', {
954 957 ]
955 958 },
956 959 {
  960 + xtype:'fieldset',
  961 + columnWidth: 0.5,
  962 + title: 'Survey Period',
  963 + collapsible: true,
  964 + defaultType: 'datefield',
  965 + defaults: {anchor: '100%'},
  966 + layout: 'anchor',
  967 + items :[{
  968 + fieldLabel: 'Start Time',
  969 + name: 'surveyStart',
  970 + emptyText: 'YYYY/MM/DDThh:mm:ss',
  971 + format: 'Y-m-d\\TH:i:s',
  972 + enforceMaxLength: true,
  973 + maxLength: 19,
  974 + labelWidth: 60,
  975 + labelAlign: 'left'
  976 + }, {
  977 + fieldLabel: 'Stop Time',
  978 + name: 'surveyStop',
  979 + emptyText: 'YYYY/MM/DDThh:mm:ss',
  980 + format: 'Y-m-d\\TH:i:s',
  981 + labelAlign: 'left',
  982 + enforceMaxLength: true,
  983 + maxLength: 19,
  984 + labelWidth: 60,
  985 + align: 'left'
  986 + }]
  987 + },
  988 + {
  989 + xtype: 'textarea',
  990 + name: 'contact',
  991 + fieldLabel: 'Contact',
  992 + height:50
  993 + },
  994 + {
957 995 xtype: 'textarea',
958 996 name: 'description',
959 997 fieldLabel: 'Description',
960   - height: 200
  998 + height: 150
961 999 },
962 1000 {
963 1001 xtype: 'component',
964   - height: 90
  1002 + height: 20
965 1003 }],
966 1004 dockedItems: [
967 1005 {
... ...