Merge remote-tracking branch 'origin/master' into webservices

Elena.Budnik
2 parents 77354e6d 52cc0f17
Showing 16 changed files with 157 additions and 116 deletions Show diff stats
help/ttTimeFormat
js/app/controllers/ExplorerModule.js
js/app/controllers/JobsMgr.js
js/app/controllers/StatisticsModule.js
js/app/models/Stats.js
js/app/views/ExplorerUI.js
js/app/views/PlotComponents/PlotBaseSerieForm.js
js/app/views/PlotComponents/PlotSpectroForm.js
js/app/views/StatisticsUI.js
js/app/views/UploadPanelUI.js
js/resources/css/amda.css
js/resources/images/16x16/align_left.png
js/resources/images/trash.png
php/classes/AmdaAction.php
php/classes/TimeTableMgr.php
update_amda/cp2amda
@@ -0,0 +1,15 @@
+<h3>ASCII Time Table Time Format</h3>
+<i>Year Month Day Hour Minute Second</i>  => with different separators ("-", ":", "/", " ") used in a standard way.
+<br/><i>Milliseconds</i> are not taken in to account.
+<br/><br/>
+Examples:
+  <ul>
+    <li> 2001-01-01T00:00:00
+    <li> 2001-01-01 00:00:00
+    <li> 2001 01 01 00 00 00
+    <li> 2001/01/01 00:00:00
+  </ul> 
+<br/>
+If you plan to use uploaded time table to work with data note that :<br/>
+<b>Valid time range: 1970-01-01 - 2038-01-19</b> 
+
@@ -105,29 +105,19 @@ Ext.define(&#39;amdaDesktop.ExplorerModule&#39;,
               region: 'center'
             },
             {
-              xtype: 'label',
-              text: 'Log:',
-              margin: '10 0 -5 0',
-              region: 'south',
-              height: 20
-            },
-            {
               xtype: 'panel',
+              title: 'Log',
               id: 'LogPanel',
+              collapsible: true,
+              iconCls: 'icon-align-left',
               region: 'south',
-              height: 150,
               split: true,
-              layout: {
-                type: 'vbox',
-                align: 'stretch',
-                autoSize: true
-              },
-              autoScroll: true,
+              height: 150,
               stateful: true,
               stateId: 'LogPanel',
-              buttons: [{
-                scope: this,
-                text: 'Clear',
+              tools: [{
+                type: 'trash',
+                tooltip: 'Clear logs',
                 handler: function () {
                   var logPanel = win.items.get('LogPanel')
                   logPanel.removeAll()
@@ -187,6 +187,7 @@ Ext.define(&#39;amdaDesktop.JobsMgr&#39;, {
                 // AKKA - use processid to find job
                 nodeToMove = jobRootNode.findChild('id', job.id, false)
                 nodeToMove.set('status', job.status)
+                nodeToMove.set('info', job.info)
  
                 // TODO check if really job.status
  
@@ -43,14 +43,12 @@ Ext.define(&#39;amdaDesktop.StatisticsModule&#39;, {
  
 	 saveState: function() {
             var uiContent = this.getUiContent();               
-            var form = uiContent.down('form').getForm();
-            var values = form.getValues();                
-            //   Ext.state.Manager.set(this.id + '_form', values);
+            var form = uiContent.formPanel.items.items[1].getForm();
+            var values = form.getValues();
             Ext.state.Manager.set('timeinterval', {'startDate' : values.startDate,'stopDate' : values.stopDate });
     },
  
-    getState : function() {            
-        //   return Ext.state.Manager.get(this.id + '_form'); 
+    getState : function() {
         return Ext.state.Manager.get('timeinterval'); 
     }
  
@@ -22,8 +22,8 @@ Ext.define(&#39;amdaModel.Stats&#39;, {
 			values.id = this.get('id');
 		}
  
-		values.timesrc =  this.get('timesrc');
-		values.name = 'test'; //this.get('name');
+		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');
@@ -506,6 +506,9 @@ Ext.define(&#39;amdaUI.ExplorerUI&#39;, {
 				},
  
 				itemcontextmenu: function(view, rec, item, index, e){
+					// Add record to selection model
+					view.ownerCt.getSelectionModel().select(rec);
+
 					// block other events
 					e.stopEvent();
  
@@ -90,7 +90,7 @@ Ext.define(&#39;amdaPlotComp.PlotBaseSerieForm&#39;, {
 		    	me.object.set('serie-yaxis', value);
 		    	me.crtTree.refresh();
 		    }),
-		    this.addStandardFieldSet('Y Values range', '', this.getValuesRangeItems()),
+		    this.addStandardFieldSet('Min/Max thresholds', '', this.getValuesRangeItems()),
 		    this.addStandardParamDropTarget('serie-colored-param', 'Colored Parameter'),
 		    this.addStandardFieldSet('Lines', 'serie-lines-activated', this.addStandardLineItems('serie-lines')),
 		    this.addStandardFieldSet('Symbols', 'serie-symbols-activated', this.addStandardSymbolsItems('serie-symbols')),
@@ -30,7 +30,7 @@ Ext.define(&#39;amdaPlotComp.PlotSpectroForm&#39;, {
 		    	me.object.set('spectro-yaxis', value);
         		me.crtTree.refresh();
 		    }),
-		    this.addStandardFieldSet('Values range', '', this.getValuesRangeItems())
+		    this.addStandardFieldSet('Min/Max thresholds', '', this.getValuesRangeItems())
 		];
 	}
 });
 \ No newline at end of file
@@ -38,8 +38,7 @@ Ext.define(&#39;amdaUI.StatisticsUI&#39;,
 	loadObject : function()
 	{
 		// load object into form	
-		var basicForm = this.formPanel.items.items[0].getForm();
-		
+		var basicForm = this.formPanel.items.items[1].getForm();
 		basicForm.loadRecord(this.object);
  
 	},
@@ -101,7 +100,21 @@ Ext.define(&#39;amdaUI.StatisticsUI&#39;,
 	{ 
 		this.timeSelector.addTT(TTname, TTid); ; 	 
 	},
-	 
+	
+	/**
+	* Set Start-Stop from parameter info (Local & MyData)
+	*/ 
+	setTimeFromData : function(obj) {
+		if (!obj.start || !obj.stop)
+			return;
+		
+		var dateStart = new Date(obj.start.replace(/[T|Z]/g,' ').replace(/\-/g,'\/')); 
+		var dateStop = new Date(obj.stop.replace(/[T|Z]/g,' ').replace(/\-/g,'\/')); 
+		
+		this.formPanel.items.items[1].getForm().setValues({ startDate : dateStart, stopDate : dateStop });
+		this.timeSelector.intervalSel.updateDuration();
+	}, 
+	
 	generateCatalog : function()
 	{	     
 		var module = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.statistics.id);
@@ -119,7 +132,7 @@ Ext.define(&#39;amdaUI.StatisticsUI&#39;,
 		var updateStatus = true;
  
 		var formValues = basicForm.getValues();
-		//this.object.set('name',formValues.name);
+		this.object.set('name',this.fieldName.getValue());
 		this.object.set('description',formValues.description);
  
 		var recs = this.paramGrid.getStore().getNewRecords();
@@ -207,7 +220,7 @@ Ext.define(&#39;amdaUI.StatisticsUI&#39;,
 			fields: [ 'name', 'hidden_id']	
 		});
  
-		this.timeSelector = new amdaUI.TimeSelectorUI({id: 'statisticsTimeSelector', height : 160}); 
+		this.timeSelector = new amdaUI.TimeSelectorUI({id: 'statisticsTimeSelector', flex:1}); 
  
 		var store = Ext.create('Ext.data.Store', 
 			{
@@ -218,8 +231,8 @@ Ext.define(&#39;amdaUI.StatisticsUI&#39;,
 			{ 
 				title: 'Select Parameter & Apply Function',
 				selType : 'rowmodel',
-	//	      flex: 2,
-				height :250,
+				flex: 2,
+	//			height :250,
 				store : store, 
 				columns: [
 					{ xtype: 'rownumberer' },
@@ -362,36 +375,20 @@ Ext.define(&#39;amdaUI.StatisticsUI&#39;,
 		this.formPanel =  Ext.create('Ext.form.Panel', 
 		{ 
 			region: 'center',	     
-			layout:  'hbox',
+			layout: {
+				type: 'hbox',
+				pack: 'start',
+				align: 'stretch'
+			},
 			//bodyStyle: {background : '#dfe8f6'},
 			defaults: { bodyStyle: {background : '#dfe8f6'}, padding : '3'},
 			fieldDefaults: { labelWidth: 80, labelAlign : 'top' },
-			items: [ 	  		    
-			{  
+			items: [ {  
 				xtype: 'form',
 				flex : 1,			    
 				layout: {type: 'vbox', pack: 'start', align: 'stretch'},
-				items : [
-					this.paramGrid,
-					this.timeSelector
-				]
-			},
-			{            
-				xtype: 'form', 
-				title: 'Additional Information', 
-				flex : 1,
-				layout: {type: 'vbox', pack: 'start', align: 'stretch', padding : '3'},
-				items : [
-					this.fieldName,
-					{
-						xtype: 'textarea',
-						name: 'description',
-						fieldLabel: 'Description', 			
-						height: 200
-					}   
-				],
-				fbar:[
-					{   
+				items : [ this.paramGrid ],
+					fbar:[ {   
 						type: 'button',			   
 						text: 'Generate Catalog',
 						scope : this,
@@ -399,8 +396,7 @@ Ext.define(&#39;amdaUI.StatisticsUI&#39;,
 						{
 							// update object with user's values
 							// if the return is true (object had been updated)
-							if(this.updateObject()){ 
-								this.updateObject();
+							if (this.updateObject()){ 
 								this.generateCatalog();			   			 
 							}
 						}
@@ -409,9 +405,31 @@ Ext.define(&#39;amdaUI.StatisticsUI&#39;,
 						type: 'button',
 						text: 'Reset',
 						scope : this,
-						handler: function() {}
+						handler: function() {
+							this.formPanel.getForm().reset();
+							this.paramGrid.store.removeAll();
+							this.timeSelector.TTGrid.store.removeAll();
+						}
 					}]
-			}]  
+				},
+				{            
+					xtype: 'form', 
+					title: 'Additional Information', 
+					flex : 1,
+					trackResetOnLoad: true,  
+					layout: {type: 'vbox', pack: 'start', align: 'stretch', padding : '3'},
+					items : [
+						this.fieldName,
+						{
+							xtype: 'textarea',
+							name: 'description',
+							fieldLabel: 'Description', 			
+							height: 125
+						},
+						this.timeSelector 
+					]
+				}
+			]  
 		}); 
  
 		var myConf = {
@@ -19,7 +19,7 @@ Ext.define(&#39;amdaUI.UploadPanelUI&#39;, {
 	isFile : true,
 	isTimeTable : false,
 	tmpNode : null,
-						
+
 	constructor: function(config) 
 	{  
 		this.init(config);
@@ -310,16 +310,9 @@ Ext.define(&#39;amdaUI.UploadPanelUI&#39;, {
 		{		
 			var title = 'Time Table';
 			var items = [
-				{ boxLabel: 'ASCII', name: 'ttfrmt', inputValue: 'ASCII', checked: true,
-						listeners: {
-								change: function (cb, nv, ov) {
-									if (nv) Ext.getCmp('tf_tt').show(); 
-									else Ext.getCmp('tf_tt').hide();  							 						  
-								}
-						} 
-				},
-				{ boxLabel: 'VOTable', name: 'ttfrmt', inputValue: 'VOT'}];
-						
+				{ boxLabel: 'ASCII&nbsp;<img amda_clicktip="ttTimeFormat" style="vertical-align:bottom" src="js/resources/images/16x16/info_mini.png"', name: 'ttfrmt',  inputValue: 'ASCII', checked: true},
+				{ boxLabel: 'VOTable', name: 'ttfrmt', inputValue: 'VOT'}
+			];
 			var timeFormatId = 'tf_tt'; 
 			this.formatId = 'nsf_tt';
 			this.localUploadId = 'form-uploadtt';
@@ -467,12 +460,11 @@ Ext.define(&#39;amdaUI.UploadPanelUI&#39;, {
 				}
 			}
 		};	 
-		var isCatalog = !(this.isFile || this.isTimeTable);
  
 		var timeFormat = Ext.create('Ext.form.FieldSet', { 
 			id: timeFormatId, 
 			title: 'Time Settings',	
-			hidden : isCatalog,
+			hidden : !this.isFile,
 			items : [
 			{
 				xtype: 'radiogroup',
@@ -104,6 +104,10 @@
     background-image:url( ../images/16x16/workspaces.png ) !important;
 }
  
+.icon-align-left {
+    background-image: url(../images/16x16/align_left.png);
+}
+
 .icon-delete {
     background-image:url( ../images/icons/fam/delete.gif ) !important;
 }
@@ -121,6 +125,14 @@ background-image: url(../images/small_cancel_centered.png);
 }
  
 /**
+Custom tool typ icons
+ */
+
+.x-tool-trash {
+    background-image: url(../images/trash.png) !important;
+}
+
+/**
  * RangeMenu Styles
  **/
  
@@ -489,6 +501,10 @@ p + p {
 	opacity: 1.0 !important;
 }
  
+#LogPanel-splitter-collapseEl {
+	display: none;
+}
+
 .epntap_grid .disabled_row {
 	color: gray;
 }
@@ -504,4 +520,4 @@ p + p {
 .epntap_cell {
 	padding: 4px;
 	white-space: normal;
-}
 \ No newline at end of file
+}
@@ -58,7 +58,6 @@ class AmdaAction
 	*   $obj = { id: node.id,  nodeType: node.nodeType }
 	*/
 	public function getTree($obj) {
-
 		$node = $obj->node;
  
 		$nodeType = $obj->nodeType;
@@ -102,6 +101,7 @@ class AmdaAction
 					$xmlName = SHAREDPATH.'/SharedObjectTree.xml';
 					break;
 				case 'bkgWorks':
+					// data/<user>/JOBS/jobs.xml
 					$xmlName = USERJOBDIR.$this->xmlFiles[$nodeType];
 					break;
 				case 'source':
@@ -144,8 +144,6 @@ class AmdaAction
 					$id =  $child->getAttribute('xml:id');
 					$name = $child->getAttribute('name');
 					$help = $child->getAttribute('att');
-					if ($child->hasAttribute('dataStart')) $dataStart = $child->getAttribute('dataStart');
-					if ($child->hasAttribute('dataStop')) $dataStop = $child->getAttribute('dataStop');
  
 					$specialNode = false;
 					$isParameter = false;
@@ -158,12 +156,17 @@ class AmdaAction
 					{
 						case 'bkgWorks':
 							$specialNode = true;
-							$status = $child->getAttribute('status');
-							//     if ($status == 'done') continue;
-							$childrenToReturn[] = array('text' => $name, 'id' => $id,'nodeType' => $nodeType, 'leaf' => $isLeaf,
-									'pid' => $child->getAttribute('pid'), 'status' => $status,
-									'jobType' => $child->getAttribute('jobType'), 'info' => $child->getAttribute('info'));
-						break;
+							$childrenToReturn[] = [
+								'text'     => $name,
+								'id'       => $id,
+								'nodeType' => $nodeType,
+								'leaf'     => $isLeaf,
+								'pid'      => $child->getAttribute('pid'),
+								'status'   => $child->getAttribute('status'),
+								'jobType'  => $child->getAttribute('jobType'),
+								'info'     => $child->getAttribute('info')
+							];
+							break;
  
 						case 'condition':
 							$objectMgr = new RequestMgr();
@@ -175,9 +178,8 @@ class AmdaAction
 						$objplot = $objectMgr->getObject($id);
 						for ($i=0; $i < count($objplot->children); $i++)
 						{
-							for ($j=0; $j < count($objplot->children[$i]->children); $j++)
-							{
-								$info = $info.' '.$objplot->children[$i]->children[$j]->name;
+							for ($j=0; $j < count($objplot->children[$i]->children); $j++) {
+								$info = $info.' . '.$objplot->children[$i]->children[$j]->name;
 							}
 						}
 						break;
@@ -846,7 +848,7 @@ class AmdaAction
 */
 	public function getJobs($obj = null)
 	{
-		$obj = (object) array();	
+		$obj = (object) array();
 		return $this->executeRequest($obj, FunctionTypeEnumClass::PROCESSRUNNINGINFO);
 	}
  
@@ -913,7 +915,6 @@ class AmdaAction
 		} catch (Exception $e) {
 			return array('success' => false, 'message' => 'Exception detected : '.$e->getMessage());
 		}
-		
 		return $res;
 	}
  
@@ -114,16 +114,6 @@ class TimeTableMgr extends AmdaObjectMgr
 					if ($key == 'created') {
 						$rootElement->appendChild($this->objectDom->createElement($key, $this->created));
 					}
-					/*else if ($key == 'intervals') {
-						$n_int = 0;
-						foreach ($value as $item) {
-							$newInterval = $this->objectDom->createElement('intervals');
-							$newInterval->appendChild($this->objectDom->createElement('start', $item->start));
-							$newInterval->appendChild($this->objectDom->createElement('stop', $item->stop));
-							$rootElement->appendChild($newInterval);
-							$n_int++;
-						}
-					}*/
 					// it is catalog 
 					else if ($key == 'parameters') {
 					$paramsElement = $this->setParamDescription($value);
@@ -161,28 +151,43 @@ class TimeTableMgr extends AmdaObjectMgr
 		$lines = file($tmp_file,FILE_SKIP_EMPTY_LINES);
 		$description="Uploaded Time Table".PHP_EOL; 
  
-		foreach ($lines as $line){  
-			if ($line[0] == '#') $description=$description.PHP_EOL.substr($line,1,-1);
+		$recordsNumber = count($lines);
+		$descNumber = 0;
+		
+		foreach ($lines as $line)
+		{  
+			if ($line[0] == '#') {
+				$description=$description.PHP_EOL.substr($line,1,-1);
+			}
 			else {
-				$date = explode(' ', preg_replace('!\s+!', ' ', $line));
+				$date = explode(' ', trim(preg_replace('!\s+!', ' ',$line)));
+				
 				if (!strtotime(trim($date[0]))) {
 					$description=$description.PHP_EOL.$line;
+					$descNumber++;
 					continue;
 				}
 				// check if it is ISO format
-				if (!isset($isIso)) $isIso = preg_match('/^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})$/', trim($date[0]));
+				if (!isset($isIso)) 
+					$isIso = preg_match('/^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})$/', trim($date[0]));
+					
 				if (!$isIso) {
-					if (count($date) == 2) {
-						$tempStartT = strtotime(trim($date[0]));
-						$tempStopT = strtotime(trim($date[1]));
-					}
-					else { // y-m-d h:m:s for example
-						$tempStartT = strtotime($date[0]." ".$date[1]);
-						$tempStopT = strtotime($date[2]." ".$date[3]);
-					}
+					// y-m-d h:m:s for example
+					$dateLength = count($date) / 2;
+
+					$tempStart = $date[0];
+					$tempStop = $date[$dateLength];
  
-					$startDate = date('Y-m-d\TH:i:s',$tempStartT);
-					$stopDate = date('Y-m-d\TH:i:s',$tempStopT);
+					if ($dateLength > 1) {
+						for ($i = 1; $i < $dateLength; $i++)
+							$tempStart.= $date[$i];	
+						
+						for ($i = $dateLength + 1; $i < $dateLength * 2; $i++)
+							$tempStop .= $date[$i];
+					}
+
+					$startDate = date('Y-m-d\TH:i:s',strtotime($tempStart));
+					$stopDate = date('Y-m-d\TH:i:s',strtotime($tempStop));
  
 					if (!$onlyDescription)
 							$attributesToReturn['intervals'][] = array('start' => $startDate, 'stop' => $stopDate); 
@@ -193,15 +198,16 @@ class TimeTableMgr extends AmdaObjectMgr
 				} 
 			}
 		}
-	  	   	  	   
+      if ( $recordsNumber == $descNumber )
+			$description = "Looks like we can not read your time format...".PHP_EOL.$description;
+			
 		$attributesToReturn['description'] = $description;
 		$attributesToReturn['name'] = basename($tmp_file, '.'.$suffix[1]);
 		$attributesToReturn['created'] = date('Y-m-d\TH:i:s');
  
 		return $attributesToReturn;
 	}
-	
-		
+
       /*
       * Uploaded vot TT => convert to array
       */
@@ -61,6 +61,7 @@ if [ -d $NEWMETA/ParamInfo ]; then
 		mkdir $AMDAINSTALLATION/AMDA_IHM/generic_data/ParamInfo
 	fi 
 	cp $NEWMETA/ParamInfo/info*.xml $AMDAINSTALLATION/AMDA_IHM/generic_data/ParamInfo
+	cp $AMDAINTERNALDIR/PARAM_INFO_PREDEFINED/info*.xml $AMDAINSTALLATION/AMDA_IHM/generic_data/ParamInfo
 fi 
  
 # copy LocalParams.xml created by makeTree.php to AMDA installation