From 51ed3cfde981d295dea5c480f3c0ed0aa7552689 Mon Sep 17 00:00:00 2001 From: Pamela Canchanya Date: Wed, 19 Mar 2014 18:44:44 -0300 Subject: [PATCH] UHM-855 Update value of message error at resource Scheduled Appointments Blocks --- api/src/main/resources/messages.properties | 4 ++++ .../openmrs1_9/ScheduledAppointmentBlockResource1_9.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/api/src/main/resources/messages.properties b/api/src/main/resources/messages.properties index 6168b6dc..9ab79133 100644 --- a/api/src/main/resources/messages.properties +++ b/api/src/main/resources/messages.properties @@ -47,6 +47,7 @@ ${project.parent.artifactId}.AppointmentBlock.error.maximalTimeSlot=The time slo ${project.parent.artifactId}.AppointmentBlock.error.voidReasonEmpty=Void Reason can't be empty ${project.parent.artifactId}.AppointmentBlock.error.appointmentsExist=Can't edit that appointment block time slot because there are appointments associated with it ${project.parent.artifactId}.AppointmentBlock.error.appointmentBlockOverlap=Can't save because the selected provider is already scheduled at this time. +${project.parent.artifactId}.AppointmentBlock.error.scheduledAppointmentBlocks= Date or location parameter is missing ${project.parent.artifactId}.AppointmentBlock.emptyTypes=Select at least one type ${project.parent.artifactId}.AppointmentBlock.saved=Appointment Block saved ${project.parent.artifactId}.AppointmentBlock.voidedSuccessfully=Appointment Block voided successfully @@ -237,3 +238,6 @@ ${project.parent.artifactId}.TimeSlot.emptyStartDate=Empty time slot start date ${project.parent.artifactId}.TimeSlot.emptyEndDate=Empty time slot end date ${project.parent.artifactId}.TimeSlot.emptyBlock=Empty time slot block ${project.parent.artifactId}.TimeSlot.saved=Time Slot(s) Saved + + + diff --git a/omod/src/main/java/org/openmrs/module/appointmentscheduling/rest/resource/openmrs1_9/ScheduledAppointmentBlockResource1_9.java b/omod/src/main/java/org/openmrs/module/appointmentscheduling/rest/resource/openmrs1_9/ScheduledAppointmentBlockResource1_9.java index 9101e1a9..c2e4ad22 100644 --- a/omod/src/main/java/org/openmrs/module/appointmentscheduling/rest/resource/openmrs1_9/ScheduledAppointmentBlockResource1_9.java +++ b/omod/src/main/java/org/openmrs/module/appointmentscheduling/rest/resource/openmrs1_9/ScheduledAppointmentBlockResource1_9.java @@ -35,7 +35,7 @@ public SimpleObject search(RequestContext context) throws ResponseException { AppointmentType appointmentType = getAppointmentType(context); if (date == null || location == null) { - throw new ValidationException("appointmentschedulingui.dailyScheduledAppointments.validationExeptionMessage"); + throw new ValidationException("appointmentscheduling.AppointmentBlock.error.scheduledAppointmentBlocks"); } List dailyAppointmentBlocks = getScheduledAppointmentBlocks(date, location,