Nhances/nhance
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of bitbucket.org:jubilian/nhance into dev

Browse Source
This commit is contained in:
velz 2024-03-29 17:08:07 +05:30
commit 2c1de1d2bf
5 changed files with 192 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/Views/client_list.php
View File

@ -1,3 +1,14 @@
<style>
.table th,
.table td {
padding: 8px;
}
table.dataTable tbody td {
padding: 4px 4px !important;
}
</style>
<div class="row" id="client_list"> <div class="row" id="client_list">
<div class="col-12"> <div class="col-12">
<div class="card"> <div class="card">

269
app/Views/employee_list.php
View File

@ -1,53 +1,62 @@
<style>
.table th,
.table td {
padding: 8px;
}
table.dataTable tbody td {
padding: 4px 4px !important;
}
</style>
<br> <div class="row">
<div class="row"> <div class="col-xl-6">
<div class="col-12"> <div id="accordion" class="mb-3">
<div class="card"> <div class="card mb-1">
<div class="card-body"> <h5 class="m-1">
<!-- <div class="text-center"> --> <a id="toggleIcon" class="text-dark float-right" data-toggle="collapse" href="#collapseOne"
<div class="row"> aria-expanded="true">
<div class="col-md-6 col-xl-3"> <i id="icon" class="mdi mdi-chevron-down mr-1 text-primary" style="font-size: 28px;"></i>
<div class="form-group mb-3"> </a>
<label>Client</label> <br/> </h5>
<select class="form-control" id="clients"> <div id="collapseOne" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion">
<option value="0">Select</option> <div class="card-body">
</select> <!-- <div class="text-center"> -->
</div> <div class="row">
</div> <div class="col-md-6 col-xl-3">
<div class="col-md-6 col-xl-3"> <div class="form-group mb-3">
<div class="form-group mb-3"> <label>Client</label> <br />
<label>Policy</label> <br/> <select class="form-control" id="clients">
<select class="form-control" id="policies"> <option value="0">Select</option>
<option value="0">Select</option> </select>
</select> </div>
</div> </div>
</div> <div class="col-md-6 col-xl-3">
</div> <div class="form-group mb-3">
<div class="row"> <label>Policy</label> <br />
<div class="col-12" style="text-align: right;"> <select class="form-control" id="policies">
<a href="<?= base_url("employee/list"); ?>" class="btn btn-primary waves-effect waves-light" id="get-emp-list" onclick="fetchEmpolyeeList(event);">Submit</a> <option value="0">Select</option>
</div> </select>
</div>
<!-- </div> -->
</div>
</div>
</div> </div>
</div> </div>
</div> </div>
<div class="row">
<div class="col-12" style="text-align: right;">
<!-- start page title --> <a href="<?= base_url("employee/list"); ?>"
<div class="row"> class="btn btn-primary waves-effect waves-light" id="get-emp-list"
<div class="col-12"> onclick="fetchEmpolyeeList(event);">Submit</a>
<div class="page-title-box page-title-box-alt"> </div>
<h4 class="page-title"></h4> </div>
<div class="page-title-right"> <!-- </div> -->
</div>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<!-- end page title -->
<div class="row" id="client_list"> <div class="row" id="client_list">
<div class="col-12"> <div class="col-12">
<div class="card"> <div class="card">
@ -58,20 +67,21 @@
</div> </div>
</div> </div>
<table class="table table-hover m-0 table-centered dt-responsive nowrap w-100" cellspacing="0" id="tickets-table"> <table class="table table-hover m-0 table-centered dt-responsive nowrap w-100" cellspacing="0"
id="tickets-table">
<thead class="bg-light"> <thead class="bg-light">
<tr> <tr>
<th class="font-weight-medium">SNO</th> <th class="font-weight-medium">SNO</th>
<th class="font-weight-medium">Employee code</th> <!-- <th class="font-weight-medium">Employee code</th> -->
<th class="font-weight-medium">Name</th> <th class="font-weight-medium">Name/code</th>
<th class="font-weight-medium">Policy name</th> <th class="font-weight-medium">Policy name</th>
<th class="font-weight-medium">Insurar name</th> <th class="font-weight-medium">Insurar name</th>
<th class="font-weight-medium">TPA ID</th> <th class="font-weight-medium">TPA ID</th>
<th class="font-weight-medium">UHID ID</th> <th class="font-weight-medium">UHID ID</th>
<th class="font-weight-medium">Policy status</th> <th class="font-weight-medium">Policy status</th>
<th class="font-weight-medium">Premium</th> <th class="font-weight-medium">Premium</th>
<th class="font-weight-medium">Action</th> <th class="font-weight-medium">Action</th>
</tr> </tr>
</thead> </thead>
<tbody class="font-12"> <tbody class="font-12">
@ -82,8 +92,8 @@
<tr> <tr>
<td><b><?php echo ($key + 1)?></b></td> <td><b><?php echo ($key + 1)?></b></td>
<td><?php echo $employee['emp_code']?></td> <!-- <td><?php echo $employee['emp_code']?></td> -->
<td><?php echo $employee['name']?></td> <td><?php echo $employee['name']?>( <?php echo $employee['emp_code']?> )</td>
<td><?php echo $employee['policy_name']?></td> <td><?php echo $employee['policy_name']?></td>
<td><?php echo $employee['insurer_short_name']?></td> <td><?php echo $employee['insurer_short_name']?></td>
<td><?php echo $employee['tpa_id']?></td> <td><?php echo $employee['tpa_id']?></td>
@ -92,12 +102,20 @@
<td><?php echo $employee['premium']?></td> <td><?php echo $employee['premium']?></td>
<td> <td>
<div class="btn-group dropdown"> <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> <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"> <div class="dropdown-menu dropdown-menu-right">
<a class="dropdown-item" href="#"><i class="mdi mdi-pencil mr-2 text-muted font-18 vertical-middle"></i>Edit Ticket</a> <a class="dropdown-item" href="#"><i
<a class="dropdown-item" href="#"><i class="mdi mdi-check-all mr-2 text-muted font-18 vertical-middle"></i>Close</a> class="mdi mdi-pencil mr-2 text-muted font-18 vertical-middle"></i>Edit
<a class="dropdown-item" href="#"><i class="mdi mdi-delete mr-2 text-muted font-18 vertical-middle"></i>Remove</a> Ticket</a>
<a class="dropdown-item" href="#"><i class="mdi mdi-star mr-2 font-18 text-muted vertical-middle"></i>Mark as Unread</a> <a class="dropdown-item" href="#"><i
class="mdi mdi-check-all mr-2 text-muted font-18 vertical-middle"></i>Close</a>
<a class="dropdown-item" href="#"><i
class="mdi mdi-delete mr-2 text-muted font-18 vertical-middle"></i>Remove</a>
<a class="dropdown-item" href="#"><i
class="mdi mdi-star mr-2 font-18 text-muted vertical-middle"></i>Mark as
Unread</a>
</div> </div>
</div> </div>
</td> </td>
@ -114,85 +132,84 @@
<div id="loader" class="loader" style="display:none;">SPINNER</div> <div id="loader" class="loader" style="display:none;">SPINNER</div>
<script> <script>
// Declare a global variable to store API response data
var clientPolicies = [];
// Declare a global variable to store API response data $(document).ready(function() {
var clientPolicies = []; console.log("document loaded");
//fetchClientPolicies();
$( document ).ready(function() { });
console.log( "document loaded" );
//fetchClientPolicies();
}); $(window).on("load", function() {
console.log("window loaded");
fetchClientPolicies();
$( window ).on( "load", function() { });
console.log( "window loaded" );
fetchClientPolicies();
});
function fetchClientPolicies() { function fetchClientPolicies() {
$('#loader').show(); $('#loader').show();
var apiURL = '<?php echo base_url();?>' + 'util/clients-with-policies'; var apiURL = '<?php echo base_url();?>' + 'util/clients-with-policies';
console.log('fetchClientPolicies'); console.log('fetchClientPolicies');
console.log(apiURL); console.log(apiURL);
$.ajax({ $.ajax({
url: apiURL, url: apiURL,
method: 'GET', method: 'GET',
headers: { headers: {
"Content-Type": "application/json", "Content-Type": "application/json",
"X-Requested-With": "XMLHttpRequest" "X-Requested-With": "XMLHttpRequest"
}, },
success: function(response) { success: function(response) {
// console.log(response.code); // console.log(response.code);
// console.log(response.dataStatus); // console.log(response.dataStatus);
// console.log(response.data); // console.log(response.data);
if (response.code === 200 && response.dataStatus === true && response.data !== "") { if (response.code === 200 && response.dataStatus === true && response.data !== "") {
try { try {
clientPolicies = (response.data); clientPolicies = (response.data);
// console.log(clientPolicies); // console.log(clientPolicies);
appendClients(clientPolicies); appendClients(clientPolicies);
} catch (error) } catch (error) {
{ console.error('Error parsing API response data:', error);
console.error('Error parsing API response data:', error); }
} } else if (response.code === 404 && response.dataStatus === false) {
} else if(response.code === 404 && response.dataStatus === false){ console.error('no data found', response);
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);
} }
else
{
console.error('Something went wrong!');
}
},
error: function(xhr, status, error) {
console.error('Error fetching data from API:', error);
}
}); });
$('#loader').hide(); $('#loader').hide();
} }
function appendClients(data) { function appendClients(data) {
$.each(data, function(index, item) { $.each(data, function(index, item) {
$('#clients').append($('<option>', { $('#clients').append($('<option>', {
value: item.id, value: item.id,
text: item.client_name text: item.client_name
})); }));
}); });
} }
function appendPolicies(data) { function appendPolicies(data) {
$('#policies').empty(); $('#policies').empty();
$('#policies').append($('<option>', { value: '0',text: 'Select'})); $('#policies').append($('<option>', {
value: '0',
text: 'Select'
}));
$.each(data, function(index, item) { $.each(data, function(index, item) {
$('#policies').append($('<option>', { $('#policies').append($('<option>', {
value: item.id, value: item.id,
text: item.name text: item.name
})); }));
}); });
} }
$('#clients').on('change', function() { $('#clients').on('change', function() {
var selectedClient = $(this).val(); var selectedClient = $(this).val();
@ -201,11 +218,11 @@ $('#clients').on('change', function() {
// Check if the selected option exists in apiData // Check if the selected option exists in apiData
var foundPolicies = clientPolicies.find(function(item) { var foundPolicies = clientPolicies.find(function(item) {
return item.id === selectedClient; return item.id === selectedClient;
}); });
console.log(foundPolicies.policies); console.log(foundPolicies.policies);
appendPolicies(foundPolicies.policies); appendPolicies(foundPolicies.policies);
}); });
// Function to convert object to query parameters // Function to convert object to query parameters
function objectToQueryString(obj) { function objectToQueryString(obj) {
@ -217,8 +234,8 @@ function fetchEmpolyeeList(event) {
var client_id = $('#clients').val(); var client_id = $('#clients').val();
var policy_id = $('#policies').val(); var policy_id = $('#policies').val();
console.log(client_id+'-'+policy_id); console.log(client_id + '-' + policy_id);
if (client_id == '0' || policy_id == '0' ) { if (client_id == '0' || policy_id == '0') {
alert('Please select values in both dropdowns.'); alert('Please select values in both dropdowns.');
return; return;
} }
@ -229,7 +246,7 @@ function fetchEmpolyeeList(event) {
}; };
const queryString = objectToQueryString(queryParams); const queryString = objectToQueryString(queryParams);
const apiURL = $('#get-emp-list').attr('href')+"?" + queryString; const apiURL = $('#get-emp-list').attr('href') + "?" + queryString;
console.log(apiURL); console.log(apiURL);
window.location.href = apiURL; window.location.href = apiURL;
@ -251,5 +268,9 @@ function fetchEmpolyeeList(event) {
// }); // });
} }
document.getElementById('toggleIcon').addEventListener('click', function() {
var icon = document.getElementById('icon');
icon.classList.toggle('mdi-chevron-down');
icon.classList.toggle('mdi-chevron-up');
});
</script> </script>

10
app/Views/import_export.php
View File

@ -1,4 +1,14 @@
<style>
.table th, .table td {
padding: 8px;
}
table.dataTable tbody td {
padding: 4px 4px !important;
}
</style>
<div class="row" id="client_add" style="position: relative; bottom: 25px;"> <div class="row" id="client_add" style="position: relative; bottom: 25px;">
<div class="col-12"> <div class="col-12">

2
app/Views/layout/header.php
View File

@ -393,7 +393,7 @@
<li class="dropdown notification-list topbar-dropdown"> <li class="dropdown notification-list topbar-dropdown">
<a class="nav-link dropdown-toggle nav-user mr-0 waves-effect waves-light" data-toggle="dropdown" href="#" role="button" aria-haspopup="false" aria-expanded="false"> <a class="nav-link dropdown-toggle nav-user mr-0 waves-effect waves-light" data-toggle="dropdown" href="#" role="button" aria-haspopup="false" aria-expanded="false">
<img src="<?= get_userProfile() != null && !empty(get_userProfile()) ? get_userProfile() : base_url() . 'public/assets/images/avatar_2x.png' ?>" alt="user-image" class="rounded-circle"> <img src="<?php echo (get_userProfile() != null && !empty(get_userProfile())) ? get_userProfile() : base_url() . 'public/assets/images/avatar_2x.png'; ?>" alt="user-image" class="rounded-circle">
<span class="pro-user-name ml-1" style="font-size: 16px;" > <span class="pro-user-name ml-1" style="font-size: 16px;" >
<?= (isset(get_session_userdata()->first_name) ? get_session_userdata()->first_name : 'NOT SET') ?> <?= (isset(get_session_userdata()->first_name) ? get_session_userdata()->first_name : 'NOT SET') ?>
<!-- <i class="mdi mdi-chevron-down"></i> --> <!-- <i class="mdi mdi-chevron-down"></i> -->

23
app/Views/policy_gmc_terms.php
View File

@ -13,11 +13,12 @@
.radiobuttondiv{ .radiobuttondiv{
margin-left: 32px; margin-left: 32px;
} }
.{
/* .{
width:62% !important; width:62% !important;
margin-left: 30px; margin-left: 30px;
margin-top: 3px margin-top: 3px
} } */
/* .form-group.col-md-6 */ /* .form-group.col-md-6 */
.form-group-client-policy-master{ .form-group-client-policy-master{
display:-webkit-box; display:-webkit-box;
@ -48,14 +49,14 @@
.jodit-status-bar{ .jodit-status-bar{
display:none; display:none;
} }
.jodit-container{ /* .jodit-container{
/* width: 821px !important; */ width: 821px !important;
/* margin-top: 3px; */ margin-top: 3px;
/* margin-bottom: 3px; */ margin-bottom: 3px;
/* margin-left: 30px; */ margin-left: 30px;
/* height: 0px !important; */ height: 0px !important;
/* min-height: 100px !important; */ min-height: 100px !important;
} } */
.input-group { .input-group {
width: 64.5% !important; width: 64.5% !important;
} }
@ -643,7 +644,7 @@ var grid_html = '';
var gmc_policy_type_id = $(this).attr('id'); var gmc_policy_type_id = $(this).attr('id');
if(gmc_policy_type_id >= '2'){ if(gmc_policy_type_id >= 2){
$('#policyGMCTerms').css('display', ''); $('#policyGMCTerms').css('display', '');
$('#police-tab').css('display', 'none'); $('#police-tab').css('display', 'none');