Migration to ExtJS 4.2.4

Benjamin Renard
1 parent c45e3428
Showing 7 changed files with 23 additions and 9 deletions Show diff stats
js/app/models/AmdaNode.js
js/app/models/InteractiveNode.js
js/app/models/PlotObject.js
js/app/stores/AmdaTreeReader.js
js/app/views/OperationsTT.js
js/app/views/TimeTableUI.js
js/lib/ext-override.js
@@ -13,7 +13,7 @@
  *  :           :08/06/2011: CDA - Migration extjs4
  */
 Ext.define('amdaModel.AmdaNode', {
-    extend: 'Ext.data.Model',
+    extend: 'Ext.data.TreeModel',
  
     requires: ['amdaReader.ExplorerReader'],
  
@@ -192,3 +192,4 @@ Ext.define(&#39;amdaModel.AmdaNode&#39;, {
     }
  
 });
+
@@ -700,7 +700,7 @@ Ext.define(&#39;amdaModel.InteractiveNode&#39;, {
                         {
                             var newNode = Ext.create(me.$className,
                                             {
-                                                    leaf : false, nodeType : me.nodeType,
+                                                    leaf : false, nodeType : me.get('nodeType'),
                                                     text : amdaModel.AmdaNode.NEW_DIR_NAME,
                                                     children : []
                                             });
@@ -28,4 +28,6 @@ Ext.define(&#39;amdaModel.PlotObject&#39;, {
     ]//,
  
   //  hasMany: {model: 'amdaModel.PlotPanel', name: 'children'}
+}, function () {
+    Ext.data.NodeInterface.decorate(this);
 });
 \ No newline at end of file
@@ -45,7 +45,7 @@ Ext.define(&#39;amdaReader.AmdaTreeReader&#39;, {
             record.phantom = false;
  
             // Use generated function to extract all fields at once
-            me.convertRecordData(convertedValues, node, record);
+            me.convertRecordData(convertedValues, node, record, me.applyDefaults);
             records.push(record);
  
             if (me.implicitIncludes) {
@@ -62,6 +62,7 @@ Ext.define(&#39;amdaUI.OperationsTT&#39;, {
 	    }
  
 	    var me = this;
+	    me.parent.TTGrid.getSelectionModel().deselectAll();
 	    AmdaAction.operationTTCacheIntervals(extend,shift, function () {
 	    	me.parent.TTGrid.getStore().reload();
  
@@ -92,12 +92,13 @@ Ext.define(&#39;amdaUI.TimeTableUI&#39;, {
         	me.TTGrid.getStore().clearFilter(true);
  
     		//clear sort
-        	me.TTGrid.getStore().sorters = new Ext.util.MixedCollection();
+        	me.TTGrid.getStore().sorters.clear();
+        	//me.TTGrid.getStore().sorters = new Ext.util.MixedCollection();
  
         	//set cache token to the Time Table object
         	me.object.set('cacheToken', result.token);
  
-        	me.TTGrid.getStore().reload();
+        	me.TTGrid.getStore().load();
  
         	me.status = result.status;
  
@@ -223,6 +224,7 @@ Ext.define(&#39;amdaUI.TimeTableUI&#39;, {
 	},
  
 	addInterval : function(start, stop) {
+		this.TTGrid.getSelectionModel().deselectAll();
 	   AmdaAction.addTTCacheInterval({'start' : start, 'stop' : stop},function (result, e) {
 		   this.TTGrid.getStore().reload();
 		   this.status = result.status;
@@ -390,21 +392,26 @@ Ext.define(&#39;amdaUI.TimeTableUI&#39;, {
  
 	    	            	//context.grid.getSelectionModel().deselectAll();
 	    	            	//Interval is modified on the server side
+	    	            	me.editing = true;
+	    	            	
 	    	            	AmdaAction.modifyTTCacheInterval(obj, function (result, e) {
+	    	            		
 	    	            		var ttModule = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.tt.id);
                     			if (ttModule)
                     				ttModule.getUiContent().status = result.status;
+                    			context.grid.getSelectionModel().deselectAll();
 	    	            		context.store.reload({
 	                        		callback : function(records, options, success) {
-	                        			context.view.refresh();
 	                        			context.view.bufferedRenderer.scrollTo(context.rowIdx, true, function() {
 	                        				me.fireEvent('edit', me, context);
-		            	    	            me.editing = false;
+	                        				me.editing = false;
 	                        			}, me);	    	            
 	                        		}
 	                        	});
 	                        }, this);
 	    	            }
+	    	            else
+	    	            	me.editing = false;
 	    	        }
 	    	    }
  
@@ -537,6 +544,7 @@ Ext.define(&#39;amdaUI.TimeTableUI&#39;, {
                         var row = 0;
                         if (selection)
                         	row = store.indexOf(selection) + 1;
+                        this.TTGrid.getSelectionModel().deselectAll();
  
                         var me = this;
                         AmdaAction.addTTCacheInterval({'index' : row}, function (result, e) {
@@ -544,6 +552,7 @@ Ext.define(&#39;amdaUI.TimeTableUI&#39;, {
                         	this.TTGrid.getStore().reload({
                         		callback : function(records, options, success) {
                         			me.TTGrid.getView().bufferedRenderer.scrollTo(row, false, function() {
+                        				me.TTGrid.getView().select(row);
                         				cellEditing.startEditByPosition({row: row, column: 1});	
                         			}, me);	
                         		}
@@ -559,6 +568,7 @@ Ext.define(&#39;amdaUI.TimeTableUI&#39;, {
                         var selection = this.TTGrid.getView().getSelectionModel().getSelection()[0];
                         if (selection) {
                         	var rowId = selection.get('cacheId');
+                        	this.TTGrid.getSelectionModel().deselectAll();
                         	AmdaAction.removeTTCacheIntervalFromId(rowId, function (result, e) {
                         		this.status = result.status;
                             	this.TTGrid.getStore().reload();
@@ -97,7 +97,7 @@ Ext.onReady(function () {
     }      
     });*/  
  
-	Ext.override(Ext.selection.Model, {
+	/*Ext.override(Ext.selection.Model, {
 		storeHasSelected: function(record) {
 			var store = this.store,
 				records,
@@ -125,6 +125,6 @@ Ext.onReady(function () {
 			}
 			return false;
 		}
-	});
+	});*/
 }); 
  
 \ No newline at end of file