Merge branch 'amdadev' of https://gitlab.irap.omp.eu/CDPP/AMDA_IHM into amdadev

Benjamin Renard
2 parents 1b28b610 6a679a7f
Showing 4 changed files with 38 additions and 15 deletions Show diff stats
js/app/views/CatalogUI.js
js/app/views/VisuUI.js
php/classes/AmdaAction.php
php/classes/TimeTableMgr.php
@@ -160,16 +160,10 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
     updateSurveyDates : function(res){
         if (this.TTGrid.getStore().getTotalCount() <= 0)
             return;
-
-        if(! this.object.get('surveyStart') ){
-            this.object.set('surveyStart',  res['minStart']);
-            this.status.isModified = true;
-        }
-        if(! this.object.get('surveyStop') ){
-            this.object.set('surveyStop',  res['maxStop']);
-            this.status.isModified = true;
-        } 
-  },
+        this.object.set('surveyStart',  res['minStart']);
+        this.object.set('surveyStop',  res['maxStop']);
+        this.status.isModified = true;
+    },
  
     createTT: function (catId) {
         var ttObj = Ext.create('amdaModel.TimeTable');
@@ -131,12 +131,19 @@ Ext.define(&#39;amdaUI.VisuUI&#39;, {
  
             me.reset();
         }
-
+        var type = "";
+        if(this.object.get('id').includes('sharedcatalog'))
+            type = 'sharedcatalog'
+        else if(this.object.get('id') == "")
+            type = 'uploaded'
+        else
+            type = 'object'
         var opt = {
             'typeTT': 'catalog', 'id': this.object.get('id'),
-            'name': this.object.get('name')
+            'name': this.object.get('name'),
+            'type': type,
+            'format': this.object.get('objFormat')
         };
-
         this.formPanel.getForm().loadRecord(this.object);
         AmdaAction.readIntervalsForChart(opt, onAfterInit);
     },
@@ -189,9 +189,13 @@ class AmdaAction
 						case 'catalog':
 							if ($isLeaf) {
 								$info = '<b>Nb intervals:</b> '.$child->getAttribute('intervals').'<br/>';
-
 								$objectMgr = new TimeTableMgr();
+						
 								$obj_info = $objectMgr->getObject($id, $nodeType);
+
+								if($nodeType == "catalog")
+									$info .='<b>Nb columns:</b> '.$obj_info['nbParam']. '<br/>';
+								
 								if (!empty($obj_info) && !empty($obj_info['description'])) {
 									$info .= '<b>Description:</b> '. $obj_info['description'] . '<br/>';
 								}
@@ -1202,7 +1206,10 @@ class AmdaAction
 	public function readIntervalsForChart($o)
 	{
 		$objMgr = new CatalogCacheMgr(TRUE);
-		$objMgr->initFromObject($o->id, $o->type);
+		if($o->type == 'uploaded')
+			$objMgr->initFromUploadedFile($o->name, $o->format);
+		else
+			$objMgr->initFromObject($o->id, $o->type);
 		return $objMgr->getIntervalsForChart();
 	}
  
@@ -74,8 +74,14 @@ class TimeTableMgr extends AmdaObjectMgr
 		$attributes = $objToGet->childNodes;
  
 		$nbInt = 0;
+		$nbParam = 0;
 		foreach ($attributes as $attribute) {
 			if ($attribute->nodeType == XML_ELEMENT_NODE) {
+				if($attribute->tagName == 'parameters'){
+					foreach($attribute->childNodes as $parameter){
+						$nbParam++;
+					}
+				}
 				/*if ($attribute->tagName == 'intervals') {
 					$start = $attribute -> getElementsByTagName('start')->item(0) -> nodeValue;
 					$stop = $attribute -> getElementsByTagName('stop')->item(0) -> nodeValue;
@@ -116,6 +122,7 @@ class TimeTableMgr extends AmdaObjectMgr
                                         if($attributesToReturn['surveyStop'] == "" )
                                             $attributesToReturn['surveyStop'] = $stop;
 		$attributesToReturn['nbIntervals'] = $nbInt;
+		$attributesToReturn['nbParam'] = $nbParam;
  
 		return $attributesToReturn;
 	}
@@ -541,6 +548,14 @@ class TimeTableMgr extends AmdaObjectMgr
 			$this->objectDom->documentElement->appendChild($newInterval);
 		}
  
+		// Update SurveyStart & SurveyStop
+		$surveyStartNodes = $objToGet->getElementsByTagName('surveyStart');
+		$surveyStopNodes = $objToGet->getElementsByTagName('surveyStop');
+		if ($surveyStartNodes->length > 0 && $surveyStopNodes->length > 0) {
+			$surveyStartNodes->item(0)->nodeValue = TimeUtils::stamp2iso($minStart);
+			$surveyStopNodes->item(0)->nodeValue = TimeUtils::stamp2iso($maxStop);
+		}
+
 		//save modifications
 		$this->id = $id;
 		$this->resFileName = USERTTDIR . $this->id . '.xml';