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

Hacene SI HADJ MOHAND
2 parents 80404514 c198a068
Showing 14 changed files with 205 additions and 56 deletions Show diff stats
desktop.php
help/catAsciiFormat
help/parameters/RO-IRFU-LAP-EAICD.PDF
help/parameters/RO-IRFU-LAP-UG.PDF
index.html
js/app/views/CatalogUI.js
js/app/views/StatisticsUI.js
js/app/views/UploadPanelUI.js
js/lib/ext-override.js
js/resources/css/login.css
js/resources/images/icons/attention.png
php/RemoteDataCenter/IPIM.php
php/classes/TimeTableCacheSortObject.php
php/classes/UserMgr.php
@@ -9,10 +9,19 @@
   require_once('php/config.php');
  
   // error_reporting(E_ALL);
+  if (!isset($_POST['username'])) {
+    header('Location: index.html');
+    exit(1);
+  }
+
   if (!isset($_POST['username'])) die('<a href="index.html">LOGIN SVP</a>');
  
   $usrMgr = new UserMgr();
   $sessionID = $usrMgr->init();
+  if ($sessionID === FALSE) {
+    header('Location: index.html?error=1');
+    exit(1);
+  }
 ?>
  
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
@@ -37,7 +46,7 @@
 <!--  <script type="text/javascript" src="js/lib/ext/ext-all-debug-w-comments.js"></script> -->
     <script type="text/javascript" src="js/lib/ext/ext-all.js"></script>
 <!--	<script type="text/javascript" src="js/lib/ext/ext-all-dev.js"></script> -->
-<!--   <script type="text/javascript" src="js/lib/ext-override.js"></script> -->
+    <script type="text/javascript" src="js/lib/ext-override.js"></script>
  
 <!-- Direct API -->
     <script type="text/javascript" src="php/api.php"></script> 
@@ -0,0 +1,16 @@
+<h3>ASCII Catalog Format</h3>
+<ul>
+<li>Time formats in ascii catalog are the same as in ascii time tables.
+ <br/> <br/>
+<li>Each ascii catalog should have a header with parameters description ( will be changed ) : see <i>Catalog Header example</i> below.
+Note that parameter <i>id</i> should be unique for a given catalog.
+<pre>
+# Test catalog; 
+# Name: ascii_cat; 
+# Creation Date: 2019-09-01T08:11:53;
+# Parameter 1: id:column1; name:Col 1; size:1; type:float;
+# Parameter 2: id:column2; name:Col 2; size:1; type:int; 
+# Parameter 3: id:column3; name:Col 3; size:1; type:int; 
+# Parameter 4: id:column4; name:Col 4; size:1; type:int; 
+</pre>
+</ul>
@@ -13,6 +13,7 @@
 <body>
 <div id="centrage">
  
+
 <div id="trou">
  
 <div id="couvercle"></div>
@@ -20,11 +21,56 @@
 <div id="TousLesBoutons">
 <div id="Btn_FirstVisit" onclick="location.href='help.html';"></div>
 <div id="Btn_Rules" onclick="location.href='help/policy.html';"></div>
-<form method="POST" action="desktop.php">  
+<form id="Form_Login" method="POST" action="desktop.php" onsubmit="return checkForm(this);">  
+            <div id="loader" class="loader"></div>
 	    <input type="text" name="username" placeholder="LOGIN" id="Btn_EnterLogin" class="PlaceHolder" />   
 	    <input type="password" name="password" placeholder="PASSWORD" id="Btn_EnterPassword" class="PlaceHolder"/>
-     <div><input id="Btn_Login" type="submit" value=""/></div>
-</form> 
+     <div><input id="Btn_Login" name="login" type="submit" value=""/></div>
+</form>
+<script type="text/javascript">
+  function setLoginLoader(value) {
+    var form = document.getElementById('Form_Login');
+    form.elements['username'].readOnly = value;
+    form.elements['password'].readOnly = value;
+    form.elements['login'].disabled = value;
+    document.getElementById("loader").style.display = value ? 'block' : 'none';
+  }
+
+  
+  function checkForm(form)
+  {
+    if (form.elements['username'].value == "" || form.elements['password'].value == "") {
+       alert('Please type your username and password');
+       return false;
+    }
+    setLoginLoader(true);
+    return true;
+  }
+
+  window.onpageshow = function(event) {
+    var qs = (function(a) {
+      if (a == "") return {};
+      var b = {};
+      for (var i = 0; i < a.length; ++i)
+      {
+        var p=a[i].split('=', 2);
+        if (p.length == 1)
+            b[p[0]] = "";
+        else
+            b[p[0]] = decodeURIComponent(p[1].replace(/\+/g, " "));
+      }
+      return b;
+     })(window.location.search.substr(1).split('&'));
+
+     if (qs["error"] && qs["error"] == "1") {
+       alert('Cannot connect to AMDA');
+       return false;
+     }
+
+     setLoginLoader(false);
+     
+  };
+</script>
 <a href="mailto:amda@irap.omp.eu?subject=AMDA registration" id="Btn_Register"></a>
 <a href="mailto:amda@irap.omp.eu?subject=AMDA contact" id="Btn_Contact"></a>
 <div id="Btn_About" onclick="location.href='help/info.html';"></div><div id="textAbout">AMDA Info</div>
@@ -270,6 +270,7 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
                 {
                     xtype: 'rownumberer',
                     width: 50,
+                    minWidth: 50,
                     renderer: function (value, metaData, record) {
                         var msg = record.index + 1;
                         if (record.get('isNew') || record.get('isModified')) {
@@ -286,6 +287,7 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
                     sortable: true,
                     dataIndex: 'start',
                     width: 120,
+                    minWidth: 50,
                     menuDisabled: false,
                     editor: {
                         xtype: 'datefield',
@@ -302,6 +304,7 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
                     sortable: true,
                     dataIndex: 'stop',
                     width: 120,
+                    minWidth: 50,
                     menuDisabled: false,
                     editor: {
                         xtype: 'datefield',
@@ -317,6 +320,7 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
                     sortable: true,
                     dataIndex: 'durationHour',
                     width: 120,
+                    minWidth: 50,
                     menuDisabled: false,
                     hidden: true,
                     id: amdaUI.CatalogUI.COL_TO_HIDE_DURATION + '1',
@@ -336,6 +340,7 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
                     sortable: true,
                     dataIndex: 'durationMin',
                     width: 120,
+                    minWidth: 50,
                     menuDisabled: false,
                     hidden: false,
                     id: amdaUI.CatalogUI.COL_TO_HIDE_DURATION + '2',
@@ -355,6 +360,7 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
                     sortable: true,
                     dataIndex: 'durationSec',
                     width: 120,
+                    minWidth: 50,
                     menuDisabled: false,
                     hidden: true,
                     id: amdaUI.CatalogUI.COL_TO_HIDE_DURATION + '3',
@@ -378,7 +384,8 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
                     text: obj.name,
                     sortable: true,
                     dataIndex: obj.id,
-                    menuDisabled: false
+                    menuDisabled: false,
+                    minWidth: 50
                 };
                 switch (obj.type) {
                     case 0: //double
@@ -389,7 +396,7 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
                             xtype: 'gridcolumn',
                             width: pramColumnWidth * parseInt(obj.size),
                             editor: 'textfield',
-                            filter: {type: 'numeric'}
+                            filter: {type: 'numeric', menuItemCfgs: {decimalPrecision: 10}}
                         });
                         break;
                     case 1: //dateTime
@@ -783,6 +790,12 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
             selModel: {pruneRemoved: false},
             //	selType: 'cellmodel',
             plugins: [cellEditing, {ptype: 'bufferedrenderer'}],
+            listeners: {
+              afterrender: function () {
+                this.TTGrid.headerCt.resizer.tracker.gridBugFix = true;
+              },
+              scope: this
+            },
             dockedItems: [{
                     xtype: 'toolbar',
                     items: [{
@@ -888,7 +901,7 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
                             dock: 'bottom',
                             ui: 'footer',
                             height: 140,
-                        
+
                             items: [
                                 {
                                     type: 'button',
@@ -117,9 +117,8 @@ Ext.define(&#39;amdaUI.StatisticsUI&#39;,
 	updateObject : function()
 	{    
 		// get the basic form of the left 
-		var basicForm = this.formPanel.items.items[0].getForm();
-		var updateStatus = true;
-		
+		var basicForm = this.formPanel.items.items[1].getForm();
+		var updateStatus = true;	
 		var formValues = basicForm.getValues();
 		this.object.set('name',this.fieldName.getValue());
 		this.object.set('description',formValues.description);
@@ -151,9 +150,8 @@ Ext.define(&#39;amdaUI.StatisticsUI&#39;,
 						+'<br>You must add one or choose Time Selection `by Interval`'); 
 			return false;    
 		}
-             
+
 		basicForm.updateRecord(this.object);
-	    
 		this.object.set('timesrc', timeSource);
 		// set valid intervals into TimeTable object
 		if (timeSource === amdaModel.AmdaTimeObject.inputTimeSrc[0])
@@ -180,15 +178,6 @@ Ext.define(&#39;amdaUI.StatisticsUI&#39;,
 	 */
 	init : function (config) 
 	{	  
-// 	  var functions = Ext.create('Ext.data.Store', {
-// 	    fields: ['id', 'name'],
-// 	    data : [
-// 		{"id":"min", "name":"MIN"},
-// 		{"id":"max", "name":"MAX"},
-// 		{"id":"mean","name":"MEAN"}        
-// 	    ]
-// 	    });
-	     
 		this.fieldName = new Ext.form.field.Text({
 				fieldLabel: 'Catalog Name',
 				allowBlank : false,
@@ -385,7 +374,6 @@ Ext.define(&#39;amdaUI.StatisticsUI&#39;,
 				pack: 'start',
 				align: 'stretch'
 			},
-			//bodyStyle: {background : '#dfe8f6'},
 			defaults: { bodyStyle: {background : '#dfe8f6'}, padding : '3'},
 			fieldDefaults: { labelWidth: 80, labelAlign : 'top' },
 			items: [ {  
@@ -455,7 +455,7 @@ Ext.define(&#39;amdaUI.UploadPanelUI&#39;, {
 		}
 		else {
 			this.formats = [
-				{ boxLabel: 'ASCII&nbsp;<img amda_clicktip="ttTimeFormat" style="vertical-align:bottom" src="js/resources/images/16x16/info_mini.png"', name: 'catfrmt',  inputValue: 'ASCII', checked: true},
+				{ boxLabel: 'ASCII&nbsp;<img amda_clicktip="catAsciiFormat" style="vertical-align:middle" src="js/resources/images/icons/attention.png"', name: 'catfrmt',  inputValue: 'ASCII', checked: true},
 				{ boxLabel: 'VOTable', name: 'catfrmt', inputValue: 'VOT'}
 			];
  
-/** 
+/**
  * Project  : AMDA-NG4
  * Name     : ext-override.js
  * @file     ext-override.js
-  
+
  * @brief   patches for extjs
  * @author  elena (sencha support)
  * @version $Id: ext-override.js 2345 2014-05-13 09:06:43Z elena $
@@ -10,12 +10,68 @@
  *    FT Id     :   Date   : Name - Description
  *******************************************************************************
  *  :           :16/06/2011 : elena  -  creation
- * 
+ *
  */
  
-Ext.onReady(function () {  
-    
-// for version 4.1.3 - corrected in 4.2.2    
+Ext.onReady(function () {
+
+  // Fix for #7096
+  Ext.override(Ext.dd.DragTracker, {
+    constrainModes: {
+      point: function (me, xy) {
+        var dr = me.dragRegion,
+        constrainTo = me.getConstrainRegion();
+
+        if (!constrainTo) {
+          return xy;
+        }
+        dr.x = dr.left = dr[0] = dr.right = xy[0];
+        dr.y = dr.top = dr[1] = dr.bottom = xy[1];
+        if (!me.gridBugFix)
+          dr.constrainTo(constrainTo);
+
+        return [dr.left, dr.top];
+      },
+      // Constrain the dragTarget to within the constrain region. Return the passed xy adjusted by the same delta.
+      dragTarget: function(me, xy) {
+        var s = me.startXY,
+          dr = me.startRegion.copy(),
+          constrainTo = me.getConstrainRegion(),
+          adjust;
+          // No constraint
+          if (!constrainTo) {
+            return xy;
+          }
+          // See where the passed XY would put the dragTarget if translated by the unconstrained offset.
+          // If it overflows, we constrain the passed XY to bring the potential
+          // region back within the boundary.
+          dr.translateBy(xy[0] - s[0], xy[1] - s[1]);
+          // Constrain the X coordinate by however much the dragTarget overflows
+          if (dr.right > constrainTo.right) {
+            xy[0] += adjust = (constrainTo.right - dr.right);
+            // overflowed the right
+            dr.left += adjust;
+          }
+          if (dr.left < constrainTo.left) {
+            xy[0] += (constrainTo.left - dr.left);
+          }
+          // overflowed the left
+          // Constrain the Y coordinate by however much the dragTarget overflows
+          if (dr.bottom > constrainTo.bottom) {
+            xy[1] += adjust = (constrainTo.bottom - dr.bottom);
+            // overflowed the bottom
+            dr.top += adjust;
+          }
+          if (dr.top < constrainTo.top) {
+            xy[1] += (constrainTo.top - dr.top);
+          }
+          // overflowed the top
+          return xy;
+        }
+    }
+  });
+
+// for version 4.1.3 - corrected in 4.2.2
   /*Ext.override(Ext.grid.RowNumberer, {
      renderer: function(value, metaData, record, rowIdx, colIdx, store) {
         var rowspan = this.rowspan;
@@ -23,13 +79,13 @@ Ext.onReady(function () {
             metaData.tdAttr = 'rowspan="' + rowspan + '"';
         }
  
-        metaData.tdCls = Ext.baseCSSPrefix + 'grid-cell-special';        
-       
+        metaData.tdCls = Ext.baseCSSPrefix + 'grid-cell-special';
+
         return store.indexOf(record) + 1;
     }
   });*/
-  
-//TODO check if needed for  version 4.1.3,  4.2.2   
+
+//TODO check if needed for  version 4.1.3,  4.2.2
     /*Ext.override(Ext.view.Table, {
       onUpdate : function(store, record, operation, changedFieldNames) {
         var me = this,
@@ -38,15 +94,15 @@ Ext.onReady(function () {
             oldCells, newCells, len, i,
             columns, overItemCls,
             isHovered, row;
-            
-        if (me.rendered) {        
+
+        if (me.rendered) {
             index = me.store.indexOf(record);
             columns = me.headerCt.getGridColumns();
             overItemCls = me.overItemCls;
  
             // If we have columns which may *need* updating (think lockable grid child with all columns either locked or unlocked)
             // and the changed record is within our view, then update the view
-	    
+
             if (columns.length && index > -1) {
                 newRow = me.bufferRender([record], index)[0];
                 oldRow = me.all.item(index);
@@ -80,37 +136,37 @@ Ext.onReady(function () {
         }
        }
       });*/
-    
-//TODO check if needed for  version 4.1.3,  4.2.2     
+
+//TODO check if needed for  version 4.1.3,  4.2.2
    /*Ext.override(Ext.ZIndexManager, {
       tempHidden: [],
       show: function() {
 	var comp, x, y;
-	
+
 	while (comp = this.tempHidden.shift()) {
 	  x = comp.x;
 	  y = comp.y;
-	  
+
 	  comp.show();
 	  comp.setPosition(x,y);
       }
-    }      
-    }); 
+    }
+    });
  
     Ext.override(Ext.selection.TreeModel, {
-	    
+
 	onRowClick: function (view, record, item, index, e) {
-		// Record index will be -1 if the clicked record is a metadata record and not selectable		 
+		// Record index will be -1 if the clicked record is a metadata record and not selectable
   		if (index !== -1) {
-			if (!this.allowRightMouseSelection(e)) {			      
-				return ;			 
+			if (!this.allowRightMouseSelection(e)) {
+				return ;
 			}
-	
+
 			//Don't process if it's a right-click over a previously selected record.
 			// if (!(e.type === 'contextmenu' && this.isSelected(record))) {
 				this.processSelection(view, record, item, index, e);
 			// }
-		} 
+		}
 	}
     });
 	Ext.override(Ext.selection.Model, {
@@ -142,5 +198,4 @@ Ext.onReady(function () {
 			return false;
 		}
 	});*/
-}); 
-            
 \ No newline at end of file
+});
@@ -22,3 +22,23 @@ input, textarea { font-family:verdana,tahoma,arial,verdana,sans-serif; font-size
 #field2 { left:540px; top:333px; width:200px; }
 .qo-submit { background:transparent url(../images/login/login.gif) no-repeat 0 0; height:22px; left:705px; top:373px; width:43px; }
 .qo-submit-over { background:transparent url(../images/login/login.gif) no-repeat 0 -38px; height:22px; left:705px; top:373px; width:43px; }
+
+.loader {
+  position: absolute;
+  left: 50%;
+  top: 50%;
+  z-index: 999;
+  margin: -75px 0 0 -75px;
+  border: 16px solid #f3f3f3;
+  border-radius: 50%;
+  border-top: 16px solid #3498db;
+  width: 50px;
+  height: 50px;
+  animation: spin 2s linear infinite;
+  display: none;
+}
+
+@keyframes spin {
+  0% { transform: rotate(0deg); }
+  100% { transform: rotate(360deg); }
+}
@@ -19,7 +19,7 @@ class IPIM extends SimulationDataCenterClass
 	protected $energyTableWidth = 200;
  
  
-	protected function addSimulatedRegionToTargetsFile($reg=null,$reg=null){}
+	protected function addSimulatedRegionToTargetsFile($reg=null,$coordName=null){}
  
 	protected function getDatasetName($no) 
 	{
@@ -235,7 +235,7 @@ class TimeTableCacheSortObject
 			{
 				$res = $part->compare($global_intervals[$index_a], $global_intervals[$index_b]);
 				if ($res != 0)
-					return $res;
+					return ($res > 0) ? 1 : -1;
 			}
 			return $index_a-$index_b;
 		});
@@ -328,8 +328,9 @@ class UserMgr
 				// New Bases to add
 				if (count($basesToAdd) > 0) {
 					foreach ($basesToAdd as $baseToAdd) { 
-						$centerNode = $this->makeNewBase($baseToAdd);
-						$this->paramMgr->xmlDom->documentElement->appendChild($centerNode);
+						$centerNode = $this->makeNewBase($baseToAdd);  
+                        if (isset($centerNode))
+                            $this->paramMgr->xmlDom->documentElement->appendChild($centerNode);
 					}
 				}
  
@@ -535,8 +536,9 @@ class UserMgr
  
 	public function init() 
 	{ 
-		if ($this->ddLogin() != 0) 
-			die('<h2>You are trying to log in as '.$this->user.'<br/> Please check that you entered a valid password</h2>');
+		if ($this->ddLogin() != 0) {
+			return FALSE;
+		} 
  
 		$this->userdir = USERPATH."/".$this->user."/";