HTML-848 - Order widget should consider time of order expiry when det…

…ermining whether it can be revised.
openmrs · Jan 9, 2025 · d23c172 · d23c172
1 parent 9096e12
commit d23c172
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/api/src/main/java/org/openmrs/module/htmlformentry/widget/OrderWidget.java b/api/src/main/java/org/openmrs/module/htmlformentry/widget/OrderWidget.java
@@ -118,7 +118,7 @@ public JsonObject constructJavascriptConfig(FormEntryContext context) {
 
 		JsonObject jsonConfig = new JsonObject();
 		jsonConfig.addString("fieldName", fieldName);
-		jsonConfig.addString("defaultDate", new SimpleDateFormat("yyyy-MM-dd").format(defaultDate));
+		jsonConfig.addString("defaultDate", getValueForProperty(defaultDate));
 		jsonConfig.addString("patientId", patId.toString());
 		jsonConfig.addString("encounterId", encId == null ? "" : encId.toString());
 		jsonConfig.addString("mode", context.getMode().name());
@@ -263,7 +263,7 @@ public String getValueForProperty(Object propertyValue) {
 				val = ((OpenmrsObject) propertyValue).getId().toString();
 			} else if (propertyValue instanceof Date) {
 				Date dateVal = (Date) propertyValue;
-				val = new SimpleDateFormat("yyyy-MM-dd").format(dateVal);
+				val = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss").format(dateVal);
 			} else if (propertyValue instanceof Class) {
 				Class classValue = (Class) propertyValue;
 				val = classValue.getName();

diff --git a/omod/src/main/webapp/resources/orderWidget.js b/omod/src/main/webapp/resources/orderWidget.js
@@ -7,6 +7,14 @@
         if (!encDate || encDate === '') {
             encDate = defaultDate;
         }
+        if (encDate.length === 10) {
+            if (defaultDate.startsWith(encDate)) {
+                encDate = defaultDate;
+            }
+            else {
+                encDate += 'T00:00:00';
+            }
+        }
         return encDate;
     }