From: <Se...@us...> - 2009-07-17 19:43:51
|
Revision: 4008 http://jaffa.svn.sourceforge.net/jaffa/?rev=4008&view=rev Author: SeanZ Date: 2009-07-17 19:43:43 +0000 (Fri, 17 Jul 2009) Log Message: ----------- add empty records test to avoid error being thrown. Modified Paths: -------------- trunk/JaffaRIA/source/html/js/extjs/ux/grid/MultiGroupingStore.js Modified: trunk/JaffaRIA/source/html/js/extjs/ux/grid/MultiGroupingStore.js =================================================================== --- trunk/JaffaRIA/source/html/js/extjs/ux/grid/MultiGroupingStore.js 2009-07-17 00:42:49 UTC (rev 4007) +++ trunk/JaffaRIA/source/html/js/extjs/ux/grid/MultiGroupingStore.js 2009-07-17 19:43:43 UTC (rev 4008) @@ -412,7 +412,7 @@ delete this.nextKey; // Need to compare the prior next key, to the first row that was added // This could trigger a complete reload - if(nextKey) { + if(nextKey && r.length>0) { var id = this.reader.meta.id; // Get key field name from reader console.debug("Store.loadRecords : Refresh Check...",id,r[0].data[id],nextKey.data[id]); if(r[0].data[id] != nextKey.data[id]) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Se...@us...> - 2009-09-10 00:50:39
|
Revision: 4081 http://jaffa.svn.sourceforge.net/jaffa/?rev=4081&view=rev Author: SeanZ Date: 2009-09-10 00:13:28 +0000 (Thu, 10 Sep 2009) Log Message: ----------- use !== 0 to test specifically. Modified Paths: -------------- trunk/JaffaRIA/source/html/js/extjs/ux/grid/MultiGroupingStore.js Modified: trunk/JaffaRIA/source/html/js/extjs/ux/grid/MultiGroupingStore.js =================================================================== --- trunk/JaffaRIA/source/html/js/extjs/ux/grid/MultiGroupingStore.js 2009-09-10 00:03:25 UTC (rev 4080) +++ trunk/JaffaRIA/source/html/js/extjs/ux/grid/MultiGroupingStore.js 2009-09-10 00:13:28 UTC (rev 4081) @@ -146,7 +146,7 @@ var result; for (var i = 0; i < len; ++i) { result = v1[i] > v2[i] ? 1 : (v1[i] < v2[i] ? -1 : 0); - if (result != 0) + if (result !== 0) return result; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ga...@us...> - 2010-04-28 20:51:53
|
Revision: 4414 http://jaffa.svn.sourceforge.net/jaffa/?rev=4414&view=rev Author: gautamj Date: 2010-04-28 20:51:47 +0000 (Wed, 28 Apr 2010) Log Message: ----------- Fixed the loadRecords() method to add numeric values only when computing the query limit. This fixes the bug related to the retrieval of only 25 records whenever a column is added to the grouping. Modified Paths: -------------- trunk/JaffaRIA/source/html/js/extjs/ux/grid/MultiGroupingStore.js Modified: trunk/JaffaRIA/source/html/js/extjs/ux/grid/MultiGroupingStore.js =================================================================== --- trunk/JaffaRIA/source/html/js/extjs/ux/grid/MultiGroupingStore.js 2010-04-28 17:42:07 UTC (rev 4413) +++ trunk/JaffaRIA/source/html/js/extjs/ux/grid/MultiGroupingStore.js 2010-04-28 20:51:47 UTC (rev 4414) @@ -418,7 +418,7 @@ if(r[0].data[id] != nextKey.data[id]) { console.debug("Store.loadRecords : Need to refresh all records as they are out of sync"); var pn = this.paramNames; - options.params[pn.limit] = options.params[pn.limit]+options.params[pn.start]-1; + options.params[pn.limit] = (isNaN(options.params[pn.limit]) ? 0 : options.params[pn.limit]) + (isNaN(options.params[pn.start]) ? 0 : options.params[pn.start]); options.params[pn.start] = 0; options.add = false; options.initial = false; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Se...@us...> - 2010-09-24 02:06:53
|
Revision: 4763 http://jaffa.svn.sourceforge.net/jaffa/?rev=4763&view=rev Author: SeanZ Date: 2010-09-24 02:06:47 +0000 (Fri, 24 Sep 2010) Log Message: ----------- Modified to allow sortInfo to be an array of field/direction to be sorted. Modified Paths: -------------- trunk/JaffaRIA/source/html/js/extjs/ux/grid/MultiGroupingStore.js Modified: trunk/JaffaRIA/source/html/js/extjs/ux/grid/MultiGroupingStore.js =================================================================== --- trunk/JaffaRIA/source/html/js/extjs/ux/grid/MultiGroupingStore.js 2010-09-24 00:54:17 UTC (rev 4762) +++ trunk/JaffaRIA/source/html/js/extjs/ux/grid/MultiGroupingStore.js 2010-09-24 02:06:47 UTC (rev 4763) @@ -21,7 +21,12 @@ Ext.ux.grid.MultiGroupingStore = Ext.extend(Ext.data.GroupingStore, { constructor: function(config){ - Ext.ux.grid.MultiGroupingStore.superclass.constructor.apply(this, arguments); + var sortInfo = config.sortInfo || this.sortInfo; + Ext.ux.grid.MultiGroupingStore.superclass.constructor.apply(this, arguments); + if (Ext.isArray(sortInfo)) { + if (sortInfo.length==0) this.sortInfo = []; + else this.sortInfo = sortInfo; + } } /* ---------------------------------------------------------------------- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cos...@us...> - 2012-04-30 21:14:38
|
Revision: 6176 http://jaffa.svn.sourceforge.net/jaffa/?rev=6176&view=rev Author: cosbor11 Date: 2012-04-30 20:34:03 +0000 (Mon, 30 Apr 2012) Log Message: ----------- Added an undefined guard for sorting field. Modified Paths: -------------- trunk/JaffaRIA/source/html/js/extjs/ux/grid/MultiGroupingStore.js Modified: trunk/JaffaRIA/source/html/js/extjs/ux/grid/MultiGroupingStore.js =================================================================== --- trunk/JaffaRIA/source/html/js/extjs/ux/grid/MultiGroupingStore.js 2012-04-30 20:24:00 UTC (rev 6175) +++ trunk/JaffaRIA/source/html/js/extjs/ux/grid/MultiGroupingStore.js 2012-04-30 20:34:03 UTC (rev 6176) @@ -527,14 +527,18 @@ } } if(this.sortInfo && this.remoteSort){ - if(Ext.isArray(this.sortInfo)) + if(Ext.isArray(this.sortInfo)){ for(var i=0;i<this.sortInfo.length;i++) { f=meta(this.sortInfo[i].field); - sort[sort.length] = {fieldName: f.sortFieldName || this.sortInfo[i].field, sortAscending: this.sortInfo[i].direction=='ASC' }; + if(f){ + sort[sort.length] = {fieldName: f.sortFieldName || this.sortInfo[i].field, sortAscending: this.sortInfo[i].direction=='ASC' }; + } } - else { + } else { f=meta(this.sortInfo.field); - sort[sort.length] = {fieldName: f.sortFieldName || this.sortInfo.field, sortAscending: this.sortInfo.direction=='ASC' }; + if(f){ + sort[sort.length] = {fieldName: f.sortFieldName || this.sortInfo.field, sortAscending: this.sortInfo.direction=='ASC' }; + } } } p[this.paramNames.sort]=sort; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <b_c...@us...> - 2012-10-16 18:06:01
|
Revision: 6423 http://jaffa.svn.sourceforge.net/jaffa/?rev=6423&view=rev Author: b_calderwood Date: 2012-10-16 18:05:50 +0000 (Tue, 16 Oct 2012) Log Message: ----------- If consistency check fails properly calculate how many records should be retrieved for refresh. Was incorrectly calculating new limit if the second retrieve was for all records (ie. limit = -1). Modified Paths: -------------- trunk/JaffaRIA/source/html/js/extjs/ux/grid/MultiGroupingStore.js Modified: trunk/JaffaRIA/source/html/js/extjs/ux/grid/MultiGroupingStore.js =================================================================== --- trunk/JaffaRIA/source/html/js/extjs/ux/grid/MultiGroupingStore.js 2012-10-16 00:05:06 UTC (rev 6422) +++ trunk/JaffaRIA/source/html/js/extjs/ux/grid/MultiGroupingStore.js 2012-10-16 18:05:50 UTC (rev 6423) @@ -445,7 +445,9 @@ if(r[0].data[id] != nextKey.data[id]) { console.debug("Store.loadRecords : Need to refresh all records as they are out of sync"); var pn = this.paramNames; - options.params[pn.limit] = (isNaN(options.params[pn.limit]) ? 0 : options.params[pn.limit]) + (isNaN(options.params[pn.start]) ? 0 : options.params[pn.start]); + var oldLimit = (isNaN(options.params[pn.limit]) ? 0 : options.params[pn.limit]); + var oldStart = (isNaN(options.params[pn.start]) ? 0 : options.params[pn.start]); + options.params[pn.limit] = oldLimit < 0?oldLimit:(oldLimit + oldStart); options.params[pn.start] = 0; options.add = false; options.initial = false; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <b_c...@us...> - 2012-11-09 00:09:36
|
Revision: 6471 http://jaffa.svn.sourceforge.net/jaffa/?rev=6471&view=rev Author: b_calderwood Date: 2012-11-09 00:09:28 +0000 (Fri, 09 Nov 2012) Log Message: ----------- After retrieving new records check if any of the new records are already in the existing set. If a duplicate is found this means our records are out of sync and we need to retrieve the full set again. Modified Paths: -------------- trunk/JaffaRIA/source/html/js/extjs/ux/grid/MultiGroupingStore.js Modified: trunk/JaffaRIA/source/html/js/extjs/ux/grid/MultiGroupingStore.js =================================================================== --- trunk/JaffaRIA/source/html/js/extjs/ux/grid/MultiGroupingStore.js 2012-11-07 17:42:22 UTC (rev 6470) +++ trunk/JaffaRIA/source/html/js/extjs/ux/grid/MultiGroupingStore.js 2012-11-09 00:09:28 UTC (rev 6471) @@ -473,20 +473,39 @@ } if (Ext.isArray(o.errors) && o.errors.length>0) { var msg = ''; - for (var i=0; i<o.errors.length; i++) { - msg += (o.errors[i].localizedMessage || this.defaultLocalizedErrorMessage) + '\n<br>'; + for (var i=0; i<o.errors.length; i++) {msg += (o.errors[i].localizedMessage || this.defaultLocalizedErrorMessage) + '\n<br>';} + if (msg) {Ext.MessageBox.show( {title : 'Load Errors',msg : msg,buttons : Ext.MessageBox.OK,icon: Ext.MessageBox.ERROR});} + this.fireEvent('load', this); + } else { + //Check if any of the new records have keys that exist in the current store + var newRecs = o.records?o.records:[]; + var foundKey = false; + if (options && options.add){ + for (var i = 0; i < newRecs.length && !foundKey; i++){ + if (this.data && this.data.containsKey && newRecs[i] && newRecs[i].id && this.data.containsKey(newRecs[i].id)){ + foundKey = true; + } + } } - if (msg) { - Ext.MessageBox.show( { - title : 'Load Errors',//FIXME - msg : msg, - buttons : Ext.MessageBox.OK, - icon: Ext.MessageBox.ERROR - }); + //If a duplicate key is found then records are out of sync, reload all the required records. + if (foundKey){ + console.debug("Store.loadRecords : Need to refresh all records as they are out of sync"); + var pn = this.paramNames; + var oldLimit = (isNaN(options.params[pn.limit]) ? 0 : options.params[pn.limit]); + var oldStart = (isNaN(options.params[pn.start]) ? 0 : options.params[pn.start]); + options.params[pn.limit] = oldLimit < 0?oldLimit:(oldLimit + oldStart); + options.params[pn.start] = 0; + options.add = false; + options.initial = false; + delete this.nextKey; + this.fireEvent("loadexception", this); + console.debug("Store.loadRecords : Reload Using ",options); + this.load(options); + return; + }else{ + Ext.ux.grid.MultiGroupingStore.superclass.loadRecords.call(this, o, options, success); } - this.fireEvent('load', this); - } else { - Ext.ux.grid.MultiGroupingStore.superclass.loadRecords.call(this, o, options, success); + } } }); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <b_c...@us...> - 2013-02-01 18:25:12
|
Revision: 6847 http://jaffa.svn.sourceforge.net/jaffa/?rev=6847&view=rev Author: b_calderwood Date: 2013-02-01 18:25:05 +0000 (Fri, 01 Feb 2013) Log Message: ----------- Merge from 5_10_RELEASE Modified Paths: -------------- trunk/JaffaRIA/source/html/js/extjs/ux/grid/MultiGroupingStore.js Modified: trunk/JaffaRIA/source/html/js/extjs/ux/grid/MultiGroupingStore.js =================================================================== --- trunk/JaffaRIA/source/html/js/extjs/ux/grid/MultiGroupingStore.js 2013-02-01 18:19:46 UTC (rev 6846) +++ trunk/JaffaRIA/source/html/js/extjs/ux/grid/MultiGroupingStore.js 2013-02-01 18:25:05 UTC (rev 6847) @@ -554,11 +554,11 @@ if(Ext.isArray(this.groupField)) for(var i=0;i<this.groupField.length;i++) { f=meta(this.groupField[i]); - sort[sort.length] = {fieldName: f.sortFieldName||this.groupField[i], sortAscending: f.sortDir=='ASC' }; + if (f) sort[sort.length] = {fieldName: f.sortFieldName||this.groupField[i], sortAscending: f.sortDir=='ASC' }; } else { f=meta(this.groupField); - sort[sort.length] = {fieldName: f.sortFieldName||this.groupField, sortAscending: f.sortDir=='ASC' }; + if (f) sort[sort.length] = {fieldName: f.sortFieldName||this.groupField, sortAscending: f.sortDir=='ASC' }; } } if(this.sortInfo && this.remoteSort){ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Se...@us...> - 2013-03-05 18:23:50
|
Revision: 6978 http://jaffa.svn.sourceforge.net/jaffa/?rev=6978&view=rev Author: SeanZ Date: 2013-03-05 18:23:44 +0000 (Tue, 05 Mar 2013) Log Message: ----------- bug 30271: minor spelling error. Modified Paths: -------------- trunk/JaffaRIA/source/html/js/extjs/ux/grid/MultiGroupingStore.js Modified: trunk/JaffaRIA/source/html/js/extjs/ux/grid/MultiGroupingStore.js =================================================================== --- trunk/JaffaRIA/source/html/js/extjs/ux/grid/MultiGroupingStore.js 2013-03-05 16:00:09 UTC (rev 6977) +++ trunk/JaffaRIA/source/html/js/extjs/ux/grid/MultiGroupingStore.js 2013-03-05 18:23:44 UTC (rev 6978) @@ -322,7 +322,7 @@ */ ,nextKey: null - ,defaultLocalizedErrorMessage: 'Internal errors occured, please contact your system administrator.' + ,defaultLocalizedErrorMessage: 'Internal errors occurred, please contact your system administrator.' /** Override the load method so it can merge the groupFields and sortField * into a single sort criteria (group fields need to be sorted by first!) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |