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

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

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="col-12">
<div class="card">

View File

@ -1,9 +1,25 @@
<style>
.table th,
.table td {
padding: 8px;
}
table.dataTable tbody td {
padding: 4px 4px !important;
}
</style>
<br>
<div class="row">
<div class="col-12">
<div class="card">
<div class="col-xl-6">
<div id="accordion" class="mb-3">
<div class="card mb-1">
<h5 class="m-1">
<a id="toggleIcon" class="text-dark float-right" data-toggle="collapse" href="#collapseOne"
aria-expanded="true">
<i id="icon" class="mdi mdi-chevron-down mr-1 text-primary" style="font-size: 28px;"></i>
</a>
</h5>
<div id="collapseOne" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion">
<div class="card-body">
<!-- <div class="text-center"> -->
<div class="row">
@ -26,7 +42,9 @@
</div>
<div class="row">
<div class="col-12" style="text-align: right;">
<a href="<?= base_url("employee/list"); ?>" class="btn btn-primary waves-effect waves-light" id="get-emp-list" onclick="fetchEmpolyeeList(event);">Submit</a>
<a href="<?= base_url("employee/list"); ?>"
class="btn btn-primary waves-effect waves-light" id="get-emp-list"
onclick="fetchEmpolyeeList(event);">Submit</a>
</div>
</div>
<!-- </div> -->
@ -35,19 +53,10 @@
</div>
</div>
</div>
</div>
<!-- start page title -->
<div class="row">
<div class="col-12">
<div class="page-title-box page-title-box-alt">
<h4 class="page-title"></h4>
<div class="page-title-right">
</div>
</div>
</div>
</div>
<!-- end page title -->
<div class="row" id="client_list">
<div class="col-12">
<div class="card">
@ -58,12 +67,13 @@
</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">
<tr>
<th class="font-weight-medium">SNO</th>
<th class="font-weight-medium">Employee code</th>
<th class="font-weight-medium">Name</th>
<!-- <th class="font-weight-medium">Employee code</th> -->
<th class="font-weight-medium">Name/code</th>
<th class="font-weight-medium">Policy name</th>
<th class="font-weight-medium">Insurar name</th>
<th class="font-weight-medium">TPA ID</th>
@ -82,8 +92,8 @@
<tr>
<td><b><?php echo ($key + 1)?></b></td>
<td><?php echo $employee['emp_code']?></td>
<td><?php echo $employee['name']?></td>
<!-- <td><?php echo $employee['emp_code']?></td> -->
<td><?php echo $employee['name']?>( <?php echo $employee['emp_code']?> )</td>
<td><?php echo $employee['policy_name']?></td>
<td><?php echo $employee['insurer_short_name']?></td>
<td><?php echo $employee['tpa_id']?></td>
@ -92,12 +102,20 @@
<td><?php echo $employee['premium']?></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>
<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="#"><i class="mdi mdi-pencil mr-2 text-muted font-18 vertical-middle"></i>Edit Ticket</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>
<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
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>
</td>
@ -114,7 +132,6 @@
<div id="loader" class="loader" style="display:none;">SPINNER</div>
<script>
// Declare a global variable to store API response data
var clientPolicies = [];
@ -152,15 +169,12 @@
clientPolicies = (response.data);
// console.log(clientPolicies);
appendClients(clientPolicies);
} catch (error)
{
} catch (error) {
console.error('Error parsing API response data:', error);
}
} else if (response.code === 404 && response.dataStatus === false) {
console.error('no data found', response);
}
else
{
} else {
console.error('Something went wrong!');
}
},
@ -184,7 +198,10 @@
function appendPolicies(data) {
$('#policies').empty();
$('#policies').append($('<option>', { value: '0',text: 'Select'}));
$('#policies').append($('<option>', {
value: '0',
text: 'Select'
}));
$.each(data, function(index, item) {
$('#policies').append($('<option>', {
@ -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>

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="col-12">

View File

@ -393,7 +393,7 @@
<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">
<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;" >
<?= (isset(get_session_userdata()->first_name) ? get_session_userdata()->first_name : 'NOT SET') ?>
<!-- <i class="mdi mdi-chevron-down"></i> -->

View File

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