dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 14707
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2014-04-07 01:09:34 +0700
message:
  Display View-all option in program list if the selected orgunit doesn't have any program assigned.
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingSelect.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/searchTrackedEntityInstanceCriteria.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/programTrackingSelect.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingSelect.vm	2014-04-06 15:48:31 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingSelect.vm	2014-04-06 18:09:34 +0000
@@ -4,13 +4,11 @@
         showById('sendSmsToListBtn');
         jQuery("#program option").each(function() {
             var item = jQuery(this);
-            if( item.attr('type') != 1 && item.val() != '' ) {
+            if( item.attr('type') != 1 || item.val() != '' ) {
                 item.remove();
             }
         });
 
-        jQuery("#searchObjectId [value=prg]").remove();
-        jQuery("#searchObjectId [value=prg]").remove();
         jQuery("#searchObjectId").prepend('<option value="-100">' + i18n_please_select_criteria + '</option>');
         jQuery("#searchObjectId [value=]").attr("selected", "selected");
 

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/searchTrackedEntityInstanceCriteria.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/searchTrackedEntityInstanceCriteria.vm	2014-04-06 17:03:28 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/searchTrackedEntityInstanceCriteria.vm	2014-04-06 18:09:34 +0000
@@ -19,16 +19,7 @@
 		<td>$i18n.getString('program')</td>
 		<td>
 			<select id='program' name='program' onchange='enableBtn();'>
-				#if($programs.size()==0)
-					<option value="">[$i18n.getString( "none_program" )]</option>
-					<script>disable('listEntityInstanceBtn')</script>
-				#elseif($programs.size()>1)
-					<option value='' type='2' id='emptyProgramOption'>[$i18n.getString("please_select")]</option>
-					<script>disable('listEntityInstanceBtn')</script>
-				#else
-					<script>enable('listEntityInstanceBtn')</script>
-				#end
-				
+				<option value="">[$i18n.getString( "view_all" )]</option>
 				#foreach($program in $programs)
 					<option value="$program.uid" type='$program.type'>$program.displayName</option>
 				#end