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

Myriam Bouchemit
2 parents a37ffa44 ce626a0a
Showing 5 changed files with 10 additions and 9 deletions Show diff stats
js/app/AmdaApp.js
js/app/views/ParameterUI.js
js/app/views/StatisticsUI.js
php/classes/FilesMgr.php
php/uploadFile.php
@@ -578,7 +578,7 @@ Ext.define(&#39;amdaApp.AmdaApp&#39;, {
 						}
 					});
 					Ext.state.Manager.getProvider().saveState();
-					AmdaAction.logout();
+					AmdaAction.logout(false);
 				}
 				else if (btn == 'no')
 				{
@@ -591,7 +591,7 @@ Ext.define(&#39;amdaApp.AmdaApp&#39;, {
 					});
 					Ext.state.Manager.getProvider().set(me.desktop.id+'_wallpaper',me.desktop.getWallpaper());
 					Ext.state.Manager.getProvider().saveLastTime();
-					AmdaAction.logout();
+					AmdaAction.logout(false);
 				}
 			}
 		});
@@ -448,6 +448,7 @@ Ext.define(&#39;amdaUI.ParameterUI&#39;,
 								allowBlank : false, blankText : 'Time Step is required',
 								name : 'timestep',
 								minValue : 0.001,
+								decimalPrecision : 3,
 								hideTrigger: true,
 								width: 150,
 								//validateOnChange: false,
@@ -230,7 +230,7 @@ Ext.define(&#39;amdaUI.StatisticsUI&#39;,
 						{
 							xtype: 'combo', queryMode : 'local',		    
 							//emptyText : 'please click to select function',
-							store: [ 'min', 'max', 'mean' ],
+							store: [ 'min', 'max', 'mean' ,'median','variance','skewness','kurtosis','count','countNotNan' ],
 							triggerAction: 'all',  		         
 							//lazyInit: false,
 							listeners: {
@@ -120,12 +120,12 @@ class FilesMgr extends AmdaObjectMgr
 		return array('type' => $data_type, 'size' => $size, 'n_records' => $n_recs, 'units' => $units, 'fillvalue' => $fillval);
 	}
  
-	public function getCdfSampling() {   
+	public function getCdfSampling() {
 		exec('cdfsamplingfromdata '.$this->fileName, $results);
 		return $results;
 	}
  
-	public function getCdfSamplings() {        
+	public function getCdfSamplings() {      
 		exec('cdfsamplingsfromdata '.$this->fileName, $results);
 		return $results;
 	}
@@ -48,7 +48,6 @@
 		if (preg_match('/Content-Length: (\d+)/', $data, $matches)) {
 			$ContentLength = (int)$matches[1];
 		}
-				
 		return $ContentLength;
 	}
  
@@ -189,12 +188,13 @@
  
 		$url = null;
  
-		if (substr($remoteName,0,5) == 'https') 
+		/*if (substr($remoteName,0,5) == 'https') 
 		{
 			$response = array( 'success' => false, 'error' => ' : Sorry, https protocol is no implemented yet'); 
 			die(json_encode($response));
-		}
-		
+		}*/
+
+		if (substr($remoteName,0,5) == 'https')  $url = 'https';
 		if (substr($remoteName,0,4) == 'http')  $url = 'http';
 		if (substr($remoteName,0,3) == 'ftp')   $url = 'ftp';