Merge branch 'catalog-update-view' into 'master'

Catalog update view See merge request !32

Merge branch 'catalog-update-view' into 'master'
Catalog update view See merge request !32
Elena Budnik
2 parents 754a2160 941aea39
Showing 1 changed file with 69 additions and 50 deletions Show diff stats
js/app/views/CatalogUI.js
@@ -21,7 +21,10 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
 		this.init(config);
 		this.callParent(arguments);
 		this.toReconfigure = true;
-		if (this.object) this.loadObject();	         
+		
+		if (this.object) {
+			this.loadObject();
+		}
 	},
  
 	setObject : function (object, toReconfigure) {	
@@ -120,9 +123,9 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
 							});
  
 			columns[1] = Ext.create('Ext.grid.column.Column', { text: 'Start Time', sortable : true, dataIndex: 'start',  
-						width : 120, menuDisabled: true, editor : { xtype:'datefield', allowBlank:false, hideTrigger: true, format : 'Y-m-d\TH:i:s'}});
+						width : 120, menuDisabled: false, editor : { xtype:'datefield', allowBlank:false, hideTrigger: true, format : 'Y-m-d\TH:i:s'}});
 			columns[2] = Ext.create('Ext.grid.column.Column', { text: 'Stop Time', sortable : true,  dataIndex: 'stop',  
-						width : 120, menuDisabled: true, editor : { xtype:'datefield', allowBlank:false, hideTrigger: true,  format : 'Y-m-d\TH:i:s'}});
+						width : 120, menuDisabled: false, editor : { xtype:'datefield', allowBlank:false, hideTrigger: true,  format : 'Y-m-d\TH:i:s'}});
  
 			Ext.Array.each(result.parameters, function(obj) 
 			{			 
@@ -133,13 +136,13 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
 				if (obj.type == 1) // dateTime
 				{
 					columns[i] = Ext.create('Ext.grid.column.Column', { text: obj.name, sortable : true,  dataIndex: index,  
-						width : 120, menuDisabled: true, editor : { xtype:'datefield', allowBlank:false, hideTrigger: true,  format : 'Y-m-d\TH:i:s'}});
+						width : 120, menuDisabled: false, editor : { xtype:'datefield', allowBlank:false, hideTrigger: true,  format : 'Y-m-d\TH:i:s'}});
 				}
 				else
 				{					 
 					width = 50. *  parseInt(obj.size);				
 					columns[i] = Ext.create('Ext.grid.column.Column', { text: obj.name, sortable : false,  dataIndex: index,  
-						width : width, menuDisabled: true, editor: 'textfield' });
+						width : width, menuDisabled: false, editor: 'textfield' });
 				}
 				i++;
 			});
@@ -172,21 +175,21 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
 							me.updateCount();
 						//Statistical plugin
 						//   	this.fireEvent("refresh");
-					}
+					} 
 				}
-			});			
+			});
  
 			me.TTGrid.reconfigure(store, columns);
-		}		
+		}
 		me.TTGrid.getSelectionModel().deselectAll();
 	//         	        	
 	//         	// clear filters
 	//         	me.TTGrid.getStore().clearFilter(true);
 	//         
-	//     		//clear sort
-	//         	me.TTGrid.getStore().sorters.clear();
-	//         	//me.TTGrid.getStore().sorters = new Ext.util.MixedCollection();
-	         	
+		// clear sort
+		me.TTGrid.getStore().sorters.clear();
+		// me.TTGrid.getStore().sorters = new Ext.util.MixedCollection();
+			
 		//set cache token to the Catalog object
 		me.object.set('cacheToken', result.token);
 		me.setParamInfo(result.parameters);	
@@ -216,8 +219,9 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
 		}
 		else {
 			var typeTT = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.catalog.id).linkedNode.data.nodeType;
-			if (this.object.get('id') == '') {														  				
-				//TODO ?  
+			
+			if (this.object.get('id') == '') {
+				AmdaAction.initTTCache(this.isCatalog, 1, this.onAfterInit,this); 
 			}	
 			else {
 				//From existing TT file
@@ -284,8 +288,7 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
 		if (btn == 'cancel') return;
  
 		this.fieldName.clearInvalid();
-		this.saveProcess(true);		
-		
+		this.saveProcess(true);
 	},
  
 	/**
@@ -342,33 +345,38 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
 					// Only update the record if the new value is different than the
 					// startValue. When the view refreshes its el will gain focus
 					if (!record.isEqual(value, startValue)) {
-					var obj = {};					
-					 
-					obj['cacheId']  = record.get('cacheId');
-					obj['isCatalog'] = true;
-					obj[activeColumn.dataIndex] = value;								  
-					
-					//Interval is modified on the server side
-					me.editing = true;
-					
-					AmdaAction.modifyTTCacheInterval(obj, function (result, e) {						
-						var module = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.catalog.id);
-						if (module)
-							module.getUiContent().status = result.status;
-						context.grid.getSelectionModel().deselectAll();
-						context.store.reload({
-							callback : function(records, options, success) {
-								context.view.bufferedRenderer.scrollTo(context.rowIdx, true, function() {
-									me.fireEvent('edit', me, context);
-									me.editing = false;
-								}, me);	    	            
+						var obj = {};					
+						
+						obj['cacheId']  = record.get('cacheId');
+						obj['isCatalog'] = true;
+						obj[activeColumn.dataIndex] = value;								  
+						
+						//Interval is modified on the server side
+						me.editing = true;
+						
+						AmdaAction.modifyTTCacheInterval(obj, function (result, e) {						
+							var module = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.catalog.id);
+							if (module)
+								module.getUiContent().status = result.status;
+							if (!context.store.loading) {
+								context.grid.getSelectionModel().deselectAll();
+								context.store.reload({
+									callback : function(records, options, success) {
+										context.view.bufferedRenderer.scrollTo(context.rowIdx, true, function() {
+											me.fireEvent('edit', me, context);
+											me.editing = false;
+										}, me);
+									}
+								});
+							}
+							else {
+								me.editing = false;
 							}
-						});
 						}, this);
 					}
 					else
 						me.editing = false;
-				}
+					}
 			}	
 		});
  
@@ -376,7 +384,8 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
 			height: 530,
 			columns: [ ],
 			frame: true,
-			columnLines: true,
+			columnLines: true,	
+			selModel: {pruneRemoved: false},
 			//	selType: 'cellmodel',
 			plugins: [ cellEditing, { ptype : 'bufferedrenderer'} ],
 			dockedItems: [{
@@ -397,14 +406,16 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
 						var me = this;
 						AmdaAction.addTTCacheInterval({'index' : row, 'isCatalog' : true}, function (result, e) {
 							this.status = result.status;
-							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);	
-								}
-							});
+							if (!this.TTGrid.getStore().loading) {
+								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);
+									}
+								});
+							}
 						}, this);
 					}
 				},{
@@ -420,7 +431,9 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
 							this.TTGrid.getSelectionModel().deselectAll();
 							AmdaAction.removeTTCacheIntervalFromId(rowId, this.isCatalog, function (result, e) {
 								this.status = result.status;
-								this.TTGrid.getStore().reload();
+								if (!this.TTGrid.getStore().loading) {
+									this.TTGrid.getStore().reload();
+								}
 							}, this);
 						}
 					}
@@ -477,17 +490,23 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
 								var module = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.catalog.id);	
  
 								if (!module) return;
+											  
+								module.createLinkedNode();
+ 								module.createObject();
+								
 								var obj = module.linkedNode.get('object');
  
-								if (obj && obj.get('id') == '' && !obj.get('fromPlugin')) {
 									var me = this;
  
 									Ext.Msg.prompt('Define Parameters', 'Please enter parameters number:', function(btn, text){
 										if (btn == 'ok'){
 											AmdaAction.initTTCache(me.isCatalog, text, me.onAfterInit, me); 
 										}
+										else {
+											AmdaAction.initTTCache(me.isCatalog, 0, me.onAfterInit, me);
+										}
 									}, this);
-								}	
+									
 							}
 						}]
 					},