dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 7515
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2012-07-05 14:55:20 +0700
message:
  Don't search patient by the whole country in Patient Registration Management.
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/searchPatientCriteria.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties


--
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/javascript/commons.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js	2012-06-28 04:07:13 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js	2012-07-05 07:55:20 +0000
@@ -186,7 +186,13 @@
 			}
 			else
 			{
-				var value =jQuery(this).val();
+				var value = '';
+				if( jQuery(this).attr('type')=='checkbox' ){
+					value = byId(this.id).checked;
+				}
+				else if( jQuery(this).val()!='' ){
+					value = htmlEncode(jQuery(this).val());
+				}
 				if( dateOperator != '' )
 				{
 					value = dateOperator + "'" + value + "'";
@@ -197,7 +203,7 @@
 				else
 					params +=  elementId + "=";
 					
-				params += htmlEncode(value) + "&";
+				params += value + "&";
 			}
 		});
 		contentDiv = 'listPatientDiv';

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/searchPatientCriteria.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/searchPatientCriteria.vm	2012-06-28 04:07:13 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/searchPatientCriteria.vm	2012-07-05 07:55:20 +0000
@@ -52,7 +52,7 @@
 				<td><input type="button" class='small-button' value='+' onclick='addAttributeOption();'>
 					<td>
 						$i18n.getString('search_by_selected_unit')
-						<input type='checkbox' id='searchBySelectedOrgunit' name='searchBySelectedOrgunit' value='true' />
+						<input type='checkbox' id='searchBySelectedOrgunit' name='searchBySelectedOrgunit' />
 					</td>
 					<td>
 						<input type="button" class='large-button' value='$i18n.getString( "search" )' onclick='validateAdvancedSearch();'>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties	2012-07-04 05:06:10 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties	2012-07-05 07:55:20 +0000
@@ -238,7 +238,6 @@
 single_event_without_registration=Single event without registration
 for=for
 standard_interval_days=Standard interval days
-times=Times
 program_enrollment=Program enrollment
 due_date=Due date
 stage_visited = Stage visited
@@ -247,4 +246,7 @@
 allow_provided_elsewhere = Allow provided elsewhere
 save_success=Save successful
 sort_by_scheduled_days = Sort by scheduled days
-assign_program_to_orgunits_for_registering = Assign program to orgunits for registering
\ No newline at end of file
+assign_program_to_orgunits_for_registering = Assign program to orgunits for registering
+visited_program_stage = Visited program stage
+number_of_patients = Number of patients
+number_of_visits = Number of visits