Merge branch 'amdadev' into develop

Benjamin Renard
2 parents 9827d468 0e29827d
Showing 24 changed files with 363 additions and 164 deletions Show diff stats
generic_data/operations.json
js/app/controllers/ExplorerModule.js
js/app/controllers/InteractiveModule.js
js/app/controllers/JobsMgr.js
js/app/controllers/StatisticsModule.js
js/app/models/AmdaTimeObject.js
js/app/models/BkgJobNode.js
js/app/models/Download.js
js/app/models/ExecutableNode.js
js/app/models/InteractiveNode.js
js/app/models/Statistic.js
js/app/models/StatisticParam.js
js/app/models/StatisticsNode.js
js/app/models/Stats.js
js/app/models/TimeTableNode.js
js/app/stores/ExplorerReader.js
js/app/views/ExplorerUI.js
js/app/views/StatisticsUI.js
js/app/views/TabResultUI.js
js/app/views/TimeTableOperationUI.js
 {"nodes": [
   {"nodeType" : "request", "text" : "Plot", "id" :  "request-treeRootNode"} ,    
   {"nodeType" : "download", "text" : "Download", "id" :  "download-treeRootNode"} ,
-  {"nodeType" : "condition","text" : "Data Mining","id" : "condition-treeRootNode" }
+  {"nodeType" : "condition","text" : "Data Mining","id" : "condition-treeRootNode" },
+  {"nodeType" : "statistic","text" : "Statistic","id" : "statistic-treeRootNode" }
 ]}
@@ -48,7 +48,7 @@ Ext.define(&#39;amdaDesktop.ExplorerModule&#39;,
       'amdaModel.Download',
       'amdaModel.TimeTable',
       'amdaModel.Catalog',
-      'amdaModel.Stats',
+      'amdaModel.Statistic',
       'amdaModel.FileObject',
       'amdaModel.FileParamObject',
       'amdaModel.FilterInfo'
@@ -141,6 +141,7 @@ Ext.define(&#39;amdaDesktop.InteractiveModule&#39;, {
 // 						this.operationOnShow();
 					if (onShowEvent)
 						onShowEvent();
+					onShowEvent = null; // use onShowEvent only once after window creation (cf. #9510)
 				}	 
 			});
 		} else {
@@ -94,7 +94,7 @@ Ext.define(&#39;amdaDesktop.JobsMgr&#39;, {
                   case 'download':
                     type = 'Download '
                     break
-                  case 'statistics':
+                  case 'statistic':
                     type = 'Statistics '
                     break
                   default:
@@ -161,7 +161,7 @@ Ext.define(&#39;amdaDesktop.JobsMgr&#39;, {
                     resRootNode = root.findChild('id', bkgJob.RES_ROOT_NODE.DOWNLOAD, true)
                     jobRootNode = root.findChild('id', bkgJob.JOB_ROOT_NODE.DOWNLOAD, true)
                     break
-                  case 'statistics':
+                  case 'statistic':
                     resRootNode = root.findChild('id', bkgJob.RES_ROOT_NODE.STATISTICS, true)
                     jobRootNode = root.findChild('id', bkgJob.JOB_ROOT_NODE.STATISTICS, true)
                     break
@@ -21,25 +21,16 @@ Ext.define(&#39;amdaDesktop.StatisticsModule&#39;, {
      * @required
      */
 	nodeDataModel : 'amdaModel.StatisticsNode',
-	objectDataModel : 'amdaModel.Stats',
+	objectDataModel : 'amdaModel.Statistic',
     /**
      * @cfg {String} window definitions
      * @required
      */
 	width : 550,
-	height: 550,
+	height: 600,
 	uiType : 'panelStatistics',
 	helpTitle : 'Help on Statistics Module',
 	helpFile : 'statisticsHelp',
-    /**	
-     * @override
-     */
-    createWindow : function() {
-        if (!this.linkedNode){
-            this.setLinkedNode(amdaModel.StatisticsNode);
-        }
-        this.callParent(arguments);
-    },
 	 saveState: function() {
             var uiContent = this.getUiContent();               
@@ -12,12 +12,17 @@
 Ext.define('amdaModel.TTobject', {
-    extend: 'amdaModel.AmdaObject',
+     extend: 'amdaModel.AmdaObject',
+
+     fields : [
+         {name: 'nodeType', type: 'string'}
+     ],
      getJsonValues : function () {
          var values  = new Object();
          values.timeTableName = this.get('name');
          values.id = this.get('id');
+         values.nodeType = this.get('nodeType');
          return values;
      }
 }); 
@@ -18,7 +18,7 @@ Ext.define(&#39;amdaModel.BkgJobNode&#39;, {
 				PLOT: 'request',//'plot',
 				CONDITION: 'condition',
 				DOWNLOAD: 'download',
-				STATISTICS: 'statistics'
+				STATISTICS: 'statistic'
 			},
 			JOB_ROOT_NODE: {
 				PLOT: 'bkgPlot-treeRootNode',
@@ -179,7 +179,7 @@ Ext.define(&#39;amdaModel.BkgJobNode&#39;, {
 					case 'condition' : var type = 'Data Mining '; break;
 					case 'request' : var type = 'Plot '; break;   
 					case 'download' : var type = 'Download '; break;
-					case 'statistics' : var type = 'Statistics '; break;
+					case 'statistic' : var type = 'Statistics '; break;
 					default: var type = 'unknown';    
 				}
@@ -228,8 +228,8 @@ Ext.define(&#39;amdaModel.BkgJobNode&#39;, {
 							resultId : result.result,
 							folderId : result.folder});
 					break;
-				case 'statistics' : 
-					obj = Ext.create('amdaModel.Stats',
+				case 'statistic' : 
+					obj = Ext.create('amdaModel.Statistic',
 							{name: result.name,
 							resultId : result.result,
 							folderId : result.folder});
@@ -325,7 +325,7 @@ Ext.define(&#39;amdaModel.BkgJobNode&#39;, {
 					case 'condition' : var type = 'Data Mining '; break;
 					case 'request' : var type = 'Plot '; break;   
 					case 'download' : var type = 'Download '; break;
-					case 'statistics' : var type = 'Statistics '; break;
+					case 'statistic' : var type = 'Statistics '; break;
 					default: var type = 'unknown';    
 				}
 				myDesktopApp.infoMsg('Your request is still running and has been assigned the name '+this.get('text')+' -- Check Jobs in Progress');
@@ -77,7 +77,8 @@ Ext.define(&#39;amdaModel.Download&#39;, {
 		{name: 'fileformat', type: 'string', defaultValue: amdaModel.DownloadConfig.defaultValues.fileformat},
 		{name: 'fileformatTT', type: 'string', defaultValue: amdaModel.DownloadConfig.defaultValues.fileformatTT},
 		{name: 'compression', type: 'string', defaultValue: amdaModel.DownloadConfig.defaultValues.filecompress},
-		{name: 'compressionTT', type: 'string', defaultValue: amdaModel.DownloadConfig.defaultValues.filecompressTT}
+		{name: 'compressionTT', type: 'string', defaultValue: amdaModel.DownloadConfig.defaultValues.filecompressTT},
+		{name: 'last_update', type: 'int', defaultValue: 0}
 	],
 	associations : [
@@ -11,7 +11,7 @@
 Ext.define('amdaModel.ExecutableNode', {
 	extend: 'amdaModel.InteractiveNode',
-	fields: [ 'jobNode', 'resultModel'],
+	fields: [ 'jobNode', 'resultModel' ],
 	statics: { jobTreeLoaded : false },
@@ -19,7 +19,8 @@ Ext.define(&#39;amdaModel.InteractiveNode&#39;, {
 		{name: 'filtered', type: 'boolean', defaultValue: false, persist: false},
 		{name: 'needsArgs', type:'boolean', defaultValue: false},
 		{name: 'predefinedArgs', type:'boolean', defaultValue: false},
-		{name: 'disable', type: 'boolean', defaultValue: false, persist: false}
+		{name: 'disable', type: 'boolean', defaultValue: false, persist: false},
+		{name: 'last_update', type: 'int', defaultValue: 0}
 	],
 	statics: {
@@ -206,6 +207,7 @@ Ext.define(&#39;amdaModel.InteractiveNode&#39;, {
 					}
 					if (res.last_update) {
+						this.set('last_update', res.last_update);
 						this.get('object').set('last_update', res.last_update);
 					}
@@ -288,6 +290,7 @@ Ext.define(&#39;amdaModel.InteractiveNode&#39;, {
 					var reloadObject = false;
 					if (res.last_update) {
+						this.set('last_update', res.last_update);
 						this.get('object').set('last_update', res.last_update);
 						reloadObject = true;
 					}
@@ -0,0 +1,119 @@
+/**
+ * Project      : AMDA-NG
+ * Name         : Statistic.js 
+ * Description  : Statistics Object Definition
+ * @class amdaModel.Statistic
+ * @extends amdaModel.AmdaTimeObject
+ * @author  elena
+ */
+
+Ext.define('amdaModel.Statistic', {
+	extend: 'amdaModel.AmdaTimeObject',
+ 
+	requires: [
+		"amdaModel.StatisticParam"
+	],
+   
+	fields : [
+		{name: 'type', type: 'string', defaultValue: 'Statistic'},
+		{name: 'description', type: 'string'},
+		{name: 'last_update', type: 'int', defaultValue: 0}
+	],
+
+	associations : [
+		{
+			type : 'hasMany',
+			model : 'amdaModel.StatisticParam',
+			name  : 'params'
+		}
+	],
+
+	constructor: function(){
+		var me = this;
+		me.callParent(arguments);
+		if ((arguments.length > 0) && arguments[0])
+		{
+			if (arguments[0].parameter)
+				me.loadParams(arguments[0].parameter);
+		}
+		this.dirty = false;
+	},
+
+	loadParams: function(params)
+	{
+		/* Compatability mode */
+		Ext.each(params, function(param, index) {
+			if (param.hasOwnProperty('is-init')) {
+				return;
+			}
+			params[index]['dim1-sum-type']  = param['dim1-is-range'] ? 1 : 0;
+			params[index]['dim1-min-value'] = param['dim1-min-range'];
+			params[index]['dim1-max-value'] = param['dim1-max-range'];
+			params[index]['dim2-sum-type']  = param['dim2-is-range'] ? 1 : 0;
+			params[index]['dim2-min-value'] = param['dim2-min-range'];
+			params[index]['dim2-max-value'] = param['dim2-max-range'];
+			params[index]['is-init'] = true;
+		});
+		this.params().loadData(params);
+        },
+
+	isDirty : function() {
+		if (this.dirty)
+			return true;
+
+		var d = false;
+
+		this.params().each(function (param, index) {
+			if (param.dirty)
+				d = true;
+		});
+		return d;
+	},
+    
+	getJsonValues : function () 
+	{
+		var values  = new Object();	    
+                values.nodeType =  'statistic';
+                values.type = this.get('type');
+                values.name = this.get('name');
+		values.timesrc = this.get('timesrc');
+		values.description = this.get('description');
+        	
+		// if there's at least one parameter
+		values.parameter = [];
+                this.params().each(function (param, index) {
+			values.parameter[index] = param.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;
+
+		return values;
+	}
+});
@@ -0,0 +1,30 @@
+/**
+ * Project      : AMDA-NG
+ * Name         : StatisticParam.js
+ * Description  : Statistic Param Business Object Definition
+ * @class amdaModel.StatisticParam
+ * @extends amdaModel.RequestParamObject 
+ * 
+ * @author benjamin
+ * @version $Id: StatisticParam.js 2068 2021-05-20 11:27:38Z benjamin $
+ ******************************************************************************
+ *    FT Id     :   Date   : Name - Description
+ ******************************************************************************
+ *	:           :20/05/2021: benjamin – creation 
+ */
+ 
+ 		
+Ext.define('amdaModel.StatisticParam', {
+	extend: 'amdaModel.RequestParamObject',
+
+	fields : [
+		{name: 'function', type: 'string', defaultValue: ''}
+	],
+
+	getJsonValues : function ()
+        {
+		var values = this.callParent(arguments);
+		values['function'] = this.get('function');
+		return values;
+	}
+});
@@ -10,22 +10,15 @@
 Ext.define('amdaModel.StatisticsNode', {
 	extend: 'amdaModel.ExecutableNode',
-	
-	singleton: true,
+
+	statics: {
+		nodeType: 'statistic',
+		objectName: 'Statistic'
+	},	
-	fields: [ 
-		{name: 'object', type: 'object'},
-		{name: 'moduleId', type: 'string', defaultValue:'statistics-win'},
-		{name: 'nodeType', type: 'string', defaultValue: 'statistics'},
-		{name: 'objectDataModel', type: 'string', defaultValue:'amdaModel.Stats'},
-		{name: 'jobNode', type: 'string', defaultValue: 'amdaModel.BkgJobNode'}
-	], 
-	
-	 constructor: function(config) {
-		this.callParent(arguments);	 
-		this.set('nodeType','statistics');
-	},
-	isExecutable: function(){
-		return true;
+	constructor: function(config) {
+		this.callParent(arguments);
+		this.set('moduleId',myDesktopApp.dynamicModules.statistics.id);
+		this.set('objectDataModel',amdaModel.Statistic.$className);
 	}
 });
@@ -1,82 +0,0 @@
-/**
- * Project      : AMDA-NG
- * Name         : Stats.js 
- * Description  : Statistics Object Definition
- * @class amdaModel.Stats
- * @extends amdaModel.TimeTable 
- * @author  elena
- */
-
-Ext.define('amdaModel.Stats', {
-	extend: 'amdaModel.AmdaTimeObject',
-    
-	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 = this.get('name');
-    
-// 		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.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;
-	}
-});
@@ -135,7 +135,7 @@ Ext.define(&#39;amdaModel.TimeTableNode&#39;, {
 		var me = this;   
 		myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.tt_op.id, true, function (module) {
 			module.createWindow();
-			module.getUiContent().addTT(me.get('text'), me.get('id'));
+			module.getUiContent().addTT(me.get('text'), me.get('id'), me.get('nodeType'));
 		});
 	},
@@ -48,7 +48,9 @@ Ext.define(&#39;amdaReader.ExplorerReader&#39;, {
             case 'request' :
                 return amdaModel.PlotNode;
             case 'download' :
-                return amdaModel.DownloadNode; 
+                return amdaModel.DownloadNode;
+            case 'statistic' :
+                return amdaModel.StatisticsNode;
             case 'bkgWorks' :
                 return amdaModel.BkgJobNode; 	  	
             default:
@@ -544,7 +544,10 @@ Ext.define(&#39;amdaUI.ExplorerUI&#39;, {
 								menu.removeListener('click',onRecordClick,this);
 							};
-						menu.addListener('click',onRecordClick,rec);
+						if (!menu.hasListener('click')) {
+						    // set click listener on menu only once (cf. #9510)
+						    menu.addListener('click',onRecordClick,rec);
+						}
 						// then show menu
 						menu.showAt(e.getXY());
 					}
@@ -589,6 +592,7 @@ Ext.define(&#39;amdaUI.ExplorerUI&#39;, {
 							case 'request' :
 							case 'condition' :
                                                         case 'download':
+							case 'statistic':
 								record.editLeaf();
 								break;
 							case 'localParam' :
@@ -645,6 +649,13 @@ Ext.define(&#39;amdaUI.ExplorerUI&#39;, {
 								beforeshow: function updateTipBody(tip) {
 									if (view.getRecord(tip.triggerElement)) {
 										var info = view.getRecord(tip.triggerElement).get('info');
+										var last_update = view.getRecord(tip.triggerElement).get('last_update');
+										if (last_update && (last_update > 0)) {
+											if (info && (info != '')) {
+												info += '<br/>';
+											}
+											info += '<b>Last modification: </b>' + Ext.Date.format(new Date(last_update * 1000), "Y-m-d H:i:s");
+										}
 										if (!info || info == '') {
 											tip.addCls('hide');
 										}
@@ -13,18 +13,11 @@ Ext.define(&#39;amdaUI.StatisticsUI&#39;,
             alias: 'widget.panelStatistics',
             requires: [
-                //'amdaModel.Function'
                 'amdaUI.TimeSelectorUI',
                 'amdaUI.ParamArgumentsPlug',
-                'amdaModel.DownloadParam',
-                'amdaModel.RequestParamObject'
+		'amdaModel.StatisticParam'
             ],
-            statics:
-                    {
-                        //	  functionStore : null
-                    },
-
             constructor: function (config)
             {
                 this.init(config);
@@ -41,7 +34,15 @@ Ext.define(&#39;amdaUI.StatisticsUI&#39;,
                 // load object into form	
                 var basicForm = this.formPanel.items.items[1].getForm();
                 basicForm.loadRecord(this.object);
+		// set object's TTs into the timeselector
+		this.timeSelector.setTTTab(this.object.get('timeTables'));
+		// set parameters
+		this.paramGrid.reconfigure(this.object.params());
+            },
+            setObject: function (obj) {
+                this.object = obj;
+                this.loadObject();
             },
             onApplyParameterArgs: function (parentUI, paramObject)
@@ -67,7 +68,7 @@ Ext.define(&#39;amdaUI.StatisticsUI&#39;,
                     }
                 }
-                var r = Ext.create('amdaModel.DownloadParam', paramObj);
+                var r = Ext.create('amdaModel.StatisticParam', paramObj);
                 this.paramGrid.getStore().add(r);
                 this.paramGrid.getSelectionModel().select(this.paramGrid.getStore().getCount() - 1);
                 //	var pos = this.paramGrid.store.getCount();
@@ -86,6 +87,88 @@ Ext.define(&#39;amdaUI.StatisticsUI&#39;,
                     paramArgsPlug.show('statistics-param-arguments-plugin', record);
             },
+            saveRequest : function()
+            {
+                var me = this;
+
+                if (!this.updateObject()) {
+                    return;
+                }
+
+                var statisticModule = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.statistics.id);
+
+                if ((this.object.get('id') != '') && (statisticModule.linkedNode.get('text') == this.object.get('name'))) {
+                    this.saveProcess(false);
+                    return;
+                }
+
+                statisticModule.linkedNode.isValidName(this.fieldName.getValue(), function (res) {
+			if (!res)
+			{
+				me.fieldName.validFlag = 'Error during object validation';
+				myDesktopApp.errorMsg(me.fieldName.validFlag);
+				me.fieldName.validate();
+				return;
+			}
+
+			if (!res.valid)
+			{
+				if (res.error)
+				{
+					if (res.error.search('subtree') != -1) {
+						Ext.MessageBox.show({title:'Warning',
+							msg: res.error+'<br/>Do you want to overwrite it?',
+							width: 300,
+							buttons: Ext.MessageBox.OKCANCEL,
+							fn : function(btn) {
+								if (btn == 'cancel') return;
+								this.fieldName.clearInvalid();
+								this.saveProcess(true);
+							},
+							icon: Ext.MessageBox.WARNING,
+							scope : me
+						});
+						me.fieldName.validFlag = true;
+					}
+					else
+						me.fieldName.validFlag = res.error;
+				}
+				else
+				{
+					me.fieldName.validFlag = 'Invalid object name';
+					myDesktopApp.errorMsg(me.fieldName.validFlag);
+				}
+				me.fieldName.validate();
+				return;
+			}
+
+			me.fieldName.validFlag = true;
+			me.fieldName.validate();
+			me.saveProcess(false);
+		});
+            },
+
+            saveProcess: function(toRename) {
+		var statisticModule = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.statistics.id);
+		if (this.object.isModified('name')) {
+			if (this.object.get('id'))
+			{
+				var contextNode = statisticModule.linkedNode.parentNode;
+				statisticModule.createLinkedNode();
+				statisticModule.linkedNode.set('contextNode',contextNode);
+				statisticModule.createObject(this.object.getJsonValues());
+				var statisticObj = statisticModule.linkedNode.get('object');
+				this.object = statisticObj;
+				if (toRename) statisticModule.linkedNode.toRename = true;
+			}
+			statisticModule.linkedNode.create();
+		}
+		else {
+			statisticModule.linkedNode.set('contextNode',statisticModule.contextNode);
+			statisticModule.linkedNode.update();
+		}
+            },
+
             addTT: function (TTname, TTid)
             {
                 this.timeSelector.addTT(TTname, TTid);
@@ -181,7 +264,7 @@ Ext.define(&#39;amdaUI.StatisticsUI&#39;,
             init: function (config)
             {
                 this.fieldName = new Ext.form.field.Text({
-                    fieldLabel: 'Catalog Name',
+                    fieldLabel: 'Request Name',
                     allowBlank: false,
                     stripCharsRe: /(^\s+|\s+$)/g,
                     emptyText: 'Please no spaces!',
@@ -195,25 +278,15 @@ Ext.define(&#39;amdaUI.StatisticsUI&#39;,
                     }
                 });
-                var ttStore = Ext.create('Ext.data.Store',
-                        {
-                            fields: ['name', 'hidden_id']
-                        });
-
                 this.timeSelector = new amdaUI.TimeSelectorUI({id: 'statisticsTimeSelector', flex: 1});
-                var store = Ext.create('Ext.data.Store',
-                        {
-                            fields: ['name', 'function']
-                        });
-
                 this.paramGrid = Ext.create('Ext.grid.Panel',
                         {
                             title: 'Select Parameter & Apply Function',
                             selType: 'rowmodel',
                             flex: 2,
                             //			height :250,
-                            store: store,
+                            store: Ext.create('Ext.data.Store', {model: 'amdaModel.StatisticParam'}),
                             columns: [
                                 {xtype: 'rownumberer'},
                                 {
@@ -408,7 +481,7 @@ Ext.define(&#39;amdaUI.StatisticsUI&#39;,
                                     items: [this.paramGrid],
                                     fbar: [{
                                             type: 'button',
-                                            text: 'Generate Catalog',
+                                            text: 'Generate',
                                             scope: this,
                                             handler: function ()
                                             {
@@ -428,7 +501,16 @@ Ext.define(&#39;amdaUI.StatisticsUI&#39;,
                                                 this.paramGrid.store.removeAll();
                                                 this.timeSelector.TTGrid.store.removeAll();
                                             }
-                                        }]
+                                        },
+                                        {
+                                            text: 'Save',
+                                            id: 'save-statistic',
+                                            scope: this,
+                                            handler: function () {
+                                                this.saveRequest();
+                                            }
+                                        }
+                                    ]
                                 },
                                 {
                                     xtype: 'form',
@@ -31,7 +31,7 @@ Ext.define(&#39;amdaUI.TabResultUI&#39;, {
 						break;	   
 			case 'download': var title = 'Download Results';
 						break;
-			case 'statistics': var title = 'Statistics Results';
+			case 'statistic': var title = 'Statistics Results';
 						break;
 			default:
 		}
@@ -319,7 +319,7 @@ Ext.define(&#39;amdaUI.ResultItem&#39;, {
 			case 'condition' : 
 				Ext.apply(this, configTT);	
 				break;
-			case 'statistics' : 
+			case 'statistic' : 
 				Ext.apply(this, configCat);	
 				break;
 			case 'request' : 		      
@@ -17,13 +17,13 @@ Ext.define(&#39;amdaUI.TimeTableOperationUI&#39;, {
 		this.callParent(arguments);
 	},
-	addTT : function(newTTName,newTTid) {
+	addTT : function(newTTName,newTTid,nodeType) {
 		// search for an existing record in store with this unique name
         var existingIndex = this.TTGrid.store.findExact( 'name', newTTName);
         // if no corresponding TT found
         if (existingIndex == -1){
             // adding the time table to the TTGrid of TT download 
-            var r = Ext.create('amdaModel.TTobject', { id: newTTid, name: newTTName });
+            var r = Ext.create('amdaModel.TTobject', { id: newTTid, name: newTTName, nodeType: nodeType});
             this.TTGrid.store.insert(this.TTGrid.store.getCount(),r);   
         }  
 	}, 
@@ -125,7 +125,7 @@ Ext.define(&#39;amdaUI.TimeTableOperationUI&#39;, {
 		          var timeTableOperationModule = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.tt_op.id);
 		          if (!timeTableOperationModule)
 		        	  return false;
-		          timeTableOperationModule.getUiContent().addTT(data.records[0].get('text'),data.records[0].get('id'));
+		          timeTableOperationModule.getUiContent().addTT(data.records[0].get('text'),data.records[0].get('id'), data.records[0].get('nodeType'));
 		          return true;
 		        }
 		    });
@@ -173,7 +173,7 @@ Ext.define(&#39;amdaUI.TimeTableOperationUI&#39;, {
 			            	   		var ttids = [];
 			            	   		var name= "";
 			            	   		Ext.each(tts, function(tt, index) {
-			            	   			ttids[index] = tt.data.id;
+			            	   			ttids[index] = {'id': tt.data.id, 'nodeType' : tt.data.nodeType};
 			            	   			name = name + tt.data.name + " ";
 			            	   		});
 			            	   		// Time table's name and history field
@@ -235,7 +235,7 @@ Ext.define(&#39;amdaUI.TimeTableOperationUI&#39;, {
 				            	   	var tts = this.TTGrid.getStore().data.items;
 			            	   		var ttids = [];
 			            	   		Ext.each(tts, function(tt, index) {
-			            	   			ttids[index] = tt.data.id;
+			            	   			ttids[index] = {'id': tt.data.id, 'nodeType': tt.data.nodeType};
 			            	   		});
 			            	   		// Time table's name and history field
 			            	   		var newTabName = tts[0].data.name + "_I_" + tts[1].data.name;
@@ -10,7 +10,7 @@ class AmdaAction
 										'remoteSimuParam' => 'RemoteParams.xml', 'derivedParam' => 'WsParams.xml', 'myDataParam' => 'WsParams.xml',
 										'timeTable' => 'Tt.xml', 'catalog' => 'Tt.xml', 'alias' => 'Alias.xml',
 										'myData' => 'Files.xml',
-										'request' => 'Request.xml', 'condition' => 'Request.xml', 'download' => 'Request.xml',
+										'request' => 'Request.xml', 'condition' => 'Request.xml', 'download' => 'Request.xml', 'statistic' => 'Request.xml',
 										'bkgWorks' => 'jobs.xml');
 	private $user, $amdaStat;
@@ -152,6 +152,7 @@ class AmdaAction
 					$isSimulation = false;
 					$rank = null;
 					$skip = FALSE;
+					$last_update = 0;
 					switch ($nodeType)
 					{
@@ -172,8 +173,13 @@ class AmdaAction
 						case 'download':
 						case 'condition':
 						case 'request':
+						case 'statistic':
 							$objectMgr = new RequestMgr($nodeType);
 							$info = $objectMgr->getObjectInfo($id);
+							$obj_info = $objectMgr->getObject($id);
+							if (!empty($obj_info) && !empty($obj_info->last_update)) {
+								$last_update = $obj_info->last_update;
+							}
 							break;
 						case 'timeTable':
@@ -357,7 +363,7 @@ class AmdaAction
 										$info .=  "<br/><b>Plot Only!!!</b>";
 								}
-								$childrenToReturn[] = array('text' => $name, 'id' => $id,'nodeType' => $nodeType,  'info' => $info,
+								$childrenToReturn[] = array('text' => $name, 'id' => $id,'nodeType' => $nodeType,  'info' => $info, 'last_update' => $last_update,
 									'leaf' => false, 'help' => $help, 'disable' => $disable, 'rank' => $rank, 'timeRestriction' => $timeRestriction);
 							}
 						break;
@@ -577,7 +583,7 @@ class AmdaAction
 						$childrenToReturn[] = array('text' => $name, 'id' => $id, 'nodeType' => $nodeType, 'info' => $info,
 													'help' => $help, 'leaf' => $isLeaf, 'isParameter' => $isParameter, 'dim_1' => $dim_1, 'dim_2' => $dim_2,
 													'component_info' => isset($component_info) ? $component_info : NULL,
-													'iconCls' => isset($iconCls) ? $iconCls : NULL );
+													'iconCls' => isset($iconCls) ? $iconCls : NULL, 'last_update' => $last_update );
 					}
 				}
 				// if $childrenToReturn we have to return []
@@ -735,6 +741,7 @@ class AmdaAction
 			case 'condition' :
 			case 'request' :
 			case 'download' :
+			case 'statistic':
 				$objectMgr = new RequestMgr($nodeType);
 				break;
 			case 'bkgWorks' :
@@ -769,6 +776,7 @@ class AmdaAction
 			case 'condition' :
 			case 'request' :
 			case 'download' :
+			case 'statistic' :
 				$objectMgr = new RequestMgr($obj->nodeType);
 				break;
 			case 'alias' :
@@ -808,6 +816,7 @@ class AmdaAction
 		  case 'condition' :
 		  case 'request' :
 		  case 'download' :
+		  case 'statistic' :
 			   $objectMgr = new RequestMgr($obj->nodeType);
 			   break;
 		  case 'alias' :
@@ -842,6 +851,7 @@ class AmdaAction
 			case 'condition' :
 			case 'request' :
 			case 'download' :
+			case 'statistic' :
 				$objectMgr = new RequestMgr($obj->nodeType);
 				break;
 			case 'alias' :
@@ -873,6 +883,7 @@ class AmdaAction
 			case 'condition' :
 			case 'request' :
 			case 'download' :
+			case 'statistic' :
 				$objectMgr = new RequestMgr($obj->nodeType);
 				break;
 			default:
@@ -900,6 +911,7 @@ class AmdaAction
 			case 'condition' :
 			case 'request' :
 			case 'download' :
+			case 'statistic' :
 				$objectMgr = new RequestMgr($obj->nodeType);
 				break;
 			default:
@@ -7,13 +7,13 @@
 class AmdaStats {
 	public $statXml;
-	public $tasks = array('plot', 'mining', 'print', 'statistics');
+	public $tasks = array('plot', 'mining', 'print', 'statistic');
 	public $tasksWs = array('ws_print', 'ws_plot');
 	public $tasksAdd = array('ttoper', 'samp', 'upload', 'create', 'images');
 	public $usersToExclude = array('bouchemit');
 	public $success = true;
 	private $user = null;
-	private $task = array('request'=>'plot','condition'=>'mining', 'download'=>'print','statistics'=>'statistics',
+	private $task = array('request'=>'plot','condition'=>'mining', 'download'=>'print','statistic'=>'statistics',
 				'getparameter'=>'ws_print', 'getdataset' => 'ws_print', 'getorbites' => 'ws_print', 'getplot' => 'ws_plot');
 	public function __construct($user) {
@@ -9,7 +9,7 @@ class RequestMgr extends AmdaObjectMgr
 	public $obj;
 	protected $type;
 	protected $jobXml, $jobXmlName;
-	protected $types = array('request', 'download', 'condition');	  	
+	protected $types = array('request', 'download', 'condition', 'statistic');	  	
 	function __construct($type) 
 	{
@@ -38,6 +38,10 @@ class RequestMgr extends AmdaObjectMgr
 		{
 			$this->id_prefix = 'down_';
 		}
+		else if ($type == 'statistic')
+		{
+			$this->id_prefix = 'stat_';
+		}
 		else 
 		{
 			$this->id_prefix = 'cond_';			
@@ -298,7 +302,7 @@ class RequestMgr extends AmdaObjectMgr
 				if (count($argsTab) > 0) $args[] = $argsTab;
 				break;
-			case 'statistics' :
+			case 'statistic' :
 				return array('success' => true);
 				break;
 			default :
@@ -421,6 +425,32 @@ class RequestMgr extends AmdaObjectMgr
 					$info .= "Empty";
 				}
 				break;
+			case 'statistic':
+				$info .= "Statistic: ";
+				$functions_list = array();
+				if (!empty($obj->parameter)) {
+					foreach ($obj->parameter as $param) {
+						if (!array_key_exists($param->function, $functions_list)) {
+							$functions_list[$param->function] = array();
+						}
+						if (!in_array($param->paramid, $functions_list[$param->function])) {
+							$functions_list[$param->function][] = $param->paramid;
+						}
+					}
+					if (!empty($functions_list)) {
+						foreach ($functions_list as $func => $params) {
+							$info .= "<br/>";
+							$info .= "<b>" . $func . ":</b> " . implode(', ', $params);
+						}
+					}
+					else {
+						$info .= "Empty";
+					}
+				}
+				else {
+					$info .= "Empty";
+				}
+				break;
 			default:
 				$info .= "<b>ERROR:</b> Unknown request type";
 		}
@@ -359,7 +359,7 @@ class TimeTableMgr extends AmdaObjectMgr
 		$intervals = 0;
 		for ($iId = 0; $iId < count($obj->ids); $iId++) {
-			$table[$iId] = $this->loadIntervalsFromObject($obj->ids[$iId]);
+			$table[$iId] = $this->loadIntervalsFromObject($obj->ids[$iId]->id, $obj->ids[$iId]->nodeType);
 			for ($jId = 0; $jId < count($table[$iId]['intervals']); $jId++) {
 				$interval[$iId][$jId][0] = $table[$iId]['intervals'][$jId]['start'];
 				$interval[$iId][$jId][1] = $table[$iId]['intervals'][$jId]['stop'];
@@ -559,7 +559,7 @@ class TimeTableMgr extends AmdaObjectMgr
 	{
 		$intervals = 0;
 		for ($iId = 0; $iId < count($obj->ids); $iId++) {
-			$table[$iId] = $this->loadIntervalsFromObject($obj->ids[$iId]);
+			$table[$iId] = $this->loadIntervalsFromObject($obj->ids[$iId]->id, $obj->ids[$iId]->nodeType);
 			for ($jId = 0; $jId < count($table[$iId]['intervals']); $jId++) {
 				$interval[$iId][$jId][0] = $table[$iId]['intervals'][$jId]['start'];
 				$interval[$iId][$jId][1] = $table[$iId]['intervals'][$jId]['stop'];