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:
Srinivas-Saravanan 2025-02-11 11:32:02 +05:30
commit d576de46f9
4 changed files with 62 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
app/Controllers/TicketController.php
View File

@ -387,6 +387,42 @@ class TicketController extends BaseController
$ticket_data['date_of_intimat'] = change_date_format($ticket_data['date_of_intimat'], null, $out_put_format); $ticket_data['date_of_intimat'] = change_date_format($ticket_data['date_of_intimat'], null, $out_put_format);
} }
if (empty($ticket_data['raised_date'])) {
$ticket_data['raised_date'] = null;
} else {
$ticket_data['raised_date'] = change_date_format($ticket_data['raised_date'], null, $out_put_format);
}
if (empty($ticket_data['registration_date'])) {
$ticket_data['registration_date'] = null;
} else {
$ticket_data['registration_date'] = change_date_format($ticket_data['registration_date'], null, $out_put_format);
}
if (empty($ticket_data['query_received_date'])) {
$ticket_data['query_received_date'] = null;
} else {
$ticket_data['query_received_date'] = change_date_format($ticket_data['query_received_date'], null, $out_put_format);
}
if (empty($ticket_data['denial_date'])) {
$ticket_data['denial_date'] = null;
} else {
$ticket_data['denial_date'] = change_date_format($ticket_data['denial_date'], null, $out_put_format);
}
if (empty($ticket_data['approved_date'])) {
$ticket_data['approved_date'] = null;
} else {
$ticket_data['approved_date'] = change_date_format($ticket_data['approved_date'], null, $out_put_format);
}
if (empty($ticket_data['settled_date'])) {
$ticket_data['settled_date'] = null;
} else {
$ticket_data['settled_date'] = change_date_format($ticket_data['settled_date'], null, $out_put_format);
}
return $ticket_data; return $ticket_data;
} }

8
app/Views/ticket_edit_onbording.php
View File

@ -211,14 +211,14 @@ function setMemberData(input) {is_head_approved
function showConfirmationModal(event) { function showConfirmationModal(event) {
Swal.fire({ Swal.fire({
title: "Approve or Reject the rejected claim", title: "Approve Claim Rejection",
text: "Do you want to save this?", // text: "Do you want to save this?",
icon: "warning", icon: "warning",
showCancelButton: true, showCancelButton: true,
showDenyButton: true, showDenyButton: true,
confirmButtonColor: "#3085d6", confirmButtonColor: "#3085d6",
cancelButtonColor: "#d33", cancelButtonColor: "#6c757d",
denyButtonColor: "#6c757d", denyButtonColor: "#d33",
confirmButtonText: "Approve", confirmButtonText: "Approve",
denyButtonText: "Reject", denyButtonText: "Reject",
cancelButtonText: "Cancel" cancelButtonText: "Cancel"

2
app/Views/ticket_form_gmc.php
View File

@ -298,7 +298,7 @@
<div class="form-group col-md-12 text-right m-b-0" style="margin-top: 29px;"> <div class="form-group col-md-12 text-right m-b-0" style="margin-top: 29px;">
<button type="submit" class="btn btn-primary waves-effect waves-light mr-1" id="btnSubmit" >Submit</button> <button type="submit" class="btn btn-primary waves-effect waves-light mr-1" id="btnSubmit" >Submit</button>
<?php if(get_role_id() == 5 && isset($ticket_data) && $ticket_data['claim_status_id'] == 8) { ?> <?php if(get_role_id() == 5 && isset($ticket_data) && $ticket_data['claim_status_id'] == 8) { ?>
<a class="btn btn-secondary waves-effect waves-light mr-1" onclick="showConfirmationModal(event)">Rejected Approve</a> <a class="btn btn-secondary waves-effect waves-light mr-1" onclick="showConfirmationModal(event)">Approve Claim Rejection</a>
<?php } ?> <?php } ?>
<!-- <button type="button" class="btn btn-primary waves-effect waves-light mr-1" id="btnApprove" >Approve</button> --> <!-- <button type="button" class="btn btn-primary waves-effect waves-light mr-1" id="btnApprove" >Approve</button> -->
</div> </div>

23
app/Views/ticket_list.php
View File

@ -68,12 +68,31 @@ table.dataTable tbody td {
<?php foreach($ticket_data as $index => $row){ ?> <?php foreach($ticket_data as $index => $row){ ?>
<tr onclick="viewTicket(<?php echo $row['id']; ?>)"> <tr onclick="viewTicket(<?php echo $row['id']; ?>)">
<td data-toggle="tooltip" data-placement="top" title="<?php echo $row['status']; ?>"> <td data-toggle="tooltip" data-placement="top"
title=" <?php
if ($row['claim_status_id'] == 8) {
if ($row['is_head_approved'] == 0) {
echo 'Waiting For Head Approvel';
} elseif ($row['is_head_approved'] == 1) {
echo 'Head Approved';
} elseif ($row['is_head_approved'] == 2) {
echo 'Head Rejected';
} else {
echo $row['status'];
}
} else {
echo $row['status'];
}
?>">
<span class="status-tooltip"> <span class="status-tooltip">
<?php <?php
if (in_array($row['claim_status_id'],[8,23,33,43])) { if (in_array($row['claim_status_id'],[8,23,33,43])) {
if ($row['is_head_approved'] == 0) { if ($row['is_head_approved'] == 0) {
echo $row['status'] . '&nbsp;<i class="fa fa-exclamation-triangle" style="color:red;" aria-hidden="true"></i>'; echo $row['status'] . '&nbsp;<i class="fa fa-exclamation-triangle" style="color:#cece00;" aria-hidden="true"></i>';
} elseif ($row['is_head_approved'] == 1) { } elseif ($row['is_head_approved'] == 1) {
echo $row['status'] . '&nbsp;<i class="fa fa-check-circle" style="color:green;" aria-hidden="true"></i>'; echo $row['status'] . '&nbsp;<i class="fa fa-check-circle" style="color:green;" aria-hidden="true"></i>';
} elseif ($row['is_head_approved'] == 2) { } elseif ($row['is_head_approved'] == 2) {