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

BUG_Mentioned issues fixes

Browse Source
This commit is contained in:
venba-Inspriron-3558 2025-08-22 12:04:42 +05:30
parent 8a20d137a6
commit 938279db03
3 changed files with 78 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Models/ThzMasterNotesModel.php
View File

@ -105,7 +105,7 @@ class ThzMasterNotesModel extends Model
AND LOWER(thz_master_notes.notes_by) = 'user' AND LOWER(thz_master_notes.notes_by) = 'user'
WHERE thz_master_notes.thz_id = ". $integer_ticket_id ." WHERE thz_master_notes.thz_id = ". $integer_ticket_id ."
$ticketTypeFilter $ticketTypeFilter
ORDER BY thz_master_notes.created_at ASC"; ORDER BY thz_master_notes.created_at DESC";
$result = $this->db->query($notes_sql)->getResultArray(); $result = $this->db->query($notes_sql)->getResultArray();

74
app/Views/thz_list.php
View File

@ -80,6 +80,11 @@ tbody tr td:last-child {
white-space: nowrap !important; white-space: nowrap !important;
} }
.maincard{
margin-top:0 !important;
padding-top: 0 !important;
}
.col-12 { .col-12 {
max-width: 98% !important; max-width: 98% !important;
@ -122,8 +127,8 @@ td .text-muted {
<div class="col-12"> <div class="col-12">
<div class="card"> <div class="card">
<div class="card-body"> <div class="card-body maincard">
<div class="row" style="padding-bottom: 10px;"> <div class="row" style="padding-bottom: 10px;" >
<div class="col-6" style="align-self: center;"> <div class="col-6" style="align-self: center;">
<h4 style="position: relative;">Ticket List </h4> <h4 style="position: relative;">Ticket List </h4>
</div> </div>
@ -155,7 +160,10 @@ td .text-muted {
<span class="text-muted"><?php if (!empty($row['empcode'])): echo '('.$row['empcode'].')'; endif; ?></span><br> <span class="text-muted"><?php if (!empty($row['empcode'])): echo '('.$row['empcode'].')'; endif; ?></span><br>
<span class="text-muted"><?php if (!empty($row['mobile'])): echo $row['mobile']; endif; ?></span> <span class="text-muted"><?php if (!empty($row['mobile'])): echo $row['mobile']; endif; ?></span>
</td> </td>
<td><?php echo $row['policy_no']; ?></td> <td><?php echo (!empty($row['policy_no']) && strtolower($row['policy_no']) !== 'null')
? $row['policy_no']
: 'N/A'; ?>
</td>
<td><?php echo $row['ticket_type']; ?></td> <td><?php echo $row['ticket_type']; ?></td>
<td><?php echo $row['subject']; ?></td> <td><?php echo $row['subject']; ?></td>
<td><?php echo $row['status']; ?></td> <td><?php echo $row['status']; ?></td>
@ -259,22 +267,23 @@ td .text-muted {
<input type="text" class="form-control" id="empcode" name="empcode" placeholder="Enter Employee code"> <input type="text" class="form-control" id="empcode" name="empcode" placeholder="Enter Employee code">
</div> </div>
<div class="form-group col-md-4"> <div class="form-group col-md-4">
<label for="ticket_type">Ticket Type<span class="text-danger">*</span></label>
<select class="form-control" id="ticket_type" name="ticket_type" required onchange="hideandshowpolicy()">
<option value="">Select Ticket Type</option>
<option value="Sales" selected >Sales</option>
<option value="Service">Service</option>
</select>
</div>
<div class="form-group col-md-4" id="policy_container">
<label for="policy_no">Policy Number</label> <label for="policy_no">Policy Number</label>
<select class="form-control" id="policy_no" name="policy_no" onchange="changevalue()"> <select class="form-control" id="policy_no" name="policy_no" onchange="changevalue()">
<option value="" selected data-id="">Select Policy</option> <option value="" selected data-id="">Select Policy</option>
</select> </select>
</div> </div>
<div class="form-group col-md-4">
<label for="ticket_type">Ticket Type<span class="text-danger">*</span></label>
<select class="form-control" id="ticket_type" name="ticket_type" required>
<option value="">Select Ticket Type</option>
<option value="Sales">Sales</option>
<option value="Service">Service</option>
</select>
</div>
<!-- <div class="form-group col-md-6"> <!-- <div class="form-group col-md-6">
<label for="status">Status</label> <label for="status">Status</label>
@ -287,9 +296,9 @@ td .text-muted {
</select> </select>
</div> --> </div> -->
<!-- // enga 5-"head" and 1-"admin" assign pannvaga dropdown-data la varakudhathu <!-- // enga 5-"head" and 1-"admin" assign pannvaga dropdown-data la varakudhathu. but dropdown display aganum
// 2,3,4 dropdown data'va varannum but those role means hide it --> // 2,3,4 dropdown data'va varannum but dropdown hide pannanum -->
<?php if(in_array(get_role_id(), [2,3,4]) ) { ?> <?php if(in_array(get_role_id(), [1,5]) ) { ?>
<div class="form-group col-md-4"> <div class="form-group col-md-4">
<label for="assign_to">Assign To</label> <label for="assign_to">Assign To</label>
<select class="form-control" id="assign_to" name="assign_to"> <select class="form-control" id="assign_to" name="assign_to">
@ -304,19 +313,20 @@ td .text-muted {
<?php } ?> <?php } ?>
<div class="form-group col-md-12"> <div class="form-group col-md-12">
<label for="subject">Subject</label> <label for="subject">Subject<span class="text-danger">*</span></label>
<input type="text" class="form-control" id="subject" name="subject" placeholder="Enter Subject"> <input type="text" class="form-control" id="subject" name="subject" placeholder="Enter Subject" required>
</div> </div>
<div class="form-group col-md-12"> <div class="form-group col-md-12">
<label for="message">Message</label> <label for="message">Message<span class="text-danger">*</span></label>
<!-- <input type="text" class="form-control" id="message" name="message" placeholder="Enter Message"> --> <!-- <input type="text" class="form-control" id="message" name="message" placeholder="Enter Message"> -->
<textarea class="form-control" id="message" name="message" placeholder="Enter Message" rows="4"></textarea> <textarea class="form-control" id="message" name="message" placeholder="Enter Message" rows="4" required></textarea>
</div> </div>
</div> </div>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-primary btn-border-radius mr-2 text-white" onclick="resetTicket()">Reset</button>
<button type="button" class="btn btn-ternary btn-border-radius" onclick="submitTicket()">Save</button> <button type="button" class="btn btn-ternary btn-border-radius" onclick="submitTicket()">Save</button>
</div> </div>
</form> </form>
@ -368,6 +378,11 @@ td .text-muted {
myModal.show(); myModal.show();
} }
function resetTicket(){
var form = document.getElementById('ticketForm');
form.reset();
}
function submitTicket() { function submitTicket() {
var form = document.getElementById('ticketForm'); var form = document.getElementById('ticketForm');
@ -512,6 +527,19 @@ td .text-muted {
var policyId = selectedOption.getAttribute("data-id"); var policyId = selectedOption.getAttribute("data-id");
document.getElementById('policy_id').value = policyId || ""; document.getElementById('policy_id').value = policyId || "";
} }
function hideandshowpolicy() {
var select = document.getElementById('ticket_type').value;
var policyContainer = document.getElementById('policy_container');
if (select === 'Service') {
policyContainer.style.display = "block"; // show
} else {
policyContainer.style.display = "none"; // hide
document.getElementById('policy_no').value = "";
document.getElementById('policy_id').value = "";
}
}
</script> </script>
<script> <script>
@ -536,10 +564,7 @@ $(document).ready(function() {
$("#assign_to").select2(); $("#assign_to").select2();
$("#policy_no").select2(); $("#policy_no").select2();
$("#modal_assignee").select2(); $("#modal_assignee").select2();
}); hideandshowpolicy();
// Datatable document ready
$(document).ready(function() {
var ticketsTable = $('#scroll-horizontal-datatable'); var ticketsTable = $('#scroll-horizontal-datatable');
$('#scroll-horizontal-datatable_filter').prepend('<i class="mdi mdi-magnify"></i>'); $('#scroll-horizontal-datatable_filter').prepend('<i class="mdi mdi-magnify"></i>');
@ -554,7 +579,7 @@ $(document).ready(function() {
buttons: [ buttons: [
{ {
text: '<i class="mdi mdi-plus"></i> Create New Ticket', text: '<i class="mdi mdi-plus"></i> Create New Ticket',
className: 'btn btn-ternary btn-border-radius text-white mr-2', className: 'btn btn-primary btn-border-radius text-white mr-2',
attr: { style: "color:#fff !important;" }, attr: { style: "color:#fff !important;" },
action: function(e, dt, node, config) { action: function(e, dt, node, config) {
openTicket(); openTicket();
@ -563,6 +588,7 @@ $(document).ready(function() {
{ {
extend: 'collection', extend: 'collection',
text: ' Export <i class="mdi mdi-menu-down"></i>', text: ' Export <i class="mdi mdi-menu-down"></i>',
className: 'btn btn-ternary btn-border-radius text-white',
buttons: [ buttons: [
{ {
extend: 'csv', extend: 'csv',

49
app/Views/thz_notes.php
View File

@ -89,7 +89,7 @@
<!-- Title --> <!-- Title -->
<div class="row" id="notes-title" style="padding-bottom: 10px;"> <div class="row" id="notes-title" style="padding-bottom: 10px;">
<div class="col-6" style="align-self: center;"> <div class="col-6" style="align-self: center;">
<h4 style="position: relative;">Ticket ID-<?php echo $master[0]['thz_id']; ?></h4> <h4 style="position: relative;"><span onclick="history.back()"><i class="mdi mdi-chevron-left"></i></span> Ticket ID-<?php echo $master[0]['thz_id']; ?></h4>
</div> </div>
</div> </div>
@ -126,7 +126,10 @@
</div> </div>
<div class="row mb-2"> <div class="row mb-2">
<div class="col-5">Policy Number</div> <div class="col-5">Policy Number</div>
<div class="col-7 text-end"><?= $master[0]['policy_no'];?></div> <div class="col-7 text-end"><?= (!empty($master[0]['policy_no']) && strtolower($master[0]['policy_no']) !== 'null')
? $master[0]['policy_no']
: 'N/A'; ?>
</div>
</div> </div>
<div class="row mb-2"> <div class="row mb-2">
<div class="col-5">Assigned To</div> <div class="col-5">Assigned To</div>
@ -248,8 +251,8 @@
<div class="modal-body"> <div class="modal-body">
<div class="form-row"> <div class="form-row">
<input type="text" id="edit_thz_id" name="thz_id"> <input type="hidden" id="edit_thz_id" name="thz_id">
<input type="text" id="updated_by" name="updated_by" value="<?= get_session_userid(); ?>"> <input type="hidden" id="updated_by" name="updated_by" value="<?= get_session_userid(); ?>">
<div class="form-group col-md-12"> <div class="form-group col-md-12">
<label for="ticket_type">Ticket Type<span class="text-danger">*</span></label> <label for="ticket_type">Ticket Type<span class="text-danger">*</span></label>
@ -272,9 +275,9 @@
</select> </select>
</div> </div>
<!-- // enga 5-"head" and 1-"admin" assign pannvaga dropdown-data la varakudhathu <!-- // enga 5-"head" and 1-"admin" assign pannvaga dropdown-data la varakudhathu. but dropdown display aganum
// 2,3,4 dropdown data'va varannum but those role means hide it --> // 2,3,4 dropdown data'va varannum but dropdown hide pannanum -->
<?php if(in_array(get_role_id(), [2,3,4]) ) { ?> <?php if(in_array(get_role_id(), [1,5]) ) { ?>
<div class="form-group col-md-12"> <div class="form-group col-md-12">
<label for="assign_to">Assign To</label> <label for="assign_to">Assign To</label>
<select class="form-control" id="assign_to" name="assign_to"> <select class="form-control" id="assign_to" name="assign_to">
@ -314,11 +317,11 @@
<div class="card related-ticket-card mb-3"> <div class="card related-ticket-card mb-3">
<div class="card-body" style="border-radius: 20px; padding:27px !important;"> <div class="card-body" style="border-radius: 20px; padding:27px !important;">
<div class="d-flex justify-content-between align-items-start"> <div class="d-flex justify-content-between align-items-start">
<h5 class="mb-1"><?php echo $rt['ticket_type']; ?></h5> <h5 class="mb-1"><?php echo '# '.$rt['thz_id']." / ".$rt['ticket_type']; ?></h5>
<small> <small>
<?php if (!empty($rt['created_at'])): <?php if (!empty($rt['created_at'])):
$cdt = new DateTime($rt['created_at']); $cdt = new DateTime($rt['created_at']);
echo $cdt->format('d/m/Y') . "<span class='time'>" . $cdt->format('h:i a') . "</span>"; echo $cdt->format('d/m/Y') . "<span class='time'> " . $cdt->format('h:i a') . "</span>";
endif; endif;
?></small> ?></small>
</div> </div>
@ -342,32 +345,30 @@
$("#ticket_type").select2(); $("#ticket_type").select2();
$("#status").select2(); $("#status").select2();
$("#assign_to").select2(); $("#assign_to").select2();
var form = document.getElementById('ticketForm');
form.reset();
var masterData = <?= json_encode($master[0]); ?>;
document.getElementById('edit_thz_id').value = masterData.thz_id;
document.getElementById('assign_to').value = masterData.assign_to;
document.getElementById('status').value = masterData.status;
document.getElementById('ticket_type').value = masterData.ticket_type;
document.getElementById('EditModalLabel').innerText = "Update Ticket: " + masterData.thz_id ;
}); });
function openEditTicket() { function openEditTicket() {
var form = document.getElementById('ticketForm');
form.reset();
var masterData = <?= json_encode($master[0]); ?>; var masterData = <?= json_encode($master[0]); ?>;
console.log(masterData); console.log(masterData);
document.getElementById('EditModalLabel').innerText = "Update Ticket: " + masterData.thz_id ; $("#edit_thz_id").val(masterData.thz_id);
$("#ticket_type").val(masterData.ticket_type).trigger("change");
$("#status").val(masterData.status).trigger("change");
$("#assign_to").val(masterData.assign_to).trigger("change");
var myModal = new bootstrap.Modal(document.getElementById('EditModal')); $("#EditModalLabel").text("Update #" + masterData.thz_id);
myModal.show();
var myModal = new bootstrap.Modal(document.getElementById('EditModal'));
myModal.show();
} }
function submitTicket() { function submitTicket() {
var form = document.getElementById("ticketForm"); var form = document.getElementById("ticketForm");