dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2248
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: trunk
timestamp: Mon 2010-09-27 15:30:19 +0700
message:
  Fix bug:   Representative Information is showed wrong.
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientForm.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-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientForm.vm	2010-09-25 07:53:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientForm.vm	2010-09-27 08:30:19 +0000
@@ -101,8 +101,9 @@
 		#set( $representative = $patient.representative ) 
 		<tr>
 			<td>$i18n.getString("representative")</td>
-			<td>$patient.representative.getFullName() <a title="$i18n.getString('patient_info')" href="#" id="btnRepresentativeInfo" rel="#representativeInfo"><img src="../images/information.png" alt="$i18n.getString( "show_details" )"></a></td>
-			<script>jQuery("#btnRepresentativeInfo").cluetip({width:'350px'});</script>
+			<td>$!patient.representative.getFullName() 
+				<a title="$i18n.getString('patient_info')" href="#" id="btnRepresentativeInfo" rel="#representativeInfo"><img src="../images/information.png" alt="$i18n.getString( "show_details" )"></a></td>
+				<script>jQuery("#btnRepresentativeInfo").cluetip({width:'350px'});</script>
 		</tr>
 	#end
 	
@@ -233,33 +234,33 @@
 <div id="representativeInfo" style="display:none">
 <table>
 	<tr>
-		<td><strong>$i18n.getString("full_name")</strong></td>
-		<td>$representative.getFullName()</td>
-	</tr>
-	<tr>
-		<td><strong>$i18n.getString("gender")</strong></td>
-		<td> $representative.gender</td>
-	</tr>
-	<tr>
-		<td><strong>$i18n.getString("birth_date")</strong></td>
-		<td>$format.formatDate( $representative.birthDate )</td>
-	</tr>
-	<tr>
-		<td><strong>$i18n.getString("age")</strong></td>
-		<td> $representative.getAge() </td>
-	</tr>
-	<tr>
-		<td><strong>$i18n.getString("blood_group")</strong></td>
-		<td>$representative.getBloodGroup()</td>
+		<td><strong>$i18n.getString("full_name"):</strong></td>
+		<td>$!representative.getFullName()</td>
+	</tr>
+	<tr>
+		<td><strong>$i18n.getString("gender"):</strong></td>
+		<td> $!representative.gender</td>
+	</tr>
+	<tr>
+		<td><strong>$i18n.getString("date_of_birth"):</strong></td>
+		<td>$!format.formatDate( $!representative.birthDate )</td>
+	</tr>
+	<tr>
+		<td><strong>$i18n.getString("age"):</strong></td>
+		<td> $!representative.getAge() </td>
+	</tr>
+	<tr>
+		<td><strong>$i18n.getString("blood_group"):</strong></td>
+		<td>$!representative.getBloodGroup()</td>
 	</tr>
 	#foreach( $patientIdentifier in $representative.identifiers )
 	  <tr>  
-	  	<td><strong>#if( $patientIdentifier.identifierType )$patientIdentifier.identifierType.name #else $i18n.getString("system_identifier") #end</strong></td>      
-	      <td> $patientIdentifier.identifier </td>
+	  	<td><strong>#if( $patientIdentifier.identifierType )$patientIdentifier.identifierType.name: #else $i18n.getString("system_identifier"): #end</strong></td>      
+	      <td> $!patientIdentifier.identifier </td>
 	   </tr>
 	#end
 	<tr>
-		<td><strong>$i18n.getString("programs")</strong></td>
+		<td><strong>$i18n.getString("programs"):</strong></td>
 		<td>  
 			 #foreach( $program in $representative.programs )
 			 	#if( $velocityCount == 1 )