dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 11246
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2013-06-21 12:44:54 +0700
message:
  Small change in Patient Dashboard
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientDashboard.vm


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientDashboard.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientDashboard.vm	2013-06-11 05:55:48 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientDashboard.vm	2013-06-21 05:44:54 +0000
@@ -25,6 +25,14 @@
 					<td>$encoder.htmlEncode($!patient.getFullName())</td>
 				</tr>
 				#end
+				#foreach( $identifier in $identifiers )
+				<tr>
+					#if($!identifier.identifierType)
+						<td>$identifier.identifierType.displayName</td>
+						<td id='dashboard_iden$identifier.identifierType.id'>$identifier.identifier</td>
+					#end
+				</tr>
+				#end
 				<tr>
 					<td>$i18n.getString("location")</td>
 					<td>$encoder.htmlEncode($!patient.organisationUnit.name)</td>
@@ -57,34 +65,22 @@
 					</td>
 				</tr>
 				
+				<tr>
+					<td>$i18n.getString("health_worker")</td>
+					<td>
+						#if($!patient.healthWorker )
+							$encoder.htmlEncode($!patient.healthWorker.name)
+						#else
+							[$i18n.getString('none')]
+						#end
+					</td>
+				</tr>
 				#foreach($key in $programIndicatorsMap.keySet())
 				<tr class='bold'>
 					<td>$encoder.htmlEncode($key)</td>
 					<td>$!programIndicatorsMap.get($key)</td>
 				</tr>
 				#end
-				
-				<tr>
-					<td>$i18n.getString("health_worker")</td>
-					<td>
-						#if($!patient.healthWorker )
-							$encoder.htmlEncode($!patient.healthWorker.name)
-						#else
-							[$i18n.getString('none')]
-						#end
-					</td>
-				</tr>
-				#foreach( $identifier in $identifiers )
-				<tr>
-					#if($!identifier.identifierType)
-						<td>$identifier.identifierType.displayName</td>
-					#else
-						<td>$i18n.getString("system_identifier")</td>
-					#end
-					<td id='dashboard_iden$identifier.identifierType.id'>$identifier.identifier</td>
-				</tr>
-				#end
-				
 				#foreach( $attributeValue in $attributeValues )
 				<tr>
 					<td>$attributeValue.patientAttribute.displayName</td>
@@ -101,6 +97,15 @@
 					</td>
 				</tr>
 				#end
+				#foreach( $identifier in $identifiers )
+				<tr>
+					#if($!identifier.identifierType)
+					#else
+						<td>$i18n.getString("system_identifier")</td>
+						<td id='dashboard_iden$identifier.identifierType.id'>$identifier.identifier</td>
+					#end
+				</tr>
+				#end
 			</table>
 		</div>
 	</div>