From 9f5f93b73e909a4c126af9a1ff4fff53eef41597 Mon Sep 17 00:00:00 2001 From: vadivelJ96 Date: Tue, 4 Nov 2025 11:29:40 +0530 Subject: [PATCH 1/7] CHANGE_help_desk_tickets - VADIVEL J 2025-11-01 11:29 --- app/Views/bds_renewal_report_list.php | 29 ++++--------------- app/Views/layout/header.php | 40 ++++++++++++++------------- app/Views/mail_template.php | 17 ++++++++++-- app/Views/report_bds.php | 35 +++++++++++++++-------- 4 files changed, 65 insertions(+), 56 deletions(-) diff --git a/app/Views/bds_renewal_report_list.php b/app/Views/bds_renewal_report_list.php index e9cbb1c6..a3147bd1 100644 --- a/app/Views/bds_renewal_report_list.php +++ b/app/Views/bds_renewal_report_list.php @@ -154,35 +154,18 @@ $(document).ready(function() { // Global DataTables defaults $.extend(true, $.fn.dataTable.defaults, { language: { - search: "", // remove "Search:" label + search: ` +
+ _INPUT_ + +
`, searchPlaceholder: "Search" }, + paging: true, pageLength: 10, ordering: false }); -// Global init hook -$(document).on('init.dt', function (e, settings) { - let $filter = $(settings.nTableWrapper).find('.dataTables_filter'); - let $input = $filter.find('input'); - - if (!$filter.hasClass('custom-search')) { - // Wrap in Bootstrap input-group - $input - .addClass('form-control') - .wrap('
'); - - // Append icon - $input.after(` - - - - `); - - // Align to right - $filter.addClass('text-right custom-search'); - } -}); \ No newline at end of file diff --git a/app/Views/layout/header.php b/app/Views/layout/header.php index 5fe38d18..a1ab5d11 100755 --- a/app/Views/layout/header.php +++ b/app/Views/layout/header.php @@ -355,6 +355,7 @@ .content-page { padding: 80px 15px 65px 15px !important; + height: 100vh; } /* Media query for small screens */ @@ -1861,25 +1862,6 @@ - - -
  • - - /assets/images/leads_sb.png" alt="Logo" height="20"> - Leads - -
    • - - - -
  • - - /assets/images/ticket.png" alt="Logo" height="20"> - Tickets - -
    • -
  • @@ -2034,6 +2016,26 @@
    • + + +
  • + + /assets/images/leads_sb.png" alt="Logo" height="20"> + Leads + +
    • + + + +
  • + + /assets/images/ticket.png" alt="Logo" height="20"> + Tickets + +
    • + +
  • diff --git a/app/Views/mail_template.php b/app/Views/mail_template.php index 22582cf5..f2b322bd 100644 --- a/app/Views/mail_template.php +++ b/app/Views/mail_template.php @@ -32,6 +32,10 @@ width: 100%; /* default: allow full width */ } +p{ + margin:0 !important; +} + /* On screens smaller than 600px → force 100% */ @media screen and (max-width: 600px) { .mail-template-footer { @@ -53,9 +57,16 @@
    - Client Logo +
    +
    +     		tags and their contents - data = data.replace(/]*>(.*?)<\/a>/gi, ''); - // Also remove other HTML tags and   - data = $('
    ').html(data).text().replace(/\u00a0/g, ' ').trim(); + // If it's the first, 20th, 10th, or 11th column, clean the data + if (column === 0 || column === 20 || column === 10 || column === 11) { + // Remove all tags and their contents first + data = data.replace(/]*>.*?<\/a>/gi, ''); + + // Convert any HTML entities / remaining tags to plain text + // (jQuery used only for HTML decoding; you can replace with DOMParser if you prefer) + data = $('
    ').html(data).text(); + + // Normalize NBSP to space + data = data.replace(/\u00A0/g, ' '); + + // Remove BOM, zero-width, and control characters + data = data.replace(/[\u0000-\u001F\u007F-\u009F\u200B-\u200F\uFEFF]/g, '').trim(); } - // Force K and L columns to string + // Do NOT prepend \u200C. Return raw cleaned value. + // If you need to force Excel as string, use the formula trick or prepend a single apostrophe. if (column === 10 || column === 11) { - // Option 1: prepend single quote - return '\u200C' + data; - - // Option 2: use Excel formula trick + // Option A: return as Excel formula to preserve formatting // return '="' + data + '"'; + + // Option B: prepend apostrophe (visible in Excel formula bar, not in cell) + // return "'" + data; + + return data; } + return data; + } } }, From 711eea853be8c7679ab2187f354983907ca187fa Mon Sep 17 00:00:00 2001 From: vadivelJ96 Date: Tue, 4 Nov 2025 11:45:01 +0530 Subject: [PATCH 2/7] CHANGE_help_desk_tickets - VADIVEL J 2025-11-01 11:44 --- app/Views/layout/header.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Views/layout/header.php b/app/Views/layout/header.php index a1ab5d11..ffaba0a3 100755 --- a/app/Views/layout/header.php +++ b/app/Views/layout/header.php @@ -355,7 +355,7 @@ .content-page { padding: 80px 15px 65px 15px !important; - height: 100vh; + min-height: 1000px ; } /* Media query for small screens */ From af9e68bf217742e3325d5aacdea7ff86872bcf9d Mon Sep 17 00:00:00 2001 From: vadivelJ96 Date: Tue, 4 Nov 2025 12:32:34 +0530 Subject: [PATCH 3/7] CHANGE_help_desk_tickets - VADIVEL J 2025-11-04 12:32 --- app/Views/mail_template.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Views/mail_template.php b/app/Views/mail_template.php index f2b322bd..a314977d 100644 --- a/app/Views/mail_template.php +++ b/app/Views/mail_template.php @@ -58,8 +58,8 @@ p{
    From c44a3f05afc1db4d031c5bac5dc50e82cc367a4f Mon Sep 17 00:00:00 2001 From: vadivelJ96 Date: Tue, 4 Nov 2025 12:47:34 +0530 Subject: [PATCH 5/7] CHANGE_help_desk_tickets - VADIVEL J 2025-11-04 12:47 --- app/Views/mail_template.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Views/mail_template.php b/app/Views/mail_template.php index c51ac87b..f111bd54 100644 --- a/app/Views/mail_template.php +++ b/app/Views/mail_template.php @@ -56,7 +56,7 @@ p{
    - + diff --git a/app/Views/bds_report_Insurer_wise_Data.php b/app/Views/bds_report_Insurer_wise_Data.php index cbc717a2..835f48d6 100644 --- a/app/Views/bds_report_Insurer_wise_Data.php +++ b/app/Views/bds_report_Insurer_wise_Data.php @@ -19,6 +19,10 @@ table.dataTable tbody td { .right-align-input { text-align: right; } + +#scroll-horizontal-datatable tfoot .right-align-input { + text-align: right !important; +}
    @@ -84,6 +88,7 @@ table.dataTable tbody td { text: ' CSV ', className: 'app-btn-primary ', title: 'Insurer-Wise-Report-List', + footer: true }, { extend: 'excel', @@ -93,6 +98,7 @@ table.dataTable tbody td { orthogonal: 'sort' }, className: 'app-btn-primary ', + footer: true } ] } diff --git a/app/Views/bds_report_bap_wise_data.php b/app/Views/bds_report_bap_wise_data.php index 12c6e8a2..3b2175db 100644 --- a/app/Views/bds_report_bap_wise_data.php +++ b/app/Views/bds_report_bap_wise_data.php @@ -19,6 +19,12 @@ table.dataTable tbody td { .right-align-input { text-align: right; } + +#scroll-horizontal-datatable tfoot .right-align-input { + text-align: right !important; +} + +
    @@ -84,6 +90,7 @@ table.dataTable tbody td { text: ' CSV ', className: 'app-btn-primary ', title: 'Bap-Wise-Report-List', + footer: true }, { extend: 'excel', @@ -93,6 +100,7 @@ table.dataTable tbody td { }, className: 'app-btn-primary ', title: 'Bap-Wise-Report-List', + footer: true } ] } diff --git a/app/Views/irba_report.php b/app/Views/irba_report.php index 56f41f07..ee134535 100644 --- a/app/Views/irba_report.php +++ b/app/Views/irba_report.php @@ -64,6 +64,7 @@
    +
    @@ -131,19 +132,26 @@ var toDate = $('#endDate').val(); var category = $('#category').val(); var report_type = $('#report_type').val(); + + if(category == false || report_type == false){ + alert("Please Fill the Mandatory Fields Category and Report Type to Proceed ..!! "); + return ; + } + var requestData = { fromDate: fromDate, toDate: toDate, category: category, report_type: report_type }; - console.log(typeof fromDate); + var url = ''; $('.loader').fadeIn(); $('.loader-mask').fadeIn(); sendAjaxRequestForGlobal(url, 'POST', requestData, function(response) { if (response.status == true) { $('#report').html(response.html); + // $('#view_name').html(response.view_name); $('.loader').fadeOut(); $('.loader-mask').delay(350).fadeOut('slow'); diff --git a/app/Views/irda_bap_client_report_list.php b/app/Views/irda_bap_client_report_list.php index 20d18f17..3e9dc0fe 100644 --- a/app/Views/irda_bap_client_report_list.php +++ b/app/Views/irda_bap_client_report_list.php @@ -31,6 +31,10 @@ table.dataTable tbody td { background-color: #ffffff; /* White shade */ } +#scroll-horizontal-datatable tfoot .right-align-input { + text-align: right !important; +} +
    @@ -216,6 +220,7 @@ $(document).ready(function() { text: ' CSV ', className: 'app-btn-primary ', title: 'IRDA-BAP-CLIENT-List', + footer:true }, { extend: 'excel', @@ -225,6 +230,7 @@ $(document).ready(function() { orthogonal: 'sort' }, className: 'app-btn-primary ', + footer:true } ] } diff --git a/app/Views/irda_bap_insurer_report_list.php b/app/Views/irda_bap_insurer_report_list.php index 6d213238..0ed8d492 100644 --- a/app/Views/irda_bap_insurer_report_list.php +++ b/app/Views/irda_bap_insurer_report_list.php @@ -20,6 +20,10 @@ table.dataTable tbody td { .right-align-input { text-align: right; } + +#scroll-horizontal-datatable tfoot .right-align-input { + text-align: right !important; +}
    @@ -167,7 +171,7 @@ table.dataTable tbody td {
    - + @@ -299,12 +303,14 @@ $(document).ready(function() { buttons: [ { extend: 'csv', + footer:true, text: ' CSV ', className: 'app-btn-primary ', title: 'IRDA-BAP-INSURER-List', }, { extend: 'excel', + footer:true, text: ' EXCEL ', className: 'app-btn-primary ', title: 'IRDA-BAP-INSURER-List', diff --git a/app/Views/notification.php b/app/Views/notification.php index eb7c0336..99be6c3d 100755 --- a/app/Views/notification.php +++ b/app/Views/notification.php @@ -1523,6 +1523,8 @@ submitButton.innerText = 'Submit'; } }); + + } function removeAttachment(id) { diff --git a/app/Views/outstanding_report_list.php b/app/Views/outstanding_report_list.php index 0242fbf4..0dc70504 100644 --- a/app/Views/outstanding_report_list.php +++ b/app/Views/outstanding_report_list.php @@ -40,24 +40,10 @@
    - -
    - - @@ -68,65 +54,13 @@
    - - - - - - -
    - - - - - - - -
    @@ -294,6 +228,7 @@ getURLParams() $('#client_id').select2(); $('#insurer_id').select2(); + $('#insurer_branch_id').select2(); $('#policy_type_id').select2(); }) @@ -304,10 +239,17 @@ var end_date = $('#endDate').val(); var client_id = $('#client_id').val(); var insurer_id = $('#insurer_id').val(); + var insurer_branch_id = $('#insurer_branch_id').val(); var policy_type_id = $('#policy_type_id').val(); var date_type = $('#date_type').val(); var issuer = $('#issuer').val(); + if(insurer_id == false || insurer_branch_id == false){ + alert("Please Choose Insurer and its branch to Proceed .. !!"); + return; + } + + console.log(start_date + '-' + end_date); var queryParams = { @@ -315,6 +257,7 @@ end_date: end_date, client_id: client_id, insurer_id: insurer_id, + insurer_branch_id : insurer_branch_id, policy_type_id: policy_type_id, date_type: date_type, issuer: issuer, @@ -338,6 +281,7 @@ const endDate = params.get('end_date') || 0; // Default to 0 if not found const client_id = params.get('client_id') || 0; // Default to 0 if not found const insurer_id = params.get('insurer_id') || 0; // Default to 0 if not found + const insurer_branch_id = params.get('insurer_branch_id') || 0 ; // Default to 0 if not found const policy_type_id = params.get('policy_type_id') || 0; // Default to 0 if not found const date_type = params.get('date_type') || 0; // Default to 0 if not found const issuer = params.get('issuer') || 0; // Default to 0 if not found @@ -348,6 +292,7 @@ console.log('endDate', endDate) console.log('client_id', client_id) console.log('insurer_id', insurer_id) + console.log('insurer_branch_id',insurer_branch_id) console.log('policy_type_id', policy_type_id) console.log('date_type', date_type) console.log('issuer', issuer) @@ -361,7 +306,8 @@ $('#start_date').val(startDate) $('#end_date').val(endDate) $('#client_id').val(client_id).change() - $('#insurer_id').val(insurer_id).change() + $('#insurer_id').val(insurer_id) + $('#insurer_branch_id').val(insurer_branch_id).change() $('#policy_type_id').val(policy_type_id).change() $('#date_type').val(date_type) $('#issuer').val(issuer) @@ -415,6 +361,7 @@ // Reset all select dropdowns to the first option $('#client_id').val('0').change(); $('#insurer_id').val('0').change(); + $('#insurer_branch_id').val('0').change(); $('#policy_type_id').val('0').change(); $('#date_type').val('0'); $('#issuer').val('0'); @@ -457,4 +404,68 @@ console.log(apiURL); window.location.href = apiURL; } + + function getInsurerBranch(){ + + let insurer_id = $('#insurer_id').val(); + + if(insurer_id == 0){ + return; + } + + $('.loader').fadeIn(); + $('.loader-mask').fadeIn('slow'); + + $.ajax({ + url: '', + type: 'POST', + data: {insurer_id}, + success: function(response) { + + console.log(response) + $('.loader').fadeOut(); + $('.loader-mask').delay(350).fadeOut('slow'); + + if (response.data && response.data != []) { + + let options =""; + let insurer_branch_list = response.data; + + insurer_branch_list.forEach(element => { + options += ``; + }); + + $('#insurer_branch_id').html('' + options); + + } + }, + error: function(xhr, status, error) { + $('.loader').fadeOut(); + $('.loader-mask').delay(350).fadeOut('slow'); + // Handle error + console.error('Upload error occurred:'); + console.error('Status: ', status); // Status of the request + console.error('Error: ', error); // Specific error message + console.error('XHR Object: ', xhr); // Full XHR object with response details + + // Optionally log server response, if available + if (xhr.responseText) { + console.error('Response Text: ', xhr.responseText); + } + + toastr.warning('Error uploading file', 'WARNING'); + console.error('Upload error:', error); + }, + complete: function() { + $('.loader').fadeOut(); + $('.loader-mask').delay(350).fadeOut('slow'); + console.log("Ajax call completed successfully"); + } + }); + + + + } + + \ No newline at end of file diff --git a/app/Views/variance_report_list.php b/app/Views/variance_report_list.php index 476a0439..48de74e7 100644 --- a/app/Views/variance_report_list.php +++ b/app/Views/variance_report_list.php @@ -231,12 +231,12 @@ buttons: [{ extend: 'csv', text: ' CSV ', - title: 'Policy-Tranction-BDS-List', + title: 'Variance-Report-List', }, { extend: 'excel', text: ' EXCEL ', - title: 'Policy-Tranction-BDS-List', + title: 'Variance-Report-List', customize: function(xlsx) { var sheet = xlsx.xl.worksheets['sheet1.xml']; var total = 0; From 2455e1bf9cdcd6154b26767325e5c4a2fda64fc5 Mon Sep 17 00:00:00 2001 From: vadivelJ96 Date: Tue, 4 Nov 2025 18:30:40 +0530 Subject: [PATCH 7/7] CHANGE_help_desk_tickets - VADIVEL J 2025-11-04 18:30 --- app/Views/report_bds_new.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Views/report_bds_new.php b/app/Views/report_bds_new.php index 474f92f1..92bca589 100644 --- a/app/Views/report_bds_new.php +++ b/app/Views/report_bds_new.php @@ -208,7 +208,7 @@ echo base_url('policy_tranction/endorsement/list') . '?pt_id=' . $row['id'] ; } ?>" class="mdi mdi-pencil" > -
    +
    +
    +
    		Default Logo From e6911a06ab8a68b0e1fd002fbfcfbed7caa02fc6 Mon Sep 17 00:00:00 2001 From: vadivelJ96 Date: Tue, 4 Nov 2025 17:50:19 +0530 Subject: [PATCH 6/7] CHANGE_help_desk_tickets - VADIVEL J 2025-11-04 17:50 --- app/Config/Routes.php | 1 + app/Controllers/BDSReportController.php | 24 +++- app/Controllers/MasterController.php | 9 ++ app/Views/bds_multi_report.php | 2 +- app/Views/bds_report_Insurer_wise_Data.php | 6 + app/Views/bds_report_bap_wise_data.php | 8 ++ app/Views/irba_report.php | 10 +- app/Views/irda_bap_client_report_list.php | 6 + app/Views/irda_bap_insurer_report_list.php | 8 +- app/Views/notification.php | 2 + app/Views/outstanding_report_list.php | 157 +++++++++++---------- app/Views/variance_report_list.php | 4 +- 12 files changed, 152 insertions(+), 85 deletions(-) diff --git a/app/Config/Routes.php b/app/Config/Routes.php index 0bc4cbf5..c1cf6375 100755 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -213,6 +213,7 @@ $routes->group("/master", ["filter" => "authMVC"], function ($routes) { $routes->post("edit", "MasterController::editInsurerBranch"); $routes->get("editget/(:any)", "MasterController::editInsurerGet/$1"); $routes->get("list/(:any)", "MasterController::insurerBranchList/$1"); + $routes->post("getList", "MasterController::getInsurerBranchList"); $routes->get("remove/(:any)", "MasterController::removeInsurerBranch/$1"); }); }); diff --git a/app/Controllers/BDSReportController.php b/app/Controllers/BDSReportController.php index 38c5ecd4..9ba0dca9 100644 --- a/app/Controllers/BDSReportController.php +++ b/app/Controllers/BDSReportController.php @@ -181,7 +181,7 @@ class BDSReportController extends AdminController 'Client' => 'client' ]; - $data['page_name'] = "IRBA Report"; + $data['page_name'] = "IRDA Report"; return $this->loadLayout('irba_report', $data); } else { @@ -202,9 +202,11 @@ class BDSReportController extends AdminController $viewData = []; } + $view_name = "bds_report_Insurer_wise_Data" ; + $html = view('bds_report_Insurer_wise_Data', $viewData); - return $this->respond(['status' => true, 'html' => $html], 200); + return $this->respond(['status' => true, 'html' => $html , 'view_name' => $view_name], 200); } else if ($report_type == 'bap') { $life = $category == 'life' ? 1 : 0; @@ -217,33 +219,40 @@ class BDSReportController extends AdminController $viewData = []; } + $view_name = "bds_report_bap_wise_data"; $html = view('bds_report_bap_wise_data', $viewData); - return $this->respond(['status' => true, 'html' => $html], 200); + return $this->respond(['status' => true, 'html' => $html , 'view_name' => $view_name], 200); } else if ($report_type == 'bapInsurer') { //Condition for BAP Insurer wise date $category = $category == 'life' ? 1 : 0; $viewData['data'] = $this->getBAPInsurerData($category, $fromDate, $toDate); + + $view_name = "irda_bap_insurer_report_list"; $html = view('irda_bap_insurer_report_list', $viewData); - return $this->respond(['status' => true, 'html' => $html], 200); + return $this->respond(['status' => true, 'html' => $html , 'view_name' => $view_name], 200); } else if ($report_type == 'bapClient') { //Condition for BAP Client wise date $category = $category == 'life' ? 1 : 0; $viewData['data'] = $this->getBAPClientData($category, $fromDate, $toDate); + + $view_name = "irda_bap_client_report_list"; $html = view('irda_bap_client_report_list', $viewData); - return $this->respond(['status' => true, 'html' => $html], 200); + return $this->respond(['status' => true, 'html' => $html , 'view_name' => $view_name], 200); } else if ($report_type == 'client') { //Condition for Client wise date $category = $category == 'life' ? 1 : 0; $viewData['data'] = $this->getClientData($category, $fromDate, $toDate); + $view_name = "irda_client_report_list"; + $html = view('irda_client_report_list', $viewData); - return $this->respond(['status' => true, 'html' => $html], 200); + return $this->respond(['status' => true, 'html' => $html , 'view_name' => $view_name], 200); } } } @@ -932,8 +941,9 @@ class BDSReportController extends AdminController $data['client_type'] = [1 => 'Group', 2 => 'Individual']; $data['renewal_data'] = $this->policyTransactionModel->getRenewalReportData($fromDate, $toDate, $client_type, $client_id, $issuer); // print_r($data); die; + $view_name = "bds_renewal_report_list"; $html = view('bds_renewal_report_list', $data); - return $this->respond(['status' => true, 'html' => $html], 200); + return $this->respond(['status' => true, 'html' => $html , 'view_name' => $view_name], 200); } } diff --git a/app/Controllers/MasterController.php b/app/Controllers/MasterController.php index 58618abf..6f747c67 100755 --- a/app/Controllers/MasterController.php +++ b/app/Controllers/MasterController.php @@ -354,6 +354,15 @@ class MasterController extends AdminController exit(); } + public function getInsurerBranchList() + { + $id = $this->request->getPost('insurer_id'); + + $insurer_branch_list = $this->insurerBranchModel->where(['insurer_id' => $id, 'is_active' => 1])->findAll()??[]; + + return $this->response->setJSON([ 'data' => $insurer_branch_list ])->setStatusCode(200); + } + public function editInsurerGeneralInfo() { $this->myLogger->logme('error','edit Insurer general info function called'); diff --git a/app/Views/bds_multi_report.php b/app/Views/bds_multi_report.php index fac8a2e0..b2cbb84f 100644 --- a/app/Views/bds_multi_report.php +++ b/app/Views/bds_multi_report.php @@ -39,7 +39,7 @@ // Get headers dynamically $headers = array_keys($data[0]); foreach ($headers as $header): ?> - TOTAL
    Grand Total