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