dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 11432
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2013-07-18 13:02:45 +0700
message:
  Minor fix in change location person form.
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientLocation.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/patientLocation.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientLocation.vm	2013-06-13 07:36:43 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientLocation.vm	2013-07-18 06:02:45 +0000
@@ -10,11 +10,37 @@
 </h3>
 	
 <table>
+	#set($value="")
+	#set($flag=false)
+	#foreach( $identifier in $patient.identifiers)
+		#if($!identifier.identifierType)
+			#set($value=$identifier.identifier)
+		#else
+			#set($systemId=$identifier.identifier)
+		#end
+	#end
+	#if($value=="")
+		#set($value=$!patient.getFullName())
+	#else
+		#set($flag=true)
+	#end
+	#if($value=="")
+		#set($value=$systemId)
+	#end
+					
+	#if($patient.getFullName()=='')
 	<tr>
 		<td style="background-color:#88be3b; height:26px;">&nbsp;</td>
-		<td>$i18n.getString('full_name'):</td>
-		<td>$patient.getFullName()</td>
+		<td>
+			#if($flag==true)
+				$i18n.getString('identifier'):
+			#else
+				$i18n.getString('full_name'):
+			#end
+		</td>
+		<td>$value</td>
 	</tr>
+	#end
 	<tr>
 		<td style="background-color:#88be3b; height:26px;">&nbsp;</td>
 		<td>$i18n.getString('gender'):</td>