=== 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 @@
| $encoder.htmlEncode($!patient.getFullName()) |
#end
+ #foreach( $identifier in $identifiers )
+
+ #if($!identifier.identifierType)
+ | $identifier.identifierType.displayName |
+ $identifier.identifier |
+ #end
+
+ #end
| $i18n.getString("location") |
$encoder.htmlEncode($!patient.organisationUnit.name) |
@@ -57,34 +65,22 @@
+
+ | $i18n.getString("health_worker") |
+
+ #if($!patient.healthWorker )
+ $encoder.htmlEncode($!patient.healthWorker.name)
+ #else
+ [$i18n.getString('none')]
+ #end
+ |
+
#foreach($key in $programIndicatorsMap.keySet())
| $encoder.htmlEncode($key) |
$!programIndicatorsMap.get($key) |
#end
-
-
- | $i18n.getString("health_worker") |
-
- #if($!patient.healthWorker )
- $encoder.htmlEncode($!patient.healthWorker.name)
- #else
- [$i18n.getString('none')]
- #end
- |
-
- #foreach( $identifier in $identifiers )
-
- #if($!identifier.identifierType)
- | $identifier.identifierType.displayName |
- #else
- $i18n.getString("system_identifier") |
- #end
- $identifier.identifier |
-
- #end
-
#foreach( $attributeValue in $attributeValues )
| $attributeValue.patientAttribute.displayName |
@@ -101,6 +97,15 @@
#end
+ #foreach( $identifier in $identifiers )
+
+ #if($!identifier.identifierType)
+ #else
+ | $i18n.getString("system_identifier") |
+ $identifier.identifier |
+ #end
+
+ #end