dhis2-devs team mailing list archive

Thread
Date

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 1227: Improved validation rule expression filtering similariliy to previous commit.

To: DHIS 2 developers <dhis2-devs@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Mon, 14 Dec 2009 17:53:14 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

------------------------------------------------------------
revno: 1227
committer: Lars Helge Oeverland larshelge@xxxxxxxxx <larshelge@xxxxxxxxx>
branch nick: trunk
timestamp: Mon 2009-12-14 18:51:18 +0100
message:
  Improved validation rule expression filtering similariliy to previous commit.
modified:
  dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/org/hisp/dhis/validationrule/i18n_module.properties
  dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/editExpressionForm.vm


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription.

=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/org/hisp/dhis/validationrule/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/org/hisp/dhis/validationrule/i18n_module.properties	2009-12-02 15:08:11 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/org/hisp/dhis/validationrule/i18n_module.properties	2009-12-14 17:51:18 +0000
@@ -140,3 +140,4 @@
 intro_validation_rule_group = Add, modify, view and delete validation rule groups. Provides the ability to group and run validation rules together.
 intro_run_validation = Run validation rules in order to unveil anomalies and errors in the data in the database.
 intro_outlier_analysis = Perform analysis of potential outlier values. Outlier values can be examined and checked for data capture errors.
+view_all = View all
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/editExpressionForm.vm'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/editExpressionForm.vm	2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/editExpressionForm.vm	2009-12-14 17:51:18 +0000
@@ -42,10 +42,11 @@
 	</td>
   	<td valign="top">
   	  <label>$encoder.htmlEncode( $i18n.getString( "filter_by_name" ) )</label><br>  	  
-  	  <input type="text" id="filter" name="filter" style="width:450px" onkeyup="filterDataElements( 'dataElementGroupId', 'filter' )"><br>
+  	  <input type="text" id="filter" name="filter" style="width:450px" onkeyup="filterList( this.value, 'dataElementId' )"><br>
   	  
   	  <select id="dataElementGroupId" name="dataElementGroupId" style="min-width:450px" onchange="filterDataElements( 'dataElementGroupId', 'filter' )">
 	  	<option value="$ALL">[ $i18n.getString( "filter_by_group_view_all" ) ]</option>
+	  	<option value="$ALL">[ $i18n.getString( "view_all" ) ]</option>
 	  	#foreach ( $group in $dataElementGroups )
 	  	  <option value="$group.id" #if ( $dataElementGroupId == $group.id ) selected="selected"#end>$encoder.htmlEncode( $group.name )</option>
 	  	#end