=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js' --- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js 2012-09-13 04:01:07 +0000 +++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js 2012-09-13 06:40:05 +0000 @@ -452,6 +452,23 @@ } } +function filterInSection($this) +{ + var $tbody = $this.parent().parent().parent(); + + if($this.val() == '') + { + $tbody.find("tr:not([colspan])").show(); + } + else + { + var $not_matched = $tbody.find('tr:not([colspan])').find('td:first-child(:not(:contains("' + $this.val() + '"))') + $not_matched.parent().parent(). hide(); + } + + console.log($this) +} + function getDataElementType( dataElementId ) { if ( dataElements[dataElementId] != null ) === modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/sectionForm.vm' --- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/sectionForm.vm 2011-09-08 15:28:20 +0000 +++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/sectionForm.vm 2012-09-13 06:40:05 +0000 @@ -25,12 +25,13 @@ #set( $categories = $orderedCategories.get( $categoryComboId ) ) #set( $optionsMap = $orderedOptionsMap.get( $categoryComboId ) ) #set( $colRepeat = $catColRepeat.get( $categoryComboId ) ) - + #set( $hasFilterInSection = false ) + #foreach( $category in $categories ) #set( $categoryOptions = $optionsMap.get( $category.id ) ) #set( $colCount = $colCount / $categoryOptions.size() )