Default values not recognized In the Locations --> "Manage Layout" -

TRUNK-3564
openmrs · May 9, 2013 · 94daadd · 94daadd
1 parent 3c4427b
commit 94daadd
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 7 deletions.
diff --git a/webapp/src/main/webapp/WEB-INF/view/admin/locations/locationForm.jsp b/webapp/src/main/webapp/WEB-INF/view/admin/locations/locationForm.jsp
@@ -55,7 +55,7 @@
 			</td>
 		</tr>
 		<spring:nestedPath path="location">
-			<openmrs:portlet url="addressLayout" id="addressPortlet" size="full" parameters="layoutShowTable=false|layoutShowExtended=false|layoutShowErrors=false" />
+			<openmrs:portlet url="addressLayout" id="addressPortlet" size="full" parameters="layoutShowTable=false|layoutShowExtended=false|layoutShowErrors=false|isNew=${location.locationId == null}" />
 		</spring:nestedPath>
 		<tr>
 			<th valign="top"><openmrs:message code="Location.parentLocation"/></th>

diff --git a/webapp/src/main/webapp/WEB-INF/view/admin/patients/patientForm.jsp b/webapp/src/main/webapp/WEB-INF/view/admin/patients/patientForm.jsp
@@ -376,15 +376,15 @@
 				<c:forEach var="address" items="${patient.addresses}" varStatus="varStatus">
 					<spring:nestedPath path="patient.addresses[${varStatus.index}]">
 						<div id="address${varStatus.index}Data" class="tabBox">
-							<openmrs:portlet url="addressLayout" id="addressPortlet" size="full" parameters="layoutShowTable=true|layoutShowExtended=true|layoutHideVoidOption=${(address.personAddressId == null)}" />
+							<openmrs:portlet url="addressLayout" id="addressPortlet" size="full" parameters="layoutShowTable=true|layoutShowExtended=true|layoutHideVoidOption=${(address.personAddressId == null)}|isNew=${(address.personAddressId == null)}" />
 							<%-- @ include file="include/editPersonAddress.jsp" --%>
 							<!-- <input type="button" onClick="return removeTab(this, 'name');" class="removeTab" value='<openmrs:message code="Patient.removeThisAddress"/>'/><br/> --> <br/>
 						</div>
 					</spring:nestedPath>
 				</c:forEach>
 				<div id="addressData" class="tabBox">
 					<spring:nestedPath path="emptyAddress">
-						<openmrs:portlet url="addressLayout" id="addressPortlet" size="full" parameters="layoutShowTable=true|layoutShowExtended=true|layoutHideVoidOption=true" />
+						<openmrs:portlet url="addressLayout" id="addressPortlet" size="full" parameters="layoutShowTable=true|layoutShowExtended=true|layoutHideVoidOption=true|isNew=true" />
 						<!-- <input type="button" onClick="return removeTab(this, 'name');" class="removeTab" value='<openmrs:message code="Patient.removeThisAddress"/>'/><br/> --> <br/>
 					</spring:nestedPath>
 				</div>

diff --git a/webapp/src/main/webapp/WEB-INF/view/admin/patients/shortPatientForm.jsp b/webapp/src/main/webapp/WEB-INF/view/admin/patients/shortPatientForm.jsp
@@ -439,7 +439,8 @@
 		<th class="headerCell" valign="top"><openmrs:message code="Person.address"/></th>
 		<td class="inputCell">
 			<spring:nestedPath path="personAddress">
-				<openmrs:portlet url="addressLayout" id="addressPortlet" size="full" parameters="layoutShowTable=true|layoutShowExtended=false" />
+				<openmrs:portlet url="addressLayout" id="addressPortlet" size="full" 
+					parameters="layoutShowTable=true|layoutShowExtended=false|isNew=${patientModel.personAddress.personAddressId == null}" />
 			</spring:nestedPath>
 		</td>
 	</tr>

diff --git a/webapp/src/main/webapp/WEB-INF/view/admin/person/personForm.jsp b/webapp/src/main/webapp/WEB-INF/view/admin/person/personForm.jsp
@@ -321,15 +321,15 @@
 				<c:forEach var="address" items="${person.addresses}" varStatus="varStatus">
 					<spring:nestedPath path="person.addresses[${varStatus.index}]">
 						<div id="address${varStatus.index}Data" class="tabBox">
-							<openmrs:portlet url="addressLayout" id="addressPortlet" size="full" parameters="layoutShowTable=true|layoutShowExtended=true|layoutHideVoidOption=${(address.personAddressId == null)}" />
+							<openmrs:portlet url="addressLayout" id="addressPortlet" size="full" parameters="layoutShowTable=true|layoutShowExtended=true|layoutHideVoidOption=${(address.personAddressId == null)}|isNew=${(address.personAddressId == null)}" />
 							<%-- @ include file="include/editPersonAddress.jsp" --%>
 							<!-- <input type="button" onClick="return removeTab(this, 'name');" class="removeTab" value='<openmrs:message code="Person.removeThisAddress"/>'/><br/> --> <br/>
 						</div>
 					</spring:nestedPath>
 				</c:forEach>
 				<div id="addressData" class="tabBox">
 					<spring:nestedPath path="emptyAddress">
-						<openmrs:portlet url="addressLayout" id="addressPortlet" size="full" parameters="layoutShowTable=true|layoutShowExtended=true|layoutHideVoidOption=true" />
+						<openmrs:portlet url="addressLayout" id="addressPortlet" size="full" parameters="layoutShowTable=true|layoutShowExtended=true|layoutHideVoidOption=true|isNew=true" />
 						<!-- <input type="button" onClick="return removeTab(this, 'name');" class="removeTab" value='<openmrs:message code="Person.removeThisAddress"/>'/><br/> --> <br/>
 					</spring:nestedPath>
 				</div>

diff --git a/webapp/src/main/webapp/WEB-INF/view/portlets/addressLayout.jsp b/webapp/src/main/webapp/WEB-INF/view/portlets/addressLayout.jsp
@@ -216,11 +216,16 @@
 									<c:catch var="exp">
 										<spring:bind path="${token.codeName}">
 											<c:if test="${token.codeName == 'endDate'}"><input type="hidden" name="_${status.expression}"></c:if>
-											<input id="${status.expression}" type="text" name="${status.expression}" value="<c:out value="${status.value}"/>" size="${token.displaySize}" 
+											<c:set var="elementValue" value="${status.value}" />
+											<c:if test="${model.isNew && empty elementValue && not empty model.layoutTemplate.elementDefaults && not empty model.layoutTemplate.elementDefaults[token.codeName]}">
+												<c:set var="elementValue" value="${model.layoutTemplate.elementDefaults[token.codeName]}" />
+											</c:if>
+											<input id="${status.expression}" type="text" name="${status.expression}" value="${elementValue}" size="${token.displaySize}" 
                                             	<c:if test="${token.codeName == 'startDate' || token.codeName == 'endDate'}">onfocus='showCalendar(this,60)'</c:if> 
                                             	<c:if test="${token.codeName == 'endDate' && status.value == ''}">disabled="disabled" </c:if>
                                                 onkeyup="<c:if test='${model.layoutTemplate.elementRegex[token.codeName] !="" }'>validateFormat(this, '${model.layoutTemplate.elementRegex[token.codeName]}','${token.codeName}' )</c:if>"
                                             />
+                                            <c:remove var="elementValue" scope="page" />
                                             <c:if test="${token.codeName == 'endDate'}">
                                             <script type="text/javascript">updateActiveCheckbox('${status.expression}', ${status.value == ''});</script>
                                             </c:if>