dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 11662
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2013-08-14 13:58:11 +0700
message:
  Minor fix for registration person list.
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/form.js
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/patient.js
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientRegistrationList.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/javascript/form.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/form.js	2013-04-15 07:46:11 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/form.js	2013-08-14 06:58:11 +0000
@@ -81,6 +81,7 @@
 			listAll:false,
 			programIds:	getFieldValue("programIdAddPatient"),
 			searchTexts: "prg_" + getFieldValue("programIdAddPatient"),
+			searchByUserOrgunits: false,
 			searchBySelectedOrgunit:true
 		},
 		function()

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/patient.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/patient.js	2013-08-12 06:23:01 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/patient.js	2013-08-14 06:58:11 +0000
@@ -152,6 +152,7 @@
 	{
 		jQuery('#listPatientDiv').load('searchRegistrationPatient.action',{
 				listAll:false,
+				searchByUserOrgunits: false,
 				searchBySelectedOrgunit: true,
 				programIds: getFieldValue('programIdAddPatient'),
 				searchTexts: 'prg_' + getFieldValue('programIdAddPatient')

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientRegistrationList.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientRegistrationList.vm	2013-06-20 09:05:11 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientRegistrationList.vm	2013-08-14 06:58:11 +0000
@@ -31,7 +31,9 @@
 			#end
 			
 			#foreach( $identifierType in $identifierTypes)
+				#if($identifierType.personDisplayName=='true')
 				<col/>
+				#end
 			#end
 			#if( $identifierTypes.size()==0 )
 				<col/>       
@@ -58,10 +60,14 @@
 						#end
 					#end
 					
+					#set($personDisplayName='false')
 					#foreach( $identifierType in $identifierTypes)
-						<th>$encoder.htmlEncode($identifierType.displayName)</th>
+						#if($identifierType.personDisplayName=='true')
+							<th>$encoder.htmlEncode($identifierType.displayName)</th>
+							#set($personDisplayName='true')
+						#end
 					#end
-					#if( $identifierTypes.size()==0 )
+					#if( $personDisplayName=='false' )
 						<th>$i18n.getString( "full_name" )</th>          
 					#end
 					<th>$i18n.getString( "gender" )</th>
@@ -104,22 +110,33 @@
 					#end
 						
 					#set($value="")
-					#foreach( $identifier in $patient.identifiers)
-						#if($!identifier.identifierType)
-							#set($value=$identifier.identifier)
-						#else
-							#set($systemId=$identifier.identifier)
+					#foreach( $identifierType in $identifierTypes)
+						#set($value="")
+						#if($identifierType.personDisplayName=='true')
+							<td style="cursor:pointer;" onclick="javascript:isDashboard=true;showPatientDashboardForm( '$patient.id' )">
+								#foreach( $identifier in $patient.identifiers)
+									#if($!identifier.identifierType.id==$identifierType.id)
+										#set($value=$identifier.identifier)
+									#else
+										#set($systemId=$identifier.identifier)
+									#end
+							#end
+							<a>$encoder.htmlEncode($value)</a>
+						</td>
 						#end
 					#end
+					
 					#if($value=="")
 						#set($value=$!patient.getFullName())
 					#end
 					#if($value=="")
 						#set($value=$systemId)
 					#end
-					<td style="cursor:pointer;" onclick="javascript:isDashboard=true;showPatientDashboardForm( '$patient.id' )">
-						<a>$encoder.htmlEncode($value)</a>
-					</td>
+					#if($personDisplayName=='false')
+						<td style="cursor:pointer;" onclick="javascript:isDashboard=true;showPatientDashboardForm( '$patient.id' )">
+							<a>$encoder.htmlEncode($value)</a>
+						</td>
+					#end
 					
 					<td>#if($!patient.gender) $i18n.getString($!patient.gender) #end</td>