new record type in statistics store

Elena.Budnik
1 parent d80af896
Showing 2 changed files with 83 additions and 76 deletions Show diff stats
js/app/models/Statistics.js
js/app/views/StatisticsUI.js
@@ -7,69 +7,76 @@
  * @author  elena
  */
  
-  
-
 Ext.define('amdaModel.Statistics', {
-	
-    extend: 'amdaModel.AmdaTimeObject',
+	extend: 'amdaModel.AmdaTimeObject',
  
-    fields : [
-	      { name: 'parameter' } ,
-	      { name: 'description' }
-	//      { name: 'timesrc', type: 'string'}
+	fields : [
+		{ name: 'parameter' } ,
+		{ name: 'description' }
 	],
  
-    getJsonValues : function (hasId) {
-    	var values  = new Object();	    
-    	if (hasId) {
-    		values.id = this.get('id');
-    	}
-    	
-	values.timesrc =  this.get('timesrc');
-    	values.name = 'test'; //this.get('name');
+	getJsonValues : function (hasId) 
+	{
+		var values  = new Object();	    
+		if (hasId) {
+			values.id = this.get('id');
+		}
+
+		values.timesrc =  this.get('timesrc');
+		values.name = 'test'; //this.get('name');
  
-	
-    	if (this.get('description').match(/[a-z,0-9]/gi) != null) {
-    		values.description = this.get('description');
-    	}
+		if (this.get('description').match(/[a-z,0-9]/gi) != null) {
+			values.description = this.get('description');
+		}
 //     	if (this.get('history').match(/[a-z,0-9]/gi) != null) {
 //     		values.history = this.get('history');
 //     	}
-    	values.objName = this.get('objName');
-    	values.objFormat = this.get('objFormat');
+		values.objName = this.get('objName');
+		values.objFormat = this.get('objFormat');
  
-//    	values.cacheToken = this.get('cacheToken');
-    	values.parameter = this.get('parameter'); 
-	if (values.timesrc == amdaModel.AmdaTimeObject.inputTimeSrc[0]){
-	      // get complete timeTables collection
-	      var timeTables = this.get('timeTables');	    
-	      // init an empty array for timeTables
-	      values.timeTables=[];
-	      // for each interval record
-	      Ext.Array.each(timeTables, function(item, index, all){
-		if (!item.$className) {
-		      values.timeTables[index] = {timeTableName : item.timeTableName, id : item.id};
-		}
-		  // get Json simplified value 
-		else {
-		  values.timeTables[index] = item.getJsonValues();
-		}
-	      });            
-	  } else {
-	      values.startDate = this.get('startDate');
-	      values.stopDate = this.get('stopDate');
-	      values.durationDay = this.get('durationDay');
-	      values.durationHour = this.get('durationHour');
-	      values.durationMin = this.get('durationMin');
-	      values.durationSec = this.get('durationSec');
-	  } 
+//    values.cacheToken = this.get('cacheToken');
+      values.parameter = this.get('parameter'); 
+		
+		// if there's at least one parameter
+// 		if (this.get('parameter') && this.get('parameter').length) 
+// 		{
+// 			var list = this.get('parameter');
+// 			values.parameter=[];					
+// 			Ext.each(list, function(item, index){   
+// 				values.parameter[index] = item.getJsonValues();
+// 			});
+// 		} 
+		
+		if (values.timesrc == amdaModel.AmdaTimeObject.inputTimeSrc[0])
+		{
+			// get complete timeTables collection
+			var timeTables = this.get('timeTables');	    
+			// init an empty array for timeTables
+			values.timeTables=[];
+			// for each interval record
+			Ext.Array.each(timeTables, function(item, index, all)
+			{
+				if (!item.$className) {
+					values.timeTables[index] = {timeTableName : item.timeTableName, id : item.id};
+				}
+				// get Json simplified value 
+				else {
+					values.timeTables[index] = item.getJsonValues();
+				}
+			});            
+		} else 
+		{
+			values.startDate = this.get('startDate');
+			values.stopDate = this.get('stopDate');
+			values.durationDay = this.get('durationDay');
+			values.durationHour = this.get('durationHour');
+			values.durationMin = this.get('durationMin');
+			values.durationSec = this.get('durationSec');
+		} 
  
-    	values.leaf = true;
-    	values.nodeType = 'statistics';
-	
-    	return values;
-    }
-	
-	
- 
+		values.leaf = true;
+		values.nodeType = 'statistics';
+
+		return values;
+	}
 });
 \ No newline at end of file
@@ -53,20 +53,19 @@ Ext.define(&#39;amdaUI.StatisticsUI&#39;, {
 			template_args: {}
 		};
  
-// 		if (components) {
-// 			if (components['index1']) {
-// 				paramObj['dim1-index'] = components['index1'];
-// 				++paramObj['type'];
-// 			}
-// 			
-// 			if (components['index2']) {
-// 				paramObj['dim2-index'] = components['index2'];
-// 				++paramObj['type'];
-// 			}
-// 		}
+		if (components) {
+			if (components['index1']) {
+			//	paramObj['dim1-index'] = components['index1'];
+				++paramObj['type'];
+			}
+			
+			if (components['index2']) {
+			//	paramObj['dim2-index'] = components['index2'];
+				++paramObj['type'];
+			}
+		}
  
-		var r = Ext.create('amdaModel.DownloadParam', paramObj);
-		
+		var r = Ext.create('amdaModel.DownloadParam', paramObj);		
 		this.paramGrid.getStore().add(r);
 	   this.paramGrid.getSelectionModel().select(this.paramGrid.getStore().getCount()-1);  
 	//	var pos = this.paramGrid.store.getCount();
@@ -96,12 +95,11 @@ Ext.define(&#39;amdaUI.StatisticsUI&#39;, {
 		module.linkedNode.execute();	     
 	},
  
-	/**
-	 * update this.object from form
-	 */
-	
+	/*
+	 * Update this.object from form
+	 */	
 	updateObject : function(){    
-	    // get the basic form of the left 
+		// get the basic form of the left 
 		var basicForm = this.formPanel.items.items[0].getForm();
 		var updateStatus = true;
  
@@ -112,11 +110,13 @@ Ext.define(&#39;amdaUI.StatisticsUI&#39;, {
 		var recs = this.paramGrid.getStore().getNewRecords();
 		var paramArr = new Array();
  
-		Ext.Array.each(recs, function(rec, index,allItems)
+		Ext.Array.each(recs, function(rec, index, allItems)
 		{
 			var obj =  new Object();
-			obj.param = rec.get('name');
+			obj.param = rec.get('paramid');
+			obj.template_args = rec.get('template_args');
 			obj.function = rec.get('function');
+			
 			if (obj.function == null) 
 			{				
 				myDesktopApp.warningMsg('Please select function : `click to select`'); 
@@ -144,7 +144,7 @@ Ext.define(&#39;amdaUI.StatisticsUI&#39;, {
 		// set valid intervals into TimeTable object
 		if (timeSource === amdaModel.AmdaTimeObject.inputTimeSrc[0])
 			this.object.set('timeTables',this.timeSelector.TTGrid.getStore().data.items);          
-	  	      
+	 	      
 		return updateStatus;	    
 	},