dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 1226
committer: Lars Helge Oeverland larshelge@xxxxxxxxx <larshelge@xxxxxxxxx>
branch nick: trunk
timestamp: Mon 2009-12-14 18:40:23 +0100
message:
  Added a "view all" option in the indicator numerator/denominator dataelement filter. Now filtering on the client side which is a lot faster than previously using ajax.
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/popup.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module.properties
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/editDenumForm.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-commons-resources/src/main/webapp/popup.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/popup.vm	2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/popup.vm	2009-12-14 17:40:23 +0000
@@ -15,6 +15,7 @@
 	#end
 	
     <script type="text/javascript" src="../dhis-web-commons/util/commons.js"></script>
+    <script type="text/javascript" src="../dhis-web-commons/util/lists.js"></script>
     <script type="text/javascript" src="../dhis-web-commons/util/jquery.js"></script>
     
   </head>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module.properties	2009-12-02 15:08:11 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module.properties	2009-12-14 17:40:23 +0000
@@ -381,3 +381,4 @@
 data_element_group_sets							= Data element group sets
 available_data_element_group_sets				= Available data element group sets
 selected_data_element_group_sets				= Selected data element group sets
+view_all										= View all

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/editDenumForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/editDenumForm.vm	2009-10-20 13:07:59 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/editDenumForm.vm	2009-12-14 17:40:23 +0000
@@ -44,10 +44,11 @@
 	<td></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( 'aggregationOperator', '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="width:450px" onchange="filterDataElements( 'aggregationOperator', '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 )