From 9283e717c07da2ed708a82ec73476d8abd09ea50 Mon Sep 17 00:00:00 2001
From: teleivo <teleivo@users.noreply.github.com>
Date: Fri, 1 Mar 2024 15:50:37 +0100
Subject: [PATCH] test: TE workinglist separates order using ; instead of ,

---
 .../workinglists/trackedEntityFilters.json    | 150 +++++++++---------
 1 file changed, 79 insertions(+), 71 deletions(-)

diff --git a/dhis-2/dhis-test-e2e/src/test/resources/tracker/workinglists/trackedEntityFilters.json b/dhis-2/dhis-test-e2e/src/test/resources/tracker/workinglists/trackedEntityFilters.json
index 5ce7817f73a7..7aa4f68fb9e2 100644
--- a/dhis-2/dhis-test-e2e/src/test/resources/tracker/workinglists/trackedEntityFilters.json
+++ b/dhis-2/dhis-test-e2e/src/test/resources/tracker/workinglists/trackedEntityFilters.json
@@ -1,75 +1,83 @@
 {
-    "id": "ctZIHTIIlYS",
-    "name": "TA Tracker program filter",
-    "program": {
-        "id": "f1AyMswryyQ"
+  "id": "ctZIHTIIlYS",
+  "name": "TA Tracker program filter",
+  "program": {
+    "id": "f1AyMswryyQ"
+  },
+  "sharing": {
+    "public": "rw------",
+    "userGroups": {
+      "OPVIvvXzNTw": {
+        "access": "rw------",
+        "id": "OPVIvvXzNTw"
+      }
+    }
+  },
+  "entityQueryCriteria": {
+    "enrollmentStatus": "COMPLETED",
+    "followUp": true,
+    "ouMode": "ACCESSIBLE",
+    "displayColumnOrder": [
+      "eventDate",
+      "dueDate",
+      "program",
+      "invalid"
+    ],
+    "assignedUserMode": "ANY",
+    "programStage": "a3kGcGDCuk6",
+    "trackedEntityType": "Q9GufDoplCL",
+    "lastUpdatedDate": {
+      "period": "TODAY",
+      "startBuffer": -5,
+      "endBuffer": 5,
+      "type": "RELATIVE"
     },
-    "sharing": {
-        "public": "rw------",
-        "userGroups": {
-            "OPVIvvXzNTw": {
-                "access": "rw------",
-                "id": "OPVIvvXzNTw"
-            }
-        }
+    "enrollmentCreatedDate": {
+      "period": "TODAY",
+      "startBuffer": -5,
+      "endBuffer": 5,
+      "type": "RELATIVE"
+    },
+    "enrollmentIncidentDate": {
+      "endDate": "2019-03-20T00:00:00.000",
+      "type": "ABSOLUTE",
+      "startDate": "2014-05-01T00:00:00.000"
     },
-    "entityQueryCriteria": {
-        "enrollmentStatus": "COMPLETED",
-        "followUp": true,
-        "ouMode": "ACCESSIBLE",
-        "displayColumnOrder": [ "eventDate", "dueDate", "program", "invalid"],
-        "assignedUserMode": "ANY",
-        "programStage":"a3kGcGDCuk6",
-        "trackedEntityType":"Q9GufDoplCL",
-        "lastUpdatedDate": {
-            "period": "TODAY",
-            "startBuffer": -5,
-            "endBuffer": 5,
-            "type": "RELATIVE"
-        },
-        "enrollmentCreatedDate": {
-            "period": "TODAY",
-            "startBuffer": -5,
-            "endBuffer": 5,
-            "type": "RELATIVE"
-        },
-        "enrollmentIncidentDate": {
-            "endDate": "2019-03-20T00:00:00.000",
-            "type": "ABSOLUTE",
-            "startDate": "2014-05-01T00:00:00.000"
-        },
-        "trackedEntityInstances": ["a3kGcGDCuk7", "a3kGcGDCuk8"],
-        "order": "createdAt:desc;orgUnit:asc",
-        "attributeValueFilters": [
-            {
-                "attribute": "dIVt4l5vIOa",
-                "sw": "a",
-                "ew": "e"
-            },
-            {
-                "attribute": "kZeSYCgaHTk",
-                "like": "abc"
-            },
-            {
-                "attribute": "x5yfLot5VCM",
-                "dateFilter": {
-                    "startDate": "2014-05-01T00:00:00.000",
-                    "endDate": "2019-03-20T00:00:00.000",
-                    "type": "ABSOLUTE"
-                }
-            },
-            {
-                "attribute": "ypGAwVRNtVY",
-                "le": "20",
-                "ge": "10"
-            },
-            {
-                "attribute": "aIga5mPOFOJ",
-                "in":  [
-                    "MALE",
-                    "FEMALE"
-                ]
-            }
+    "trackedEntityInstances": [
+      "a3kGcGDCuk7",
+      "a3kGcGDCuk8"
+    ],
+    "order": "createdAt:desc,orgUnit:asc",
+    "attributeValueFilters": [
+      {
+        "attribute": "dIVt4l5vIOa",
+        "sw": "a",
+        "ew": "e"
+      },
+      {
+        "attribute": "kZeSYCgaHTk",
+        "like": "abc"
+      },
+      {
+        "attribute": "x5yfLot5VCM",
+        "dateFilter": {
+          "startDate": "2014-05-01T00:00:00.000",
+          "endDate": "2019-03-20T00:00:00.000",
+          "type": "ABSOLUTE"
+        }
+      },
+      {
+        "attribute": "ypGAwVRNtVY",
+        "le": "20",
+        "ge": "10"
+      },
+      {
+        "attribute": "aIga5mPOFOJ",
+        "in": [
+          "MALE",
+          "FEMALE"
         ]
-    }
-}
\ No newline at end of file
+      }
+    ]
+  }
+}