Add modif. time for data mining (#7063) + Add the possibility to resample a data…

… mining request under a ref. parameter (#7018)

Add modif. time for data mining (#7063) + Add the possibility to resample a data…
… mining request under a ref. parameter (#7018)
Benjamin Renard
1 parent ca4c6ce0
Showing 4 changed files with 143 additions and 23 deletions Show diff stats
js/app/models/Search.js
js/app/views/SearchUI.js
php/classes/DerivedParamMgr.php
php/classes/RequestMgr.php
@@ -24,10 +24,13 @@ Ext.define(&#39;amdaModel.Search&#39;, {
 	      {name: 'sampling', type: 'int', defaultValue: '600'},
 	      {name: 'gap', type: 'int', defaultValue: '5'},
 	      {name: 'description', type: 'string'},
-	      {name: 'expression', type: 'string'}	      
+	      {name: 'expression', type: 'string'},    
+              {name: 'last_update', type: 'int', defaultValue: 0},
+              {name: 'sampling_mode', type: 'string', defaultValue: 'timestep'}, // 'timestep' or 'refparam'
+              {name: 'reference_param', type: 'string'} // only used if 'sampling_mode' is 'refparam'
 	],
  
-	propertiesToCopy : 'id,name,sampling,gap,description,expression',
+	propertiesToCopy : 'id,name,sampling,gap,description,expression,last_update,sampling_mode,reference_param',
  
 	getJsonValues : function(hasId){
  
@@ -38,6 +41,8 @@ Ext.define(&#39;amdaModel.Search&#39;, {
         myValues.name = this.get('name');
         myValues.sampling = this.get('sampling');
         myValues.gap = this.get('gap');
+	myValues.sampling_mode = this.get('sampling_mode');
+	myValues.reference_param = this.get('reference_param');
         myValues.description = this.get('description');
         myValues.expression = this.get('expression').replace(/\n/g," ");;
         myValues.timesrc =  this.get('timesrc');                         
@@ -73,4 +78,4 @@ Ext.define(&#39;amdaModel.Search&#39;, {
         return myValues;
 	}
  
-});
 \ No newline at end of file
+});
@@ -298,9 +298,9 @@ Ext.define(&#39;amdaUI.SearchUI&#39;,
 		this.fieldName = new Ext.form.field.Text({
 				labelAlign: 'top', itemId: 'formParamName',
 				fieldLabel: 'Request Name',
+				labelPad: 0,
 				name : 'name',
-				width: 375,
-				colspan: 3,
+				width: 165,
 				allowBlank : false,
 				stripCharsRe: /(^\s+|\s+$)/g,
 				validateOnChange: false,
@@ -315,6 +315,7 @@ Ext.define(&#39;amdaUI.SearchUI&#39;,
 		this.constructionField = new extensions.SelectableTextArea(
 		{
 				labelAlign: 'top',
+				labelPad: 0,
 				itemId: 'formSearchCondition',
 				fieldLabel:'<img amda_clicktip="constructParameter" src="js/resources/images/16x16/info_mini.png"/>&nbsp;Data Mining Condition',
 				allowBlank : false, blankText : 'Condition expression is required',
@@ -322,7 +323,7 @@ Ext.define(&#39;amdaUI.SearchUI&#39;,
 				validateOnChange: false,
 				validateOnBlur: false,
 				validator : this.isBalanced,
-				flex : 2.5,
+				flex : 2,
 				listeners :
 				{
 					render : function(o,op)
@@ -421,6 +422,90 @@ Ext.define(&#39;amdaUI.SearchUI&#39;,
 				}
 		});
  
+		var samplingmode_store = new Ext.data.ArrayStore({
+			fields: ['id', 'name'],
+			data: [
+				['timestep', 'Time Step'],
+				['refparam', 'Ref. Parameter']
+			]
+		});
+
+		this.timeStepField = new Ext.form.NumberField({
+			fieldLabel: '<img amda_clicktip="resamplingStep" src="js/resources/images/16x16/info_mini.png"/>&nbsp;Time Step (sec)',
+			labelAlign: 'top',
+			labelPad: 0,
+			blankText : 'Time Step is required',
+			name : 'sampling',
+			minValue : 0.001,
+			decimalPrecision : 10,
+			hideTrigger: true,
+			width: 165,
+			validateOnBlur: false
+		});
+
+		this.refParamField = new Ext.form.TextField({
+			fieldLabel: '<img amda_clicktip="resamplingRefParam" src="js/resources/images/16x16/info_mini.png"/>&nbsp;Reference Param.',
+			labelAlign: 'top',
+			labelPad: 0,
+			name : 'reference_param',
+			width: 165,
+			hidden: true,
+			listeners: {
+				afterrender: function(field, eOpts ){
+					var paramTarget = new Ext.dd.DropTarget(field.el.dom,
+						{
+							ddGroup: 'explorerTree',
+							notifyEnter: function(ddSource, e, data) {
+							},
+							notifyDrop: function(ddSource, e, data) {
+								var selectedRecord = ddSource.dragData.records[0];
+								switch (selectedRecord.$className) {
+									case 'amdaModel.LocalParamNode'   :
+									case 'amdaModel.RemoteParamNode'  :
+									case 'amdaModel.RemoteSimuParamNode'  :
+										if (!selectedRecord.get('isParameter') || selectedRecord.get('disable'))
+											return false;
+										if (selectedRecord.get('alias') != "" )
+											field.setValue("#"+selectedRecord.get('alias'));
+										else
+											field.setValue(selectedRecord.get('id'));
+										return true;
+									case 'amdaModel.AliasNode'        :
+										if (!selectedRecord.isLeaf())
+											return false;
+										field.setValue("#"+selectedRecord.get('text'));
+										return true;
+									case 'amdaModel.DerivedParamNode' :
+										if (!selectedRecord.isLeaf())
+											return false;
+										field.setValue("ws_"+selectedRecord.get('text'));
+										return true;
+									case 'amdaModel.MyDataParamNode' :
+										if (!selectedRecord.isLeaf())
+											return false;
+										field.setValue("wsd_"+selectedRecord.get('text'));
+										return true;
+									default:
+										return false;
+								}
+								return true;
+							}
+						}
+					);
+				},
+				scope: this
+			}
+		});
+
+		this.samplingDefContainer = new Ext.container.Container({
+			border: false,
+			items: [
+				this.timeStepField,
+				this.refParamField
+			],
+			width: 165
+		});
+
 		this.formPanel = new Ext.form.Panel(
 		{
 				region : 'center',  
@@ -430,7 +515,7 @@ Ext.define(&#39;amdaUI.SearchUI&#39;,
 				layout : { 
 					type : 'vbox',
 					align: 'stretch',
-					defaultMargins : { top:15, bottom:0, left: 15, right:15}
+					defaultMargins: {top: 5, left:5, bottom:10, right:10}
 				},
 				id: 'formSearch',
 				defaults: {
@@ -455,29 +540,57 @@ Ext.define(&#39;amdaUI.SearchUI&#39;,
 							},
 							defaultType: 'textfield',
 							defaults: {
-								labelAlign: 'top'
+								labelAlign: 'top',
+								labelPad: 0
 							},
 							items: [   
 								this.fieldName,
+								{ xtype: 'component', width: 45},
 								{
-									xtype :'displayfield', width: 165,
-									hideLabel: true, 
-									value: '<b>Averaging/Interpolation</b>&nbsp;<img amda_clicktip="resamplingStep" src="js/resources/images/16x16/info_mini.png"/>'
+									fieldLabel: 'Last modification',
+									xtype: 'displayfield',
+									name : 'last_update',
+									width: 165,
+									renderer: function(value, field) {
+										var tpl = new Ext.XTemplate('<p style="font-style:italic;color:gray;margin:0;">{date}</>');
+										var mod_date = 'Not saved';
+										if (value > 0)
+											mod_date = Ext.Date.format(new Date(value*1000), "Y-m-d\\TH:i:s");
+										return tpl.apply({date: mod_date});
+									},
+								},
+								{
+                                                                	xtype: 'combo',
+									fieldLabel: 'Sampling mode',
+									name: 'sampling_mode',
+									queryMode: 'local',
+									editable: false,
+									valueField: 'id',
+									displayField: 'name',
+									store: samplingmode_store,
+									value: samplingmode_store.first(),
+									width: 165,
+									listeners: {
+										change: function(field, value) {
+											this.timeStepField.setVisible(value != 'refparam');
+											this.refParamField.setVisible(value == 'refparam');
+										},
+										scope: this
+									}
+								},
+								{
+									xtype:'component', width: 45
 								},
-								{ xtype: 'component', width: 45 },
+								this.samplingDefContainer,
 								{
 									xtype :'displayfield', width: 165,
-									hideLabel: true, 
-									value: '<b>Data Gap</b>&nbsp;<img amda_clicktip="dataGap" src="js/resources/images/16x16/info_mini.png"/>'
+									hideLabel: true,
+									fieldStyle: 'display:inline-block;text-align:right',
+									value: '<b style="top: 50%;position: relative;">Data Gap&nbsp;<img amda_clicktip="dataGap" src="js/resources/images/16x16/info_mini.png"/></b>'
 								},
 								{
-									xtype: 'numberfield', name: 'sampling',
-									allowBlank : false, blankText : 'Time Step is required',
-									fieldLabel: 'Time Step (sec)', minValue : 0.001,
-									labelAlign: 'top', hideTrigger: true, width: 165,
-									validateOnBlur: false
+									xtype:'component', width: 45
 								},
-								{ xtype: 'component', width: 45 },
 								{
 									xtype: 'numberfield',  name: 'gap',
 									fieldLabel: 'if no data for interval', minValue : 1,
@@ -324,7 +324,6 @@ class DerivedParamMgr extends AmdaObjectMgr
  
 		$attributesToReturn['id'] = $objToGet->getAttribute('xml:id');
 		$attributes = $objToGet -> childNodes;
-		$last_update = 0;
 		foreach($attributes as $attribute) 
 		{
 			if ($attribute->tagName === "buildchain") $attributesToReturn[$attribute->tagName] = $this->setAlias($attribute->nodeValue);
@@ -132,7 +132,9 @@ class RequestMgr extends AmdaObjectMgr
 			}    
 		}      
 		//if Start Time - Stop Time
-		if (!$obj->timeTables) $obj =  $this->convertTime($obj); 
+		if (!$obj->timeTables) $obj =  $this->convertTime($obj);
+		if (empty($obj->last_update))
+			$obj->last_update = filemtime(USERREQDIR.$id);
  
 		return  $obj;
 	}
@@ -192,6 +194,7 @@ class RequestMgr extends AmdaObjectMgr
  
 		$this->descFileName = USERREQDIR.$this->id;
 		$p->id = $this->id;
+		$p->last_update = time(); 
 		// save request as json
 		$file = fopen($this->descFileName, 'w');
 		fwrite($file, json_encode($p));
@@ -199,7 +202,7 @@ class RequestMgr extends AmdaObjectMgr
  
 		$this -> addToContent($p, $folder);
  
-		return array('id' => $this->id, 'info' => $info) + $additional;
+		return array('id' => $this->id, 'info' => $info, 'last_update' => $p->last_update) + $additional;
 	}
  
 	public static function checkRequest($obj)