Anjaly | BDSHR-1329 | Changing the manage reports page to

show only applicable facilities.

Author: anjalyj

src/main/resources/templates/dhis.scheduleReports.html

@@ -20,8 +20,9 @@
         $( document ).ready(function() {
             var formErrors = [[${formErrors}]];
             var success = [[${success}]];
+            var orgUnits =[[${orgUnits}]]
             document.getElementById("periodSpan").innerHTML = getPeriodType();
-            var scheduleOptions = new ReportScheduleOptions(formErrors,success);
+            var scheduleOptions = new ReportScheduleOptions(orgUnits,formErrors,success);
         });
     </script>
 </head>
@@ -71,12 +72,7 @@ <h3 th:text="'Schedule Dataset for:'+ ${reportConfig.datasetName}"></h3>
                         <div class="panel-body">
                             <h4>Select Facilities and schedule submission</h4>
 
-                            <div class="checkbox" th:each="org: ${orgUnits}">
-                                <label>
-                                    <input type="checkbox" name="selectedFacilities" th:value="${org.facilityId}"
-                                           th:attr="data-orgunit=${org.orgUnitId}"/>
-                                    <span th:utext="${org.facilityName}">name</span>
-                                </label>
+                            <div id="applicableOrgUnits" hidden="true">
                             </div>
                         </div>
                     </div>
@@ -265,6 +261,17 @@ <h4>Select Facilities and schedule submission</h4>
         {{/.}}
 
     </script>
+    <script id="template_applicable_org_units" type="x-tmpl-mustache">
+        {{#.}}
+            <div class="checkbox">
+                <label>
+                    <input type="checkbox" name="selectedFacilities" value="{{facilityId}}"
+                           data-orgunit="{{orgUnitId}}"/>
+                    <span>{{facilityName}}</span>
+                </label>
+            </div>
+        {{/.}}
+    </script>
 </div>
 <div class="container">
     <div th:replace="fragments/footer :: footer"></div>

src/main/webapp/scripts/reportScheduleOptions.js

@@ -1,4 +1,4 @@
-function ReportScheduleOptions(formErrors,success) {
+function ReportScheduleOptions(orgUnits,formErrors,success) {
    var periodId = "#periodType", startDtId = "#startDate", displayPeriodId =  "#reportingPeriod";
    var dtCh= "/",  minYear=1900, maxYear=2100;
    var applicableOrgUnits = [];
@@ -11,17 +11,6 @@ function ReportScheduleOptions(formErrors,success) {
         self.validateInput($(this).val());
    });
 
-   var checkboxes = $("input[type='checkbox']");
-   checkboxes.click(function() {
-        if(checkboxes.is(":checked")){
-            isChecked = true;
-        }
-        else{
-            isChecked = false;
-        }
-        self.disableSubmitAndPreview();
-   });
-
    $('#scheduleStartDate').datepicker({
        autoclose: true,
        onRender: function(date) {
@@ -115,24 +104,6 @@ function ReportScheduleOptions(formErrors,success) {
        });
    });
 
-   $("input[name=selectedFacilities]").bind("click", function(e) {
-        clearErrors();
-        clearSuccess();
-        var orgUnitId = $(e.target).attr("data-orgunit");
-        var arrayLength = self.applicableOrgUnits.length;
-        var found = false;
-        for (var i = 0; i < arrayLength; i++) {
-            var orgUnit = self.applicableOrgUnits[i];
-            if (orgUnit.id === orgUnitId) {
-                found = true;
-            }
-        }
-        if (!found)  {
-            showErrors("The selected organization is not applicable for this report.");
-            e.preventDefault();
-        }
-   });
-
    $("input[name=scheduleType]").bind("click", function(e) {
         var val = $('input[type=radio]:checked').val();
         if (val == "repeat") {
@@ -332,6 +303,7 @@ function ReportScheduleOptions(formErrors,success) {
            if (results) {
               if (results.hasOwnProperty('organisationUnits')) {
                  self.applicableOrgUnits = results.organisationUnits;
+                 showApplicableOrgUnits(orgUnits);
               }
            }
        }).fail(function(){
@@ -340,6 +312,39 @@ function ReportScheduleOptions(formErrors,success) {
        });
    };
 
+   var showApplicableOrgUnits = function(availableOrgUnits){
+         var availableApplicableOrgUnits = getAvailableApplicableOrgUnits(availableOrgUnits, self.applicableOrgUnits);
+         if(availableApplicableOrgUnits.length==0){
+            showErrors("This report is not applicable to any of the available facilities.");
+            $('#createReportSchedule').attr('hidden', true);
+         }
+         else{
+             var template = $('#template_applicable_org_units').html();
+             Mustache.parse(template);
+             var rendered = Mustache.render(template,availableApplicableOrgUnits);
+             $('#applicableOrgUnits').html(rendered);
+             $('#applicableOrgUnits').attr('hidden',false);
+             var checkboxes = $("input[type='checkbox']");
+             checkboxes.click(function() {
+                 if(checkboxes.is(":checked")){
+                     isChecked = true;
+                 }
+                 else{
+                     isChecked = false;
+                 }
+                 self.disableSubmitAndPreview();
+             });
+         }
+   }
+
+    var getAvailableApplicableOrgUnits = function(availableOrgUnits, applicableOrgUnits){
+         var filteredOrgUnits = availableOrgUnits.filter(function(availableUnit) {
+            return applicableOrgUnits.find(function(applicableUnit) {
+                return applicableUnit.id == availableUnit.orgUnitId})
+         });
+         return filteredOrgUnits;
+    }
+
    var getDhisNames = function(response) {
        var dataElements = {};
        var comboOptions = {};
@@ -397,7 +402,7 @@ function ReportScheduleOptions(formErrors,success) {
 
    fetchOrgUnits();
    showErrors(formErrors);
-   showSuccess(success)
+   showSuccess(success);
 }
 
 var toggleFacilityDetails = function(facilityId, show) {