Fix TT operation with shared TT (#9497)

Benjamin Renard
1 parent 698494ac
Showing 3 changed files with 12 additions and 7 deletions Show diff stats
js/app/models/AmdaTimeObject.js
js/app/models/TimeTableNode.js
js/app/views/TimeTableOperationUI.js
@@ -12,12 +12,17 @@
  
  
 Ext.define('amdaModel.TTobject', {
-    extend: 'amdaModel.AmdaObject',
+     extend: 'amdaModel.AmdaObject',
+
+     fields : [
+         {name: 'nodeType', type: 'string'}
+     ],
  
      getJsonValues : function () {
          var values  = new Object();
          values.timeTableName = this.get('name');
          values.id = this.get('id');
+         values.nodeType = this.get('nodeType');
          return values;
      }
 }); 
@@ -135,7 +135,7 @@ Ext.define(&#39;amdaModel.TimeTableNode&#39;, {
 		var me = this;   
 		myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.tt_op.id, true, function (module) {
 			module.createWindow();
-			module.getUiContent().addTT(me.get('text'), me.get('id'));
+			module.getUiContent().addTT(me.get('text'), me.get('id'), me.get('nodeType'));
 		});
 	},
  
@@ -17,13 +17,13 @@ Ext.define(&#39;amdaUI.TimeTableOperationUI&#39;, {
 		this.callParent(arguments);
 	},
  
-	addTT : function(newTTName,newTTid) {
+	addTT : function(newTTName,newTTid,nodeType) {
 		// search for an existing record in store with this unique name
         var existingIndex = this.TTGrid.store.findExact( 'name', newTTName);
         // if no corresponding TT found
         if (existingIndex == -1){
             // adding the time table to the TTGrid of TT download 
-            var r = Ext.create('amdaModel.TTobject', { id: newTTid, name: newTTName });
+            var r = Ext.create('amdaModel.TTobject', { id: newTTid, name: newTTName, nodeType: nodeType});
             this.TTGrid.store.insert(this.TTGrid.store.getCount(),r);   
         }  
 	}, 
@@ -125,7 +125,7 @@ Ext.define(&#39;amdaUI.TimeTableOperationUI&#39;, {
 		          var timeTableOperationModule = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.tt_op.id);
 		          if (!timeTableOperationModule)
 		        	  return false;
-		          timeTableOperationModule.getUiContent().addTT(data.records[0].get('text'),data.records[0].get('id'));
+		          timeTableOperationModule.getUiContent().addTT(data.records[0].get('text'),data.records[0].get('id'), data.records[0].get('nodeType'));
 		          return true;
 		        }
 		    });
@@ -173,7 +173,7 @@ Ext.define(&#39;amdaUI.TimeTableOperationUI&#39;, {
 			            	   		var ttids = [];
 			            	   		var name= "";
 			            	   		Ext.each(tts, function(tt, index) {
-			            	   			ttids[index] = tt.data.id;
+			            	   			ttids[index] = {'id': tt.data.id, 'nodeType' : tt.data.nodeType};
 			            	   			name = name + tt.data.name + " ";
 			            	   		});
 			            	   		// Time table's name and history field
@@ -235,7 +235,7 @@ Ext.define(&#39;amdaUI.TimeTableOperationUI&#39;, {
 				            	   	var tts = this.TTGrid.getStore().data.items;
 			            	   		var ttids = [];
 			            	   		Ext.each(tts, function(tt, index) {
-			            	   			ttids[index] = tt.data.id;
+			            	   			ttids[index] = {'id': tt.data.id, 'nodeType': tt.data.nodeType};
 			            	   		});
 			            	   		// Time table's name and history field
 			            	   		var newTabName = tts[0].data.name + "_I_" + tts[1].data.name;