diff --git a/api/src/main/java/org/openmrs/module/appointmentscheduling/Appointment.java b/api/src/main/java/org/openmrs/module/appointmentscheduling/Appointment.java index 0126ce31..b0d28f6e 100644 --- a/api/src/main/java/org/openmrs/module/appointmentscheduling/Appointment.java +++ b/api/src/main/java/org/openmrs/module/appointmentscheduling/Appointment.java @@ -13,12 +13,6 @@ */ package org.openmrs.module.appointmentscheduling; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; - import org.codehaus.jackson.map.annotate.JsonSerialize; import org.openmrs.BaseOpenmrsData; import org.openmrs.BaseOpenmrsMetadata; @@ -27,6 +21,12 @@ import org.openmrs.Visit; import org.openmrs.module.appointmentscheduling.serialize.AppointmentStatusSerializer; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + /** * It is a model class. It should extend either {@link BaseOpenmrsObject} or * {@link BaseOpenmrsMetadata}. @@ -37,17 +37,6 @@ public class Appointment extends BaseOpenmrsData implements Serializable { public enum AppointmentStatusType { SCHEDULED, ACTIVE, CANCELLED, MISSED, COMPLETED; - - private final String name = null; - - public String getName() { - return name; - } - - @Override - public String toString() { - return name; - } } // TODO confirm that "WALK-IN" should be considered active and "RESCHEDULED" diff --git a/omod/src/main/java/org/openmrs/module/appointmentscheduling/rest/resource/openmrs1_9/AppointmentStatusTypeResource1_9.java b/omod/src/main/java/org/openmrs/module/appointmentscheduling/rest/resource/openmrs1_9/AppointmentStatusTypeResource1_9.java index 7b1f45d9..193158c3 100644 --- a/omod/src/main/java/org/openmrs/module/appointmentscheduling/rest/resource/openmrs1_9/AppointmentStatusTypeResource1_9.java +++ b/omod/src/main/java/org/openmrs/module/appointmentscheduling/rest/resource/openmrs1_9/AppointmentStatusTypeResource1_9.java @@ -28,8 +28,7 @@ public SimpleObject getAll(RequestContext requestContext) @Override public String getUri(Object o) { - return RestConstants.URI_PREFIX + "/appointmentscheduling/appointmentstatustype/" - + ((AppointmentStatusType) o).getName(); + return RestConstants.URI_PREFIX + "/appointmentscheduling/appointmentstatustype"; } @Override