From 97a970b3fae1ec54b6c8734c138a08a750944c73 Mon Sep 17 00:00:00 2001
From: "venkatesh.r" <venkatesh.r@venbainfotech.com>
Date: Thu, 11 Dec 2025 12:43:45 +0530
Subject: [PATCH] FIX_BDS_RENEWAL_REPORT_LOADING_ISSUE

---
 app/Controllers/BDSReportController.php |   3 +-
 app/Views/bds_renewal_report_list.php   |   6 +-
 app/Views/renewal_search.php            | 140 +++++++++++++-----------
 3 files changed, 80 insertions(+), 69 deletions(-)

diff --git a/app/Controllers/BDSReportController.php b/app/Controllers/BDSReportController.php
index 6a9d90f1..abc1ac14 100644
--- a/app/Controllers/BDSReportController.php
+++ b/app/Controllers/BDSReportController.php
@@ -928,7 +928,8 @@ class BDSReportController extends AdminController
             $default_start = new \DateTime();
             $data['default_end'] = $default_start->format('d-m-Y');
             $data['default_start']  = $default_start->modify('-60 days')->format('d-m-Y');
-            $data['issuer_branch'] = $this->nhanceBranchModel->where('is_active', 1)->findAll();;
+            $data['issuer_branch'] = $this->nhanceBranchModel->where('is_active', 1)->findAll();
+            $data['client_list'] = $this->clientModel->where('is_active', 1)->findAll();
             $data['tab_name'] = "Renewal Reports";
             $data['page_name'] = "Renewal Report";
             return $this->loadLayout('renewal_search', $data);
diff --git a/app/Views/bds_renewal_report_list.php b/app/Views/bds_renewal_report_list.php
index c4873dda..16bb337a 100644
--- a/app/Views/bds_renewal_report_list.php
+++ b/app/Views/bds_renewal_report_list.php
@@ -20,12 +20,12 @@ table.dataTable tbody td {
 
 <div class="col-12" id="inception_list">    
         <div class="card">
-            <div class="card-body">
-                <div class="row" style="margin-bottom:1rem;">
+            <div class="card-body" style="background-color: #F5FFFF !important; border-radius: 10px; box-shadow: 4px 4px 4px 4px #00000040;">
+                <!-- <div class="row" style="margin-bottom:1rem;">
                     <div class="col-6" style="align-self: center;">
                         <h4 style="position: relative;">Renewal Policy List</h4>
                     </div>
-                </div>
+                </div> -->
                 <div>
                     <div class="table-responsive">
                         <table data-custom-table-css="table" id="scroll-horizontal-datatable" class="table w-100 nowrap">
diff --git a/app/Views/renewal_search.php b/app/Views/renewal_search.php
index 6cdca11d..f6b8c348 100644
--- a/app/Views/renewal_search.php
+++ b/app/Views/renewal_search.php
@@ -1,75 +1,80 @@
-<div class="container-fluid-min">
+<div class="container-fluid-min" style="margin-left: 30px;">
     <div class="col-xl-12">
-        <div class="card-body">
-            <div id="accordion" class="mb-3">
-                <div class="card mb-1">
-                    <h4 class="m-1">
-                        <span>Filter</span>
-                        <a id="toggleIcon" class="text-dark float-right" data-toggle="collapse" href="#collapseOne"
-                            aria-expanded="true">
-                            <i id="icon" class="mdi mdi-chevron-down mr-1 text-primary" style="font-size: 28px;"></i>
-                        </a>
-                    </h4>
-                    <div id="collapseOne" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion">
-                        <div class="card-body">
-                            <!-- <div class="text-center"> -->
-                            <div class="form-row">
-                                <div class="form-group col-md-3" id="date_div">
-                                    <label>Date<span class="text-danger"></span></label>
-                                    <!-- <div id="reportrange" class="form-control"
-                                    style="background: #fff; cursor: pointer; padding: 5px 10px; border: 1px solid #ccc; width: 100%">
-                                    <i class="mdi mdi-calendar-blank"></i>&nbsp;
-                                    <span></span> <i class="mdi mdi-menu-down"></i>
-                                </div> -->
-                                    <div class="input-icon">
-                                        <input type="text" id="reportrange" class="form-control" readonly style="caret-color: transparent;">
-                                        <i class="mdi mdi-calendar-blank-outline additional-icon"></i>
-                                    </div>
-                                    <input type="hidden" id="startDate" value=<?= $default_start ?>>
-                                    <input type="hidden" id="endDate" value=<?= $default_end ?>>
+        <div id="accordion" class="mb-3">
+            <div class="card mb-1" style="background-color: #F5FFFF !important; border-radius: 10px; box-shadow: 4px 4px 4px 4px #00000040;">
+                <h4 class="m-1" style="display: flex;justify-content: space-between;padding: 12px;">
+                    <span>Filter</span>
+                    <a id="toggleIcon" class="text-dark float-right" data-toggle="collapse" href="#collapseOne"
+                        aria-expanded="true">
+                        <i id="icon" class="mdi mdi-chevron-down mr-1 text-primary" style="font-size: 28px;"></i>
+                    </a>
+                </h4>
+                <div id="collapseOne" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion">
+                    <div class="card-body" style="margin-top: -30px;">
+                        <!-- <div class="text-center"> -->
+                        <div class="form-row">
+                            <div class="form-group col-md-3" id="date_div">
+                                <label>Date<span class="text-danger"></span></label>
+                                <!-- <div id="reportrange" class="form-control"
+                                style="background: #fff; cursor: pointer; padding: 5px 10px; border: 1px solid #ccc; width: 100%">
+                                <i class="mdi mdi-calendar-blank"></i>&nbsp;
+                                <span></span> <i class="mdi mdi-menu-down"></i>
+                            </div> -->
+                                <div class="input-icon">
+                                    <input type="text" id="reportrange" class="form-control" readonly style="caret-color: transparent;">
+                                    <i class="mdi mdi-calendar-blank-outline additional-icon"></i>
                                 </div>
+                                <input type="hidden" id="startDate" value=<?= $default_start ?>>
+                                <input type="hidden" id="endDate" value=<?= $default_end ?>>
+                            </div>
 
-                                <div class="form-group col-md-3">
-                                    <label for="client_branch">Nhance Branch<span class="text-danger"></span></label>
-                                    <select class="form-control" id="issuer_branch" name="issuer_branch">
-                                        <option value="">Select Branch</option>
-                                        <?php
-                                        if (isset($issuer_branch) && count($issuer_branch)) {
-                                            foreach ($issuer_branch as $key => $value) {
-                                                echo "<option value=" . $value['id'] . ">" . $value['branch_name'] . "</option>";
-                                            }
+                            <div class="form-group col-md-3">
+                                <label for="client_branch">Nhance Branch<span class="text-danger"></span></label>
+                                <select class="form-control" id="issuer_branch" name="issuer_branch">
+                                    <option value="">Select Branch</option>
+                                    <?php
+                                    if (isset($issuer_branch) && count($issuer_branch)) {
+                                        foreach ($issuer_branch as $key => $value) {
+                                            echo "<option value=" . $value['id'] . ">" . $value['branch_name'] . "</option>";
                                         }
-                                        ?>
-                                    </select>
-                                </div>
-
-
-                                <div class="form-group col-md-3 client_type_div">
-                                    <label for="client_type">Client Type<span class="text-danger"></span></label>
-                                    <select class="form-control" id="client_type" name="client_type">
-                                        <option value="">Select Client type</option>
-                                        <option value="1">Group</option>
-                                        <option value="2">Individual</option>
-                                    </select>
-                                </div>
-
-                                <div class="form-group col-md-3">
-                                    <label for="client_branch">Client<span class="text-danger"></span></label>
-                                    <select class="form-control" id="client_id" name="client_id">
-                                        <option value="">Select Client</option>
-                                    </select>
-                                </div>
-
+                                    }
+                                    ?>
+                                </select>
                             </div>
-                            <div class="row justify-content-end">
 
-                                <div class="col-auto">
-                                    <a href="#" class="btn btn-primary waves-effect waves-light" id="get-report-page"
-                                        onclick="fetchReportPage(event);">Submit</a>
-                                </div>
+
+                            <div class="form-group col-md-3 client_type_div">
+                                <label for="client_type">Client Type<span class="text-danger"></span></label>
+                                <select class="form-control" id="client_type" name="client_type">
+                                    <option value="">Select Client type</option>
+                                    <option value="1">Group</option>
+                                    <option value="2">Individual</option>
+                                </select>
                             </div>
-                            <!-- </div> -->
+
+                            <div class="form-group col-md-3">
+                                <label for="client_branch">Client<span class="text-danger"></span></label>
+                                <select class="form-control" id="client_id" name="client_id">
+                                    <option value="">Select Client</option>
+                                    <?php
+                                    if (isset($client_list) && count($client_list)) {
+                                        foreach ($client_list as $key => $value) {
+                                            echo "<option value=" . $value['id'] . ">" . $value['client_name'] . "</option>";
+                                        }
+                                    }
+                                    ?>
+                                </select>
+                            </div>
+
                         </div>
+                        <div class="row justify-content-end">
+
+                            <div class="col-auto">
+                                <a href="#" class="btn btn-primary waves-effect waves-light" id="get-report-page"
+                                    onclick="fetchReportPage(event);">Submit</a>
+                            </div>
+                        </div>
+                        <!-- </div> -->
                     </div>
                 </div>
             </div>
@@ -85,8 +90,9 @@
     let client_list = [];
 
     $(document).ready(function() {
-        getClientAndBranchAndPolicy();
+        // getClientAndBranchAndPolicy();
         $('#client_id').select2();
+        $('#issuer_branch').select2();
     })
 
     $(function() {
@@ -173,9 +179,13 @@
 
     //get client , branch, policy data
     function getClientAndBranchAndPolicy() {
+
+        return_type = 'client';
+
         $.ajax({
             url: '<?= base_url("/util/getClientAndBranchAndPolicy") ?>',
             type: "GET",
+            data:{ return_type : return_type},
             dataType: 'json',
             success: function(res) {