Merge FER_9660 into develop

Benjamin Renard
2 parents 315ba40a 42c4ccd3
Showing 5 changed files with 356 additions and 14 deletions Show diff stats
js/app/views/CatalogUI.js
php/classes/AmdaAction.php
php/classes/CatalogCacheMgr.php
php/classes/CatalogCacheObject.php
php/config.php
@@ -483,7 +483,8 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
                     sortable: true,
                     dataIndex: obj.id,
                     menuDisabled: false,
-                    minWidth: 50
+                    minWidth: 50,
+                    paramColumn: true
                 };
                 switch (obj.type) {
                     case 0: //double
@@ -503,12 +504,10 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
                             dateFormat: 'Y-m-d\\TH:i:s.u',
                             convert: function (value, rec) {
                                 if (!Ext.isDate(value)) {
-                                    var valueString = new String(value);
-                                    return new Date(valueString.replace(/\-/g, '\/').replace(/[T|Z]/g, ' '));
+                                    return new Date(value);
                                 }
                                 return value;
                             }
-
                         });
                         column = Ext.apply({}, column, {
                             xtype: 'datecolumn',
@@ -519,7 +518,18 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
                                 hideTrigger: true,
                                 format: 'Y-m-d\\TH:i:s.u'
                             },
-                            filter: {type: 'date', dateFormat: 'Y-m-d'}
+                            filter: {type: 'date', dateFormat: 'Y-m-d'},
+                            renderer: function (value) {
+                                if (value != null) {
+                                    if (Ext.isDate(value)) {
+                                        return Ext.Date.format(value, 'Y-m-d\\TH:i:s.u');
+                                    } else {
+                                        return Ext.Date.format(new Date(value), 'Y-m-d\\TH:i:s.u');
+                                    }
+                                } else {
+                                    return value;
+                                }
+                            }
                         });
                         break;
                     case 2: //string
@@ -565,7 +575,6 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
                 fieldsConfig.push(field);
                 columnsConfig.push(column);
             });
-
             var store = Ext.create('Ext.data.Store', {
                 fields: fieldsConfig,
                 autoDestroy: false,
@@ -842,8 +851,157 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
             } 
 		}
 	},
+
+    columnForm: function(isNew, self, me , columnInfo = null){
+        
+        
+        // Different avaible types
+        var types = Ext.create('Ext.data.Store', {
+        fields: ['type', 'name'],
+        data : [
+            {"type":2, "name":"String"},
+            {"type":3, "name":"Integer"},
+            {"type":0, "name":"Float"},
+            {"type":1,"name":"TIme"}
+        ]
+        });
+
+        // Window for the creation of the new Column
+        var window = Ext.create('Ext.window.Window', {
+            title: (isNew) ? 'New Column' : 'Edit Column',
+            width: 275,
+            height: 155,
+            closable:false,
+            modal:true,
+            resizable: false,
+            items: [
+                {
+                    xtype: 'form',
+                    layout: 'form',
+                    id: 'simpleForm',
+                    frame: true,
+                    bodyPadding: '5 5 0',
+                    fieldDefaults: {
+                        msgTarget: 'side',
+                        labelWidth: 85
+                    },
+                    items: [{
+                        // Name 
+                        xtype:'textfield', 
+                        fieldLabel: 'Column Name',
+                        name: 'nameColumn',
+                        value: (isNew) ? null : columnInfo.name,
+                        allowBlank: false,
+                        tooltip: 'Enter the name of the column you want to create'
+                    },{
+                        // Type
+                        xtype: 'combobox',
+                        fieldLabel: 'Data Type',
+                        name:'typeColumn',
+                        store:types,
+                        allowBlank: false,
+                        value : (isNew) ? null : columnInfo.type,
+                        queryMode: 'local',
+                        displayField: 'name',
+                        valueField: 'type',
+                        editable: false,
+                        tooltip: 'Enter the type of data you want to put in this column'
+                    },
+                    {
+                        // Size
+                        xtype:'numberfield',
+                        fieldLabel: 'Size',
+                        name: 'sizeColumn',
+                        value: (isNew) ? 1 : columnInfo.size,
+                        maxValue: 3,
+                        minValue: 1,
+                        allowBlank: false,
+                        tooltip: 'For exemple: 1 for scalar type or 3 for a vector'
+                    }],
+
+                    buttons: [{
+                        text: 'Save',
+                        handler: function() {
+                            // If the form is correctly filled, we continue
+                            if(this.up('form').getForm().isValid()){
+                                if(isNew){
+                                    var newColumnPrefix='added_param_id_';
+                                    var nbAddedColumn= 0;
+                                    Ext.each(self.TTGrid.headerCt.getGridColumns(), function(column){
+                                        if(column.dataIndex.substr(0, 15) == newColumnPrefix){
+                                            nbAddedColumn++;
+                                        }
+                                    });
+
+                                    AmdaAction.addColumn(newColumnPrefix+nbAddedColumn,
+                                                        this.up('form').getForm().findField('nameColumn').getValue(),
+                                                        this.up('form').getForm().findField('typeColumn').getValue(),
+                                                        this.up('form').getForm().findField('sizeColumn').getValue(),
+                                                        function(result, e){
+                                        if(result){
+                                            me.toReconfigure = true;
+                                            me.onAfterInit(result);
+                                            window.close();
+                                        }
+                                    });
+                                }
+                                else{
+                                    var newName = null;
+                                    var newType = null;
+                                    var newSize = null;
+
+                                    // Check if there is modifications
+                                    if(this.up('form').getForm().findField('nameColumn').getValue() != columnInfo.name){
+                                        newName = this.up('form').getForm().findField('nameColumn').getValue();
+                                    }
+                                    if(this.up('form').getForm().findField('typeColumn').getValue() != columnInfo.type){
+                                        newType = this.up('form').getForm().findField('typeColumn').getValue();
+                                    }
+                                    if(this.up('form').getForm().findField('sizeColumn').getValue() != columnInfo.size){
+                                        newSize = this.up('form').getForm().findField('sizeColumn').getValue();
+                                    }
+
+                                    if(newName != null || newType != null || newSize != null)
+                                    {
+                                        AmdaAction.editColumn(columnInfo.id, newName, newType, newSize, function(result, e){
+                                            if(result){
+                                                me.toReconfigure = true;
+                                                me.onAfterInit(result);
+                                                window.close();
+                                            }
+                                        });
+                                        
+                                    }
+                                    else{
+                                        window.close();
+                                    }
+                                }
+                            }
+                        },
+                    },
+                    {
+                        // to reset the form
+                        text: 'Reset',
+                        handler: function() {
+                            this.up('form').getForm().reset();
+                        }
+                    },
+                    {
+                        // To quit the window
+                        text: 'Cancel',
+                        handler: function() {
+                            window.close();
+                        }
+                    }]
+                }
+            ]
+        }).show();
+        
+    },
+
     init: function (config)
     {
+        var me = this;
         this.object = config.object;
         this.fieldName = new Ext.form.field.Text({
             fieldLabel: 'Name',
@@ -928,7 +1086,7 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
  
             ]
         };
-
+        const self = this;
         this.TTGrid = Ext.create('Ext.grid.Panel', {
             height: 530,
             features: [filters],
@@ -957,8 +1115,74 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
             //	selType: 'cellmodel',
             plugins: [cellEditing, {ptype: 'bufferedrenderer'}],
             listeners: {
-                afterrender: function () {
+                afterrender: function ( ) {
                     this.TTGrid.headerCt.resizer.tracker.gridBugFix = true;
+                    // Adding "Delete Column" in the menu
+                    var menu = this.TTGrid.headerCt.getMenu();
+                    menu.on('beforeshow',function(){
+                        var deleteName='delete_column';
+                        var editName= 'edit_column';
+                        var isDeleteinMenu = false;
+                        var isEditInMenu = false;
+                        // Is there already the delete or edit item in the menu
+                        Ext.each(menu.items.items, function(items){
+                            if(items.name == deleteName){
+                                isDeleteinMenu = true;
+                            }
+                            if(items.name == editName){
+                                isEditInMenu = true;
+                            }
+
+                        });
+                        // Computing the number of parameters in the catalog
+                        var nbParamColumns=0;
+                        Ext.each(this.TTGrid.headerCt.getGridColumns(), function(column){
+                            if(column.paramColumn){
+                                nbParamColumns++
+                            }
+                        });
+
+                        // Adding the "Edit Column" if conditions satisfied
+                        if(!isEditInMenu){
+                            menu.add({
+                                text: 'Edit Column',
+                                iconCls: 'icon-parameters',
+                                name: editName,
+                                handler: function(item,e) {
+                                    AmdaAction.getCatColumnInfo(menu.activeHeader.dataIndex,function(result, e){
+                                        if(result){
+                                            me.columnForm(false, self,me, result);
+                                        }
+                                    });
+                                }
+                            });
+                        }
+
+                        // Adding the "Delete Column" if conditions satisfied
+                        if(!isDeleteinMenu){
+                            menu.add({
+                                text: 'Delete Column',
+                                iconCls: 'icon-delete',
+                                disabled:false,
+                                name: deleteName,
+                                handler: function(item,e) {
+                                    AmdaAction.deleteColumn(menu.activeHeader.dataIndex,function(result, e){
+                                        me.toReconfigure = true;
+                                        me.onAfterInit(result);
+                                    });
+                                }
+                            });
+                        }
+
+                        Ext.each(menu.items.items, function(item){
+                            if(item.name == deleteName){
+                                item.setDisabled(!menu.activeHeader.paramColumn || nbParamColumns <= 1);
+                            }
+                            if(item.name == editName){
+                                item.setDisabled(!menu.activeHeader.paramColumn);
+                            }
+                        });
+                    }, this);
                 },
                 scope: this
             },
@@ -966,6 +1190,7 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
                     xtype: 'toolbar',
                     items: [{
                             iconCls: 'icon-add',
+                            text:'New line',
                             scope: this,
                             handler: function () {
                                 cellEditing.cancelEdit();
@@ -992,9 +1217,11 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
                                     }
                                 }, this);
                             }
-                        }, {
+                        }, 
+                        {
                             iconCls: 'icon-delete',
                             disabled: true,
+                            text:'Delete Line',
                             itemId: 'delete',
                             scope: this,
                             handler: function () {
@@ -1011,6 +1238,16 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
                                     }, this);
                                 }
                             }
+                        },
+                        '-',{
+                            iconCls: 'icon-add',
+                            text:'New Column(s)',
+                            itemId: 'column_add',
+                            scope: this,
+                            handler: function () {
+
+                                me.columnForm(true, self,me);
+                            }
                         }, '->',
                         {
                             text: 'Clear Filters',
@@ -1652,5 +1652,26 @@ class AmdaAction
 		);
 		return $this->executeRequest($args, FunctionTypeEnumClass::PARAMINFO);
 	}
+
+	public function deleteColumn($id){
+		$cacheMgr = new CatalogCacheMgr();
+
+		return $cacheMgr->deleteColumn($id);
+	}
+
+	public function addColumn($id, $name, $type, $size){
+		$cacheMgr = new CatalogCacheMgr();
+		return $cacheMgr->addColumn($id,$name, $type,$size);
+	}
+
+	public function getCatColumnInfo($id){
+		$cacheMgr = new CatalogCacheMgr();
+		return $cacheMgr->getCatColumnInfo($id);
+	}
+
+	public function editColumn($id, $name, $type, $size){
+		$cacheMgr = new CatalogCacheMgr();
+		return $cacheMgr->editColumn($id,$name, $type,$size);
+	}
 }
 ?>
@@ -7,6 +7,7 @@
 class CatalogCacheMgr extends TimeTableCacheMgr
 {
 	const DEFAULT_PARAM_ID_PREFIX = 'cat_param_id_';
+	const DEFAULT_NEW_PARAM_ID_PREFIX = 'added_param_id_'; 
 	private $isForVisu = FALSE;
  
 	function __construct($isForVisu = FALSE) {
@@ -24,7 +25,7 @@ class CatalogCacheMgr extends TimeTableCacheMgr
     $this->cache = new CatalogCacheObject();
 		if (!empty($options['nparams'])) {
 			for ($i = 0; $i < (int)$options['nparams']; $i++) {
-				$this->cache->addParameter(CatalogCacheMgr::DEFAULT_PARAM_ID_PREFIX.(string)($i+1), 'column_'.(string)($i+1), 1, 0, "");
+				$this->cache->addParameter(CatalogCacheMgr::DEFAULT_PARAM_ID_PREFIX.(string)($i+1), 'column_'.(string)($i+1), 1, 0, "", FALSE);
 			}
 		}
 		else if (!empty($options['parameters'])) {
@@ -43,7 +44,7 @@ class CatalogCacheMgr extends TimeTableCacheMgr
 				if (isset($parameter['description'])) {
 					$description = $parameter['description'];
 				}
-				$this->cache->addParameter($id, $parameter['name'], intval($parameter['size']), intval($parameter['type']), $description);
+				$this->cache->addParameter($id, $parameter['name'], intval($parameter['size']), intval($parameter['type']), $description, FALSE);
 				++$index;
 			}
 		}
@@ -72,7 +73,7 @@ class CatalogCacheMgr extends TimeTableCacheMgr
 			if (isset($parameter['description'])) {
 				$description = $parameter['description'];
 			}
-			$this->cache->addParameter($parameter['id'], $parameter['name'], intval($parameter['size']), intval($parameter['type']), $parameter['description']);
+			$this->cache->addParameter($parameter['id'], $parameter['name'], intval($parameter['size']), intval($parameter['type']), $parameter['description'], FALSE);
 		}
  
 		return $result+ array('parameters' => $info['parameters']);
@@ -147,5 +148,42 @@ class CatalogCacheMgr extends TimeTableCacheMgr
  
 		 return $result + array('parameters' => $parameters_chart);
    }
+
+   public function deleteColumn($id){
+		if (!$this->loadFromFile())
+		return array('success' => false, 'message' => 'Cannot load cache file');
+
+		$result = $this->cache->deleteParameter($id);
+		if ($result){
+			$this->saveToFile();
+		}
+		return array('success' => $result , 'token' => $this->cache->getToken(), 'status' => $this->cache->getStatus(),'parameters' => $this->cache->getParametersInfo());
+   }
+
+   public function addColumn($id,$name, $type,$size){
+		if (!$this->loadFromFile())
+		return array('success' => false, 'message' => 'Cannot load cache file');
+		$isNew=true;
+		$this->cache->addParameter($id,$name, $size, $type, "", $isNew);
+		$this->saveToFile();
+		return array('success' => true , 'token' => $this->cache->getToken(), 'status' => $this->cache->getStatus(),'parameters' => $this->cache->getParametersInfo());
+   }
+
+   public function getCatColumnInfo($id){
+	if (!$this->loadFromFile())
+		return array('success' => false, 'message' => 'Cannot load cache file');
+	
+	return $this->cache->getParameterInfo($id);
+   }
+
+   public function editColumn($id,$name, $type,$size){
+		if (!$this->loadFromFile())
+			return array('success' => false, 'message' => 'Cannot load cache file');
+
+		$this->cache->editParameter($id,$name, $type, $size);
+
+		$this->saveToFile();
+		return array('success' => true , 'token' => $this->cache->getToken(), 'status' => $this->cache->getStatus(),'parameters' => $this->cache->getParametersInfo());
+	}
 }
 ?>
@@ -26,7 +26,7 @@ class CatalogCacheObject extends TimeTableCacheObject
 		return $intervalObj;
 	}
  
-	public function addParameter($id, $name, $size, $type, $description)
+	public function addParameter($id, $name, $size, $type, $description, $isNew = false)
 	{
 	    $this->parameters[] = array(
 				'id' => $id,
@@ -35,12 +35,53 @@ class CatalogCacheObject extends TimeTableCacheObject
 				'type' => $type,
 				'description' => $description,
 			);
+		if($isNew){
+			$this->isModified = $isNew;
+		}
+	}
+
+	public function deleteParameter($id){
+		foreach($this->parameters as $index=>$param){
+			if($id == $param['id']){
+				unset($this->parameters[$index]);
+				$this->parameters = array_values($this->parameters);
+				$this->isModified = TRUE;
+				return true;
+			}
+		}
+		return false;
+	}
+
+	public function editParameter($id, $name, $type, $size)
+	{
+		foreach ($this->parameters as $index=>$param){
+			if($id == $param['id']){
+				if(isset($name))
+					$this->parameters[$index]['name'] = $name;
+				if(isset($type))
+					$this->parameters[$index]['type'] = $type;
+				if(isset($size))
+					$this->parameters[$index]['size'] = $size;
+				$this->isModified = TRUE;
+				return true;
+			}
+		}
+		return false;
 	}
  
 	public function getParametersInfo() {
 		return $this->parameters;
 	}
  
+	public function getParameterInfo($id){
+		foreach ($this->parameters as $index=>$param){
+			if($id == $param['id']){
+				return $param;
+			}
+		}
+		return false;
+	}
+
 	public function writeAdditionalHeaderBin($handle)
 	{
 			//Params Number
@@ -127,7 +168,7 @@ class CatalogCacheObject extends TimeTableCacheObject
 					$description .= chr($res['description']);
 				}
  
-				$this->addParameter($id, $name, $size, $type, $description);
+				$this->addParameter($id, $name, $size, $type, $description, FALSE);
 			}
 			return true;
 	}
@@ -198,6 +198,11 @@ $API = array(
 			'isSharedObjectNameAlreadyUsed' => array('len'=>1),
 			'getRequestByProcessId' => array('len'=>1),
 			'parseTemplatedParam' => array('len'=>1),
+			// Furkan - New Catalog Options
+			'deleteColumn' => array('len'=> 1),
+			'addColumn' => array('len' => 4),
+			'getCatColumnInfo' => array('len' => 1),
+			'editColumn' => array('len' => 4)
 		)
 	)
 );