=== 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-09 06:18:16 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js 2013-10-09 06:40:18 +0000 @@ -2384,15 +2384,10 @@ addAttributeOption(); jQuery("input[id=searchText]").last().val(value); } - + showById('hideSearchCriteriaDiv'); jQuery( "#loaderDiv" ).hide(); } }); - - - - - } function advancedSearchOnclick() @@ -2416,5 +2411,17 @@ }); addAttributeOption(); hideById('advanced-search'); -} - + hideById('listPatientDiv'); +} + +function hideSearchCriteria() +{ + hideById('advanced-search'); + showById('showSearchCriteriaDiv'); +} + +function showSearchCriteria() +{ + showById('advanced-search'); + hideById('showSearchCriteriaDiv'); +} === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/patient.js' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/patient.js 2013-10-05 05:15:03 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/patient.js 2013-10-09 06:40:18 +0000 @@ -60,6 +60,7 @@ setInnerHTML( 'listPatientDiv', html ); showById('listPatientDiv'); setFieldValue('listAll',false); + showById('hideSearchCriteriaDiv'); jQuery( "#loaderDiv" ).hide(); } }); === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientRegistrationList.vm' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientRegistrationList.vm 2013-10-07 17:58:57 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientRegistrationList.vm 2013-10-09 06:40:18 +0000 @@ -15,7 +15,7 @@ setInnerHTML('enrollmentInfor', title); } - +
+ | $i18n.getString('select_orgunit_for_search'): $!organisationUnit.name @@ -92,7 +95,7 @@ #end - | + | $i18n.getString('search_by_user_orgunits') | @@ -109,7 +112,7 @@|||||
+ | + + | - - | -- + | === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/style.css' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/style.css 2013-05-29 05:24:13 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/style.css 2013-10-09 06:40:18 +0000 @@ -144,6 +144,19 @@ border-radius: 3px; } +.green-background +{ + position: relative; + border: 1px solid #a4d2a3; + background-color: #d5efd5; + padding-top: 10px; + padding-right: 20px; + padding-bottom: 5px; + padding-left: 20px; + margin-bottom: 15px; + border-radius: 3px; +} + /*----------------------------------------------------------------------------*/ /* Button list /*----------------------------------------------------------------------------*/