From d28c63c12e1e0eb8434645ea5d1155d70db5011d Mon Sep 17 00:00:00 2001
From: nathangray <nathangray.bsc+github@gmail.com>
Date: Thu, 7 Feb 2019 15:48:34 -0700
Subject: [PATCH] Sort nextmatch columns according to order of column selection
 preference

---
 api/js/etemplate/et2_extension_nextmatch.js | 28 +++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/api/js/etemplate/et2_extension_nextmatch.js b/api/js/etemplate/et2_extension_nextmatch.js
index 91e1853b24..1ce4ba9006 100644
--- a/api/js/etemplate/et2_extension_nextmatch.js
+++ b/api/js/etemplate/et2_extension_nextmatch.js
@@ -782,9 +782,10 @@ var et2_nextmatch = (function(){ "use strict"; return et2_DOMWidget.extend([et2_
 		}
 
 		var app = '';
+		var list = [];
 		if(this.options.settings.columnselection_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)
 			{
 				app = list[0].substring('nextmatch'.length+1);
@@ -827,10 +828,18 @@ var et2_nextmatch = (function(){ "use strict"; return et2_DOMWidget.extend([et2_
 			size = this.egw().preference(size_pref, app);
 		}
 		if(!size) size = {};
+
+		// Column order
+		var order = {};
+		for(var i = 0; i < columnDisplay.length; i++)
+		{
+			order[columnDisplay[i]] = i;
+		}
 		return {
 			visible: columnDisplay,
 			visible_negated: negated,
-			size: size
+			size: size,
+			order: order
 		};
 	},
 
@@ -845,6 +854,7 @@ var et2_nextmatch = (function(){ "use strict"; return et2_DOMWidget.extend([et2_
 		var columnDisplay = prefs.visible;
 		var size = prefs.size;
 		var negated = prefs.visible_negated;
+		var order = prefs.order;
 		var colName = '';
 
 		// Add in display preferences
@@ -907,6 +917,7 @@ var et2_nextmatch = (function(){ "use strict"; return et2_DOMWidget.extend([et2_
 						_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++)
 				{
 					if(columnDisplay[j] == colName)
@@ -919,6 +930,13 @@ var et2_nextmatch = (function(){ "use strict"; return et2_DOMWidget.extend([et2_
 				_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;
+		});
 	},
 
 	/**
@@ -1048,6 +1066,7 @@ var et2_nextmatch = (function(){ "use strict"; return et2_DOMWidget.extend([et2_
 		for (var x = 0; x < _row.length; x++)
 		{
 			this.columns[x] = jQuery.extend({
+				"order": _colData[x] && typeof _colData[x].order !== 'undefined' ? _colData[x].order : x,
 				"widget": _row[x].widget
 			},_colData[x]);
 
@@ -1061,6 +1080,7 @@ var et2_nextmatch = (function(){ "use strict"; return et2_DOMWidget.extend([et2_
 			}
 			columnData[x] = {
 				"id": "col_" + x,
+				"order": this.columns[x].order,
 				"caption": this._genColumnCaption(_row[x].widget),
 				"visibility": visibility,
 				"width": _colData[x] ? _colData[x].width : 0
@@ -1149,6 +1169,10 @@ var et2_nextmatch = (function(){ "use strict"; return et2_DOMWidget.extend([et2_
 	_parseDataRow: function(_row, _rowData, _colData) {
 		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++)
 		{
 			if (typeof _row[x] != "undefined" && _row[x].widget)