← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 10298: Remove anonymous program in searching by program.

 

------------------------------------------------------------
revno: 10298
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-03-19 09:51:05 +0700
message:
  Remove anonymous program in searching by program.
modified:
  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/sendBeneficiarySMSPage.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/searchPatientCritetia.vm'
--- dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/searchPatientCritetia.vm	2013-03-15 19:24:30 +0000
+++ dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/searchPatientCritetia.vm	2013-03-19 02:51:05 +0000
@@ -20,7 +20,9 @@
 				<select id='programIdAddPatient' name='programIdAddPatient' onchange='enableBtn();'>
 					<option value='' type='2' id='emptyProgramOption'>[$i18n.getString("please_select")]</option>
 					#foreach($program in $programs)
+						#if( $program.type!='3')
 						<option value="$program.id" type='$program.type'>$program.displayName</option>
+						#end
 					#end
 				</select>
 			</td>

=== modified file 'dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/sendBeneficiarySMSPage.vm'
--- dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/sendBeneficiarySMSPage.vm	2013-03-14 03:32:14 +0000
+++ dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/sendBeneficiarySMSPage.vm	2013-03-19 02:51:05 +0000
@@ -204,7 +204,9 @@
 
 	var programComboBox = '<select class="search-field" id="searchText" name="searchText" >';
 	#foreach ( $program in $programs )
-		programComboBox += '<option value="$program.id">$program.displayName</option>';
+		#if( $program.type!='3')
+			programComboBox += '<option value="$program.id">$program.displayName</option>';
+		#end
 	#end
 	programComboBox += '</select>';