[Projekt: Crowd-Development / Besuch vor Ort][TicketNr.: 1068895][[Bug]...

[Projekt: Crowd-Development / Besuch vor Ort][TicketNr.: 1068895][[Bug] Besuchsvorschlag Sortierung nach Firma funktioniert nicht]

entity/VisitRecommendation_entity/recordcontainers/jdito/contentProcess.js

@@ -216,7 +216,7 @@ if(idValues == false)
 
 var filter = vars.get("$local.filter"); 
 //TODO: this is a workaround that filters the records manually, it should be possible to filter the users with a tools.* method
-var filterFields = ["", "", "STREET", "COUNTRY" , "ZIP", "CITY", "PRIORITY", "PRIORITY_SOURCE", "", "DUE_DATE", "INFO", "CONTACT_ID"
+var filterFields = ["", "ORGANISATION_NAME", "STREET", "COUNTRY" , "ZIP", "CITY", "PRIORITY", "PRIORITY_SOURCE", "", "DUE_DATE", "INFO", "CONTACT_ID"
     , "", "", "USER_NEW", "", "CONTACT_PERSON_ID", "", "RESPONSIBLE"];
 var filterFns = {
     "$$$LOOKUPFIELD$$$" : function (pRecordValue, pFilterValue, pOperator, pRow)
@@ -238,8 +238,36 @@ var filterFns = {
 };
 recommendationData = JditoFilterUtils.filterRecords(filterFields, recommendationData, filter.filter, filterFns);
 
-//sort Array by priority; highest priority first
-ArrayUtils.sort2d(recommendationData, 9, true, true);
+
+var order = vars.get("$local.order");
+
+var columnOrder = {
+    "ORGANISATION_NAME.value": 1, 
+    "STREET.value": 2,
+    "COUNTRY.value": 3, 
+    "ZIP.value": 4, 
+    "CITY.value": 5, 
+    "PRIORITY.value": 6, 
+    "PRIORITY_SOURCE.value": 7, 
+    "DUE_DATE.value": 9,
+    "USER_NEW.displayValue": 13,
+    "CONTACT_PERSON_ID.displayValue": 15,
+    "RESPONSIBLE.displayValue": 17
+};
+var sortOrder = [];
+for (let field in order)
+{
+    if (field in columnOrder)
+    {
+        sortOrder.push(columnOrder[field]);
+        sortOrder.push(order[field] == "DOWN");
+    }
+}
+
+if (!sortOrder.length) 
+    sortOrder = [9, false]; //default sort by duedate
+
+ArrayUtils.sortMulti(recommendationData, sortOrder);
 result.object(recommendationData);
 
 function getPrioByDueDate(pDueDate)