[#69] Disable default load & refine uii filter style

akvo · Nov 29, 2021 · dee9158 · dee9158
1 parent 5712c0f
commit dee9158
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 17 deletions.
diff --git a/resources/css/frame.css b/resources/css/frame.css
@@ -512,10 +512,10 @@ button.btn.btn-secondary.buttons-collection.dropdown-toggle.buttons-colvis {
 
 /* Customize RSR UII Report */
 /* RSR UII filter style */
-div#uii-report-filter {
+/* div#uii-report-filter {
     margin-top: 100px;
     position: absolute;
     left: 25px;
     top: auto;
     visibility: hidden;
-}
+} */
diff --git a/resources/js/report.js b/resources/js/report.js
@@ -228,7 +228,7 @@ $("main").append(
                                         class="btn btn-sm btn-primary"
                                         style="height:35px;"
                                     >
-                                        Filter
+                                        Generate
                                     </button>
                                 </div>
                             </form>
@@ -242,7 +242,7 @@ $("main").append(
                             src="/frame/uii-datatable-report"
                             frameborder={0}
                             width="100%"
-                            style="min-width:100%; min-height: 950px;"
+                            style="min-width:100%; min-height: 175px;"
                         ></iframe>
                     </div>
                 </div>
@@ -289,8 +289,8 @@ const showModalError = (response) => {
 };
 
 $("#filter-uii-report").on("click", () => {
-    window.document.getElementById("uii-report-filter").style.visibility =
-        "hidden";
+    // window.document.getElementById("uii-report-filter").style.visibility =
+    //     "hidden";
     window.document.getElementById("uii-report-data-frame").style.minHeight =
         "950px";
     let country_id = $("#uii-country-level").val();

diff --git a/resources/js/uii-datatable-report.js b/resources/js/uii-datatable-report.js
@@ -6,15 +6,18 @@ const partnership_id = $("meta[name='partnership']").attr("content");
 const endpoints = [country_id || 0, partnership_id || 0].join("/");
 
 // Rsr Datatables / UII Report
-renderRsrTableTemplate("datatables", "65px", "").then((res) => {
-    renderRsrTable(endpoints, baseurl, "datatables").then((res) => {
-        // set parent iframe height
-        parent.window.document.getElementById(
-            "uii-report-filter"
-        ).style.visibility = "visible";
-        const bodyHeight = document.body.scrollHeight;
-        parent.window.document.getElementById(
-            "uii-report-data-frame"
-        ).style.height = bodyHeight / 8 + bodyHeight + "px";
+if (country_id) {
+    // load page by filter
+    renderRsrTableTemplate("datatables", "65px", "").then((res) => {
+        renderRsrTable(endpoints, baseurl, "datatables").then((res) => {
+            // set parent iframe height
+            parent.window.document.getElementById(
+                "uii-report-filter"
+            ).style.visibility = "visible";
+            const bodyHeight = document.body.scrollHeight;
+            parent.window.document.getElementById(
+                "uii-report-data-frame"
+            ).style.height = bodyHeight / 8 + bodyHeight + "px";
+        });
     });
-});
+}