From 8a2a99f18133fe63960ce18678ed5780ccf4866b Mon Sep 17 00:00:00 2001
From: Enrico <enrico@dhis2.org>
Date: Tue, 31 Dec 2024 11:24:00 -0300
Subject: [PATCH] fix: Bump rule-engine version [DHIS2-15891]

---
 .../resources/tracker/programs_with_program_rules.json    | 8 ++++----
 dhis-2/pom.xml                                            | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dhis-2/dhis-test-e2e/src/test/resources/tracker/programs_with_program_rules.json b/dhis-2/dhis-test-e2e/src/test/resources/tracker/programs_with_program_rules.json
index 4ed49c607596..29fce8e8e50e 100644
--- a/dhis-2/dhis-test-e2e/src/test/resources/tracker/programs_with_program_rules.json
+++ b/dhis-2/dhis-test-e2e/src/test/resources/tracker/programs_with_program_rules.json
@@ -996,7 +996,7 @@
       "name": "TA tracker program rule - showerror on stage",
       "displayName": "TA tracker program rule - showerror",
       "externalAccess": false,
-      "condition": "V{enrollment_date} > V{current_date}",
+      "condition": "d2:daysBetween(V{enrollment_date},V{current_date}) < 0",
       "favorite": false,
       "program": {
         "id": "U5HE4IRrZ7S"
@@ -1036,7 +1036,7 @@
         "users": {},
         "userGroups": {}
       },
-      "condition": "V{event_date} < V{current_date}",
+      "condition": "d2:daysBetween(V{event_date},V{current_date}) > 0",
       "program": {
         "id": "U5HE4IRrZ7S"
       },
@@ -1067,7 +1067,7 @@
         "users": {},
         "userGroups": {}
       },
-      "condition": "V{event_date} < V{current_date}",
+      "condition": "d2:daysBetween(V{event_date},V{current_date}) > 0",
       "program": {
         "id": "U5HE4IRrZ7S"
       },
@@ -1118,7 +1118,7 @@
       "name": "TA tracker program rule - warnings",
       "displayName": "TA tracker program rule - warnings",
       "externalAccess": false,
-      "condition": "V{enrollment_date} < V{current_date}",
+      "condition": "d2:daysBetween(V{enrollment_date},V{current_date}) > 0",
       "favorite": false,
       "program": {
         "id": "U5HE4IRrZ7S"
diff --git a/dhis-2/pom.xml b/dhis-2/pom.xml
index 2b67e468dc1f..a32ee7403185 100644
--- a/dhis-2/pom.xml
+++ b/dhis-2/pom.xml
@@ -90,7 +90,7 @@
     <!-- *Dependencies* -->
 
     <!-- DHIS2 Rule Engine -->
-    <dhis2-rule-engine.version>2.1.8.2</dhis2-rule-engine.version>
+    <dhis2-rule-engine.version>2.1.8.3</dhis2-rule-engine.version>
 
     <!-- HISP Quick and Staxwax -->
     <dhis-hisp-quick.version>1.4.4</dhis-hisp-quick.version>