dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 8476
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2012-10-11 15:00:24 +0700
message:
  Add mobile phone number column for person list of single event.
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/SearchPatientAction.java
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/listPatient.vm
  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/java/org/hisp/dhis/caseentry/action/patient/SearchPatientAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/SearchPatientAction.java	2012-09-11 09:46:38 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/SearchPatientAction.java	2012-10-11 08:00:24 +0000
@@ -171,14 +171,17 @@
             patients = patientService.searchPatients( searchTexts, organisationUnit, paging.getStartPos(),
                 paging.getPageSize() );
 
-            for ( Patient patient : patients )
+            if ( !searchBySelectedOrgunit )
             {
-                mapPatientOrgunit.put( patient.getId(), getHierarchyOrgunit( patient.getOrganisationUnit() ) );
+                for ( Patient patient : patients )
+                {
+                    mapPatientOrgunit.put( patient.getId(), getHierarchyOrgunit( patient.getOrganisationUnit() ) );
+                }
             }
 
             if ( programIds != null )
             {
-                for( Integer programId : programIds )
+                for ( Integer programId : programIds )
                 {
                     Program progam = programService.getProgram( programId );
                     identifierTypes.addAll( progam.getPatientIdentifierTypes() );

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/listPatient.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/listPatient.vm	2012-10-06 14:09:51 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/listPatient.vm	2012-10-11 08:00:24 +0000
@@ -38,6 +38,7 @@
 		  #if($mapPatientOrgunit.size()!=0)
 		  <col/>
 		  #end
+		  <col/>
 		  <col width="80"/>
           <tr>
 			<th>#</th>
@@ -51,7 +52,8 @@
 			#end       
             <th>$i18n.getString( "gender" )</th>
             <th>$i18n.getString( "date_of_birth" )</th>
-            <th>$i18n.getString( "age" )</th>   
+            <th>$i18n.getString( "age" )</th> 
+			<th class="{sorter: false}">$i18n.getString( "phone_number" )</th>  
 			#if($mapPatientOrgunit.size()!=0)
 			<th>$i18n.getString( "hierachy_orgunit" )</th>
 			#end			
@@ -87,7 +89,8 @@
 				</td>
 				<td>            
                     $encoder.htmlEncode( $patient.getAge() )
-                </td>	
+                </td>
+				<td>$!patient.phoneNumber</td>				
 				#if($mapPatientOrgunit.size()!=0)
 				<td>$!mapPatientOrgunit.get($patient.id)</td>
 				#end

=== 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	2012-10-05 03:29:50 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientRegistrationList.vm	2012-10-11 08:00:24 +0000
@@ -61,16 +61,13 @@
 				#if( $identifierTypes.size()==0 )
 					<th>$i18n.getString( "full_name" )</th>          
 				#end
-				
 				<th>$i18n.getString( "gender" )</th>
 				<th>$i18n.getString( "date_of_birth" )</th> 
 				<th class="{sorter: false}">$i18n.getString( "age" )</th>
 				<th class="{sorter: false}">$i18n.getString( "phone_number" )</th>
-				
 				#if($mapPatientOrgunit.size()!=0)
 					<th>$i18n.getString( "hierachy_orgunit" )</th>
 				#end
-				
 				<th style="text-align:center" class="{sorter: false}">$i18n.getString( "operations" )</th>
 			  </tr>
           </thead>