=== 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 2012-07-06 09:59:36 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js 2012-07-10 07:39:56 +0000 @@ -108,11 +108,11 @@ $( '#searchText_' + container ).datepicker("destroy"); $('#' + container + ' [id=dateOperator]').replaceWith(""); - if( attributeId == '0' ) + if( attributeId == 'prg' ) { element.replaceWith( programComboBox ); } - else if ( attributeId=='-2' ) + else if ( attributeId=='fixedAttr_gender' ) { element.replaceWith( getGenderSelector() ); } @@ -147,6 +147,7 @@ var genderSelector = ''; return genderSelector; } === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/select.vm' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/select.vm 2012-06-27 08:21:26 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/select.vm 2012-07-10 07:39:56 +0000 @@ -49,6 +49,7 @@ var i18n_events = '$encoder.jsEscape( $i18n.getString( "events" ) , "'")'; var i18n_male = '$encoder.jsEscape( $i18n.getString( "male" ) , "'")'; var i18n_female = '$encoder.jsEscape( $i18n.getString( "female" ) , "'")'; + var i18n_transgender = '$encoder.jsEscape( $i18n.getString( "transgender" ) , "'")'; var i18n_specify_search_criteria = '$encoder.jsEscape( $i18n.getString( "specify_search_criteria" ) , "'")'; selection.setListenerFunction( organisationUnitSelected ); === 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 2012-07-05 09:07:21 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/selectPatient.vm 2012-07-10 07:39:56 +0000 @@ -83,6 +83,7 @@ var i18n_date_is_greater_then_or_equals_due_date = '$encoder.jsEscape( $i18n.getString( "date_is_greater_then_or_equals_due_date" ) , "'")'; var i18n_male = '$encoder.jsEscape( $i18n.getString( "male" ) , "'")'; var i18n_female = '$encoder.jsEscape( $i18n.getString( "female" ) , "'")'; + var i18n_transgender = '$encoder.jsEscape( $i18n.getString( "transgender" ) , "'")'; var i18n_violate_validation = '$encoder.jsEscape( $i18n.getString( "violate_validation" ) , "'")'; var i18n_show_all_items = '$encoder.jsEscape( $i18n.getString( "show_all_items" ) , "'")'; === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/singleEventSelect.vm' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/singleEventSelect.vm 2012-07-05 09:07:21 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/singleEventSelect.vm 2012-07-10 07:39:56 +0000 @@ -94,6 +94,7 @@ var i18n_date_is_greater_then_or_equals_due_date = '$encoder.jsEscape( $i18n.getString( "date_is_greater_then_or_equals_due_date" ) , "'")'; var i18n_male = '$encoder.jsEscape( $i18n.getString( "male" ) , "'")'; var i18n_female = '$encoder.jsEscape( $i18n.getString( "female" ) , "'")'; + var i18n_transgender = '$encoder.jsEscape( $i18n.getString( "transgender" ) , "'")'; var i18n_violate_validation = '$encoder.jsEscape( $i18n.getString( "violate_validation" ) , "'")'; var i18n_show_all_items = '$encoder.jsEscape( $i18n.getString( "show_all_items" ) , "'")';