Merge branch 'master' into sum-components-indexes

Benjamin Renard
2 parents eac92219 ab41a22b
Showing 3 changed files with 24 additions and 17 deletions Show diff stats
js/app/views/ExplorerUI.js
js/app/views/MyDataUI.js
php/classes/AmdaStats.php
@@ -214,7 +214,7 @@ Ext.define(&#39;amdaUI.ExplorerUI&#39;, {
 						var tree = Ext.getCmp(amdaUI.ExplorerUI.RESRC_TAB.TREE_ID);
 						tree.getStore().sort([
 								{  sorterFn: function(o1, o2){
-										if (o1.get('nodeType') !== 'localParam')
+										if (o1.get('nodeType') !== 'localParam' || o1.get('isParameter'))
 											return;
  
 										return o1.get('text').toUpperCase()  < o2.get('text').toUpperCase() ? -1 : 1;
@@ -267,7 +267,7 @@ Ext.define(&#39;amdaUI.ExplorerUI&#39;, {
 			sorters:[{ direction: 'ASC' ,
 						sorterFn: function(o1, o2){
  
-								if (o1.get('nodeType') == 'localParam' || o1.get('nodeType') == 'myData') {
+								if ((o1.get('nodeType') == 'localParam' && !o1.get('isParameter')) || o1.get('nodeType') == 'myData') {
 									return o1.get('text').toUpperCase()  < o2.get('text').toUpperCase() ? -1 : 1;
 								}
  
@@ -396,15 +396,15 @@ Ext.define(&#39;amdaUI.MyDataUI&#39;, {
 		}
  
 		if (maskParts.length == 2) {
-		  if (this.fileObject.get('fileName').indexOf(maskParts[1]) < 0) {
-			myDesktopApp.warningMsg('No correspondance between ' +mask+' and '+this.fileObject.get('fileName')); 
-			return false; 
-		  }
-		}
-			
-		if ((maskParts[0].length + maskParts[1].length) < 6) {
-			myDesktopApp.warningMsg('Mask cannot be shorter than 6 letters');
-			return false;
+			if (this.fileObject.get('fileName').indexOf(maskParts[1]) < 0) {
+				myDesktopApp.warningMsg('No correspondance between ' +mask+' and '+this.fileObject.get('fileName')); 
+				return false; 
+			}
+		  
+			if ((maskParts[0].length + maskParts[1].length) < 6) {
+				myDesktopApp.warningMsg('Mask cannot be shorter than 6 letters');
+				return false;
+			}
 		}
  
 		return true;
@@ -74,7 +74,7 @@ class AmdaStats {
  
 		$doc2 = new DomDocument("1.0");
 		if ($year == null) $year = date("Y");
-		
+
 		$users=glob(USERPATH."*");
 		foreach ($users as $user) {        
 			 $name2 = $user."/Stats$year.xml";
@@ -82,7 +82,7 @@ class AmdaStats {
 			if (!file_exists($name2)) continue;
  
 			$doc2->load($name2);
-			
+
 			foreach ($tags as $tag) {    
 				$tag1 = $this->statXml->getElementsByTagName($tag)->item(0);
 				$tag2 = $doc2->getElementsByTagName($tag)->item(0);
@@ -100,7 +100,7 @@ class AmdaStats {
 		$this->getModulesStat(null,null,true);
 		// write data statistics as json
 		$this->getDataStat(0,null,null,true);
-
+	
 		return  $this->statXml->save(StatsXml);
 	}
  
@@ -210,6 +210,7 @@ class AmdaStats {
 			$TOTALarray = array();
 			$STARTarray = array();
 			$STOParray = array();
+			$usersArray = array();
  
 			foreach ($this->tasks as $task) {
 				$theTask = $this->statXml->getElementsByTagName($task)->item(0);
@@ -219,10 +220,14 @@ class AmdaStats {
 				foreach ($items as $item){
 					$VIs = $item->getElementsByTagName('dataset');
 					$time = strtotime($item->getAttribute('date'));
-
+					$user = $item->getAttribute('user');
+					
 					foreach ($VIs as $VI) {
 						$id = $VI->nodeValue;
 						if ($id) {
+
+							$usersArray[$id][$user]++;
+
 							if ($TASKarray[$id]) {
 								$TASKarray[$id]++;
 								$TOTALarray[$id]++;
@@ -251,7 +256,7 @@ class AmdaStats {
 				}
 				$VIarray[$task] = $TASKarray;
 			}
-	
+
 			$GENERALarray = array();
 			arsort($TOTALarray);
  
@@ -264,12 +269,14 @@ class AmdaStats {
 				$mining = $VIarray['mining'][$key];
 				$print = $VIarray['print'][$key];
 				$stat = $VIarray['statistics'][$key];
+				$uniqueUsers = count($usersArray[$key]);
+				
 				if ($key != 'undefined') 
 				{
 					$GENERALarray[] = array('id' => $key, 'number' => $value, 'percent' => $value,
 												'plot' => $plot, 'mining' => $mining, 
 												'print' => $print,'statistics' => $stat, 
-												'start' => $viStart, 'stop' => $viStop);
+												'start' => $viStart, 'stop' => $viStop, 'unique' => $uniqueUsers);
  
 					$Ntotal += $value;							
 				}