dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 9097
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2012-11-21 22:17:33 +0700
message:
  Don't load all persons with overdue events when to click List All Persons button in program tracking.
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/reminder/GetProgramTrackingListAction.java
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/smsReminder.js
  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/programTrackingList.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/reminder/GetProgramTrackingListAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/reminder/GetProgramTrackingListAction.java	2012-09-25 03:33:56 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/reminder/GetProgramTrackingListAction.java	2012-11-21 15:17:33 +0000
@@ -27,6 +27,7 @@
 
 package org.hisp.dhis.caseentry.action.reminder;
 
+import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -133,9 +134,9 @@
         throws Exception
     {
         programStageInstance = programStageInstanceService.getProgramStageInstance( programStageInstanceId );
-
+        
         outboundSms = new ArrayList<OutboundSms>( programStageInstance.getOutboundSms() );
-
+       
         comments = new ArrayList<PatientComment>( programStageInstance.getPatientComments() );
 
         currentUsername = currentUserService.getCurrentUsername();

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/smsReminder.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/smsReminder.js	2012-11-16 05:08:24 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/smsReminder.js	2012-11-21 15:17:33 +0000
@@ -60,7 +60,7 @@
 	var programId = getFieldValue('programIdAddPatient');
 	var searchTexts = "stat_" + programId + "_" 
 				+ startDate + "_" + endDate + "_" 
-				+ getFieldValue('orgunitId') + "_true_4";
+				+ getFieldValue('orgunitId') + "_false_4";
 	
 	showLoader();
 	jQuery('#listEventDiv').load('getSMSPatientRecords.action',

=== 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-11-14 09:07:24 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientDashboard.vm	2012-11-21 15:17:33 +0000
@@ -18,11 +18,11 @@
 			<table>
 				<tr>
 					<td>$i18n.getString("full_name")</td>
-					<td>$!patient.getFullName()</td>
+					<td>$encoder.htmlEncode($!patient.getFullName())</td>
 				</tr>
 				<tr>
 					<td>$i18n.getString("location")</td>
-					<td>$!patient.organisationUnit.name</td>
+					<td>$encoder.htmlEncode($!patient.organisationUnit.name)</td>
 				</tr>
 				<tr>
 					<td>$i18n.getString("gender")</td>
@@ -46,7 +46,7 @@
 					<td>$i18n.getString("health_worker")</td>
 					<td>
 						#if($!patient.healthWorker )
-							$!patient.healthWorker.name
+							$encoder.htmlEncode($!patient.healthWorker.name)
 						#else
 							[$i18n.getString('none')]
 						#end
@@ -75,7 +75,7 @@
 						#elseif($attributeValue.patientAttribute.valueType=='DATE')
 							$format.formatDate( $attributeValue.value )
 						#else
-							$attributeValue.value
+							$encoder.htmlEncode($attributeValue.value)
 						#end	
 					</td>
 				</tr>
@@ -213,7 +213,7 @@
 		#set( $mark = false )
 		#foreach( $patientAudit in $patientAudits )
 		<tr #alternate( $mark )>
-			<td>$patientAudit.visitor</td>
+			<td>$encoder.htmlEncode($patientAudit.visitor)</td>
 			<td>$format.formatDate($patientAudit.date)</td>
 		</tr>
 		#set( $mark = !$mark )

=== 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	2012-10-22 06:00:03 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingList.vm	2012-11-21 15:17:33 +0000
@@ -102,7 +102,7 @@
 					</td>
 				</tr>
 				<tr>
-					<td>$i18n.getString( "message" )</td>
+					<td>$i18n.getString( "send_message" )</td>
 					<td>
 						<input type="text" id="smsMessage" name="smsMessage" class="{validate:{required:true,maxlength:160}}" onkeypress="keypressOnMessage(event, this,'$programStageInstance.id');"></input>
 						<input type="button" value="&raquo;" class='tiny-button' onclick="sendSmsOnePatient( byId('smsMessage'),'$programStageInstance.id' );"/>