dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 10261
committer: Hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Sat 2013-03-16 02:24:30 +0700
message:
  (mobile) Sending SMS to Persons/Patients - Fixed bug searching by selected program.
modified:
  dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/javascript/patient.js
  dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/searchPatientCritetia.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-sms/src/main/webapp/dhis-web-sms/javascript/patient.js'
--- dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/javascript/patient.js	2013-03-15 18:55:26 +0000
+++ dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/javascript/patient.js	2013-03-15 19:24:30 +0000
@@ -350,13 +350,14 @@
 function listAllPatient()
 {
 	hideById( 'listPatientDiv' );
+	hideById( 'advanced-search' );
 	
 	jQuery('#loaderDiv').show();
 	contentDiv = 'listPatientDiv';
 	
 	var programId = getFieldValue('programIdAddPatient');
 
-	if ( programId || programId == '' )
+	if ( !programId || programId == '' )
 	{
 		jQuery('#listPatientDiv').load('searchRegistrationPatient.action',{ listAll:true },
 			function(){

=== modified file 'dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/searchPatientCritetia.vm'
--- dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/searchPatientCritetia.vm	2013-03-15 18:55:26 +0000
+++ dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/searchPatientCritetia.vm	2013-03-15 19:24:30 +0000
@@ -18,7 +18,7 @@
 			<td>$i18n.getString('program')</td>
 			<td>
 				<select id='programIdAddPatient' name='programIdAddPatient' onchange='enableBtn();'>
-					<option value='' type='2'>[$i18n.getString("please_select")]</option>
+					<option value='' type='2' id='emptyProgramOption'>[$i18n.getString("please_select")]</option>
 					#foreach($program in $programs)
 						<option value="$program.id" type='$program.type'>$program.displayName</option>
 					#end