Implements plot tab rename

Benjamin Renard
1 parent a8c008f1
Showing 5 changed files with 68 additions and 8 deletions Show diff stats
js/app/models/PlotTabNode.js
js/app/views/ExplorerUI.js
js/app/views/PlotComponents/PlotTabPanel.js
php/classes/AmdaAction.php
php/classes/RequestMgr.php
@@ -73,7 +73,7 @@ Ext.define(&#39;amdaModel.PlotTabNode&#39;, {
             break;
         case 'renameTab':
-            console.log('renameTab');
+	    this.renameTab();
             break;
         default:
             break;
@@ -137,6 +137,17 @@ Ext.define(&#39;amdaModel.PlotTabNode&#39;, {
 			}
 		});
 	});
-    }
-   
+    },
+
+    renameTab: function() {
+	if (this.myGetOwnerTree()) {
+		var item = this.myGetOwnerTree().getSelectionModel().selected.items[0];
+		this.myGetOwnerTree().fireEvent('edition', this.myGetOwnerTree().view, item);
+	}
+    },
+
+    rename: function(value,callBackFn) {
+                var dataToSend = {id : this.get('tabid'), old_name: this.modified.text, name: value,  parent : this.data.parentId, leaf: this.isLeaf(), nodeType: this.get('nodeType')};
+		AmdaAction.renameObject(dataToSend, callBackFn);
+        },
 });
@@ -1028,7 +1028,7 @@ Ext.define( &#39;MyTreeEditor&#39;, {
 									event.record.commit();
 									var rec = event.record.data;
 									// in case of directory
-									if (!rec.leaf){
+									if (!rec.leaf && (rec.nodeType != 'plottab')){
 										// set folder's ID returned by server
 										rec.id = result.id;
 									}
@@ -54,7 +54,7 @@ Ext.define(&#39;amdaPlotComp.PlotTabPanel&#39;, {
 		var tabContent = new amdaPlotComp.PlotTabContent({plotElementPanel: this.plotElementPanel, plotTabPanel : this, tabId : tabObject.get('id')});
 		tabContent.setTabObject(tabObject);
     	var tabComp = this.add({
-    		title: 'Plot '+tabNumber,
+    		title: (tabObject.get('tab-name') != '') ? tabObject.get('tab-name') : 'Plot '+tabNumber,
     		closable: true,
     		layout: 'fit',
     		bodyStyle: 'background: none',
@@ -96,7 +96,8 @@ Ext.define(&#39;amdaPlotComp.PlotTabPanel&#39;, {
 		for (i = 0; i < this.items.getCount(); ++i)
 		{
 			var tabNumber =  i+1;
-			this.items.getAt(i).setTitle('Plot '+tabNumber);
+			var tabObj = this.object.tabs().getAt(i);
+			this.items.getAt(i).setTitle((tabObj.get('tab-name') != '') ? tabObj.get('tab-name') : 'Plot '+tabNumber);
 			this.items.getAt(i).items.getAt(0).setTabObject(this.object.tabs().getAt(i));
 		}
 	},
@@ -191,7 +191,7 @@ class AmdaAction
 							$plotTabs = array();
 							foreach ($objplot->tabs as $index => $tab) {
 								$plotTabs[$index] = array(
-									"name" => "Plot ".($index+1),
+									"name" => (!empty($tab->{'tab-name'})) ? $tab->{'tab-name'} : "Plot ".($index+1),
 									"id" => $tab->id,
 								);
 							}
@@ -772,6 +772,7 @@ class AmdaAction
 			   break;
 		  case 'condition' :
 		  case 'request' :
+                  case 'plottab' :
 			   $objectMgr = new RequestMgr($obj->nodeType);
 			   break;
 		  case 'alias' :
@@ -861,6 +862,7 @@ class AmdaAction
 				break;
 			case 'condition' :
 			case 'request' :
+			case 'plottab' :
 				$objectMgr = new RequestMgr($obj->nodeType);
 				break;
 			default:
@@ -30,7 +30,7 @@ class RequestMgr extends AmdaObjectMgr
 		$this->attributes = array('name' => '');
 		$this->optionalAttributes = array();
-		if ($type == 'request') 
+		if ($type == 'request' || $type == 'plottab') 
 		{
 			$this->id_prefix = 'req_';			
 		}
@@ -70,6 +70,52 @@ class RequestMgr extends AmdaObjectMgr
 	{	
 		return false;
 	}
+
+	public function validNameObject($p)
+	{
+		if ($this->type == 'plottab') {
+			if (empty($p->name)) {
+				return array('valid' => false, 'error' => 'Name is required');
+			}
+			return array('valid' => true);
+		}
+		return parent::validNameObject($p);
+	}
+
+	public function renameObject($p)
+        {
+		if ($this->type == 'plottab') {
+			//Rename a plot tab
+			if (!isset($p->parent) || empty($p->parent)) {
+				return array('error' => 'Missing parent definition');
+			}
+			$plotObj = $this->getObject($p->parent);
+			if (is_array($plotObj) && isset($plotObj['error'])) {
+				return array('error' => $plotObj['error']);
+			}
+			if (!isset($plotObj->tabs)) {
+				return array('error' => 'Cannot retrieve tab in plot request');
+			}
+			$renameOK = FALSE;
+			foreach ($plotObj->tabs as &$tab) {
+				if ($tab->id == $p->id) {
+					$tab->{'tab-name'} = $p->name;
+					$renameOK = TRUE;
+					break;
+				}
+			}
+			if (!$renameOK) {
+				return array('error' => 'Cannot retrieve tab in plot request 2');
+			}
+			//Save modification
+			$file = fopen(USERREQDIR.$p->parent, 'w');
+			fwrite($file, json_encode($plotObj));
+			fclose($file);
+			
+			return array('id' => $p->id);
+		}
+		return parent::renameObject($p);
+	}
 	/* Stop Time from StartTime and Interval*/ 
 	public function convertTime($obj)