AS1024/itflow
1
0
Fork 0
mirror of https://github.com/itflow-org/itflow synced 2026-08-05 15:17:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add Urgent Priority, move Per Client SLA Settings to notes tab in client add / edit modal remove unnessesary sla admin setting for client overide

Browse Source
This commit is contained in:
johnnyq
2026-07-29 00:49:31 -04:00
parent d5ed05017b
commit 07c73a6a04
29 changed files with 107 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
admin/modals/sla/sla_assignment_client.php
View File

@@ -1,85 +0,0 @@
<?php
require_once '../../includes/modal_header.php';
// With a client_id we're editing that client's overrides, otherwise adding new
$client_id = intval($_GET['client_id'] ?? 0);
$client_name = '';
$client_assignments = [];
if ($client_id) {
$client_row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT client_name FROM clients WHERE client_id = $client_id LIMIT 1"));
$client_name = escapeHtml($client_row['client_name']);
$sql_assignments = mysqli_query($mysqli, "SELECT sla_assignment_priority, sla_assignment_sla_id FROM sla_assignments WHERE sla_assignment_client_id = $client_id");
while ($assignment_row = mysqli_fetch_assoc($sql_assignments)) {
$client_assignments[$assignment_row['sla_assignment_priority']] = intval($assignment_row['sla_assignment_sla_id']);
}
}
$sql_slas = mysqli_query($mysqli, "SELECT sla_id, sla_name FROM slas WHERE sla_archived_at IS NULL ORDER BY sla_name ASC");
$active_slas = [];
while ($sla_row = mysqli_fetch_assoc($sql_slas)) {
$active_slas[intval($sla_row['sla_id'])] = $sla_row['sla_name'];
}
ob_start();
?>
<div class="modal-header bg-dark">
<h5 class="modal-title"><i class="fas fa-fw fa-random mr-2"></i><?= $client_id ? "Editing SLA overrides: <strong>$client_name</strong>" : "New client SLA override" ?></h5>
<button type="button" class="close text-white" data-dismiss="modal">
<span>&times;</span>
</button>
</div>
<form action="post.php" method="post" autocomplete="off">
<input type="hidden" name="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
<div class="modal-body">
<div class="form-group">
<label>Client <strong class="text-danger">*</strong></label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
</div>
<?php if ($client_id) { ?>
<input type="hidden" name="client_id" value="<?= $client_id ?>">
<input type="text" class="form-control" value="<?= $client_name ?>" disabled>
<?php } else { ?>
<select class="form-control select2" name="client_id" required>
<option value="">- Client -</option>
<?php
$sql_clients = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients WHERE client_archived_at IS NULL ORDER BY client_name ASC");
while ($client_row = mysqli_fetch_assoc($sql_clients)) { ?>
<option value="<?= intval($client_row['client_id']) ?>"><?= escapeHtml($client_row['client_name']) ?></option>
<?php } ?>
</select>
<?php } ?>
</div>
</div>
<?php foreach (['Low', 'Medium', 'High'] as $priority) {
$current = $client_assignments[$priority] ?? 'default';
?>
<div class="form-group">
<label><?= $priority ?> priority</label>
<select class="form-control" name="client_sla_<?= strtolower($priority) ?>">
<option value="default" <?php if ($current === 'default') { echo "selected"; } ?>>Default (follow global)</option>
<option value="0" <?php if ($current === 0) { echo "selected"; } ?>>None (no SLA)</option>
<?php foreach ($active_slas as $active_sla_id => $active_sla_name) { ?>
<option value="<?= $active_sla_id ?>" <?php if ($current === $active_sla_id) { echo "selected"; } ?>><?= escapeHtml($active_sla_name) ?></option>
<?php } ?>
</select>
</div>
<?php } ?>
</div>
<div class="modal-footer">
<button type="submit" name="save_client_sla_assignment" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Save</button>
<button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
</div>
</form>
<?php
require_once '../../../includes/modal_footer.php';

60
admin/post/sla.php
View File

@@ -131,7 +131,7 @@ if (isset($_POST['save_sla_assignments'])) {
// Global defaults - one select per priority; 0 means no SLA, which for the
// global row is simply no assignment
foreach (['Low', 'Medium', 'High'] as $priority) {
foreach (['Low', 'Medium', 'High', 'Urgent'] as $priority) {
$field = 'global_sla_' . strtolower($priority);
$sla_id = intval($_POST[$field] ?? 0);
@@ -157,61 +157,3 @@ if (isset($_POST['save_sla_assignments'])) {
redirect();
}
if (isset($_POST['save_client_sla_assignment'])) {
validateCSRFToken();
$client_id = intval($_POST['client_id']);
// Per-priority values: 'default' = follow the global default (no row),
// '0' = explicitly no SLA for this client, otherwise an sla_id
foreach (['Low', 'Medium', 'High'] as $priority) {
$field = 'client_sla_' . strtolower($priority);
$value = $_POST[$field] ?? 'default';
mysqli_query($mysqli, "DELETE FROM sla_assignments WHERE sla_assignment_client_id = $client_id AND sla_assignment_priority = '$priority'");
if ($value !== 'default') {
$sla_id = intval($value);
mysqli_query($mysqli, "INSERT INTO sla_assignments SET sla_assignment_client_id = $client_id, sla_assignment_priority = '$priority', sla_assignment_sla_id = $sla_id");
}
}
// Re-resolve this client's open tickets
$restamped = 0;
$sql_tickets = mysqli_query($mysqli, "SELECT ticket_id FROM tickets WHERE ticket_client_id = $client_id AND ticket_closed_at IS NULL AND ticket_archived_at IS NULL");
while ($ticket_row = mysqli_fetch_assoc($sql_tickets)) {
applyTicketSla($ticket_row['ticket_id']);
$restamped++;
}
logAudit("SLA", "Edit", "$session_name updated SLA assignments for client ID $client_id");
flashAlert("Client SLA assignments saved - $restamped open ticket(s) re-evaluated");
redirect();
}
if (isset($_GET['delete_client_sla_assignments'])) {
validateCSRFToken();
$client_id = intval($_GET['delete_client_sla_assignments']);
mysqli_query($mysqli, "DELETE FROM sla_assignments WHERE sla_assignment_client_id = $client_id");
// Back on the global defaults - re-resolve this client's open tickets
$sql_tickets = mysqli_query($mysqli, "SELECT ticket_id FROM tickets WHERE ticket_client_id = $client_id AND ticket_closed_at IS NULL AND ticket_archived_at IS NULL");
while ($ticket_row = mysqli_fetch_assoc($sql_tickets)) {
applyTicketSla($ticket_row['ticket_id']);
}
logAudit("SLA", "Delete", "$session_name removed SLA overrides for client ID $client_id");
flashAlert("Client SLA overrides removed");
redirect();
}

88
admin/sla.php
View File

@@ -21,36 +21,13 @@ while ($active_sla_row = mysqli_fetch_assoc($sql_active_slas)) {
$active_slas[intval($active_sla_row['sla_id'])] = $active_sla_row['sla_name'];
}
// Assignments, keyed for easy lookup: [client_id][priority] = sla_id
// Global default assignments: [priority] = sla_id (per-client overrides live on the client edit modal)
$assignments = [];
$assignment_client_names = [];
$sql_assignments = mysqli_query($mysqli, "SELECT sla_assignment_client_id, sla_assignment_priority, sla_assignment_sla_id, client_name FROM sla_assignments
LEFT JOIN clients ON sla_assignment_client_id = client_id
ORDER BY client_name ASC"
);
$sql_assignments = mysqli_query($mysqli, "SELECT sla_assignment_priority, sla_assignment_sla_id FROM sla_assignments WHERE sla_assignment_client_id = 0");
while ($assignment_row = mysqli_fetch_assoc($sql_assignments)) {
$assignment_client_id = intval($assignment_row['sla_assignment_client_id']);
$assignments[$assignment_client_id][$assignment_row['sla_assignment_priority']] = intval($assignment_row['sla_assignment_sla_id']);
if ($assignment_client_id) {
$assignment_client_names[$assignment_client_id] = $assignment_row['client_name'];
}
$assignments[0][$assignment_row['sla_assignment_priority']] = intval($assignment_row['sla_assignment_sla_id']);
}
// Wording for an assignment cell: mapped plan, explicit none, or global default
function slaAssignmentWording($assignments, $active_slas, $client_id, $priority)
{
if (!isset($assignments[$client_id][$priority])) {
return "<span class='text-secondary'>Default</span>";
}
$sla_id = $assignments[$client_id][$priority];
if ($sla_id == 0) {
return "<span class='text-secondary'>None</span>";
}
if (isset($active_slas[$sla_id])) {
return escapeHtml($active_slas[$sla_id]);
}
return "<span class='text-secondary'>None (archived)</span>";
}
?>
@@ -138,9 +115,6 @@ function slaAssignmentWording($assignments, $active_slas, $client_id, $priority)
<div class="card card-dark">
<div class="card-header py-2">
<h3 class="card-title mt-2"><i class="fas fa-fw fa-random mr-2"></i>SLA Assignments</h3>
<div class="card-tools">
<button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/sla/sla_assignment_client.php"><i class="fas fa-plus mr-2"></i>Client Override</button>
</div>
</div>
<div class="card-body">
@@ -150,7 +124,7 @@ function slaAssignmentWording($assignments, $active_slas, $client_id, $priority)
<strong>Default (all clients)</strong>
<div class="form-row mt-2">
<?php foreach (['Low', 'Medium', 'High'] as $priority) {
<?php foreach (['Low', 'Medium', 'High', 'Urgent'] as $priority) {
$selected_sla_id = $assignments[0][$priority] ?? 0;
?>
<div class="form-group col-md-3">
@@ -163,61 +137,11 @@ function slaAssignmentWording($assignments, $active_slas, $client_id, $priority)
</select>
</div>
<?php } ?>
<div class="form-group col-md-3 d-flex align-items-end">
<button type="submit" name="save_sla_assignments" class="btn btn-primary"><i class="fas fa-check mr-2"></i>Save Defaults</button>
</div>
</div>
<button type="submit" name="save_sla_assignments" class="btn btn-primary"><i class="fas fa-check mr-2"></i>Save Defaults</button>
</form>
<hr>
<strong>Client overrides</strong>
<div class="table-responsive-sm mt-2">
<table class="table table-striped table-borderless table-hover">
<thead class="text-dark <?php if (empty($assignment_client_names)) { echo "d-none"; } ?>">
<tr>
<th>Client</th>
<th>Low</th>
<th>Medium</th>
<th>High</th>
<th class="text-center">Action</th>
</tr>
</thead>
<tbody>
<?php if (empty($assignment_client_names)) { ?>
<tr><td colspan="5" class="text-secondary">No client overrides - everyone follows the defaults above.</td></tr>
<?php } ?>
<?php foreach ($assignment_client_names as $override_client_id => $override_client_name) { ?>
<tr>
<td>
<a href="#" class="ajax-modal" data-modal-url="modals/sla/sla_assignment_client.php?client_id=<?= $override_client_id ?>">
<?= escapeHtml($override_client_name) ?>
</a>
</td>
<td><?= slaAssignmentWording($assignments, $active_slas, $override_client_id, 'Low') ?></td>
<td><?= slaAssignmentWording($assignments, $active_slas, $override_client_id, 'Medium') ?></td>
<td><?= slaAssignmentWording($assignments, $active_slas, $override_client_id, 'High') ?></td>
<td>
<div class="dropdown dropleft text-center">
<button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">
<i class="fas fa-ellipsis-h"></i>
</button>
<div class="dropdown-menu">
<a class="dropdown-item ajax-modal" href="#" data-modal-url="modals/sla/sla_assignment_client.php?client_id=<?= $override_client_id ?>">
<i class="fas fa-fw fa-edit mr-2"></i>Edit
</a>
<div class="dropdown-divider"></div>
<a class="dropdown-item text-danger text-bold confirm-link" href="post.php?delete_client_sla_assignments=<?= $override_client_id ?>&csrf_token=<?= $_SESSION['csrf_token'] ?>">
<i class="fas fa-fw fa-trash mr-2"></i>Remove
</a>
</div>
</div>
</td>
</tr>
<?php } ?>
</tbody>
</table>
</div>
<small class="text-muted d-block mt-2">Per-client overrides are set on each client (edit client, Notes tab).</small>
</div>
</div>