dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #24774
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 12193: Fixed bug - Error when displaying fullname of person.
------------------------------------------------------------
revno: 12193
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2013-09-23 10:15:40 +0700
message:
Fixed bug - Error when displaying fullname of person.
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/Program.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStage.java
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanRecords.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addRelationshipForm.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addRelationshipPatientForm.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataRecordingSelect.vm
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/defaultPatientForm.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/detailsPartner.vm
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/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
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingList.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/records.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/relationshipList.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/relationshipPatients.vm
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/reportDataEntryForm.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responseDuplicate.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responsePatient.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responsePatientDetails.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responsePatients.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responseRelationshipPatients.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/updatePatientForm.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-api/src/main/java/org/hisp/dhis/program/Program.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/Program.java 2013-09-20 09:42:44 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/Program.java 2013-09-23 03:15:40 +0000
@@ -103,9 +103,9 @@
private Integer type;
- private Boolean displayIncidentDate;
+ private Boolean displayIncidentDate = true;
- private Boolean ignoreOverdueEvents;
+ private Boolean ignoreOverdueEvents = false;
private List<PatientIdentifierType> patientIdentifierTypes;
@@ -128,13 +128,13 @@
*/
private Boolean displayOnAllOrgunit = true;
- private Boolean useBirthDateAsIncidentDate;
-
- private Boolean useBirthDateAsEnrollmentDate;
-
- private Boolean selectEnrollmentDatesInFuture;
-
- private Boolean selectIncidentDatesInFuture;
+ private Boolean useBirthDateAsIncidentDate = false;
+
+ private Boolean useBirthDateAsEnrollmentDate = false;
+
+ private Boolean selectEnrollmentDatesInFuture = false;
+
+ private Boolean selectIncidentDatesInFuture = false;
private String relationshipText;
@@ -144,7 +144,7 @@
private Program relatedProgram;
- private Boolean dataEntryMethod;
+ private Boolean dataEntryMethod = false;
// -------------------------------------------------------------------------
// Constructors
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStage.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStage.java 2013-09-19 08:26:17 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStage.java 2013-09-23 03:15:40 +0000
@@ -73,7 +73,7 @@
private int minDaysFromStart;
- private Boolean irregular;
+ private Boolean irregular = false;
private Program program;
@@ -105,7 +105,7 @@
*/
private Boolean remindCompleted = false;
- private Boolean generatedByEnrollmentDate;
+ private Boolean generatedByEnrollmentDate = false;
private Boolean allowGenerateNextVisit = false;
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanRecords.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanRecords.vm 2013-09-16 09:47:59 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanRecords.vm 2013-09-23 03:15:40 +0000
@@ -68,7 +68,7 @@
#end
#end
#if($value=="")
- #set($value=$patient.getFullName())
+ #set($value=$!patient.name)
#end
$value
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addRelationshipForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addRelationshipForm.vm 2013-09-16 09:47:59 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addRelationshipForm.vm 2013-09-23 03:15:40 +0000
@@ -29,7 +29,7 @@
<td class='information'>
<table>
<tr align='justify'>
- <td colspan='2'>$patient.getFullName()
+ <td colspan='2'>$!patient.name
#if($patient.gender=='F')
<img src='images/female_small.png'>
#else
@@ -51,7 +51,7 @@
<td class='information'>
<table>
<tr>
- <td>$encoder.htmlEncode( $patient.getFullName() ) $i18n.getString( "is" )</td>
+ <td>$!encoder.htmlEncode( $patient.name) $i18n.getString( "is" )</td>
<td>
<select id="relationshipTypeId" name="relationshipTypeId" class="{validate:{required:true}}" style='width:205px;'>
<option value="">[$i18n.getString( "select_relationship" )]</option>
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addRelationshipPatientForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addRelationshipPatientForm.vm 2013-09-16 09:47:59 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addRelationshipPatientForm.vm 2013-09-23 03:15:40 +0000
@@ -61,8 +61,8 @@
<select name="relationshipTypeId" id="relationshipTypeId" class="{validate:{required:true}}" >
<option value="">[$i18n.getString( "please_select" )]</option>
#foreach ($relationship in $relationshipTypes)
- <option value="$relationship.id" relationshipFromA='true'>$encoder.htmlEncode(${relationship.aIsToB}) $i18n.getString("of") $encoder.htmlEncode($patient.getFullName()) ($encoder.htmlEncode(${relationship.bIsToA}))</option>
- <option value="$relationship.id" relationshipFromA='false'>$encoder.htmlEncode(${relationship.bIsToA}) $i18n.getString("of") $encoder.htmlEncode($patient.getFullName()) ($encoder.htmlEncode(${relationship.aIsToB}))</option>
+ <option value="$relationship.id" relationshipFromA='true'>$!encoder.htmlEncode(${relationship.aIsToB}) $i18n.getString("of") $!encoder.htmlEncode($patient.name) ($!encoder.htmlEncode(${relationship.bIsToA}))</option>
+ <option value="$relationship.id" relationshipFromA='false'>$!encoder.htmlEncode(${relationship.bIsToA}) $i18n.getString("of") $!encoder.htmlEncode($patient.name) ($!encoder.htmlEncode(${relationship.aIsToB}))</option>
#end
</select>
</td>
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataRecordingSelect.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataRecordingSelect.vm 2013-09-16 09:47:59 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataRecordingSelect.vm 2013-09-23 03:15:40 +0000
@@ -7,7 +7,7 @@
#if( $auth.hasAccess( "dhis-web-caseentry", "accessPatientAttributes" ) )
<tr>
<td class="bold">$i18n.getString( "full_name" ):</td>
- <td>$encoder.htmlEncode( $patient.getFullName() )<td>
+ <td>$!encoder.htmlEncode( $patient.name )<td>
</tr>
<tr>
<td class="bold">$i18n.getString( "gender" ):</td>
=== 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 2013-09-16 09:47:59 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataentryRecords.vm 2013-09-23 03:15:40 +0000
@@ -69,7 +69,7 @@
#end
#end
#if($value=="")
- #set($value=$patient.getFullName())
+ #set($value=$!patient.name)
#end
$value
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/defaultPatientForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/defaultPatientForm.vm 2013-09-16 09:47:59 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/defaultPatientForm.vm 2013-09-23 03:15:40 +0000
@@ -15,7 +15,7 @@
#if($patientRegistrationForm.fixedAttributes.contains( 'fullName' ))
<tr>
<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>
+ <td class="input-column"><input type="text" id="fullName" name="fullName" value="$!patient.name" class="{validate:{required:true, rangelength:[3,50]}}"></td>
</tr>
#end
@@ -86,7 +86,7 @@
<tr id="representativeFormDiv" name="representativeFormDiv">
<td class='text-column'>$i18n.getString("guardian")</td>
<td>
- $!patient.representative.getFullName() <img src="../images/information.png" alt="$i18n.getString( 'show_details' )" onclick='showRepresentativeInfo()' class='img-button'>
+ $!patient.representative.name <img src="../images/information.png" alt="$i18n.getString( 'show_details' )" onclick='showRepresentativeInfo()' class='img-button'>
</td>
</tr>
#else
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/detailsPartner.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/detailsPartner.vm 2013-02-28 08:50:43 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/detailsPartner.vm 2013-09-23 03:15:40 +0000
@@ -3,23 +3,31 @@
<td colspan='2'><label class="bold">$i18n.getString( "demographics" )</label></td>
</tr>
+ #if($partner.name)
<tr>
<td>$i18n.getString( "full_name" )</td>
- <td>: $encoder.htmlEncode($partner.getFullName())</td>
+ <td>: $!encoder.htmlEncode($partner.name)</td>
</tr>
+ #end
+ #if($partner.gender)
<tr>
<td>$i18n.getString( "gender" )</td>
<td>: $i18n.getString($partner.gender)</td>
</tr>
+ #end
+
+ #if($partner.birthDate)
<tr>
<td>$i18n.getString( "date_of_birth" )</td>
<td>: $format.formatDate( $partner.birthDate )</td>
</tr>
+
<tr>
<td>$i18n.getString( "age" )</td>
<td>: $partner.getAge()</td>
</tr>
+ #end
<tr>
<td>$i18n.getString( "phone_number" )</td>
@@ -49,7 +57,7 @@
#if( $patientAttributeValueMap.get( $attribute.id ) != " " )
<tr>
<td>$attribute.displayName</td>
- <td>: $encoder.htmlEncode($patientAttributeValueMap.get( $attribute.id ))</td>
+ <td>: $!encoder.htmlEncode($patientAttributeValueMap.get( $attribute.id ))</td>
</tr>
#end
#end
=== 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 2013-09-16 09:47:59 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/listPatient.vm 2013-09-23 03:15:40 +0000
@@ -83,7 +83,7 @@
#end
#end
#if($value=="")
- #set($value=$patient.getFullName())
+ #set($value=$patient.name)
#end
<td style="cursor:pointer;" onclick="javascript:showUpdatePatientForm('$patient.id');">
<a>$encoder.htmlEncode($value)</a>
=== 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-09-19 08:26:17 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientDashboard.vm 2013-09-23 03:15:40 +0000
@@ -19,10 +19,10 @@
</p>
<div class="contentProviderTable">
<table>
- #if( $!patient.getFullName()!='' )
+ #if( $!patient.name!='' )
<tr>
<td>$i18n.getString("full_name")</td>
- <td>$encoder.htmlEncode($!patient.getFullName())</td>
+ <td>$encoder.htmlEncode($!patient.name)</td>
</tr>
#end
@@ -62,7 +62,7 @@
<td>$i18n.getString("health_worker")</td>
<td>
#if($!patient.healthWorker )
- $encoder.htmlEncode($!patient.healthWorker.name)
+ $!encoder.htmlEncode($patient.healthWorker.name)
#else
[$i18n.getString('none')]
#end
@@ -88,7 +88,8 @@
<tr>
<td>$attributeValue.patientAttribute.displayName</td>
<td id='dashboard_attr$attributeValue.patientAttribute.id'>
- #if($attributeValue.patientAttribute.valueType=='bool')
+ #if($attributeValue.patientAttribute.valueType=='bool'
+ || $attributeValue.patientAttribute.valueType=='trueOnly')
#if($attributeValue.value)
$i18n.getString("yes")
#else
@@ -229,11 +230,11 @@
<table>
#foreach( $rel in $relationships )
#if($rel.patientA.id==$patient.id)
- <tr onclick="showPatientDashboardForm($rel.patientB.id)" title='$i18n.getString( "move_to_dashboard_of" ) $rel.patientB.getFullName()'>
+ <tr onclick="showPatientDashboardForm($rel.patientB.id)" title='$i18n.getString( "move_to_dashboard_of" ) $rel.patientB.name'>
<td><a href='#'>$rel.relationshipType.bIsToA</a></td>
<td>
#set($patient=$rel.patientB)
- #set($value=$!patient.getFullName())
+ #set($value=$!patient.name)
#foreach( $identifier in $patient.identifiers)
#if($!identifier.identifierType)
#set($value=$identifier.identifier)
@@ -249,11 +250,11 @@
</td>
</tr>
#else
- <tr onclick="showPatientDashboardForm($rel.patientA.id)" title='$i18n.getString( "move_to_dashboard_of" ) $rel.patientB.getFullName()'>
- <td><a href='#'>$rel.relationshipType.aIsToB</a></td>
+ <tr onclick="showPatientDashboardForm($rel.patientA.id)" title='$i18n.getString( "move_to_dashboard_of" ) $!rel.patientB.name'>
+ <td><a href='#'>$!rel.relationshipType.aIsToB</a></td>
<td><a href='#'>
- #set($patient=$rel.patientA)
- #set($value=$!patient.getFullName())
+ #set($patient=$!rel.patientA)
+ #set($value=$!patient.name)
#foreach( $identifier in $patient.identifiers)
#if($!identifier.identifierType)
#set($value=$identifier.identifier)
@@ -308,7 +309,7 @@
#foreach( $patientAudit in $patientAudits )
<tr #alternate( $mark )>
<td>$format.formatDate($patientAudit.date)</td>
- <td>$encoder.htmlEncode($patientAudit.visitor)</td>
+ <td>$!encoder.htmlEncode($patientAudit.visitor)</td>
<td>$i18n.getString($patientAudit.accessedModule)</td>
</tr>
#set( $mark = !$mark )
=== 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 2013-09-17 09:14:41 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientForm.vm 2013-09-23 03:15:40 +0000
@@ -29,7 +29,7 @@
<tr name='propertiesField'>
<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>
+ <td class="input-column"><input type="text" id="fullName" name="fullName" value="$!patient.name" class="{validate:{required:true, rangelength:[3,50]}}"></td>
</tr>
<tr name='propertiesField'>
@@ -90,7 +90,7 @@
<tr id="representativeFormDiv" name='propertiesField'>
<td class='text-column'>$i18n.getString("guardian")</td>
<td>
- $!patient.representative.getFullName() <img src="../images/information.png" alt="$i18n.getString( 'show_details' )" onclick='showRepresentativeInfo()' class='img-button'>
+ $!patient.representative.name <img src="../images/information.png" alt="$i18n.getString( 'show_details' )" onclick='showRepresentativeInfo()' class='img-button'>
</td>
</tr>
#else
=== 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 2013-09-16 09:47:59 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientLocation.vm 2013-09-23 03:15:40 +0000
@@ -20,7 +20,7 @@
#end
#end
#if($value=="")
- #set($value=$!patient.getFullName())
+ #set($value=$!patient.name)
#else
#set($flag=true)
#end
@@ -28,7 +28,7 @@
#set($value=$systemId)
#end
- #if($patient.getFullName()=='')
+ #if($patient.name=='')
<tr>
<td>
#if($flag==true)
=== 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-09-16 09:47:59 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientRegistrationList.vm 2013-09-23 03:15:40 +0000
@@ -127,7 +127,7 @@
#end
#if($value=="")
- #set($value=$!patient.getFullName())
+ #set($value=$!patient.name)
#end
#if($value=="")
#set($value=$systemId)
@@ -169,7 +169,7 @@
#if( $auth.hasAccess( "dhis-web-caseentry", "getPatientLocation" ) )
<a href="javascript:isDashboard=false;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() )', i18n_confirm_delete_patient )" title='$i18n.getString( "remove" )'><img src="../images/delete.png" alt='$i18n.getString( "remove" )'></a>
+ <a href="javascript:removePatient( '$patient.id', '$encoder.jsEncode( $patient.name )', i18n_confirm_delete_patient )" 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>
</td>
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingList.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingList.vm 2013-09-16 09:47:59 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingList.vm 2013-09-23 03:15:40 +0000
@@ -26,7 +26,7 @@
#end
#end
#if($value=="")
- #set($value=$!patient.getFullName())
+ #set($value=$!patient.name)
#set($title= $encoder.htmlEncode($i18n.getString( "full_name" )))
#end
#if($value=="")
=== 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 2013-09-16 09:47:59 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingRecords.vm 2013-09-23 03:15:40 +0000
@@ -56,7 +56,7 @@
#end
#end
#if($value=="")
- #set($value=$patient.getFullName())
+ #set($value=$patient.name)
#end
$value
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/records.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/records.vm 2013-09-16 09:47:59 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/records.vm 2013-09-23 03:15:40 +0000
@@ -1,7 +1,7 @@
<table>
<tr>
<td class="bold">$i18n.getString( "full_name" ):</td>
- <td>$encoder.htmlEncode( $patient.getFullName() )</td>
+ <td>$encoder.htmlEncode( $patient.name )</td>
</tr>
<tr>
<td class="bold">$i18n.getString( "gender" ):</td>
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/relationshipList.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/relationshipList.vm 2013-09-16 09:47:59 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/relationshipList.vm 2013-09-23 03:15:40 +0000
@@ -15,7 +15,7 @@
<table>
<tr>
<td class="bold text-column">$i18n.getString( "full_name" ): </td>
- <td>$encoder.htmlEncode( $patient.getFullName() )<td>
+ <td>$!encoder.htmlEncode( $patient.name )<td>
</tr>
<tr>
<td class="bold text-column">$i18n.getString( "gender" ): </td>
@@ -80,7 +80,7 @@
</td>
<td>
- $encoder.htmlEncode( $relationship.patientB.getFullName() )
+ $!encoder.htmlEncode( $relationship.patientB.name )
</td>
#elseif($relationship.patientB.id == $patient.id )
#set( $partnerId = $relationship.patientA.id )
@@ -89,13 +89,13 @@
</td>
<td>
- $encoder.htmlEncode( $relationship.patientA.getFullName() )
+ $!encoder.htmlEncode( $relationship.patientA.name )
</td>
#end
<td style="text-align:center">
<a href="javascript:manageRepresentative( '$patient.id', $partnerId )" title="$i18n.getString( 'set_as_representative' )"><img src="images/representative.png" alt="$i18n.getString( 'manage_representative' )"></a>
- <a href="javascript:removeRelationship( '$relationship.id', '$encoder.jsEncode( $relationship.patientA.getFullName() )', '$encoder.jsEncode( $relationship.relationshipType.aIsToB )', '$encoder.jsEncode( $relationship.patientB.getFullName() )' )" title="$i18n.getString( 'remove' )"><img src="../images/delete.png" alt="$i18n.getString( 'remove' )"></a>
+ <a href="javascript:removeRelationship( '$relationship.id', '$!encoder.jsEncode( $relationship.patientA.name )', '$encoder.jsEncode( $relationship.relationshipType.aIsToB )', '$!encoder.jsEncode( $relationship.patientB.name )' )" title="$i18n.getString( 'remove' )"><img src="../images/delete.png" alt="$i18n.getString( 'remove' )"></a>
</td>
</tr>
#set( $mark = !$mark)
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/relationshipPatients.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/relationshipPatients.vm 2013-09-16 09:47:59 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/relationshipPatients.vm 2013-09-23 03:15:40 +0000
@@ -39,7 +39,7 @@
<td>$velocityCount</td>
<td style="cursor:pointer;" onclick="javascript:isDashboard=true;showPatientDashboardForm( '$patient.id' )">
- <a>$encoder.htmlEncode($patient.getFullName())</a>
+ <a>$!encoder.htmlEncode($patient.name)</a>
</td>
<td>#if($!patient.gender) $i18n.getString($!patient.gender) #end</td>
=== 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 2013-09-16 09:47:59 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/report.vm 2013-09-23 03:15:40 +0000
@@ -34,7 +34,7 @@
#end
#end
#if($value=="")
- #set( $value=$programInstance.patient.getFullName())
+ #set( $value=$programInstance.patient.name)
#end
<input type='button' class='patient-object' value="$value"
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportDataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportDataEntryForm.vm 2013-09-16 09:47:59 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportDataEntryForm.vm 2013-09-23 03:15:40 +0000
@@ -1,5 +1,5 @@
<div id='reportTitle' name='reportTitle' style="display:none;">
- <h3>$i18n.getString('records_of') $encoder.htmlEncode( $patient.getFullName() ) $i18n.getString('at') $programStage.displayName $i18n.getString('in') $organisationUnit.name $i18n.getString('on_value') $format.formatDate($programStageInstance.executionDate)</h3>
+ <h3>$i18n.getString('records_of') $!encoder.htmlEncode( $patient.name ) $i18n.getString('at') $programStage.displayName $i18n.getString('in') $organisationUnit.name $i18n.getString('on_value') $format.formatDate($programStageInstance.executionDate)</h3>
<hr/>
</div>
@@ -11,7 +11,7 @@
<span class='bold' id="patientName">$i18n.getString( "full_name" ):</span>
</td>
<td class='coordinates2'>
- $encoder.htmlEncode( $patient.getFullName() )
+ $!encoder.htmlEncode( $patient.name )
#if($patient.gender=='F')
<img src='images/female_small.png'>
#else
@@ -74,7 +74,7 @@
enable('completeBtn');
disable('uncompleteBtn');
#end
- setInnerHTML("patientNameLbl", "» " + "$encoder.jsEncode( $patient.getFullName() )");
+ setInnerHTML("patientNameLbl", "» " + "!$encoder.jsEncode( $patient.name)");
});
var i18n_value_must_integer = '$encoder.jsEscape( $i18n.getString( "value_must_integer" ) , "'")';
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responseDuplicate.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responseDuplicate.vm 2013-09-16 09:47:59 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responseDuplicate.vm 2013-09-23 03:15:40 +0000
@@ -3,7 +3,7 @@
#foreach( $patient in $patients )
<patient>
<id>$patient.id</id>
- <fullName>$encoder.xmlEncode( $patient.getFullName() )</fullName>
+ <fullName>$!encoder.xmlEncode( $patient.name )</fullName>
<gender>$encoder.xmlEncode( $i18n.getString($patient.gender ))</gender>
<dateOfBirth>$format.formatDate( $patient.birthDate )</dateOfBirth>
<age>$encoder.xmlEncode( $patient.getAge() )</age>
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responsePatient.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responsePatient.vm 2013-09-16 09:47:59 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responsePatient.vm 2013-09-23 03:15:40 +0000
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<patient>
<id>$patient.id</id>
- <fullName>$!encoder.xmlEncode( $patient.getFullName() )</fullName>
+ <fullName>$!encoder.xmlEncode( $patient.name )</fullName>
<gender>$!encoder.xmlEncode( $i18n.getString($patient.gender ))</gender>
<dobType>#if($!patient.dobType)$!patient.dobType#else $i18n.getString('none') #end</dobType>
<dateOfBirth>$!format.formatDate( $!patient.birthDate )</dateOfBirth>
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responsePatientDetails.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responsePatientDetails.vm 2013-09-16 09:47:59 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responsePatientDetails.vm 2013-09-23 03:15:40 +0000
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<patient>
<id>$patient.id</id>
- <fullName>$!encoder.xmlEncode( $patient.getFullName() )</fullName>
+ <fullName>$!encoder.xmlEncode( $patient.name )</fullName>
<gender>$!encoder.xmlEncode( $i18n.getString($patient.gender ))</gender>
<dateOfBirth>$!format.formatDate( $patient.birthDate )</dateOfBirth>
<age>$!encoder.xmlEncode( $patient.getAge() )</age>
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responsePatients.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responsePatients.vm 2013-09-16 09:47:59 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responsePatients.vm 2013-09-23 03:15:40 +0000
@@ -3,7 +3,7 @@
#foreach( $patient in $patients )
<patient>
<id>$patient.id</id>
- <fullName>$!encoder.xmlEncode( $patient.getFullName() )</fullName>
+ <fullName>$!encoder.xmlEncode( $patient.name )</fullName>
<gender>$!encoder.xmlEncode( $i18n.getString( $patient.gender ))</gender>
<dateOfBirth>$format.formatDate( $patient.birthDate )</dateOfBirth>
<age>$!encoder.xmlEncode( $patient.getAge() )</age>
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responseRelationshipPatients.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responseRelationshipPatients.vm 2013-09-16 09:47:59 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responseRelationshipPatients.vm 2013-09-23 03:15:40 +0000
@@ -3,7 +3,7 @@
#foreach( $patient in $patients )
{
"id": $!{patient.id},
- "fullName": "$!encoder.jsonEncode( ${patient.getFullName()} )"
+ "fullName": "$!encoder.jsonEncode( ${patient.name} )"
}#if( $velocityCount < $size ),#end
#end
] }
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/updatePatientForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/updatePatientForm.vm 2013-08-01 03:15:38 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/updatePatientForm.vm 2013-09-23 03:15:40 +0000
@@ -106,7 +106,7 @@
<table>
<tr>
<td class="bold text-column">$i18n.getString("full_name"): </td>
- <td>$encoder.htmlEncode($!representative.getFullName())</td>
+ <td>$!encoder.htmlEncode($!representative.name)</td>
</tr>
<tr>
<td class="bold text-column">$i18n.getString("relationship"): </td>
