extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-25 09:23:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'changable_column_order'

Browse Source
This commit is contained in:
Hadi Nategh 2019-07-22 11:55:15 +02:00
commit d5b8242b19
1 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
api/js/etemplate/et2_extension_nextmatch.js
View File

@ -809,9 +809,10 @@ var et2_nextmatch = (function(){ "use strict"; return et2_DOMWidget.extend([et2_
} }
var app = ''; var app = '';
var list = [];
if(this.options.settings.columnselection_pref) { if(this.options.settings.columnselection_pref) {
var pref = {}; var pref = {};
var list = et2_csvSplit(this.options.settings.columnselection_pref, 2, "."); list = et2_csvSplit(this.options.settings.columnselection_pref, 2, ".");
if(this.options.settings.columnselection_pref.indexOf('nextmatch') == 0) if(this.options.settings.columnselection_pref.indexOf('nextmatch') == 0)
{ {
app = list[0].substring('nextmatch'.length+1); app = list[0].substring('nextmatch'.length+1);
@ -854,10 +855,18 @@ var et2_nextmatch = (function(){ "use strict"; return et2_DOMWidget.extend([et2_
size = this.egw().preference(size_pref, app); size = this.egw().preference(size_pref, app);
} }
if(!size) size = {}; if(!size) size = {};
// Column order
var order = {};
for(var i = 0; i < columnDisplay.length; i++)
{
order[columnDisplay[i]] = i;
}
return { return {
visible: columnDisplay, visible: columnDisplay,
visible_negated: negated, visible_negated: negated,
size: size size: size,
order: order
}; };
}, },
@ -872,6 +881,7 @@ var et2_nextmatch = (function(){ "use strict"; return et2_DOMWidget.extend([et2_
var columnDisplay = prefs.visible; var columnDisplay = prefs.visible;
var size = prefs.size; var size = prefs.size;
var negated = prefs.visible_negated; var negated = prefs.visible_negated;
var order = prefs.order;
var colName = ''; var colName = '';
// Add in display preferences // Add in display preferences
@ -934,6 +944,7 @@ var et2_nextmatch = (function(){ "use strict"; return et2_DOMWidget.extend([et2_
_colData[i].width = parseInt(size[colName])+'px'; _colData[i].width = parseInt(size[colName])+'px';
} }
} }
_colData[i].order = typeof order[colName] === 'undefined' ? i : order[colName];
for(var j = 0; j < columnDisplay.length; j++) for(var j = 0; j < columnDisplay.length; j++)
{ {
if(columnDisplay[j] == colName) if(columnDisplay[j] == colName)
@ -946,6 +957,13 @@ var et2_nextmatch = (function(){ "use strict"; return et2_DOMWidget.extend([et2_
_colData[i].visible = negated; _colData[i].visible = negated;
} }
} }
_colData.sort(function(a,b) {
return a.order - b.order;
});
_row.sort(function(a,b) {
return a.colData.order - b.colData.order;
});
}, },
/** /**
@ -1075,6 +1093,7 @@ var et2_nextmatch = (function(){ "use strict"; return et2_DOMWidget.extend([et2_
for (var x = 0; x < _row.length; x++) for (var x = 0; x < _row.length; x++)
{ {
this.columns[x] = jQuery.extend({ this.columns[x] = jQuery.extend({
"order": _colData[x] && typeof _colData[x].order !== 'undefined' ? _colData[x].order : x,
"widget": _row[x].widget "widget": _row[x].widget
},_colData[x]); },_colData[x]);
@ -1088,6 +1107,7 @@ var et2_nextmatch = (function(){ "use strict"; return et2_DOMWidget.extend([et2_
} }
columnData[x] = { columnData[x] = {
"id": "col_" + x, "id": "col_" + x,
"order": this.columns[x].order,
"caption": this._genColumnCaption(_row[x].widget), "caption": this._genColumnCaption(_row[x].widget),
"visibility": visibility, "visibility": visibility,
"width": _colData[x] ? _colData[x].width : 0 "width": _colData[x] ? _colData[x].width : 0
@ -1176,6 +1196,10 @@ var et2_nextmatch = (function(){ "use strict"; return et2_DOMWidget.extend([et2_
_parseDataRow: function(_row, _rowData, _colData) { _parseDataRow: function(_row, _rowData, _colData) {
var columnWidgets = new Array(this.columns.length); var columnWidgets = new Array(this.columns.length);
_row.sort(function(a,b) {
return a.colData.order - b.colData.order;
});
for (var x = 0; x < columnWidgets.length; x++) for (var x = 0; x < columnWidgets.length; x++)
{ {
if (typeof _row[x] != "undefined" && _row[x].widget) if (typeof _row[x] != "undefined" && _row[x].widget)