dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #19281
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 8335: Minor fix for patient management.
------------------------------------------------------------
revno: 8335
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2012-10-02 13:59:33 +0700
message:
Minor fix for patient management.
modified:
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/PatientAttribute.java
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/hibernate/HibernatePatientStore.java
dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties
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/patientForm.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-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/PatientAttribute.java'
--- dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/PatientAttribute.java 2012-06-22 02:59:28 +0000
+++ dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/PatientAttribute.java 2012-10-02 06:59:33 +0000
@@ -42,6 +42,10 @@
private String value;
+ // -------------------------------------------------------------------------
+ // Constructors
+ // -------------------------------------------------------------------------
+
public PatientAttribute( String name, String value )
{
this.name = name;
@@ -52,6 +56,10 @@
{
}
+ // -------------------------------------------------------------------------
+ // Gettes && Setters
+ // -------------------------------------------------------------------------
+
@XmlAttribute
public String getName()
{
=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/hibernate/HibernatePatientStore.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/hibernate/HibernatePatientStore.java 2012-10-02 06:23:53 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/hibernate/HibernatePatientStore.java 2012-10-02 06:59:33 +0000
@@ -47,7 +47,6 @@
import org.hisp.dhis.jdbc.StatementBuilder;
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.patient.Patient;
-import org.hisp.dhis.patient.PatientAttribute;
import org.hisp.dhis.patient.PatientStore;
import org.hisp.dhis.program.Program;
import org.hisp.dhis.program.ProgramStageInstance;
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties 2012-09-28 08:42:22 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties 2012-10-02 06:59:33 +0000
@@ -279,7 +279,6 @@
please_fill_out_only_one_of_these_fields = Please fill only one of these fields
age_year = Age (years)
create = Create
-change_patient_location = Change person location
enroll_for = Enroll for
identifier_and_attribute = Identifier/Attribute
unenrollment = Un-enrollment
@@ -466,4 +465,5 @@
history = History
use_calendar = Use calendar
export_xls = Export XLS
-stage_skipped = Stage is skipped
\ No newline at end of file
+stage_skipped = Stage is skipped
+location = Location
\ No newline at end of file
=== 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 2012-09-27 08:00:40 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientDashboard.vm 2012-10-02 06:59:33 +0000
@@ -14,9 +14,9 @@
<table width='100%'>
<tr><th>
$i18n.getString("demographics")
- <a href="javascript:showUpdatePatientForm( '$patient.id', true );"><label class='bold'>«$i18n.getString("edit_profile")»</label></a>
+ <a href="javascript:showUpdatePatientForm( '$patient.id', true );"><span class='bold'>«$i18n.getString("edit_profile")»</span></a>
#if( $auth.hasAccess( "dhis-web-caseentry", "getPatientLocation" ) )
- <a href="javascript:getPatientLocation( '$patient.id', true );"><label class='bold'> «$i18n.getString("change_location")»</label></a>
+ <a href="javascript:getPatientLocation( '$patient.id', true );"><span class='bold'> «$i18n.getString("change_location")»</span></a>
#end
</th></tr>
</table>
@@ -27,6 +27,10 @@
<td>$!patient.getFullName()</td>
</tr>
<tr>
+ <td>$i18n.getString("location")</td>
+ <td>$!patient.organisationUnit.name</td>
+ </tr>
+ <tr>
<td>$i18n.getString("gender")</td>
<td>$i18n.getString($!patient.gender)</td>
</tr>
@@ -67,7 +71,19 @@
#foreach( $attributeValue in $attributeValues )
<tr>
<td>$attributeValue.patientAttribute.name</td>
- <td>$attributeValue.value</td>
+ <td>
+ #if($attributeValue.patientAttribute.valueType=='YES/NO')
+ #if($attributeValue.value=='true')
+ $i18n.getString("yes")
+ #else
+ $i18n.getString("no")
+ #end
+ #elseif($attributeValue.patientAttribute.valueType=='DATE')
+ $format.formatDate( $attributeValue.value )
+ #else
+ $attributeValue.value
+ #end
+ </td>
</tr>
#end
</table>
@@ -79,7 +95,7 @@
<table width='100%'>
<tr><th>
$i18n.getString("active_programs")
- <a href='javascript:showProgramEnrollmentForm( "$patient.id" )'><label class='bold'>«$i18n.getString("enroll_program")»</label></a>
+ <a href='javascript:showProgramEnrollmentForm( "$patient.id" )'><span class='bold'>«$i18n.getString("enroll_program")»</span></a>
</th>
</tr>
</table>
@@ -156,8 +172,8 @@
<table width='100%'>
<tr><th>
$i18n.getString("relationships")
- <a href="javascript:setFieldValue( 'isShowPatientList', 'false' ); showRelationshipList( '$patient.id' );"><label class='bold'>«$i18n.getString("management")»</label></a>
- <a href="javascript:showAddRelationshipPatient( '$patient.id', false );"><label class='bold'> «$i18n.getString("add_new_patient")»</label></a>
+ <a href="javascript:setFieldValue( 'isShowPatientList', 'false' ); showRelationshipList( '$patient.id' );"><span class='bold'>«$i18n.getString("management")»</span></a>
+ <a href="javascript:showAddRelationshipPatient( '$patient.id', false );"><span class='bold'> «$i18n.getString("add_new_patient")»</span></a>
</th></tr>
</table>
<div class="contentProviderTable">
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientForm.vm 2012-09-28 09:03:34 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientForm.vm 2012-10-02 06:59:33 +0000
@@ -22,7 +22,7 @@
</tr>
<tr>
- <td class='text-column'><label for="fullName">$i18n.getString( "full_name" )</label></td>
+ <td class='text-column'><label for="fullName">$i18n.getString( "full_name" )<em title="$i18n.getString( "required" )" class="required">*</em></label></td>
<td class="input-column"><input type="text" id="fullName" name="fullName" value="$!patient.getFullName()" class="{validate:{required:true, rangelength:[3,50]}}"></td>
</tr>
=== 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-09-24 05:02:17 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientLocation.vm 2012-10-02 06:59:33 +0000
@@ -5,7 +5,7 @@
<h3>
<a href="javascript:loadPatientList();">$i18n.getString( 'patient_management' )</a>
• <a href="javascript:showPatientDashboardForm($patientId);">$i18n.getString( 'patient_dashboard' )</a>
- • $i18n.getString( "change_patient_location" )
+ • $i18n.getString( "change_location" )
</h3>
<form method='post'>
=== 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-09-26 09:16:02 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientRegistrationList.vm 2012-10-02 06:59:33 +0000
@@ -130,7 +130,7 @@
<a href="javascript:showUpdatePatientForm( '$patient.id' )" title='$i18n.getString( "edit_profile" )'><img src="../images/edit.png" alt='$i18n.getString( "edit_profile" )'></a>
<a href="javascript:setFieldValue( 'isShowPatientList', 'false' ); showRelationshipList('$patient.id')" title='$i18n.getString( "manage_relationship" )'><img src="../images/relationship.png" alt='$i18n.getString( "manage_relationship" )'></a>
#if( $auth.hasAccess( "dhis-web-caseentry", "getPatientLocation" ) )
- <a href="javascript:getPatientLocation( '$patient.id' );" title='$i18n.getString( "change_patient_location" )'><img src="../icons/dataentry.png" alt='$i18n.getString( "change_patient_location" )' style='width:25px; height:25px'></a>
+ <a href="javascript:getPatientLocation( '$patient.id' );" title='$i18n.getString( "change_location" )'><img src="../icons/dataentry.png" alt='$i18n.getString( "change_patient_location" )' style='width:25px; height:25px'></a>
#end
<a href="javascript:removePatient( '$patient.id', '$encoder.jsEncode( $patient.getFullName() )' )" title='$i18n.getString( "remove" )'><img src="../images/delete.png" alt='$i18n.getString( "remove" )'></a>
<a href="javascript:showPatientHistory( '$patient.id' )" title='$i18n.getString( "patient_details_and_history" )'><img src="../images/information.png" alt='$i18n.getString( "patient_details_and_history" )'></a>
