Adding the Delete Column item in the catalog grid menu

furkan
1 parent 560766be
Showing 5 changed files with 105 additions and 4 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
@@ -565,7 +566,13 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
                 fieldsConfig.push(field);
                 columnsConfig.push(column);
             });
-
+            /*var addColumn = Ext.create('Ext.button.Button',{
+                xtype: 'gridcolumn',
+                text:'bonjour',
+                editor: 'textfield',
+                filter: {type: 'string'}
+            });
+            columnsConfig.push(addColumn);*/
             var store = Ext.create('Ext.data.Store', {
                 fields: fieldsConfig,
                 autoDestroy: false,
@@ -844,6 +851,7 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
 	},
     init: function (config)
     {
+        var me = this;
         this.object = config.object;
         this.fieldName = new Ext.form.field.Text({
             fieldLabel: 'Name',
@@ -957,8 +965,48 @@ 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 isDeleteinMenu = false;
+                        // Is there already the item in the menu
+                        Ext.each(menu.items.items, function(items){
+                            if(items.name == 'delete_column'){
+                                isDeleteinMenu = 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 "Delete Column" if conditions satisfied
+                        if(!isDeleteinMenu && menu.activeHeader.paramColumn && nbParamColumns > 1){
+                            menu.add([{
+                                text: 'Delete Column',
+                                name:'delete_column',
+                                handler: function(item,e) {
+                                    AmdaAction.deleteColumn(menu.activeHeader.dataIndex,function(result, e){
+                                        me.toReconfigure = true;
+                                        me.onAfterInit(result);
+                                    });
+                                }
+                            }]);
+                        }
+                        // If there is already the item but only 1 parameter left => not allowed the delete
+                        else if (isDeleteinMenu && nbParamColumns == 1){
+                            Ext.each(menu.items.items, function(items){
+                                if(items.name == 'delete_column'){
+                                    items.setDisabled(true);
+                                }
+                            });
+                        }
+                    }, this);
                 },
                 scope: this
             },
@@ -966,6 +1014,7 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
                     xtype: 'toolbar',
                     items: [{
                             iconCls: 'icon-add',
+                            text:'New line',
                             scope: this,
                             handler: function () {
                                 cellEditing.cancelEdit();
@@ -992,9 +1041,11 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
                                     }
                                 }, this);
                             }
-                        }, {
+                        }, 
+                        {
                             iconCls: 'icon-delete',
                             disabled: true,
+                            text:'Delete Line',
                             itemId: 'delete',
                             scope: this,
                             handler: function () {
@@ -1011,6 +1062,26 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
                                     }, this);
                                 }
                             }
+                        },
+                        '-',{
+                            iconCls: 'icon-add',
+                            text:'New Column(s)',
+                            itemId: 'column_add',
+                            scope: this,
+                            handler: function () {
+                                /*var selection = this.TTGrid.getView().getSelectionModel().getSelection()[0];
+                                if (selection)
+                                {
+                                    var rowId = selection.get('cacheId');
+                                    this.TTGrid.getSelectionModel().deselectAll();
+                                    AmdaAction.removeTTCacheIntervalFromId(rowId, this.isCatalog, function (result, e) {
+                                        this.status = result.status;
+                                        if (!this.TTGrid.getStore().loading) {
+                                            this.TTGrid.getStore().reload();
+                                        }
+                                    }, this);
+                                }
+                            */}
                         }, '->',
                         {
                             text: 'Clear Filters',
@@ -1652,5 +1652,11 @@ class AmdaAction
 		);
 		return $this->executeRequest($args, FunctionTypeEnumClass::PARAMINFO);
 	}
+
+	public function deleteColumn($id){
+		$cacheMgr = new CatalogCacheMgr();
+
+		return $cacheMgr->deleteColumn($id);
+	}
 }
 ?>
@@ -139,5 +139,16 @@ 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());
+   }
 }
 ?>
@@ -36,6 +36,18 @@ class CatalogCacheObject extends TimeTableCacheObject
 			);
 	}
  
+	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 getParametersInfo() {
 		return $this->parameters;
 	}
@@ -198,6 +198,7 @@ $API = array(
 			'isSharedObjectNameAlreadyUsed' => array('len'=>1),
 			'getRequestByProcessId' => array('len'=>1),
 			'parseTemplatedParam' => array('len'=>1),
+			'deleteColumn' => array('len'=> 1)
 		)
 	)
 );