core timer fixes
This commit is contained in:
Mark Gregory
@@ -1,47 +1,3 @@
|
||||
@php
|
||||
use Illuminate\Support\Facades\Schema;
|
||||
use Modules\Helpdesk\Models\TicketTimeLog;
|
||||
|
||||
$ticketTimeLogTable = (new TicketTimeLog())->getTable();
|
||||
|
||||
$hasEndedAtColumn = Schema::hasColumn($ticketTimeLogTable, 'ended_at');
|
||||
$hasStoppedAtColumn = Schema::hasColumn($ticketTimeLogTable, 'stopped_at');
|
||||
$hasFinishedAtColumn = Schema::hasColumn($ticketTimeLogTable, 'finished_at');
|
||||
$hasUserIdColumn = Schema::hasColumn($ticketTimeLogTable, 'user_id');
|
||||
|
||||
$runningTimerQuery = TicketTimeLog::query()
|
||||
->where('ticket_id', $ticket->getKey())
|
||||
->whereNotNull('started_at')
|
||||
->orderByDesc('started_at');
|
||||
|
||||
if ($hasUserIdColumn) {
|
||||
$runningTimerQuery->where('user_id', auth()->id());
|
||||
}
|
||||
|
||||
if ($hasEndedAtColumn) {
|
||||
$runningTimerQuery->whereNull('ended_at');
|
||||
}
|
||||
|
||||
if ($hasStoppedAtColumn) {
|
||||
$runningTimerQuery->whereNull('stopped_at');
|
||||
}
|
||||
|
||||
if ($hasFinishedAtColumn) {
|
||||
$runningTimerQuery->whereNull('finished_at');
|
||||
}
|
||||
|
||||
$runningTimer = ($hasEndedAtColumn || $hasStoppedAtColumn || $hasFinishedAtColumn)
|
||||
? $runningTimerQuery->first()
|
||||
: null;
|
||||
|
||||
$runningTimerStartedAt = $runningTimer?->started_at;
|
||||
$runningTimerElapsedSeconds = $runningTimerStartedAt
|
||||
? max(0, now()->diffInSeconds($runningTimerStartedAt))
|
||||
: 0;
|
||||
$runningTimerElapsedDisplay = gmdate('H:i:s', $runningTimerElapsedSeconds);
|
||||
$hasRunningTimer = $runningTimerStartedAt !== null;
|
||||
@endphp
|
||||
|
||||
@can('update', $ticket)
|
||||
<details
|
||||
class="group rounded-xl border border-zinc-200 bg-white p-4 shadow-sm dark:border-zinc-700 dark:bg-zinc-900"
|
||||
@@ -60,23 +16,6 @@
|
||||
<p class="text-xs font-semibold text-indigo-100">
|
||||
Log time, assignment, status and priority
|
||||
</p>
|
||||
|
||||
<span
|
||||
class="{{ $hasRunningTimer ? 'inline-flex' : 'hidden' }} mt-2 w-fit items-center gap-2 rounded-xl bg-emerald-400/20 px-3 py-1.5 text-xs font-black text-emerald-50 ring-1 ring-emerald-200/40"
|
||||
data-helpdesk-running-summary-badge
|
||||
data-helpdesk-started-at="{{ $runningTimerStartedAt?->toIso8601String() }}"
|
||||
data-dusk="ticket-running-timer-summary">
|
||||
<span class="relative flex h-2.5 w-2.5">
|
||||
<span class="absolute inline-flex h-full w-full animate-ping rounded-full bg-emerald-200 opacity-75"></span>
|
||||
<span class="relative inline-flex h-2.5 w-2.5 rounded-full bg-emerald-300"></span>
|
||||
</span>
|
||||
|
||||
<span>Running</span>
|
||||
|
||||
<span class="font-mono" data-helpdesk-running-summary-elapsed data-dusk="ticket-running-elapsed-summary">
|
||||
{{ $runningTimerElapsedDisplay }}
|
||||
</span>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -93,41 +32,9 @@
|
||||
</div>
|
||||
@endif
|
||||
|
||||
@if ($hasRunningTimer)
|
||||
<div
|
||||
class="mb-4 rounded-xl border border-emerald-300 bg-emerald-50 p-3 text-emerald-950 shadow-sm dark:border-emerald-800 dark:bg-emerald-950 dark:text-emerald-100"
|
||||
data-helpdesk-running-timer>
|
||||
<div class="flex items-center justify-between gap-3">
|
||||
<div class="min-w-0">
|
||||
<p class="text-[0.68rem] font-black uppercase tracking-[0.18em] text-emerald-700 dark:text-emerald-300">
|
||||
Timer running
|
||||
</p>
|
||||
|
||||
<p class="mt-1 text-xs font-semibold text-emerald-800 dark:text-emerald-200">
|
||||
Started {{ $runningTimerStartedAt->format('d M Y H:i:s') }}
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<div class="shrink-0 text-right">
|
||||
<p class="font-mono text-2xl font-black leading-none text-emerald-900 dark:text-emerald-100"
|
||||
data-helpdesk-panel-elapsed
|
||||
data-dusk="ticket-running-elapsed-time">
|
||||
{{ $runningTimerElapsedDisplay }}
|
||||
</p>
|
||||
|
||||
<p class="mt-1 text-[0.65rem] font-bold uppercase tracking-wide text-emerald-700 dark:text-emerald-300">
|
||||
Elapsed
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
<div data-helpdesk-timer-source>
|
||||
@include('helpdesk::partials.ticket-time-timer', [
|
||||
'ticket' => $ticket,
|
||||
])
|
||||
</div>
|
||||
@include('helpdesk::partials.ticket-time-timer', [
|
||||
'ticket' => $ticket,
|
||||
])
|
||||
|
||||
<form method="POST" action="{{ route('helpdesk.tickets.time-logs.store', $ticket) }}"
|
||||
class="mb-4 space-y-2">
|
||||
@@ -247,102 +154,4 @@
|
||||
</button>
|
||||
</form>
|
||||
</details>
|
||||
|
||||
<script>
|
||||
(() => {
|
||||
const root = document.querySelector('[data-helpdesk-ticket-controls]');
|
||||
|
||||
if (!root || root.dataset.helpdeskElapsedBadgeBound === 'true') {
|
||||
return;
|
||||
}
|
||||
|
||||
root.dataset.helpdeskElapsedBadgeBound = 'true';
|
||||
|
||||
const source = root.querySelector('[data-helpdesk-timer-source]');
|
||||
const badge = root.querySelector('[data-helpdesk-running-summary-badge]');
|
||||
const summaryElapsed = root.querySelector('[data-helpdesk-running-summary-elapsed]');
|
||||
const panelElapsed = root.querySelector('[data-helpdesk-panel-elapsed]');
|
||||
|
||||
if (!source || !badge || !summaryElapsed) {
|
||||
return;
|
||||
}
|
||||
|
||||
let interval = null;
|
||||
let startedAt = badge.dataset.helpdeskStartedAt
|
||||
? Date.parse(badge.dataset.helpdeskStartedAt)
|
||||
: null;
|
||||
|
||||
const formatElapsed = (seconds) => {
|
||||
const date = new Date(Math.max(0, seconds) * 1000);
|
||||
|
||||
return date.toISOString().substring(11, 19);
|
||||
};
|
||||
|
||||
const updateElapsed = () => {
|
||||
if (!startedAt) {
|
||||
startedAt = Date.now();
|
||||
}
|
||||
|
||||
const display = formatElapsed(Math.floor((Date.now() - startedAt) / 1000));
|
||||
|
||||
summaryElapsed.textContent = display;
|
||||
|
||||
if (panelElapsed) {
|
||||
panelElapsed.textContent = display;
|
||||
}
|
||||
};
|
||||
|
||||
const showBadge = () => {
|
||||
badge.classList.remove('hidden');
|
||||
badge.classList.add('inline-flex');
|
||||
|
||||
if (!startedAt) {
|
||||
startedAt = Date.now();
|
||||
}
|
||||
|
||||
updateElapsed();
|
||||
|
||||
if (interval) {
|
||||
return;
|
||||
}
|
||||
|
||||
interval = window.setInterval(updateElapsed, 1000);
|
||||
};
|
||||
|
||||
const hideBadge = () => {
|
||||
badge.classList.add('hidden');
|
||||
badge.classList.remove('inline-flex');
|
||||
summaryElapsed.textContent = '00:00:00';
|
||||
startedAt = null;
|
||||
|
||||
if (interval) {
|
||||
window.clearInterval(interval);
|
||||
interval = null;
|
||||
}
|
||||
};
|
||||
|
||||
const sourceShowsRunning = () => {
|
||||
const text = source.textContent.trim().toLowerCase();
|
||||
|
||||
return text.includes('running') || text.includes('timer started');
|
||||
};
|
||||
|
||||
const sync = () => {
|
||||
if (sourceShowsRunning()) {
|
||||
showBadge();
|
||||
return;
|
||||
}
|
||||
|
||||
hideBadge();
|
||||
};
|
||||
|
||||
new MutationObserver(sync).observe(source, {
|
||||
childList: true,
|
||||
subtree: true,
|
||||
characterData: true,
|
||||
});
|
||||
|
||||
sync();
|
||||
})();
|
||||
</script>
|
||||
@endcan
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
@can('update', $ticket)
|
||||
@livewire('Modules\\Helpdesk\\Livewire\\TicketTimer', ['ticket' => $ticket], key('helpdesk-ticket-timer-'.$ticket->getKey()))
|
||||
@livewire('helpdesk.ticket-timer', ['ticket' => $ticket], key('helpdesk-ticket-timer-'.$ticket->getKey()))
|
||||
@endcan
|
||||
|
||||
Reference in New Issue
Block a user