Update TimeSelectorUI for catalog selection

Benjamin Renard
1 parent 81fae858
Showing 4 changed files with 22 additions and 75 deletions Show diff stats
js/app/views/DownloadUI.js
js/app/views/SearchUI.js
js/app/views/StatisticsUI.js
js/app/views/TimeSelectorUI.js
@@ -145,7 +145,7 @@ Ext.define(&#39;amdaUI.DownloadUI&#39;, {
             if (downloadSrc === 0) 
             {            
                 var timeformat =  basicForm.findField('timeformat').getRawValue();         
-                var timeSource = values.timesrc_downloadTimeSelector;           
+                var timeSource = this.timeSelector.getActiveTimeSource();     
                 var structure = values.filestructure;
                 var sampling = values.sampling ? values.sampling : 600;
 		var refparamSampling = values.refparamsampling == 'on';
@@ -68,7 +68,7 @@ Ext.define(&#39;amdaUI.SearchUI&#39;, {
 	// get the basic form
 	var basicForm = this.formPanel.getForm();
 	// get the timeSource selected
-	var timeSource = basicForm.findField('timesrc_'+this.timeSelector.id).getGroupValue();	    
+	var timeSource = this.timeSelector.getActiveTimeSource();	    
 	var updateStatus = true;
  
 	  var fieldsWithoutName = basicForm.getFields().items;
@@ -68,7 +68,7 @@ Ext.define(&#39;amdaUI.StatisticsUI&#39;, {
 	    });
 	    this.object.set('parameter', paramArr);
  
-	    var timeSource = formValues.timesrc_statisticsTimeSelector; 
+	    var timeSource = this.timeSelector.getActiveTimeSource(); 
  
 	    if (timeSource === amdaModel.AmdaTimeObject.inputTimeSrc[0] // timeSource  'TimeTable'
                         && this.timeSelector.TTGrid.getStore().count() == 0) {
@@ -20,7 +20,7 @@ Ext.define(&#39;amdaUI.TimeSelectorUI&#39;,
  
     setTTTab: function(arrayTT) 
     {
-        /*var arrayRec = new Array();
+        var arrayRec = new Array();
         var index = 1;
         if (arrayTT)
         {
@@ -45,9 +45,9 @@ Ext.define(&#39;amdaUI.TimeSelectorUI&#39;,
         // RadioManager is a singleton working with getByName !!!!!	
         var obj = new Object();  	 
         obj['timesrc_' + this.id] =  this.activeTab;        
-        this.timeSrc.setValue(obj); 
+        this.timeSrc.setActiveTab(this.activeTab); 
  
-        if (index === 0) this.TTGrid.getStore().loadData(arrayRec);       */ 
+        if (index === 0) this.TTGrid.getStore().loadData(arrayRec);
     },
  
     addTT : function(newTTName,newTTid)
@@ -55,10 +55,8 @@ Ext.define(&#39;amdaUI.TimeSelectorUI&#39;,
         // set the TimeTable radio checked
         var obj = new Object();  
         obj['timesrc_'+this.id] =  amdaModel.AmdaTimeObject.inputTimeSrc[0]; /*'TimeTable'*/
-        this.timeSrc.setValue(obj);
+        this.timeSrc.setActiveTab(obj['timesrc_'+this.id]); 
  
-        // fireEvent to show the corresponding panel
-        this.timeSrc.fireEvent('change', this.timeSrc, this.timeSrc.getValue());
         // search for an existing record in store with this unique name
         var existingIndex = this.TTGrid.store.findExact( 'name', newTTName);
         // if no corresponding TT found
@@ -69,6 +67,11 @@ Ext.define(&#39;amdaUI.TimeSelectorUI&#39;,
         }        
     },
  
+    getActiveTimeSource: function()
+    {
+    	return this.timeSrc.getActiveTab().getItemId(); 
+    },
+    
     initComponent: function() 
     {
         this.activeField = null;
@@ -84,7 +87,7 @@ Ext.define(&#39;amdaUI.TimeSelectorUI&#39;,
             columns: 
             [ 
                 Ext.create('Ext.grid.RowNumberer', { width: 20 } ),
-                { header: "Time Table Name", dataIndex: 'name', flex:1, sortable : false, menuDisabled: true },
+                { header: "Time Table or Catalog Name", dataIndex: 'name', flex:1, sortable : false, menuDisabled: true },
                 { 
                   menuDisabled: true,  width: 30, renderer: function()
                     {
@@ -100,7 +103,10 @@ Ext.define(&#39;amdaUI.TimeSelectorUI&#39;,
                         ddGroup: 'explorerTree',
                         notifyOver  : function(ddSource, e, data)
                         {
-                                if ((data.records[0].get('nodeType') == 'timeTable' || data.records[0].get('nodeType') == 'sharedtimeTable') && (data.records[0].get('leaf')))
+                                if ((data.records[0].get('nodeType') == 'timeTable' || 
+                                	 data.records[0].get('nodeType') == 'sharedtimeTable' ||
+                                	 data.records[0].get('nodeType') == 'catalog' ||
+                                	 data.records[0].get('nodeType') == 'sharedcatalog') && (data.records[0].get('leaf')))
                                 {
                                     this.valid = true;
                                     return this.dropAllowed;
@@ -193,28 +199,6 @@ Ext.define(&#39;amdaUI.TimeSelectorUI&#39;,
                 }
  
         });
-                                                                       
-        this.cardContainer = 
-        {
-                xtype: 'container',
-                flex: 4,
-                width: '99%',
-                layout: 'card',
-                border: false,
-                activeItem: 1,
-                items: 
-                [                           
-                    this.TTGrid,  
-                    this.intervalSel
-                ],
-                listeners: 
-                {
-                    afterrender: function (container,opt)
-                    {
-                        this.layout.setActiveItem(this.initialConfig.activeItem);
-                    }
-                }
-        };
  
         this.timeSrc = new Ext.tab.Panel(
             {
@@ -227,66 +211,29 @@ Ext.define(&#39;amdaUI.TimeSelectorUI&#39;,
                 	  title: 'Interval',
                 	  layout: 'fit',
                 	  bodyStyle: 'background: none',
+                	  itemId: amdaModel.AmdaTimeObject.inputTimeSrc[1],//'Interval'
                 	  items: [
                 	          this.intervalSel
                 	  ]
                   },
                   {
-                	  title: 'Time Table',
+                	  title: 'Time Table or Catalog',
                 	  layout: 'fit',
+                	  itemId: amdaModel.AmdaTimeObject.inputTimeSrc[0],//'TimeTable'
                 	  items: [
                 	          this.TTGrid
                 	  ]
-                  },
-                  {
-                	  title: 'Catalog',
-                	  items: [
-                	  ]
                   }
-                    /*{
-                        boxLabel: 'Time Table', 
-                        name: 'timesrc_'+this.id, 
-                        inputValue: amdaModel.AmdaTimeObject.inputTimeSrc[0]//'TimeTable',                   
-                    },
-                    {
-                        boxLabel: 'Interval', 
-                        name: 'timesrc_'+this.id, 
-                        inputValue: amdaModel.AmdaTimeObject.inputTimeSrc[1],//'Interval', 
-                        checked: true                    
-                    },
-                    {
-                        boxLabel: 'Catalog', 
-                        name: 'timesrc_'+this.id, 
-                        inputValue: amdaModel.AmdaTimeObject.inputTimeSrc[2],//'Catalog'
-                    }*/
-                ]/*,	    
-                listeners: 
-                {
-                        scope: this,
-                        change: function(radio, newValue, oldValue, options)
-                        {		      			    
-                            var ttIndex =  newValue['timesrc_'+this.id] === amdaModel.AmdaTimeObject.inputTimeSrc[0] ? 0 : 1 ;		      
-                            if (this.rendered)
-                            {				 
-                                    radio.nextSibling().layout.setActiveItem(ttIndex);
-                            } 
-                            else 
-                            {				 
-                                    this.cardContainer.activeItem = ttIndex;
-                            }		   
-                        }
-                }      */         
+                ]     
         });
  
         var config = 
         {
-                //style: { borderColor: '#98c0f4', borderWidth: '2px' },   
                 title: 'Time Selection',
                 layout: 'fit',
                 items: 
                 [
-                    this.timeSrc/*,
-                    this.cardContainer*/
+                    this.timeSrc
                 ]
         };