=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/caseAggregationForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/caseAggregationForm.vm 2013-05-02 03:31:45 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/caseAggregationForm.vm 2013-05-02 14:41:51 +0000
@@ -17,7 +17,7 @@
-
+
|
@@ -27,6 +27,7 @@
|
+
|
@@ -138,3 +139,4 @@
var i18n_dob_type = '$encoder.jsEscape( $i18n.getString( "dob_type" ) , "'") ';
var i18n_age_days = '$encoder.jsEscape( $i18n.getString( "age_days" ) , "'") ';
+
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/caseaggregation.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/caseaggregation.js 2013-05-02 09:43:44 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/caseaggregation.js 2013-05-02 14:41:51 +0000
@@ -210,6 +210,7 @@
function getPatientDataElements()
{
clearListById( 'dataElements' );
+ clearListById( 'dataElementBackups' );
clearListById( 'deSumId' );
var programStageId = getFieldValue('programStageId');
@@ -226,11 +227,16 @@
else{
disable('programStageProperty');
}
+
var dataElements = jQuery('#dataElements');
+ var dataElementBackups = jQuery('#dataElementBackups');
+ clearListById( 'dataElements' );
+ clearListById( 'dataElementBackups' );
var deSumId = jQuery('#deSumId');
for ( i in json.dataElements )
{
dataElements.append( "" );
+ dataElementBackups.append( "" );
if( json.dataElements[i].type=='int')
{
deSumId.append( "" );
@@ -435,3 +441,23 @@
disable('deSumId');
}
}
+
+function filterDataElement( event, value, fieldName, backupFieldsName )
+{
+ // Remove all options in data element fields
+ var field = jQuery('#' + fieldName + " option " ).remove();
+
+ jQuery('#' + backupFieldsName + " option ").each( function(){
+ var option = jQuery(this);
+ if(value.length == 0 )
+ {
+ jQuery('#' + fieldName ).append( "" );
+ }
+ else if (option.text().toLowerCase().indexOf( value.toLowerCase() ) != -1 )
+ {
+ jQuery('#' + fieldName ).append( "" );
+ }
+ });
+
+}
+