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

FIX_5THand6TH fixes

Browse Source
This commit is contained in:
venba-Inspriron-3558 2025-08-26 14:32:00 +05:30
parent 437bfde3c1
commit 85c20366d0
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Controllers/ThzController.php
View File

@ -81,6 +81,9 @@ class ThzController extends BaseController
$data = $this->request->getGet(); $data = $this->request->getGet();
if ($returnType === 'web' && in_array(get_role_id(), [2,3,4])) {
$data['assign_to'] = $data['assign_to'] ?? get_session_userid();
}
$tickets = $this->fetchTicketsBasedOnrole($data); $tickets = $this->fetchTicketsBasedOnrole($data);

12
app/Views/thz_list.php
View File

@ -254,13 +254,13 @@ table thead th {
<table id="scroll-horizontal-datatable" class="table w-100 nowrap text-custom-black text-custom app-font-family"> <table id="scroll-horizontal-datatable" class="table w-100 nowrap text-custom-black text-custom app-font-family">
<thead> <thead>
<tr> <tr>
<th>Ticket No</th> <th>Ticket ID</th>
<th class="app-text-left">Name</th> <th class="app-text-left">Name</th>
<th>Policy Number</th> <th>Policy Number</th>
<th>Ticket Type</th> <th>Ticket Type</th>
<th>Subject</th> <th>Subject</th>
<th>Status</th> <th>Status</th>
<th>Assign To</th> <th class="app-text-left">Assign To</th>
<th>Created At</th> <th>Created At</th>
<th>Updated At</th> <th>Updated At</th>
</tr> </tr>
@ -716,7 +716,7 @@ $(document).ready(function() {
"<'row'<'col-sm-5'i><'col-sm-7'p>>", "<'row'<'col-sm-5'i><'col-sm-7'p>>",
buttons: [ buttons: [
{ {
text: '<i class="mdi mdi-plus app-text-white" ></i><span class="app-text-white"> Create New Ticket </span>', text: '<i class="mdi mdi-plus app-text-white" ></i><span class="app-text-white app-font-family btn-custom"> Create New Ticket </span>',
className: 'btn app-btn-primary app-btn-border-radius app-text-white mr-2', className: 'btn app-btn-primary app-btn-border-radius app-text-white mr-2',
action: function(e, dt, node, config) { action: function(e, dt, node, config) {
openTicket(); openTicket();
@ -724,18 +724,18 @@ $(document).ready(function() {
}, },
{ {
extend: 'collection', extend: 'collection',
text: '<span class="app-text-white"> Export </span><i class="mdi mdi-menu-down app-text-white"></i>', text: '<span class="app-text-white app-font-family btn-custom"> Export </span><i class="mdi mdi-menu-down app-text-white"></i>',
className: 'btn app-btn-secondary app-btn-border-radius app-text-white', className: 'btn app-btn-secondary app-btn-border-radius app-text-white',
buttons: [ buttons: [
{ {
extend: 'csv', extend: 'csv',
text: '<i class="mdi mdi-file-delimited app-text-white" ></i><span class="app-text-white"> CSV </span>', text: '<i class="mdi mdi-file-delimited app-text-white" ></i><span class="app-text-white app-font-family btn-custom"> CSV </span>',
title: 'Tickets', title: 'Tickets',
className: 'app-btn-primary app-text-white', className: 'app-btn-primary app-text-white',
}, },
{ {
extend: 'excel', extend: 'excel',
text: '<i class="mdi mdi-file-excel app-text-white" ></i><span class="app-text-white"> EXCEL </span>', text: '<i class="mdi mdi-file-excel app-text-white" ></i><span class="app-text-white app-font-family btn-custom"> EXCEL </span>',
title: 'Tickets', title: 'Tickets',
exportOptions: { exportOptions: {
orthogonal: 'sort' orthogonal: 'sort'

2
app/Views/thz_notes.php
View File

@ -161,6 +161,7 @@ hr{
<div class="card master-card" style="background:#F5FFFF;"> <div class="card master-card" style="background:#F5FFFF;">
<div class="card-header d-flex justify-content-between align-items-center" style="background:none; border:none;"> <div class="card-header d-flex justify-content-between align-items-center" style="background:none; border:none;">
<p class="sub-title-text app-font-family mb-0">Details</p> <p class="sub-title-text app-font-family mb-0">Details</p>
<?php if($master[0]['status'] !== "Closed") : ?>
<a href="javascript:void(0);" onclick="openEditTicket()"> <a href="javascript:void(0);" onclick="openEditTicket()">
<i class="mdi mdi-pencil edit-icon" title="Edit"></i> <i class="mdi mdi-pencil edit-icon" title="Edit"></i>
<!-- <i class="mdi mdi-pencil" <!-- <i class="mdi mdi-pencil"
@ -170,6 +171,7 @@ hr{
onmouseout="this.style.color='#555'; this.style.fontSize='15px';"> onmouseout="this.style.color='#555'; this.style.fontSize='15px';">
</i> --> </i> -->
</a> </a>
<?php endif; ?>
</div> </div>
<div class="card-body card-scroll sub-title-text app-font-family" style="padding:0 27px !important; background:#F5FFFF;"> <div class="card-body card-scroll sub-title-text app-font-family" style="padding:0 27px !important; background:#F5FFFF;">
<div class="row mb-2 ml-o"> <div class="row mb-2 ml-o">