Merge branch 'master' into multiplot

Benjamin Renard
2 parents 752ba9ab 55fa3bbc
Showing 10 changed files with 126 additions and 19 deletions Show diff stats
js/app/controllers/PlotModule.js
js/app/views/PlotComponents/PlotTabContent.js
js/app/views/PlotComponents/PlotTabPanel.js
js/app/views/PlotUI.js
php/RemoteDataCenter/RemoteParamManager.php
php/classes/AmdaAction.php
php/classes/AmdaClient.php
php/classes/FilterResSimu.php
php/classes/UserMgr.php
php/config.php
@@ -216,6 +216,7 @@ Ext.define(&#39;amdaDesktop.PlotModule&#39;, {
         var win = desktop.getWindow(this.id);
         if (win) {
             // Plot UI is opened => add plot in a new tab
+            me.linkedNode.get('object').plots().add(plotNode);
             me.getUiContent().editPlot(plotNode);
             win.show();
         }
@@ -259,6 +259,9 @@ Ext.define(&#39;amdaPlotComp.PlotTabContent&#39;, {
                 afterrender: function(comp, eOpts) {
                     this.updateUI();
                 },
+                beforedestroy: function(comp, eOpts) {
+                    this.resetModif();
+                },
                 scope: this
             }
         };
@@ -49,6 +49,15 @@ Ext.define(&#39;amdaPlotComp.PlotTabPanel&#39;, {
             }
         }
     },
+
+    isDirty : function() {
+        var dirty = false;
+        this.multiplot_object.plots().each(function (rec, index) {
+            if (rec.get('object').get('id') != '')
+                dirty |= rec.get('object').isDirty();
+        });
+        return dirty;
+    },
  
     addPlotNode: function(plotNode, selectTab, refreshMultiPlot)
     {
@@ -98,8 +98,8 @@ Ext.define(&#39;amdaUI.PlotUI&#39;, {
         var module = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.plot.id);
         if (module)
             module.closeInteractiveSession();
-	
-        return this.object.isDirty();
+
+        return this.plotTabs.isDirty();
     },
  
     /**
@@ -47,7 +47,7 @@ class RemoteParamManager
 		if (!file_exists(USERWSDIR."RemoteParams.xml"))
 				return array("err" => "RemoteParams file error");
  
-		if (!$this->xmlDom->load($this->xmlName))
+		if (!@$this->xmlDom->load($this->xmlName))
 			return array("err" => "RemoteParams file error");
  
 		return array("success" => true);
@@ -282,9 +282,10 @@ class AmdaAction
 										$not_yet = true;
 									}
 								}
-// 								if ($child->parentNode->getAttribute('restriction') > 1 ) {
-// 									$timeRestriction = true;
-// 								}
+
+								if ($child->parentNode->hasAttribute('timeRestriction')) {
+									$timeRestriction = $child->parentNode->getAttribute('timeRestriction');
+								}
 							}
  
 							$component_info = array();
@@ -302,9 +303,10 @@ class AmdaAction
 										$not_yet = true;
 									}
 								}
-// 								if ($child->parentNode->parentNode->getAttribute('restriction') > 1) {
-// 									$timeRestriction = true;
-// 								}
+
+								if ($child->parentNode->parentNode->hasAttribute('timeRestriction')) {
+									$timeRestriction = $child->parentNode->parentNode->getAttribute('timeRestriction');
+								}
  
 								if ($child->hasAttribute("index1"))
 									$component_info["index1"] = $child->getAttribute('index1');
@@ -330,7 +332,7 @@ class AmdaAction
 							if ($isParameter) {
 								$objectMgr = new AliasMgr();
 								$alias = $objectMgr->getAlias($id);
-
+                                $info .= '</br><i>ID : '.$id.'</i>';
 								$childrenToReturn[] = array('text' => $name,'alias' => $alias,
 									'id' => $id,'nodeType' => $nodeType, 'info' => $info, "component_info" => $component_info,
 									'globalStart' => $globalStart, 'globalStop' => $globalStop, 'timeRestriction' => $timeRestriction,
@@ -342,23 +344,31 @@ class AmdaAction
 									$rank = $child->getAttribute('rank');
 								}
  
-								$disable = $child->hasAttribute('group');
+								if ($child->hasAttribute("timeRestriction")) {
+									$timeRestriction = $child->getAttribute("timeRestriction");
+								}
+								$disable = TRUE;
  
-								if ($disable) {
+								if ($child->hasAttribute('group')) {
 									if ($child->getAttribute("group") === "TBD") {
 											$info .=  "<br/><b>Under Testing</b>";
-										}
+									}
 									else {
 										$info .= "<br/><b>Restricted Access : Group ".$child->getAttribute('group')."</b>";
+										if (!empty($timeRestriction)) {
+											$disable = FALSE;
+											$info .= "<br/><b>Time Restriction : ".$timeRestriction."</b>";
+										}
 									}
 								}
 								else {
+									$disable = FALSE;
 									if ($child->hasAttribute('restriction') && $child->getAttribute('restriction') == 'plotOnly')
 										$info .=  "<br/><b>Plot Only!!!</b>";
 								}
  
 								$childrenToReturn[] = array('text' => $name, 'id' => $id,'nodeType' => $nodeType,  'info' => $info,
-									'leaf' => false, 'help' => $help, 'disable' => $disable, 'rank' => $rank);
+									'leaf' => false, 'help' => $help, 'disable' => $disable, 'rank' => $rank, 'timeRestriction' => $timeRestriction);
 							}
 						break;
  
@@ -107,6 +107,19 @@ class AmdaClient {
 // 		return true;
 // 	}
 // 	
+
+	/* Get list of VI with TimeRestriction in DDBASE */
+	public function getDatasetsWithTimeRestriction() {
+		try {
+			$restrictions = $this->client->getDatasetsWithTimeRestriction();
+		}
+		catch  (SoapFault $exception) {
+			error_log($exception->faultstring.PHP_EOL, 1, email);
+			return FALSE;
+		}
+		return $restrictions;
+	}
+
 	/* Get Time Restriction from VI in DDBASE */
 	public function getTimeRestriction($dataSet) {
 		try {
@@ -16,7 +16,7 @@
  	    $this->simXmlName = $basePath;
 	    $this->simXml     = new DomDocument("1.0");
 	    if (file_exists($this->simXmlName)) {
-	    	$this->simXml->load($this->simXmlName); 
+	    	@$this->simXml->load($this->simXmlName); 
 	    	$this->simRootEl  = $this->simXml->documentElement;
 	    }
 	    $this->simXP      = new domxpath($this->simXml);
@@ -25,6 +25,8 @@ class UserMgr
 	protected $userGrpsCheckSum; //use to know if there is a modification in user groups
 	protected $amdaClient; //client to dd webservice
 	protected $paramMgr, $baseExtXml;
+	protected $datasetsTimeRestriction;
+	protected $datasetsTimeRestrictionCheckSum;
  
 	public $isFirst = false;
 	public $isOldWS = false;
@@ -151,6 +153,55 @@ class UserMgr
 		}
 	}
  
+	protected function loadDatasetsTimeRestriction()
+	{
+		if (isset($this->datasetsTimeRestriction)) {
+			return;
+		}
+		$restrictionFilePath = datasetsTimeRestrictionJson;
+		if (file_exists($restrictionFilePath)) {
+			// Re-use the cache file if it's not older than 3600s.
+			if (abs(time() - filemtime($restrictionFilePath)) < 3600) {
+				$fileContent = file_get_contents($restrictionFilePath);
+				if (!empty($fileContent)) {
+					$this->datasetsTimeRestriction = json_decode($fileContent, TRUE);
+					if (isset($this->datasetsTimeRestriction) && ($this->datasetsTimeRestriction !== FALSE)) {
+						$this->datasetsTimeRestrictionCheckSum = md5($fileContent);
+						return;
+					}
+				}
+			}
+		}
+
+		$this->datasetsTimeRestrictionCheckSum = '';
+		$this->datasetsTimeRestriction = $this->amdaClient->getDatasetsWithTimeRestriction();
+
+		if ($this->datasetsTimeRestriction !== FALSE) {
+			foreach ($this->datasetsTimeRestriction as &$datasetTimeRestriction) {
+				$timeRestriction = $datasetTimeRestriction['restriction'];
+				//Parse time restriction
+				$n = sscanf($timeRestriction, "%04d-%02d-%02d", $yy, $mm, $dd);
+				if ($n != 3) {
+					$n = sscanf($timeRestriction, "%d", $ndays);
+					if ($n != 1) {
+						//Cannot parse the time restriction
+						$timeRestriction = '';
+					}
+					else {
+						$timeRestriction = date("Y-m-d", strtotime("-$ndays days"))."T23:59:59.999Z";
+					}
+				}
+				else {
+					$timeRestriction .= "T23:59:59.999Z";
+				}
+				$datasetTimeRestriction['restriction'] = $timeRestriction;
+			}
+			$content = json_encode($this->datasetsTimeRestriction);
+			$this->datasetsTimeRestrictionCheckSum = md5($content);
+			file_put_contents($restrictionFilePath, $content);
+		}
+	}
+
 	/*
 	* Check if special groups with settings exist and user is from these groups
 	* Take the first group from user list
@@ -617,12 +668,15 @@ class UserMgr
  
 	protected function makeLocalTree()
 	{
+		$this->loadDatasetsTimeRestriction();
+
 		$this->loadUserGrps();
  
 		if (file_exists(USERWSDIR.'LocalParams.xml')) {
-			if (file_exists(USERWSDIR.'userGrpsChecksum')) {
+			if (file_exists(USERWSDIR.'userGrpsChecksum') && file_exists(USERWSDIR.'datasetsTimeRestrictionCheckSum')) {
 				$lastGrpsChecksum = file_get_contents(USERWSDIR.'userGrpsChecksum');
-				if ($lastGrpsChecksum == $this->userGrpsCheckSum) {
+				$lastDatasetsTimeRestrictionCheckSum = file_get_contents(USERWSDIR.'datasetsTimeRestrictionCheckSum');
+				if (($lastGrpsChecksum == $this->userGrpsCheckSum) && ($lastDatasetsTimeRestrictionCheckSum == $this->datasetsTimeRestrictionCheckSum)) {
 					//No modification in groups for this user
 					if (filemtime(USERWSDIR.'LocalParams.xml') == filemtime(LocalData.'/LocalParams.xml')) {
 						//And no modification in LocalParams file => skip makeLocalTree
@@ -637,8 +691,10 @@ class UserMgr
 				die("Login for ".$this->user." failed: Can't copy LocalParams.xml");
 		//Save groups checksum used to generate this user local tree
 		file_put_contents(USERWSDIR.'userGrpsChecksum', $this->userGrpsCheckSum);
+		//Save datasets time restrictions used to generate this user local tree
+		file_put_contents(USERWSDIR.'datasetsTimeRestrictionCheckSum', $this->datasetsTimeRestrictionCheckSum);
  
-		$result = $this->updateTreeForGrps(USERWSDIR.'LocalParams.xml');
+		$result = $this->updateTreeForGrpsAndTimeRestrictions(USERWSDIR.'LocalParams.xml');
  
 		//Set modif time to the original one
 		touch(USERWSDIR.'LocalParams.xml', filemtime(LocalData.'/LocalParams.xml'));
@@ -646,7 +702,7 @@ class UserMgr
 		return TRUE;
 	}
  
-	protected function updateTreeForGrps($file)
+	protected function updateTreeForGrpsAndTimeRestrictions($file)
 	{
 		if (!isset($this->userGrps))
 			return TRUE;
@@ -671,6 +727,20 @@ class UserMgr
 						}
 				}
 		}
+
+		if (!empty($this->datasetsTimeRestriction)) {
+			foreach ($this->datasetsTimeRestriction as $datasetTimeRestriction) {
+				$nodes = $xp->query("//dataset[@xml:id='".str_replace('_','-',$datasetTimeRestriction['vi'])."']");
+				if ($nodes->length > 0) {
+					foreach ($nodes as $node) {
+						$timeRestriction = $datasetTimeRestriction['restriction'];
+						if (!empty($timeRestriction)) {
+							$node->setAttribute('timeRestriction', $timeRestriction);
+						}
+					}
+				}
+			}
+		}
  
 		return $xml->save($file);
 	}
@@ -90,6 +90,7 @@ define(&#39;orbitsAllXml&#39;,LocalData.&#39;/OrbitsAll.xml&#39;);
 define('FeedbackXml', DATAPATH.'/Feedback/Feedback.xml');
 define('specialGrpsXml',SpecialSettingsDir.'/Groups.xml');
 define('specialSettingsXml',SpecialSettingsDir.'/Settings.xml');
+define('datasetsTimeRestrictionJson',LocalData.'/datasetsTimeRestriction.json');
  
 //Help info dirs
 define('HELPPATH', IHM_SRC_DIR."/help/");