WebSVN – SmartDukaan – Diff – /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/rbm-drr-dashboard.vm

       if (p) {
         startDate = p.startDate.format("YYYY-MM-DD");
         endDate = p.endDate.format("YYYY-MM-DD");
+      }
       load();
-      // If a Sales filter is currently active, re-fetch its data for the new range.
+      // If a Sales role is currently active, re-fetch sales-data for the new range.
-      if (CURRENT_SALES_AUTH_ID) {
+      if (CURRENT_SALES_ROLE) {
         $.ajax({
           url: "/rbm-drr/sales-data",
           type: "GET",
           data: {startDate: startDate, endDate: endDate},
           dataType: "json",
+    }
     // Cached latest payload so the "Target Status by RBM" modal can render
     // without a re-fetch when the KPI card is clicked.
     var LAST_PAYLOAD = null;
-    var SALES_PAYLOAD = null;              // fetched on-demand from /rbm-drr/sales-data
+    var SALES_PAYLOAD = null;              // fetched from /rbm-drr/sales-data when a Sales role is selected
+    var CURRENT_SALES_ROLE = null;         // "ASM" / "CM" / … — when set with SALES_PAYLOAD, we render Sales view
-    var CURRENT_SALES_AUTH_ID = null;      // when set, renderFiltered() uses SALES_PAYLOAD
+    var CURRENT_SALES_AUTH_ID = null;      // when set, further narrows Sales view to this person
     // Set of RBM authIds allowed by the current filter. null = no filter (show all).
     var CURRENT_FILTER_AUTH_IDS = null;
     function render(data) {
       LAST_PAYLOAD = data;
       renderFiltered();
+    }
+    // Maps a sales-data row into the same shape the RBM grid renderer expects.
+    function normaliseSalesRow(r) {
+      return {
+        authId: r.salesAuthId, warehouseId: r.warehouseId,
+        rbmName: r.salesName + (r.role ? " (" + r.role + ")" : ""),
+        warehouseName: r.warehouseName,
+        totalAch: r.totalAch, totalTgt: r.totalTgt,
+        hidAch: r.hidAch, hidTgt: r.hidTgt,
+        fastAch: r.fastAch, fastTgt: r.fastTgt,
+        runAch: r.runAch, runTgt: r.runTgt,
+        slowAch: r.slowAch, slowTgt: r.slowTgt,
+        otherAch: r.otherAch, otherTgt: r.otherTgt
+      };
+    }
     // Renders KPIs + grid from the appropriate payload:
-    //  - Sales filter active → SALES_PAYLOAD filtered to selected sales person (rows are sales × warehouse)
+    //  - Sales role active + payload loaded → filter SALES_PAYLOAD to that role (and optionally one person)
-    //  - RBM filter or no filter → LAST_PAYLOAD filtered by CURRENT_FILTER_AUTH_IDS (rows are RBM × warehouse)
+    //  - RBM filter or no filter → LAST_PAYLOAD filtered by CURRENT_FILTER_AUTH_IDS
     function renderFiltered() {
-      if (CURRENT_SALES_AUTH_ID && SALES_PAYLOAD) {
+      if (CURRENT_SALES_ROLE && SALES_PAYLOAD) {
         var salesRows = (SALES_PAYLOAD.rows || []).filter(function (r) {
-          return String(r.salesAuthId) === String(CURRENT_SALES_AUTH_ID);
+          if (r.role !== CURRENT_SALES_ROLE) return false;
-        }).map(function (r) {
-          // Normalise sales row into the same shape the RBM grid renderer expects.
+          if (CURRENT_SALES_AUTH_ID && String(r.salesAuthId) !== String(CURRENT_SALES_AUTH_ID)) return false;
-          return {
+          return true;
-            authId: r.salesAuthId, warehouseId: r.warehouseId,
-            rbmName: r.salesName + (r.role ? " (" + r.role + ")" : ""),
-            warehouseName: r.warehouseName,
+        }).map(normaliseSalesRow);
-            totalAch: r.totalAch, totalTgt: r.totalTgt,
-            hidAch: r.hidAch, hidTgt: r.hidTgt,
-            fastAch: r.fastAch, fastTgt: r.fastTgt,
-            runAch: r.runAch, runTgt: r.runTgt,
-            slowAch: r.slowAch, slowTgt: r.slowTgt,
-            otherAch: r.otherAch, otherTgt: r.otherTgt
-          };
-        });
         renderRowsAsGrid(salesRows, true);
         return;
+      }
       if (!LAST_PAYLOAD) return;
       var allRows = LAST_PAYLOAD.rows || [];
         salesHtml += '<option value="' + s.authId + '">' + escapeHtml(s.name || "Unknown") + '</option>';
       });
       personSel.html(salesHtml).prop("disabled", false);
+    }
+    // Fetches (or refetches) /rbm-drr/sales-data for the current date range,
+    // then renders. Called on Level change and on Apply while Sales view active.
+    function fetchAndRenderSales() {
+      $("#rdrrTableWrap").html('<div class="loading"><div class="spinner"></div>Loading&hellip;</div>');
+      $.ajax({
+        url: "/rbm-drr/sales-data", type: "GET",
+        data: {startDate: startDate, endDate: endDate}, dataType: "json",
+        success: function (payload) {
+          SALES_PAYLOAD = payload;
+          renderFiltered();
+        },
+        error: function () {
+          SALES_PAYLOAD = {rows: []};
+          renderFiltered();
+        }
+      });
+    }
     // Type toggles: show/hide Level; reset filter state; refresh Person options.
     $("#rdrrTypeSelect").on("change", function () {
       var type = $(this).val();
       if (type === "SALES") {
         $("#rdrrLevelSelect").css("display", "").val("");
       } else {
         $("#rdrrLevelSelect").css("display", "none").val("");
+      }
       // Clear all filter state whenever the type changes.
       CURRENT_FILTER_AUTH_IDS = null;
+      CURRENT_SALES_ROLE = null;
       CURRENT_SALES_AUTH_ID = null;
       SALES_PAYLOAD = null;
       repopulatePersonForCurrentType();
       renderFiltered();
     });
     $("#rdrrLevelSelect").on("change", function () {
+      var level = $(this).val();
-      // New level → clear Sales filter state and repopulate Person.
+      // Reset the person-specific filter; role determines the view.
       CURRENT_FILTER_AUTH_IDS = null;
       CURRENT_SALES_AUTH_ID = null;
-      SALES_PAYLOAD = null;
+      CURRENT_SALES_ROLE = level || null;
       repopulatePersonForCurrentType();
+      if (level) {
+        // Fetch Sales-data once, then all subsequent role/person filtering is client-side.
+        fetchAndRenderSales();
+      } else {
+        SALES_PAYLOAD = null;
-      renderFiltered();
+        renderFiltered();
+      }
     });
     $("#rdrrPersonSelect").on("change", function () {
       var authId = $(this).val();
       var type = $("#rdrrTypeSelect").val();
       if (type === "RBM") {
         // RBM filter (single authId) — no server round trip needed.
+        CURRENT_SALES_ROLE = null;
         CURRENT_SALES_AUTH_ID = null;
         SALES_PAYLOAD = null;
         if (!authId) {
           CURRENT_FILTER_AUTH_IDS = null;
         } else {
+        }
         renderFiltered();
         return;
+      }
+      // SALES type — role already active from Level dropdown; SALES_PAYLOAD already fetched.
-      // SALES type
+      // Person selection just further filters client-side (no re-fetch).
       CURRENT_FILTER_AUTH_IDS = null;
-      if (!authId) {
-        // "All <role>s" — no filter (show everyone in the DRR grid, RBM view).
-        CURRENT_SALES_AUTH_ID = null;
+      CURRENT_SALES_AUTH_ID = authId || null;
-        SALES_PAYLOAD = null;
+      if (SALES_PAYLOAD) {
         renderFiltered();
+      } else if (CURRENT_SALES_ROLE) {
+        // Edge case: person changed before Level's fetch completed — trigger the fetch.
-        return;
+        fetchAndRenderSales();
+      }
-      // Pick a specific Sales person → fetch that person's aggregated data.
-      CURRENT_SALES_AUTH_ID = authId;
-      $("#rdrrTableWrap").html('<div class="loading"><div class="spinner"></div>Loading&hellip;</div>');
-      $.ajax({
-        url: "/rbm-drr/sales-data", type: "GET",
-        data: {startDate: startDate, endDate: endDate}, dataType: "json",
-        success: function (payload) {
-          SALES_PAYLOAD = payload;
-          renderFiltered();
-        },
-        error: function () {
-          SALES_PAYLOAD = {rows: []};
-          renderFiltered();
-        }
-      });
     });
     // initial load
     loadFilterOptions();
     load();

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/rbm-drr-dashboard.vm – Rev 37497 → 37517