From 7ce0acf6b7974d6a965383cbb1433733fe5e4e66 Mon Sep 17 00:00:00 2001
From: Mark Goodrich <mgoodrich@pih.org>
Date: Fri, 24 May 2024 16:48:32 -0400
Subject: [PATCH] HTML-842: Add Appointments Tag

---
 .../openmrs/module/htmlformentry/AppointmentsTagTest.java | 8 ++++----
 .../module/htmlformentry/widget/AppointmentsWidget.java   | 2 +-
 .../module/htmlformentry/data/appointmentCheckInTest.xml  | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/api-tests/src/test/java/org/openmrs/module/htmlformentry/AppointmentsTagTest.java b/api-tests/src/test/java/org/openmrs/module/htmlformentry/AppointmentsTagTest.java
index f259de28c..5307eb8ee 100644
--- a/api-tests/src/test/java/org/openmrs/module/htmlformentry/AppointmentsTagTest.java
+++ b/api-tests/src/test/java/org/openmrs/module/htmlformentry/AppointmentsTagTest.java
@@ -107,8 +107,8 @@ public void setupRequest(MockHttpServletRequest request, Map<String, String> wid
 				request.setParameter(widgets.get("Location:"), "2");
 				request.setParameter(widgets.get("Provider:"), "502");
 				request.setParameter(widgets.get("Appointments:"), "05f2ad92-1cc8-4cec-bf54-9cac0200746d");
-				request.setParameter(widgets.get("Appointments:").replace("_05f2ad92-1cc8-4cec-bf54-9cac0200746d",
-				    "_75504r42-3ca8-11e3-bf2b-0800271c1111"), "75504r42-3ca8-11e3-bf2b-0800271c1111");
+				request.setParameter(widgets.get("Appointments:").replace("_1",
+				    "_2"), "75504r42-3ca8-11e3-bf2b-0800271c1111");
 			}
 			
 			@Override
@@ -167,8 +167,8 @@ public String[] widgetLabelsForEdit() {
 			
 			public void setupEditRequest(MockHttpServletRequest request, Map<String, String> widgets) {
 				request.setParameter(widgets.get("Appointments:"), "");
-				request.setParameter(widgets.get("Appointments:").replace("_05f2ad92-1cc8-4cec-bf54-9cac0200746d",
-				    "_75504r42-3ca8-11e3-bf2b-0800271c1111"), "75504r42-3ca8-11e3-bf2b-0800271c1111");
+				request.setParameter(widgets.get("Appointments:").replace("_1",
+				    "_2"), "75504r42-3ca8-11e3-bf2b-0800271c1111");
 			}
 			
 			@Override
diff --git a/api/src/main/java/org/openmrs/module/htmlformentry/widget/AppointmentsWidget.java b/api/src/main/java/org/openmrs/module/htmlformentry/widget/AppointmentsWidget.java
index d8a0d2b1e..b4c163b45 100644
--- a/api/src/main/java/org/openmrs/module/htmlformentry/widget/AppointmentsWidget.java
+++ b/api/src/main/java/org/openmrs/module/htmlformentry/widget/AppointmentsWidget.java
@@ -50,7 +50,7 @@ && new DateTime(appointment.getStartDateTime()).withTimeAtStartOfDay()
 			        && appointment.getFulfillingEncounters().contains(context.getExistingEncounter())) {
 				checkboxWidget.setInitialValue(appointment.getUuid());
 			}
-			context.registerWidget(checkboxWidget, fieldName + "_" + appointment.getUuid());
+			context.registerWidget(checkboxWidget, fieldName + "_" + appointment.getId());
 			checkboxWidgets.add(checkboxWidget);
 		}
 		
diff --git a/api/src/test/resources/org/openmrs/module/htmlformentry/data/appointmentCheckInTest.xml b/api/src/test/resources/org/openmrs/module/htmlformentry/data/appointmentCheckInTest.xml
index 6484483c4..e4641a9bf 100644
--- a/api/src/test/resources/org/openmrs/module/htmlformentry/data/appointmentCheckInTest.xml
+++ b/api/src/test/resources/org/openmrs/module/htmlformentry/data/appointmentCheckInTest.xml
@@ -3,8 +3,8 @@
     <appointment_speciality speciality_id="1" name="Ortho" uuid="c36006e5-9fbb-4f20-866b-0ece245615a1" creator="1"/>
     <appointment_service appointment_service_id="1" name="Consultation" description="Consultation" start_time="09:00:00" end_time="17:00:00" location_id="1"
                          speciality_id="1" max_appointments_limit="4" duration_mins="30" creator="1" uuid="c36006e5-9fbb-4f20-866b-0ece245615a6" voided="false"/>
-    <patient_appointment patient_appointment_id="1" patient_id ="2" appointment_service_id="1" start_date_time="2024-08-15 12:00:00.0" end_date_time="2024-08-15 13:00:00.0" status="Scheduled" appointment_kind="Scheduled" creator="1" location_id="2" date_created="2108-08-10 15:57:09.0" voided="false" void_reason="" uuid="75504r42-3ca8-11e3-bf2b-0800271c1111"/>
-    <patient_appointment_provider patient_appointment_provider_id="1" provider_id="1" patient_appointment_id="1" date_created="2005-09-22 00:00:00.0" creator="1" voided="false" void_reason="" uuid="f716177b-82ca-49e7-8394-cfe7c8d21f80"/>
-    <patient_appointment patient_appointment_id="2" patient_id ="2" appointment_service_id="1" start_date_time="2024-08-16 13:00:00.0" end_date_time="2024-08-16 14:00:00.0" status="Scheduled" appointment_kind="Scheduled"  creator="1" location_id="3" date_created="2108-08-10 15:57:09.0" voided="false" void_reason="" uuid="05f2ad92-1cc8-4cec-bf54-9cac0200746d"/>
+    <patient_appointment patient_appointment_id="1" patient_id ="2" appointment_service_id="1" start_date_time="2024-08-16 13:00:00.0" end_date_time="2024-08-16 14:00:00.0" status="Scheduled" appointment_kind="Scheduled"  creator="1" location_id="3" date_created="2108-08-10 15:57:09.0" voided="false" void_reason="" uuid="05f2ad92-1cc8-4cec-bf54-9cac0200746d"/>
     <patient_appointment_provider patient_appointment_provider_id="2" provider_id="1" patient_appointment_id="2" date_created="2005-09-22 00:00:00.0" creator="1" voided="false" void_reason="" uuid="f7b1c999-6d25-4939-b6ad-effafaaeb0f6"/>
+    <patient_appointment patient_appointment_id="2" patient_id ="2" appointment_service_id="1" start_date_time="2024-08-15 12:00:00.0" end_date_time="2024-08-15 13:00:00.0" status="Scheduled" appointment_kind="Scheduled" creator="1" location_id="2" date_created="2108-08-10 15:57:09.0" voided="false" void_reason="" uuid="75504r42-3ca8-11e3-bf2b-0800271c1111"/>
+    <patient_appointment_provider patient_appointment_provider_id="1" provider_id="1" patient_appointment_id="1" date_created="2005-09-22 00:00:00.0" creator="1" voided="false" void_reason="" uuid="f716177b-82ca-49e7-8394-cfe7c8d21f80"/>
 </dataset>