dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 8061
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2012-09-13 10:51:44 +0700
message:
  DataEntry: added ability to filter on section if sections.size > 1.
modified:
  dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties
  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/select.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-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties	2012-08-13 13:34:45 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties	2012-09-13 03:51:44 +0000
@@ -13,6 +13,7 @@
 data_set=Data Set
 select=Select
 period=Period
+filter_on_section=Filter on Section
 earlier_periods=Earlier periods
 later_periods=Later periods
 value_of_data_element_less=The value of the following data element is less than the minimum accepted value

=== 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-07-31 20:02:10 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js	2012-09-13 03:51:44 +0000
@@ -396,6 +396,7 @@
 
         $( '#contentDiv' ).html( html );
 
+        enableSectionFilter();
         loadDataValues();
     }
     else
@@ -404,7 +405,50 @@
 
         $( '#contentDiv' ).load( 'loadForm.action', {
             dataSetId : dataSetId
-        }, loadDataValues );
+        }, function() {
+            enableSectionFilter();
+            loadDataValues()
+        } );
+    }
+}
+
+function enableSectionFilter()
+{
+    var $sectionsHeaders = $(".formSection .cent h3");
+
+    if( $sectionsHeaders.size() > 1)
+    {
+        $("#selectionBox").css("height", "123px");
+
+        $("#filterDataSetSection").append("<option value='all'>All</option>")
+
+        $sectionsHeaders.each(function(idx, value) {
+            $("#filterDataSetSection").append("<option value='" + idx + "'>" + value.innerHTML + "</option>");
+        });
+
+        $("#filterDataSetSectionTr").show();
+    }
+    else
+    {
+        $("#selectionBox").css("height", "93px");
+        $("#filterDataSetSectionTr").hide();
+        $("#filterDataSetSection").children().remove()
+    }
+}
+
+function filterOnSection()
+{
+    var $filterDataSetSection = $("#filterDataSetSection");
+    var value = $filterDataSetSection.val();
+
+    if(value == 'all')
+    {
+        $(".formSection").show();
+    }
+    else
+    {
+        $(".formSection").hide();
+        $($(".formSection")[value]).show();
     }
 }
 

=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/select.vm'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/select.vm	2012-02-17 12:29:45 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/select.vm	2012-09-13 03:51:44 +0000
@@ -50,7 +50,7 @@
     <input type="button" value="$i18n.getString( 'run_validation' )" onclick="validate()" id="validationButton" style="width:150px;" disabled="disabled"/>
 </div>
 
-<div class="inputCriteria" style="width:504px;height:93px;">
+<div id="selectionBox" class="inputCriteria" style="width:504px;height:93px;">
 <table>
 	<tr>
 		<td><label for="selectedOrganisationUnit">$i18n.getString( "organisation_unit" )</label></td>
@@ -61,13 +61,20 @@
 		<td><select id="selectedDataSetId" name="selectedDataSetId" style="width:371px" onchange="dataSetSelected()" disabled="disabled"></select>
 			<span id="loaderSpan" style="display:none"><img src='../images/ajax-loader-bar.gif'></span></td>
 	</tr>	
-	<tr>
-		<td><label for="selectedPeriodId">$i18n.getString( "period" )</label></td>
-		<td><select id="selectedPeriodId" name="selectedPeriodId" style="width:215px" onchange="periodSelected()" disabled="disabled"></select>
-			<input type="button" id="prevButton" style="width:75px" value="$i18n.getString( 'prev_year' )" title="$i18n.getString('earlier_periods')" onclick="previousPeriodsSelected()" disabled="disabled">
-			<input type="button" id="nextButton" style="width:75px" value="$i18n.getString( 'next_year' )" title="$i18n.getString('later_periods')" onclick="nextPeriodsSelected()" disabled="disabled">
-		</td>
-	</tr>	
+    <tr>
+   		<td><label for="selectedPeriodId">$i18n.getString( "period" )</label></td>
+   		<td><select id="selectedPeriodId" name="selectedPeriodId" style="width:215px" onchange="periodSelected()" disabled="disabled"></select>
+   			<input type="button" id="prevButton" style="width:75px" value="$i18n.getString( 'prev_year' )" title="$i18n.getString('earlier_periods')" onclick="previousPeriodsSelected()" disabled="disabled">
+   			<input type="button" id="nextButton" style="width:75px" value="$i18n.getString( 'next_year' )" title="$i18n.getString('later_periods')" onclick="nextPeriodsSelected()" disabled="disabled">
+   		</td>
+   	</tr>
+    <tr id="filterDataSetSectionTr" style="display: none;">
+   		<td><label for="filterDataSetSection">$i18n.getString( "filter_on_section" )</label></td>
+   		<td>
+            <select id="filterDataSetSection" name="filterDataSetSection" style="width:371px" onchange="filterOnSection()">
+        </select>
+        </td>
+   	</tr>
 </table>
 </div>