dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 12570
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2013-10-11 13:38:40 +0700
message:
  Display the default search field when to click Clear and Close button.
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/javascript/commons.js
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/multiDataEntrySelect.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/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	2013-10-09 14:43:56 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2013-10-11 06:38:40 +0000
@@ -685,4 +685,5 @@
 active_and_completed_enrolments = Active and Completed Enrolments
 hide_search_criteria = Hide search criteria
 there_are_active_search_filter_click_on_arrow_to_show_them = there are active search filter, click on arrow to show them.
-add_relative = Add relative
\ No newline at end of file
+add_relative = Add relative
+orgunit_search_type = Orgunit search type"
\ No newline at end of file

=== 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	2013-10-11 04:31:33 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js	2013-10-11 06:38:40 +0000
@@ -2379,14 +2379,12 @@
 function advancedSearchOnclick()
 {
 	jQuery('#advanced-search').toggle();
-	if( getFieldValue('showSearchIdField')=='true' )
-	{
-		if(jQuery('#advanced-search').is(':visible')){
-			hideById('searchByIdTR');
-		}
-		else{
-			showById('searchByIdTR');
-		}
+	
+	if(jQuery('#advanced-search').is(':visible')){
+		hideById('searchByIdTR');
+	}
+	else{
+		showById('searchByIdTR');
 	}
 }
 
@@ -2400,16 +2398,13 @@
 	});
 	addAttributeOption();
 	hideById('advanced-search');
-	hideById('listPatientDiv');
+	showById('searchByIdTR');
 }
 
 function hideSearchCriteria()
 {
 	hideById('advanced-search');
-	if( getFieldValue('showSearchIdField')=='true' )
-	{
-		showById('showSearchCriteriaDiv');
-	}
+	showById('showSearchCriteriaDiv');
 }
 
 function showSearchCriteria()

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/multiDataEntrySelect.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/multiDataEntrySelect.vm	2013-09-20 15:13:05 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/multiDataEntrySelect.vm	2013-10-11 06:38:40 +0000
@@ -20,6 +20,8 @@
 		
 		jQuery("#searchObjectId [value=prg]").remove();
 		registration = false;
+		
+		jQuery('#searchByIdTR').remove();
 	});	
 </script>