Sindu,Sanjana|fixed dropdown of visit types to show the retired visit types too

sindur · wluyima · commit 2082d923ff4d · 2013-05-31T12:03:34.000-04:00
diff --git a/web/src/main/java/org/openmrs/web/controller/visit/VisitFormController.java b/web/src/main/java/org/openmrs/web/controller/visit/VisitFormController.java
@@ -326,7 +326,7 @@ public String purgeVisit(WebRequest request, @ModelAttribute(value = "visit") Vi
 	
 	@ModelAttribute("visitTypes")
 	public List<VisitType> getVisitTypes() throws Exception {
-		return Context.getVisitService().getAllVisitTypes(false);
+		return Context.getVisitService().getAllVisitTypes(true);
 	}
 	
 	@ModelAttribute("attributeTypes")
diff --git a/webapp/src/main/webapp/WEB-INF/messages.properties b/webapp/src/main/webapp/WEB-INF/messages.properties
@@ -2483,6 +2483,7 @@ Visit.noVisitAssigned=No visit assigned
 Visit.cannotPurgeVisitWithEncounters=Can't purge a visit that has encounters associated to it
 Visit.encounter.search.placeholder=Enter encounter id, provider identifier, location, form, encounter type or provider name
 
+Visit.type.retired=Retired
 Visit.configure.startCloseVisitsTask=Start auto close visits task
 Visit.configure.closeVisitsTask.failedToStart=Failed to start task
 Visit.configure.closeVisitsTask.failedToStop=Failed to stop task
diff --git a/webapp/src/main/webapp/WEB-INF/view/admin/visits/visitForm.jsp b/webapp/src/main/webapp/WEB-INF/view/admin/visits/visitForm.jsp
@@ -198,13 +198,21 @@ $j(document).ready( function() {
 			<th><openmrs:message code="Visit.visitType"/><span class="required"> *</span></th>
 			<td>
 			<spring:bind path="visitType">
+			<c:set var="groupOpen" value="false" />
 				<select name="${status.expression}">
 				   <option value=""></option>
 				<c:forEach items="${visitTypes}" var="visitType">
+				<c:if test="${visitType.retired && !groupOpen}">
+					<optgroup label="<openmrs:message code="Visit.type.retired"/>">
+					<c:set var="groupOpen" value="true" />
+				</c:if>
 					<option value="${visitType.visitTypeId}" <c:if test="${visitType.visitTypeId == status.value}">selected="selected"</c:if>>
 						${visitType.name}
 					</option>
 				</c:forEach>
+				<c:if test="${groupOpen}">
+					</optgroup>
+					</c:if>
 				</select>
 			<c:if test="${status.errorMessage != ''}"><span class="error">${status.errorMessage}</span></c:if>
 			</spring:bind>

Original file line number	Diff line number	Diff line change
`@@ -326,7 +326,7 @@ public String purgeVisit(WebRequest request, @ModelAttribute(value = "visit") Vi`
`326`	`326`
`327`	`327`	`@ModelAttribute("visitTypes")`
`328`	`328`	`public List<VisitType> getVisitTypes() throws Exception {`
`329`		`- return Context.getVisitService().getAllVisitTypes(false);`
	`329`	`+ return Context.getVisitService().getAllVisitTypes(true);`
`330`	`330`	`}`
`331`	`331`
`332`	`332`	`@ModelAttribute("attributeTypes")`