dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 11194
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-06-11 12:55:48 +0700
message:
  Add more information into Change Location form.
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/GetPatientLocationAction.java
  dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/PatientDashboardAction.java
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientDashboard.vm
  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/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/GetPatientLocationAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/GetPatientLocationAction.java	2012-08-12 06:10:50 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/GetPatientLocationAction.java	2013-06-11 05:55:48 +0000
@@ -29,6 +29,7 @@
 
 import org.hisp.dhis.oust.manager.SelectionTreeManager;
 import org.hisp.dhis.patient.Patient;
+import org.hisp.dhis.patient.PatientIdentifier;
 import org.hisp.dhis.patient.PatientService;
 
 import com.opensymphony.xwork2.Action;
@@ -75,6 +76,20 @@
         return patientId;
     }
 
+    private String systemIdentifier;
+
+    public String getSystemIdentifier()
+    {
+        return systemIdentifier;
+    }
+
+    private Patient patient;
+
+    public Patient getPatient()
+    {
+        return patient;
+    }
+
     // -------------------------------------------------------------------------
     // Action implementation
     // -------------------------------------------------------------------------
@@ -82,8 +97,17 @@
     public String execute()
         throws Exception
     {
-        Patient patient = patientService.getPatient( patientId );
+        patient = patientService.getPatient( patientId );
 
+        for( PatientIdentifier identifier : patient.getIdentifiers() )
+        {
+            if( identifier.getIdentifierType()== null)
+            {
+                systemIdentifier = identifier.getIdentifier();
+                break;
+            }
+        }
+        
         selectionTreeManager.setSelectedOrganisationUnit( patient.getOrganisationUnit() );
 
         return SUCCESS;

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/PatientDashboardAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/PatientDashboardAction.java	2013-06-10 09:32:43 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/PatientDashboardAction.java	2013-06-11 05:55:48 +0000
@@ -32,7 +32,6 @@
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientDashboard.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientDashboard.vm	2013-05-29 09:41:18 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientDashboard.vm	2013-06-11 05:55:48 +0000
@@ -32,7 +32,12 @@
 				#if( $!patient.gender )
 				<tr>
 					<td>$i18n.getString("gender")</td>
-					<td>$i18n.getString($!patient.gender)</td>
+					<td>#if($patient.gender=='F')
+							<img src='images/female_small.png'>
+						#else
+							<img src='images/male_small.png'>
+						#end
+					</td>
 				</tr>
 				#end
 				#if( $!patient.birthDate )

=== 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	2012-12-10 12:54:54 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientLocation.vm	2013-06-11 05:55:48 +0000
@@ -8,6 +8,35 @@
 	&#8226; <a href="javascript:showPatientDashboardForm($patientId);">$i18n.getString( 'patient_dashboard' )</a>
 	&#8226; $i18n.getString( "change_location" )
 </h3>
+	
+<table>
+	<tr>
+		<td colspan='3' style="padding-right:10px">
+			<h3>$patient.getFullName()</h3>
+		</td>
+	</tr>
+	<tr>
+		<td style="background-color:#88be3b; height:26px;">&nbsp;</td>
+		<td>$i18n.getString('gender'):</td>
+		<td>
+			#if($patient.gender=='F')
+				<img src='images/female_small.png'>
+			#else
+				<img src='images/male_small.png'>
+			#end
+		</td>
+	</tr>
+	<tr>
+		<td style="background-color:#88be3b; height:26px;">&nbsp;</td>
+		<td>$i18n.getString('dob_type'):</td>
+		<td>$!format.formatDate($!patient.birthDate)</td>
+	</tr>
+	<tr>
+		<td style="background-color:#88be3b; height:26px;">&nbsp;</td>
+		<td>$i18n.getString('age'):</td>
+		<td>$!patient.getAge()</td>
+	</tr>
+</table>
 
 <form method='post'>
 	<table>

=== 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-05-06 08:28:39 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientRegistrationList.vm	2013-06-11 05:55:48 +0000
@@ -66,8 +66,8 @@
 					#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>
+					<th>$i18n.getString( "age" )</th>
+					<th>$i18n.getString( "phone_number" )</th>
 				#else
 					<th>$i18n.getString("system_identifier")</th>
 				#end
@@ -75,7 +75,7 @@
 				#if($mapPatientOrgunit.size()!=0)
 					<th>$i18n.getString( "hierachy_orgunit" )</th>
 				#end
-				<th style="text-align:center" class="{sorter: false}">$i18n.getString( "operations" )</th>
+				<th style="text-align:center">$i18n.getString( "operations" )</th>
 			  </tr>
           </thead>
 		  
@@ -189,7 +189,6 @@
 <script type="text/javascript">
 	jQuery(document).ready(function(){
 		setTableStyles();	
-		tableSorter( 'patientList' );
 	});
 	var i18n_patient_details_and_history = '$encoder.jsEscape( $i18n.getString( "patient_details_and_history" ) , "'" )';	
 	var i18n_id = '$encoder.jsEscape( $i18n.getString( "id" ), "'")';