dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 8036
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2012-09-11 16:52:55 +0700
message:
  Minor fix.
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataentryRecords.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingRecords.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/report.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/dataentryRecords.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataentryRecords.vm	2012-09-11 09:46:38 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataentryRecords.vm	2012-09-11 09:52:55 +0000
@@ -33,8 +33,8 @@
 						#set( $value="")
 						#foreach( $identifierType in $program.patientIdentifierTypes )
 							#foreach( $pIdentifier in $patient.identifiers )
-								#if($identifierType.id==$pIdentifier.identifierType.id)
-									#set($value=$value + "&#13;&#10;" + $pIdentifier.identifier)
+								#if($identifierType.personDisplayName=="true" && $identifierType.id==$pIdentifier.identifierType.id)
+									#set($value=$value + $pIdentifier.identifier + "&#13;&#10;" )
 								#end
 							#end
 						#end

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingRecords.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingRecords.vm	2012-09-11 09:46:38 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingRecords.vm	2012-09-11 09:52:55 +0000
@@ -34,8 +34,8 @@
 						#set( $value="")
 						#foreach( $identifierType in $programInstance.program.patientIdentifierTypes )
 							#foreach( $pIdentifier in $patient.identifiers )
-								#if($identifierType.id==$pIdentifier.identifierType.id)
-									#set($value=$value + "&#13;&#10;" + $pIdentifier.identifier)
+								#if($identifierType.personDisplayName=="true" && $identifierType.id==$pIdentifier.identifierType.id)
+									#set($value=$value + $pIdentifier.identifier + "&#13;&#10;" )
 								#end
 							#end
 						#end

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/report.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/report.vm	2012-09-11 09:46:38 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/report.vm	2012-09-11 09:52:55 +0000
@@ -27,8 +27,8 @@
 						#if($program.patientIdentifierTypes)
 							#foreach( $identifierType in $program.patientIdentifierTypes )
 								#foreach( $pIdentifier in $programInstance.patient.identifiers )
-									#if($identifierType.id==$pIdentifier.identifierType.id)
-										#set( $value= $value + '&#13;&#10;' + $pIdentifier.identifier )
+									#if($identifierType.personDisplayName=="true" && $identifierType.id==$pIdentifier.identifierType.id)
+										#set( $value= $value + $pIdentifier.identifier + '&#13;&#10;' )
 									#end
 								#end
 							#end