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

     <div class="brand">
       <div class="crumb"><a href="/indent/today_po_rbm">&larr; Today PO / RBM</a> &middot; Sales &middot; Indent</div>
       <h1>RBM DRR Dashboard <span class="live"><i></i>Live</span></h1>
     </div>
     <div class="hd-right">
+      <select id="rdrrTypeSelect" class="ctl" style="min-width:120px;height:38px;padding:8px 12px" title="Filter type">
+        <option value="RBM" selected>RBM</option>
+        <option value="SALES">Sales</option>
+      </select>
-      <select id="rdrrRbmFilter" class="ctl" style="min-width:220px;height:38px;padding:8px 12px">
+      <select id="rdrrLevelSelect" class="ctl" style="min-width:140px;height:38px;padding:8px 12px;display:none"
+              title="Sales level">
+        <option value="">Select level</option>
+        <option value="ASM">ASM (L1)</option>
+        <option value="CM">CM (L2)</option>
+        <option value="DM">DM (L3)</option>
+        <option value="BM">BM (L4)</option>
+        <option value="RSM">RSM (L5)</option>
+        <option value="NSM">NSM (L6)</option>
+      </select>
+      <select id="rdrrPersonSelect" class="ctl" style="min-width:230px;height:38px;padding:8px 12px" title="Person">
         <option value="">All RBMs</option>
       </select>
       <input class="ctl" id="rdrrPeriod" type="text" placeholder="Select date range"/>
       <button class="btn-r" id="rdrrApply">Apply</button>
     </div>
       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 (CURRENT_SALES_AUTH_ID) {
+        $.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();
+          }
+        });
+      }
     });
     function load() {
       $("#rdrrTableWrap").html('<div class="loading"><div class="spinner"></div>Loading&hellip;</div>');
       $("#rdrrAgingWrap").html('<div class="loading"><div class="spinner"></div>Loading&hellip;</div>');
+    }
     // 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 CURRENT_SALES_AUTH_ID = null;      // when set, renderFiltered() uses SALES_PAYLOAD
+    // Set of RBM authIds allowed by the current filter. null = no filter (show all).
-    var CURRENT_FILTER_AUTH_ID = "";  // "" = all RBMs
+    var CURRENT_FILTER_AUTH_IDS = null;
     function render(data) {
       LAST_PAYLOAD = data;
-      populateRbmFilter(data.rows || []);
       renderFiltered();
+    }
-    // Build the dropdown options from the fetched rows (unique RBM names).
+    // Renders KPIs + grid from the appropriate payload:
-    // Preserves current selection if the RBM still exists in the new dataset.
+    //  - Sales filter active → SALES_PAYLOAD filtered to selected sales person (rows are sales × warehouse)
-    function populateRbmFilter(rows) {
-      var seen = {};
-      var options = [];
-      rows.forEach(function (r) {
-        if (!seen[r.authId]) {
-          seen[r.authId] = true;
-          options.push({id: r.authId, name: r.rbmName});
-        }
-      });
-      options.sort(function (a, b) {
-        return (a.name || "").localeCompare(b.name || "");
-      });
-      var sel = $("#rdrrRbmFilter");
-      var prev = sel.val() || "";
-      var html = '<option value="">All RBMs (' + options.length + ')</option>';
-      options.forEach(function (o) {
-        html += '<option value="' + o.id + '">' + escapeHtml(o.name || "Unknown") + '</option>';
-      });
-      sel.html(html);
-      // Restore prior selection if still valid; otherwise reset.
-      if (prev && seen[prev]) sel.val(prev); else CURRENT_FILTER_AUTH_ID = "";
-    }
-    // Renders KPIs + grid from LAST_PAYLOAD filtered by CURRENT_FILTER_AUTH_ID.
+    //  - RBM filter or no filter → LAST_PAYLOAD filtered by CURRENT_FILTER_AUTH_IDS (rows are RBM × warehouse)
     function renderFiltered() {
+      if (CURRENT_SALES_AUTH_ID && SALES_PAYLOAD) {
+        var salesRows = (SALES_PAYLOAD.rows || []).filter(function (r) {
+          return String(r.salesAuthId) === String(CURRENT_SALES_AUTH_ID);
+        }).map(function (r) {
+          // Normalise sales row into the same shape the RBM grid renderer expects.
+          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
+          };
+        });
+        renderRowsAsGrid(salesRows, true);
+        return;
+      }
       if (!LAST_PAYLOAD) return;
       var allRows = LAST_PAYLOAD.rows || [];
-      var rows = CURRENT_FILTER_AUTH_ID
+      var rows = CURRENT_FILTER_AUTH_IDS
               ? allRows.filter(function (r) {
-                return String(r.authId) === String(CURRENT_FILTER_AUTH_ID);
+                return CURRENT_FILTER_AUTH_IDS[String(r.authId)];
               })
               : allRows;
+      renderRowsAsGrid(rows, false);
+    }
+    // Extracted from renderFiltered() so both RBM-source and Sales-source paths share it.
+    function renderRowsAsGrid(rows, isSalesView) {
       // Recompute totals from the filtered subset. Cheaper + correct vs using server totals.
       var t = {
         totalAch: 0, totalTgt: 0, hidAch: 0, hidTgt: 0, fastAch: 0, fastTgt: 0,
         runAch: 0, runTgt: 0, slowAch: 0, slowTgt: 0, otherAch: 0, otherTgt: 0,
       $("#rdrrKpiPct").html(pk.cls === "na" ? '<span class="u">n/a</span>' :
               '<span class="pct ' + pk.cls + '">' + pk.text + '</span>');
       $("#rdrrKpiTop").html((t.rbmsAtOrAbove100 || 0) + ' <span class="u">/ ' + (t.rbmRowCount || 0) + '</span>');
       if (rows.length === 0) {
+        var emptyMsg;
+        if (isSalesView) {
-        $("#rdrrTableWrap").html('<div class="empty"><div class="ei">📭</div>' +
+          emptyMsg = 'No Sales target/achievement rows for this person in the range. Has the pushSalesTargets cron run today?';
+        } else if (CURRENT_FILTER_AUTH_IDS) {
-                (CURRENT_FILTER_AUTH_ID ? 'This RBM has no rows in the current range.' : 'No RBM rows in this range.') +
+          emptyMsg = 'No RBM rows in this range for the selected filter.';
-                '</div>');
+        } else {
+          emptyMsg = 'No RBM rows in this range.';
+        }
+        $("#rdrrTableWrap").html('<div class="empty"><div class="ei">📭</div>' + emptyMsg + '</div>');
         return;
+      }
       var buckets = [
         {key: "hid", label: "HID"},
     function openStatusModal() {
       if (!LAST_PAYLOAD) return;
       // Respect the RBM filter so the modal matches what's on screen.
       var rows = (LAST_PAYLOAD.rows || []).filter(function (r) {
-        return !CURRENT_FILTER_AUTH_ID || String(r.authId) === String(CURRENT_FILTER_AUTH_ID);
+        return !CURRENT_FILTER_AUTH_IDS || CURRENT_FILTER_AUTH_IDS[String(r.authId)];
       });
       var achieved = [], pending = [];
       rows.forEach(function (r) {
         if (!r.totalTgt || r.totalTgt <= 0) return;
         var pct = (r.totalAch / r.totalTgt) * 100;
     });
     $("#rdrrCallDrawerBack").on("click", function (e) {
       if (e.target === this) $(this).removeClass("show");
     });
+    // ------------------------- cascading filter (Type → [Level] → Person) -------------------------
+    // Flow:
+    //   Type = RBM   → Person dropdown = all RBMs. Pick one to filter to that RBM.
+    //   Type = SALES → Level dropdown appears (ASM/CM/DM/BM/RSM/NSM). Pick a level
+    //                  → Person dropdown = active people at that level. Pick a person
+    //                  → fetches /rbm-drr/sales-data and shows that person's aggregated rows.
+    // One backend call caches both the RBM list and the Sales list.
+    var ALL_RBMS = [];         // [{authId, name}, ...]
+    var ALL_SALES_BY_ROLE = {}; // {ASM: [...], CM: [...], ...}
+    function loadFilterOptions() {
+      $.ajax({
+        url: "/rbm-drr/all-sales", type: "GET", dataType: "json",
+        success: function (payload) {
+          ALL_RBMS = (payload && payload.rbms) || [];
+          ALL_SALES_BY_ROLE = {};
+          ((payload && payload.sales) || []).forEach(function (s) {
+            (ALL_SALES_BY_ROLE[s.role] = ALL_SALES_BY_ROLE[s.role] || []).push(s);
+          });
+          repopulatePersonForCurrentType();
+        }
+      });
+    }
-    // RBM filter — re-render KPIs + grid from the cached payload (no re-fetch).
+    // Refill the Person dropdown based on current Type (+ Level if Sales).
+    function repopulatePersonForCurrentType() {
+      var type = $("#rdrrTypeSelect").val();
+      var personSel = $("#rdrrPersonSelect");
+      if (type === "RBM") {
+        var html = '<option value="">All RBMs (' + ALL_RBMS.length + ')</option>';
+        ALL_RBMS.forEach(function (r) {
+          html += '<option value="' + r.authId + '">' + escapeHtml(r.name || "Unknown") + '</option>';
+        });
+        personSel.html(html).prop("disabled", false);
+        return;
+      }
+      // SALES
+      var level = $("#rdrrLevelSelect").val();
+      if (!level) {
+        personSel.html('<option value="">Pick a level first</option>').prop("disabled", true);
+        return;
+      }
+      var list = ALL_SALES_BY_ROLE[level] || [];
+      var salesHtml = '<option value="">All ' + escapeHtml(level) + 's (' + list.length + ')</option>';
+      list.forEach(function (s) {
+        salesHtml += '<option value="' + s.authId + '">' + escapeHtml(s.name || "Unknown") + '</option>';
+      });
+      personSel.html(salesHtml).prop("disabled", false);
+    }
+    // Type toggles: show/hide Level; reset filter state; refresh Person options.
-    $("#rdrrRbmFilter").on("change", function () {
+    $("#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_AUTH_ID = null;
+      SALES_PAYLOAD = null;
+      repopulatePersonForCurrentType();
+      renderFiltered();
+    });
+    $("#rdrrLevelSelect").on("change", function () {
+      // New level → clear Sales filter state and repopulate Person.
-      CURRENT_FILTER_AUTH_ID = $(this).val() || "";
+      CURRENT_FILTER_AUTH_IDS = null;
+      CURRENT_SALES_AUTH_ID = null;
+      SALES_PAYLOAD = null;
+      repopulatePersonForCurrentType();
       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_AUTH_ID = null;
+        SALES_PAYLOAD = null;
+        if (!authId) {
+          CURRENT_FILTER_AUTH_IDS = null;
+        } else {
+          var single = {};
+          single[String(authId)] = true;
+          CURRENT_FILTER_AUTH_IDS = single;
+        }
+        renderFiltered();
+        return;
+      }
+      // SALES type
+      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;
+        SALES_PAYLOAD = null;
+        renderFiltered();
+        return;
+      }
+      // 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();
     loadPurchaseMilestones();
     loadPerformanceDashboard();
     loadCallTargetIframe();
   })();

Subversion Repositories SmartDukaan

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