← Back to team overview

dhis2-devs team mailing list archive

  1. dhis2-devs team
  2. Mailing list archive
  3. Message #24551

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 12058: more patient name fixes

  Thread Previous • Date Previous • • Thread Next 
------------------------------------------------------------
revno: 12058
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2013-09-12 10:40:07 +0200
message:
  more patient name fixes
modified:
  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/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-light/src/main/webapp/dhis-web-light/enrollment/programEnrollmentForm.vm
  dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/addNewRelationshipForm.vm
  dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/beneficiaryDetail.vm
  dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/beneficiaryList.vm
  dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/beneficiaryProgramList.vm
  dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/beneficiaryProgramStageList.vm
  dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/completedProgramStageForm.vm
  dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/patientLocationForm.vm
  dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/programStageForm.vm
  dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/relatedPatientList.vm
  dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/selectProgramStageSection.vm
  dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/singleevent/selectSingleEventBeneficiary.vm
  dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/singleevent/singleEventForm.vm
  dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/beneficiarySearchResult.vm
  dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/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/activityPlanRecords.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanRecords.vm	2013-05-24 09:10:42 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanRecords.vm	2013-09-12 08:40:07 +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-07-31 06:51:17 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addRelationshipForm.vm	2013-09-12 08:40:07 +0000
@@ -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-08-01 03:15:38 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addRelationshipPatientForm.vm	2013-09-12 08:40:07 +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-06-12 04:19:18 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataRecordingSelect.vm	2013-09-12 08:40:07 +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-05-28 07:32:37 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataentryRecords.vm	2013-09-12 08:40:07 +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-03 14:59:12 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/defaultPatientForm.vm	2013-09-12 08:40:07 +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
 

=== 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-05-06 08:28:39 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/listPatient.vm	2013-09-12 08:40:07 +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-07 12:32:55 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientDashboard.vm	2013-09-12 08:40:07 +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
 				
@@ -228,7 +228,7 @@
 							<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)
@@ -248,7 +248,7 @@
 							<td><a href='#'>$rel.relationshipType.aIsToB</a></td>
 							<td><a href='#'>
 								#set($patient=$rel.patientA)
-								#set($value=$!patient.getFullName())
+								#set($value=$!patient.name)
 								#foreach( $identifier in $patient.identifiers)
 									#if($!identifier.identifierType)
 										#set($value=$identifier.identifier)

=== 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-11 16:02:06 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientForm.vm	2013-09-12 08:40:07 +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'>

=== 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-07-22 04:59:04 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientLocation.vm	2013-09-12 08:40:07 +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-12 07:19:15 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientRegistrationList.vm	2013-09-12 08:40:07 +0000
@@ -127,7 +127,7 @@
 					#end
 					
 					#if($value=="")
-						#set($value=$!patient.getFullName())
+						#set($value=$!patient.name)
 					#end
 					#if($value=="")
 						#set($value=$systemId)

=== 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-08-27 06:52:06 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingList.vm	2013-09-12 08:40:07 +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-08-06 06:33:43 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingRecords.vm	2013-09-12 08:40:07 +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-06-12 04:19:18 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/records.vm	2013-09-12 08:40:07 +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-12 07:19:15 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/relationshipList.vm	2013-09-12 08:40:07 +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>

=== 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-07-30 03:56:26 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/relationshipPatients.vm	2013-09-12 08:40:07 +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	2012-12-14 17:07:44 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/report.vm	2013-09-12 08:40:07 +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-07-05 07:05:20 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportDataEntryForm.vm	2013-09-12 08:40:07 +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", "&raquo; " + "$encoder.jsEncode( $patient.getFullName() )");
+		setInnerHTML("patientNameLbl", "&raquo; " + "$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-02-13 15:58:32 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responseDuplicate.vm	2013-09-12 08:40:07 +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-01-28 05:28:45 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responsePatient.vm	2013-09-12 08:40:07 +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-01-28 05:28:45 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responsePatientDetails.vm	2013-09-12 08:40:07 +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-02-13 15:58:32 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responsePatients.vm	2013-09-12 08:40:07 +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	2012-12-10 12:54:54 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responseRelationshipPatients.vm	2013-09-12 08:40:07 +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-light/src/main/webapp/dhis-web-light/enrollment/programEnrollmentForm.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/enrollment/programEnrollmentForm.vm	2013-03-06 04:25:38 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/enrollment/programEnrollmentForm.vm	2013-09-12 08:40:07 +0000
@@ -1,4 +1,4 @@
-<h2>$i18n.getString( "enroll" ) $patient.getFullName() to $program.getName()</h2>
+<h2>$i18n.getString( "enroll" ) $patient.name to $program.getName()</h2>
 <form action="saveMobileProgramEnrollment.action" method="POST">
 <div class="header-box" align="center">
 <input type="hidden" name="patientId" value="$patientId"/>	

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/addNewRelationshipForm.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/addNewRelationshipForm.vm	2012-06-11 10:11:21 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/addNewRelationshipForm.vm	2013-09-12 08:40:07 +0000
@@ -6,12 +6,12 @@
 <input type="hidden" name="relatedPatientId" value="$relatedPatientId"/>	
 <input type="hidden" name="relationshipTypeId" value="$relationshipTypeId"/>	
 	<p style="text-align: left;">
-		<label>$originalPatient.getFullName() is</label>
+		<label>$originalPatient.name is</label>
 		<select name="relationship" style="width: 100%;">
 			<option value="$relationshipType.getaIsToB()">$relationshipType.getaIsToB()</option>
 			<option value="$relationshipType.getbIsToA()">$relationshipType.getbIsToA()</option>
 		</select>
-		<label>of $relatedPatient.getFullName()</label>
+		<label>of $relatedPatient.name</label>
 	</p>
 
 </div>

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/beneficiaryDetail.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/beneficiaryDetail.vm	2012-05-29 15:37:40 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/beneficiaryDetail.vm	2013-09-12 08:40:07 +0000
@@ -1,4 +1,4 @@
-<h2>$i18n.getString("details_for") $!encoder.htmlEncode( ${patient.getFullName()} )   </h2>
+<h2>$i18n.getString("details_for") $!encoder.htmlEncode( ${patient.name} )   </h2>
 <p>
 
 <ul>
@@ -15,7 +15,7 @@
 <h2>$i18n.getString( "navigate_to" )</h2>
 <ul>
 	#if($organisationUnitId == "0")
-		<li><a href="showPatientProgramList.action?patientId=$patient.id">$!encoder.htmlEncode( ${patient.getFullName()} )</a></li>
+		<li><a href="showPatientProgramList.action?patientId=$patient.id">$!encoder.htmlEncode( ${patient.name} )</a></li>
 	#else
 		<li><a href="selectActivity.action?organisationUnitId=$organisationUnitId&patientId=$patient.id&current=$current"> $i18n.getString("activity_list")</a></li>
 	#end

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/beneficiaryList.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/beneficiaryList.vm	2012-09-27 06:54:00 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/beneficiaryList.vm	2013-09-12 08:40:07 +0000
@@ -3,7 +3,7 @@
 <p>
 <ul>
 #foreach( $patient in $patients )
-	<li><a href="showPatientProgramList.action?patientId=$patient.getId()">$!encoder.htmlEncode( ${patient.getFullName()} )</a></li>
+	<li><a href="showPatientProgramList.action?patientId=$patient.getId()">$!encoder.htmlEncode( ${patient.name} )</a></li>
 #end
 </ul>
 </p>

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/beneficiaryProgramList.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/beneficiaryProgramList.vm	2013-03-20 03:54:42 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/beneficiaryProgramList.vm	2013-09-12 08:40:07 +0000
@@ -1,4 +1,4 @@
-<h2>$!encoder.htmlEncode( ${patient.getFullName()} )</h2>
+<h2>$!encoder.htmlEncode( ${patient.name} )</h2>
 	#if( $validated)
 		<div class="header-box">
 			<h3 style="text-align: left;">$i18n.getString("successfully_saved")</h3>

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/beneficiaryProgramStageList.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/beneficiaryProgramStageList.vm	2013-01-28 09:42:58 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/beneficiaryProgramStageList.vm	2013-09-12 08:40:07 +0000
@@ -1,4 +1,4 @@
-<h2>$!encoder.htmlEncode( ${patient.getFullName()} )</h2>
+<h2>$!encoder.htmlEncode( ${patient.name} )</h2>
 
 #if( $validated == true)
     <div class="header-box">
@@ -48,7 +48,7 @@
 <div id="footer">
 <h2>$i18n.getString( "navigate_to" )</h2>
 <ul>
-	<li><a href="showPatientProgramList.action?patientId=$patient.getId()">$!encoder.htmlEncode( ${patient.getFullName()} )</a></li>
+	<li><a href="showPatientProgramList.action?patientId=$patient.getId()">$!encoder.htmlEncode( ${patient.name} )</a></li>
 	<li><a href="index.action">$i18n.getString("home")</a></li>
 </ul>
 </div>
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/completedProgramStageForm.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/completedProgramStageForm.vm	2013-05-29 07:41:44 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/completedProgramStageForm.vm	2013-09-12 08:40:07 +0000
@@ -124,7 +124,7 @@
 <div id="footer">
 <h2>$i18n.getString( "navigate_to" )</h2>
 <ul>
-	<li><a href="showPatientProgramStageList.action?patientId=$patientId&programInstanceId=$programInstanceId&programId=$programId&validated=false">$!encoder.htmlEncode( ${patient.getFullName()} )</a></li>
+	<li><a href="showPatientProgramStageList.action?patientId=$patientId&programInstanceId=$programInstanceId&programId=$programId&validated=false">$!encoder.htmlEncode( ${patient.name} )</a></li>
 	<li><a href="index.action">$i18n.getString("home")</a></li>
 </ul>
 </div>

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/patientLocationForm.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/patientLocationForm.vm	2012-07-23 09:58:04 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/patientLocationForm.vm	2013-09-12 08:40:07 +0000
@@ -1,4 +1,4 @@
-<h2>$i18n.getString( "register_location_for" ) $patient.getFullName()</h2>
+<h2>$i18n.getString( "register_location_for" ) $patient.name</h2>
 
 <form action="registerPatientLocation.action" method="POST">
 <div class="header-box" align="center">
@@ -26,7 +26,7 @@
 <div id="footer">
 <h2>$i18n.getString( "navigate_to" )</h2>
 <ul>
-	<li><a href="showPatientProgramList.action?patientId=$patient.getId()">$!encoder.htmlEncode( ${patient.getFullName()} )</a></li>
+	<li><a href="showPatientProgramList.action?patientId=$patient.getId()">$!encoder.htmlEncode( ${patient.name} )</a></li>
 	<li> <a href="trackingMenu.action"> $i18n.getString("tracking_menu")</a> </li>
 	<li><a href="index.action">$i18n.getString("home")</a></li>
 </ul>

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/programStageForm.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/programStageForm.vm	2013-05-29 07:41:44 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/programStageForm.vm	2013-09-12 08:40:07 +0000
@@ -1,5 +1,5 @@
 <div class="header-box" align="center">
-	<h3 style="text-align: left; background-color: #719953; border-color: #719953; color: white;">$patient.firstName $patient.lastName</h3>
+	<h3 style="text-align: left; background-color: #719953; border-color: #719953; color: white;">$patient.name</h3>
 	<p style="text-align: left;">
 	Program Stage: $encoder.htmlEncode( $programStage.name )<br/>
 	
@@ -139,7 +139,7 @@
 		<li><a href="selectActivity.action?organisationUnitId=$orgUnitId&patientId=$patientId&current=$current"> $i18n.getString("activity_list")</a></li>
 	#end
 	
-	<li><a href="showPatientProgramList.action?patientId=$patientId">$!encoder.htmlEncode( ${patient.getFullName()} )</a></li>
+	<li><a href="showPatientProgramList.action?patientId=$patientId">$!encoder.htmlEncode( ${patient.name} )</a></li>
 	<li><a href="index.action">$i18n.getString("home")</a></li>
 	
 </ul>

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/relatedPatientList.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/relatedPatientList.vm	2012-06-11 10:11:21 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/relatedPatientList.vm	2013-09-12 08:40:07 +0000
@@ -9,7 +9,7 @@
 <p>
 <ul>
 #foreach( $patient in $patients )
-	<li><a href="showAddNewRelationshipForm.action?originalPatientId=$originalPatientId&relatedPatientId=$patient.id&relationshipTypeId=$relationshipTypeId">$!encoder.htmlEncode( ${patient.getFullName()} )</a></li>
+	<li><a href="showAddNewRelationshipForm.action?originalPatientId=$originalPatientId&relatedPatientId=$patient.id&relationshipTypeId=$relationshipTypeId">$!encoder.htmlEncode( ${patient.name} )</a></li>
 #end
 </ul>
 </p>

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/selectProgramStageSection.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/selectProgramStageSection.vm	2012-11-15 06:17:43 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/selectProgramStageSection.vm	2013-09-12 08:40:07 +0000
@@ -1,5 +1,5 @@
 <div class="header-box" align="center">
-    <h3 style="text-align: left; background-color: #719953; border-color: #719953; color: white;">$patient.firstName $patient.lastName</h3>
+    <h3 style="text-align: left; background-color: #719953; border-color: #719953; color: white;">$patient.name</h3>
     <p style="text-align: left;">
         $programStage.name (${dateFormat.format( $programStageInstance.dueDate)})
     </p>
@@ -47,7 +47,7 @@
 	#else
 		<li><a href="selectActivity.action?organisationUnitId=$orgUnitId&patientId=$patientId&current=$current"> $i18n.getString("activity_list")</a></li>
 	#end
-	<li><a href="showPatientProgramList.action?patientId=$patientId">$!encoder.htmlEncode( ${patient.getFullName()} )</a></li>
+	<li><a href="showPatientProgramList.action?patientId=$patientId">$!encoder.htmlEncode( ${patient.name} )</a></li>
 	<li><a href="index.action">$i18n.getString("home")</a></li>
 </ul>
 </div>
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/singleevent/selectSingleEventBeneficiary.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/singleevent/selectSingleEventBeneficiary.vm	2012-05-24 14:51:18 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/singleevent/selectSingleEventBeneficiary.vm	2013-09-12 08:40:07 +0000
@@ -9,7 +9,7 @@
 <p>
 <ul>
 #foreach( $patient in $singleEventBeneficiaryList )
-	<li><a href="showSingleEventForm.action?organisationUnitId=$organisationUnitId&patientId=$patient.id&programId=$programId">$!encoder.htmlEncode( ${patient.getFullName()} )</a></li>
+	<li><a href="showSingleEventForm.action?organisationUnitId=$organisationUnitId&patientId=$patient.id&programId=$programId">$!encoder.htmlEncode( ${patient.name} )</a></li>
 #end
 </ul>
 </p>

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/singleevent/singleEventForm.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/singleevent/singleEventForm.vm	2013-05-29 07:41:44 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/singleevent/singleEventForm.vm	2013-09-12 08:40:07 +0000
@@ -81,7 +81,7 @@
 <h2>$i18n.getString( "navigate_to" )</h2>
 <ul>
 	<li><a href="selectSingleEventBeneficiary.action?organisationUnitId=$organisationUnitId&programId=$programId">$i18n.getString("beneficiary_list")</a></li>
-	<li><a href="showPatientProgramList.action?patientId=$patientId">$!encoder.htmlEncode( ${patient.getFullName()} )</a></li>
+	<li><a href="showPatientProgramList.action?patientId=$patientId">$!encoder.htmlEncode( ${patient.name} )</a></li>
 	<li><a href="index.action">$i18n.getString("home")</a></li>
 </ul>
 </div>

=== modified file 'dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/beneficiarySearchResult.vm'
--- dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/beneficiarySearchResult.vm	2012-06-18 06:14:19 +0000
+++ dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/beneficiarySearchResult.vm	2013-09-12 08:40:07 +0000
@@ -9,8 +9,7 @@
 <p>
 <ul>
 #foreach( $patient in $patientList )
-	#set($fullName = $patient.getFirstName() + $patient.getMiddle() + $patient.getLastName())
-	<li><a href="selectProgram.action?organisationUnitId=$organisationUnit.id&beneficiaryId=$beneficiary.id&current=$current">$!encoder.htmlEncode( ${fullName} )</a></li>
+	<li><a href="selectProgram.action?organisationUnitId=$organisationUnit.id&beneficiaryId=$beneficiary.id&current=$current">$!encoder.htmlEncode( $patient.name )</a></li>
 #end
 </ul>
 </p>

=== modified file 'dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/patientRegistrationList.vm'
--- dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/patientRegistrationList.vm	2013-03-20 04:23:51 +0000
+++ dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/patientRegistrationList.vm	2013-09-12 08:40:07 +0000
@@ -89,7 +89,7 @@
 					#end
 				#end
 				#if($value=="")
-					#set($value=$patient.getFullName())
+					#set($value=$patient.names)
 				#end
 				<td>$!encoder.htmlEncode($value)</td>
  Thread Previous • Date Previous • • Thread Next