=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/i18n.vm' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/i18n.vm 2013-10-08 03:23:55 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/i18n.vm 2013-10-10 05:29:57 +0000 @@ -213,4 +213,5 @@ male: '$encoder.jsEscape($i18n.getString( 'male' ) , "'")', transgender: '$encoder.jsEscape($i18n.getString( 'transgender' ) , "'")', immediate_children: '$encoder.jsEscape($i18n.getString( 'immediate_children' ) , "'")', +delete: '$encoder.jsEscape($i18n.getString( 'delete' ) , "'")', }; \ 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-10 00:04:15 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js 2013-10-10 05:29:57 +0000 @@ -2393,11 +2393,14 @@ function advancedSearchOnclick() { jQuery('#advanced-search').toggle(); - if(jQuery('#advanced-search').is(':visible')){ - hideById('searchByIdTR'); - } - else{ - showById('searchByIdTR'); + if( getFieldValue('showSearchIdField')=='true' ) + { + if(jQuery('#advanced-search').is(':visible')){ + hideById('searchByIdTR'); + } + else{ + showById('searchByIdTR'); + } } } @@ -2417,7 +2420,10 @@ function hideSearchCriteria() { hideById('advanced-search'); - showById('showSearchCriteriaDiv'); + if( getFieldValue('showSearchIdField')=='true' ) + { + showById('showSearchCriteriaDiv'); + } } function showSearchCriteria() === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/selectPatient.vm' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/selectPatient.vm 2013-10-08 17:16:47 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/selectPatient.vm 2013-10-10 05:29:57 +0000 @@ -7,9 +7,10 @@

$i18n.getString( "patient_management" ) #openHelp( "patient" )

- - - + + + +
#parse( "dhis-web-caseentry/searchPatientCriteria.vm" )