dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 8965
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2012-11-09 21:38:35 +0700
message:
  Add more information for minimized search div in anonymous program.
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/anonymousRegistration.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/anonymousRegistration.js


--
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/resources/org/hisp/dhis/caseentry/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2012-11-09 06:08:13 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2012-11-09 14:38:35 +0000
@@ -472,4 +472,5 @@
 validation_rule = Validation rule
 specify_a_date = Please specify a date
 clear_all = Clear all
-show_all = Show all
\ No newline at end of file
+show_all = Show all
+you_have_active_filters = You have active filters
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/anonymousRegistration.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/anonymousRegistration.vm	2012-11-09 14:20:40 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/anonymousRegistration.vm	2012-11-09 14:38:35 +0000
@@ -60,6 +60,7 @@
 		
 		<table id='minimized-advanced-search' class="hidden">
 			<tr><td align='right'>
+				$i18n.getString('you_have_active_filters')&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 				<input type="button" class='large-button' value="$i18n.getString('show_all')" onclick='showFilterForm()'>
 				<input type="button" class='large-button' value="$i18n.getString('clear_all')" onclick='removeAllOption()'>
 			</td></tr>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/anonymousRegistration.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/anonymousRegistration.js	2012-11-09 14:20:40 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/anonymousRegistration.js	2012-11-09 14:38:35 +0000
@@ -2,9 +2,13 @@
 function organisationUnitSelected( orgUnits, orgUnitNames )
 {
 	hideById('dataEntryInfor');
+	hideById('advanced-search');
 	hideById('listDiv');
 	showById('mainLinkLbl');
 	setFieldValue("filter", false);
+	setFieldValue("startDate", '');
+	setFieldValue("endDate", '');
+	jQuery('#advancedSearchTB [name=searchText]').val('');
 	jQuery.getJSON( "anonymousPrograms.action",{}, 
 		function( json )
 		{   
@@ -79,6 +83,7 @@
 		}, 
 		function( json ) 
 		{   
+			jQuery('#advancedSearchTB [name=searchText]').val('');
 			jQuery('.stage-object-selected').attr('psid', jQuery('#programId option:selected').attr("psid"));
 	
 			clearListById('searchObjectId');
@@ -459,7 +464,7 @@
 
 function showFilterForm()
 {
-	jQuery('#advanced-search').toggle();
+	showById('advanced-search');
 	hideById('minimized-advanced-search');
 	disable('advancedBtn');
 	setFieldValue('filter', true);