From e8382ce2e0089a72146e5a2e43d1e781bba6323e Mon Sep 17 00:00:00 2001
From: "venkatesh.r" <venkatesh.r@venbainfotech.com>
Date: Mon, 29 Jul 2024 14:22:01 +0530
Subject: [PATCH 01/21] FIX_RACK_RATE_ISSUE : RV

---
 .env.sample                          |  83 ++++++--
 app/Controllers/ClientController.php |   3 +-
 app/Controllers/MasterController.php |   1 +
 app/Views/client_policy.php          |   6 +-
 app/Views/policy_gmc_terms.php       |  67 +++----
 app/Views/policy_grid.php            | 270 +++++++++++----------------
 6 files changed, 219 insertions(+), 211 deletions(-)

diff --git a/.env.sample b/.env.sample
index 6af188a4..b3f6111e 100644
--- a/.env.sample
+++ b/.env.sample
@@ -14,13 +14,14 @@
 # ENVIRONMENT
 #--------------------------------------------------------------------
 
-CI_ENVIRONMENT = development
+# CI_ENVIRONMENT = development
 
 #--------------------------------------------------------------------
 # APP
 #--------------------------------------------------------------------
 
-app.baseURL = 'http://localhost/nhance/'
+app.baseURL = 'http://localhost/client_changes/nhance/'
+app.appTimezone = 'Asia/Kolkata'
 # If you have trouble with `.`, you could also use `_`.
 # app_baseURL = ''
 # app.forceGlobalSecureRequests = false
@@ -31,19 +32,74 @@ app.baseURL = 'http://localhost/nhance/'
 #--------------------------------------------------------------------
 
 
+# Dev DB Connection
 
 database.default.hostname = 119.18.54.85
 database.default.database = venbaehn_nhance
 database.default.username = venbaehn_nhance_user1
 database.default.password = 'iM~X7(cR+}A-'
+database.default.DBDriver = MySQLi
+database.default.DBPrefix =
+database.default.port = 3306
+
+database.tests.hostname = 119.18.54.85
+database.tests.database = venbaehn_nhance
+database.tests.username = venbaehn_nhance_user1
+database.tests.password = 'iM~X7(cR+}A-'
+database.tests.DBDriver = MySQLi
+database.tests.DBPrefix =
+database.tests.port = 3306
+
+# Test DB Connection
+
+# database.default.hostname = 119.18.54.85
+# database.default.database = venbaehn_nhance_test
+# database.default.username = venbaehn_nhance_user1
+# database.default.password = 'iM~X7(cR+}A-'
 # database.default.DBDriver = MySQLi
 # database.default.DBPrefix =
 # database.default.port = 3306
 
-database.default.hostname = 119.18.54.85
-database.default.database = venbaehn_nhance
-database.default.username = venbaehn_nhance_user1
-database.default.password = 'iM~X7(cR+}A-'
+# database.tests.hostname = 119.18.54.85
+# database.tests.database = venbaehn_nhance_test
+# database.tests.username = venbaehn_nhance_user1
+# database.tests.password = 'iM~X7(cR+}A-'
+# database.tests.DBDriver = MySQLi
+# database.tests.DBPrefix =
+# database.tests.port = 3306
+
+# UAT DB Connection
+
+# database.default.hostname = 119.18.54.85
+# database.default.database = venbaehn_nhance_uat
+# database.default.username = venbaehn_nhance_user1
+# database.default.password = 'iM~X7(cR+}A-'
+# database.default.DBDriver = MySQLi
+# database.default.DBPrefix =
+# database.default.port = 3306
+
+# database.tests.hostname = 119.18.54.85
+# database.tests.database = venbaehn_nhance_uat
+# database.tests.username = venbaehn_nhance_user1
+# database.tests.password = 'iM~X7(cR+}A-'
+# database.tests.DBDriver = MySQLi
+# database.tests.DBPrefix =
+# database.tests.port = 3306
+
+# Local PhpMyAdmin DB Connection
+
+# database.default.hostname = localhost
+# database.default.database = nhance
+# database.default.username = root
+# database.default.password = ''
+# database.default.DBDriver = MySQLi
+# database.default.DBPrefix =
+# database.default.port = 3306
+
+# database.tests.hostname = localhost
+# database.tests.database = nhance
+# database.tests.username = root
+# database.tests.password = ''
 # database.tests.DBDriver = MySQLi
 # database.tests.DBPrefix =
 # database.tests.port = 3306
@@ -125,12 +181,12 @@ database.default.password = 'iM~X7(cR+}A-'
 #--------------------------------------------------------------------
 
 # session.driver = 'CodeIgniter\Session\Handlers\FileHandler'
-# session.cookieName = 'ci_session'
-# session.expiration = 7200
+session.cookieName = 'ci_session_dev'
+session.expiration = 86400
 # session.savePath = null
 # session.matchIP = false
-# session.timeToUpdate = 300
-# session.regenerateDestroy = false
+session.timeToUpdate = 300
+session.regenerateDestroy = true
 
 #--------------------------------------------------------------------
 # LOGGER
@@ -151,5 +207,10 @@ database.default.password = 'iM~X7(cR+}A-'
 GOOGLE_OAUTH_APP_NAME      = 'OAuth'
 GOOGLE_OAUTH_CLIENT_ID     = '696241936560-m2mr272ge7vr2n4q36c22l3d2gdgi90l.apps.googleusercontent.com'
 GOOGLE_OAUTH_CLIENT_SECRET = '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'
-GOOGLE_OAUTH_REDIRECT_URI  = 'http://localhost/nhance/oauth2callback'
+GOOGLE_OAUTH_REDIRECT_URI  = 'http://localhost/client_changes/nhance/oauth2callback'
 GOOGLE_OAUTH_SCOPES        = "https://www.googleapis.com/auth/userinfo.email,https://www.googleapis.com/auth/userinfo.profile"
+
+
+App_Url = https://venbait.in/nhance/app/dev/
+POST_ENROLLMENT_APP_LINK = https://venbait.in/nhance/employee/dev/
+NHANCE_LOGO = https://venbait.in/nhance/dev/public/assets/images/Nhance_Favi.png
\ No newline at end of file
diff --git a/app/Controllers/ClientController.php b/app/Controllers/ClientController.php
index 77bd79e8..ab571f53 100644
--- a/app/Controllers/ClientController.php
+++ b/app/Controllers/ClientController.php
@@ -2161,7 +2161,8 @@ class ClientController extends AdminController
         }
     }
 
-    public function getClientBranch($client_id){
+    public function getClientBranch($client_id)
+    {
 
          $branchs = $this->clientBranchModel
                 ->select('*')
diff --git a/app/Controllers/MasterController.php b/app/Controllers/MasterController.php
index f364d1de..603f9e51 100644
--- a/app/Controllers/MasterController.php
+++ b/app/Controllers/MasterController.php
@@ -1086,6 +1086,7 @@ class MasterController extends AdminController
             'insurer_id' => $data['insurer_id'],
             'description' => 'opening Amount',
             'transaction_type' => 'Credit',
+            'event_name' => null,
             'updated_by' => 1,
         ];
 
diff --git a/app/Views/client_policy.php b/app/Views/client_policy.php
index 6250897f..86baa139 100644
--- a/app/Views/client_policy.php
+++ b/app/Views/client_policy.php
@@ -256,8 +256,9 @@
             console.log('client_policy_data',data)
             var role = data.role
             delete data.role;
+
             $.each(data, function(index, item) {
-                // //console.log(item.open_for_enrollment);
+                console.log('step 1');
                 var patternGMC = /gmc/i; // Case insensitive pattern for 'gmc'
                 var patternGPA = /gpa/i; // Case insensitive pattern for 'gpa'
                 var subject = item.policy_type_name;
@@ -304,9 +305,7 @@
 
                 var policy_name_data = `${item.policy_type_name ?? ''}` + ' - ' +  `${item.policy_no ?? ''}`;
 
-                var role = data.role;
 
-                $.each(data, function(index, item) {
                     policyTable += `
                         <tr>
                             <td>${item.insurer_short} - ${item.insurer_branch_name}</td>
@@ -336,7 +335,6 @@
                             </td>
                         </tr>
                     `;
-                });
 
             });
 
diff --git a/app/Views/policy_gmc_terms.php b/app/Views/policy_gmc_terms.php
index c3f2bb54..3872cccc 100644
--- a/app/Views/policy_gmc_terms.php
+++ b/app/Views/policy_gmc_terms.php
@@ -1254,13 +1254,15 @@
 
 <!-- Jodit RTE -->
 <script>
-    $(document).ready(function() {
-        var editor = new Jodit('#additionalsicknessbenefit', {
+    $(document).ready(function() 
+    {
+        var editor = new Jodit('#additionalsicknessbenefit', 
+        {
             buttons: 'bold,italic,underline,|,align,alignCenter,alignRight,alignJustify',
         });
 
-
-        var editor = new Jodit('#Wellness', {
+        var editor = new Jodit('#Wellness', 
+        {
             buttons: 'bold,italic,underline,|,align,alignCenter,alignRight,alignJustify',
         });
     });
@@ -1270,16 +1272,15 @@
 
 <!-- Policy terms Add Special Condition -->
 <script>
-    document.getElementById('myButtonSpecialCondition').addEventListener('click', function(event) {
-
+    document.getElementById('myButtonSpecialCondition').addEventListener('click', function(event) 
+    {
         //console.log('specialCondition callback clicked')
         event.preventDefault();
         specialCondition();
-
     });
 
-
-    function specialCondition(count = 0) {
+    function specialCondition(count = 0) 
+    {
 
         //console.log('specialCondition function called')
 
@@ -1307,12 +1308,11 @@
         }
     }
 
-
-    $(document).on('click', '.specialConditionClose', function() {
+    $(document).on('click', '.specialConditionClose', function() 
+    {
         $(this)[0].parentNode.parentNode.remove();
     });
 
-
     // Close the Policy terms 
     $(document).on('click', '#policyGMCTermsClose', function() {
         $('#policyGMCTerms').css('display', 'none');
@@ -1336,17 +1336,17 @@
     // }
 
 
-    $('#self').change(function () {
+    $('#self').change(function () 
+    {
         if ($(this).prop('checked')) {
             $('.self-age').css('display','');
         }else{
             $('.self-age').css('display','none');
         }
-    })
+    });
 
-
-
-    $('#spouse').change(function () {
+    $('#spouse').change(function () 
+    {
         if ($(this).prop('checked')) {
             $('.spouse-age').css('display','');
             if($('#spouse_min_age').val() < 17 || $('#spouse_min_age').val() == '' ){
@@ -1358,10 +1358,10 @@
         }else{
             $('.spouse-age').css('display','none');
         }
-    })
+    });
 
-
-    $('#children').change(function () {
+    $('#children').change(function () 
+    {
         if ($(this).val() != 0) {
             $('.child-age').css('display','');
 
@@ -1374,10 +1374,10 @@
         }else{
             $('.child-age').css('display','none');
         }
-    })
+    });
 
-
-    $('#family_floaters').change(function () {
+    $('#family_floaters').change(function () 
+    {
 
         checkAdditionPremiumJSON()
 
@@ -1410,10 +1410,10 @@
         }else if(family_floaters == '4EPORPIL'){
             $('#member_count').val(4);
         }
-    })
+    });
                  
-
-    function lowerIsEighteen(params) {
+    function lowerIsEighteen(params) 
+    {
         var value = $(params).val();
         
         if (value < 18) {
@@ -1423,8 +1423,8 @@
         }
     }
 
-
-    function appendGMCSIAddMore(data = null){
+    function appendGMCSIAddMore(data = null)
+    {
 
         console.log('function called')
 
@@ -1450,13 +1450,14 @@
         $('#gmc_si_add_more').append(html);
     }
     
-    function removeGMCAdditionalSI(button) {
+    function removeGMCAdditionalSI(button) 
+    {
         console.log('remove clicked');
         $(button).closest('.row').remove();
     }
 
-
-    function checkAdditionPremiumJSON(){
+    function checkAdditionPremiumJSON()
+    {
 
         var client_id = $('#Client_id').val();
         var client_policy_id = $('#gmc_client_policy_id').val();
@@ -1469,8 +1470,8 @@
             console.log(response.data);
 
             if (response.data > 0) {
-                console.log('Please change the additional premium relation');
-                Swal.fire("Please change the additional premium relation");
+                console.log('Any changes made in the policy term for family floater, please update the rack rate configuration.');
+                Swal.fire("Any changes made in the policy term for family floater, please update the rack rate configuration.");
             }
             console.log('outer');
 
diff --git a/app/Views/policy_grid.php b/app/Views/policy_grid.php
index 7352bc2b..12104d31 100644
--- a/app/Views/policy_grid.php
+++ b/app/Views/policy_grid.php
@@ -37,7 +37,7 @@
                     <h4 class="modal-title" id="myLargeModalLabel">Rack Rate <span id="PolicyNameForTitle"></span></h4>
                 </div>
                 <div class="col-md-5" style="position: relative;left: 20px;" id="add_new_rack_rate_tab_div">
-                    <button class="btn btn-info waves-effect waves-light mr-1 float-right" id="add_new_rack_rate_tab" onclick="appendNewTab()">Add Tab</button>
+                    <button class="btn btn-info waves-effect waves-light mr-1 float-right" id="add_new_rack_rate_tab" onclick="appendNewTab()">Add Rack Rate</button>
                 </div>
                 <div class="col-md-1" style="position: relative;top: 10px;">
                     <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
@@ -155,7 +155,6 @@ $(document).on('click', '.close', function() {
     console.log("Tab panes removed");
 });   
 
-
 var rarc_rate_json_array = [];
 
 $(document).on('submit', 'form[id^="GridForm_"]', function(event) {
@@ -193,9 +192,9 @@ $(document).on('submit', 'form[id^="GridForm_"]', function(event) {
 
     // Create FormData object
     var formData = new FormData(form[0]);
-    // for (var pair of formData.entries()) {
-    //     console.log(pair[0] + ': ' + pair[1]);
-    // }
+    for (var pair of formData.entries()) {
+        console.log(pair[0] + ': ' + pair[1]);
+    }
 
     let desiredKeys = ["self", "spouse", "childrens", "parents", "parents-in-law"];
 
@@ -289,6 +288,7 @@ var client_policy_for_additional_rack_rate  = '';
 var terms_si_amount_array  = [];
 var unit_length = 0;
 
+
 $('body').on('click', '.btnPolicyModel', function() 
 {
     $('#tab_content .tab-pane').not('#primary_rack_rate_tab').remove();
@@ -314,6 +314,9 @@ $('body').on('click', '.btnPolicyModel', function()
             $('#rack_rate_one').show()
         }
 
+        $('#rack_rate_one').click();
+
+
         $.ajax({
             url: '<?= base_url("util/policy-premium") ?>',
             type: "GET",
@@ -326,7 +329,9 @@ $('body').on('click', '.btnPolicyModel', function()
                 // console.log('rack rate responce.premium data parsed', JSON.parse(res.premiumData));
                
                 var data_for_the_rack_rate =  JSON.parse(res.premiumData) ?? [];
-                var groupedData = groupByRackRateName(data_for_the_rack_rate);
+                var groupedData = groupByRackRateName(data_for_the_rack_rate) ?? [];
+
+                console.log('groupedData', groupedData)
                 
                 if(policy_type_string == 'GMC'){
                     if (res.self == "") {
@@ -363,24 +368,39 @@ $('body').on('click', '.btnPolicyModel', function()
                 var premium_type_for_primary_rr = [];
                 var first = 0;
 
-                premiumData = []
-                if(policy_type_string == 'GMC'){
-                    $.each(groupedData, function(index, item){
-                        if(index !== 'Primary'){
-                            appendNewTab(index, item)
-                        }else{
-                            premiumData = item;
-                        }
-                    });
-                }else{
-                    $.each(groupedData, function(index, item){
-                        if(index == 'Primary'){
-                            premiumData = item;
-                        }
-                    });
+                premiumData = [];
+
+                try {
+                    if (policy_type_string == 'GMC') {
+                        $.each(groupedData, function(index, item) {
+                            if (index !== 'Primary') {
+                                appendNewTab(index, item);
+                            } else {
+                                premiumData = item;
+                            }
+                        });
+                    } else {
+                        $.each(groupedData, function(index, item) {
+                            if (index == 'Primary') {
+                                premiumData = item;
+                            }
+                        });
+                    }
+                } catch (error) {
+                    console.error('An error occurred:', error);
+                    console.error('Error Name:', error.name);
+                    console.error('Error Message:', error.message);
+                    console.error('Error Stack:', error.stack);
+
+                    // Optional: handle the error in a user-friendly way
+                    console.error('An error occurred while processing the data. Please try again.');
                 }
+
+
+                console.log('premiumData for primary rack rate', premiumData);
+
                 
-                if (premiumData.length > 0) {
+                if (premiumData.length > 0 && premiumData != 'undefined') {
                     $.each(premiumData, function(index, item) {
 
                         policy_grid_id_value = item.policy_grid_id;
@@ -413,6 +433,7 @@ $('body').on('click', '.btnPolicyModel', function()
 
                    checkboxdata = checkboxDataObject;
                 }
+                console.log('before create checkbox')
                 createCheckboxes(checkboxdata, additional_relationship, null, policy_type_id);
                 appendGridData(res.data, policy_grid_id_value);
                 if(premiumData[0]){
@@ -433,7 +454,7 @@ $('body').on('click', '.btnPolicyModel', function()
                     premiumData.shift();
                     $.each(premiumData, function(index, item) {
                         if (item.si_or_bp == '1') {
-                            console.log('gpa basic pay items', item)
+                            console.log('gpa basic pay items', item);
                             appendGridtHtml('1', null, item);
                         } else {
                             appendGridtHtml(item.policy_grid_id, null, item);
@@ -452,7 +473,7 @@ $('body').on('click', '.btnPolicyModel', function()
                 $('#4_si').trigger('keyup');
 
                 $('input[name="gpa_si"]').each(function() {
-                      console.log('gpa_si[]', $(this));
+                    //   console.log('gpa_si[]', $(this));
                     $(this).trigger('keyup');
                 });
                 
@@ -485,7 +506,6 @@ $('body').on('click', '.btnPolicyModel', function()
                 });
 
 
-
                 $(`input[name="${first}_si[]"]`).each(function() {
                     // console.log(first+'_si[]', $(this));
                     $(this).trigger('keyup');
@@ -518,6 +538,8 @@ $('body').on('click', '.btnPolicyModel', function()
 
 });
 
+console.log(rarc_rate_json_array);
+
 $(document).on('change', 'select[id^="grid_"]', function(event) 
 {
 
@@ -543,6 +565,7 @@ $(document).on('change', 'select[id^="grid_"]', function(event)
         dataType: 'json',
         success: function(res) {
 
+            console.log('change response', res)
 
             if (res.data[0].policy_type == "GPA") {
                 $('#si_or_bp').val('2');
@@ -564,6 +587,8 @@ $(document).on('change', 'select[id^="grid_"]', function(event)
     });
 })
 
+//--------------------------------------------------------------------------------------------------------
+
 $('#grid').change(function() 
 {
     console.log('unit_length', unit_length)
@@ -590,6 +615,7 @@ $('#grid').change(function()
         dataType: 'json',
         success: function(res) {
 
+            console.log('change response', res)
 
             if (res.data[0].policy_type == "GPA") {
                 $('#si_or_bp').val('2');
@@ -616,29 +642,19 @@ function addGridHTML(event = false, data = false, ui_type = false, si_or_bp = fa
     console.log('addGridHTML si_or_bp', si_or_bp);
     console.log('addGridHTML event', event);
     console.log('addGridHTML ui_type', ui_type);
+    var secondaryValue = unique_id;
 
-    secondaryValue = unique_id;
-    // console.log('typeof secondaryValue');
-    // console.log(typeof secondaryValue);
-
-    // if(event.id){
-    //     var unique_id = event.id.split('_');
-    //     if (unique_id.length > 1) {
-    //         secondaryValue = unique_id[1];
-    //         secondaryValue = String(secondaryValue);
-    //     }
-    // }
-
-    // console.log('unique_id', unique_id)
-    // console.log('secondaryValue', secondaryValue)
 
     var grid_container = document.getElementById('grid_content_input');
-    // console.log(grid_container);
+    console.log('step 1', grid_container);
 
     if (secondaryValue != false) {
-        grid_container_id = 'grid_content_input_' + secondaryValue;
+        grid_container_id = 'grid_content_input_for_additional_' + secondaryValue;
         grid_container = document.getElementById(grid_container_id);
+        console.log('step 2', grid_container);
+
     }
+    console.log('step 3', grid_container);
 
     var id_var = 'grid_';
 
@@ -649,8 +665,6 @@ function addGridHTML(event = false, data = false, ui_type = false, si_or_bp = fa
         var dataIdValue = event.value;
     }
 
-    $(grid_container).empty();
-
     if (dataIdValue == '1') {
         for (var i = 1; i <= 13; i++) {
             $('#' + id_var + i).remove();
@@ -814,8 +828,8 @@ function addGridHTML(event = false, data = false, ui_type = false, si_or_bp = fa
 
     } else if (dataIdValue == '3') {
 
-        console.log('secondaryValue type 3 step 1', secondaryValue)
-        console.log('secondaryValue type 3', secondaryValue)
+        // console.log('secondaryValue type 3 step 1', secondaryValue)
+        // console.log('secondaryValue type 3', secondaryValue)
 
         for (var i = 1; i <= 13; i++) {
             $('#' + id_var + i).remove();
@@ -927,13 +941,13 @@ function addGridHTML(event = false, data = false, ui_type = false, si_or_bp = fa
 
         grid_html = `
         <div class="form-row" id="${id_var}6" style="/*width:84%*/">   
-            <div class="form-group col-md-4 unitDiv">
+            <div class="form-group col-md-4">
                 <label for="mobile">Sum Insured<span class="text-danger">*</span></label>
                 <input value="${data !== false && data !== undefined && data !== '' ? data.si : ''}" type="text" class="form-control" placeholder="Enter Sum Insured" name="6_si" id="6_si" onkeypress = "return onlyNumbers(event)"  onchange="formatNumber(this)" required>
                 <div id='sum_insured_number_word' class="text-danger-2" ></div>
             </div>                    
             <div class="form-row">
-                <div class="form-group col-md-4">
+                <div class="form-group col-md-4 unitDiv">
                     <label for="mobile">Units<span class="text-danger">*</span></label>
                     <input value="${data !== false && data !== undefined && data !== '' ? data.unit : ''}" type="text" class="form-control" placeholder="Enter Unit" name="6_unit[]" id="6_unit" required>
                 </div>          
@@ -1230,8 +1244,9 @@ function addGridHTML(event = false, data = false, ui_type = false, si_or_bp = fa
 
     }
 
-    // console.log('grid_container', grid_container)
+    console.log('grid_container step 4', grid_container)
     // console.log('grid_html', grid_html)
+    $(grid_container).empty();
     grid_container.insertAdjacentHTML('beforeend', grid_html);
 
     if (dataIdValue == '1') {
@@ -1244,7 +1259,7 @@ function addGridHTML(event = false, data = false, ui_type = false, si_or_bp = fa
         // });
     }
 
-       if(unit_length == 1 || unit_length == 0){
+    if(unit_length == 1 || unit_length == 0){
 
         $('.unitDiv').hide();
         $('.unitDiv').find('input').removeAttr('required');
@@ -1280,7 +1295,7 @@ function appendGridtHtml(ui_type = false, secondary = false, data = false)
     // console.log('container', container);
 
     if (secondary != false && secondary != 'false' && secondary != null && secondary != 'null') {
-        container_id = 'grid_content_input_' + secondary;
+        container_id = 'grid_content_input_for_additional_' + secondary;
         console.log('container', container_id);
         container = document.getElementById(container_id);
         console.log('container', container);
@@ -1568,16 +1583,16 @@ function appendGridtHtml(ui_type = false, secondary = false, data = false)
             <div class="form-row" id="removeChild_${Count}" style="/*width:84%*/">   
                 <div class="form-group col-md-4 unitDiv">
                     <label for="mobile">Units<span class="text-danger">*</span></label>
-                    <input value="${data !== false && data !== undefined && data !== '' ? data.unit : ''}" type="text" class="form-control" placeholder="Enter unit" name="unit" id="9_unit_${Count}" required>
+                    <input value="${data !== false && data !== undefined && data !== '' ? data.unit : ''}" type="text" class="form-control" placeholder="Enter unit" name="gpa_unit" id="9_unit_${Count}" required>
                 </div>   
                 <div class="form-group col-md-4">
                     <label for="mobile">Sum Insured<span class="text-danger">*</span></label>
-                    <input value="${data !== false && data !== undefined && data !== '' ? data.si : ''}" type="text" class="form-control" placeholder="Enter Sum Insured" name="9_si[]" id="9_si_${Count}" onkeypress = "return onlyNumbers(event)"  onchange="formatNumber(this)" required>
+                    <input value="${data !== false && data !== undefined && data !== '' ? data.si : ''}" type="text" class="form-control" placeholder="Enter Sum Insured" name="gpa_si" id="9_si_${Count}" onkeypress = "return onlyNumbers(event)"  onchange="formatNumber(this)" required>
                     <div id='sum_insured_number_word_${Count}' class="text-danger-2" ></div>                                             
                 </div>                                             
                 <div class="form-group col-md-4">
                     <label for="mobile">Premium<span class="text-danger">*</span></label>
-                    <input value="${data !== false && data !== undefined && data !== '' ? data.premium : ''}" type="text" class="form-control" placeholder="Enter Premium" name="9_premium[]" id="9_premium_${Count}" onkeypress = "return onlyNumbers(event)"  onchange="formatNumber(this)"  required>
+                    <input value="${data !== false && data !== undefined && data !== '' ? data.premium : ''}" type="text" class="form-control" placeholder="Enter Premium" name="gpa_premium" id="9_premium_${Count}" onkeypress = "return onlyNumbers(event)"  onchange="formatNumber(this)"  required>
                     <div id='premium_number_word_${Count}' class="text-danger-2" ></div>
                 </div>
             </div>`;
@@ -1712,7 +1727,7 @@ function appendGridtHtml(ui_type = false, secondary = false, data = false)
                     <option value="father" ${data !== false && data !== undefined && data !== '' && data.relationship === 'father' ? 'selected' : ''}>Father</option>
                     <option value="mother" ${data !== false && data !== undefined && data !== '' && data.relationship === 'mother' ? 'selected' : ''}>Mother</option>
                     <option value="father-in-law" ${data !== false && data !== undefined && data !== '' && data.relationship === 'father-in-law' ? 'selected' : ''}>Father in Law</option>
-                    <option value="mother-in-law" ${dappendGridtHtmlata !== false && data !== undefined && data !== '' && data.relationship === 'mother-in-law' ? 'selected' : ''}>Mother in Law</option>
+                    <option value="mother-in-law" ${data !== false && data !== undefined && data !== '' && data.relationship === 'mother-in-law' ? 'selected' : ''}>Mother in Law</option>
                     <option value="child" ${data !== false && data !== undefined && data !== '' && data.relationship === 'child' ? 'selected' : ''}>Child</option>
                 </select>              
             </div>                           
@@ -1761,10 +1776,11 @@ function appendGridtHtml(ui_type = false, secondary = false, data = false)
 
 }
 
-
 function removebutton(index, type) 
 {
 
+    console.log('remove button function called')
+
     if (index == 0) {
         var inputs = document.querySelectorAll('#grid_' + type + ' input');
         inputs.forEach(function(input) {
@@ -1803,7 +1819,7 @@ function checkDuplicate(unique_id = null)
 
     if (unique_id) {
         id = $('#grid_'+unique_id)[0];
-        container = $('#grid_content_input_'+unique_id);
+        container = $('#grid_content_input_for_additional_'+unique_id);
 
         console.log('checkDuplicate id 2', id);
         console.log('checkDuplicate container 2', container);
@@ -2580,8 +2596,8 @@ function getCurrentTime()
 
 function createCheckboxes(obj, additional_relationship = [], unique_id = null, policy_type = null) 
 {
-    console.log('object', obj);
-    console.log('additional_relationship', additional_relationship);
+    console.log('createCheckboxes function object', obj);
+    console.log('createCheckboxes function additional_relationship', additional_relationship);
 
     if (typeof additional_relationship === 'string') {
         additional_relationship = JSON.parse(additional_relationship);
@@ -2658,6 +2674,7 @@ function createCheckboxes(obj, additional_relationship = [], unique_id = null, p
     }
 
     if (obj['childrens'] > 0) {
+
         let childrensValue = additional_relationship['childrens'] || 'NA';
 
         html += `
@@ -2763,86 +2780,11 @@ function createCheckboxes(obj, additional_relationship = [], unique_id = null, p
     }
 }
 
-
 function formatString(str) 
 {
     return str.split('-').map(word => word.charAt(0).toUpperCase() + word.slice(1)).join(' ');
 }
 
-$('#del_btn').click(function() 
-{
-    //console.log('delete btn clicked');
-
-    Swal.fire({
-        title: "Are you sure?",
-        text: "You need to Delete this!",
-        icon: "warning",
-        showCancelButton: true,
-        confirmButtonColor: "#3085d6",
-        confirmButtonText: "Yes",
-    }).then((result) => {
-        //console.log('after then entered');
-
-        if (result.isConfirmed) {
-            //console.log('isConfirmed entered');
-
-            var client_policy_id = $('#client_policy_id_2').val();
-            //console.log('client_policy_id', client_policy_id)
-
-            var rack_rate_type = $('#rack_rate_type_2').val();
-            //console.log('rack_rate_type', rack_rate_type)
-
-            var client_id = $('#Client_id_2').val();
-            //console.log('client_id', client_id)
-
-
-            $('.loader').fadeIn();
-            $('.loader-mask').fadeIn();
-
-            $.ajax({
-                url: '<?php echo base_url('util/delete-additional-rack-rate/'); ?>' + client_id + '/' + client_policy_id + '/' + rack_rate_type,
-                type: 'GET',
-                success: function(res) {
-                    
-                    //console.log('ajax success entered');
-                    //console.log(res);
-
-                    $('.loader').fadeOut();
-                    $('.loader-mask').delay(350).fadeOut('slow');
-
-                    if (res.status === true) {
-
-                        $('#additional_grid_content_input').empty();
-                        $('#additional_grid').val('');
-                        $('#individual_2').prop('checked', true)
-                        $('#single_2').prop('checked', false)
-                        $('input[type="checkbox"]').prop('checked', false);
-
-
-                        toastr.success(res.message, 'Success');
-
-                    } else if (res.status === false) {
-                        toastr.warning(res.message, 'Warning');
-                        return;
-                    }
-                },
-                error: function(xhr, status, error) {
-                    //console.log('ajax error entered');
-                    console.error(xhr.responseText);
-                    $('.loader').fadeOut();
-                    $('.loader-mask').delay(350).fadeOut('slow');
-                }
-            });
-
-            // Removed the duplicated loader hiding code here
-        }
-
-        //console.log('after then entered end or cancel');
-    });
-
-    //console.log('delete btn clicked end');
-});
-
 function checkCheckboxes() 
 {
 
@@ -2916,7 +2858,7 @@ function checkPolicyTermsSI(unique_id = null)
 
     if (unique_id) {
         id = $('#grid_'+unique_id)[0];
-        container = $('#grid_content_input_'+unique_id);
+        container = $('#grid_content_input_for_additional_'+unique_id);
     }
 
     console.log(id);
@@ -3018,6 +2960,9 @@ function checkPolicyTermsSI(unique_id = null)
 function appendNewTab(tabNameData = null, data = null)
 {
    console.log('appendNewTab function called');
+   console.log('tabNameData', tabNameData);
+   console.log('data', data);
+
    let tabName = tabNameData;
 
    if(tabNameData == null){
@@ -3049,6 +2994,7 @@ function appendNewTab(tabNameData = null, data = null)
         newTabLink.classList.add('nav-link', 'nav-link', 'px-3', 'py-2');  
         newTabLink.setAttribute('data-toggle', 'tab');
         newTabLink.setAttribute('href', `#${tabId}`);
+        newSpan.setAttribute('id', `link_${tabId}`);
         // newTabLink.textContent = tabName;
         newTabLink.appendChild(newSpan);
 
@@ -3101,7 +3047,7 @@ function appendNewTab(tabNameData = null, data = null)
                     <a href="#" id="copyfromexcel_${tabId}" onclick="copyFromExcel(this, '${tabId}')">Copy from excel</a>
                     <hr>
 
-                    <div class="form-row" id="grid_content_input_${tabId}" style="display: true;">
+                    <div class="form-row" id="grid_content_input_for_additional_${tabId}" style="display: true;">
                     </div>
 
 
@@ -3129,14 +3075,20 @@ function appendNewTab(tabNameData = null, data = null)
         if(data){
 
             addGridHTML(false, data[0], data[0].policy_grid_id, false, tabId);
+            policy_grid_id = data[0].policy_grid_id
+            additional_relationship = data[0].additional_relationship;
+            premium_type = data[0].premium_type;
+
             // data.shift();
-            $.each(data, function(index, item) {
-                // console.log(item)
-                policy_grid_id = item.policy_grid_id
-                additional_relationship = item.additional_relationship;
-                premium_type = item.premium_type;
-                appendGridtHtml(item.policy_grid_id, tabId, item);
-            });
+            // if(data.length > 1){
+                $.each(data, function(index, item) {
+                    // console.log(item)
+                    policy_grid_id = item.policy_grid_id
+                    additional_relationship = item.additional_relationship;
+                    premium_type = item.premium_type;
+                    appendGridtHtml(item.policy_grid_id, tabId, item);
+                });
+            // }
         }
 
         appendGridData(rack_rate_array, policy_grid_id, tabId);
@@ -3145,14 +3097,18 @@ function appendNewTab(tabNameData = null, data = null)
         hideShowSubmitButton(employee_count, tabId);
         editPolicyPremiumCalculationSetValue(premium_type, tabId);
 
+        if(data == null){
+            $('#link_'+tabId).click();
+        }
       }
 
 }
 
 function appendGridData(data, policy_grid_id_value = null, unique_id = null)
-{
-    console.log('policy_grid_id_value', policy_grid_id_value)
-    console.log(data)
+{   
+    console.log('appendGridData function called');
+    console.log('appendGridData policy_grid_id_value', policy_grid_id_value)
+    console.log('appendGridData data', data)
 
     var rack_rate_id =  $('#grid');
 
@@ -3256,7 +3212,7 @@ function copyFromExcel(input, unique_id = null)
     var grid_content_from_excel  = $('#grid_content_from_excel');
 
     if(unique_id){
-        grid_content_input = $('#grid_content_input_'+unique_id);
+        grid_content_input = $('#grid_content_input_for_additional_'+unique_id);
         grid_content_from_excel  = $('#grid_content_from_excel_'+unique_id);
     }
 
@@ -3317,56 +3273,46 @@ function editPolicyPremiumCalculationSetValue(premium_type, unique_id = null)
     if(unique_id){
 
         // console.log('editPolicyPremiumCalculationSetValue step 1');
-
-
         if (premium_type === '2') {
             // console.log('editPolicyPremiumCalculationSetValue step 2');
-
             $('#individual_'+unique_id).prop('checked', true);
             $('#single_'+unique_id).prop('checked', false);
+
         } else if (premium_type === '1') {
             // console.log('editPolicyPremiumCalculationSetValue step 3');
-
             $('#single_'+unique_id).prop('checked', true);
             $('#individual_'+unique_id).prop('checked', false);
+
         } else {
             // console.log('editPolicyPremiumCalculationSetValue step 4');
-
             $('#single_'+unique_id).prop('checked', false);
             $('#individual_'+unique_id).prop('checked', true);
+
         }
     }else{
 
         // console.log('editPolicyPremiumCalculationSetValue step 5');
-
         if (premium_type === '2') {
             // console.log('editPolicyPremiumCalculationSetValue step 6');
-
             $('#individual').prop('checked', true);
             $('#single').prop('checked', false);
+
         } else if (premium_type === '1') {
             // console.log('editPolicyPremiumCalculationSetValue step 7');
-
             $('#single').prop('checked', true);
             $('#individual').prop('checked', false);
+
         } else {
             // console.log('editPolicyPremiumCalculationSetValue step 8');
-
             $('#single').prop('checked', false);
             $('#individual').prop('checked', true);
+
         }
 
     }
 
 }
 
-function hideUnitFieldInABranchHaveSingleUnit()
-{
-    $('input[name="11_max_si[]"]').each(function() {
-        $(this)
-    });
-}
-
 function checkFamiliFloatersKeysDuplicate(rarc_rate_json_array, formObject)
 {   
     

From bd4be728906fe4eb26332432f3649e6682d2cc5f Mon Sep 17 00:00:00 2001
From: "venkatesh.r" <venkatesh.r@venbainfotech.com>
Date: Mon, 29 Jul 2024 15:07:37 +0530
Subject: [PATCH 02/21] FIX_RACK_RATE_DELETE : RV

---
 app/Config/Routes.php                |  1 +
 app/Controllers/ClientController.php | 34 ++++++++++++
 app/Views/policy_grid.php            | 83 +++++++++++++++++++++++-----
 3 files changed, 103 insertions(+), 15 deletions(-)

diff --git a/app/Config/Routes.php b/app/Config/Routes.php
index 80babc57..ab02ddd4 100644
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -271,6 +271,7 @@ $routes->group("/util", ["filter" => "authMVC"], function ($routes) {
     $routes->get("get_policy_type_for_base_policy/(:any)", "ClientController::getPolicyTypeForBasePolicy/$1");
     $routes->get("get_client_details/(:any)", "ClientController::getClientDetails/$1");
     $routes->get("featch_dashboard_data/(:any)", "DashboardController::featch_dashboard_data/$1");
+    $routes->get("remove_rack_rate/(:any)", "ClientController::removeRackRate/$1");
 });
 
 $routes->cli('cli/processjob', 'JobWorker::processJob');
diff --git a/app/Controllers/ClientController.php b/app/Controllers/ClientController.php
index ab571f53..e113a8c0 100644
--- a/app/Controllers/ClientController.php
+++ b/app/Controllers/ClientController.php
@@ -2823,4 +2823,38 @@ class ClientController extends AdminController
 
     }
 
+
+    public function removeRackRate($rack_rate_name = null, $client_policy_id = null)
+    {
+        $this->myLogger->logme('error', 'Rack Rate Remove function called');
+
+        $data = [
+            'updated_by' => get_session_userid(),
+            'is_active' => 0
+        ];
+
+        $rackRateData = $this->policyPremium2Model
+                    ->where('rack_rate_name', $rack_rate_name)
+                    ->where('client_policy_id', $client_policy_id)
+                    ->where('is_active',1)
+                    ->countAllResults();
+        
+        if($rackRateData > 0){
+            $update = $this->policyPremium2Model
+                ->where('rack_rate_name', $rack_rate_name)
+                ->where('client_policy_id', $client_policy_id)
+                ->set($data)->update();
+
+            if ($update) {
+                return $this->respond(['status' => true, 'code' => 200, 'message' => 'Rack Rate removed successfully', 'rr_count' => $rackRateData], 200);
+            } else {
+                return $this->respond(['status' => false, 'code' => 404, 'message' => 'Failed to remove policy', 'rr_count' => $rackRateData], 200);
+            }
+        }else{
+
+            return $this->respond(['status' => false, 'code' => 404, 'message' => 'Rack Rate not available', 'rr_count' => $rackRateData], 200);
+        }            
+   
+    }
+
 }
\ No newline at end of file
diff --git a/app/Views/policy_grid.php b/app/Views/policy_grid.php
index 12104d31..0110412c 100644
--- a/app/Views/policy_grid.php
+++ b/app/Views/policy_grid.php
@@ -3062,7 +3062,7 @@ function appendNewTab(tabNameData = null, data = null)
 
                 <div class="form-group text-right m-b-0" id="hide_smbt_btn_${tabId}">
                     <button type="submit" class="btn btn-primary waves-effect waves-light mr-1" id="btnGridSubmit_2_${tabId}">Submit</button>
-                    <a class="btn btn-danger waves-effect waves-light mr-1" id="btnGridremove_2_${tabId}" onclick="removeTab(this)">Delete</a>
+                    <a class="btn btn-danger waves-effect waves-light mr-1" id="btnGridremove_2_${tabId}" onclick="removeTab(this, '${tabId}', '${tabName}')">Delete</a>
                     <a class="btn btn-secondary waves-effect waves-light mr-1" id="btnGridrename_${tabId}" onclick="renameRackRateTab(this)">Rename</a>
                 </div>
             </form>`;
@@ -3173,19 +3173,18 @@ function hideShowSubmitButton(emp_count, unique_id = null)
 
 }
 
-function removeTab(input)
-{
-   console.log(input)
-   secondaryValue = ''
-   if(input.id){
-        var unique_id = input.id.split('_');
-        if (unique_id.length > 1) {
-            secondaryValue = unique_id[2];
-        }
-    }
+function removeTab(input, tabID, tabName)
+{  
+   var client_policy_id = $('#client_policy_id_'+tabID).val();  
+   console.log('removeTab input', input)
+   console.log('removeTab tabID', tabID)
+   console.log('removeTab tabName', tabName)
+   console.log('removeTab client_policy_id', client_policy_id)
+
+
    Swal.fire({
             title: "Are you sure?",
-            text: "You need to remove this Tab.",
+            text: "You want to remove this Rack Rate.",
             icon: "info",
             showCancelButton: true,
             confirmButtonColor: "#3085d6",
@@ -3194,9 +3193,63 @@ function removeTab(input)
 
             if (result.isConfirmed) {
 
-                $('#'+secondaryValue).remove();
-                $('#list_'+secondaryValue).remove();
+                $('#'+tabID).remove();
+                $('#list_'+tabID).remove();
                 $('#rack_rate_one').click();
+
+                $('.loader').fadeIn();
+                $('.loader-mask').fadeIn();
+
+                var form_action = '<?= base_url("util/remove_rack_rate/") ?>' + tabName + '/' + client_policy_id; 
+                    console.log(form_action)
+                    $.ajax({
+                        url: form_action,
+                        type: "GET",
+                        dataType: 'json',
+                        processData: false,
+                        contentType: false,
+                        success: function(res) {
+                            
+                            $('.loader').fadeOut();
+                            $('.loader-mask').delay(350).fadeOut('slow');
+
+                            console.log(res)
+
+                            if(res){
+                            if (res.status == true) {
+                                Swal.fire({
+                                    title: "Success",
+                                    text: res.message,
+                                    icon: "success"
+                                });
+                                // toastr.success('Policy removed successfully.', 'success');
+                            } else {
+                                if(res.rr_count > 0){
+                                    Swal.fire({
+                                        title: "warning!",
+                                        text: res.message,
+                                        icon: "warning"
+                                    });
+                                }else{
+                                    Swal.fire({
+                                        title: "Success",
+                                        text: 'Rack Rate removed successfully',
+                                        icon: "success"
+                                    });
+                                }
+
+                                // toastr.warning('Failed to remove policy', 'warning');
+                            }
+                            }
+                        },
+                        error: function (xhr, status, error) {
+                            console.error(xhr.responseText);
+                            console.error(status, error);
+                            $('.loader').fadeOut();
+                            $('.loader-mask').delay(350).fadeOut('slow');
+                            console.log('Something Wrong!', 'warning');
+                        }
+                    });
             }
 
         });
@@ -3232,7 +3285,7 @@ function renameRackRateTab(input)
 {  
     console.log(input)
     console.log(input.id)
-    var newTabName = prompt('Enter the tab name')
+    var newTabName = prompt('Enter rack rate name:')
     console.log(newTabName)
     secondaryValue = '';
     if(input.id){

From bd4e51f14428476576b23d1ea8f195d2f3dcc1f9 Mon Sep 17 00:00:00 2001
From: aadhavan valli <aadhavanvalli@gmail.com>
Date: Mon, 29 Jul 2024 17:14:03 +0530
Subject: [PATCH 03/21] 
 CHANGE_ENROLLMENT_STATUS_AND_REMINDER_MAIL_CHANGE_THE_CODE : AADHAVAN

---
 app/Config/Routes.php                      |   4 +-
 app/Controllers/ClientController.php       |  25 +-
 app/Controllers/DashboardController.php    | 158 +++++++--
 app/Controllers/JobWorker.php              |  70 +---
 app/Models/ClientPolicyModel.php           |   3 +
 app/Views/client_policy.php                | 111 ++++--
 app/Views/enrollment_dash.php              | 373 ++++++++++++++++-----
 public/assets/images/left_arrow.png        | Bin 0 -> 383 bytes
 public/assets/images/mask_group.png        | Bin 0 -> 8099 bytes
 public/assets/images/mask_group_blue.png   | Bin 0 -> 6038 bytes
 public/assets/images/mask_group_orange.png | Bin 0 -> 7686 bytes
 public/assets/images/mask_group_pink.png   | Bin 0 -> 7860 bytes
 public/assets/images/right_arrow.png       | Bin 0 -> 362 bytes
 13 files changed, 516 insertions(+), 228 deletions(-)
 create mode 100644 public/assets/images/left_arrow.png
 create mode 100644 public/assets/images/mask_group.png
 create mode 100644 public/assets/images/mask_group_blue.png
 create mode 100644 public/assets/images/mask_group_orange.png
 create mode 100644 public/assets/images/mask_group_pink.png
 create mode 100644 public/assets/images/right_arrow.png

diff --git a/app/Config/Routes.php b/app/Config/Routes.php
index 423e318e..a0dd7be7 100644
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -47,7 +47,7 @@ $routes->group("/user", ["filter" => "authMVC"], function ($routes) {
 
 
 $routes->group("/dashboard", ["filter" => "authMVC"], function ($routes) {
-    $routes->get("view", "DashboardController::dashboard");
+    $routes->match(['get','post'],'view','DashboardController::dashboard');
     $routes->get('get-notification', 'DashboardController::getDashboardNotifications');
     $routes->get('acknowledge-notification/(:segment)', 'DashboardController::acknowledgeMessage/$1');
     $routes->get('get-pending-action', 'PendingActionsController::getPendingActions');
@@ -272,7 +272,7 @@ $routes->group("/util", ["filter" => "authMVC"], function ($routes) {
 
 $routes->cli('cli/processjob', 'JobWorker::processJob');
 $routes->cli('cli/processjobs', 'JobWorker::processJobs');
-$routes->cli('cli/enrollment_status', 'JobWorker::enrollment_status');
+$routes->cli('cli/enrollment_status', 'DashboardController::enrollment_status');
 $routes->get("processjob", "JobWorker::processJob");
 
 
diff --git a/app/Controllers/ClientController.php b/app/Controllers/ClientController.php
index 5ffe24f3..7b694d78 100644
--- a/app/Controllers/ClientController.php
+++ b/app/Controllers/ClientController.php
@@ -405,7 +405,9 @@ class ClientController extends AdminController
         foreach ($clientPoliceData as $key => $value) {
             
             $clientPoliceData[$key]->policy_start_date = date('d-M-Y', strtotime($value->policy_start_date));
+            $clientPoliceData[$key]->open_date = date('d-M-Y', strtotime($value->open_date));
             $clientPoliceData[$key]->policy_end_date = date('d-M-Y', strtotime($value->policy_end_date));
+            $clientPoliceData[$key]->close_date = date('d-M-Y', strtotime($value->close_date));
         }
 
         $editData['client_policy']    = $clientPoliceData;
@@ -812,16 +814,17 @@ class ClientController extends AdminController
         //     }
         // } 
 
-
+        $data['policy_start_date'] = change_date_format($this->request->getPost('policy_start_date'), 'd-m-Y', 'Y-m-d');
+        $data['policy_end_date']   = change_date_format($this->request->getPost('policy_end_date'), 'd-m-Y', 'Y-m-d');
         $data['policy_no'] = $this->request->getPost('policy_no');
         if($data['inception_type'] == 2){
-            $data['policy_start_date'] = change_date_format($this->request->getPost('policy_start_date'), 'd-m-Y', 'Y-m-d');
-            $data['policy_end_date']   = change_date_format($this->request->getPost('policy_end_date'), 'd-m-Y', 'Y-m-d');
+            $data['open_date'] = change_date_format($this->request->getPost('open_date'), 'd-m-Y', 'Y-m-d');
+            $data['close_date']   = change_date_format($this->request->getPost('close_date'), 'd-m-Y', 'Y-m-d');
             $data['reminder_date']   = change_date_format($this->request->getPost('reminder_date'), 'd-m-Y', 'Y-m-d');
 
         }else{
-            $data['policy_start_date'] = null; 
-            $data['policy_end_date'] = null;
+            $data['open_date'] = null; 
+            $data['closedate'] = null;
             $data['reminder_date'] = null;
         }
 
@@ -882,14 +885,16 @@ class ClientController extends AdminController
         $data['client_branch_id']                   = $this->request->getPost('client_branch_id');
         $data['cd_ac_no']                           = $this->request->getPost('cd_ac_no');
         $data['gst']                                = $this->request->getPost('gst');
-
+        $data['policy_start_date'] = change_date_format($this->request->getPost('policy_start_date'), 'd-m-Y', 'Y-m-d');
+        $data['policy_end_date']   = change_date_format($this->request->getPost('policy_end_date'), 'd-m-Y', 'Y-m-d');
+        
         if($data['inception_type'] == 2){
-            $data['policy_start_date'] = change_date_format($this->request->getPost('policy_start_date'), 'd-m-Y', 'Y-m-d');
-            $data['policy_end_date']   = change_date_format($this->request->getPost('policy_end_date'), 'd-m-Y', 'Y-m-d');
+            $data['open_date'] = change_date_format($this->request->getPost('open_date'), 'd-m-Y', 'Y-m-d');
+            $data['close_date']   = change_date_format($this->request->getPost('close_date'), 'd-m-Y', 'Y-m-d');
             $data['reminder_date']   = change_date_format($this->request->getPost('reminder_date'), 'd-m-Y', 'Y-m-d');
         }else{
-            $data['policy_start_date'] = null; 
-            $data['policy_end_date'] = null;
+            $data['open_date'] = null; 
+            $data['close_date'] = null;
             $data['reminder_date'] = null;
         }
 
diff --git a/app/Controllers/DashboardController.php b/app/Controllers/DashboardController.php
index 7a29a9a3..da5e1ac6 100644
--- a/app/Controllers/DashboardController.php
+++ b/app/Controllers/DashboardController.php
@@ -6,6 +6,7 @@ use CodeIgniter\HTTP\IncomingRequest;
 use CodeIgniter\HTTP\RequestInterface;
 use CodeIgniter\HTTP\ResponseInterface;
 use Psr\Log\LoggerInterface;
+use App\Helpers\sendMailNotification;
 
 use CodeIgniter\API\ResponseTrait;
 
@@ -13,6 +14,11 @@ use App\Models\MessageModel;
 use App\Models\UserMessageModel;
 use App\Models\ClientModel;
 
+use App\Models\JobModel;
+use App\Models\ClientPolicyModel;
+use App\Models\NotificationModel;
+use App\Models\EmployeePolicyModel;
+
 class DashboardController extends AdminController
 {
     
@@ -33,20 +39,22 @@ class DashboardController extends AdminController
 
     public function dashboard()
     {
-        $data = [];
 
+        $data = [];
+    
         $results = $this->clientModel->select('clients.id as client_id, clients.client_name, clients.short_name,
-                                            client_branch.id as client_branch_id, client_branch.branch_name, 
-                                            client_branch.branch_code, employees.id as employee_id, 
-                                            employees.name as employee_name, employees.relationship,
-                                            employees.emp_code, employees.emp_status, auth_history.user_type')
-                                    ->join('client_branch','clients.id = client_branch.client_id', 'left')
-                                    ->join('employees','client_branch.id = employees.client_branch_id', 'left')
-                                    ->join('auth_history', 'employees.id = auth_history.user_id AND "employee" = auth_history.user_type', 'left')
-                                    ->findAll();
-        
+                                              client_branch.id as client_branch_id, client_branch.branch_name, 
+                                              client_branch.branch_code, employees.id as employee_id, 
+                                              employees.name as employee_name, employees.relationship,
+                                              employees.emp_code, employees.emp_status, auth_history.user_type, client_policy.policy_type_id, client_policy.id as client_policy_id')
+                                     ->join('client_branch', 'clients.id = client_branch.client_id', 'left')
+                                     ->join('client_policy', 'client_branch.id = client_policy.client_branch_id', 'left')
+                                     ->join('employees', 'client_branch.id = employees.client_branch_id', 'left')
+                                     ->join('auth_history', 'employees.id = auth_history.user_id AND "employee" = auth_history.user_type', 'left')
+                                     ->findAll();
+    
         $groupedData = [];
-        $employeeId = '';
+    
         foreach ($results as $row) {
             $clientId = $row['client_id'];
             $clientName = $row['client_name'];
@@ -54,16 +62,14 @@ class DashboardController extends AdminController
             $branchId = $row['client_branch_id'];
             $branchName = $row['branch_name'];
             $branchCode = $row['branch_code'];
-            if($employeeId != $row['employee_id']){
-                $employeeId = $row['employee_id'];
-            }else{
-                $employeeId = null;
-            }
-            $employeeName = $row['employee_name'] ;
-            $employeeRelationship = $row['relationship'] ;
-            $employeeEmpCode =  $row['emp_code'] ;
+            $employeeId = $row['employee_id'];
+            $employeeName = $row['employee_name'];
+            $employeeRelationship = $row['relationship'];
+            $employeeEmpCode = $row['emp_code'];
             $employeeEmpStatus = $row['emp_status'];
             $employeeUserType = $row['user_type'];
+            $clientPolicyId = $row['client_policy_id'];
+            $policyTypeId = $row['policy_type_id'];
     
             // Initialize the client entry if it doesn't exist
             if (!isset($groupedData[$clientId])) {
@@ -83,12 +89,23 @@ class DashboardController extends AdminController
                     'branch_code' => $branchCode,
                     'emp_login' => 0,
                     'emp_enroll' => 0,
+                    'client_policies' => [],
                     'employees' => []
                 ];
             }
-            if ($employeeId !== null && $employeeRelationship == 'Self') {
-                // Append employee info to the branch's employees list
-                $groupedData[$clientId]['branches'][$branchId]['employees'][] = [
+    
+            // Add the client policy to the branch's policies list if it exists, not already added, and policyTypeId is not equal to 1
+            if ($clientPolicyId !== null && $policyTypeId != 1 && !in_array(['client_policy_id' => $clientPolicyId, 'policy_type_id' => $policyTypeId], $groupedData[$clientId]['branches'][$branchId]['client_policies'])) {
+                $groupedData[$clientId]['branches'][$branchId]['client_policies'][] = [
+                    'client_policy_id' => $clientPolicyId,
+                    'policy_type_id' => $policyTypeId
+                ];
+            }
+    
+            // Append employee info to the branch's employees list if relationship is 'Self' and not already added
+            $employeeKey = $employeeId . '-' . $employeeName; // unique key to identify an employee
+            if ($employeeId !== null && $employeeRelationship == 'Self' && !isset($groupedData[$clientId]['branches'][$branchId]['employees'][$employeeKey])) {
+                $groupedData[$clientId]['branches'][$branchId]['employees'][$employeeKey] = [
                     'employee_id' => $employeeId,
                     'employee_name' => $employeeName,
                     'relationship' => $employeeRelationship,
@@ -105,21 +122,31 @@ class DashboardController extends AdminController
                     $groupedData[$clientId]['branches'][$branchId]['emp_enroll']++;
                 }
             }
-            $employeeId = $row['employee_id'];
         }
     
         // Re-index the arrays to match the expected structure
         foreach ($groupedData as &$client) {
+            foreach ($client['branches'] as &$branch) {
+                $branch['employees'] = array_values($branch['employees']);
+            }
             $client['branches'] = array_values($client['branches']);
         }
-        // echo "<pre>";
+    
         $data['client_branch_emp_list'] = $groupedData;
+        $session = \Config\Services::session();
+        $session->set('enrollment_data', json_encode($data));
+        // echo "<pre>";
         // print_r($data);die;
 
+        
         echo view('layout/header');
         echo view('DashBoard', $data);
         echo view('layout/footer');
     }
+    
+    
+    
+    
 
     public function getDashboardNotifications()
     {
@@ -148,4 +175,87 @@ class DashboardController extends AdminController
     }
 
 
+    public static function enrollment_status() {
+        $clientModel = new ClientModel();
+        $clientPolicyModel = new ClientPolicyModel();
+        $notificationModel = new NotificationModel();
+        $employeePolicyModel = new EmployeePolicyModel();
+        $myLogger = \Config\Services::mylogger();
+    
+        $client_policy_data = $clientPolicyModel
+                                                ->where('id', 21)
+                                                ->findAll();
+        $currentDate = date('Y-m-d');
+    
+        // Update policy status based on start and end dates
+        foreach ($client_policy_data as $client_policy) {
+            $id = $client_policy['id'];
+            
+            if ($currentDate == $client_policy['open_date']) {
+                $clientPolicyModel->update($id, ['open_for_enrollment' => 1]);
+            } 
+            
+            if ($client_policy['close_date'] < $currentDate) {
+                $clientPolicyModel->update($id, ['open_for_enrollment' => 0]);
+            }
+        }
+    
+        $reminder_whole_mail = [];
+
+        foreach ($client_policy_data as $client_policy) {
+            // Fetch client data
+            $client_data = $clientModel->find($client_policy['client_id']);
+            
+            // Fetch notification settings
+            $notification_data = $notificationModel->where('client_id', $client_policy['client_id'])
+                                                   ->where('template_name', 'member_reminder_mail')
+                                                   ->first();
+            
+            // Check if notification should be sent
+            if ($notification_data && $notification_data['enabled'] == 1 && $currentDate == $client_policy['reminder_date']) {
+                // Fetch all employees related to the client policy
+                $employees = $employeePolicyModel->select('employees.*')
+                                                 ->join('employees', 'employee_polices.employee_id = employees.id', 'left')
+                                                 ->where('employee_polices.client_policy_id', $client_policy['id'])
+                                                 ->findAll();
+        
+                // Process each employee
+                foreach ($employees as $employee) {
+                    if($employee['emp_status'] == 'draft' && $employee['relationship'] == 'Self'){
+                        $params['emp_data'] = $employee;
+                        $params['client_data'] = $client_data;
+                        $params['notification_data'] = $notification_data;
+                        
+                        // Send the mail notification
+                        $reminder_whole_mail[] = sendMailNotification::sendMailNotification('member_reminder_mail', $params);
+                    }
+                }
+            }
+        }
+        
+        // Process and queue bulk emails
+        $temp_whole_data = [];
+        $count = 0;
+
+        foreach ($reminder_whole_mail as $whole_index => $values) {
+            foreach ($values as $index => $value) {
+                $temp_whole_data[] = $value;
+                $count++;
+                
+                if ($count == 20 || ($whole_index == count($reminder_whole_mail) - 1 && $index == count($values) - 1)) {
+                    if (!empty($temp_whole_data)) {
+                        Jobs::addJob(['job_name' => 'bulk_mail', 'payload' => $temp_whole_data]);
+                        $temp_whole_data = [];
+                        $count = 0;
+                    }
+                }
+            }
+        }
+        if(count($temp_whole_data) > 0){
+            Jobs::addJob(['job_name' => 'bulk_mail', 'payload' => $temp_whole_data]);
+        }
+    
+        return json_encode(true);
+    }
+
 }
diff --git a/app/Controllers/JobWorker.php b/app/Controllers/JobWorker.php
index eb9f96e2..f5b40c04 100644
--- a/app/Controllers/JobWorker.php
+++ b/app/Controllers/JobWorker.php
@@ -3,13 +3,8 @@
 namespace App\Controllers;
 
 
-use App\Models\JobModel;
-use App\Models\ClientModel;
-use App\Models\ClientPolicyModel;
-use App\Models\NotificationModel;
-use App\Models\EmployeePolicyModel;
 
-use App\Helpers\sendMailNotification;
+
 
 class JobWorker extends AdminController
 {
@@ -330,70 +325,7 @@ class JobWorker extends AdminController
     }
 
 
-    public static function enrollment_status() {
-        $clientModel = new ClientModel();
-        $clientPolicyModel = new ClientPolicyModel();
-        $notificationModel = new NotificationModel();
-        $employeePolicyModel = new EmployeePolicyModel();
-        $myLogger = \Config\Services::mylogger();
-    
-        $client_policy_data = $clientPolicyModel->where('is_active', 1)
-                                                ->where('policy_status', 1)
-                                                ->where('inception_type', 2)
-                                                ->findAll();
-        $currentDate = date('Y-m-d');
-    
-        // Update policy status based on start and end dates
-        foreach ($client_policy_data as $client_policy) {
-            $id = $client_policy['id'];
-            
-            if ($currentDate == $client_policy['policy_start_date']) {
-                $clientPolicyModel->update($id, ['open_for_enrollment' => 1]);
-            } 
-            if ($client_policy['policy_end_date'] < $currentDate) {
-                $clientPolicyModel->update($id, ['open_for_enrollment' => 0]);
-            }
-        }
-    
-        $reminder_whole_mail = [];
-        foreach ($client_policy_data as $client_policy) {
-            $employee = $employeePolicyModel->select('employees.*')
-                                            ->join('employees', 'employee_polices.employee_id = employees.id', 'left')
-                                            ->where('employee_polices.client_policy_id', $client_policy['id'])
-                                            ->first();
-            $client_data = $clientModel->find($client_policy['client_id']);
-            $notification_data = $notificationModel->where('client_id', $client_policy['client_id'])
-                                                   ->where('template_name', 'member_reminder_mail')
-                                                   ->first();
-            
-            if ($notification_data && $notification_data['enabled'] == 1 && $currentDate == $client_policy['reminder_date']) {
-                $params['emp_data'] = $employee;
-                $params['client_data'] = $client_data;
-                $params['notification_data'] = $notification_data;
-                $reminder_whole_mail[] = sendMailNotification::sendMailNotification('member_reminder_mail', $params);
 
-            }
-        }
-        // Process and queue bulk emails
-        $temp_whole_data = [];
-        $count = 0;
-        foreach ($reminder_whole_mail as $whole_index => $values) {
-            foreach ($values as $index => $value) {
-                $temp_whole_data[] = $value;
-                $count++;
-                
-                if ($count == 20 || ($whole_index == count($reminder_whole_mail) - 1 && $index == count($values) - 1)) {
-                    if (!empty($temp_whole_data)) {
-                        Jobs::addJob(['job_name' => 'bulk_mail', 'payload' => $temp_whole_data]);
-                        $temp_whole_data = [];
-                        $count = 0;
-                    }
-                }
-            }
-        }
-    
-        return json_encode(true);
-    }
     
     
 
diff --git a/app/Models/ClientPolicyModel.php b/app/Models/ClientPolicyModel.php
index 9a4f3c0c..f3bed1e8 100644
--- a/app/Models/ClientPolicyModel.php
+++ b/app/Models/ClientPolicyModel.php
@@ -20,6 +20,9 @@ class ClientPolicyModel extends Model
         "policy_start_date",
         "policy_end_date",
         "reminder_date",
+        "open_date",
+        "close_date",
+        "close_date",
         "insured",
         "no_of_employees",
         "no_of_lives",
diff --git a/app/Views/client_policy.php b/app/Views/client_policy.php
index 527d4450..2c52734c 100644
--- a/app/Views/client_policy.php
+++ b/app/Views/client_policy.php
@@ -112,10 +112,7 @@
                                 <label for="policy_end_date">Policy End Date<span class="text-danger">*</span></label>
                                 <input value="" type="text" class="form-control" placeholder="Enter End Date " name="policy_end_date" id="end_date" required>
                             </div>
-                            <div class="form-group col-md-4">
-                                <label for="reminder_date">Reminder Date<span class="text-danger">*</span></label>
-                                <input value="" type="text" class="form-control" placeholder="Enter Reminder Date " name="reminder_date" id="reminder_date" required>
-                            </div>
+                           
                             <div class="form-group col-md-4" id="policy_status_field">
                                 <label for="policy_status">Policy Status</label>
                                 <input value="" type="text" class="form-control" placeholder="Policy Status" id="policy_status" readonly>
@@ -146,7 +143,18 @@
                                 <label for="inception_type" style="position: relative;bottom: 5px;left: 85px;">Enable
                                     Employee Enrolment Process</label>
                             </div>
-
+                            <div class="form-group col-md-4">
+                                <label for="open_date">Open Date<span class="text-danger">*</span></label>
+                                <input value="" type="text" class="form-control" placeholder="Enter OpenS Date " name="open_date" id="open_date" >
+                            </div>
+                            <div class="form-group col-md-4">
+                                <label for="close_date">Close Date<span class="text-danger">*</span></label>
+                                <input value="" type="text" class="form-control" placeholder="Enter Close Date " name="close_date" id="close_date" >
+                            </div>
+                            <div class="form-group col-md-4">
+                                <label for="reminder_date">Reminder Date<span class="text-danger">*</span></label>
+                                <input value="" type="text" class="form-control" placeholder="Enter Reminder Date " name="reminder_date" id="reminder_date" >
+                            </div>
                             <div class="form-group col-md-4">
                                 <label class="switch" style="position: relative;top: 43px;left: 20px;">
                                     <input id="policy_visibility" type="checkbox" name="enrolment_visibility" checked>
@@ -180,16 +188,16 @@
 <script>
 
     $('#inception_type').change(function () {
-        var start_data = $('#start_date').parent();
-        var end_data = $('#end_date').parent();
+        var open_data = $('#open_date').parent();
+        var close_data = $('#close_date').parent();
         var reminder_data = $('#reminder_date').parent();
         if($(this).prop('checked')){
-            $(start_data).show();
-            $(end_data).show();
+            $(open_data).show();
+            $(close_data).show();
             $(reminder_data).show();
         }else{
-            $(start_data).hide();
-            $(end_data).hide();
+            $(open_data).hide();
+            $(close_data).hide();
             $(reminder_data).hide();
         }
     })
@@ -214,7 +222,6 @@
         // Get today's date
         var today = new Date();
 
-        // Initialize Flatpickr for the start date with today's date
         var startDatePicker = flatpickr("#start_date", {
             dateFormat: "d-m-Y",
             defaultDate: today,
@@ -227,21 +234,42 @@
             }
         });
 
-        // Calculate the end date (today + 1 year)
-        var endDate = new Date(today);
-        endDate.setFullYear(endDate.getFullYear() + 1);
-        endDate.setDate(endDate.getDate() - 1); // Set end date to last day of next year
 
-        // Initialize Flatpickr for the end date with the calculated end date
+
+        // Initialize Flatpickr for the start date with today's date
+        var openDatePicker = flatpickr("#open_date", {
+            dateFormat: "d-m-Y",
+            defaultDate: today,
+            allowInput: false,
+            onChange: function(selectedDates, dateStr, instance) {
+                var closeDate = new Date(selectedDates[0]);
+                closeDate.setFullYear(closeDate.getFullYear() + 1);
+                closeDate.setDate(closeDate.getDate() - 1); // Set end date to last day of selected year
+                closeDatePicker.setDate(closeDate);
+            }
+        });
+
+        // Calculate the end date (today + 1 year)
+        var closeDate = new Date(today);
+        closeDate.setFullYear(closeDate.getFullYear() + 1);
+        closeDate.setDate(closeDate.getDate() - 1); // Set end date to last day of next year
+
         var endDatePicker = flatpickr("#end_date", {
             dateFormat: "d-m-Y",
-            defaultDate: endDate,
+            defaultDate: closeDate,
+            allowInput: false
+        });
+
+        // Initialize Flatpickr for the end date with the calculated end date
+        var closeDatePicker = flatpickr("#close_date", {
+            dateFormat: "d-m-Y",
+            defaultDate: closeDate,
             allowInput: false
         });
 
         var reminderDatePicker = flatpickr("#reminder_date", {
             dateFormat: "d-m-Y",
-            defaultDate: endDate,
+            defaultDate: closeDate,
             allowInput: false
         });
 
@@ -308,9 +336,9 @@
                         <td>${policy_name_data}</td>
                         <td>${item.branch_name ? item.branch_name : ' - '}</td>
                         <td>${tpaValue}</td>
-                        <td>${(item.policy_start_date)} /   ${(item.policy_end_date)}</td>
+                        <td>${(item.open_date)} /   ${(item.close_date)}</td>
                         <td style="text-align: center;">${(enrollmentStatus)}</td>
-                        <td>${checkDateStatus(item.policy_end_date, 1)}</td>
+                        <td>${checkDateStatus(item.close_date, 1)}</td>
                         <td>
                             <div class="btn-group dropdown">
                                 <a href="javascript: void(0);" class="dropdown-toggle arrow-none btn btn-light btn-sm" data-toggle="dropdown"aria-expanded="false"><i class="mdi mdi-dots-horizontal"></i></a>
@@ -352,8 +380,10 @@
         $('#insurer').val('').change();
         $('#tpa').val('').change();
         $('#policy_no').val('').change();
+        $('#policy_no').val('').change();
         $('#start_date').val('').change();
         $('#end_date').val('').change();
+        $('#close_date').val('').change();
         // $('#policy').html('<option value="" selected>Select Policy</option>').change();
         $('#policy_form_action').val('<?= base_url("client/policy/create"); ?>');
         $('#policy_status_field').hide()
@@ -382,8 +412,10 @@
         $('#insurer').val('').change();
         $('#tpa').val('').change();
         $('#policy_no').val('').change();
-        $('#start_date').val('').change();
+        $('#start_no').val('').change();
         $('#end_date').val('').change();
+        $('#open_date').val('').change();
+        $('#close_date').val('').change();
         $('#policy').html('<option value="" selected>Select Policy</option>');
         $('#base_policy_id').hide();
         $('#client_branch').val('').change();
@@ -532,9 +564,9 @@
                             <td>${policy_name_data}</td>
                             <td>${item.branch_name}</td>
                             <td>${tpaValue}</td>
-                            <td>${rearrangeDateFormat(item.policy_start_date)} /   ${rearrangeDateFormat(item.policy_end_date)}</td>
+                            <td>${rearrangeDateFormat(item.open_date)} /   ${rearrangeDateFormat(item.close_date)}</td>
                             <td style="text-align: center;">${(enrollmentStatus)}</td>
-                            <td>${checkDateStatus(item.policy_end_date, 1)}</td>
+                            <td>${checkDateStatus(item.close_date, 1)}</td>
                             <td>
                                 <div class="btn-group dropdown">
                                     <a href="javascript: void(0);" class="dropdown-toggle arrow-none btn btn-light btn-sm" data-toggle="dropdown"aria-expanded="false"><i class="mdi mdi-dots-horizontal"></i></a>
@@ -555,8 +587,8 @@
                 $('#insurer').val('');
                 $('#tpa').val('');
                 $('#policy_no').val('');
-                $('#start_date').val('');
-                $('#end_date').val('');
+                $('#open_date').val('');
+                $('#close_date').val('');
                 $('#policy').html('<option value="" selected>Select Policy</option>');
             },
             error: function(xhr, status, error) {
@@ -689,6 +721,7 @@
     // get the client policy data for edit
     $('body').on('click', '.btnPolicyEdit', function() {
 
+
         var policy_form_action = '';
         var policy_id = $(this).attr('data-id');
 
@@ -739,18 +772,26 @@
                 $('#policy_PrimaryKey').val(res.data.id);
                 $('#insurer_policy_id').val(res.data.policy_id);
                 $('#policy_no').val(res.data.policy_no);
-                $('#start_date').val(rearrangeDateFormat(res.data.policy_start_date));
-                $('#end_date').val(rearrangeDateFormat(res.data.policy_end_date));
+                // $('#start_date').val(rearrangeDateFormat(res.data.policy_start_date));
+                $('#open_date').val(rearrangeDateFormat(res.data.open_date));
+                // $('#end_date').val(rearrangeDateFormat(res.data.policy_end_date));
+                $('#close_date').val(rearrangeDateFormat(res.data.close_date));
                 $('#reminder_date').val(rearrangeDateFormat(res.data.reminder_date));
-                $('#policy_status').val(checkDateStatus(res.data.policy_end_date));
+                $('#policy_status').val(checkDateStatus(res.data.policy_close_date));
                 $('#gst_no').val(gst);
                 $('#policy_status_field').show();
 
 
                 if (res.data.inception_type == 2) {
                     $('#inception_type').prop('checked', true);
+                    $('#open_date').parent().show();
+                    $('#close_date').parent().show();
+                    $('#reminder_date').parent().show();
                 } else {
                     $('#inception_type').prop('checked', false);
+                    $('#open_date').parent().hide();
+                    $('#close_date').parent().hide();
+                    $('#reminder_date').parent().hide();
                 }
 
 
@@ -1218,8 +1259,8 @@
         $('#insurer').val('').change();
         $('#tpa').val('').change();
         $('#policy_no').val('');
-        $('#start_date').val('');
-        $('#end_date').val('');
+        $('#open_date').val('');
+        $('#close_date').val('');
         $('#reminder_date').val('');
         $('#base_policy').val('').change();
 
@@ -1325,8 +1366,8 @@
         if($('#inception_type').prop('checked')){
             
         }else{
-            $('#start_date').parent().hide();
-            $('#end_date').parent().hide();
+            $('#open_date').parent().hide();
+            $('#close_date').parent().hide();
             $('#reminder_date').parent().hide();
         }
     })
@@ -1437,8 +1478,8 @@
                         $('#insurer').val(res.data.insurer_branch_id + '-' + res.data.insurer_id).change();
                         $('#tpa').val(res.data.tpa_branch_id + '-' + res.data.tpa_id).change();
                         $('#policy_no').val(res.data.policy_no).change();
-                        $('#start_date').val(rearrangeDateFormat(res.data.policy_start_date)).change();
-                        $('#end_date').val(rearrangeDateFormat(res.data.policy_end_date)).change();
+                        $('#open_date').val(rearrangeDateFormat(res.data.open_date)).change();
+                        $('#close_date').val(rearrangeDateFormat(res.data.close_date)).change();
                     }
 
                 },
diff --git a/app/Views/enrollment_dash.php b/app/Views/enrollment_dash.php
index 81683287..f0c1fb79 100644
--- a/app/Views/enrollment_dash.php
+++ b/app/Views/enrollment_dash.php
@@ -11,10 +11,11 @@
 <script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.6.0/js/bootstrap.min.js"></script>
 
 <style>
-    /* Existing CSS ... */
-
+    .carousel-control-next {
+        right: -18px;
+    }
     .carousel-control-prev {
-        left: -38px;
+        left: -24px;
     }
 
     .status-option {
@@ -48,14 +49,14 @@
 
     .scroll-item {
         flex: 0 0 auto;
-        width: 33%; /* Adjust based on the number of items you want to show */
+        width: 30%; /* Adjust based on the number of items you want to show */
         box-sizing: border-box;
         padding: 0 10px;
     }
 
     @media (min-width: 1200px) {
         .col-xl-3 {
-            max-width: 32% !important;
+            max-width: 30% !important;
         }
     }
 
@@ -92,7 +93,7 @@
 
     .carousel-item {
         height: auto; /* Adjust if needed */
-        /* margin-left: 80px; */
+        margin-left: 57px;
     }
 
     .card {
@@ -105,7 +106,7 @@
     }
 
     .carousel-control-prev-icon, .carousel-control-next-icon {
-        background-color: rgba(0,0,0,0.5); /* Change color as needed */
+        /* background-color: rgba(0,0,0,0.5); Change color as needed */
     }
 
     .carousel-control-prev-icon {
@@ -139,14 +140,14 @@
 <div class="tab-pane fade" id="enrollment-dash-tab">
     <div class="row visa_status_count_view">
         <div class="col-12">
-            <div class="card" style="border: 0px;">
+            <div class="card" style="border: 0px;height: 470px;">
                 <div class="card-body status-option" id="statusContent" style="padding: 0.5rem !important;background-color: white;">
                     <!-- Search Input Field -->
                     <div class="row">
                         <div class="col-3">
-                            <select class="form-control" name="" id="">
-                                <option value="">Open Enrollment</option>
-                                <option value="">Close Enrollment</option>
+                            <select class="form-control" name="" id="enrollment_status_open_close">
+                                <option value="open">Open Enrollment</option>
+                                <option value="close">Close Enrollment</option>
                             </select>
                         </div>
                         <div class="col-5"></div>
@@ -166,86 +167,86 @@
                                     // Start a new carousel item if needed
                                     if ($currentItem % $itemsPerSlide == 0) {
                                         if (!$isActive) echo '</div>'; // Close previous carousel item
-                                        echo '<div class="carousel-item' . ($isActive ? ' active' : '') . '">';
-                                        $isActive = false;
+                                            echo '<div class="carousel-item' . ($isActive ? ' active' : '') . '">';
+                                            $isActive = false;
+                                        }
+                                        if(count($branches['client_policies']) != 0){  ?>
+                                            <!-- New Card Layout for each item -->
+                                            <div class="col-xl-3 col-md-6 d-inline-block scroll-item carousel-slide-item" data-client="<?php echo $clients['short_name']; ?>" data-branch="<?php echo $branches['branch_name']; ?>">
+                                                <div class="card" style="box-shadow: 0 4px 8px rgba(0, 0, 0, 0.2);">
+                                                    <div class="card-header add_card_background_random" >
+                                                        <div class="row">
+                                                            <div class="col-8 emp-count-view-click" >
+                                                                <div class="d-flex justify-content-between">
+                                                                    <div class="w-100 " >
+                                                                        <h3 class="my-2 py-1" ><span data-plugin="counterup" style="font-size: 2.0rem;background-color: white;border-radius: 6px;height: 30;padding: 4px 11px 4px 11px;" onclick="enrollment_list(this, 'emp_count_view_click')"><?php echo isset($branches['employees']) ? count($branches['employees']) : '0'; ?></span></h3>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                        <div class="row">
+                                                            <div class="col-12 emp-count-view-click" >
+                                                                <div class="d-flex justify-content-between">
+                                                                    <div class="w-100" >
+                                                                        <h5 class="mt-0 text-truncate" title="Branch Info" style="font-weight: 400 !important;font-size: 20px !important;line-height: 36px;color: black !important;"><?php echo isset($clients['short_name']) ? $clients['short_name'] : 'N/A'; ?> - <?php echo isset($branches['branch_name']) ? $branches['branch_name'] : 'N/A'; ?></h5>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                            <!-- <div class="col-3 center_text emp-count-view-click" >
+                                                            <div class="d-flex justify-content-between">
+                                                                <div class="w-100 text-center" >
+                                                                    <p class="mb-0 text-muted">
+                                                                        <span class="text-success mr-2"></span>
+                                                                        <span class="text-nowrap">Emp Count</span>  
+                                                                    </p>
+                                                                </div>
+                                                            </div>
+                                                             </div> -->
+                                                        </div>
+                                                    </div>
+                                                    <div class="card-body" >
+                                                        <input type="text" class="client_id" value="<?php echo $clients['client_id']; ?>" hidden>
+                                                        <input type="text" class="client_branch_id" value="<?php echo $branches['client_branch_id'] ?>" hidden>
+                                                        <div class="row emp-status" style="margin-top: -9px;">
+                                                            <div class="col-6 emp-count-view-click" >
+                                                                <span style="font-size: large;color: black !important;" class="number_css" onclick="enrollment_list(this, 'emp_logged_in_view_click')"><?php echo isset($branches['emp_login']) ? $branches['emp_login'] : '0'; ?></span><br>
+                                                                <span class="text-nowrap " style="color: currentColor;font-size: 15px;">Logged-In</span>  
+                                                            </div>
+                                                            <div class="col-6 emp-count-view-click" >
+                                                                <span style="font-size: large;color: black !important;" class="number_css" onclick="enrollment_list(this, 'emp_not_logged_in_view_click')"><?php echo isset($branches['emp_login']) ? count($branches['employees']) - $branches['emp_login'] : '0'; ?></span><br>
+                                                                <span class="text-nowrap" style="color: currentColor;font-size: 15px;margin-left: -13px;">Not Logged-In</span>  
+                                                            </div>
+                                                        </div>
+                                                        <div class="row emp-status" style="margin-top: 5px;">
+                                                            <div class="col-6 emp-count-view-click" >
+                                                                <span style="font-size: large;color: black !important;" class="number_css" onclick="enrollment_list(this, 'emp_not_enrolled_view_click')"><?php echo isset($branches['emp_enroll']) ? count($branches['employees']) - $branches['emp_enroll'] : '0'; ?></span><br>
+                                                                <span class="text-nowrap" style="color: currentColor;font-size: 15px;">Draft</span>  
+                                                            </div>
+                                                            <div class="col-6 emp-count-view-click" >
+                                                                <span style="font-size: large;color: black !important;" class="number_css" onclick="enrollment_list(this, 'emp_enrolled_view_click')"><?php echo isset($branches['emp_enroll']) ? $branches['emp_enroll'] : '0'; ?></span><br>
+                                                                <span class="text-nowrap" style="color: currentColor;font-size: 15px;">Enrolled</span>  
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        <?php 
+                                        $currentItem++;
+                                        }
                                     }
-                                    ?>
-                                    <!-- New Card Layout for each item -->
-                                    <div class="col-xl-3 col-md-6 d-inline-block scroll-item carousel-slide-item" data-client="<?php echo $clients['short_name']; ?>" data-branch="<?php echo $branches['branch_name']; ?>">
-                                        <div class="card" style="box-shadow: 0 4px 8px rgba(0, 0, 0, 0.2);">
-                                            <div class="card-header" >
-                                                <div class="row">
-                                                    <div class="col-8 center_text emp-count-view-click" >
-                                                        <div class="d-flex justify-content-between">
-                                                            <div class="w-100 text-center" >
-                                                            <h3 class="my-2 py-1 number_css" ><span data-plugin="counterup" style="margin-left: 113px;font-size: 2.0rem;" onclick="enrollment_list(this, 'emp_count_view_click')"><?php echo isset($branches['employees']) ? count($branches['employees']) : '0'; ?></span></h3>
-                                                            </div>
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                                <div class="row">
-                                                    <div class="col-12 center_text emp-count-view-click" >
-                                                        <div class="d-flex justify-content-between">
-                                                            
-                                                            <div class="w-100 text-center" >
-                                                                <h5 class="text-muted font-weight-normal mt-0 text-truncate" title="Branch Info" style="text-align: center;"><?php echo isset($clients['short_name']) ? $clients['short_name'] : 'N/A'; ?> - <?php echo isset($branches['branch_name']) ? $branches['branch_name'] : 'N/A'; ?></h5>
-                                                            </div>
-                                                        </div>
-                                                    </div>
-                                                    <!-- <div class="col-3 center_text emp-count-view-click" >
-                                                        <div class="d-flex justify-content-between">
-                                                            <div class="w-100 text-center" >
-                                                                <p class="mb-0 text-muted">
-                                                                    <span class="text-success mr-2"></span>
-                                                                    <span class="text-nowrap">Emp Count</span>  
-                                                                </p>
-                                                            </div>
-                                                        </div>
-                                                    </div> -->
-                                                </div>
-                                            </div>
-                                            <div class="card-body add_card_background_random" >
-                                                
-                                                <input type="text" class="client_id" value="<?php echo $clients['client_id']; ?>" hidden>
-                                                <input type="text" class="client_branch_id" value="<?php echo $branches['client_branch_id'] ?>" hidden>
-                                                <div class="row emp-status" style="margin-top: -9px;">
-                                                    <div class="col-6 center_text emp-count-view-click" >
-                                                        <span style="font-size: large;color: white !important;" class="number_css" onclick="enrollment_list(this, 'emp_logged_in_view_click')"><?php echo isset($branches['emp_login']) ? $branches['emp_login'] : '0'; ?></span><br>
-                                                        <span class="text-nowrap " style="color: currentColor;font-size: 15px;">Logged-In</span>  
-                                                    </div>
-                                                    <div class="col-6 center_text emp-count-view-click" >
-                                                        <span style="font-size: large;color: white !important;" class="number_css" onclick="enrollment_list(this, 'emp_not_logged_in_view_click')"><?php echo isset($branches['emp_login']) ? count($branches['employees']) - $branches['emp_login'] : '0'; ?></span><br>
-                                                        <span class="text-nowrap" style="color: currentColor;font-size: 15px;margin-left: -13px;">Not Logged-In</span>  
-                                                    </div>
-                                                </div>
-                                                <div class="row emp-status" style="margin-top: -9px;">
-
-                                                    <div class="col-6 center_text emp-count-view-click" >
-                                                        <span style="font-size: large;color: white !important;" class="number_css" onclick="enrollment_list(this, 'emp_not_enrolled_view_click')"><?php echo isset($branches['emp_enroll']) ? count($branches['employees']) - $branches['emp_enroll'] : '0'; ?></span><br>
-                                                        <span class="text-nowrap" style="color: currentColor;font-size: 15px;">Draft</span>  
-                                                    </div>
-                                                    <div class="col-6 center_text emp-count-view-click" >
-                                                        <span style="font-size: large;color: white !important;" class="number_css" onclick="enrollment_list(this, 'emp_enrolled_view_click')"><?php echo isset($branches['emp_enroll']) ? $branches['emp_enroll'] : '0'; ?></span><br>
-                                                        <span class="text-nowrap" style="color: currentColor;font-size: 15px;">Enrolled</span>  
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <?php
-                                    $currentItem++;
                                 }
-                            }
+                            
                             if ($currentItem % $itemsPerSlide != 0) echo '</div>'; // Close the last carousel item
                             ?>
                         </div>
                         <a class="carousel-control-prev" href="#carouselExampleControls" role="button" data-slide="prev">
+                            <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 320 512" style="width: 28px;"><!--!Font Awesome Free 6.6.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.--><path d="M41.4 233.4c-12.5 12.5-12.5 32.8 0 45.3l160 160c12.5 12.5 32.8 12.5 45.3 0s12.5-32.8 0-45.3L109.3 256 246.6 118.6c12.5-12.5 12.5-32.8 0-45.3s-32.8-12.5-45.3 0l-160 160z"/></svg>                            <!-- <img src="<?php echo base_url()?>public/assets/images/left_arrow.png" alt="<"> -->
                             <!-- <span class="carousel-control-prev-icon" aria-hidden="true"></span> -->
-                            <!-- <span class="sr-only">Previous</span> -->
-                             <i class="fas fa-angle-left"></i>
+                            <span class="sr-only">Previous</span>
                         </a>
                         <a class="carousel-control-next" href="#carouselExampleControls" role="button" data-slide="next">
-                            <span class="carousel-control-next-icon" aria-hidden="true"></span>
+                        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 320 512" style="width: 28px;"><!--!Font Awesome Free 6.6.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.--><path d="M278.6 233.4c12.5 12.5 12.5 32.8 0 45.3l-160 160c-12.5 12.5-32.8 12.5-45.3 0s-12.5-32.8 0-45.3L210.7 256 73.4 118.6c-12.5-12.5-12.5-32.8 0-45.3s32.8-12.5 45.3 0l160 160z"/></svg>
+                            <!-- <span class="carousel-control-next-icon" aria-hidden="true"></span> -->
                             <span class="sr-only">Next</span>
                         </a>
                     </div>
@@ -257,6 +258,8 @@
 
 <script>
 $(document).ready(function() {
+    var lastDirection = ''; // Variable to keep track of the last direction
+
     // Scroll functionality
     $('.scroll-container').on('wheel', function(e) {
         if (e.originalEvent.deltaY < 0) {
@@ -300,9 +303,58 @@ $(document).ready(function() {
         }
     });
 
+    function navigateCarousel(direction) {
+        lastDirection = direction; // Track the direction
+        var $carousel = $('#carouselExampleControls');
+        var $activeItem = $carousel.find('.carousel-item.active');
 
+        if (direction === 'next') {
+            if ($activeItem.find('.scroll-item').length === 0) {
+                $carousel.carousel('next');
+                setTimeout(checkEmptyCarouselItem, 100); // Check after slide transition
+            } else {
+                $carousel.carousel('next');
+            }
+        } else if (direction === 'prev') {
+            if ($activeItem.find('.scroll-item').length === 0) {
+                $carousel.carousel('prev');
+                setTimeout(checkEmptyCarouselItem, 100); // Check after slide transition
+            } else {
+                $carousel.carousel('prev');
+            }
+        }
+    }
+
+    function checkEmptyCarouselItem() {
+        var $carousel = $('#carouselExampleControls');
+        var $activeItem = $carousel.find('.carousel-item.active');
+        
+        // Check if the active item is empty
+        if ($activeItem.find('.scroll-item').length === 0) {
+            // If empty, move to the next item
+            $carousel.carousel(lastDirection === 'next' ? 'next' : 'prev');
+        }
+    }
+
+    // Attach click handlers to carousel controls
+    $('.carousel-control-next').on('click', function() {
+        navigateCarousel('next');
+    });
+
+    $('.carousel-control-prev').on('click', function() {
+        navigateCarousel('prev');
+    });
+
+    // Check the carousel item when the slide changes
+    $('#carouselExampleControls').on('slid.bs.carousel', function() {
+        checkEmptyCarouselItem();
+    });
+
+    // Initial check for empty carousel items
+    checkEmptyCarouselItem();
 });
 
+
 function enrollment_list(current_element, type) {
     var clientId = $(current_element).closest('.carousel-slide-item').find('.client_id').val();
     var branchId = $(current_element).closest('.carousel-slide-item').find('.client_branch_id').val();
@@ -320,17 +372,162 @@ function enrollment_list(current_element, type) {
     window.location.href = `${url}?${params.toString()}`;
 }
 
+
 document.addEventListener('DOMContentLoaded', function() {
     // Array of predefined colors
-    var colors = ['yellowgreen', 'indianred', 'cadetblue', 'burlywood', 'darkolivegreen'];
+    var colors = ['#EBE8FF', '#FFECE5', '#FFE8F5'];
+    // '#6ADBE3'
+    // Array of predefined background images
+    var images = [
+        '/public/assets/images/mask_group.png',
+        '/public/assets/images/mask_group_orange.png',
+        '/public/assets/images/mask_group_pink.png',
+    ];
+    // '/public/assets/images/mask_group_blue.png'
 
-    // Counter to keep track of the current color index
-    var colorIndex = 0;
+    // Counter to keep track of the current index
+    var index = 0;
 
-    // Apply a color from the array to each card-header in sequence
+    // Base URL for the images
+    var baseUrl = '<?php echo base_url() ?>';
+
+    // Apply a color and image from the arrays to each card-header in sequence
     document.querySelectorAll('.add_card_background_random').forEach(function(header) {
-        header.style.backgroundColor = colors[colorIndex];
-        colorIndex = (colorIndex + 1) % colors.length; // Move to the next color, cycling back to 0 if needed
+        header.style.backgroundColor = colors[index % colors.length];
+        header.style.backgroundImage = `url(${baseUrl + images[index % images.length]})`;
+        header.style.backgroundSize = 'cover'; // Ensure the image covers the entire div
+        header.style.backgroundPosition = 'center'; // Center the image within the div
+        index++;
     });
 });
+
+$('#enrollment_status_open_close').change(function () {
+    if ($(this).val() == 'open') {
+        console.log("open");
+    } else {
+        console.log("close");
+
+        // Fetch the session data from PHP
+        var enrollment_data = '<?php echo $_SESSION['enrollment_data']; ?>';
+
+        try {
+            // Parse JSON data
+            var data = JSON.parse(enrollment_data);
+            console.log('Parsed data:', data);
+
+            // Ensure data is an object and client_branch_emp_list is treated as an array
+            if (data && typeof data === 'object') {
+                if (Array.isArray(data.client_branch_emp_list)) {
+                    console.log('client_branch_emp_list:', data.client_branch_emp_list);
+                    updateCarouselWithData(data);
+                } else {
+                    // Convert client_branch_emp_list to an array if it's not already
+                    if (data.client_branch_emp_list && typeof data.client_branch_emp_list === 'object') {
+                        // If it's an object but not an array, wrap it in an array
+                        data.client_branch_emp_list = [data.client_branch_emp_list];
+                    } else {
+                        // Handle the case where it's neither an array nor an object
+                        console.error('client_branch_emp_list is not an array or object:', data.client_branch_emp_list);
+                        data.client_branch_emp_list = []; // Ensure it is at least an empty array
+                    }
+
+                    console.log('Converted client_branch_emp_list:', data.client_branch_emp_list);
+                    updateCarouselWithData(data);
+                }
+            } else {
+                console.error('Parsed data is not an object:', data);
+            }
+        } catch (e) {
+            console.error('Error parsing JSON:', e);
+        }
+    }
+});
+
+function updateCarouselWithData(data) {
+    console.log(data);
+    var itemsPerSlide = 3; // Number of items per slide
+    var currentItem = 0; // Counter for items
+    var isActive = true; // Variable to set the first item as active
+    var carouselInner = $('.carousel-inner');
+
+    // Clear existing carousel items
+    carouselInner.empty();
+
+    // Check if data.client_branch_emp_list is valid
+    if (Array.isArray(data.client_branch_emp_list) && data.client_branch_emp_list.length > 0) {
+        console.log("Processing array...");
+        // Handle the case where data.client_branch_emp_list is an array
+        var items = data.client_branch_emp_list[0];
+        console.log("Items data:", items);
+
+        array.forEach(element => {
+            
+        });
+        // Validate if items is an array
+        if (Array.isArray(items)) {
+            for (var i = 0; i < items.length; i++) {
+                var item = items[i];
+                console.log("--------------");
+                console.log(item);
+
+                // Create a new carousel item every `itemsPerSlide` items
+                if (currentItem % itemsPerSlide === 0) {
+                    if (!isActive) carouselInner.append('</div>'); // Close previous carousel item
+                    carouselInner.append('<div class="carousel-item' + (isActive ? ' active' : '') + '">');
+                    isActive = false;
+                }
+
+                // Generate HTML for each item
+                var itemHtml = `
+                    <div class="col-xl-3 col-md-6 d-inline-block scroll-item carousel-slide-item" data-client="${item.client_name}" data-branch="${item.branch_name}">
+                        <div class="card" style="box-shadow: 0 4px 8px rgba(0, 0, 0, 0.2);">
+                            <div class="card-header add_card_background_random">
+                                <div class="row">
+                                    <div class="col-8 emp-count-view-click">
+                                        <div class="d-flex justify-content-between">
+                                            <div class="w-100">
+                                                <h3 class="my-2 py-1">
+                                                    <span data-plugin="counterup" style="font-size: 2.0rem;background-color: white;border-radius: 6px;height: 30;padding: 4px 11px 4px 11px;">${item.employee_count}</span>
+                                                </h3>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="row">
+                                    <div class="col-12 emp-count-view-click">
+                                        <div class="d-flex justify-content-between">
+                                            <div class="w-100">
+                                                <h5 class="mt-0 text-truncate" title="Branch Info" style="font-weight: 400 !important;font-size: 20px !important;line-height: 36px;color: black !important;">${item.client_name} - ${item.branch_name}</h5>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="card-body">
+                                <!-- Add more details based on the item data -->
+                            </div>
+                        </div>
+                    </div>
+                `;
+
+                carouselInner.find('.carousel-item.active').append(itemHtml);
+                currentItem++;
+            }
+
+            // Close the last carousel item if it was opened
+            if (currentItem % itemsPerSlide !== 0) carouselInner.append('</div>');
+        } else {
+            console.error('Expected an array for items, but got:', items);
+        }
+    } else if (typeof data.client_branch_emp_list === 'object') {
+        console.error('client_branch_emp_list is an object, not an array:', data.client_branch_emp_list);
+    } else {
+        console.error('client_branch_emp_list is missing or not in the expected format:', data.client_branch_emp_list);
+    }
+
+    // Initialize or refresh carousel if needed
+    $('#carouselExampleControls').carousel('dispose').carousel();
+}
+
+
 </script>
diff --git a/public/assets/images/left_arrow.png b/public/assets/images/left_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..804d62f6a82699a596c3c8755813c938b404e9a8
GIT binary patch
literal 383
zcmV-_0f7FAP)<h;3K|Lk000e1NJLTq001%o001%w1^@s69zTe&00009a7bBm000XU
z000XU0RWnu7ytkPF-b&0RCt{2*)LB*Q5eVZFS-%1m>eb|8`Vs(+a<^gkT*cJP<;aw
zeF1cWR;_N*pgAa77=aDuU~Jy);FP~-+~@puzU{`(cK@9FJP?b;Vh8Mwz{>#lz>I)9
z2AV&JS;&Y-2N5JB3$%VAf`jCM_8*9#ASb}{KZsx;r@-q9L=ccO;B5`UJmehcY=AHg
zDFD3<5oRGp;A0DfNk|D8Y>6-jxd6U)K$wD*f#Hq_GmuMQv<Jcj<O&$?iAWt%0VW<0
zsY0s2)Dt2#NDcV*h)4xe_Y8;-AKfb4T1htw4|~$J!s}P+gD7=GkvcTG$M{bLNb+OV
zSAfX;>bk>+t^#CH9(Y%P$PDP*k?D&9BpG5qDL`b_3Q~(6clGw509kaTund)2PrEgi
du3|CFGzXfw%azZPS+4*9002ovPDHLkV1hU|m-YYv

literal 0
HcmV?d00001

diff --git a/public/assets/images/mask_group.png b/public/assets/images/mask_group.png
new file mode 100644
index 0000000000000000000000000000000000000000..6496263160792c24062bf4d48785be06aff482f8
GIT binary patch
literal 8099
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

literal 0
HcmV?d00001

diff --git a/public/assets/images/mask_group_blue.png b/public/assets/images/mask_group_blue.png
new file mode 100644
index 0000000000000000000000000000000000000000..148fa6a95917ffcd7c52f8a1f15a620f033340cb
GIT binary patch
literal 6038
zcmb7|^;=ZY*2f2v&LN~rVCWKQB!_P4mXL;FDA7TL5tyMQL`eaqkuE`y?k;IzNXemw
zA>Z-7f53h2d7cw%oxS%tKkT(W-?gIkb-^Tr^n?HafJ8%G#Sj3%Q^P%1;6K1!{oH$=
z;cf&z>gIj`01?%{6AzG<L5FkV`5A(h0N;lhw{gZj7eyUK0H89S=*s>+06@#9p`vIU
zgtxb7?MG#r_V94?1i2Ov#Y7(0<-q;B?Y)jOZxKD@19H%0=oCg;Eb&Zdonei^<J;S>
zyxA|xG4GHo?79Mz4<uf^(^2E%xO2zDCSp>^<x=V+(>$G}p~7O~kK5Mbdv_8c3vP0o
z(2`3mAHuq!>Fj`W_wPfoTh(^KrIK6K$TmrWqwLAs%O<}~o5U~T-5Q=hV5hb&^qgDm
znYQxm16dr3CTrGB&HA%n?jRJvNVE`=(_QL@UmyuLxJWs4FTJagfphC>d{G1Q66;6l
zD0SAqj?r6?Kk>Z>|CXs<Gs>$YgtP!EE(LDNo0)!CPh#b(`7yU?Ku5&?Qk*_f#s-Lu
zCwP{?6&f3H*m-?=brSByjBGcvLxb+wT8{A&fI^0saqm_4=n2LUKLo3IV(!yszp!5a
zoSbNRGcr5Ng@^y6xuQbR;8W1i#+%n}H*1>p@nCy?Nt-9Ui&mOYbtW~2aa(eL2YQA@
z@K|2$&FY(Zft?*&5H<9Y5vV3yU6o5ab7>)^Hu=fo(=`L$*9dO!P*nZSH4rR_X!gdu
z5)W_3e?SY)dS1Ky_wO3i1>X4D-#)+KGu;;!E5>rcmOz0UPYjp~{dF%6J~Oxy6wi2P
zYiqE0+4j7(7EyO?u9Z@N5^`CvCR;V1ulw7hmu;q~7*UD_r3<;&T3kLCX9-O=jK*|D
zXNHbY1$?z6Gv1m`w89|U@yoY&^_>eYG~G96SYSNpgWGkzP&YD5ku`R&*!c<RQPdUN
z7|?@R6h2wOULLo@dt4wEw!FH0u%PgHa)_QM#^;MJ8{?0Z6<ZeBY|<=+Yvn6TA;R_{
z1!9gH%rp}?rPoc+rlEfNkfkVnIa3DoDv*jevgS-L<3+>=2+XzbXT#ASR09u;{<a`+
zi%O}u0eosJUEhWWy$`2QLxk)uj?|pF6a^xA;zk94YIKkCx8X}~s(ylzv<FkF>CVsO
zbA;Q~8=#xR5$fEmOaey)A$KGJgd8yuQO)t{Z{yf8EB)8O|8WujJl4YWpyX<ml#-oR
zeCSCd+VPdkt(aug-UUqsZR>LMHEQ-s;lA<8;26tEKs3pRo{6}6W*?DLuq*P~{LW`3
zd+o5ZyC;t$a-34+&`oc5kId2`oj^4wnOp{5`9^`XiHgUu?>Lwux{~)0ts9fGNjt{I
zCPr5<mw}np0|WZ|JqF*;FPSeGR_jMy%OJIMzpX^nG{u3@^Vj;kO0#59nd6dhh2913
z%HB*5=mdpOjH|YI*~Nql=OAQ$RYAt(Izf1m7&2Ab0aRN|B+9VoMf^>E|BL3$Vvsf8
zNA60a%Q23zJ@b<U(Eb@m8V#*p6mEWoTk6+|6Pu4!(-Tq1KTGcuk+fM2-}2r(90ICU
zqx#lhP<C+_6`~HBYBYRFpSeIR-zZq@TcB)&c2`op-Ahvos@z~tC;v=7NTL3|3ry!3
z!~htUv?Te^@p6E6Z$gKXoHhemt?+e8zsFohthq=$-y6RSLN2Nb$+2c6&YtcZ8gwTr
zrJt~}6E0GH5P#f1>joow;R4Di+%k*%nYfYOH~4p&%*)`;Ld$J`5p-GGXs|t?iajo&
z$dfY1`igDX;nezQ5~I=6Cqk7hDi+NB$)ipwpC>ZF`uhZy{OnZGxWCLAcH8OM|0|`s
zprP>eiLM~xAnWrjOaHS(Ux<N9@1)m!j`bU0W|>1$*WdJ8mh1OOv|rGjUbl>9oeO%G
zY&N4jr9Dh!>VE0aOI0LV0TtN-IQaU#Hsg%YLm^L8*Q>SM>Y^dtSG4+Q_+{cFRoiK|
ztYyP&|0cP5u8z{y*-hU%o0{7%3rA2>y(luzVCq!=N)eRD1DE8zVd!ZDUaXkbU!73<
zfEMA>Zf=v!vw1x19GK~WJEMbKua-toMjPMrXsCGWQ@TiB#WgBSI5Rg&3HC>_&z3LN
zoKLdgH&eA-v@^zCn2j32xq@UdEm>2kzNGFQ!pO;UKgyP2IgunIRAk8abyoC0X5F{N
z92Q*8V?JI8{T&h)jL{`TC3oo1)a;n%2KbFv4QzarT`x?X{yiV-?0G#~;Z%4S`DzE#
zanT~S&-dtl7D)Qz#0g)49@+Yn;tqM;xCS26&3x4HIhFm+bBz=$z546?=SR~i2NH?z
zzxY3=%aPO$^L>e~kg(M>D7!XWRO|&hMib?R)JXS~p&GQt8CYH#b)c8bv9B)FO{KO&
zaIq>u#WZS}x|{E}mdSFthy}cA>q}S}h}9$Ij|w>nX<>#_5bG}Oh&dv1Q_H<zmpv0j
z*5V|GEVq}(rBCF~L{7uXKQ)RfEKc~(ZGFG%{Oz~5fn#&WzHHA!*65Kyj3w~V!F(zV
zyBYaY_949T&*0O1N;ad%7ZCtMa`PcQP!13NX2|De92Rs_tc$Lw$i}|1?u}c7mzSNW
zzXMxuBJzZ3eq+BiB_*;MrM=_D!$+hIwdkRnxxQ-Fn=9a;U?S~>e6Nj;iyU-LXiwcx
z*IkGyAKKgS<%v<H30~C*j?HEX^iOC0Wxr5gyn4yKTroO?(x)TRj%*2{P`+SRAA13t
znc)j?-x2(-%mUUo>nH504%YmbRHDyG$2gx!t{{-Nw=YPFBa1N8hoEZ2mvvf+^an?G
z;g!Gm52AutjVYwdpWWmL)0maC@V<(#X6MT!7k?XrbI|qN_jy1_Ft*1NILo51jr-T0
zM?AO?va<7~BMA;`H}k<6=5TF1M_gv5ga<f161|^5jYE?p+c=`IUUDdko(GWtZYZa&
z^W{2Et+haXAr}u1pCh6~-0OnAw3ltI5x4n1%!ITU@@;`@&+coL?EdtavXx`bZ;mhX
z$td%kTd%B}E(TG=aBS<KCWq`^&=Kmmoc2UcmoP>F>oR;VGlyiz+Y1=lnpiSliF@Rz
zFYV60Xge-Q>S&Ow|5Tb-Urg2S$8`>~W_AHa;MEq1cu>VeU&i(nB}?qJ1Z50=2%Ju@
z&1ODMAvOkh$4G4P0yR__Ot#BX2E?c<wd7w-IRzPs32ub;NFJlE#;?&w$^M$)S7&dD
z$pw#|+(uh4OmZ&i1Q}fg%5N9S_xe<NDd$%aE23;-(07#T@T!>fR0^EGvz%4T5OR2b
z86PW(e==*0nPyON$Oz`(E}#h^@kS_c&Qvd9F9<%<cS?f0x<W7;>Zvp#_^NK*eANu*
z<%5z1o${hL_ChGe&d!%ydqbqV)=wgyz^%*&Om&|d{q*urfcws*3ds`nRCi~GfDqd5
zY5wtlN6xXyct*hZpO@w=0@$DYJ$;gn#o4|edH)`JrMuDe!JFKX(op%ok3n(gcWrY=
z8uSg+f-*9U#&;we$q)TN9M0*T^Y346B@QVhk%q@tF}h3#P^)3gg5oZ`Irh=V)h~@L
zq)o09YNou$gu6tLzFY*KS2N?Q1*`a1JBCYv(HA$u&eU^Lu07dbU-CnYdA{+x_8NPL
zl>5@m!^ezoZ;(Uz=U6h+{ShNXPyvdX_c7|pje(wjofu2p8k<p8h!yv&uU|Mfz75FG
z5Y6@?Er~r|%;q#RCqhy|YOl|d-H|t|jrLeFIKBNhwoQdp?0n5L&AYHu*Tse#e{(|C
zIE9|O=RRv%ay;e9oxa2IjAj{>Hsew!nAkPWh}RL(13F(KCNZKLm=YPjA=g;dJSMqz
z@J|_e)6e<7(lF$`;V8(_0X12dJ=<7m-?^E5KaLVsP&%p9wCc;u&DPxeB{@oGfqyA0
zc;G?=ZXh0woK5a0>>2;Q6`YDA|GRPh#A~cTeZ~bg-+sfGx9Tz}j_drwijqs7ts5C5
z9!Db$j><*7_QA|R<+biQ5azLKog^5#@}(#nGbNr3?|u`VP;KvXM#rUgKMXc5?4@4L
z-VM}^qGepazlvHTD%1F6<ce&~pK7F&71Fk!G~uL|o<Kb&v^M(A(Si=WUWufP1z^hD
zz6Uhh@T|vmjxdKxakeb)2$P2n8CMw_;+rsVihlqAe!n=@p9@eqs1P>oE_ep^M2A3I
zWde1t_7la&F;}$y(27Tpe$vim%z3qWR7etLqFCXLT06f}V2WQ&qXV&JE)D~Tao0I=
zw=v5f{7%u4iXu97TO%V>I`sD$9k=s2T9*C9h<Qu7k1k)!?7D?`(WqHA{5dzy6TesI
z@jJ0>yfLs&C%2pdD=;?7tNw5qDL_G02@iQe(^#9ny++js`<PL=@0JOQ*#pN<b1sj1
z-ERIAm9Y_uH6~jzQ{;WxmY!*TNb)=<eOTr0>Z*`v*BPh`-}>VnO<+?c)h4C?yzwkh
z&FC}L25h$?!x_A}l@gkM@1I6++jPx&3dCW$E7Z_7<x?~EiRNSLa{>d%hcPX|v9tPd
zE)2&up#5dI<(d(q1>0d|UF68ev$V~7@Z5-LbAy4N%R-LT(e31ux<$5^p;F!Yl9FR*
z{`jXBHXoJwiFcke>(V!`-b5oAPTK~3vM#bjM`2b?i{2E=gx>wRM5j}5jQ6Q!Cxz&f
zAA=wkg$C6(h}P(q)6*;QVZOjamuF+h9RdUjQchH74gcUG^H0_P{0@a)t^Y!k>DmnZ
zRUSk&|FBEbIjj52@GNK|1?y@fM|>@*NW&7go!>e+U|);<Q@{Ocj>HZ;who7r1oAge
z@0_h^<Y(vob{u=4OpZ8lD%+?{YkTC><n4toqJ)ZZDW;D!r0_sFw_cyszD`mvNng&A
z|9l}O3tOJ|e8Ld=#bpU7*v(>hGw%GaQlSBhx<b1*{8pCvhZnyPTm7i+o`;}+?P=Ut
zxDNik47un3`|jYwS8|_>mkux`5IU3fwaN=&I6GQyq;>H};OhfP%hRcz4k!t0{PBt&
zhC5Iqjjr2QbmHSs9s%k8Dp9QGLGJ)gPnb`CAj-3%3!EeVOvqK|#k5A$j-Bf%<=!<A
zim{X|)oJo_IylRa4uQzIdP>&_D^)_N5y`&z7B+;aie4>yZ7Rq&`}yI7qVw#h3i_5*
znI4H^_<QeUm8b}WFGxQ3OIs1M67j?&h&vK?Q9%CTJwhp;eC~eZI~?2`6xDEJ85MEh
zthPud{(Qt!kGHGOkHg@!MkKJqTp?Hs8SbED&tFl9eVup@{d5k8YLpfoT`*4!+<Bm&
zYgW--xrtRlpH9(OhER>&pW+WIPYfX8Q`Mr?;x(>R&=-z_ftG684ZL{UAmQ)+Ir7mZ
zK8{uEb$%(%Q8@dVG;yai$0?=g6JC8fJVJHe8sxf2Dn6Xz%iFI?O+4$yql$|5_jn4w
z=2%aHdnXH@;fxBHQj=LLZg1bg4f`Wml4%6OY9%YP42F3c99t|U5jXu<xxE@6Z+IGV
zw%6<3I9BaE0g=5uQhID^JL2NHc~-Mf#Ucx%Cl+lZuWAdHUhk8NzuR566nLxpCVT`l
z_SS!xYUx~ahoxR=eO1YIKg6{ENZ_FNqT>FaZ`-kOUvD16!>jEL+vK3}mk_?Ie8ZE%
ze>!fXXQi&bU~h0sm~MG4%b>)yZo6yB_RY8f)4W({fEvZIOQc0>>w#C1ChdONlhrOY
zffAp}a44be&tpCNJxjVKV%4LD)a(%Bk#1GddT#s2SEp^q+lTAj+|D8IFZCKSOR1~n
zgszW9Qu;%t)^i7kgS)N;7d5WYVY9pZF+|S4OIfWvf|>*3##El4F(YbvM>v8=BDK3p
zI`l$jvkb_G6|5R>y?YHFS!eWF7Z;9@2_Tw+uNadyN$%E`2-`Fq4}h;XFh|GwjDcE=
zqW=7{k=^BaJy5kki|o^e2H`;i)hjD)M0l+=om50Re@Gmqa2MJ}Zp?iRuHKtm$3=fz
z$RTLg>Eq_0pz2GckZK!lXIDq`;<e~GvBu~ayNMKp&FHmR>{Q2=FcGnCtHv;DLipZY
zd&0aw>8{RA;8xiLA~Sl$aW<oM&<?Ooo!rt+*y%aJgLYiq=GEVA^WGrmg}7GFwJRmC
zoL-OoUtt<3r3@CFQv_3;vpWk*5OJvH=BUfTs8SVj5^u0_Ej$@^g;La7vIkuH<&FyJ
zqbWmvF=!1KW%635AM;i(%`J8y$?rViRc}#m3K^{t{ffigw;|uaDnN0tLlwweHyxnH
zNcbY`8-*RP<~6#>A9}8N^~B)U3T}(5IzQ=R2-D7#12H2yNr=_WfYOcb-w7fARO?fw
zvG$iBce&WhCR_%1$QczvmMa5fyoXbx+9lOdYjc@!175icZA-y6U$qanp8%w9+s&YO
z(NNVnEBMgY83`?)j9_B#JLb4Bbb%-&TjoVXyh~Yn>F3YDW%HpME|R*U!%76FD7<b6
zkdY_Wg$#R2AxYOvX_s14Dx!o6eiXwOa8cq%I<kCT)-)K;WbB9?8!&xZ?P2)Z33lPE
zz}M3p`813lr(zo<Vbzj>9f&P8(`a9GD%-wU(B8a4mhNl1B|aOefJ_h5ghQ?b`23(<
z>Tu3RS|12xpn6%R;gmWA%dK6m(R8~$zdV?Ez|{1sF90ocsuj4et@6=y(K`c2Gv?0w
zEFySs{)8N3C5&58#ZfDPJTVpJ!%`hNdV<Z(6~9=_tde-%ax1$pWKDm_T8BO4YAB(C
z)l*OBTh^FFsAvJz-o6tf_?Tpr;UGzSf2AdUme3tZw7%Qb)H*${cd{oN8L-00@ht2!
zXGh+Y0*2B(7gP*6QOXKY%@w`_oOCu2pB25XkvKkLoP*;Mjee$8Zp)>d7d&8H1V!*K
zznmj!a;(@7{`ETgAK|{n4pHY1(>FKSXHPP~rK0z(@Q;H|tIBSEi|%n>a7)HqnmoUn
zcU+fhym(KKTfnZgUJm`XtZ;Ggc^Vrb2jCZTzAz*ect-?RpVV_Nmumu)`vv3Id94P4
zYC0c+&K^>Kl6d;LUrCKX-E}Hkp2Kxd*z~es3R}OWvtmD*xO|w$S+T>}$9&^VDlFY1
zgK7J5VvsAA?^he2)^5h@I+pcHb!76;cJe7_VDov3=s_?(HeaCaPgT(Bu%%T5DCSD}
zbnYis=iDEWRn(?q`z@e(QaS%i!WH-F^P;|aTt%6aF?(Yo{rly@-(rp<yo6t8G81YF
z+OU0zy#x>s7nKG>9Tiv(CmxPYPbkI~4(uze>4KF(xK5oY^6>b>ud}Aaf)+i=S$^6a
z5D#%Tu5(~Q^;oEzDs=s)o1h;wz`Cb*F@gGL!_rRVXC!FT4f+G5{7{e5%N$cHN3nFz
z{LfX!d1@9$Y_FbKTVU|UbCiPC)!_1aCABtf#_d0q|0vse#%dE$0c>#RK_X;jf6l>*
z)ukpk{BlNhk|%bX!7MnQ85WPS?MxGc^1FyA!q6zUDSAHzS&v(Ba5Ap@fbkLWAGL*q
z5!)1L($(qm44fJlIbM8MEw_=a?%oA=kR!x38@#Pio0n79bp?=toyq(Mq?zCu9@=h!
z{6`T~CaCf>?&O_MmJj`#m^wH6=wCmwFgVjw1+cP{!6_tGY+M0v<#3z=oZ%u2@cS;D
z0$@i5RQqpE^4wiOn3GgkJ3cGtxJ5HZV%~z%!vPXPLXNiyU&hD}WM4FTo=7qQa4WHK
z39?dZLkI2upLGeq1S@0(SI*+^x412cFB)r=v{nf9=>?|Ikdfl13x{6YS4H$PMry|r
zLJuFPw_(3Mp2;lDLZ&jOWM$E1=VeI0ISNsEPfSC|@eCn&1NDw$bRor|6Iai&I>{)H
wmR8m;P21ZczE)+X;(xr0>xKU>2c6U{*-7}M)li8D@xOT*s=6xQmF(XAA2I@$zW@LL

literal 0
HcmV?d00001

diff --git a/public/assets/images/mask_group_orange.png b/public/assets/images/mask_group_orange.png
new file mode 100644
index 0000000000000000000000000000000000000000..bc747bad437d36fe07b7d58d6777218ad85f26f2
GIT binary patch
literal 7686
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

literal 0
HcmV?d00001

diff --git a/public/assets/images/mask_group_pink.png b/public/assets/images/mask_group_pink.png
new file mode 100644
index 0000000000000000000000000000000000000000..209691b2a4242382f265c7e25573bd26472aaafe
GIT binary patch
literal 7860
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
XHq@)4+(hpt|Fxv~R8Or|#Ww0cf4eOR

literal 0
HcmV?d00001

diff --git a/public/assets/images/right_arrow.png b/public/assets/images/right_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..b5d072da5e99513b6ea775c066a23d54bdddbdbc
GIT binary patch
literal 362
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2nC-&H|6fVg?3oVGw3ym^DX&fq_xR
z)5S5QV$R!}wt6ms62~8^J1r96<-K@uVn(Ls7cqxq=CB2mZZL2!STMhiYipU%(ykRI
z#;q-tsX}}EC(QhL{;%rt{r*Mv=WO+Tf#CidACFdUAI=7mbq2Z&K|2oiFnBC%jbxnQ
zBwfs;&>DS)yFujL1`URw7YUIJOA7i$87CZKzQ*Ff<$ptfLDMEVm|@9>rd*(M@!de>
za^HY5>u-oNXzqDvz-Scl-omSaCrti0=Y(G|>6#NJ7q)*9&RctMcJ>?jZ;X!;W_0Xt
zaH$cf=8T@ASJo5o^>pr^X@aZOJ|2H1_}XpDuY(T{uM%9R_S9lUvubicZDGo;1fNw;
zoZplkidZ<+;KfcqiM_FEJkIBZk6m7VcwfUZwg1=I{p`>DViZ&G00tg|r>mdKI;Vst
E0D!KFxBvhE

literal 0
HcmV?d00001


From 0e03faea09f67620f1e83630e9e9f518735d80d6 Mon Sep 17 00:00:00 2001
From: "venkatesh.r" <venkatesh.r@venbainfotech.com>
Date: Mon, 29 Jul 2024 18:04:00 +0530
Subject: [PATCH 04/21] FIX_ADDITIONAL_RELIONSHIP_JSON : RV

---
 app/Controllers/ClientController.php | 34 ++++++-------
 app/Views/client_policy.php          | 36 ++++++++++---
 app/Views/policy_grid.php            | 75 +++++++++++++++++-----------
 3 files changed, 91 insertions(+), 54 deletions(-)

diff --git a/app/Controllers/ClientController.php b/app/Controllers/ClientController.php
index e113a8c0..0a21c731 100644
--- a/app/Controllers/ClientController.php
+++ b/app/Controllers/ClientController.php
@@ -1021,28 +1021,28 @@ class ClientController extends AdminController
             $policy_grid_id = $this->request->getPost('policy_grid_id');
             $rack_rate_name = $this->request->getPost('rack_rate_name');
 
-            $self               = $this->request->getPost('self') ? 1 : 0;
-            $spouse             = $this->request->getPost('spouse');
-            $childrens          = $this->request->getPost('childrens');
-            $parents            = $this->request->getPost('parents');
-            $parents_in_law     = $this->request->getPost('parents-in-law');
+            $relation_data = [
+                'self'          => $this->request->getPost('self'),
+                'spouse'        => $this->request->getPost('spouse'),
+                'childrens'     => $this->request->getPost('childrens'),
+                'parents'       => $this->request->getPost('parents'),
+                'parents-in-law'=> $this->request->getPost('parents-in-law'),
+            ];
 
-            if($policy_grid_id == 1 || $policy_grid_id == 2){
-                $self               =  1;
-                $spouse             = 'NA';
-                $childrens          = 'NA';
-                $parents            = 'NA';
-                $parents_in_law     = 'NA';    
+            if ($policy_grid_id == 1 || $policy_grid_id == 2 || $policy_grid_id == 6 || $policy_grid_id == 7) {
+                $relation_data = [
+                    'self'          => 1,
+                    'spouse'        => 'NA',
+                    'childrens'     => 'NA',
+                    'parents'       => 'NA',
+                    'parents-in-law'=> 'NA',
+                ];
             }
 
-            $relation_data['self']               = $self;
-            $relation_data['spouse']             = $spouse;
-            $relation_data['childrens']          = $childrens;
-            $relation_data['parents']            = $parents;
-            $relation_data['parents-in-law']     = $parents_in_law;
-
+            // Convert to JSON
             $jsonDataForRelation = json_encode($relation_data);
 
+
             $si_or_bp = $this->request->getPost('si_or_bp');
             $basic_multiplier = str_replace(',', '', $this->request->getPost('basic_multiplier'));
             $premium_multiplier = str_replace(',', '', $this->request->getPost('premium_multiplier'));
diff --git a/app/Views/client_policy.php b/app/Views/client_policy.php
index 86baa139..1ca428b1 100644
--- a/app/Views/client_policy.php
+++ b/app/Views/client_policy.php
@@ -488,6 +488,9 @@
 
                 $('#policy_table tr').remove();
                 var policyTable = '';
+                var role = res.data.role
+                delete res.data.role;
+
                 $.each(res.data, function(index, item) {
 
                     var patternGMC = /gmc/i; // Case insensitive pattern for 'gmc'
@@ -543,9 +546,9 @@
                         <tr>
                             <td>${item.insurer_short} - ${item.insurer_branch_name}</td>
                             <td>${policy_name_data}</td>
-                            <td>${item.branch_name}</td>
+                            <td>${item.branch_name ? item.branch_name : ' - '}</td>
                             <td>${tpaValue}</td>
-                            <td>${rearrangeDateFormat(item.policy_start_date)} /   ${rearrangeDateFormat(item.policy_end_date)}</td>
+                            <td>${(item.policy_start_date)} / ${(item.policy_end_date)}</td>
                             <td style="text-align: center;">${(enrollmentStatus)}</td>
                             <td>${checkDateStatus(item.policy_end_date, 1)}</td>
                             <td>
@@ -554,8 +557,15 @@
                                     <div class="dropdown-menu dropdown-menu-right">
                                         <a href="#" data-id="${item.id}" id="${item.policy_id}" class="dropdown-item btnPolicyEdit"><i class="mdi mdi-lead-pencil mr-2 text-muted font-18 vertical-middle"></i>Edit</a>
                                         <a href="#" data-id="${item.id}" id="${search_term}" data-typeid="${item.policy_type_id}" class="dropdown-item btnPolicyMaster" data-toggle="modal"><i class="mdi mdi-wrench mr-2 text-muted font-18 vertical-middle"></i>Terms</a>
-                                        <a href="#" data-id="${item.id}" id="${search_term}" data-typeid="${item.policy_type_id}"class="dropdown-item btnPolicyModel"  data-toggle="modal" data-target="#bs-example-modal-lg"><i class="mdi mdi-book-open mr-2 text-muted font-18 vertical-middle"></i>Rack Rate</a>              
-                                        <a href="#" data-id="${item.id}" id="${search_term}" data-typeid="${item.policy_type_id}" class="dropdown-item" onclick = "removepolicy(this)"><i class="fa fa-trash mr-2 text-muted font-18 vertical-middle"></i>Delete</a>                                                                         
+                                        <a href="#" data-id="${item.id}" id="${search_term}" data-typeid="${item.policy_type_id}" class="dropdown-item btnPolicyModel"  data-toggle="modal" data-target="#bs-example-modal-lg"><i class="mdi mdi-book-open mr-2 text-muted font-18 vertical-middle"></i>Rack Rate</a>`;
+
+                    // Conditionally render the delete option based on the role
+                    if (role !== 3 && role !== 4) {
+                        policyTable += `
+                                        <a href="#" data-id="${item.id}" id="${search_term}" data-typeid="${item.policy_type_id}" class="dropdown-item" onclick="removepolicy(this)"><i class="fa fa-trash mr-2 text-muted font-18 vertical-middle"></i>Delete</a>`;
+                    }
+
+                    policyTable += `              
                                     </div>
                                 </div>
                             </td>
@@ -990,16 +1000,26 @@
 
     //for date convert to indian formate like this 'yyyy-mm-dd' to this 'dd-mm-yyyy'
     function rearrangeDateFormat(inputDate) {
-
-        if (inputDate !== null) {
+        console.log('inputDate', inputDate)
+        // Check if inputDate is a string and not empty
+        if (typeof inputDate === 'string' && inputDate.trim() !== '') {
             var dateComponents = inputDate.split("-");
-            var rearrangedDate = dateComponents[2] + "-" + dateComponents[1] + "-" + dateComponents[0];
-            return rearrangedDate;
+            
+            // Check if dateComponents has the expected number of parts
+            if (dateComponents.length === 3) {
+                var rearrangedDate = dateComponents[2] + "-" + dateComponents[1] + "-" + dateComponents[0];
+                return rearrangedDate;
+            } else {
+                // Handle unexpected date format
+                return '00-00-0000';
+            }
         } else {
+            // Handle the case where inputDate is not a valid string
             return '00-00-0000';
         }
     }
 
+
     function checkDateStatus(inputDate, bg = false) {
 
         var givenDate = new Date(inputDate);
diff --git a/app/Views/policy_grid.php b/app/Views/policy_grid.php
index 0110412c..1c9a96e7 100644
--- a/app/Views/policy_grid.php
+++ b/app/Views/policy_grid.php
@@ -1246,8 +1246,13 @@ function addGridHTML(event = false, data = false, ui_type = false, si_or_bp = fa
 
     console.log('grid_container step 4', grid_container)
     // console.log('grid_html', grid_html)
-    $(grid_container).empty();
+    if(data == false){
+        $(grid_container).empty();
+    }
     grid_container.insertAdjacentHTML('beforeend', grid_html);
+    console.log('grid_container step 5');
+    console.log('grid_container step 6', grid_container);
+
 
     if (dataIdValue == '1') {
         $('#gpa_sum_si').trigger('keyup');
@@ -1283,24 +1288,24 @@ var Count = 1
 function appendGridtHtml(ui_type = false, secondary = false, data = false) 
 {
     console.log('appendGridtHtml function data', data);    
-    console.log('appendGridtHtml ui_type', ui_type);
-
-    console.log('secondary', secondary)
-    console.log('typeof secondary', typeof secondary)
+    console.log('appendGridtHtml function ui_type', ui_type);
+    console.log('appendGridtHtml function secondary', secondary);
+    console.log('appendGridtHtml function typeof secondary', typeof secondary)
 
     var html = '';
     Count++;
 
     var container = document.getElementById('grid_content_input');
-    // console.log('container', container);
+    console.log('appendGridtHtml function container step 1', container);
 
     if (secondary != false && secondary != 'false' && secondary != null && secondary != 'null') {
         container_id = 'grid_content_input_for_additional_' + secondary;
-        console.log('container', container_id);
         container = document.getElementById(container_id);
-        console.log('container', container);
+        console.log('appendGridtHtml function container step 2', container);
     }
 
+    console.log('appendGridtHtml function container step 3', container);
+
     if (ui_type == '1') {
 
         // console.log('step 1')
@@ -1444,7 +1449,7 @@ function appendGridtHtml(ui_type = false, secondary = false, data = false)
                 </div>                           
                 <div class="form-group col-md-2">
                     <label for="mobile">To Age<span class="text-danger">*</span></label>
-                    <input value="${data !== false && data !== undefined && data !== '' ? data.age_from : ''}" type="text" class="form-control" placeholder="Age" name="4_age_to[]" id="4_age_to" onkeypress = "return onlyNumbers(event)" required>
+                    <input value="${data !== false && data !== undefined && data !== '' ? data.age_to : ''}" type="text" class="form-control" placeholder="Age" name="4_age_to[]" id="4_age_to" onkeypress = "return onlyNumbers(event)" required>
                 </div>
                 <div class="form-group col-md-3">
                     <label for="mobile">Premium<span class="text-danger">*</span></label>
@@ -1743,8 +1748,9 @@ function appendGridtHtml(ui_type = false, secondary = false, data = false)
         </div>`;
     }
 
-    console.log('container', container);
+    console.log('appendGridtHtml function container step 4', container);
     container.insertAdjacentHTML('beforeend', html);
+    console.log('appendGridtHtml function container step 5', container);
 
     // $('#gmc_add_more').hide();
     // $('#gmc_add_more2').hide();
@@ -1840,11 +1846,17 @@ function checkDuplicate(unique_id = null)
 
         // Extract values from input arrays
         siInputs.each(function() {
-            siValues.push($(this).val());
+            var value = $(this).val();  
+            var cleanedValue = value.replace(/,/g, '');
+            var numericValue = parseFloat(cleanedValue);
+            siValues.push(numericValue);
         });
 
         premiumInputs.each(function() {
-            premiumValues.push($(this).val());
+            var value = $(this).val();  
+            var cleanedValue = value.replace(/,/g, '');
+            var numericValue = parseFloat(cleanedValue);
+            premiumValues.push(numericValue);
         });
 
         for (var i = 0; i < siValues.length; i++) {
@@ -2623,7 +2635,7 @@ function createCheckboxes(obj, additional_relationship = [], unique_id = null, p
                 <label>Choose applicable family members</label>`;
 
     if (obj['self'] > 0) {
-        let selfValue = additional_relationship['self'] || 'NA';
+        let selfValue = additional_relationship['self'] || '1';
         console.log('selfValue', selfValue);
 
         html += `
@@ -2649,7 +2661,7 @@ function createCheckboxes(obj, additional_relationship = [], unique_id = null, p
     }
 
     if (obj['spouse'] > 0) {
-        let spouseValue = additional_relationship['spouse'] || 'NA';
+        let spouseValue = additional_relationship['spouse'] || 'any';
 
         html += `
                  <div class="radio-group">
@@ -2675,7 +2687,7 @@ function createCheckboxes(obj, additional_relationship = [], unique_id = null, p
 
     if (obj['childrens'] > 0) {
 
-        let childrensValue = additional_relationship['childrens'] || 'NA';
+        let childrensValue = additional_relationship['childrens'] || 'any';
 
         html += `
                 <div class="radio-group">
@@ -2712,7 +2724,7 @@ function createCheckboxes(obj, additional_relationship = [], unique_id = null, p
     }
 
     if (obj['parents'] > 0) {
-        let parentsValue = additional_relationship['parents'] || 'NA';
+        let parentsValue = additional_relationship['parents'] || 'any';
 
         html += `
                 <div class="radio-group">
@@ -2741,7 +2753,7 @@ function createCheckboxes(obj, additional_relationship = [], unique_id = null, p
     }
 
     if (obj['parents-in-law'] > 0) {
-        let parentsInLawValue = additional_relationship['parents-in-law'] || 'NA';
+        let parentsInLawValue = additional_relationship['parents-in-law'] || 'any';
         html += `
                 <div class="radio-group">
                     <label class="col-lg-1">Parents-in-law:</label>
@@ -2960,8 +2972,8 @@ function checkPolicyTermsSI(unique_id = null)
 function appendNewTab(tabNameData = null, data = null)
 {
    console.log('appendNewTab function called');
-   console.log('tabNameData', tabNameData);
-   console.log('data', data);
+   console.log('appendNewTab function tabNameData', tabNameData);
+   console.log('appendNewTab function data', data);
 
    let tabName = tabNameData;
 
@@ -3072,23 +3084,28 @@ function appendNewTab(tabNameData = null, data = null)
         var policy_grid_id = null;
         var additional_relationship = [];
         var premium_type = null;
-        if(data){
+        var si_or_bp_value = ''
+        if(data.length > 0){
+
+            console.log('appendNewTab function first index data', data[0])
+            console.log('appendNewTab function first index data[0].policy_grid_id', data[0].policy_grid_id)
 
-            addGridHTML(false, data[0], data[0].policy_grid_id, false, tabId);
-            policy_grid_id = data[0].policy_grid_id
-            additional_relationship = data[0].additional_relationship;
-            premium_type = data[0].premium_type;
 
-            // data.shift();
-            // if(data.length > 1){
                 $.each(data, function(index, item) {
-                    // console.log(item)
+
+                    console.log('appendNewTab function index', index)
                     policy_grid_id = item.policy_grid_id
                     additional_relationship = item.additional_relationship;
                     premium_type = item.premium_type;
+
+                    // if(index == 0){
+                    //     addGridHTML(false, item, item.policy_grid_id, si_or_bp_value, tabId);
+                    // }else{
+                    //     appendGridtHtml(item.policy_grid_id, tabId, item);
+                    // }
+
                     appendGridtHtml(item.policy_grid_id, tabId, item);
                 });
-            // }
         }
 
         appendGridData(rack_rate_array, policy_grid_id, tabId);
@@ -3184,7 +3201,7 @@ function removeTab(input, tabID, tabName)
 
    Swal.fire({
             title: "Are you sure?",
-            text: "You want to remove this Rack Rate.",
+            text: "Do you want to remove this Rack Rate.",
             icon: "info",
             showCancelButton: true,
             confirmButtonColor: "#3085d6",

From 26f27ccc47603df93c3fbec72fe80e8bc7a218ce Mon Sep 17 00:00:00 2001
From: "venkatesh.r" <venkatesh.r@venbainfotech.com>
Date: Mon, 29 Jul 2024 18:12:05 +0530
Subject: [PATCH 05/21] FIX_RACK_RATE : RV

---
 app/Views/policy_grid.php | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/app/Views/policy_grid.php b/app/Views/policy_grid.php
index 1c9a96e7..b050ff05 100644
--- a/app/Views/policy_grid.php
+++ b/app/Views/policy_grid.php
@@ -3085,27 +3085,25 @@ function appendNewTab(tabNameData = null, data = null)
         var additional_relationship = [];
         var premium_type = null;
         var si_or_bp_value = ''
-        if(data.length > 0){
+        if(data){
 
             console.log('appendNewTab function first index data', data[0])
             console.log('appendNewTab function first index data[0].policy_grid_id', data[0].policy_grid_id)
+            $.each(data, function(index, item) {
 
+                console.log('appendNewTab function index', index)
+                policy_grid_id = item.policy_grid_id
+                additional_relationship = item.additional_relationship;
+                premium_type = item.premium_type;
 
-                $.each(data, function(index, item) {
+                // if(index == 0){
+                //     addGridHTML(false, item, item.policy_grid_id, si_or_bp_value, tabId);
+                // }else{
+                //     appendGridtHtml(item.policy_grid_id, tabId, item);
+                // }
 
-                    console.log('appendNewTab function index', index)
-                    policy_grid_id = item.policy_grid_id
-                    additional_relationship = item.additional_relationship;
-                    premium_type = item.premium_type;
-
-                    // if(index == 0){
-                    //     addGridHTML(false, item, item.policy_grid_id, si_or_bp_value, tabId);
-                    // }else{
-                    //     appendGridtHtml(item.policy_grid_id, tabId, item);
-                    // }
-
-                    appendGridtHtml(item.policy_grid_id, tabId, item);
-                });
+                appendGridtHtml(item.policy_grid_id, tabId, item);
+            });
         }
 
         appendGridData(rack_rate_array, policy_grid_id, tabId);

From d36b0b05ed8207d5fadfada86f4bbc9a529a3bcc Mon Sep 17 00:00:00 2001
From: "venkatesh.r" <venkatesh.r@venbainfotech.com>
Date: Tue, 30 Jul 2024 08:11:56 +0530
Subject: [PATCH 06/21] FIX_RACK_RATE_ISSUE : RV

---
 app/Views/policy_grid.php | 125 ++++++++++++++++++++++++++------------
 1 file changed, 87 insertions(+), 38 deletions(-)

diff --git a/app/Views/policy_grid.php b/app/Views/policy_grid.php
index b050ff05..342f9261 100644
--- a/app/Views/policy_grid.php
+++ b/app/Views/policy_grid.php
@@ -368,38 +368,9 @@ $('body').on('click', '.btnPolicyModel', function()
                 var premium_type_for_primary_rr = [];
                 var first = 0;
 
-                premiumData = [];
+                var premiumData = groupedData.Primary ?? [];
+                console.log('----- premiumData for primary rack rate -----', premiumData);
 
-                try {
-                    if (policy_type_string == 'GMC') {
-                        $.each(groupedData, function(index, item) {
-                            if (index !== 'Primary') {
-                                appendNewTab(index, item);
-                            } else {
-                                premiumData = item;
-                            }
-                        });
-                    } else {
-                        $.each(groupedData, function(index, item) {
-                            if (index == 'Primary') {
-                                premiumData = item;
-                            }
-                        });
-                    }
-                } catch (error) {
-                    console.error('An error occurred:', error);
-                    console.error('Error Name:', error.name);
-                    console.error('Error Message:', error.message);
-                    console.error('Error Stack:', error.stack);
-
-                    // Optional: handle the error in a user-friendly way
-                    console.error('An error occurred while processing the data. Please try again.');
-                }
-
-
-                console.log('premiumData for primary rack rate', premiumData);
-
-                
                 if (premiumData.length > 0 && premiumData != 'undefined') {
                     $.each(premiumData, function(index, item) {
 
@@ -416,6 +387,7 @@ $('body').on('click', '.btnPolicyModel', function()
                         }
                     });
                 }
+
                 console.log('premiumData for primary rack rate', premiumData);
                 console.log('additional_relationship for primary rack rate', additional_relationship);
 
@@ -465,6 +437,24 @@ $('body').on('click', '.btnPolicyModel', function()
                     console.log("res.premiumData is undefined, null, or empty.");
                 }
 
+                try {
+                    if (policy_type_string == 'GMC') {
+                        $.each(groupedData, function(index, item) {
+                            if (index !== 'Primary') {
+                                appendNewTab(index, item);
+                            }
+                        });
+                    } 
+                } catch (error) {
+                    console.error('An error occurred:', error);
+                    console.error('Error Name:', error.name);
+                    console.error('Error Message:', error.message);
+                    console.error('Error Stack:', error.stack);
+
+                    // Optional: handle the error in a user-friendly way
+                    console.error('An error occurred while processing the data. Please try again.');
+                }
+
                 $('#bs-example-modal-lg').modal('show');
                 $("#gpa_si").trigger("keyup");
                 $("#gpa_si_9").trigger("keyup");
@@ -3089,19 +3079,24 @@ function appendNewTab(tabNameData = null, data = null)
 
             console.log('appendNewTab function first index data', data[0])
             console.log('appendNewTab function first index data[0].policy_grid_id', data[0].policy_grid_id)
+
+            if (data[0].policy_grid_id == 4 || data[0].policy_grid_id == 6) {
+            
+                appendFourthAndSixthRackRate(data[0], tabId);
+                policy_grid_id = data[0].policy_grid_id
+                additional_relationship = data[0].additional_relationship;
+                premium_type = data[0].premium_type;
+
+                data.shift();
+            }
+
             $.each(data, function(index, item) {
 
                 console.log('appendNewTab function index', index)
                 policy_grid_id = item.policy_grid_id
                 additional_relationship = item.additional_relationship;
                 premium_type = item.premium_type;
-
-                // if(index == 0){
-                //     addGridHTML(false, item, item.policy_grid_id, si_or_bp_value, tabId);
-                // }else{
-                //     appendGridtHtml(item.policy_grid_id, tabId, item);
-                // }
-
+                
                 appendGridtHtml(item.policy_grid_id, tabId, item);
             });
         }
@@ -3409,4 +3404,58 @@ function checkFamiliFloatersKeysDuplicate(rarc_rate_json_array, formObject)
 
 }
 
+
+function appendFourthAndSixthRackRate(data = null, uniqueId = null)
+{   
+    console.log('appendFourthAndSixthRackRate function called');
+    console.log('appendFourthAndSixthRackRate function uniqueId', uniqueId);
+    console.log('appendFourthAndSixthRackRate function data', data);
+
+
+    grid_html = `
+        <div class="form-row" id="grid_4"> 
+            <div class="form-group col-md-4">
+                <label for="mobile">Sum Insured<span class="text-danger">*</span></label>
+                <input value="${data !== false && data !== undefined && data !== '' ? data.si : ''}" type="text" class="form-control" placeholder="Enter Sum Insured" name="4_si" id="4_si" onkeypress = "return onlyNumbers(event)"  onchange="formatNumber(this)" required>
+                <div id='sum_insured_number_word' class="text-danger-2" ></div>
+            </div>                    
+            <div class="form-row">
+                <div class="form-group col-md-4 unitDiv">
+                    <label for="mobile">Units<span class="text-danger">*</span></label>
+                    <input value="${data !== false && data !== undefined && data !== '' ? data.unit : ''}" type="text" class="form-control" placeholder="Enter Unit" name="4_unit[]" id="4_unit" required>
+                </div>           
+                <div class="form-group col-md-2">
+                    <label for="mobile">From Age<span class="text-danger">*</span></label>
+                    <input value="${data !== false && data !== undefined && data !== '' ? data.age_from : ''}" type="text" class="form-control" placeholder="Age" name="4_age_from[]" id="4_age_from" onkeypress = "return onlyNumbers(event)" required>
+                </div>                           
+                <div class="form-group col-md-2">
+                    <label for="mobile">To Age<span class="text-danger">*</span></label>
+                    <input value="${data !== false && data !== undefined && data !== '' ? data.age_to : ''}" type="text" class="form-control" placeholder="Age" name="4_age_to[]" id="4_age_to" onkeypress = "return onlyNumbers(event)" required>
+                </div>
+                <div class="form-group col-md-3">
+                    <label for="mobile">Premium<span class="text-danger">*</span></label>
+                    <input value="${data !== false && data !== undefined && data !== '' ? data.premium : ''}" type="text" class="form-control" placeholder="Enter Premium" name="4_premium[]" id="4_premium" onkeypress = "return onlyNumbers(event)" onchange="formatNumber(this)"  required>
+                    <div id='premium_number_word' class="text-danger-2" ></div>
+                </div>
+                <div class="form-group">
+                    <button style="margin-top: 44px;" type="button" class="btn btn-danger" id="gmc_remove" onclick="removebutton(0,4)">x</button>
+                    <button style="margin-top: 44px;" type="button" class="btn btn-primary" id="gmc_add_more" onclick="appendGridtHtml(4, '${uniqueId}')">+</button>
+                </div>
+            </div>
+        </div>`;
+
+    grid_container_id = 'grid_content_input_for_additional_' + uniqueId;
+    console.log('appendFourthAndSixthRackRate function', grid_container_id);
+    grid_container = document.getElementById(grid_container_id);
+    console.log('appendFourthAndSixthRackRate function', grid_container);
+    grid_container.insertAdjacentHTML('beforeend', grid_html);
+
+    if(unit_length == 1 || unit_length == 0){
+        $('.unitDiv').hide();
+        $('.unitDiv').find('input').removeAttr('required');
+    }else{
+        $('.unitDiv').show();
+        $('.unitDiv').find('input').attr('required', true);
+    }
+}
 </script>
\ No newline at end of file

From 495dff7b004284da439145484a5099136357e3fc Mon Sep 17 00:00:00 2001
From: aadhavan valli <aadhavanvalli@gmail.com>
Date: Tue, 30 Jul 2024 08:28:17 +0530
Subject: [PATCH 07/21] CHANGE_DASHBOARD_CONROLLED_MERGE_TIME_ERROR : AADHAVAN

---
 app/Controllers/DashboardController.php | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/app/Controllers/DashboardController.php b/app/Controllers/DashboardController.php
index b1ed384e..220c7468 100644
--- a/app/Controllers/DashboardController.php
+++ b/app/Controllers/DashboardController.php
@@ -57,15 +57,6 @@ class DashboardController extends AdminController
         $pendingActionsController = new PendingActionsController;
         $pendingActionsData = $pendingActionsController->getPendingActionsForDashBoard();
 
-        $results = $this->clientModel->select('clients.id as client_id, clients.client_name, clients.short_name,
-                                            client_branch.id as client_branch_id, client_branch.branch_name, 
-                                            client_branch.branch_code, employees.id as employee_id, 
-                                            employees.name as employee_name, employees.relationship,
-                                            employees.emp_code, employees.emp_status, auth_history.user_type')
-            ->join('client_branch', 'clients.id = client_branch.client_id', 'left')
-            ->join('employees', 'client_branch.id = employees.client_branch_id', 'left')
-            ->join('auth_history', 'employees.id = auth_history.user_id AND "employee" = auth_history.user_type', 'left')
-            ->findAll();
 
         $groupedData = [];
     

From a8f0a347628cc60efeb0ee60a4a2ead15b3040c7 Mon Sep 17 00:00:00 2001
From: aadhavan valli <aadhavanvalli@gmail.com>
Date: Tue, 30 Jul 2024 11:20:35 +0530
Subject: [PATCH 08/21] CHANGE_DASHBOARD_COMPLETE_PUSH : AADHAVAN

---
 app/Views/enrollment_dash.php | 422 +++++++++++++++++++++++-----------
 1 file changed, 291 insertions(+), 131 deletions(-)

diff --git a/app/Views/enrollment_dash.php b/app/Views/enrollment_dash.php
index f0c1fb79..1a5ba2d9 100644
--- a/app/Views/enrollment_dash.php
+++ b/app/Views/enrollment_dash.php
@@ -9,6 +9,8 @@
 
 <!-- Bootstrap JS (ensure this is included) -->
 <script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.6.0/js/bootstrap.min.js"></script>
+<!-- Remove one of these -->
+
 
 <style>
     .carousel-control-next {
@@ -339,10 +341,20 @@ $(document).ready(function() {
     // Attach click handlers to carousel controls
     $('.carousel-control-next').on('click', function() {
         navigateCarousel('next');
+        $('.carousel-item').each(function(index, element) {
+            if ($.trim($(element).html()) === '') {
+                $(element).remove();
+            }        
+        });
     });
 
     $('.carousel-control-prev').on('click', function() {
         navigateCarousel('prev');
+        $('.carousel-item').each(function(index, element) {
+            if ($.trim($(element).html()) === '') {
+                $(element).remove();
+            }        
+        });
     });
 
     // Check the carousel item when the slide changes
@@ -373,9 +385,286 @@ function enrollment_list(current_element, type) {
 }
 
 
+
+
+
+$('#enrollment_status_open_close').change(function () {
+    if ($(this).val() === 'open') {
+        var enrollment_data = '<?php echo addslashes($_SESSION['enrollment_data']); ?>';
+        try {
+            // Parse JSON data
+            var data = JSON.parse(enrollment_data);
+            console.log('Parsed data:', data);
+
+            // Ensure data is an object and client_branch_emp_list is treated as an array
+            if (data && typeof data === 'object') {
+                if (Array.isArray(data.client_branch_emp_list)) {
+                    console.log('client_branch_emp_list:', data.client_branch_emp_list);
+                    updateCarouselWithData(data, 1);
+                } else {
+                    // Convert client_branch_emp_list to an array if it's not already
+                    if (data.client_branch_emp_list && typeof data.client_branch_emp_list === 'object') {
+                        // If it's an object but not an array, wrap it in an array
+                        data.client_branch_emp_list = [data.client_branch_emp_list];
+                    } else {
+                        // Handle the case where it's neither an array nor an object
+                        console.error('client_branch_emp_list is not an array or object:', data.client_branch_emp_list);
+                        data.client_branch_emp_list = []; // Ensure it is at least an empty array
+                    }
+
+                    console.log('Converted client_branch_emp_list:', data.client_branch_emp_list);
+                    updateCarouselWithData(data, 1);
+                }
+            } else {
+                console.error('Parsed data is not an object:', data);
+            }
+        } catch (e) {
+            console.error('Error parsing JSON:', e);
+        }
+    } else {
+        // Fetch the session data from PHP
+        var enrollment_data = '<?php echo addslashes($_SESSION['enrollment_data']); ?>';
+        try {
+            // Parse JSON data
+            var data = JSON.parse(enrollment_data);
+            console.log('Parsed data:', data);
+
+            // Ensure data is an object and client_branch_emp_list is treated as an array
+            if (data && typeof data === 'object') {
+                if (Array.isArray(data.client_branch_emp_list)) {
+                    console.log('client_branch_emp_list:', data.client_branch_emp_list);
+                    updateCarouselWithData(data, 2);
+                } else {
+                    // Convert client_branch_emp_list to an array if it's not already
+                    if (data.client_branch_emp_list && typeof data.client_branch_emp_list === 'object') {
+                        // If it's an object but not an array, wrap it in an array
+                        data.client_branch_emp_list = [data.client_branch_emp_list];
+                    } else {
+                        // Handle the case where it's neither an array nor an object
+                        console.error('client_branch_emp_list is not an array or object:', data.client_branch_emp_list);
+                        data.client_branch_emp_list = []; // Ensure it is at least an empty array
+                    }
+
+                    console.log('Converted client_branch_emp_list:', data.client_branch_emp_list);
+                    updateCarouselWithData(data, 2);
+                }
+            } else {
+                console.error('Parsed data is not an object:', data);
+            }
+        } catch (e) {
+            console.error('Error parsing JSON:', e);
+        }
+    }
+});
+
+function updateCarouselWithData(data, open_close) {
+    var itemsPerSlide = 3; // Number of items per slide
+    var currentItem = 0; // Counter for items
+    var isActive = true; // Variable to set the first item as active
+    var carouselInner = $('.carousel-inner');
+
+    // Clear existing carousel items
+    carouselInner.empty();
+
+    // Check if data.client_branch_emp_list is valid
+    if (Array.isArray(data.client_branch_emp_list) && data.client_branch_emp_list.length > 0) {
+        console.log("Processing array...");
+        // Handle the case where data.client_branch_emp_list is an array
+        var items = data.client_branch_emp_list[0];
+        console.log("Items data:", items);
+
+        // Convert items object to an array
+        var client_list = Object.values(items);
+
+        // Validate if client_list is an array
+        if (Array.isArray(client_list)) {
+            console.log(client_list);
+            for (var i = 0; i < client_list.length; i++) {
+                var client = client_list[i];
+                // console.log(item.branches);
+                var branch_list = client.branches;
+                for (var j = 0; j < branch_list.length; j++) {
+                    var branch = branch_list[j];
+                    console.log(branch);
+
+                    if(open_close == 1){
+                        if(branch.client_policies.length > 0){
+                        if (currentItem % itemsPerSlide === 0) {
+                            if (!isActive) carouselInner.append('</div>'); // Close previous carousel item
+                            carouselInner.append('<div class="carousel-item' + (isActive ? ' active' : '') + '">');
+                            isActive = false;
+                        }
+                        // Generate HTML for each item
+                var itemHtml = `
+                    <div class="col-xl-3 col-md-6 d-inline-block scroll-item carousel-slide-item" data-client="${client.short_name}" data-branch="${branch.branch_name }">
+                                                <div class="card" style="box-shadow: 0 4px 8px rgba(0, 0, 0, 0.2);">
+                                                    <div class="card-header add_card_background_random" >
+                                                        <div class="row">
+                                                            <div class="col-8 emp-count-view-click" >
+                                                                <div class="d-flex justify-content-between">
+                                                                    <div class="w-100 " >
+                                                                        <h3 class="my-2 py-1" ><span data-plugin="counterup" style="font-size: 2.0rem;background-color: white;border-radius: 6px;height: 30;padding: 4px 11px 4px 11px;" onclick="enrollment_list(this, 'emp_count_view_click')">${branch.employees.length}</span></h3>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                        <div class="row">
+                                                            <div class="col-12 emp-count-view-click" >
+                                                                <div class="d-flex justify-content-between">
+                                                                    <div class="w-100" >
+                                                                        <h5 class="mt-0 text-truncate" title="Branch Info" style="font-weight: 400 !important;font-size: 20px !important;line-height: 36px;color: black !important;">${client.short_name}  -  ${branch.branch_name} </h5>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                            <!-- <div class="col-3 center_text emp-count-view-click" >
+                                                            <div class="d-flex justify-content-between">
+                                                                <div class="w-100 text-center" >
+                                                                    <p class="mb-0 text-muted">
+                                                                        <span class="text-success mr-2"></span>
+                                                                        <span class="text-nowrap">Emp Count</span>  
+                                                                    </p>
+                                                                </div>
+                                                            </div>
+                                                             </div> -->
+                                                        </div>
+                                                    </div>
+                                                    <div class="card-body" >
+                                                        <input type="text" class="client_id" value="${client.client_id}" hidden>
+                                                        <input type="text" class="client_branch_id" value="${branch.client_branch_id}" hidden>
+                                                        <div class="row emp-status" style="margin-top: -9px;">
+                                                            <div class="col-6 emp-count-view-click" >
+                                                                <span style="font-size: large;color: black !important;" class="number_css" onclick="enrollment_list(this, 'emp_logged_in_view_click')">${branch.emp_login}</span><br>
+                                                                <span class="text-nowrap " style="color: currentColor;font-size: 15px;">Logged-In</span>  
+                                                            </div>
+                                                            <div class="col-6 emp-count-view-click" >
+                                                                <span style="font-size: large;color: black !important;" class="number_css" onclick="enrollment_list(this, 'emp_not_logged_in_view_click')">    ${branch.employees.length - (branch.emp_login || 0)}</span><br>
+                                                                <span class="text-nowrap" style="color: currentColor;font-size: 15px;margin-left: -13px;">Not Logged-In</span>  
+                                                            </div>
+                                                        </div>
+                                                        <div class="row emp-status" style="margin-top: 5px;">
+                                                            <div class="col-6 emp-count-view-click" >
+                                                                <span style="font-size: large;color: black !important;" class="number_css" onclick="enrollment_list(this, 'emp_not_enrolled_view_click')">${branch.employees.length - (branch.emp_enroll || 0)}</span><br>
+                                                                <span class="text-nowrap" style="color: currentColor;font-size: 15px;">Draft</span>  
+                                                            </div>
+                                                            <div class="col-6 emp-count-view-click" >
+                                                                <span style="font-size: large;color: black !important;" class="number_css" onclick="enrollment_list(this, 'emp_enrolled_view_click')">${(branch.emp_enroll || 0)}</span><br>
+                                                                <span class="text-nowrap" style="color: currentColor;font-size: 15px;">Enrolled</span>  
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        `;
+
+                    carouselInner.find('.carousel-item').last().append(itemHtml);
+                    currentItem++;
+                    }
+                    }else{
+                        if(branch.client_policies.length == 0){
+                        if (currentItem % itemsPerSlide === 0) {
+                            if (!isActive) carouselInner.append('</div>'); // Close previous carousel item
+                            carouselInner.append('<div class="carousel-item' + (isActive ? ' active' : '') + '">');
+                            isActive = false;
+                        }
+                        // Generate HTML for each item
+                var itemHtml = `
+                    <div class="col-xl-3 col-md-6 d-inline-block scroll-item carousel-slide-item" data-client="${client.short_name}" data-branch="${branch.branch_name }">
+                                                <div class="card" style="box-shadow: 0 4px 8px rgba(0, 0, 0, 0.2);">
+                                                    <div class="card-header add_card_background_random" >
+                                                        <div class="row">
+                                                            <div class="col-8 emp-count-view-click" >
+                                                                <div class="d-flex justify-content-between">
+                                                                    <div class="w-100 " >
+                                                                        <h3 class="my-2 py-1" ><span data-plugin="counterup" style="font-size: 2.0rem;background-color: white;border-radius: 6px;height: 30;padding: 4px 11px 4px 11px;" onclick="enrollment_list(this, 'emp_count_view_click')">${branch.employees.length}</span></h3>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                        <div class="row">
+                                                            <div class="col-12 emp-count-view-click" >
+                                                                <div class="d-flex justify-content-between">
+                                                                    <div class="w-100" >
+                                                                        <h5 class="mt-0 text-truncate" title="Branch Info" style="font-weight: 400 !important;font-size: 20px !important;line-height: 36px;color: black !important;">${client.short_name}  -  ${branch.branch_name} </h5>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                            <!-- <div class="col-3 center_text emp-count-view-click" >
+                                                            <div class="d-flex justify-content-between">
+                                                                <div class="w-100 text-center" >
+                                                                    <p class="mb-0 text-muted">
+                                                                        <span class="text-success mr-2"></span>
+                                                                        <span class="text-nowrap">Emp Count</span>  
+                                                                    </p>
+                                                                </div>
+                                                            </div>
+                                                             </div> -->
+                                                        </div>
+                                                    </div>
+                                                    <div class="card-body" >
+                                                        <input type="text" class="client_id" value="${client.client_id}" hidden>
+                                                        <input type="text" class="client_branch_id" value="${branch.client_branch_id}" hidden>
+                                                        <div class="row emp-status" style="margin-top: -9px;">
+                                                            <div class="col-6 emp-count-view-click" >
+                                                                <span style="font-size: large;color: black !important;" class="number_css" onclick="enrollment_list(this, 'emp_logged_in_view_click')">${branch.emp_login}</span><br>
+                                                                <span class="text-nowrap " style="color: currentColor;font-size: 15px;">Logged-In</span>  
+                                                            </div>
+                                                            <div class="col-6 emp-count-view-click" >
+                                                                <span style="font-size: large;color: black !important;" class="number_css" onclick="enrollment_list(this, 'emp_not_logged_in_view_click')">    ${branch.employees.length - (branch.emp_login || 0)}</span><br>
+                                                                <span class="text-nowrap" style="color: currentColor;font-size: 15px;margin-left: -13px;">Not Logged-In</span>  
+                                                            </div>
+                                                        </div>
+                                                        <div class="row emp-status" style="margin-top: 5px;">
+                                                            <div class="col-6 emp-count-view-click" >
+                                                                <span style="font-size: large;color: black !important;" class="number_css" onclick="enrollment_list(this, 'emp_not_enrolled_view_click')">${branch.employees.length - (branch.emp_enroll || 0)}</span><br>
+                                                                <span class="text-nowrap" style="color: currentColor;font-size: 15px;">Draft</span>  
+                                                            </div>
+                                                            <div class="col-6 emp-count-view-click" >
+                                                                <span style="font-size: large;color: black !important;" class="number_css" onclick="enrollment_list(this, 'emp_enrolled_view_click')">${(branch.emp_enroll || 0)}</span><br>
+                                                                <span class="text-nowrap" style="color: currentColor;font-size: 15px;">Enrolled</span>  
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        `;
+
+                    carouselInner.find('.carousel-item').last().append(itemHtml);
+                    currentItem++;
+                    }
+                    }
+                }
+                // Create a new carousel item every `itemsPerSlide` items
+                
+            }
+
+            // Close the last carousel item if it was opened
+            if (currentItem % itemsPerSlide !== 0) carouselInner.append('</div>');
+        } else {
+            console.error('Expected an array for items, but got:', client_list);
+        }
+    } else if (typeof data.client_branch_emp_list === 'object') {
+        console.error('client_branch_emp_list is an object, not an array:', data.client_branch_emp_list);
+    } else {
+        console.error('client_branch_emp_list is missing or not in the expected format:', data.client_branch_emp_list);
+    }
+    random_color_set();
+
+    // Initialize or refresh carousel if needed
+    $('#carouselExampleControls').carousel('dispose').carousel();
+}
+
+
 document.addEventListener('DOMContentLoaded', function() {
-    // Array of predefined colors
-    var colors = ['#EBE8FF', '#FFECE5', '#FFE8F5'];
+    random_color_set();
+});
+
+function remove_empty_carousel() {
+    
+}
+
+function random_color_set() {
+     // Array of predefined colors
+     var colors = ['#EBE8FF', '#FFECE5', '#FFE8F5'];
     // '#6ADBE3'
     // Array of predefined background images
     var images = [
@@ -399,135 +688,6 @@ document.addEventListener('DOMContentLoaded', function() {
         header.style.backgroundPosition = 'center'; // Center the image within the div
         index++;
     });
-});
-
-$('#enrollment_status_open_close').change(function () {
-    if ($(this).val() == 'open') {
-        console.log("open");
-    } else {
-        console.log("close");
-
-        // Fetch the session data from PHP
-        var enrollment_data = '<?php echo $_SESSION['enrollment_data']; ?>';
-
-        try {
-            // Parse JSON data
-            var data = JSON.parse(enrollment_data);
-            console.log('Parsed data:', data);
-
-            // Ensure data is an object and client_branch_emp_list is treated as an array
-            if (data && typeof data === 'object') {
-                if (Array.isArray(data.client_branch_emp_list)) {
-                    console.log('client_branch_emp_list:', data.client_branch_emp_list);
-                    updateCarouselWithData(data);
-                } else {
-                    // Convert client_branch_emp_list to an array if it's not already
-                    if (data.client_branch_emp_list && typeof data.client_branch_emp_list === 'object') {
-                        // If it's an object but not an array, wrap it in an array
-                        data.client_branch_emp_list = [data.client_branch_emp_list];
-                    } else {
-                        // Handle the case where it's neither an array nor an object
-                        console.error('client_branch_emp_list is not an array or object:', data.client_branch_emp_list);
-                        data.client_branch_emp_list = []; // Ensure it is at least an empty array
-                    }
-
-                    console.log('Converted client_branch_emp_list:', data.client_branch_emp_list);
-                    updateCarouselWithData(data);
-                }
-            } else {
-                console.error('Parsed data is not an object:', data);
-            }
-        } catch (e) {
-            console.error('Error parsing JSON:', e);
-        }
-    }
-});
-
-function updateCarouselWithData(data) {
-    console.log(data);
-    var itemsPerSlide = 3; // Number of items per slide
-    var currentItem = 0; // Counter for items
-    var isActive = true; // Variable to set the first item as active
-    var carouselInner = $('.carousel-inner');
-
-    // Clear existing carousel items
-    carouselInner.empty();
-
-    // Check if data.client_branch_emp_list is valid
-    if (Array.isArray(data.client_branch_emp_list) && data.client_branch_emp_list.length > 0) {
-        console.log("Processing array...");
-        // Handle the case where data.client_branch_emp_list is an array
-        var items = data.client_branch_emp_list[0];
-        console.log("Items data:", items);
-
-        array.forEach(element => {
-            
-        });
-        // Validate if items is an array
-        if (Array.isArray(items)) {
-            for (var i = 0; i < items.length; i++) {
-                var item = items[i];
-                console.log("--------------");
-                console.log(item);
-
-                // Create a new carousel item every `itemsPerSlide` items
-                if (currentItem % itemsPerSlide === 0) {
-                    if (!isActive) carouselInner.append('</div>'); // Close previous carousel item
-                    carouselInner.append('<div class="carousel-item' + (isActive ? ' active' : '') + '">');
-                    isActive = false;
-                }
-
-                // Generate HTML for each item
-                var itemHtml = `
-                    <div class="col-xl-3 col-md-6 d-inline-block scroll-item carousel-slide-item" data-client="${item.client_name}" data-branch="${item.branch_name}">
-                        <div class="card" style="box-shadow: 0 4px 8px rgba(0, 0, 0, 0.2);">
-                            <div class="card-header add_card_background_random">
-                                <div class="row">
-                                    <div class="col-8 emp-count-view-click">
-                                        <div class="d-flex justify-content-between">
-                                            <div class="w-100">
-                                                <h3 class="my-2 py-1">
-                                                    <span data-plugin="counterup" style="font-size: 2.0rem;background-color: white;border-radius: 6px;height: 30;padding: 4px 11px 4px 11px;">${item.employee_count}</span>
-                                                </h3>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="row">
-                                    <div class="col-12 emp-count-view-click">
-                                        <div class="d-flex justify-content-between">
-                                            <div class="w-100">
-                                                <h5 class="mt-0 text-truncate" title="Branch Info" style="font-weight: 400 !important;font-size: 20px !important;line-height: 36px;color: black !important;">${item.client_name} - ${item.branch_name}</h5>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="card-body">
-                                <!-- Add more details based on the item data -->
-                            </div>
-                        </div>
-                    </div>
-                `;
-
-                carouselInner.find('.carousel-item.active').append(itemHtml);
-                currentItem++;
-            }
-
-            // Close the last carousel item if it was opened
-            if (currentItem % itemsPerSlide !== 0) carouselInner.append('</div>');
-        } else {
-            console.error('Expected an array for items, but got:', items);
-        }
-    } else if (typeof data.client_branch_emp_list === 'object') {
-        console.error('client_branch_emp_list is an object, not an array:', data.client_branch_emp_list);
-    } else {
-        console.error('client_branch_emp_list is missing or not in the expected format:', data.client_branch_emp_list);
-    }
-
-    // Initialize or refresh carousel if needed
-    $('#carouselExampleControls').carousel('dispose').carousel();
 }
 
-
 </script>

From 71bae2149c50470d432d892ac78a74666abc1387 Mon Sep 17 00:00:00 2001
From: velz <velmurugan.s@venbainfotech.com>
Date: Tue, 30 Jul 2024 11:37:05 +0530
Subject: [PATCH 09/21] FEAT_TEST_RACK_RATE_UI

---
 app/Config/Routes.php                         |   1 +
 app/Controllers/EmployeeController.php        | 106 ++++-
 app/Controllers/EmployeeServiceController.php |   2 +-
 app/Helpers/excel_util_helper.php             |   2 +-
 app/Models/ClientModel.php                    |   2 +-
 app/Views/rack_rate_test.php                  | 405 ++++++++++++++++--
 tests/unit/PremiumCalculationTestNew.php      |   2 +-
 7 files changed, 469 insertions(+), 51 deletions(-)

diff --git a/app/Config/Routes.php b/app/Config/Routes.php
index 80babc57..a0106507 100644
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -146,6 +146,7 @@ $routes->group("/employee", ["filter" => "authMVC"], function ($routes) {
     $routes->get("truncate/(:any)", "EmployeeController::truncateFileData/$1");
     $routes->get("test-rack-rate", "EmployeeController::testRackRate");
     $routes->post("test-rack-rate", "EmployeeController::testRackRate");
+    $routes->post("test-dependent", "EmployeeController::testCheckDependentConflict");
 });
 
 
diff --git a/app/Controllers/EmployeeController.php b/app/Controllers/EmployeeController.php
index 42bd37bd..a347a929 100644
--- a/app/Controllers/EmployeeController.php
+++ b/app/Controllers/EmployeeController.php
@@ -1507,6 +1507,7 @@ class EmployeeController extends AdminController
 
     public function testRackRate()
     {
+        helper('excel_util_helper');
         if ($this->request->getMethod() == 'get') {
         $filterData = $this->request->getGet('client_policy_id');
             //just load UI only
@@ -1557,26 +1558,99 @@ class EmployeeController extends AdminController
          }
 
          // print_r($family_details);
-                  return $this->respond(['dataStatus' => true, 'code' => 200, 'data' => $family_details], 200);
+                  // return $this->respond(['dataStatus' => true, 'code' => 200, 'data' => $family_details], 200);
         //get policy details
-         $policy_details = $this->clientPolicyModel->getPolicyDetails($file['client_id'],$file['policy_id']);
+         $policy_details = $this->clientPolicyModel->getPolicyDetails($client_id,$policy_id);
+         $policy_details = (array)$policy_details[0];
+         // ~dd($policy_details[0]->policy_start_date);
         //get rack rates
-          $slab_details = $this->policiesModel->getPolicySlabRatesForEmpOnboard($file['policy_id'],$file['client_id']);
+          $slab_details = $this->policiesModel->getPolicySlabRatesForEmpOnboard($policy_id,$client_id);
         //get file array or construnct dummy file array here
-          $file = ['id' => null,'client_id' => 10,'policy_id' => 10,'action' => 'inception','client_branch_id' => 1,'created_by' => 1];
+          $file = ['id' => null,'client_id' => $client_id,'policy_id' => $policy_id,'action' => 'inception','client_branch_id' => $branch_id,'created_by' => 1];
+         //get existing units in the current branch
+        $existing_units = $this->clientBranchModel->getExisitingUnits(client_id: $client_id,client_branch_id: $branch_id);
         //get familiy details in inception file format array from post method
-            $family_details = [  
-                            [2,'TEST001','John Doe', '01-Jan-1988', 'M', 'Self', '5000000', NULL, '', '', 'G', '', '', '', '', '', '',''],
-                              [1,'TEST001','Jane Doe', '01-Jan-1985', 'F', 'Spouse', 5000000, '01-Jan-2024', '01-Jan-2020', 50000, 'A', 'Manager', '1234567890', 'john.doe@example.com', '0', '', '', ''],
-                            
-                          // [3,'TEST001','Peter Doe', '01-Jan-1955', 'M', 'Father', '', NULL, '', '', '', '', '', '', '', '', '',''],
-                              [4,'TEST001','Mary Doe', '01-Jan-1953', 'F', 'Mother', '', NULL, '', '', '', '', '', '', '', '', '',''],
-                              [5,'TEST001','Grace Doe', '01-Jan-1954', 'F', 'Mother in law', '', NULL, '', '', '', '', '', '', '', '', '',''],
-                          //[6,'TEST001','George Doe', '01-Jan-1948', 'M', 'Father in law', '', NULL, '', '', '', '', '', '', '', '', '',''],
-                               [7,'TEST001','Alice Doe', '01-Jan-1990', 'F', 'Daughter', 5000000, '01-Jan-2024', '01-Jan-2024', 40000, 'B', 'Supervisor', '9876543210', '', '', '', '',''],
-                                 [6,'TEST001','Bob Doe', '01-Jan-1993', 'M', 'son', '50000', NULL, '', '', '', '', '', '', '', '', '',''],
-                         ];
-          $data = calculate_premimum_new($family_details,$policy_details,$all_rack_rates,$file);
+          $data = calculate_premium_new(family_data: $family_details,policy_terms:$policy_details,slab_details:$slab_details,fileArr: $file,existing_units: $existing_units);
+
+          foreach($data as $key => $member )
+          {
+            // ~dd($member);
+            $data[$key]['policy_details']['no_of_days'] = $member['policy_details']['date_coverage'] ? (calculate_days_bw_dates($member['policy_details']['date_coverage'],$member['policy_details']['policy_end_date'])->days + 1) : '';
+          }
+
+          return $this->respond(['dataStatus' => true, 'code' => 200, 'data' => $data], 200);
+         }
+    }
+
+
+    public function testCheckDependentConflict()
+    {
+        helper('excel_util_helper');
+        if ($this->request->getMethod() == 'get') {
+        $filterData = $this->request->getGet('client_policy_id');
+            //just load UI only
+        $this->loadLayout('rack_rate_test');
+        }
+
+
+         if ($this->request->getMethod() == 'post') {
+        $json = $this->request->getJSON();
+         // return $this->respond(['dataStatus' => false, 'code' => 200, 'data' => $data], 200);
+         // $data = (json_decode(json_encode($data),true));
+         $client_id = $json->client_id;
+         $policy_id = $json->policy_id;
+         $branch_id = $json->branch_id;
+         $tabledata = $json->data;
+         
+         if(count($tabledata))
+         {
+             $family_details = [];
+             foreach($tabledata as $key => $row)
+             {
+                $row = (array)$row;
+                if(!$row['column12'])
+                {
+                    
+                    $temp[0] = $row['column1'];//sno
+                    $temp[1] = $row['column2'];//emp code
+                    $temp[2] = $row['column3'];//name
+                    $temp[3] = $row['column4'];//DOB
+                    $temp[4] = strtoupper($row['column5']);//Gender
+                    $temp[5] = $row['column6'];//relation
+                    $temp[6] = $row['column7'];//SI
+                    $temp[7] = $row['column8'];//DOC
+                    $temp[8] = '';//DOJ
+                    $temp[9] = $row['column9'];//BP
+                    $temp[10] = $row['column10'];//band
+                    $temp[11] = '';//designation
+                    $temp[12] = '';//mobile
+                    $temp[13] = '';//EMail
+                    $temp[14] = '';//CE
+                    $temp[15] = '';//RFE
+                    $temp[16] = '';//DOE
+                    $temp[17] = '';//Unit
+                    $temp[18] = $row['column11'];//unit
+                    $family_details[] = $temp;
+                }
+             }
+         }
+
+         // print_r($family_details);
+                  // return $this->respond(['dataStatus' => true, 'code' => 200, 'data' => $family_details], 200);
+        //get policy details
+         $policy_details = $this->clientPolicyModel->getPolicyDetails($client_id,$policy_id);
+         $policy_terms = (array)$policy_details[0];
+        // dd($policy_terms);
+         $policy_terms = json_decode($policy_terms['policy_terms']);
+         $policy_terms = (array) $policy_terms;// convert obj to array
+        
+        //get file array or construnct dummy file array here
+          $file = ['id' => null,'client_id' => $client_id,'policy_id' => $policy_id,'action' => 'inception','client_branch_id' => $branch_id,'created_by' => 1]; 
+        //get familiy details in inception file format array from post method
+          $result = check_dependent_conflict($family_details, $policy_terms, $file['action']);
+
+
+          return $this->respond(['dataStatus' => true, 'code' => 200, 'data' => ['policy_terms' => $policy_terms['family_floaters'],'result' => $result] ], 200);
          }
     }
 
diff --git a/app/Controllers/EmployeeServiceController.php b/app/Controllers/EmployeeServiceController.php
index 4ddd51e6..4eea7b8f 100644
--- a/app/Controllers/EmployeeServiceController.php
+++ b/app/Controllers/EmployeeServiceController.php
@@ -1273,7 +1273,7 @@ class EmployeeServiceController extends AdminController
 
 
         // die();
-        return (($employee_data_group_by_family));
+        return (count($employee_data_group_by_family));
 
     }
 
diff --git a/app/Helpers/excel_util_helper.php b/app/Helpers/excel_util_helper.php
index 4f81d9d3..de35a7e3 100644
--- a/app/Helpers/excel_util_helper.php
+++ b/app/Helpers/excel_util_helper.php
@@ -1008,7 +1008,7 @@ if (!function_exists('transform_excel_data_to_db'))
             // $policy['reason_for_exit'] = $memArr[17];
             
             $policy['client_policy_id'] = $actionArr['policy_id'];
-            $policy['date_coverage'] = isset($memArr[7]) ? convert_string_to_date($memArr[7],'Y-m-d') : NULL;
+            $policy['date_coverage'] = isset($memArr[7]) && $memArr[7] != '' ? convert_string_to_date($memArr[7],'Y-m-d') : NULL;
             $policy['policy_end_date'] = null;
             $policy['days'] = null;
             $policy['premium'] = null;
diff --git a/app/Models/ClientModel.php b/app/Models/ClientModel.php
index a43c1812..b6101356 100644
--- a/app/Models/ClientModel.php
+++ b/app/Models/ClientModel.php
@@ -82,7 +82,7 @@ class ClientModel extends Model
                 $client['policies'] = $clientPolicies; 
 
                 $clientBranchModel = new ClientBranchModel();
-                $clientBranchs = $clientBranchModel->select(['client_branch.id','client_branch.branch_name','client_branch.branch_code', 'client_branch.client_id'])
+                $clientBranchs = $clientBranchModel->select(['client_branch.id','client_branch.branch_name','client_branch.branch_code', 'client_branch.client_id','client_branch.units'])
                                   ->where('client_branch.client_id',$client['id'])
                                   ->findAll();
 
diff --git a/app/Views/rack_rate_test.php b/app/Views/rack_rate_test.php
index 39fe5512..a144444a 100644
--- a/app/Views/rack_rate_test.php
+++ b/app/Views/rack_rate_test.php
@@ -46,7 +46,7 @@
                     <div class="card-body">
                         <!-- <div class="text-center"> -->
                         <div class="form-row">
-                            <div class="form-group col-md-4">
+                            <div class="form-group col-md-3">
                                 <label>Client</label> <br />
                                 <select class="form-control" id="clients">
                                     <option value="0">Select</option>
@@ -54,14 +54,20 @@
                             </div>
 
 
-                            <div class="form-group col-md-4">
+                            <div class="form-group col-md-3">
                                 <label>Branch</label> <br />
                                 <select name="branch_id" class="form-control" id="branch_id">
                                     <option value="0">Select</option>
                                 </select>
                             </div>
+                            <div class="form-group col-md-3">
+                                <label>Unit</label> <br />
+                                <select name="branch_id" class="form-control" id="unit_id">
+                                    <option value="0">Select</option>
+                                </select>
+                            </div>
 
-                            <div class="form-group col-md-4">
+                            <div class="form-group col-md-3">
                                 <label>Policy</label> <br />
                                 <select class="form-control" id="policies">
                                     <option value="0">Select</option>
@@ -76,7 +82,8 @@
                                 <a href="<?= base_url("employee/endorsement-list"); ?>" class="btn btn-primary waves-effect waves-light" id="get-emp-list" onclick="fetchEmpolyeeList(event);">Submit</a>
                             </div> -->
                             <div class="col-12" style="text-align: right;">
-                                <a href="<?= base_url("employee/endorsement-list"); ?>" class="btn btn-primary waves-effect waves-light" id="get-emp-list" onclick="calculatePremium(event);" >calc</a>
+                                <a href="<?= base_url("#"); ?>" class="btn btn-primary waves-effect waves-light" id="get-emp-list" onclick="checkDependentConflict(event);" >Check Dependent conflict</a>
+                                <a href="<?= base_url("#"); ?>" class="btn btn-primary waves-effect waves-light" id="get-emp-list" onclick="calculatePremium(event);" >calc premium</a>
                                 <a href="#" class="btn btn-primary waves-effect waves-light" id="get-emp-list" onclick="addRowToTable();">+</a>
                             </div>
                             <!-- <button onclick="addRowToTable()">Add Row</button> -->
@@ -136,13 +143,61 @@
                                             <div class="modal-dialog modal-dialog-centered" style="max-width:80%;">
                                                 <div class="modal-content">
                                                     <div class="modal-header">
-                                                        <h4 class="modal-title" id="myCenterModalLabel">Center modal</h4>
+                                                        <h4 class="modal-title" id="myCenterModalLabel">Premium Calculation Test Data</h4>
                                                         <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
                                                     </div>
                                                     <div class="modal-body">
-                                                        <h5>Overflowing text to show scroll behavior</h5>
-                                                        <p>Cras mattis consectetur purus sit amet fermentum. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Morbi leo risus, porta ac consectetur ac, vestibulum at eros.</p>
-                                                        <p>Praesent commodo cursus magna, vel scelerisque nisl consectetur et. Vivamus sagittis lacus vel augue laoreet rutrum faucibus dolor auctor.</p>
+                                                    <table class="table table-hover m-0 table-centered dt-responsive w-100" cellspacing="0" id="restable">
+                                                        <thead class="bg-light">
+                                                            <tr>
+                                                                <th class="small-width">SNO</th>
+                                                        <th class="small-width">Emp code</th>
+                                                        <th class="large-width">Name</th>
+                                                        <th class="medium-width">DOB</th>
+                                                        <th class="medium-width">Relation</th>
+                                                        <th class="large-width">Rack rate name</th>
+                                                        <th class="small-width">Grid ID</th>
+                                                        <th class="small-width">Is Self</th>
+                                                        <th class="small-width">Premium type</th>
+                                                        <th class="large-width">SI</th>
+                                                        <th class="medium-width">premium</th>
+                                                        <th class="small-width">Policy days</th>
+
+                                                        <th class="small-width">no of days</th>
+                                                        <th class="medium-width">Rata premium</th>
+                                                        <th class="medium-width">GST</th>
+                                                            </tr>
+                                                        </thead>
+
+                                                        <tbody id='restablebody'>
+                                                        </tbody>
+                                                    </table>
+                                                    </div>
+                                                </div><!-- /.modal-content -->
+                                            </div><!-- /.modal-dialog -->
+                                        </div><!-- /.modal -->
+
+
+<div class="modal fade" id="centermodal2" tabindex="-1" role="dialog" aria-hidden="true" >
+                                            <div class="modal-dialog modal-dialog-centered" style="max-width:80%;">
+                                                <div class="modal-content">
+                                                    <div class="modal-header">
+                                                        <h4 class="modal-title" id="myCenterModalLabel">Premium Calculation Test Data</h4>
+                                                        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+                                                    </div>
+                                                    <div class="modal-body">
+                                                     <table class="table table-hover m-0 table-centered dt-responsive w-100" cellspacing="0" id="restable">
+                                                        <thead class="bg-light">
+                                                            <tr>
+                                                                
+                                                        <th class="small-width">Column</th>
+                                                        <th class="large-width">Error</th>
+                                                         </tr>
+                                                        </thead>
+
+                                                        <tbody id='dependenttablebody'>
+                                                        </tbody>
+                                                    </table>
                                                     </div>
                                                 </div><!-- /.modal-content -->
                                             </div><!-- /.modal-dialog -->
@@ -161,7 +216,8 @@
     // Declare a global variable to store API response data
     var clientPolicies = [];
     var clientPoliciesWithBranch = {
-        policies: []
+        policies: [],
+        units:[]
     };
     var client_id = '<?= isset($getData) ? $getData['client_id'] : '0' ?>';
     var client_branch_id = '<?= isset($getData) ? $getData['branch_id'] : '0' ?>';
@@ -172,7 +228,11 @@
         fetchClientPolicies();
 
         addRowToTable(['Ram Kumar','01-Apr-1990','M','Self','500000','',450000,'A','unit1']);
-        addRowToTable(['Sita','01-Apr-1993','F','Spouse','500000','','','A','unit1']);
+        addRowToTable(['Sita','01-Apr-1993','F','Spouse','','','','','']);
+        addRowToTable(['Gugan','01-Apr-2005','M','Son','','','','','']);
+        addRowToTable(['Selvi','01-Apr-2010','F','Daughter','','','','','']);
+        addRowToTable(['Suresh','01-Apr-1960','M','Father','','','','','']);
+        addRowToTable(['Jamuna','01-Apr-1965','F','Mother','','','','','']);
         
     });
 
@@ -303,7 +363,7 @@
         $.each(data, function(index, item) {
             var option = $('<option>', {
                 value: item.client_policy_id,
-               text: `${item.name ?? ''} - ${item.policy_no ?? ''} - ${item.policy_type ?? ''}`
+               text: `${item.policy_no ?? ''} - ${item.policy_type ?? ''}`
             });
             if (PolicyID == item.client_policy_id) {
                 option.attr('selected', true);
@@ -312,6 +372,60 @@
         });
     }
 
+    function appendUnits(data) {
+
+        $('#unit_id').empty();
+        $('#unit_id').append($('<option>', {
+            value: '0',
+            text: 'Select'
+        }));
+
+        // var PolicyID = <?= isset($getData) ? $getData['policy_id'] : '0' ?>;
+        // console.log(PolicyID)
+        $.each(data, function(index, item) {
+            var option = $('<option>', {
+                value: item,
+               text: item
+            });
+            if (index == 0) {
+                option.attr('selected', true);
+                setUnitInFirstRow(item);
+            }
+            $('#unit_id').append(option);
+        });
+    }
+
+    function setUnitInFirstRow(text) {
+        var cellIndex = 10;
+        // Get the tbody element by its ID
+        var tbody = document.getElementById('emptablebody');
+        
+        // Check if the tbody exists
+        if (!tbody) {
+            console.error('Tbody element not found with id:', tbodyId);
+            return;
+        }
+        
+        // Get the first row of the tbody
+        var firstRow = tbody.rows[0];
+        
+        // Check if the first row exists
+        if (!firstRow) {
+            console.error('No rows found in tbody with id:', tbodyId);
+            return;
+        }
+        
+        // Check if the specified cell index exists in the first row
+        if (cellIndex >= firstRow.cells.length) {
+            console.error('Cell index', cellIndex, 'out of bounds for the first row');
+            return;
+        }
+        
+        // Set the text content of the specified cell in the first row
+        firstRow.cells[cellIndex].textContent = text;
+    }
+
+
     $(document).ready(function() {
 
         $('#clients').on('change', function() {
@@ -334,30 +448,64 @@
             appendBranch(foundPolicies.branchs);
         });
 
+        $('#unit_id').on('change', function() {
+
+            var selectedUnit = $(this).val();
+            setUnitInFirstRow(selectedUnit);
+        });
+
     });
 
     $(document).ready(function() {
 
         $('#branch_id').on('change', function() {
-
-            var selectedClient = $(this).val();
+            console.log(clientPolicies);
+            console.log(clientPoliciesWithBranch);
+            var selectedBranch = $(this).val();
+            var current_client_id = $('#clients').val();
 
             // console.log('selectedBranch', selectedClient);
             // console.log('clientPolicies', clientPoliciesWithBranch);
 
             var foundPolicies = clientPoliciesWithBranch.policies.filter(function(item) {
                 // console.log('item', item);
-                return item.branch_id === selectedClient;
+                return item.branch_id === selectedBranch;
             });
 
+            var foundUnits = [];
+
+            clientPolicies.forEach(function(client) {
+                if (client.id == current_client_id) {
+                    console.log('inside ' + current_client_id);
+                    console.log(client.client_name + ' first if');
+                    var branches = client.branchs;
+                    branches.forEach(function(branch) {
+                        if (branch.id == selectedBranch) {
+                            console.log('inside branch check');
+                            console.log(branch.branch_name);
+                            console.log(branch.units);
+                            foundUnits = (JSON.parse(branch.units));
+                        }
+                    });
+                }
+            });
+
+            console.log('final');
+            console.log(foundUnits);
+
+            if (Array.isArray(foundUnits) && foundUnits.length === 0) {
+                // appendPolicies(foundPolicies);
+                toastr.warning('No Units found for the selected client branch.');
+            } else {
+                // console.log('foundPolicies', foundPolicies);
+                appendUnits(foundUnits);
+            }
 
             if (Array.isArray(foundPolicies) && foundPolicies.length === 0) {
-
                 appendPolicies(foundPolicies);
                 toastr.warning('No policies found for the selected client branch.');
 
             } else {
-                
                 // console.log('foundPolicies', foundPolicies);
                 appendPolicies(foundPolicies);
             }
@@ -378,11 +526,12 @@
         var client_id = $('#clients').val();
         var policy_id = $('#policies').val();
         var branch_id = $('#branch_id').val();
-        // console.log(client_id + '-' + policy_id);
-        // if (client_id == '0' || policy_id == '0') {
-        //     alert('Please select values in both dropdowns.');
-        //     return;
-        // }
+        var unit_id = $('#unit_id').val();
+        console.log(client_id + '-' + policy_id);
+        if (client_id == '0' || policy_id == '0') {
+            alert('Please select all values in dropdowns.');
+            return;
+        }
 
         var queryParams = {
             client_id: client_id,
@@ -392,7 +541,7 @@
         };
 
 
-        // $('#loader').show();
+        $('#loader').show();
         var apiURL = '<?php echo base_url(); ?>' + 'employee/test-rack-rate';
         console.log('calculatePremium');
         // console.log(apiURL);
@@ -406,17 +555,13 @@
             data: JSON.stringify(queryParams),
             success: function(response) {
                 console.log(response);
-               
-                var myModal = new bootstrap.Modal(document.getElementById('centermodal'), { keyboard: true });
-            
-            // Show the modal
-            myModal.show();
-                // return;
-                // console.log(response.dataStatus);
-                // console.log(response.data);
+                console.log(response.dataStatus);
+                console.log(response.data);
                 if (response.code === 200 && response.dataStatus === true && response.data !== "") {
                     // $("#centermodal").modal('show');
                     console.log('success');
+                    
+                        displayData(response.data);
                 } else if (response.code === 404 && response.dataStatus === false) {
                     console.error('no data found', response);
                 } else {
@@ -428,7 +573,67 @@
             }
         });
 
-        // $('#loader').hide();
+        $('#loader').hide();
+
+      
+    }
+
+
+     function checkDependentConflict() {
+        event.preventDefault(); // Prevent default action
+        let table = document.getElementById('emptable');
+        let tabledata = getTableDataAsJson(table);
+        // return;
+        var client_id = $('#clients').val();
+        var policy_id = $('#policies').val();
+        var branch_id = $('#branch_id').val();
+        console.log(client_id + '-' + policy_id);
+        if (client_id == '0' || policy_id == '0' || branch_id == '0') {
+            alert('Please select all values');
+            return;
+        }
+
+        var queryParams = {
+            client_id: client_id,
+            policy_id: policy_id,
+            branch_id: branch_id,
+            data: tabledata,
+        };
+
+
+        $('#loader').show();
+        var apiURL = '<?php echo base_url(); ?>' + 'employee/test-dependent';
+        console.log('calculatePremium');
+        // console.log(apiURL);
+        $.ajax({
+            url: apiURL,
+            method: 'POST',
+            headers: {
+                "Content-Type": "application/json",
+                "X-Requested-With": "XMLHttpRequest"
+            },
+            data: JSON.stringify(queryParams),
+            success: function(response) {
+                console.log(response);
+                console.log(response.dataStatus);
+                console.log(response.data);
+                if (response.code === 200 && response.dataStatus === true && response.data !== "") {
+                    // $("#centermodal").modal('show');
+                    console.log('success');
+                    
+                        displayDependentData(response.data);
+                } else if (response.code === 404 && response.dataStatus === false) {
+                    console.error('no data found', response);
+                } else {
+                    console.error('Something went wrong!');
+                }
+            },
+            error: function(xhr, status, error) {
+                console.error('Error fetching data from API:', error);
+            }
+        });
+
+        $('#loader').hide();
 
       
     }
@@ -439,6 +644,144 @@
         icon.classList.toggle('mdi-chevron-up');
     });
 
+    function displayData(data)
+    {
+              const tableBody = document.getElementById("restablebody");
+              $("#restablebody").empty();
+              const existingRowCount = tableBody.rows.length;
+              for(i = 0; i < data.length; i++)
+              {
+                      const newRow = document.createElement("tr");
+
+                      let newCell;
+
+                      // SNO with auto-increment
+                      newCell = document.createElement("td");
+                      newCell.textContent = i + 1;
+                      newCell.style.border = "1px solid";
+                      newRow.appendChild(newCell);
+
+                      // Emp code (assuming you want an input field)
+                      newCell = document.createElement("td");
+                      newCell.innerHTML = data[i]['emp_code'];
+                      newCell.style.border = "1px solid";
+                      newRow.appendChild(newCell);
+
+                      newCell = document.createElement("td");
+                      // newCell.innerHTML = data[i]['name'] ;
+                      newCell.innerHTML = data[i]['name'];
+                      newCell.style.border = "1px solid";
+                      newRow.appendChild(newCell);
+
+                      newCell = document.createElement("td");
+                      newCell.innerHTML = data[i]['dob'];
+                      newCell.style.border = "1px solid";
+                      newRow.appendChild(newCell);
+
+                      newCell = document.createElement("td");
+                      newCell.innerHTML = data[i]['relationship'];
+                      newCell.style.border = "1px solid";
+                      newRow.appendChild(newCell);
+
+                      newCell = document.createElement("td");
+                      newCell.innerHTML = data[i]['temp']['grid_name'];
+                      newCell.style.border = "1px solid";
+                      newRow.appendChild(newCell);
+
+                      newCell = document.createElement("td");
+                      newCell.innerHTML = data[i]['temp']['grid_id'];
+                      newCell.style.border = "1px solid";
+                      newRow.appendChild(newCell);
+
+                      newCell = document.createElement("td");
+                      newCell.innerHTML = (data[i]['temp']['acting_self'] ? 'Yes' : 'No');
+                      newCell.style.border = "1px solid";
+                      newRow.appendChild(newCell);
+
+                      newCell = document.createElement("td");
+                      newCell.innerHTML = (data[i]['temp']['premium_type'] == 1 ? 'S' : 'I');
+                      newCell.style.border = "1px solid";
+                      newRow.appendChild(newCell);
+
+                      newCell = document.createElement("td");
+                      newCell.innerHTML = (data[i]['policy_details']['basic_cover_si']);
+                      newCell.style.border = "1px solid";
+                      newRow.appendChild(newCell);
+
+                      newCell = document.createElement("td");
+                      newCell.innerHTML = (data[i]['policy_details']['premium']);
+                      newCell.style.border = "1px solid";
+                      newRow.appendChild(newCell);
+
+                       newCell = document.createElement("td");
+                       newCell.innerHTML = data[i]['policy_details']['days'];
+                       newCell.style.border = "1px solid";
+                       newRow.appendChild(newCell);
+
+                       newCell = document.createElement("td");
+                       newCell.innerHTML = data[i]['policy_details']['no_of_days'];
+                       newCell.style.border = "1px solid";
+                       newRow.appendChild(newCell);
+
+                       newCell = document.createElement("td");
+                       newCell.innerHTML = (data[i]['policy_details']['rata_premimum']);
+                       newCell.style.border = "1px solid";
+                       newRow.appendChild(newCell);
+
+                       newCell = document.createElement("td");
+                       newCell.innerHTML = (data[i]['policy_details']['gst']);
+                       newCell.style.border = "1px solid";
+                       newRow.appendChild(newCell);
+
+
+                      tableBody.appendChild(newRow);
+              }
+              var myModal = new bootstrap.Modal(document.getElementById('centermodal'), { keyboard: true });
+                // Show the modal
+              myModal.show();
+    }
+
+     function displayDependentData(data)
+    {
+              const tableBody = document.getElementById("dependenttablebody");
+              $("#dependenttablebody").empty();
+              
+              if(!data['result']['status'])
+              {
+                  for(i = 0; i < data['result']['error_data'].length; i++)
+                  {
+
+                        
+                          const newRow = document.createElement("tr");
+
+                          let newCell;
+
+                          // SNO with auto-increment
+                          newCell = document.createElement("td");
+                          newCell.textContent = data['result']['error_data'][i]['col_name'];
+                          newCell.style.border = "1px solid";
+                          newRow.appendChild(newCell);
+
+                          // Emp code (assuming you want an input field)
+                          newCell = document.createElement("td");
+                          newCell.innerHTML = data['result']['error_data'][i]['msg'];
+                          newCell.style.border = "1px solid";
+                          newRow.appendChild(newCell);
+
+                          tableBody.appendChild(newRow);
+                  }
+              }
+              else
+              {
+                  const newRow = document.createElement("div");
+                  newRow.innerHTML = '<h2>All Good...!</h2>';
+                  tableBody.appendChild(newRow);
+
+              }
+              var myModal = new bootstrap.Modal(document.getElementById('centermodal2'), { keyboard: true });
+                // Show the modal
+              myModal.show();
+    }
 
     function formatNumberToIndianLocale(value, field_name, action) {
 
diff --git a/tests/unit/PremiumCalculationTestNew.php b/tests/unit/PremiumCalculationTestNew.php
index ca69067e..93eca137 100644
--- a/tests/unit/PremiumCalculationTestNew.php
+++ b/tests/unit/PremiumCalculationTestNew.php
@@ -146,7 +146,7 @@ class PremiumCalculationTestNew extends CIUnitTestCase
             foreach ($value['slab_rates'] as $skey => $svalue) {
                 $svalue['rack_rate_name'] = $key;
                 $svalue['grid_master'] = $value['grid_master'];
-                $all_rack_rates[] = $svalue;
+                $all_rack_rates['slab_rates'][] = $svalue;
             }
             // dd($value['slab_rates']);
         }

From 04e3e0f23afbea4e320bc1ed5c0f3e23ef802714 Mon Sep 17 00:00:00 2001
From: aadhavan valli <aadhavanvalli@gmail.com>
Date: Tue, 30 Jul 2024 12:19:00 +0530
Subject: [PATCH 10/21] CHANGE_ENROLLMENT_STATUS_COORECT THE CODE : AADHAVAN

---
 app/Controllers/DashboardController.php | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/app/Controllers/DashboardController.php b/app/Controllers/DashboardController.php
index 220c7468..79a90517 100644
--- a/app/Controllers/DashboardController.php
+++ b/app/Controllers/DashboardController.php
@@ -194,20 +194,19 @@ class DashboardController extends AdminController
         $employeePolicyModel = new EmployeePolicyModel();
         $myLogger = \Config\Services::mylogger();
     
-        $client_policy_data = $clientPolicyModel
-                                                ->where('id', 21)
-                                                ->findAll();
-        $currentDate = date('Y-m-d');
+        $client_policy_data = $clientPolicyModel->findAll();
+        $currentDate = date('d');
     
         // Update policy status based on start and end dates
         foreach ($client_policy_data as $client_policy) {
             $id = $client_policy['id'];
-            
-            if ($currentDate == $client_policy['open_date']) {
+            $openDate = date('d', strtotime($client_policy['open_date']));
+            $closeDate = date('d', strtotime($client_policy['close_date']));
+            if ($currentDate == $openDate) {
                 $clientPolicyModel->update($id, ['open_for_enrollment' => 1]);
             } 
             
-            if ($client_policy['close_date'] < $currentDate) {
+            if ($closeDate < $currentDate) {
                 $clientPolicyModel->update($id, ['open_for_enrollment' => 0]);
             }
         }
@@ -224,13 +223,15 @@ class DashboardController extends AdminController
                                                    ->first();
             
             // Check if notification should be sent
-            if ($notification_data && $notification_data['enabled'] == 1 && $currentDate == $client_policy['reminder_date']) {
+            if ($notification_data && $notification_data['enabled'] == 1 && $currentDate == date('d', strtotime($client_policy['reminder_date'])) ) {
                 // Fetch all employees related to the client policy
                 $employees = $employeePolicyModel->select('employees.*')
                                                  ->join('employees', 'employee_polices.employee_id = employees.id', 'left')
                                                  ->where('employee_polices.client_policy_id', $client_policy['id'])
+                                                 ->where('employees.emp_status', 'draft')
+                                                 ->where('employee_polices.status', 'draft')
+                                                 ->where('employees.relationship', 'Self')
                                                  ->findAll();
-        
                 // Process each employee
                 foreach ($employees as $employee) {
                     if($employee['emp_status'] == 'draft' && $employee['relationship'] == 'Self'){

From 6c5063a600f4a01c3013aa7e66a3b8e6b8fa64b5 Mon Sep 17 00:00:00 2001
From: Venba <bitbucket@venbainfotech.com>
Date: Tue, 30 Jul 2024 08:16:34 +0000
Subject: [PATCH 11/21] FIX_ADDED_JOBMODEL

---
 app/Controllers/JobWorker.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Controllers/JobWorker.php b/app/Controllers/JobWorker.php
index f5b40c04..5c099fe8 100644
--- a/app/Controllers/JobWorker.php
+++ b/app/Controllers/JobWorker.php
@@ -5,7 +5,7 @@ namespace App\Controllers;
 
 
 
-
+use App\Models\JobModel;
 class JobWorker extends AdminController
 {
     const STATUS_DONE = 'done';

From a00a0b25d84542065d15288eee573accdefe37ab Mon Sep 17 00:00:00 2001
From: "venkatesh.r" <venkatesh.r@venbainfotech.com>
Date: Tue, 30 Jul 2024 14:06:15 +0530
Subject: [PATCH 12/21] FIX_DELETION_RELATED_ISSUE : RV

---
 app/Controllers/EmpDataServiceController.php  | 20 ++++++-----
 app/Controllers/EmployeeController.php        | 33 +++++++------------
 app/Controllers/EmployeeServiceController.php | 17 +++++-----
 app/Helpers/excel_util_helper.php             | 18 ++++++----
 app/Models/EmployeeModel.php                  |  2 +-
 app/Models/EmployeePolicyModel.php            | 20 +++++++++--
 app/Views/layout/footer.php                   |  2 +-
 7 files changed, 60 insertions(+), 52 deletions(-)

diff --git a/app/Controllers/EmpDataServiceController.php b/app/Controllers/EmpDataServiceController.php
index 2df33a79..c59195a3 100644
--- a/app/Controllers/EmpDataServiceController.php
+++ b/app/Controllers/EmpDataServiceController.php
@@ -1816,7 +1816,6 @@ class EmpDataServiceController extends BaseController
 
 
     //Endorsement Correction
-
     public function importCorrectionValidation($params)
     {
 
@@ -2232,7 +2231,6 @@ class EmpDataServiceController extends BaseController
 
 
     //Endorsement SIEnhancement
-
     public function importSIEnhancementValidation($params)
     {
         $file_id = $params['file_id'];
@@ -2844,12 +2842,14 @@ class EmpDataServiceController extends BaseController
 
 
     //Endorsement Deletion
-
     public function importDeletionValidation($params)
-    {
+    {   
+
         $file_id = $params['file_id'];
         $file = $this->batchFileModel->where('id', $file_id)->first();
 
+        // dd($file);
+
         $client_id = $file['client_id'];
         $client_policy_id = $file['client_policy_id'];
         $client_branch_id = $file['client_branch_id'];
@@ -2954,6 +2954,7 @@ class EmpDataServiceController extends BaseController
         $query = $db->query($sql);
         $endorsement_data = $query->getResultArray();
 
+        // dd($endorsement_data);
 
         if ($endorsement_data == null || empty($endorsement_data)) {
 
@@ -3255,7 +3256,7 @@ class EmpDataServiceController extends BaseController
         $file_name_with_path = WRITEPATH . "/uploads/import_excel/" . $file['file_name'];
         $excel_data = $this->readExcelFileToArray($file_name_with_path);
         unset($excel_data[0]);
-        array_pop($excel_data);
+        // array_pop($excel_data);
 
         $emp_count = count($excel_data); //excel file count
 
@@ -3279,6 +3280,7 @@ class EmpDataServiceController extends BaseController
             $fetch_data = [
                 'client_policy_id' => $client_policy_id,
                 'client_branch_id' => $client_branch_id,
+                'client_id' => $client_id,
                 'emp_name' => $emp_name,
                 'emp_code' => $emp_code
             ];
@@ -3289,8 +3291,8 @@ class EmpDataServiceController extends BaseController
             if (isset($result['emp_endorsement_primarykey']) && $result['emp_endorsement_primarykey'] !== null) {
 
                 $employee_policy_table_primaryKey[] = $result['emp_policy_primarykey']; //for cash deposite
-                $employee_policy_table_data[] = array('id' => $result['emp_policy_primarykey'], 'date_of_exit' => $result['date_of_exit'], 'reason_for_exit' => $result['reason_for_exit'], 'status' => $result['status'], 'is_active' => 0);
-                $employees_table_data[] = array('id' => $result['employees_primarykey'], 'emp_status' => $result['status'], 'is_active' => 0);
+                $employee_policy_table_data[] = array('id' => $result['emp_policy_primarykey'], 'date_of_exit' => $result['date_of_exit'], 'reason_for_exit' => $result['reason_for_exit'], 'status' => $result['status']);
+                $employees_table_data[] = array('id' => $result['employees_id'], 'emp_status' => $result['status']);
                 $emp_endorsement_table_data[] = array('id' => $result['emp_endorsement_primarykey'], 'group_key' => $result['group_key'], 'endorsement_id' => $value[15], 'status' => 'complete');
             }
           
@@ -3843,7 +3845,7 @@ class EmpDataServiceController extends BaseController
                     FROM employee_polices
                     JOIN employees ON employees.id = employee_polices.employee_id
                     WHERE employees.unit = '$unit'
-                    AND id IN (" . implode(',', $arrayData['employeeIds']) . ")
+                    AND employee_polices.id IN (" . implode(',', $arrayData['employeeIds']) . ")
                 ")->getRow();
 
                 if($amount){
@@ -3903,7 +3905,7 @@ class EmpDataServiceController extends BaseController
                         FROM employee_polices
                         JOIN employees ON employees.id = employee_polices.employee_id
                         WHERE employees.unit = '$unit'
-                        AND id IN (" . implode(',', $arrayData['employeeIds']) . ")
+                        AND employee_polices.id IN (" . implode(',', $arrayData['employeeIds']) . ")
                     ")->getRow();
                 
                 if($amount){
diff --git a/app/Controllers/EmployeeController.php b/app/Controllers/EmployeeController.php
index 42bd37bd..2e538bf2 100644
--- a/app/Controllers/EmployeeController.php
+++ b/app/Controllers/EmployeeController.php
@@ -98,6 +98,7 @@ class EmployeeController extends AdminController
                 emp_name : $filterData['emp_name'],
                 status   : $filterData['status'], 
             );
+            // dd($this->employeePolicyModel->getLastQuery());
 
             $data['getData'] = $filterData;
         }
@@ -162,7 +163,7 @@ class EmployeeController extends AdminController
         // dd($res);
 
         // $empServiceController = new EmployeeServiceController();
-        // $res = $empServiceController->excelFileDataValidation(['file_id' => '38']);
+        // $res = $empServiceController->employeeDisembark(['file_id' => '586']);
         // dd($res);
         // $existing_famility_details = $this->employeeModel->getEmpFamilybyEmpCode(client_policy_id: '2');
         // dd($existing_famility_details);
@@ -1163,21 +1164,8 @@ class EmployeeController extends AdminController
 
         // $this->loadLayout('ecard_template/default_ecard');
 
-      $data =  [
-                    'employeeIds' => [6,8,10],
-                    'client_id' => 12,
-                    'client_policy_id' => 12,
-                    'client_branch_id' => 1,
-                    'cd_ac_no' => '34567834567892',
-                    'endorsement_no' =>  null,
-                    'count' => 3,
-                    'event_name' =>'inception',
-                    'policy_name' => 'new policy',
-                    'user_id' => 1,
-                ];
-
-                $empDataServiceController = new EmpDataServiceController();
-                $empData= $empDataServiceController->cashDepositCalculationForInception($data);
+        $empDataServiceController = new EmpDataServiceController();
+        $return = $empDataServiceController->importDeletionValidation(['file_id' => 130]);
         
     }
     
@@ -1557,13 +1545,14 @@ class EmployeeController extends AdminController
          }
 
          // print_r($family_details);
-                  return $this->respond(['dataStatus' => true, 'code' => 200, 'data' => $family_details], 200);
-        //get policy details
-         $policy_details = $this->clientPolicyModel->getPolicyDetails($file['client_id'],$file['policy_id']);
-        //get rack rates
-          $slab_details = $this->policiesModel->getPolicySlabRatesForEmpOnboard($file['policy_id'],$file['client_id']);
+        return $this->respond(['dataStatus' => true, 'code' => 200, 'data' => $family_details], 200);
         //get file array or construnct dummy file array here
           $file = ['id' => null,'client_id' => 10,'policy_id' => 10,'action' => 'inception','client_branch_id' => 1,'created_by' => 1];
+        //get policy details
+         $policy_details = $this->clientPolicyModel->getPolicyDetails($file['client_id'],$file['policy_id']);
+         //get rack rates
+        $slab_details = $this->policiesModel->getPolicySlabRatesForEmpOnboard($file['policy_id'],$file['client_id']);
+ 
         //get familiy details in inception file format array from post method
             $family_details = [  
                             [2,'TEST001','John Doe', '01-Jan-1988', 'M', 'Self', '5000000', NULL, '', '', 'G', '', '', '', '', '', '',''],
@@ -1576,7 +1565,7 @@ class EmployeeController extends AdminController
                                [7,'TEST001','Alice Doe', '01-Jan-1990', 'F', 'Daughter', 5000000, '01-Jan-2024', '01-Jan-2024', 40000, 'B', 'Supervisor', '9876543210', '', '', '', '',''],
                                  [6,'TEST001','Bob Doe', '01-Jan-1993', 'M', 'son', '50000', NULL, '', '', '', '', '', '', '', '', '',''],
                          ];
-          $data = calculate_premimum_new($family_details,$policy_details,$all_rack_rates,$file);
+        //   $data = calculate_premimum_new($family_details,$policy_details,$all_rack_rates,$file);
          }
     }
 
diff --git a/app/Controllers/EmployeeServiceController.php b/app/Controllers/EmployeeServiceController.php
index 4ddd51e6..87eb818d 100644
--- a/app/Controllers/EmployeeServiceController.php
+++ b/app/Controllers/EmployeeServiceController.php
@@ -906,8 +906,8 @@ class EmployeeServiceController extends AdminController
                      }
 
                      //proceed next data level validation in JOB queue
-                     // $job_details  = new Jobs();
-                     // $r = Jobs::addJob(['job_name' => 'excelFileDataValidation','payload' => ['file_id' => $file_id]]);
+                     $job_details  = new Jobs();
+                     $r = Jobs::addJob(['job_name' => 'excelFileDataValidation','payload' => ['file_id' => $file_id]]);
                      // $jobWorker = new JobWorker();
                      // JobWorker::processJob($r);
                      
@@ -1024,7 +1024,7 @@ class EmployeeServiceController extends AdminController
                                 }
                             }
 
-                             if(($policy_details['base_policy'] == null || $policy_details['base_policy'] == 0 && ($file['action'] == 'inception' || $file['action'] == 'missed_inception' || $file['action'] == 'addition' || $file['action'] == 'enrollment')) || ($policy_details['policy_type_id'] == 3 && $is_self_available_in_policy_terms)) // 3 is GMC parents dep addon)
+                             if(($file['action'] == 'inception' || $file['action'] == 'missed_inception' || $file['action'] == 'addition' || $file['action'] == 'enrollment') || ($policy_details['policy_type_id'] == 3 && $is_self_available_in_policy_terms) && ($policy_details['base_policy'] == null || $policy_details['base_policy'] == 0)) // 3 is GMC parents dep addon)
                             {
                                 $res = check_self_available_in_family($family,$file['action']);
                                 if(!$res['is_self_found'])
@@ -1248,12 +1248,11 @@ class EmployeeServiceController extends AdminController
 
             $existing_famility_details = $this->employeeModel->getEmpFamilybyEmpCode(client_id: $client_id,client_policy_id: $client_policy_id,emp_status: ['enrolled','draft'],policy_status:['enrolled','draft']);
 
-            //get existing units in the current branch
-             $existing_units = $this->clientBranchModel->getExisitingUnits(client_id: $file['client_id'],client_branch_id: $file['client_branch_id']);
-
-
             // $file = ['id' => null,'client_id' => $client_id,'policy_id' => $client_policy_id,'action' => 'inception'];
             $file = ['id' => null,'client_id' => $client_id,'policy_id' => $client_policy_id,'action' => 'inception','created_by' => get_session_userid(),'client_branch_id' => $params['client_branch_id']];
+
+            //get existing units in the current branch
+            $existing_units = $this->clientBranchModel->getExisitingUnits(client_id: $file['client_id'],client_branch_id: $file['client_branch_id']);
             // dd($this->employeeModel->getLastQuery());
             // Kint::dump($existing_famility_details);die();
              $employee_data_group_by_family = data_group_by_family($existing_famility_details,$data_source = 'db');
@@ -1500,14 +1499,14 @@ class EmployeeServiceController extends AdminController
                 //get applicable slab rate for current member relation
                 $pre_rack_rate_name = '';
                 $applicable_rack_rate_name = '';
-                $applicable_rack_rate_master = '';
+                $applicable_rack_rate_master = [];
                 foreach ($slab_details['slab_rates'] as $skey => $slab_value) 
                 {
                     if($pre_rack_rate_name != $slab_value['rack_rate_name'])
                     {
                         $pre_rack_rate_name = $slab_value['rack_rate_name'];
                         $rack_rate_json = json_decode($slab_value['additional_relationship']);
-                        if(in_array(strtolower($employee['relationship']), $rack_rate_json) && $rack_rate_json[ strtolower($employee['relationship']) ] != 0 && $rack_rate_json[ strtolower($employee['relationship']) ] != NA)
+                        if(in_array(strtolower($employee['relationship']), $rack_rate_json) && $rack_rate_json[ strtolower($employee['relationship']) ] != 0 && $rack_rate_json[ strtolower($employee['relationship']) ] != 'NA')
                         {
                             $applicable_rack_rate_name = $slab_value['rack_rate_name'];
                             $applicable_rack_rate_master = $slab_value['grid_master'];
diff --git a/app/Helpers/excel_util_helper.php b/app/Helpers/excel_util_helper.php
index 4f81d9d3..a1edcba9 100644
--- a/app/Helpers/excel_util_helper.php
+++ b/app/Helpers/excel_util_helper.php
@@ -227,11 +227,14 @@ if(!function_exists('check_si'))
 {
     function check_si($row,$policy_details,$slab_details)
     {
+        // Kint::dump($policy_details);
+        $policy_details = (array)$policy_details[0];
+        // dd($policy_details);
         $return_array = array('status' => true,'error' => '');
         $is_si_found = false;
         $is_age_slab_found = false;
 
-        if($policy_details[0]['policy_type_id'] == 1 && $slab_details[0]['policy_grid_id'] == 1 && $slab_details[0]['si_or_bp'] == 2) // GPA && grid type 1 for GPA && sub type is basic pay
+        if($policy_details['policy_type_id'] == 1 && $slab_details[0]['policy_grid_id'] == 1 && $slab_details[0]['si_or_bp'] == 2) // GPA && grid type 1 for GPA && sub type is basic pay
         {
              $is_si_found = true;
              $is_age_slab_found = true;
@@ -1986,13 +1989,14 @@ if(!function_exists('check_unit'))
 {
     function check_unit($row,$existing_units)
     {
-        
+        $temp = $row[18];
+        $temp = empty($row[18]) ? $row[18] : trim($row[18]);
         
         if(in_array($row['current_action'], ['I','A','MI']) )
         {
             if(count($existing_units) == 1)
             {
-                if(empty(trim($row[18])))
+                if(empty($temp))
                 {
                     return array('status' => true);
                 }
@@ -2000,11 +2004,11 @@ if(!function_exists('check_unit'))
 
             if(strtolower($row[5]) == 'self')
             {
-                if(in_array(trim($row[18]),$existing_units)) //18 is unit name
+                if(in_array($temp,$existing_units)) //18 is unit name
                 {
                     return array('status' => true);
                 }
-                else if(!empty(trim($row[18])))
+                else if(!empty($temp))
                 {
                     return array('status' => false,'error' => 'wrong unit name');
                 }
@@ -2015,13 +2019,13 @@ if(!function_exists('check_unit'))
             }
             else
             {
-                 if(empty(trim($row[18])))
+                 if(empty($temp))
                 {
                     return array('status' => true);
                 }
                 else
                 {
-                    if(in_array(trim($row[18]),$existing_units)) //18 is unit name
+                    if(in_array($temp,$existing_units)) //18 is unit name
                     {
                         return array('status' => true);
                     }
diff --git a/app/Models/EmployeeModel.php b/app/Models/EmployeeModel.php
index bd6a5e6f..e0e29c14 100644
--- a/app/Models/EmployeeModel.php
+++ b/app/Models/EmployeeModel.php
@@ -109,7 +109,7 @@ class EmployeeModel extends Model
         $result =  $this->select(['employees.id as emp_id', 'employees.client_id','employees.client_branch_id', 'employees.relationship', 'employees.relationship_code', 'employees.change_event', 'employees.emp_code', 'employees.name', 'employees.email_personal', 'employees.email_corporate', 'employees.mobile', 'employees.gender', 'employees.dob', 'employees.doj', 'employees.basic_pay', 'employees.band', 'employees.designation', 'employees.emp_status','employees.unit','employee_polices.id as emp_policy_id', 'employee_polices.employee_id', 'employee_polices.client_policy_id', 'employee_polices.tpa_id', 'employee_polices.uhid', 'employee_polices.batch_code', 'employee_polices.status', 'employee_polices.pre_existing_alignments', 'employee_polices.basic_cover_si', 'employee_polices.date_coverage', 'employee_polices.policy_end_date', 'employee_polices.days', 'employee_polices.premium', 'employee_polices.rata_premimum', 'employee_polices.gst', 'employee_polices.date_of_exit', 'employee_polices.reason_for_exit','policies.name as policy_name','client_policy.is_addon'])
                         ->join('employee_polices', 'employee_polices.employee_id = employees.id')
                         ->join('client_policy', 'client_policy.id = employee_polices.client_policy_id')
-                        ->join('policies', 'policies.id = client_policy.policy_id')
+                        ->join('policies', 'policies.id = client_policy.policy_id','left')
                         ->where('employees.is_active',1)
                          ->when($client_policy_id, function($query) use ($client_policy_id){
                             return $query->where('employee_polices.client_policy_id',$client_policy_id);
diff --git a/app/Models/EmployeePolicyModel.php b/app/Models/EmployeePolicyModel.php
index 52ffe324..6a668532 100644
--- a/app/Models/EmployeePolicyModel.php
+++ b/app/Models/EmployeePolicyModel.php
@@ -81,7 +81,7 @@ class EmployeePolicyModel extends Model
        
         $result = $this->select([
             'employee_polices.*',
-            'pm.name as policy_name',
+            'policy_type.policy_type as policy_name',
             'im.short_name as insurer_short_name',
             'ib.branch_name as insurer_branch_name',
             'ib.branch_code as insurer_branch_code',
@@ -109,8 +109,8 @@ class EmployeePolicyModel extends Model
         ])
         ->join('employees emp', 'employee_polices.employee_id = emp.id')
         ->join('client_policy cp', 'employee_polices.client_policy_id = cp.id') //cp - client policy
-        ->join('policies pm', 'cp.policy_id = pm.id') //pm - policy master
-        ->join('policy_type', 'policy_type.id = pm.policy_type_id')
+        ->join('policies pm', 'cp.policy_id = pm.id', 'left') //pm - policy master
+        ->join('policy_type', 'policy_type.id = cp.policy_type_id')
         ->join('insurers im', 'cp.insurer_id = im.id') //im - insurer master
         ->join('insurer_branch ib', 'cp.insurer_branch_id = ib.id') //ib - insurer branch
         ->join('tpa tpam', 'cp.tpa_id = tpam.id', 'left') //tpam - tpa master
@@ -511,6 +511,7 @@ class EmployeePolicyModel extends Model
                 employees.relationship_code AS emp_relationship_code,
                 employees.emp_type as emp_type,
                 'D' as event_type_data,
+                TIMESTAMPDIFF(YEAR, employees.dob, CURDATE()) AS emp_age,
 
                 employees.doj AS emp_doj,
                 employees.mobile AS emp_mobile,
@@ -604,6 +605,7 @@ class EmployeePolicyModel extends Model
 
         $client_policy_id = $fetch_data['client_policy_id'];
         $client_branch_id = $fetch_data['client_branch_id'];
+        $client_id = $fetch_data['client_id'];
         $emp_name = $fetch_data['emp_name'];
         $emp_code = $fetch_data['emp_code'];
 
@@ -614,6 +616,18 @@ class EmployeePolicyModel extends Model
                     ep.id as emp_policy_primarykey,
                     e.id as employees_primarykey,
                     ee.group_key,
+                    (
+                        SELECT employees.id
+                        FROM employees
+                        WHERE client_id = '$client_id'
+                            AND client_branch_id = '$client_branch_id'
+                            AND is_active = 1
+                            AND emp_status = 'active'
+                            AND emp_code = '$emp_code'
+                            AND name = '$emp_name'
+                        LIMIT 1
+                    ) AS employees_id,
+
                     MAX(
                     CASE
                         WHEN ee.field_name = 'date_of_exit' THEN ee.new_value
diff --git a/app/Views/layout/footer.php b/app/Views/layout/footer.php
index 700faa5f..0f5877ea 100644
--- a/app/Views/layout/footer.php
+++ b/app/Views/layout/footer.php
@@ -140,7 +140,7 @@
 
 <script>
     toastr.options = {
-        "timeOut": 2000,
+        "timeOut": 5000,
         "closeButton": true,
     };
 </script>

From 849c91070913fe138c9ec676014afaeee2a5d19d Mon Sep 17 00:00:00 2001
From: velz <velmurugan.s@venbainfotech.com>
Date: Tue, 30 Jul 2024 14:42:42 +0530
Subject: [PATCH 13/21] FEAT_RACK_RATE_TEST_CONTD

---
 app/Views/rack_rate_test.php | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/app/Views/rack_rate_test.php b/app/Views/rack_rate_test.php
index a144444a..7573f21e 100644
--- a/app/Views/rack_rate_test.php
+++ b/app/Views/rack_rate_test.php
@@ -182,7 +182,7 @@
                                             <div class="modal-dialog modal-dialog-centered" style="max-width:80%;">
                                                 <div class="modal-content">
                                                     <div class="modal-header">
-                                                        <h4 class="modal-title" id="myCenterModalLabel">Premium Calculation Test Data</h4>
+                                                        <h4 class="modal-title" id="myCenterModalLabel">Dependent Conflict Test Data</h4>
                                                         <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
                                                     </div>
                                                     <div class="modal-body">
@@ -206,6 +206,19 @@
 
 
 <script>
+
+    let mouseX = 0;
+        let mouseY = 0;
+
+        document.addEventListener('mousemove', function(event) {
+            mouseX = event.clientX;
+            mouseY = event.clientY;
+        });
+
+        function getMouseCoordinates() {
+            return { x: mouseX, y: mouseY };
+        }
+
     $(document).ready(function() {
         // Initialize select2
         $("#clients").select2();
@@ -884,6 +897,7 @@ const suggestionsList = document.getElementById("suggestions");
               newCell.contentEditable = "true";  // Make the cell editable (if needed)
               newCell.style.border = "1px solid";
               newCell.addEventListener("input", handleInput);
+              newCell.addEventListener("blur", function(){ hideSuggestions(); });
               newRow.appendChild(newCell);
 
                // SI (assuming you want a date input field)
@@ -983,10 +997,13 @@ const suggestionsList = document.getElementById("suggestions");
 
                   // Position the suggestion box near the input field (optional)
                   const cellRect = focusedCell.parentNode.getBoundingClientRect();
-                  // console.log(cellRect.left);
-                  // console.log(cellRect.right);
-                  suggestionBox.style.left = 170 + "px";
-                  suggestionBox.style.top = 50 + "px";
+                 
+                  const coords = getMouseCoordinates();
+                   console.log(coords.x);
+                   console.log(coords.y);
+
+                  suggestionBox.style.left = (coords.x - 100) + "px";
+                  suggestionBox.style.top = (coords.y - 300) + "px";
               }
         }
 

From 0b6dba1bc852c8f887f15a6284989bc6e2cd1c98 Mon Sep 17 00:00:00 2001
From: aadhavan valli <aadhavanvalli@gmail.com>
Date: Tue, 30 Jul 2024 14:48:09 +0530
Subject: [PATCH 14/21] CHANGE_ENROLLMENT_STATUS_COORECT THE CODE_1 : AADHAVAN

---
 app/Views/enrollment_dash.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Views/enrollment_dash.php b/app/Views/enrollment_dash.php
index 1a5ba2d9..fe69b3db 100644
--- a/app/Views/enrollment_dash.php
+++ b/app/Views/enrollment_dash.php
@@ -149,7 +149,7 @@
                         <div class="col-3">
                             <select class="form-control" name="" id="enrollment_status_open_close">
                                 <option value="open">Open Enrollment</option>
-                                <option value="close">Close Enrollment</option>
+                                <option value="close">Closed Enrollment</option>
                             </select>
                         </div>
                         <div class="col-5"></div>

From a5a368b7db0a5b1f627461ddd9d69835cab8858b Mon Sep 17 00:00:00 2001
From: velz <velmurugan.s@venbainfotech.com>
Date: Wed, 31 Jul 2024 08:41:02 +0530
Subject: [PATCH 15/21] CHANGE_TESTCASE_DELETED

---
 tests/unit/PremiumCalculationTestNew.php | 236 -----------------------
 1 file changed, 236 deletions(-)
 delete mode 100644 tests/unit/PremiumCalculationTestNew.php

diff --git a/tests/unit/PremiumCalculationTestNew.php b/tests/unit/PremiumCalculationTestNew.php
deleted file mode 100644
index 93eca137..00000000
--- a/tests/unit/PremiumCalculationTestNew.php
+++ /dev/null
@@ -1,236 +0,0 @@
-<?php
-
-
-namespace App\Tests;
-
-use CodeIgniter\Test\CIUnitTestCase;
-use Config\App;
-use Config\Services;
-use Tests\Support\Libraries\ConfigReader;
-
-use App\Controllers\EmployeeServiceController;
-use CodeIgniter\Test\DatabaseTestTrait;
-use Kint\Kint;
-
-class PremiumCalculationTestNew extends CIUnitTestCase
-{
-    use DatabaseTestTrait;
-    protected $migrate     = false;
-
-    //primary, single parent, double parent, and double parent in law
-    public function testPremiumCalculation($MY_PARAM = 'default')
-    {
-         helper('excel_util_helper');
-          $param = getenv('MY_PARAM');
-         // echo isset($param) && $param != NULL ? $param : $MY_PARAM;
-         
-         //first slab
-         $primary_relationship = '{"self":1,"spouse":"any","childrens":"any","parents":"NA","parents-in-law":"NA","either-parents-pil":0}';
-         $primary_grid_id = 7;
-         $primary_unit = 'unit1';
-         $primary_grid_type = 2;
-         $primary_max_si = 35000000;
-         $primary_grid_name = 'dependent + age + SI';
-         $primary_grid_master = ['id' => 4,'policy_type' => 'GMC','ui_type' => $primary_grid_id,'policy_grid_type' => $primary_grid_name,'is_dependent_allowed' => 1,'max_dependent_age' => 0,'max_dependent_count' => 1,'basicpay' => 0,'emp_band' => 0];
-         $primary_slabs = [
-                                         [ 'id' => 322, 'client_id' => 61, 'client_policy_id' => 63, 'policy_grid_id' => $primary_grid_id, 'age_from' => 0, 'age_to' => 18, 'grade' => 'A', 'si' => 5000000, 'premium' => 500, 'max_si' => $primary_max_si,'premium_type' => $primary_grid_type, 'relationship' => null,'additional_relationship' => $primary_relationship,'unit' => $primary_unit],
-                                         [ 'id' => 323, 'client_id' => 61, 'client_policy_id' => 63, 'policy_grid_id' => $primary_grid_id, 'age_from' => 19, 'age_to' => 25, 'grade' => 'B', 'si' => 5000000, 'premium' => 1500, 'max_si' => $primary_max_si, 'premium_type' => $primary_grid_type, 'relationship' => null,'additional_relationship' => $primary_relationship,'unit' => $primary_unit],
-                                         [ 'id' => 324, 'client_id' => 61, 'client_policy_id' => 63, 'policy_grid_id' => $primary_grid_id, 'age_from' => 26, 'age_to' => 35, 'grade' => 'C', 'si' => 5000000, 'premium' => 2000, 'max_si' => $primary_max_si, 'premium_type' => $primary_grid_type, 'relationship' => null,'additional_relationship' => $primary_relationship,'unit' => $primary_unit],
-                                         [ 'id' => 324, 'client_id' => 61, 'client_policy_id' => 63, 'policy_grid_id' => $primary_grid_id, 'age_from' => 36, 'age_to' => 45, 'grade' => 'D', 'si' => 5000000, 'premium' => 2500, 'max_si' => $primary_max_si, 'premium_type' => $primary_grid_type, 'relationship' => null,'additional_relationship' => $primary_relationship,'unit' => $primary_unit],
-                                         [ 'id' => 324, 'client_id' => 61, 'client_policy_id' => 63, 'policy_grid_id' => $primary_grid_id, 'age_from' => 46, 'age_to' => 55, 'grade' => 'E', 'si' => 5000000, 'premium' => 3000, 'max_si' => $primary_max_si, 'premium_type' => $primary_grid_type, 'relationship' => null,'additional_relationship' => $primary_relationship,'unit' => $primary_unit],
-                                         [ 'id' => 324, 'client_id' => 61, 'client_policy_id' => 63, 'policy_grid_id' => $primary_grid_id, 'age_from' => 56, 'age_to' => 75, 'grade' => 'F', 'si' => 5000000, 'premium' => 3500, 'max_si' => $primary_max_si, 'premium_type' => $primary_grid_type, 'relationship' => null,'additional_relationship' => $primary_relationship,'unit' => $primary_unit],
-                                         [ 'id' => 324, 'client_id' => 61, 'client_policy_id' => 63, 'policy_grid_id' => $primary_grid_id, 'age_from' => 76, 'age_to' => 85, 'grade' => 'G', 'si' => 5000000, 'premium' => 4000, 'max_si' => $primary_max_si, 'premium_type' => $primary_grid_type, 'relationship' => null,'additional_relationship' => $primary_relationship,'unit' => $primary_unit],
-                                         [ 'id' => 324, 'client_id' => 61, 'client_policy_id' => 63, 'policy_grid_id' => $primary_grid_id, 'age_from' => 86, 'age_to' => 100, 'grade' => 'G', 'si' => 5000000, 'premium' => 4500, 'max_si' => $primary_max_si, 'premium_type' => $primary_grid_type, 'relationship' => null,'additional_relationship' => $primary_relationship,'unit' => $primary_unit],
-                                         [ 'id' => 324, 'client_id' => 61, 'client_policy_id' => 63, 'policy_grid_id' => $primary_grid_id, 'age_from' => 86, 'age_to' => 100, 'grade' => 'G', 'si' => $primary_max_si, 'premium' => 15000, 'max_si' => 0, 'premium_type' => $primary_grid_type, 'relationship' => null,'additional_relationship' => $primary_relationship,'unit' => $primary_unit],
-                                          [ 'id' => 324, 'client_id' => 61, 'client_policy_id' => 63, 'policy_grid_id' => $primary_grid_id, 'age_from' => 86, 'age_to' => 100, 'grade' => 'G', 'si' => 30000000, 'premium' => 30000, 'max_si' => 0, 'premium_type' => $primary_grid_type, 'relationship' => null,'additional_relationship' => $primary_relationship,'unit' => $primary_unit]
-    ];
-
-        //second slab
-        $second_relationship = '{"self":"NA","spouse":"NA","childrens":"NA","parents":"any","parents-in-law":"NA","either-parents-pil":0}';
-        $second_grid_id = 10;
-        $second_unit = 'unit1';
-        $second_grid_type = 1;
-        $second_max_si = 35000000;
-        $second_grid_name = 'max age';
-        $second_grid_master = ['id' => 4,'policy_type' => 'GMC','ui_type' => $second_grid_id,'policy_grid_type' => $second_grid_name,'is_dependent_allowed' => 1,'max_dependent_age' => 0,'max_dependent_count' => 1,'basicpay' => 0,'emp_band' => 0];
-         $second_slabs = [
-                                        [ 'id' => 322, 'client_id' => 61, 'client_policy_id' => 63, 'policy_grid_id' => $second_grid_id, 'age_from' => 0, 'age_to' => 18, 'grade' => 'A', 'si' => 5000000, 'premium' => 700, 'max_si' => 2500000,'premium_type' => $second_grid_type, 'relationship' => null,'additional_relationship' => $second_relationship,'unit' => $second_unit ],
-                                         [ 'id' => 323, 'client_id' => 61, 'client_policy_id' => 63, 'policy_grid_id' => $second_grid_id, 'age_from' => 19, 'age_to' => 25, 'grade' => 'B', 'si' => 5000000, 'premium' => 1400, 'max_si' => 2000000, 'premium_type' => $second_grid_type, 'relationship' => null,'additional_relationship' => $second_relationship,'unit' => $second_unit],
-                                         [ 'id' => 324, 'client_id' => 61, 'client_policy_id' => 63, 'policy_grid_id' => $second_grid_id, 'age_from' => 26, 'age_to' => 35, 'grade' => 'C', 'si' => 5000000, 'premium' => 2300, 'max_si' => 1800000, 'premium_type' => $second_grid_type, 'relationship' => null,'additional_relationship' => $second_relationship,'unit' => $second_unit],
-                                         [ 'id' => 324, 'client_id' => 61, 'client_policy_id' => 63, 'policy_grid_id' => $second_grid_id, 'age_from' => 36, 'age_to' => 45, 'grade' => 'D', 'si' => 5000000, 'premium' => 2750, 'max_si' => 150000, 'premium_type' => $second_grid_type, 'relationship' => null,'additional_relationship' => $second_relationship,'unit' => $second_unit],
-                                         [ 'id' => 324, 'client_id' => 61, 'client_policy_id' => 63, 'policy_grid_id' => $second_grid_id, 'age_from' => 46, 'age_to' => 55, 'grade' => 'E', 'si' => 5000000, 'premium' => 3500, 'max_si' => 130000, 'premium_type' => $second_grid_type, 'relationship' => null,'additional_relationship' => $second_relationship,'unit' => $second_unit],
-                                         [ 'id' => 324, 'client_id' => 61, 'client_policy_id' => 63, 'policy_grid_id' => $second_grid_id, 'age_from' => 56, 'age_to' => 75, 'grade' => 'F', 'si' => 5000000, 'premium' => 4250, 'max_si' => 10, 'premium_type' => $second_grid_type, 'relationship' => null,'additional_relationship' => $second_relationship,'unit' => $second_unit],
-                                         [ 'id' => 324, 'client_id' => 61, 'client_policy_id' => 63, 'policy_grid_id' => $second_grid_id, 'age_from' => 76, 'age_to' => 85, 'grade' => 'G', 'si' => 5000000, 'premium' => 4950, 'max_si' => 5, 'premium_type' => $second_grid_type, 'relationship' => null,'additional_relationship' => $second_relationship,'unit' => $second_unit],
-                                         [ 'id' => 324, 'client_id' => 61, 'client_policy_id' => 63, 'policy_grid_id' => $second_grid_id, 'age_from' => 86, 'age_to' => 100, 'grade' => 'G', 'si' => 5000000, 'premium' => 5500, 'max_si' => 5, 'premium_type' => $second_grid_type, 'relationship' => null,'additional_relationship' => $second_relationship,'unit' => $second_unit]
-
-    ];
-
-        // third slab
-        $third_relationship = '{"self":"NA","spouse":"NA","childrens":"NA","parents":1,"parents-in-law":"NA","either-parents-pil":0}';
-        $third_grid_id = 7;
-        $third_unit = 'unit1';
-        $third_grid_type = 1;
-        $third_max_si = 35000000;
-        $third_grid_name = 'age band';
-        $third_grid_master = ['id' => 4,'policy_type' => 'GMC','ui_type' => $third_grid_id,'policy_grid_type' => $third_grid_name,'is_dependent_allowed' => 1,'max_dependent_age' => 0,'max_dependent_count' => 1,'basicpay' => 0,'emp_band' => 0];
-         $third_slabs = [
-                                        [ 'id' => 322, 'client_id' => 61, 'client_policy_id' => 63, 'policy_grid_id' => $third_grid_id, 'age_from' => 0, 'age_to' => 18, 'grade' => 'A', 'si' => 5000000, 'premium' => 701, 'max_si' => 2500000,'premium_type' => $third_grid_type, 'relationship' => null,'additional_relationship' => $third_relationship,'unit' => $third_unit ],
-                                         [ 'id' => 323, 'client_id' => 61, 'client_policy_id' => 63, 'policy_grid_id' => $third_grid_id, 'age_from' => 19, 'age_to' => 25, 'grade' => 'B', 'si' => 5000000, 'premium' => 1401, 'max_si' => 2000000, 'premium_type' => $third_grid_type, 'relationship' => null,'additional_relationship' => $third_relationship,'unit' => $third_unit],
-                                         [ 'id' => 324, 'client_id' => 61, 'client_policy_id' => 63, 'policy_grid_id' => $third_grid_id, 'age_from' => 26, 'age_to' => 35, 'grade' => 'C', 'si' => 5000000, 'premium' => 2301, 'max_si' => 1800000, 'premium_type' => $third_grid_type, 'relationship' => null,'additional_relationship' => $third_relationship,'unit' => $third_unit],
-                                         [ 'id' => 324, 'client_id' => 61, 'client_policy_id' => 63, 'policy_grid_id' => $third_grid_id, 'age_from' => 36, 'age_to' => 45, 'grade' => 'D', 'si' => 5000000, 'premium' => 2751, 'max_si' => 150000, 'premium_type' => $third_grid_type, 'relationship' => null,'additional_relationship' => $third_relationship,'unit' => $third_unit],
-                                         [ 'id' => 324, 'client_id' => 61, 'client_policy_id' => 63, 'policy_grid_id' => $third_grid_id, 'age_from' => 46, 'age_to' => 55, 'grade' => 'E', 'si' => 5000000, 'premium' => 3501, 'max_si' => 130000, 'premium_type' => $third_grid_type, 'relationship' => null,'additional_relationship' => $third_relationship,'unit' => $third_unit],
-                                         [ 'id' => 324, 'client_id' => 61, 'client_policy_id' => 63, 'policy_grid_id' => $third_grid_id, 'age_from' => 56, 'age_to' => 75, 'grade' => 'F', 'si' => 5000000, 'premium' => 4251, 'max_si' => 10, 'premium_type' => $third_grid_type, 'relationship' => null,'additional_relationship' => $third_relationship,'unit' => $third_unit],
-                                         [ 'id' => 324, 'client_id' => 61, 'client_policy_id' => 63, 'policy_grid_id' => $third_grid_id, 'age_from' => 76, 'age_to' => 85, 'grade' => 'G', 'si' => 5000000, 'premium' => 4951, 'max_si' => 5, 'premium_type' => $third_grid_type, 'relationship' => null,'additional_relationship' => $third_relationship,'unit' => $third_unit],
-                                         [ 'id' => 324, 'client_id' => 61, 'client_policy_id' => 63, 'policy_grid_id' => $third_grid_id, 'age_from' => 86, 'age_to' => 100, 'grade' => 'G', 'si' => 5000000, 'premium' => 5501, 'max_si' => 5, 'premium_type' => $third_grid_type, 'relationship' => null,'additional_relationship' => $third_relationship,'unit' => $third_unit]
-
-    ];
-
-
-    // fourth slab
-        $fourth_relationship = '{"self":"NA","spouse":"NA","childrens":"NA","parents":"NA","parents-in-law":2,"either-parents-pil":0}';
-        $fourth_grid_id = 11;
-        $fourth_unit = 'unit1';
-        $fourth_grid_type = 2;
-        $fourth_max_si = 8000000;
-        $fourth_grid_name = 'age band';
-        $fourth_grid_master = ['id' => 4,'policy_type' => 'GMC','ui_type' => $fourth_grid_id,'policy_grid_type' => $fourth_grid_name,'is_dependent_allowed' => 1,'max_dependent_age' => 0,'max_dependent_count' => 1,'basicpay' => 0,'emp_band' => 0];
-         $fourth_slabs = [
-                                        [ 'id' => 322, 'client_id' => 61, 'client_policy_id' => 63, 'policy_grid_id' => $fourth_grid_id, 'age_from' => 0, 'age_to' => 18, 'grade' => 'A', 'si' => 5000000, 'premium' => 1111, 'max_si' => $fourth_max_si,'premium_type' => $fourth_grid_type, 'relationship' => null,'additional_relationship' => $fourth_relationship,'unit' => $fourth_unit ],
-                                         [ 'id' => 323, 'client_id' => 61, 'client_policy_id' => 63, 'policy_grid_id' => $fourth_grid_id, 'age_from' => 19, 'age_to' => 25, 'grade' => 'B', 'si' => 5000000, 'premium' => 2222, 'max_si' => $fourth_max_si, 'premium_type' => $fourth_grid_type, 'relationship' => null,'additional_relationship' => $fourth_relationship,'unit' => $fourth_unit],
-                                         [ 'id' => 324, 'client_id' => 61, 'client_policy_id' => 63, 'policy_grid_id' => $fourth_grid_id, 'age_from' => 26, 'age_to' => 35, 'grade' => 'C', 'si' => 5000000, 'premium' => 3333, 'max_si' => $fourth_max_si, 'premium_type' => $fourth_grid_type, 'relationship' => null,'additional_relationship' => $fourth_relationship,'unit' => $fourth_unit],
-                                         [ 'id' => 324, 'client_id' => 61, 'client_policy_id' => 63, 'policy_grid_id' => $fourth_grid_id, 'age_from' => 36, 'age_to' => 45, 'grade' => 'D', 'si' => 5000000, 'premium' => 4444, 'max_si' => $fourth_max_si, 'premium_type' => $fourth_grid_type, 'relationship' => null,'additional_relationship' => $fourth_relationship,'unit' => $fourth_unit],
-                                         [ 'id' => 324, 'client_id' => 61, 'client_policy_id' => 63, 'policy_grid_id' => $fourth_grid_id, 'age_from' => 46, 'age_to' => 55, 'grade' => 'E', 'si' => 5000000, 'premium' => 5555, 'max_si' => $fourth_max_si, 'premium_type' => $fourth_grid_type, 'relationship' => null,'additional_relationship' => $fourth_relationship,'unit' => $fourth_unit],
-                                         [ 'id' => 324, 'client_id' => 61, 'client_policy_id' => 63, 'policy_grid_id' => $fourth_grid_id, 'age_from' => 56, 'age_to' => 75, 'grade' => 'F', 'si' => 5000000, 'premium' => 6666, 'max_si' => $fourth_max_si, 'premium_type' => $fourth_grid_type, 'relationship' => null,'additional_relationship' => $fourth_relationship,'unit' => $fourth_unit],
-                                         [ 'id' => 324, 'client_id' => 61, 'client_policy_id' => 63, 'policy_grid_id' => $fourth_grid_id, 'age_from' => 76, 'age_to' => 85, 'grade' => 'G', 'si' => 5000000, 'premium' => 7777, 'max_si' => $fourth_max_si, 'premium_type' => $fourth_grid_type, 'relationship' => null,'additional_relationship' => $fourth_relationship,'unit' => $fourth_unit],
-                                         [ 'id' => 324, 'client_id' => 61, 'client_policy_id' => 63, 'policy_grid_id' => $fourth_grid_id, 'age_from' => 86, 'age_to' => 100, 'grade' => 'G', 'si' => 5000000, 'premium' => 8888, 'max_si' => $fourth_max_si, 'premium_type' => $fourth_grid_type, 'relationship' => null,'additional_relationship' => $fourth_relationship,'unit' => $fourth_unit],
-                                         [ 'id' => 324, 'client_id' => 61, 'client_policy_id' => 63, 'policy_grid_id' => $fourth_grid_id, 'age_from' => 86, 'age_to' => 100, 'grade' => 'G', 'si' => 8000000, 'premium' => 9999, 'max_si' => 0, 'premium_type' => $fourth_grid_type, 'relationship' => null,'additional_relationship' => $fourth_relationship,'unit' => $fourth_unit]
-
-    ];
-
-    //overall rack rate
-    $over_all_rack_details = [ 'primary' => [  "slab_rates" => $primary_slabs,'grid_master' => $primary_grid_master],
-                               'two parent' => ["slab_rates" => $second_slabs,'grid_master' => $second_grid_master],
-                              'single parent' => ["slab_rates" => $third_slabs,'grid_master' => $third_grid_master],
-                                'double_parent_in_law' => ["slab_rates" => $fourth_slabs,'grid_master' => $fourth_grid_master]
-
-];
-
-        // Sample family data
-       $family_details = [  
-                            [2,'TEST001','John Doe', '01-Jan-1988', 'M', 'Self', '5000000', NULL, '', '', 'G', '', '', '', '', '', '','','unit1'],
-                              [1,'TEST001','Jane Doe', '01-Jan-1985', 'F', 'Spouse', 5000000, '01-Jan-2024', '01-Jan-2020', 50000, 'A', 'Manager', '1234567890', 'john.doe@example.com', '0', '', '', '',''],
-                            
-                          // [3,'TEST001','Peter Doe', '01-Jan-1955', 'M', 'Father', '', NULL, '', '', '', '', '', '', '', '', '','',''],
-                              [4,'TEST001','Mary Doe', '01-Jan-1953', 'F', 'Mother', '', NULL, '', '', '', '', '', '', '', '', '','',''],
-                              [5,'TEST001','Grace Doe', '01-Jan-1954', 'F', 'Mother in law', '', NULL, '', '', '', '', '', '', '', '', '','',''],
-                          //[6,'TEST001','George Doe', '01-Jan-1948', 'M', 'Father in law', '', NULL, '', '', '', '', '', '', '', '', '','',''],
-                               [7,'TEST001','Alice Doe', '01-Jan-1990', 'F', 'Daughter', 5000000, '01-Jan-2024', '01-Jan-2024', 40000, 'B', 'Supervisor', '9876543210', '', '', '', '','',''],
-                                 [6,'TEST001','Bob Doe', '01-Jan-1993', 'M', 'son', '50000', NULL, '', '', '', '', '', '', '', '', '','',''],
-                         ];
-
-        // Sample policy terms
-        $policy_terms = [
-            'family_floater' => true,
-            'family_floaters' => [
-                'self' => 1,
-                'spouse' => 1,
-                'childrens' => 2,
-                'either-parents-pil' => 0,
-                'parents' => 2,
-                'parents-in-law' => 2,
-            ],
-        ];
-        //re organize over_all_rack_details
-        $all_rack_rates = [];
-        foreach ($over_all_rack_details as $key => $value) {
-            foreach ($value['slab_rates'] as $skey => $svalue) {
-                $svalue['rack_rate_name'] = $key;
-                $svalue['grid_master'] = $value['grid_master'];
-                $all_rack_rates['slab_rates'][] = $svalue;
-            }
-            // dd($value['slab_rates']);
-        }
-
-        // dd($all_rack_rates);
-        $policy_details = ['base_policy' => null,"policy_start_date" => "2023-02-02","policy_end_date" => "2024-02-02","policy_terms" => json_encode($policy_terms),'gst' => 5];
-       $file = ['id' => null,'client_id' => 10,'policy_id' => 10,'action' => 'inception','client_branch_id' => 1,'created_by' => 1];
-       $existing_units = ['unit1'];
-       $data = calculate_premium_new(family_data:$family_details,policy_terms: $policy_details,slab_details : $all_rack_rates,fileArr: $file, existing_units:$existing_units);
-       
-       //****************************onboard process*******************
-       // $empServiceController = new EmployeeServiceController();
-       //  $empServiceController->employeesOnboardProcess(['familiy_data' => $data,'file' => $file]);
-
-        // dd();
-       //******************************** onboard process****************
-       $policy_created_count = 0;
-       echo "\n";
-       $result_to_display = [];
-       foreach ($data as $key => $value) 
-       {
-            if(is_array($value))
-            {
-                  $result_to_display[$key]['emp_code'] = $value['emp_code'];
-                  $result_to_display[$key]['name'] = $value['name'].'('.calculate_days_bw_dates($value['dob'])->y.')';
-                  $result_to_display[$key]['relation'] = $value['relationship'];
-                  $temp_grid = ($value['temp']['grid_name']);
-                  $temp_grid_type = ($value['temp']['premium_type']);
-                  $temp_grid_type = ($temp_grid_type == 1 ? 'S' : 'I');
-                  $result_to_display[$key]['premium_type'] = $temp_grid.'#'.$value['temp']['grid_id'].'#'.
-                  ($value['temp']['acting_self'] == true ? 'Self' : 'No' ) .'#'. ($temp_grid_type) ;
-                  $result_to_display[$key]['si'] = $value['policy_details']['basic_cover_si'];
-                  $result_to_display[$key]['premium'] = $value['policy_details']['premium'];
-                  $result_to_display[$key]['policy days'] = (calculate_days_bw_dates($policy_details['policy_start_date'],$policy_details['policy_end_date'])->days + 1);
-                  $result_to_display[$key]['no of days'] = $value['policy_details']['days'];
-                  $result_to_display[$key]['rata_premimum'] = $value['policy_details']['rata_premimum'];
-                  $result_to_display[$key]['gst'] = $value['policy_details']['gst'];
-
-            if(!empty($value['policy_details']['premium'])){ $policy_created_count = $policy_created_count + 1; }
-            }
-       }
-     
-        TableDisplay::displayTable($result_to_display);
-        $this->assertTrue(($policy_created_count >= 1 || $policy_created_count = 0));
-    }
-
-}
-
-
-class TableDisplay
-{
-    public static function displayTable(array $data)
-    {
-        if (empty($data)) {
-            echo "No data to display.\n";
-            return;
-        }
-
-        // Calculate column widths
-        $columns = array_keys($data[0]);
-        $widths = array_map(function ($col) use ($data) {
-            $maxWidth = strlen($col);
-            foreach ($data as $row) {
-                $maxWidth = max($maxWidth, strlen($row[$col]));
-            }
-            return $maxWidth;
-        }, $columns);
-
-        // Print header
-        echo str_repeat('-', array_sum($widths) + count($columns) * 3) . PHP_EOL;
-        foreach ($columns as $i => $col) {
-            echo str_pad($col, $widths[$i]) . " | ";
-        }
-        echo PHP_EOL;
-        echo str_repeat('-', array_sum($widths) + count($columns) * 3) . PHP_EOL;
-
-        // Print rows
-        foreach ($data as $row) {
-            foreach ($columns as $i => $col) {
-                echo str_pad($row[$col], $widths[$i]) . " | ";
-            }
-
-            echo PHP_EOL;
-        }
-        echo str_repeat('-', array_sum($widths) + count($columns) * 3) . PHP_EOL;
-    }
-}

From 6a159ac276f929e29d933b0ea24a1f7010d65070 Mon Sep 17 00:00:00 2001
From: velz <velmurugan.s@venbainfotech.com>
Date: Wed, 31 Jul 2024 14:33:01 +0530
Subject: [PATCH 16/21] FIX_TESTRACKRATE_PAGE

---
 app/Controllers/EmployeeController.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/Controllers/EmployeeController.php b/app/Controllers/EmployeeController.php
index 82328ba1..d0791f8c 100644
--- a/app/Controllers/EmployeeController.php
+++ b/app/Controllers/EmployeeController.php
@@ -1563,7 +1563,10 @@ class EmployeeController extends AdminController
           foreach($data as $key => $member )
           {
             // ~dd($member);
-            $data[$key]['policy_details']['no_of_days'] = $member['policy_details']['date_coverage'] ? (calculate_days_bw_dates($member['policy_details']['date_coverage'],$member['policy_details']['policy_end_date'])->days + 1) : '';
+            if(is_array($member))
+            {
+                $data[$key]['policy_details']['no_of_days'] = $member['policy_details']['date_coverage'] ? (calculate_days_bw_dates($member['policy_details']['date_coverage'],$member['policy_details']['policy_end_date'])->days + 1) : '';
+            }
           }
 
           return $this->respond(['dataStatus' => true, 'code' => 200, 'data' => $data], 200);

From d26e4fd952b452207962b98d85377c5ae15845a2 Mon Sep 17 00:00:00 2001
From: "venkatesh.r" <venkatesh.r@venbainfotech.com>
Date: Wed, 31 Jul 2024 14:51:36 +0530
Subject: [PATCH 17/21] FEAT_SEND_MANUAL_REMAINDER_AND_UPLOAD_ENROLL_FILE : RV

---
 app/Config/Routes.php                   |   4 +-
 app/Controllers/DashboardController.php | 258 ++++++++++++++------
 app/Controllers/EmployeeController.php  |  19 +-
 app/Models/ClientPolicyModel.php        |  21 ++
 app/Views/DashBoard.php                 |   2 +-
 app/Views/client_list.php               |   2 +-
 app/Views/client_policy.php             |   6 +-
 app/Views/employee_data_list.php        |   2 +-
 app/Views/enrollment_dash.php           |  10 +-
 app/Views/enrollment_list.php           | 307 ++++++++++++++++++++++--
 app/Views/layout/header.php             |   2 +-
 app/Views/policy_grid.php               |  24 +-
 12 files changed, 528 insertions(+), 129 deletions(-)

diff --git a/app/Config/Routes.php b/app/Config/Routes.php
index 3e79d7a7..440895a8 100644
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -273,11 +273,13 @@ $routes->group("/util", ["filter" => "authMVC"], function ($routes) {
     $routes->get("get_client_details/(:any)", "ClientController::getClientDetails/$1");
     $routes->get("featch_dashboard_data/(:any)", "DashboardController::featch_dashboard_data/$1");
     $routes->get("remove_rack_rate/(:any)", "ClientController::removeRackRate/$1");
+    $routes->get("get_client_policy_list_for_remainder/(:any)", "EmployeeController::get_client_policy_list_for_remainder/$1");
+    $routes->get("send_manual_remainder/(:any)", "DashboardController::sendManualRemainder/$1");
 });
 
 $routes->cli('cli/processjob', 'JobWorker::processJob');
 $routes->cli('cli/processjobs', 'JobWorker::processJobs');
-$routes->cli('cli/enrollment_status', 'DashboardController::enrollment_status');
+$routes->cli('cli/updatePolicyEnrollmentStatus', 'DashboardController::updatePolicyEnrollmentStatus');
 $routes->get("processjob", "JobWorker::processJob");
 
 
diff --git a/app/Controllers/DashboardController.php b/app/Controllers/DashboardController.php
index 79a90517..fe61b51f 100644
--- a/app/Controllers/DashboardController.php
+++ b/app/Controllers/DashboardController.php
@@ -27,6 +27,10 @@ class DashboardController extends AdminController
     protected $messageModel;
     protected $clientModel;
     protected $userMessageModel;
+    protected $clientPolicyModel;
+    protected $notificationModel;
+    protected $employeePolicyModel;
+
     protected $myLogger;
 
     public function __construct()
@@ -34,32 +38,37 @@ class DashboardController extends AdminController
         set_session_context('Dashboard');
         $this->messageModel        = new MessageModel();
         $this->userMessageModel    = new UserMessageModel();
+        $this->clientPolicyModel   = new ClientPolicyModel();
+        $this->notificationModel   = new NotificationModel();
+        $this->employeePolicyModel = new EmployeePolicyModel();
+        $this->clientModel         = new ClientModel();
+
         $this->myLogger = \Config\Services::mylogger();
-        $this->clientModel = new ClientModel();
+
     }
 
     public function dashboard()
     {
 
         $data = [];
-    
+
         $results = $this->clientModel->select('clients.id as client_id, clients.client_name, clients.short_name,
                                               client_branch.id as client_branch_id, client_branch.branch_name, 
                                               client_branch.branch_code, employees.id as employee_id, 
                                               employees.name as employee_name, employees.relationship,
                                               employees.emp_code, employees.emp_status, auth_history.user_type, client_policy.policy_type_id, client_policy.id as client_policy_id')
-                                     ->join('client_branch', 'clients.id = client_branch.client_id', 'left')
-                                     ->join('client_policy', 'client_branch.id = client_policy.client_branch_id', 'left')
-                                     ->join('employees', 'client_branch.id = employees.client_branch_id', 'left')
-                                     ->join('auth_history', 'employees.id = auth_history.user_id AND "employee" = auth_history.user_type', 'left')
-                                     ->findAll();
-    
+        ->join('client_branch', 'clients.id = client_branch.client_id', 'left')
+        ->join('client_policy', 'client_branch.id = client_policy.client_branch_id', 'left')
+        ->join('employees', 'client_branch.id = employees.client_branch_id', 'left')
+        ->join('auth_history', 'employees.id = auth_history.user_id AND "employee" = auth_history.user_type', 'left')
+        ->findAll();
+
         $pendingActionsController = new PendingActionsController;
         $pendingActionsData = $pendingActionsController->getPendingActionsForDashBoard();
 
 
         $groupedData = [];
-    
+
         foreach ($results as $row) {
             $clientId = $row['client_id'];
             $clientName = $row['client_name'];
@@ -70,7 +79,7 @@ class DashboardController extends AdminController
 
             $clientPolicyId = $row['client_policy_id'];
             $policyTypeId = $row['policy_type_id'];
-            $employeeId ='';
+            $employeeId = '';
             if ($employeeId != $row['employee_id']) {
                 $employeeId = $row['employee_id'];
             } else {
@@ -104,7 +113,7 @@ class DashboardController extends AdminController
                     'employees' => []
                 ];
             }
-    
+
             // Add the client policy to the branch's policies list if it exists, not already added, and policyTypeId is not equal to 1
             if ($clientPolicyId !== null && $policyTypeId != 1 && !in_array(['client_policy_id' => $clientPolicyId, 'policy_type_id' => $policyTypeId], $groupedData[$clientId]['branches'][$branchId]['client_policies'])) {
                 $groupedData[$clientId]['branches'][$branchId]['client_policies'][] = [
@@ -112,8 +121,8 @@ class DashboardController extends AdminController
                     'policy_type_id' => $policyTypeId
                 ];
             }
-    
-            // Append employee info to the branch's employees list if relationship is 'Self' and not already added
+
+            // Append employee error to the branch's employees list if relationship is 'Self' and not already added
             $employeeKey = $employeeId . '-' . $employeeName; // unique key to identify an employee
             if ($employeeId !== null && $employeeRelationship == 'Self' && !isset($groupedData[$clientId]['branches'][$branchId]['employees'][$employeeKey])) {
                 $groupedData[$clientId]['branches'][$branchId]['employees'][$employeeKey] = [
@@ -142,7 +151,7 @@ class DashboardController extends AdminController
             }
             $client['branches'] = array_values($client['branches']);
         }
-    
+
         $data['client_branch_emp_list'] = $groupedData;
         $session = \Config\Services::session();
         $session->set('enrollment_data', json_encode($data));
@@ -150,15 +159,12 @@ class DashboardController extends AdminController
         $data['pendingActionsData'] = $pendingActionsData;
         // print_r($data);die;
 
-        
+
         echo view('layout/header');
         echo view('DashBoard', $data);
         echo view('layout/footer');
     }
     
-    
-    
-    
 
     public function getDashboardNotifications()
     {
@@ -187,89 +193,61 @@ class DashboardController extends AdminController
     }
 
 
-    public static function enrollment_status() {
+    public function updatePolicyEnrollmentStatus()
+    {
         $clientModel = new ClientModel();
         $clientPolicyModel = new ClientPolicyModel();
         $notificationModel = new NotificationModel();
         $employeePolicyModel = new EmployeePolicyModel();
         $myLogger = \Config\Services::mylogger();
     
-        $client_policy_data = $clientPolicyModel->findAll();
+        // $myLogger->logme('error', 'enrollment_status function called');
+    
+        $client_policy_data = $clientPolicyModel->getPolicyDetailsForRemainder();
+        $myLogger->logme('error', 'Fetched client policy data');
+    
+        // dd($client_policy_data);
+
         $currentDate = date('d');
+        // $myLogger->logme('error', 'Current date: ' . $currentDate);
     
         // Update policy status based on start and end dates
         foreach ($client_policy_data as $client_policy) {
+
             $id = $client_policy['id'];
             $openDate = date('d', strtotime($client_policy['open_date']));
             $closeDate = date('d', strtotime($client_policy['close_date']));
+    
+            // $myLogger->logme('error', 'Processing client policy ID: ' . $id);
+            // $myLogger->logme('error', 'Open date: ' . $openDate . ', Close date: ' . $closeDate);
+    
             if ($currentDate == $openDate) {
                 $clientPolicyModel->update($id, ['open_for_enrollment' => 1]);
-            } 
-            
+                $myLogger->logme('error', 'Updated policy ID ' . $id . ' to open for enrollment.');
+            }
+    
             if ($closeDate < $currentDate) {
                 $clientPolicyModel->update($id, ['open_for_enrollment' => 0]);
+                $myLogger->logme('error', 'Updated policy ID ' . $id . ' to close for enrollment.');
             }
         }
     
-        $reminder_whole_mail = [];
-
-        foreach ($client_policy_data as $client_policy) {
-            // Fetch client data
-            $client_data = $clientModel->find($client_policy['client_id']);
-            
-            // Fetch notification settings
-            $notification_data = $notificationModel->where('client_id', $client_policy['client_id'])
-                                                   ->where('template_name', 'member_reminder_mail')
-                                                   ->first();
-            
-            // Check if notification should be sent
-            if ($notification_data && $notification_data['enabled'] == 1 && $currentDate == date('d', strtotime($client_policy['reminder_date'])) ) {
-                // Fetch all employees related to the client policy
-                $employees = $employeePolicyModel->select('employees.*')
-                                                 ->join('employees', 'employee_polices.employee_id = employees.id', 'left')
-                                                 ->where('employee_polices.client_policy_id', $client_policy['id'])
-                                                 ->where('employees.emp_status', 'draft')
-                                                 ->where('employee_polices.status', 'draft')
-                                                 ->where('employees.relationship', 'Self')
-                                                 ->findAll();
-                // Process each employee
-                foreach ($employees as $employee) {
-                    if($employee['emp_status'] == 'draft' && $employee['relationship'] == 'Self'){
-                        $params['emp_data'] = $employee;
-                        $params['client_data'] = $client_data;
-                        $params['notification_data'] = $notification_data;
-                        
-                        // Send the mail notification
-                        $reminder_whole_mail[] = sendMailNotification::sendMailNotification('member_reminder_mail', $params);
-                    }
-                }
-            }
-        }
-        
-        // Process and queue bulk emails
-        $temp_whole_data = [];
-        $count = 0;
-
-        foreach ($reminder_whole_mail as $whole_index => $values) {
-            foreach ($values as $index => $value) {
-                $temp_whole_data[] = $value;
-                $count++;
-                
-                if ($count == 20 || ($whole_index == count($reminder_whole_mail) - 1 && $index == count($values) - 1)) {
-                    if (!empty($temp_whole_data)) {
-                        Jobs::addJob(['job_name' => 'bulk_mail', 'payload' => $temp_whole_data]);
-                        $temp_whole_data = [];
-                        $count = 0;
-                    }
-                }
-            }
-        }
-        if(count($temp_whole_data) > 0){
-            Jobs::addJob(['job_name' => 'bulk_mail', 'payload' => $temp_whole_data]);
+        // Mail send function 
+        // $myLogger->logme('error', 'Calling sendRemainderMail function');
+        if( $currentDate == date('d', strtotime($client_policy['reminder_date']))){
+            $result =  $this->sendRemainderMail($client_policy_data);
+        }else{
+            $result = false;
         }
     
-        return json_encode(true);
+        // $myLogger->logme('error', 'enrollment_status function completed');
+        if($result){
+            return json_encode(['status' => true,  'message' => 'Mail send successfully']);
+        }else{
+            return json_encode(['status' => false, 'message' => 'There is no data to send']);
+        }
     }
+    
 
     public function featch_dashboard_data($type)
     {
@@ -308,4 +286,128 @@ class DashboardController extends AdminController
     }
 
 
+    public function sendRemainderMail($client_policy_data)
+    {
+        // $this->myLogger->logme('error', 'sendRemainderMail function called');    
+
+        $reminder_whole_mail = [];
+    
+        foreach ($client_policy_data as $client_policy) {
+    
+            // Fetch client data
+            $client_data = $this->clientModel->find($client_policy['client_id']);
+    
+            // Fetch notification settings
+            $notification_data = $this->notificationModel
+                ->where('client_id', $client_policy['client_id'])
+                ->where('template_name', 'member_reminder_mail')
+                ->first();
+
+            // $this->myLogger->logme('error', 'Notification data fetched: ' . json_encode($notification_data));
+    
+            // Check if notification should be sent
+            if ($notification_data && $notification_data['enabled'] == 1 && !empty($notification_data['mail_content'])) {
+                $this->myLogger->logme('error', 'Notification should be sent for client policy ID: ' . $client_policy['id']);
+    
+                // Fetch all employees related to the client policy
+                $employees = $this->employeePolicyModel
+                    ->select('employees.*')
+                    ->join('employees', 'employee_polices.employee_id = employees.id', 'left')
+                    ->where('employee_polices.client_policy_id', $client_policy['id'])
+                    ->where('employees.emp_status', 'draft')
+                    ->where('employees.is_active', 1)
+                    ->where('employee_polices.status', 'draft')
+                    ->where('employee_polices.is_active', 1)
+                    ->where('employees.relationship', 'Self')
+                    ->findAll();
+    
+                // Process each employee
+                foreach ($employees as $employee) {
+    
+                    if ($employee['emp_status'] == 'draft' && $employee['relationship'] == 'Self') {
+                        $this->myLogger->logme('error', 'Employee status and relationship check passed for employee ID: ' . $employee['id']);
+    
+                        // Mail params
+                        $params['emp_data'] = $employee;
+                        $params['client_data'] = $client_data;
+                        $params['notification_data'] = $notification_data;
+    
+                        // Send the mail notification
+                        $mail_result = sendMailNotification::sendMailNotification('member_reminder_mail', $params);
+                        // $this->myLogger->logme('error', 'Mail sent result: ' . json_encode($mail_result));
+                        $reminder_whole_mail[] = $mail_result;
+                    }
+                }
+            } else {
+                $this->myLogger->logme('error', 'Notification not sent for client policy ID: ' . $client_policy['id']);
+            }
+        }
+
+        $this->myLogger->logme('error', 'Whole email, count: ' . $reminder_whole_mail);
+    
+        // Process and queue bulk emails
+        $temp_whole_data = [];
+        $count = 0;
+    
+        foreach ($reminder_whole_mail as $whole_index => $values) {
+            foreach ($values as $index => $value) {
+                $temp_whole_data[] = $value;
+                $count++;
+                $this->myLogger->logme('error', 'Queueing email, count: ' . $count);
+    
+                if ($count == 20 || ($whole_index == count($reminder_whole_mail) - 1 && $index == count($values) - 1)) {
+                    if (!empty($temp_whole_data)) {
+                        Jobs::addJob(['job_name' => 'bulk_mail', 'payload' => $temp_whole_data]);
+                        $this->myLogger->logme('error', 'Added bulk mail job: ' . json_encode($temp_whole_data));
+                        $temp_whole_data = [];
+                        $count = 0;
+                    }
+                }
+            }
+        }
+    
+        if (count($temp_whole_data) > 0) {
+            Jobs::addJob(['job_name' => 'bulk_mail', 'payload' => $temp_whole_data]);
+            $this->myLogger->logme('error', 'Added final bulk mail job: ' . json_encode($temp_whole_data));
+            return true;
+        }
+    
+        if(count($reminder_whole_mail) > 0){
+            return true;
+        }else{
+            return false;
+        }
+
+    }
+
+
+    public function sendManualRemainder($client_id, $client_branch_id)
+    {
+        $this->myLogger->logme('error', "sendManualRemainder called with client_id: {$client_id}, client_branch_id: {$client_branch_id}");
+        
+        $client_policy_data = $this->clientPolicyModel->getPolicyDetailsForRemainder($client_id, $client_branch_id);
+        // print_r($client_policy_data); die;
+        // print_r($this->clientPolicyModel->getLastQuery()); die;
+        // $this->myLogger->logme('error', "Policy details fetched: " . json_encode($client_policy_data));
+        
+        if ($client_policy_data) {
+            $result = $this->sendRemainderMail($client_policy_data);
+            $this->myLogger->logme('error', "Manual Remainder Mail sending result: " . ($result ? 'success' : 'failure'));
+            
+            if ($result) {
+                $this->myLogger->logme('error', 'Manual Remainder Mail sent successfully');
+                return $this->respond(['status' => true, 'code' => 200, 'message' => 'Mail sent successfully'], 200);
+            } else {
+                $this->myLogger->logme('error', 'Failed to send manual remainder mail, no data to send');
+                return $this->respond(['status' => false, 'code' => 200, 'message' => 'There is no data to send','message2' => 'Failed' ], 200);
+            }
+
+        } else {
+            $this->myLogger->logme('error', 'No policy data found to send');
+            return $this->respond(['status' => false, 'code' => 200, 'message' => 'There is no data to send', 'message2' => 'No policy data found to send'], 200);
+        }
+    }
+    
+    
+
 }
diff --git a/app/Controllers/EmployeeController.php b/app/Controllers/EmployeeController.php
index 82328ba1..4f70758b 100644
--- a/app/Controllers/EmployeeController.php
+++ b/app/Controllers/EmployeeController.php
@@ -192,6 +192,7 @@ class EmployeeController extends AdminController
         // } 
 
         if ($this->request->getMethod() == 'post') {
+
             //validate uploaded file
             $filename = '';
             $validated = $this->validate([
@@ -255,7 +256,7 @@ class EmployeeController extends AdminController
         //for TPA/insurer upload
         $data['events'] = ['inception' => 'Inception (Employee + Dependents)', 'missed_inception' => 'Missed Inception (Employee + Dependents)', 'addition' => 'Addition (Employee + Dependents)', 'dependent_addition' => 'Dependent Addition (Only Dependents)', 'deletion' => 'Deletion', 'correction' => 'Correction', 'si_enhancement' => 'SI Enhancement'];
         //for inception upload
-        $data['actions'] = ['inception' => 'Inception (Employee + Dependents)',  'missed_inception' => 'Missed Inception (Employee + Dependents)', 'addition' => 'Addition (Employee + Dependents)', 'dependent_addtion' => 'Dependent Addition (Only Dependents)', 'deletion' => 'Deletion', 'correction' => 'Correction', 'si_enhancement' => 'SI Enhancement','enrollment' => 'Enrollment'];
+        $data['actions'] = ['inception' => 'Inception (Employee + Dependents)',  'missed_inception' => 'Missed Inception (Employee + Dependents)', 'addition' => 'Addition (Employee + Dependents)', 'dependent_addtion' => 'Dependent Addition (Only Dependents)', 'deletion' => 'Deletion', 'correction' => 'Correction', 'si_enhancement' => 'SI Enhancement','enrollment' => 'Enrolment'];
 
         $data['import_or_export'] = ['import' => 'Import', 'export' => 'Export'];
         $data['insurer_or_tpa'] = ['insurer' => 'Insurer', 'tpa' => 'TPA'];
@@ -1642,4 +1643,20 @@ class EmployeeController extends AdminController
          }
     }
 
+
+    public function get_client_policy_list_for_remainder($client_id, $client_branch_id)
+    {
+        $policies = $this->clientPolicyModel
+                ->select('client_policy.*, policy_type.policy_type as policy_name')
+                ->join('policy_type', 'policy_type.id = client_policy.policy_type_id')
+                ->where('client_policy.client_id', $client_id)
+                ->where('client_policy.client_branch_id', $client_branch_id)
+                ->where('client_policy.is_active', 1)
+                ->where('client_policy.policy_status', 1)
+                ->whereIn('client_policy.policy_type_id', [2, 3])
+                ->findAll();
+
+        return $this->respond(['status' => true, 'code' => 200, 'data' => $policies], 200);
+
+    }
 }
diff --git a/app/Models/ClientPolicyModel.php b/app/Models/ClientPolicyModel.php
index 29027630..506b6605 100644
--- a/app/Models/ClientPolicyModel.php
+++ b/app/Models/ClientPolicyModel.php
@@ -388,5 +388,26 @@ public function getCliendDataForExcelFileName($client_policy_id){
 
 }
 
+//for this using in CRONE JOB
+public function getPolicyDetailsForRemainder($client_id = null, $branch_id = null)
+{
+    $builder = $this->table('client_policy')
+        ->where('client_policy.is_addon', 1)
+        ->where('client_policy.open_for_enrollment', 1)
+        ->where('client_policy.inception_type', 2)
+        ->where('client_policy.is_active', 1)
+        ->where('client_policy.policy_status', 1)
+        ->whereIn('client_policy.policy_type_id', [2, 3]);
+
+    if ($client_id && $branch_id) {
+        $builder->where('client_policy.client_id', $client_id)
+        ->where('client_policy.client_branch_id', $branch_id);
+    }
+
+    return $builder->get()->getResultArray();
+
+
+    }
+
 }
 
diff --git a/app/Views/DashBoard.php b/app/Views/DashBoard.php
index c174e936..8f2a5aff 100644
--- a/app/Views/DashBoard.php
+++ b/app/Views/DashBoard.php
@@ -59,7 +59,7 @@ body {
                     <li class="nav-item">
                         <a href="#enrollment-dash-tab" data-toggle="tab" aria-expanded="true" class="nav-link px-3 py-2" id="enrollemnt_tab">
                             <span class="mr-1"><i class="fa fa-file"></i></span>
-                            <span class="d-none d-sm-inline-block">Enrollment</span>
+                            <span class="d-none d-sm-inline-block">Enrolment</span>
                         </a>
                     </li>
                 </ul>
diff --git a/app/Views/client_list.php b/app/Views/client_list.php
index f0609f71..8d015165 100644
--- a/app/Views/client_list.php
+++ b/app/Views/client_list.php
@@ -58,7 +58,7 @@ table.dataTable thead th {
                                     <a href="javascript: void(0);" class="dropdown-toggle arrow-none btn btn-light btn-sm" data-toggle="dropdown"aria-expanded="false"><i class="mdi mdi-dots-horizontal"></i></a>
                                     <div class="dropdown-menu dropdown-menu-right">
                                         <a class="dropdown-item" href="<?= base_url("client/list/"); ?><?= $row->id;?>"><i class="mdi mdi-pencil mr-2 text-muted font-18 vertical-middle"></i>Edit</a>
-                                        <a class="dropdown-item" href="<?= base_url("client/deposit/{$row->id}"); ?>"><i class="mdi mdi-cash mr-2 text-muted font-18 vertical-middle"></i>CD Tranctions</a>
+                                        <a class="dropdown-item" href="<?= base_url("client/deposit/{$row->id}"); ?>"><i class="mdi mdi-cash mr-2 text-muted font-18 vertical-middle"></i>CD Transactions</a>
                                         <?php if(get_role_id() != 3 && get_role_id() != 4) { ?>
                                             <a class="dropdown-item" data-id="<?= $row->id;?>" onclick="removeClient(this)"><i class="mdi mdi-delete mr-2 text-muted font-18 vertical-middle"></i>Delete</a>
                                         <?php } ?>
diff --git a/app/Views/client_policy.php b/app/Views/client_policy.php
index 1553e365..430faa62 100644
--- a/app/Views/client_policy.php
+++ b/app/Views/client_policy.php
@@ -15,7 +15,7 @@
                     <th>Client Branch</th>
                     <th>TPA</th>
                     <th>Date</th>
-                    <th>Enrollment Status</th>
+                    <th>Enrolment Status</th>
                     <th>Status</th>
                     <th>Action</th>
                 </tr>
@@ -944,7 +944,7 @@
 
         Swal.fire({
             title: "Are you sure?",
-            text: "You need to approve this!",
+            text: "Do you want to approve this!",
             icon: "info",
             showCancelButton: true,
             confirmButtonColor: "#3085d6",
@@ -1661,7 +1661,7 @@
 
         Swal.fire({
                 title: "Are you sure?",
-                text: "You need to remove this Policy.",
+                text: "Do you want to remove this Policy.",
                 icon: "info",
                 showCancelButton: true,
                 confirmButtonColor: "#3085d6",
diff --git a/app/Views/employee_data_list.php b/app/Views/employee_data_list.php
index a62e4f3a..f5d04b65 100644
--- a/app/Views/employee_data_list.php
+++ b/app/Views/employee_data_list.php
@@ -55,7 +55,7 @@
                                 <th class="font-weight-medium">Policy name</th>
                                 <th class="font-weight-medium">Insurer <br> name</th>
                                 <th class="font-weight-medium">TPA ID</th>
-                                <th class="font-weight-medium">UHID</th>
+                                <th class="font-weight-medium">Risk ID</th>
                                 <th class="font-weight-medium">Policy <br> status</th>
                                 <th class="font-weight-medium">(₹)Sum Insured</th>
                                 <th class="font-weight-medium">(₹)Premium</th>
diff --git a/app/Views/enrollment_dash.php b/app/Views/enrollment_dash.php
index fe69b3db..58d8f9cb 100644
--- a/app/Views/enrollment_dash.php
+++ b/app/Views/enrollment_dash.php
@@ -107,9 +107,9 @@
         height: 100%;
     }
 
-    .carousel-control-prev-icon, .carousel-control-next-icon {
-        /* background-color: rgba(0,0,0,0.5); Change color as needed */
-    }
+    /* .carousel-control-prev-icon, .carousel-control-next-icon {
+        background-color: rgba(0,0,0,0.5); 
+    } */
 
     .carousel-control-prev-icon {
         background-image: url('data:image/svg+xml;charset=utf8,%3Csvg xmlns%3D"http://www.w3.org/2000/svg" fill%3D"%23000000" viewBox%3D"0 0 8 8"%3E%3Cpath d%3D"M2.5 0L4 1.5 1.5 4 4 6.5 2.5 8 0 4 2.5 0z"/%3E%3C/svg%3E');
@@ -148,8 +148,8 @@
                     <div class="row">
                         <div class="col-3">
                             <select class="form-control" name="" id="enrollment_status_open_close">
-                                <option value="open">Open Enrollment</option>
-                                <option value="close">Closed Enrollment</option>
+                                <option value="open">Open Enrolment</option>
+                                <option value="close">Closed Enrolment</option>
                             </select>
                         </div>
                         <div class="col-5"></div>
diff --git a/app/Views/enrollment_list.php b/app/Views/enrollment_list.php
index b483e4c1..48104451 100644
--- a/app/Views/enrollment_list.php
+++ b/app/Views/enrollment_list.php
@@ -46,7 +46,7 @@
     <div class="col-12">
         <div class="card">
             <div class="card-header">
-                <div class="row">
+                <div class="row" style="margin-bottom: -22px;">
                     <div class="col-3">
                         <div id="categoryFilter" style="display: flex;">
                             <select class="form-control" id="clients" onchange="populateBranches()">
@@ -64,24 +64,35 @@
                             </select>
                         </div>
                     </div>
-                    <div class="col-3">
+                    <div class="col-1">
                         <div id="categoryFilter_11">
                             <a href="#" class="btn btn-primary waves-effect waves-light" id="get-emp-list" onclick="fetchEmpolyeeList(event);">Search</a>
                         </div>
                     </div>
-                    <div class="col-3 text-right view-status-btn">
-                        
-                        <button type="button" class="btn btn-link visa_status_button" onclick="toggleContent()">
+                    <div class="col-2">
+                        <div id="categoryFilter_12">
+                            <a href="#" class="btn btn-primary waves-effect waves-light" onclick="sendManualReminder(this)">Send Reminder</a>
+                        </div>
+                    </div>
+                    <div class="col-2">
+                        <div id="categoryFilter_13">
+                            <a class="btn btn-primary waves-effect waves-light" onclick="uploadEnrollmentFile(this)" >Upload File</a>
+                        </div>
+                    </div>
+                    <div class="col-1 text-right view-status-btn" style="position: relative;bottom: 7px;">
+                        <button type="button" class="btn btn-link visa_status_button" onclick="toggleContent()" style="color: #000;">
                             Status <i id="toggleIcon" class="fas fa-minus"></i>
                         </button>
                     </div>
                 </div>
             </div>
-            <div class="card-body status-option" id="statusContent" style="padding: 0.5rem !important;background-color: darkgrey;">
+            <div class="card-body status-option" id="statusContent" style="padding: 1.5rem !important;background-color: darkgrey;">
+                
                 <div class="text-center">
-                    <div class="row" style="margin-right: -261px;margin-left: 5px;">
-                        <div class="col-xl-2 col-md-3">
-                            <div class="card">
+
+                    <div class="row" style="margin-left: 125px; margin-bottom: -11px;">
+                        <div class="col-xl-2 col-md-2">
+                            <div class="card cardWidth">
                                 <div class="card-body" id="emp_count_view_click">
                                     <div class="d-flex justify-content-between" style="justify-content: center !important;">
                                         <div>
@@ -93,12 +104,12 @@
                                 </div>
                             </div>
                         </div><!-- end col -->
-                        <div class="col-xl-2 col-md-3">
+                        <div class="col-xl-2 col-md-2">
                             <div class="card">
                                 <div class="card-body" id="emp_enrolled_view_click">
                                     <div class="d-flex justify-content-between" style="justify-content: center !important;">
                                         <div>
-                                            <h5 class="text-muted font-weight-normal mt-0 text-truncate" title="Enrolled">Enrolled</h5>
+                                            <h5 class="text-muted font-weight-normal mt-0 text-truncate" title="Enrolled">Enroled</h5>
                                             <h3 class="my-2 py-1"><span data-plugin="counterup" id="emp_enrolled_view">0</span></h3>
                                         </div>
                                         
@@ -106,12 +117,12 @@
                                 </div>
                             </div>
                         </div><!-- end col -->
-                        <div class="col-xl-2 col-md-3">
+                        <div class="col-xl-2 col-md-2">
                             <div class="card">
                                 <div class="card-body" id="emp_not_enrolled_view_click">
                                     <div class="d-flex justify-content-between" style="justify-content: center !important;">
                                         <div>
-                                            <h5 class="text-muted font-weight-normal mt-0 text-truncate" title="Not Enrolled">Not Enrolled</h5>
+                                            <h5 class="text-muted font-weight-normal mt-0 text-truncate" title="Not Enrolled">Not Enroled</h5>
                                             <h3 class="my-2 py-1"><span data-plugin="counterup" id="emp_not_enrolled_view">0</span></h3>
                                         </div>
                                         
@@ -119,7 +130,7 @@
                                 </div>
                             </div>
                         </div><!-- end col -->
-                        <div class="col-xl-2 col-md-3">
+                        <div class="col-xl-2 col-md-2">
                             <div class="card">
                                 <div class="card-body" id="emp_logged_in_view_click">
                                     <div class="d-flex justify-content-between" style="justify-content: center !important;">
@@ -132,7 +143,7 @@
                                 </div>
                             </div>
                         </div><!-- end col -->
-                        <div class="col-xl-2 col-md-3">
+                        <div class="col-xl-2 col-md-2">
                             <div class="card">
                                 <div class="card-body" id="emp_not_logged_in_view_click">
                                     <div class="d-flex justify-content-between" style="justify-content: center !important;">
@@ -146,7 +157,9 @@
                             </div>
                         </div><!-- end col -->
                     </div>
+
                 </div>
+
             </div>
         </div>
     </div>
@@ -154,7 +167,7 @@
 
 <div class="row" id="client_list">
     <div class="col-12">
-        <div class="card" style="">
+        <div class="card">
             <div class="card-body">
                 <table class="table table-hover m-0 table-centered dt-responsive w-100" cellspacing="0" id="tickets-table">
                     <thead class="bg-light">
@@ -162,7 +175,7 @@
                             <th class="font-weight-medium">SNO</th>
                             <th class="font-weight-medium">Name</th>
                             <th class="font-weight-medium">Emp Code</th>
-                            <th class="font-weight-medium">Enrolled</th>
+                            <th class="font-weight-medium">Enroled</th>
                             <th class="font-weight-medium">Logged-In</th>
                         </tr>
                     </thead>
@@ -175,10 +188,48 @@
     </div>
 </div>
 
-<!-- Center modal content omitted for brevity -->
+<!-- Center modal content -->
+<div class="modal fade" id="upload_enrollment_model" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="false">
+    <div class="modal-dialog modal-dialog-centered">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h4 class="modal-title" id="myCenterModalLabel">Upload Enrollment File</h4>
+                <button type="button" id="close_btn" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+            </div>
+            <div class="modal-body">
+                <form class="parsley-examples" method="post" id="uploadForm" action="<?php echo base_url().'employee/upload'?>" enctype="multipart/form-data">
+                    <input type="hidden" id="file_client_id" name="client_id">
+                    <input type="hidden" id="file_branch_id" name="branch_id">
+                    <input type="hidden" id="file_upload_actions" name="upload-action-type" value="enrollment">
+                    <div class="form-group">
+                        <div class="form-row">
+                            <div class="form-group col-md-12">
+                                <label for="policy_id">Client Policy<span class="text-danger">*</span></label>
+                                <select class="form-control" id="policy_id" name="policy_id" required>
+                                    <option selected >Select Client Policy</option>
+                                </select>
+                            </div>
+                        </div>
+                        <div class="form-row">
+                            <div class="form-group col-md-6">
+                                <label for="file">File<span class="text-danger">*</span></label>
+                                <input type="file" id="fileInput" name="emplist" required
+                                    accept=" application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel,application/vnd.oasis.opendocument.spreadsheet">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="form-group text-right m-b-0" id="hide_smbt_btn">
+                        <button type="submit" class="btn btn-primary waves-effect waves-light mr-1">Upload</button>
+                    </div>
+                </form>
+            </div>
+        </div><!-- /.modal-content -->
+    </div><!-- /.modal-dialog -->
+</div><!-- /.modal -->
 
 <script>
-    function populateBranches() {
+    function populateBranches() 
+    {
         var clientId = document.getElementById('clients').value;
         var branchDropdown = document.getElementById('branch_id');
 
@@ -200,7 +251,8 @@
         });
     }
 
-    function filterTable(columnIndex, filterValue) {
+    function filterTable(columnIndex, filterValue) 
+    {
         var table = $('#tickets-table').DataTable();
         
         // Reset the search filter for all columns
@@ -209,7 +261,9 @@
         // Apply the filter to the specified column
         table.column(columnIndex).search(filterValue).draw();
     }
-    function fetchEmpolyeeList(event) {
+
+    function fetchEmpolyeeList(event) 
+    {
         event.preventDefault();
 
         var client_id = $('#clients').val();
@@ -291,7 +345,8 @@
         });
     }
 
-    $(document).ready(function() {
+    $(document).ready(function() 
+    {
 
         function getUrlParameter(name) {
             var params = new URLSearchParams(window.location.search);
@@ -312,8 +367,6 @@
                 $('#branch_id').val(branch_id).trigger('change');
                 if($('#branch_id').val() != 0){
                     $('#get-emp-list').click().trigger();
-                    
-
                 }
             }, 500);
             
@@ -331,6 +384,7 @@
         }, 1000);
 
         $('#clients').select2();
+        $('#policy_id').select2();
         $('#branch_id').select2();
         var table = $('#tickets-table').DataTable({
             dom: 'fBrtip',
@@ -450,7 +504,8 @@
         toggleContent();
     });
 
-    function toggleContent() {
+    function toggleContent() 
+    {
         var content = document.getElementById("statusContent");
         var toggleIcon = document.getElementById("toggleIcon");
         if (content.style.display === "none") {
@@ -463,4 +518,206 @@
             toggleIcon.classList.add("fa-plus");
         }
     }
+
+    //----------------------------------------------------------------------------------------------------
+
+
+    function uploadEnrollmentFile(input)
+    {  
+        console.log('uploadEnrollmentFile called');
+
+        var client_id = $('#clients').val()
+        var client_branch_id = $('#branch_id').val()
+
+        console.log('input', input);
+        console.log('client_id', client_id);
+        console.log('client_branch_id', client_branch_id);
+
+        if(client_id == 0 && client_branch_id == 0){   
+           
+            return false
+        }
+
+        // $('#upload_enrollment_model').modal('show');
+        var myModal = new bootstrap.Modal(document.getElementById('upload_enrollment_model'));
+        myModal.show();
+
+        $('#file_client_id').val(client_id);
+        $('#file_branch_id').val(client_branch_id);
+
+        $.ajax({
+            url: '<?= base_url("util/get_client_policy_list_for_remainder/") ?>' + client_id + '/' + client_branch_id,
+            type: "GET",
+            dataType: 'json',
+            success: function(res) {
+
+                console.log('uploadEnrollmentFile policy  list', res)
+
+                $('.loader').fadeOut();
+                $('.loader-mask').delay(350).fadeOut('slow');
+
+                if (res.status === false) {
+                    toastr.error(res.status);
+                    return;
+                }
+
+                appendpolicy(res.data)
+
+            },
+            error: function(xhr, status, error) {
+                console.error(xhr.responseText);
+                console.error(status, error);
+                $('.loader').fadeOut();
+                $('.loader-mask').delay(350).fadeOut('slow');
+            }
+        });
+
+    }
+
+    function appendpolicy(data)
+    {
+
+        $('#policy_id').empty();
+        $('#policy_id').append($('<option>', {
+            value: '',
+            text: 'Select',
+            selected: true
+        }));
+
+        $.each(data, function(index, item) {
+            var option = $('<option>', {
+                value: item.id,
+                text:`${item.policy_name ?? ''} - ${item.policy_no ?? ''}`
+            });
+            $('#policy_id').append(option);
+        });
+
+    }
+
+    $(document).ready(function() {
+        $("#uploadForm").submit(function(event) {
+            event.preventDefault(); // Prevent the default form submission
+
+            var client_id = $('#clients').val()
+            var client_branch_id = $('#branch_id').val()
+
+            var isValid = $('#uploadForm').parsley().validate();
+            if (!isValid) {
+                console.log('Form is Empty', 'Warning');
+                return;
+            }
+
+            if(client_id == 0 && client_branch_id == 0){   
+                toastr.warning('Select Client and Client Branch');
+                return false;
+            }
+
+            var formData = new FormData($(this)[0]);
+
+            $.ajax({
+                url: $(this).attr("action"),
+                type: 'POST',
+                data: formData,
+                processData: false, // Prevent jQuery from automatically processing the data
+                contentType: false, // Let jQuery handle the content type
+                headers: {
+                    "X-Requested-With": "XMLHttpRequest"
+                },
+                beforeSend: function() {
+                    $('.loader').fadeIn();
+                    $('.loader-mask').fadeIn();
+                },
+                success: function(response) {
+                    // Request successful, handle response
+                    console.log('Enrollment list:', response);
+
+                    $('.loader').fadeOut();
+                    $('.loader-mask').delay(350).fadeOut('slow');
+
+                    if (response.code === 200 && response.dataStatus === true && response.data !== "") {
+                        toastr.success('File upload success, Data validation is in-progress', 'success');
+                        setTimeout(function() {
+                            window.location.href = '<?= base_url("employee/upload/") ?>';
+                        }, 600);
+                    } else if (response.code === 404 && response.dataStatus === false) {
+                        console.error('No data found', response);
+                        toastr.error(response.message, 'error');
+                        setTimeout(function() {
+                            window.location.href = '<?= base_url("employee/upload/") ?>';
+                        }, 600);
+                    } else {
+                        console.error('Something went wrong!');
+                        // toastr.error('Something went wrong! Try later', 'Error');
+                        setTimeout(function() {
+                            window.location.href = '<?= base_url("employee/upload/") ?>';
+                        }, 600);
+                    }
+                },
+                error: function(xhr, status, error) {
+                    // Request failed, handle error
+                    console.error("Request failed:", status, error);
+                    console.error('Response:', xhr.responseText);
+                    // toastr.error('Something went wrong! Try later', 'Error');
+                    setTimeout(function() {
+                        window.location.href = '<?= base_url("employee/upload/") ?>';
+                    }, 1000);
+                },
+                complete: function() {
+                    $('.loader').fadeOut();
+                    $('.loader-mask').delay(350).fadeOut('slow');
+                }
+            });
+        });
+    });
+
+
+    function sendManualReminder(input)
+    {
+        console.log('sendManualReminder function called');
+
+        var client_id = $('#clients').val()
+        var client_branch_id = $('#branch_id').val()
+
+        console.log('input', input);
+        console.log('client_id', client_id);
+        console.log('client_branch_id', client_branch_id);
+
+        if(client_id == 0 && client_branch_id == 0)
+        {   
+            Swal.fire({
+                title: "warning!",
+                text: 'Please select the Client and Client Branch.',
+                icon: "warning"
+            });
+
+            return false
+        }
+
+        $.ajax({
+            url: '<?= base_url("util/send_manual_remainder/") ?>' + client_id + '/' + client_branch_id,
+            type: "GET",
+            dataType: 'json',
+            success: function(res) {
+
+                console.log('send_manual_remainder', res)
+
+                $('.loader').fadeOut();
+                $('.loader-mask').delay(350).fadeOut('slow');
+
+                if(res.status == false){
+                    toastr.info(res.message, 'INFO');
+                }else{
+                    toastr.success(res.message, 'SUCCESS');
+                }
+
+            },
+            error: function(xhr, status, error) {
+                console.error(xhr.responseText);
+                console.error(status, error);
+                $('.loader').fadeOut();
+                $('.loader-mask').delay(350).fadeOut('slow');
+            }
+        });
+
+    }
 </script>
diff --git a/app/Views/layout/header.php b/app/Views/layout/header.php
index bad283eb..5408fe1a 100644
--- a/app/Views/layout/header.php
+++ b/app/Views/layout/header.php
@@ -572,7 +572,7 @@
                                     <a href="<?= base_url('/employee/endorsement-list') ?>">View Endorsement</a>
                                 </li>
                                 <li>
-                                    <a href="<?= base_url('/employee/enrollment-list') ?>">View Enrollment</a>
+                                    <a href="<?= base_url('/employee/enrollment-list') ?>">View Enrolment</a>
                                 </li>
                             </ul>
                         </div>
diff --git a/app/Views/policy_grid.php b/app/Views/policy_grid.php
index 342f9261..85405d83 100644
--- a/app/Views/policy_grid.php
+++ b/app/Views/policy_grid.php
@@ -2698,14 +2698,14 @@ function createCheckboxes(obj, additional_relationship = [], unique_id = null, p
                         <input class="form-check-input" type="radio" name="childrens" id="children-1" value="1" ${childrensValue === '1' ? 'checked' : ''}>
                         <label class="form-check-label radioalign" for="children-1">1</label>
                     </div>
-                    <div class="form-check col-lg-1">
-                        <input class="form-check-input" type="radio" name="childrens" id="children-any" value="any" ${childrensValue === 'any' ? 'checked' : ''}>
-                        <label class="form-check-label radioalign" for="children-any">Any</label>
-                    </div>
                     <div class="form-check col-lg-1">
                         <input class="form-check-input" type="radio" name="childrens" id="children-no" value="0" ${childrensValue === '0' ? 'checked' : ''}>
                         <label class="form-check-label radioalign" for="children-unset">No</label>
                     </div>
+                    <div class="form-check col-lg-1">
+                        <input class="form-check-input" type="radio" name="childrens" id="children-any" value="any" ${childrensValue === 'any' ? 'checked' : ''}>
+                        <label class="form-check-label radioalign" for="children-any">Any</label>
+                    </div>
                     <div class="form-check col-lg-1">
                         <input class="form-check-input" type="radio" name="childrens" id="children-unset" value="NA" ${childrensValue === 'NA' ? 'checked' : ''}>
                         <label class="form-check-label radioalign" for="children-unset">NA</label>
@@ -2727,14 +2727,14 @@ function createCheckboxes(obj, additional_relationship = [], unique_id = null, p
                         <input class="form-check-input" type="radio" name="parents" id="parents-double" value="2" ${parentsValue === '2' ? 'checked' : ''}>
                         <label class="form-check-label radioalign" for="parents-double">2</label>
                     </div>
-                    <div class="form-check col-lg-1">
-                        <input class="form-check-input" type="radio" name="parents" id="parents-any" value="any" ${parentsValue === 'any' ? 'checked' : ''}>
-                        <label class="form-check-label radioalign" for="parents-any">Any</label>
-                    </div>
                     <div class="form-check col-lg-1">
                         <input class="form-check-input" type="radio" name="parents" id="parents-no" value="0" ${parentsValue === '0' ? 'checked' : ''}>
                         <label class="form-check-label radioalign" for="parents-no">No</label>
                     </div>
+                    <div class="form-check col-lg-1">
+                        <input class="form-check-input" type="radio" name="parents" id="parents-any" value="any" ${parentsValue === 'any' ? 'checked' : ''}>
+                        <label class="form-check-label radioalign" for="parents-any">Any</label>
+                    </div>
                     <div class="form-check col-lg-1">
                         <input class="form-check-input" type="radio" name="parents" id="parents-unset" value="NA" ${parentsValue === 'NA' ? 'checked' : ''}>
                         <label class="form-check-label radioalign" for="parents-unset">NA</label>
@@ -2755,14 +2755,14 @@ function createCheckboxes(obj, additional_relationship = [], unique_id = null, p
                         <input class="form-check-input" type="radio" name="parents-in-law" id="parents-in-law-double" value="2" ${parentsInLawValue === '2' ? 'checked' : ''}>
                         <label class="form-check-label radioalign" for="parents-in-law-double">2</label>
                     </div>
-                    <div class="form-check col-lg-1">
-                        <input class="form-check-input" type="radio" name="parents-in-law" id="parents-in-law-any" value="any" ${parentsInLawValue === 'any' ? 'checked' : ''}>
-                        <label class="form-check-label radioalign" for="parents-in-law-any">Any</label>
-                    </div>
                     <div class="form-check col-lg-1">
                         <input class="form-check-input" type="radio" name="parents-in-law" id="parents-in-law-no" value="0" ${parentsInLawValue === '0' ? 'checked' : ''}>
                         <label class="form-check-label radioalign" for="parents-in-law-no">No</label>
                     </div>
+                    <div class="form-check col-lg-1">
+                        <input class="form-check-input" type="radio" name="parents-in-law" id="parents-in-law-any" value="any" ${parentsInLawValue === 'any' ? 'checked' : ''}>
+                        <label class="form-check-label radioalign" for="parents-in-law-any">Any</label>
+                    </div>
                     <div class="form-check col-lg-1">
                         <input class="form-check-input" type="radio" name="parents-in-law" id="parents-in-law-unset" value="NA" ${parentsInLawValue === 'NA' ? 'checked' : ''}>
                         <label class="form-check-label radioalign" for="parents-in-law-unset">NA</label>

From 2cf9201337ad0b3901347e8419da1082c83e4433 Mon Sep 17 00:00:00 2001
From: "venkatesh.r" <venkatesh.r@venbainfotech.com>
Date: Wed, 31 Jul 2024 15:13:32 +0530
Subject: [PATCH 18/21] FIX_ENROLL_LIST : RV

---
 app/Views/enrollment_list.php | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/app/Views/enrollment_list.php b/app/Views/enrollment_list.php
index 48104451..67d6e5bf 100644
--- a/app/Views/enrollment_list.php
+++ b/app/Views/enrollment_list.php
@@ -269,8 +269,12 @@
         var client_id = $('#clients').val();
         var branch_id = $('#branch_id').val();
         if (client_id == '0' || branch_id == '0') {
-            alert('Please select values in both dropdowns.');
-            return;
+            Swal.fire({
+                title: "warning!",
+                text: 'Please select the Client and Client Branch.',
+                icon: "warning"
+            });
+            return false;
         }
 
         $.ajax({
@@ -280,7 +284,15 @@
                 "Content-Type": "application/json",
                 "X-Requested-With": "XMLHttpRequest"
             },
+            beforeSend: function() {
+                $('.loader').fadeIn();
+                $('.loader-mask').fadeIn();
+            },
             success: function(response) {
+                
+                $('.loader').fadeOut();
+                $('.loader-mask').delay(350).fadeOut('slow');
+
                 var data = JSON.parse(response);
                 console.log(data);
                 var table = $('#tickets-table').DataTable();
@@ -340,7 +352,10 @@
            
             },
             error: function(xhr, status, error) {
-                console.error('Error fetching data from API:', error);
+                console.error(xhr.responseText);
+                console.error(status, error);
+                $('.loader').fadeOut();
+                $('.loader-mask').delay(350).fadeOut('slow');
             }
         });
     }
@@ -534,7 +549,12 @@
         console.log('client_branch_id', client_branch_id);
 
         if(client_id == 0 && client_branch_id == 0){   
-           
+            
+            Swal.fire({
+                title: "warning!",
+                text: 'Please select the Client and Client Branch.',
+                icon: "warning"
+            });
             return false
         }
 

From 2e6dc18b7a733f0693e07b46e28dbed4764332ff Mon Sep 17 00:00:00 2001
From: "venkatesh.r" <venkatesh.r@venbainfotech.com>
Date: Thu, 1 Aug 2024 08:37:19 +0530
Subject: [PATCH 19/21] 
 FEAT_INSURER_EXPORT_TEMPLATE_PAGE_AND_COPY_INSURER_TEMPLATE : RV

---
 app/Config/Routes.php                 |   2 +
 app/Controllers/MasterController.php  |  47 +++++++-
 app/Views/insurer_basic_info.php      |  46 ++++----
 app/Views/insurer_export_templete.php | 152 ++++++++++++++++++++++++++
 app/Views/insurer_onboarding.php      |  46 +++-----
 5 files changed, 235 insertions(+), 58 deletions(-)
 create mode 100644 app/Views/insurer_export_templete.php

diff --git a/app/Config/Routes.php b/app/Config/Routes.php
index 440895a8..3ca47517 100644
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -275,6 +275,8 @@ $routes->group("/util", ["filter" => "authMVC"], function ($routes) {
     $routes->get("remove_rack_rate/(:any)", "ClientController::removeRackRate/$1");
     $routes->get("get_client_policy_list_for_remainder/(:any)", "EmployeeController::get_client_policy_list_for_remainder/$1");
     $routes->get("send_manual_remainder/(:any)", "DashboardController::sendManualRemainder/$1");
+    $routes->get("get_insurer_by_export_templete", "MasterController::getInsurerByExportTemplete");
+    $routes->get("copy_insurer_templete/(:any)", "MasterController::copyInsurerTemplete/$1");
 });
 
 $routes->cli('cli/processjob', 'JobWorker::processJob');
diff --git a/app/Controllers/MasterController.php b/app/Controllers/MasterController.php
index 603f9e51..969f01c6 100644
--- a/app/Controllers/MasterController.php
+++ b/app/Controllers/MasterController.php
@@ -29,6 +29,7 @@ use App\Models\StateModel;
 use App\Models\PolicyTypeModel;
 use App\Models\CDMasterModel;
 use App\Models\ClientDepositModel;
+use App\Models\InsurerExcelExportTemplateModel;
 
 class MasterController extends AdminController
 {   
@@ -52,6 +53,7 @@ class MasterController extends AdminController
     protected $CDMasterModel;
     protected $clientModel;
     protected $clientDepositModel;
+    protected $insurerTemplateModel;
 
 
     
@@ -60,7 +62,7 @@ class MasterController extends AdminController
         set_session_context('Master');
         $this->myLogger = \Config\Services::mylogger();
         
-        $this->insurerModel        = new ClientModel();
+        // $this->insurerModel        = new ClientModel();
         $this->userModel          = new UserModel();
         // $this->insurerBranchModel  = new ClientBranchModel();
         $this->insurerKYCDocsModel = new ClientKYCDocsModel();
@@ -79,6 +81,7 @@ class MasterController extends AdminController
         $this->CDMasterModel    = new CDMasterModel();
         $this->clientModel        = new ClientModel();
         $this->clientDepositModel        = new ClientDepositModel();
+        $this->insurerTemplateModel        = new InsurerExcelExportTemplateModel();
 
     }
 
@@ -150,6 +153,7 @@ class MasterController extends AdminController
 
         $editData['insurer']           = $this->insurerModel->where(['id' => $id, 'is_active' => 1])->first();
         $editData['insuer_branch']    = $this->insurerBranchModel->where(['insurer_id' => $id, 'is_active' => 1])->findAll();
+        $editData['insurer_templete_count']  = $this->insurerTemplateModel->where(['insurer_id' => $id, 'is_active' => 1])->countAllResults();
 
 
         // echo "<pre>";
@@ -209,7 +213,8 @@ class MasterController extends AdminController
         $insert = $this->insurerModel->insert($data);
         if($insert){
             $insurer_data = $this->insurerModel->where(['id' => $insert, 'is_active' => 1])->first();
-            echo json_encode(array("status" => true , 'data' => $insurer_data));
+            $insurer_templete_count = $this->insurerTemplateModel->where(['insurer_id' => $insert, 'is_active' => 1])->countAllResults();
+            echo json_encode(array("status" => true , 'data' => $insurer_data, 'templete_count' => $insurer_templete_count));
         }else{
             echo json_encode(array("status" => false));
         }
@@ -337,6 +342,44 @@ class MasterController extends AdminController
         }
     }
 
+    public function getInsurerByExportTemplete()
+    {
+        $insurer_data = $this->insurerModel
+            ->select('insurers.name as insurer_name, insurers.id, insurers.is_multi_event')
+            ->join('insurer_excel_export_template', 'insurer_excel_export_template.insurer_id = insurers.id')
+            ->groupBy('insurers.id')
+            ->findAll();
+
+        return $this->respond(['status' => true, 'code' => 200, 'data' => $insurer_data], 200);
+    }
+
+    public function copyInsurerTemplete($existing_insurer_id, $copy_insurer_id)
+    {
+        $insurer_templete_data = $this->insurerTemplateModel->where('insurer_id', $existing_insurer_id)->findAll();
+        $existing_insurer_templete_data =  $this->insurerTemplateModel->where('insurer_id', $copy_insurer_id)->delete();
+
+        $data_to_insert = [];
+        foreach ($insurer_templete_data as $value) {
+            $data_to_insert[] = [
+                "insurer_id" => $copy_insurer_id,
+                "policy_type_id" => $value['policy_type_id'],
+                "event_name" => $value['event_name'],
+                "type_name" => $value['type_name'],
+                "jsoncolumns" => $value['jsoncolumns'],
+                "created_by" => get_session_user(),
+                "is_active" => 1,
+            ];
+        }
+
+        $insert_result = $this->insurerTemplateModel->insertBatch($data_to_insert);
+        if($insert_result){
+            return $this->respond(['status' => true, 'message' => 'Template added successfully',  $insurer_templete_data]);
+        }else{
+            return $this->respond(['status' => true, 'message' => 'Failed to add template',  $insurer_templete_data]);
+        }
+
+
+    }
     // Insurer Ends
 
 
diff --git a/app/Views/insurer_basic_info.php b/app/Views/insurer_basic_info.php
index 8ba9dcc2..1ab97fc8 100644
--- a/app/Views/insurer_basic_info.php
+++ b/app/Views/insurer_basic_info.php
@@ -150,16 +150,12 @@ input:checked + .slider:before {
         $("#insurer_general_form").submit(function(events) {
 
             events.preventDefault();
-            // var isValid     = validateForm();
 
-            var isValid = true;
-            jQuery.each(events.target, function(index, event) {
-                if (event.validity.valid) {
-
-                } else {
-                    isValid = false;
-                }
-            });
+            var isValid = $('#insurer_General_PrimaryKey').parsley().validate();  
+            if (!isValid) { 
+                console.log('Form is Empty', 'Warning');
+                return ; 
+            }
 
             var PrimaryKey = $('#insurer_General_PrimaryKey').val();
             var form_action = '';
@@ -193,29 +189,25 @@ input:checked + .slider:before {
                         $('#insurer_id').val(res.data.id);
                         $('#insurer_General_PrimaryKey').val(res.data.id);
                         $('#insurer_id_branch').val(res.data.id);
-                        $('#insurer_branch_contacts_id').click();
+                        // $('#insurer_branch_contacts_id').click();
 
                         $('#btnBranchAdd').show();
                         var message = "Insurer General Info";
                         toastr.success(message, 'Success');
-
-                        // $.toast({
-                        //     text: 'Insurer General Info',
-                        //     heading: "Submitted Sucessfully", 
-                        //     position: 'top-right',
-                        //     icon: 'success', 
-                        //     bgColor: !1,
-                        // });
+                        
+                        if (PrimaryKey === '') {
+                            setTimeout(function(){
+                            window.location.href = '<?= base_url('master/insurer/list/')?>' + res.data.id
+                            }, 100)
+                        }
 
                     },
                     error: function(xhr, status, error) {
                         console.error(xhr.responseText);
                         console.error(status, error);
-
-                        setTimeout(function() {
-                            $('.loader').fadeOut();
-                            $('.loader-mask').delay(350).fadeOut('slow');
-                     console.log('Something Wrong!', 'warning');                        }, 1000);
+                        $('.loader').fadeOut();
+                        $('.loader-mask').delay(350).fadeOut('slow');
+                        console.log('Something Wrong!', 'warning');                        
                     }
                 });
             }
@@ -252,7 +244,8 @@ input:checked + .slider:before {
 
     });
 
-    function PreviewImage() {
+    function PreviewImage() 
+    {
         var oFReader = new FileReader();
         oFReader.readAsDataURL(document.getElementById("insurer_logo").files[0]);
 
@@ -260,4 +253,9 @@ input:checked + .slider:before {
             document.getElementById("uploadPreview").src = oFREvent.target.result;
         };
     };
+
+    //-----------------------------------------------------------------------------------------------------
+
+
+
 </script>
\ No newline at end of file
diff --git a/app/Views/insurer_export_templete.php b/app/Views/insurer_export_templete.php
new file mode 100644
index 00000000..3b4c049b
--- /dev/null
+++ b/app/Views/insurer_export_templete.php
@@ -0,0 +1,152 @@
+<div class="tab-pane fade" id="template-tab">
+
+    <input type="hidden" id="insurer_templete_count" value="<?= isset($insurer_templete_count) ? $insurer_templete_count : ''?>"> 
+    <div class="row">
+        <div class="form-group col-md-4">
+            <label for="email">Existing Insurer Export<span class="text-danger">*</span></label>
+            <select class="form-control" id="insurer" name="insurer" required>
+                <option value="">Select Insurer</option>
+            </select>
+        </div>
+
+        <div class="form-group col-md-3" style="position: relative;top: 28px;">
+            <label for="email"><span class="text-danger"></span></label>
+            <a href="#" class="btn btn-primary waves-effect waves-light" onclick="checkInsurerTemplete(this)">Copy</a>
+        </div>
+    </div>
+    
+</div>
+
+
+<script>
+
+    $(document).ready(function(){
+        $('#insurer').select2();
+        featchInsurerList()
+    })
+
+    function featchInsurerList()
+    {
+
+        $.ajax({
+            url: '<?= base_url("util/get_insurer_by_export_templete") ?>',
+            type: "GET",
+            dataType: 'json',
+            success: function(res) {
+
+                console.log('featchInsurerList list', res)
+
+                $('.loader').fadeOut();
+                $('.loader-mask').delay(350).fadeOut('slow');
+
+                appendInsurer(res.data)
+
+            },
+            error: function(xhr, status, error) {
+                console.error(xhr.responseText);
+                console.error(status, error);
+                $('.loader').fadeOut();
+                $('.loader-mask').delay(350).fadeOut('slow');
+            }
+        });
+
+    }
+
+    function appendInsurer(data)
+    {
+
+        $('#insurer').empty();
+        $('#insurer').append($('<option>', {
+            value: '',
+            text: 'Select',
+            selected: true
+        }));
+
+        $.each(data, function(index, item) {
+            var option = $('<option>', {
+                value: item.id,
+                text: item.insurer_name 
+            });
+            $('#insurer').append(option);
+        });
+
+    }
+
+    function checkInsurerTemplete(input)
+    {
+       var existing_insurer_id = $('#insurer').val();
+       var copy_insurer_id = $('#insurer_General_PrimaryKey').val()
+       var insurer_templete_count = $('#insurer_templete_count').val()
+
+       if(existing_insurer_id == '')
+       {
+            Swal.fire({
+                title: "warning!",
+                text: 'Please select the Insurer',
+                icon: "warning"
+            });
+            return false;
+       }
+
+       console.log('existing_insurer_id', existing_insurer_id)
+       console.log('copy_insurer_id', copy_insurer_id)
+       console.log('insurer_templete_count', insurer_templete_count)
+
+       $('#insurer').val('').change();
+
+       if(insurer_templete_count == 0){
+            copyTemplateAJAX(existing_insurer_id, copy_insurer_id)
+
+       }else{
+
+            Swal.fire({
+                title: "The insurer already have export template?",
+                text: "If you want to approve this the existing template will be deleted!",
+                icon: "warning",
+                showCancelButton: true,
+                confirmButtonColor: "#3085d6",
+                confirmButtonText: "Yes",
+            }).then((result) => {
+
+
+                if (result.isConfirmed) {            
+                    copyTemplateAJAX(existing_insurer_id, copy_insurer_id)
+                }
+
+            });
+
+       }
+
+
+    }
+
+    function copyTemplateAJAX(existing_insurer_id, copy_insurer_id)
+    {
+        $.ajax({
+            url: '<?= base_url("util/copy_insurer_templete/") ?>' + existing_insurer_id + '/' + copy_insurer_id,
+            type: "GET",
+            dataType: 'json',
+            success: function(res) {
+
+                console.log('checkInsurerTemplete response', res)
+
+                $('.loader').fadeOut();
+                $('.loader-mask').delay(350).fadeOut('slow');
+
+                if(res.status == false){
+                    toastr.error(res.message, 'ERROR');
+                }else{
+                    toastr.success(res.message, 'SUCCESS');
+                }
+
+            },
+            error: function(xhr, status, error) {
+                console.error(xhr.responseText);
+                console.error(status, error);
+                $('.loader').fadeOut();
+                $('.loader-mask').delay(350).fadeOut('slow');
+            }
+       });
+    }
+
+</script>
\ No newline at end of file
diff --git a/app/Views/insurer_onboarding.php b/app/Views/insurer_onboarding.php
index 359543d9..03e9598c 100644
--- a/app/Views/insurer_onboarding.php
+++ b/app/Views/insurer_onboarding.php
@@ -1,35 +1,3 @@
-<style>
-
-body {
-.multiselect-native-select {
-    position: relative;
-    /* bottom: 32px; */
-    select {
-        border: 0 !important;
-        clip: rect(0 0 0 0) !important;
-        height: 1px !important;
-        margin: -1px -1px -1px -3px !important;
-        overflow: hidden !important;
-        padding: 0 !important;
-        position: absolute !important;
-        width: 1px !important;
-        left: 50%;
-        top: 30px;
-    }
-}
-
-.multiselect-container{
-    width: 100% !important;
-}
-
-.multiselect-selected-text{
-    float: left !important;
-}
-
-}
-
-</style>
-
 <div class="row" id="insurer_add">
     <div class="col-12">
         <div class="card">
@@ -59,10 +27,24 @@ body {
                             <span class="d-none d-sm-inline-block">Branch & Contacts</span>
                         </a>
                     </li>
+
+                    <?php if(isset($insurer['id'])){ ?>
+
+                        <li class="nav-item">
+                            <a href="#template-tab" data-toggle="tab" aria-expanded="false" class="nav-link px-3 py-2" id="insurer_export_templete">
+                                <span class="mr-1"><i class="mdi mdi-file-export font-16"></i></span>
+                                <span class="d-none d-sm-inline-block">Insurer Export Templete</span>
+                            </a>
+                        </li>
+
+                    <?php } ?>
+
+
                 </ul>
                 <div class="tab-content">
                     <?php include('insurer_basic_info.php'); ?>
                     <?php include('insurer_branch.php'); ?>
+                    <?php include('insurer_export_templete.php'); ?>
                 </div>
             </div>
         </div>

From b8df71c1a09c15e16930e161b6f3aca991d396bb Mon Sep 17 00:00:00 2001
From: velz <velmurugan.s@venbainfotech.com>
Date: Thu, 1 Aug 2024 10:29:47 +0530
Subject: [PATCH 20/21] CHNAGE_JOB_FAILED_CAPTURED&FILE_STATUS_UPDATED

---
 app/Controllers/JobWorker.php | 23 ++++++++++++++++++++---
 app/Views/employee_upload.php |  6 +++++-
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/app/Controllers/JobWorker.php b/app/Controllers/JobWorker.php
index 5c099fe8..a0d5f694 100644
--- a/app/Controllers/JobWorker.php
+++ b/app/Controllers/JobWorker.php
@@ -6,6 +6,7 @@ namespace App\Controllers;
 
 
 use App\Models\JobModel;
+use App\Models\FileModel;
 class JobWorker extends AdminController
 {
     const STATUS_DONE = 'done';
@@ -287,23 +288,24 @@ class JobWorker extends AdminController
                 try
                 {
                     $response = $jobHandler($payload,$job->id);
+                    $job_status = self::STATUS_DONE;
                 }
                 catch(\Exception $e)
                 {
                     $job_status = self::STATUS_FAILED;
                     $runtime = $runtime === null ?  microtime(true) - $start : $runtime;
-                    $response = ['file_name' => $e->getFile(),'error' => $e->getMessage(),'line_no' => $e->getLine(),'info' => $e->getTraceAsString()];
+                    $response = ['file_name' => $e->getFile(),'error' => $e->getMessage(),'line_no' => $e->getLine(),'info' => $e->getTraceAsString(),'scope' => 'task failed'];
                 }
 
                 $runtime = microtime(true) - $start;
-                $job_status = self::STATUS_DONE;
+               
             }
             catch (\Exception $e)
             {
                 //die();
                 $job_status = self::STATUS_FAILED;
                 $runtime = $runtime === null ?  microtime(true) - $start : $runtime;
-                $response = ['file_name' => $e->getFile(),'error' => $e->getMessage(),'line_no' => $e->getLine(),'info' => $e->getTraceAsString()];
+                $response = ['file_name' => $e->getFile(),'error' => $e->getMessage(),'line_no' => $e->getLine(),'info' => $e->getTraceAsString(),'scope' => 'worker failed'];
             }
 
             $db->query("UPDATE jobs SET status=?, run_time=?, response=? WHERE id=? AND uuid=?", [
@@ -313,6 +315,21 @@ class JobWorker extends AdminController
                 $job->id,$job->uuid
             ]);
 
+            //update file status if this job is directly linked with a file id
+
+            if($job_status == self::STATUS_FAILED)
+            {
+                //get file from job payload
+                if(array_key_exists('file_id', $payload) && $payload['file_id'] != NULL && $payload['file_id'] != "" &&  is_numeric($payload['file_id']) && count($payload) == 1)
+                {
+                     $fileModel = new FileModel();
+                     $fileModel->where('id', $payload['file_id'])
+                                     ->set(['status' => 'failed','reason' => json_encode(['error_type' => 0,'error_summary' => [0],'error_data' => 'System Error, please contact Admin/Support team']) ])
+                                     ->update();
+                }
+
+            }
+
            // echo "Job $job->id  $job_status. Response - $response \n";
             // echo "Job $job->id  $job_status \n";
             SELF::streamOutput("Job $job->id  $job_status \n");
diff --git a/app/Views/employee_upload.php b/app/Views/employee_upload.php
index 9d40885e..cc94977d 100644
--- a/app/Views/employee_upload.php
+++ b/app/Views/employee_upload.php
@@ -476,6 +476,10 @@ function fetchFileError(file_id) {
                         var err_id = parseInt(key);
                         var err_count = file_error_data['error_summary'][key];
                         switch (err_id) {
+                             case 0:
+                                file_error_html +=
+                                    "<strong>"+file_error_data['error_data']+"</strong>";
+                                break;
                             case 1:
                                 file_error_html +=
                                     "<strong>Mandatory values missing</strong> <span class='badge badge-danger float-right'>" +
@@ -562,7 +566,7 @@ function fetchFileError(file_id) {
                         // console.log('file_error_html_2', file_error_html)
 
                     }
-                    if (err_id != 5 && err_id != 6) {
+                    if (err_id != 5 && err_id != 6 && err_id != 0) {
                         file_error_html += (file_error_html != "" ?
                             "<a href ='<?php echo base_url()?>" +
                             "employee/excel_error/" + file_id +

From 87ef9646658fccd01d6dc5582052e1b0fb798eaa Mon Sep 17 00:00:00 2001
From: velz <velmurugan.s@venbainfotech.com>
Date: Thu, 1 Aug 2024 11:50:36 +0530
Subject: [PATCH 21/21] FIX_ENROLMENT_SPELL_CHANGE

---
 app/Controllers/ClientController.php       |  6 +++---
 app/Controllers/EmployeeRestController.php |  2 +-
 app/Views/client_info.php                  |  2 +-
 app/Views/client_policy.php                | 12 ++++++------
 app/Views/enrollment_list.php              | 10 +++++-----
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/app/Controllers/ClientController.php b/app/Controllers/ClientController.php
index 2c6111af..a5c6ebf0 100644
--- a/app/Controllers/ClientController.php
+++ b/app/Controllers/ClientController.php
@@ -2038,10 +2038,10 @@ class ClientController extends AdminController
 
             if ($record['open_for_enrollment'] == 0) {
                 $open_for_enrollment_update_value = 1;
-                $message = 'Enrollment Opened  Successfully';
+                $message = 'Enrolment Opened  Successfully';
             } else if ($record['open_for_enrollment'] == 1) {
                 $open_for_enrollment_update_value = 0;
-                $message = 'Enrollment Closed Successfully';
+                $message = 'Enrolment Closed Successfully';
             }
 
             $data = $this->policesModel->getPolicyPremium($record['policy_id']);
@@ -2219,7 +2219,7 @@ class ClientController extends AdminController
 
             CASE
                 WHEN client_policy.inception_type = 1 THEN "File Upload"
-                WHEN client_policy.inception_type = 2 THEN "Enrollment"
+                WHEN client_policy.inception_type = 2 THEN "Enrolment"
                 ELSE "n/a"
             END as inception_type,
 
diff --git a/app/Controllers/EmployeeRestController.php b/app/Controllers/EmployeeRestController.php
index 01735912..9f928ce0 100644
--- a/app/Controllers/EmployeeRestController.php
+++ b/app/Controllers/EmployeeRestController.php
@@ -560,7 +560,7 @@ class EmployeeRestController extends AdminController
 
 
             // Set the header for download
-            $filename =  $empData[0]['policy_name'].'-Enrollment.xlsx';
+            $filename =  $empData[0]['policy_name'].'-Enrolment.xlsx';
             header('Content-Type: application/vnd.openxmlformats-officedocument.spreadsheetml.sheet');
             header('Content-Disposition: attachment;filename="' . $filename . '"');
             header('Cache-Control: max-age=0');
diff --git a/app/Views/client_info.php b/app/Views/client_info.php
index 879eceea..485684dc 100644
--- a/app/Views/client_info.php
+++ b/app/Views/client_info.php
@@ -129,7 +129,7 @@
                                             <th class="font-weight-medium"><label> Insurer </label></th>
                                             <th class="font-weight-medium"><label> TPA </label></th>
                                             <th class="font-weight-medium"><label> Policy Validity </label></th>
-                                            <th class="font-weight-medium"><label> Enrollment Status </label></th>
+                                            <th class="font-weight-medium"><label> Enrolment Status </label></th>
                                             <th class="font-weight-medium"><label> Policy Status </label></th>
                                         </tr>
                                     </thead>
diff --git a/app/Views/client_policy.php b/app/Views/client_policy.php
index 430faa62..90bc3763 100644
--- a/app/Views/client_policy.php
+++ b/app/Views/client_policy.php
@@ -312,13 +312,13 @@
                     if (item.open_for_enrollment == 1) {
 
                         enrollmentStatus = '<a href="#" data-id="' + item.id + '" id="' + item.policy_id +
-                            '" class="btnOpenEnroll" data-toggle="tooltip" data-placement="left" title="Click To Close Enrollment">Open</a>'
+                            '" class="btnOpenEnroll" data-toggle="tooltip" data-placement="left" title="Click To Close Enrolment">Open</a>'
 
 
                     } else if (item.open_for_enrollment == 0) {
 
                         enrollmentStatus =
-                            '<a href="#" data-toggle="tooltip" data-placement="top" title="Click To Open Enrollment"  data-id="' +
+                            '<a href="#" data-toggle="tooltip" data-placement="top" title="Click To Open Enrolment"  data-id="' +
                             item.id + '" id="' + item.policy_id + '" class="btnOpenEnroll">Closed</a>'
 
                     }
@@ -551,7 +551,7 @@
                         if (item.open_for_enrollment == 1) {
 
                             enrollmentStatus =
-                                '<a data-toggle="tooltip" data-placement="top" title="Click To Close Enrollment" href="#" data-id="' +
+                                '<a data-toggle="tooltip" data-placement="top" title="Click To Close Enrolment" href="#" data-id="' +
                                 item.id + '" id="' + item.policy_id +
                                 '" class="btnOpenEnroll">Open</a>'
 
@@ -559,7 +559,7 @@
                         } else if (item.open_for_enrollment == 0) {
 
                             enrollmentStatus =
-                                '<a data-toggle="tooltip" data-placement="top" title="Click To Open Enrollment" href="#" data-id="' +
+                                '<a data-toggle="tooltip" data-placement="top" title="Click To Open Enrolment" href="#" data-id="' +
                                 item.id + '" id="' + item.policy_id +
                                 '" class="btnOpenEnroll">Closed</a>'
 
@@ -982,7 +982,7 @@
                                     $('.btnOpenEnroll').each(function(index, element) {
                                         if ($(element).data('id') == client_policy_id) {
                                             $(element).html(
-                                                '<a data-toggle="tooltip" data-placement="top" title="Click To Close Enrollment" href="#" data-id="' +
+                                                '<a data-toggle="tooltip" data-placement="top" title="Click To Close Enrolment" href="#" data-id="' +
                                                 res.client_policy_data.id +
                                                 '" id="' + res.client_policy_data
                                                 .policy_id +
@@ -995,7 +995,7 @@
                                     $('.btnOpenEnroll').each(function(index, element) {
                                         if ($(element).data('id') == client_policy_id) {
                                             $(element).html(
-                                                '<a data-toggle="tooltip" data-placement="top" title="Click To Open Enrollment" href="#" data-id="' +
+                                                '<a data-toggle="tooltip" data-placement="top" title="Click To Open Enrolment" href="#" data-id="' +
                                                 res.client_policy_data.id +
                                                 '" id="' + res.client_policy_data
                                                 .policy_id +
diff --git a/app/Views/enrollment_list.php b/app/Views/enrollment_list.php
index 67d6e5bf..4052ecb5 100644
--- a/app/Views/enrollment_list.php
+++ b/app/Views/enrollment_list.php
@@ -193,7 +193,7 @@
     <div class="modal-dialog modal-dialog-centered">
         <div class="modal-content">
             <div class="modal-header">
-                <h4 class="modal-title" id="myCenterModalLabel">Upload Enrollment File</h4>
+                <h4 class="modal-title" id="myCenterModalLabel">Upload Enrolment File</h4>
                 <button type="button" id="close_btn" class="close" data-dismiss="modal" aria-hidden="true">×</button>
             </div>
             <div class="modal-body">
@@ -408,25 +408,25 @@
                     extend: 'copy',
                     text: '<i class="fa fa-copy"></i>',
                     titleAttr: 'Copy',
-                    filename: 'Enrollment List'
+                    filename: 'Enrolment List'
                 },
                 {
                     extend: 'print',
                     text: '<i class="fa fa-print"></i>',
                     titleAttr: 'Print',
-                    filename: 'Enrollment List'
+                    filename: 'Enrolment List'
                 },
                 {
                     extend: 'pdf',
                     text: '<i class="fa fa-file-pdf"></i>',
                     titleAttr: 'PDF',
-                    filename: 'Enrollment List'
+                    filename: 'Enrolment List'
                 },
                 {
                     extend: 'csv',
                     text: '<i class="fa fa-file-csv"></i>',
                     titleAttr: 'CSV',
-                    filename: 'Enrollment List'
+                    filename: 'Enrolment List'
                 }
             ],
             initComplete: function() {