Improve specialty workspace actions and Call next handoff.
Deploy Ladill Care / deploy (push) Successful in 40s
Deploy Ladill Care / deploy (push) Successful in 40s
Move timeline into a workspace tab, surface Complete consultation and Call again in Actions, and make Call next end the current encounter then open the next called patient. Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
isaacclad
@@ -19,6 +19,12 @@
|
||||
<x-btn type="submit" variant="warning">No show</x-btn>
|
||||
</form>
|
||||
@endif
|
||||
@if ($appointment->queue_ticket_status === 'called')
|
||||
<form method="POST" action="{{ route('care.queue.recall', $appointment) }}">
|
||||
@csrf
|
||||
<button type="submit" class="rounded-lg border border-indigo-200 bg-indigo-50 px-4 py-2 text-sm font-medium text-indigo-700 hover:bg-indigo-100">Call again</button>
|
||||
</form>
|
||||
@endif
|
||||
@if (($canStartConsultation ?? $canConsult) && in_array($appointment->status, [\App\Models\Appointment::STATUS_WAITING, \App\Models\Appointment::STATUS_CHECKED_IN], true))
|
||||
<form method="POST" action="{{ route('care.queue.start', $appointment) }}">
|
||||
@csrf
|
||||
|
||||
@@ -5,6 +5,8 @@
|
||||
$btnPrimary = $btn.' bg-indigo-600 text-white hover:bg-indigo-700';
|
||||
$btnSecondary = $btn.' border border-slate-200 bg-white text-slate-800 hover:bg-slate-50';
|
||||
$btnAccent = $btn.' border border-sky-200 bg-sky-50 text-sky-900 hover:bg-sky-100';
|
||||
$appointment = $consultation->appointment;
|
||||
$ticketCalled = $appointment && $appointment->queue_ticket_status === 'called';
|
||||
@endphp
|
||||
|
||||
@include('care.partials.queue-ops', [
|
||||
@@ -12,8 +14,16 @@
|
||||
'queueCallNextRoute' => 'care.queue.call-next',
|
||||
'queueCallNextParams' => [],
|
||||
'branchId' => $queueBranchId ?? null,
|
||||
'currentAppointmentId' => $appointment?->id,
|
||||
])
|
||||
|
||||
@if ($ticketCalled && $appointment)
|
||||
<form method="POST" action="{{ route('care.queue.recall', $appointment) }}" class="w-full" @click.stop>
|
||||
@csrf
|
||||
<button type="submit" class="{{ $btnAccent }}">Call again</button>
|
||||
</form>
|
||||
@endif
|
||||
|
||||
@if ($canManage && ! $isCompleted)
|
||||
<button
|
||||
type="button"
|
||||
|
||||
@@ -3,9 +3,10 @@
|
||||
$qi = $queueIntegration ?? null;
|
||||
$callNextRoute = $queueCallNextRoute ?? null;
|
||||
$callNextParams = $queueCallNextParams ?? [];
|
||||
$currentAppointmentId = $currentAppointmentId ?? null;
|
||||
@endphp
|
||||
@if (! empty($qi['enabled']) && $callNextRoute)
|
||||
<form method="POST" action="{{ route($callNextRoute, $callNextParams) }}" class="w-full">
|
||||
<form method="POST" action="{{ route($callNextRoute, $callNextParams) }}" class="w-full" @click.stop>
|
||||
@csrf
|
||||
@foreach ($callNextParams as $key => $value)
|
||||
@if (is_scalar($value))
|
||||
@@ -15,6 +16,9 @@
|
||||
@if (! empty($branchId))
|
||||
<input type="hidden" name="branch_id" value="{{ $branchId }}">
|
||||
@endif
|
||||
@if (! empty($currentAppointmentId))
|
||||
<input type="hidden" name="appointment_id" value="{{ $currentAppointmentId }}">
|
||||
@endif
|
||||
<button type="submit" class="btn-primary flex w-full items-center justify-center text-sm">Call next</button>
|
||||
</form>
|
||||
@endif
|
||||
|
||||
@@ -5,6 +5,25 @@
|
||||
$btnSecondary = $btn.' border border-slate-200 bg-white text-slate-800 hover:bg-slate-50';
|
||||
$btnAccent = $btn.' border border-indigo-200 bg-indigo-50 text-indigo-900 hover:bg-indigo-100';
|
||||
$onWorkspace = ($section ?? '') === 'workspace';
|
||||
$appointment = $workspaceVisit?->appointment;
|
||||
$openConsultation = $appointment?->consultation;
|
||||
$ticketCalled = $appointment && $appointment->queue_ticket_status === 'called';
|
||||
$canStartConsultation = $appointment && in_array($appointment->status, [
|
||||
\App\Models\Appointment::STATUS_WAITING,
|
||||
\App\Models\Appointment::STATUS_CHECKED_IN,
|
||||
], true);
|
||||
$consultationInProgress = $appointment
|
||||
&& (
|
||||
$appointment->status === \App\Models\Appointment::STATUS_IN_CONSULTATION
|
||||
|| ($openConsultation && $openConsultation->status !== \App\Models\Consultation::STATUS_COMPLETED)
|
||||
);
|
||||
$canCompleteConsultation = $consultationInProgress
|
||||
&& $openConsultation
|
||||
&& $openConsultation->status !== \App\Models\Consultation::STATUS_COMPLETED;
|
||||
$chartTab = collect($workspaceTabs ?? [])
|
||||
->keys()
|
||||
->first(fn ($key) => ! in_array($key, ['overview', 'timeline', 'orders', 'billing', 'documents'], true))
|
||||
?: 'clinical_notes';
|
||||
@endphp
|
||||
|
||||
@if ($onWorkspace)
|
||||
@@ -13,30 +32,31 @@
|
||||
'queueCallNextRoute' => 'care.specialty.call-next',
|
||||
'queueCallNextParams' => ['module' => $moduleKey],
|
||||
'branchId' => $branchId ?? null,
|
||||
'currentAppointmentId' => $appointment?->id,
|
||||
])
|
||||
@endif
|
||||
|
||||
@if ($ticketCalled && $appointment)
|
||||
<form method="POST" action="{{ route('care.queue.recall', $appointment) }}" class="w-full" @click.stop>
|
||||
@csrf
|
||||
<button type="submit" class="{{ $btnAccent }}">Call again</button>
|
||||
</form>
|
||||
@endif
|
||||
|
||||
@if ($workspaceVisit)
|
||||
@php
|
||||
$appointment = $workspaceVisit->appointment;
|
||||
$openConsultation = $appointment?->consultation;
|
||||
$canStartConsultation = $appointment && in_array($appointment->status, [
|
||||
\App\Models\Appointment::STATUS_WAITING,
|
||||
\App\Models\Appointment::STATUS_CHECKED_IN,
|
||||
], true);
|
||||
$consultationInProgress = $appointment
|
||||
&& (
|
||||
$appointment->status === \App\Models\Appointment::STATUS_IN_CONSULTATION
|
||||
|| ($openConsultation && $openConsultation->status !== \App\Models\Consultation::STATUS_COMPLETED)
|
||||
);
|
||||
$chartTab = collect($workspaceTabs ?? [])
|
||||
->keys()
|
||||
->first(fn ($key) => ! in_array($key, ['overview', 'orders', 'billing', 'documents'], true))
|
||||
?: 'clinical_notes';
|
||||
@endphp
|
||||
@if ($canCompleteConsultation)
|
||||
<button
|
||||
type="button"
|
||||
class="{{ $btnPrimary }}"
|
||||
@click.stop="$dispatch('open-modal', {{ \Illuminate\Support\Js::from('complete-consultation-'.$openConsultation->id) }})"
|
||||
>
|
||||
Complete consultation
|
||||
</button>
|
||||
@endif
|
||||
|
||||
@if ($consultationInProgress)
|
||||
<a href="{{ route('care.specialty.workspace', ['module' => $moduleKey, 'visit' => $workspaceVisit, 'tab' => $chartTab]) }}"
|
||||
class="{{ $btnPrimary }}">
|
||||
class="{{ $btnSecondary }}">
|
||||
Open chart
|
||||
</a>
|
||||
@elseif ($canStartConsultation)
|
||||
|
||||
@@ -33,128 +33,124 @@
|
||||
@endforeach
|
||||
</div>
|
||||
|
||||
<div class="grid gap-4 lg:grid-cols-5">
|
||||
<div class="space-y-4 lg:col-span-3">
|
||||
@if ($activeTab === 'billing')
|
||||
<section class="rounded-2xl border border-slate-200 bg-white p-5">
|
||||
<h3 class="text-sm font-semibold text-slate-900">Add specialty service</h3>
|
||||
<form method="POST" action="{{ route('care.specialty.services.add', ['module' => $moduleKey, 'visit' => $workspaceVisit]) }}" class="mt-3 space-y-3">
|
||||
@csrf
|
||||
<select name="service_code" required class="w-full rounded-xl border border-slate-200 px-3 py-2 text-sm">
|
||||
<option value="">Select service…</option>
|
||||
@foreach ($services as $service)
|
||||
<option value="{{ $service['code'] }}">
|
||||
{{ $service['label'] }} — {{ $currency ?? 'GHS' }} {{ number_format(((int) $service['amount_minor']) / 100, 2) }}
|
||||
</option>
|
||||
@endforeach
|
||||
</select>
|
||||
<button type="submit" class="btn-primary">{{ $actions['invoice'] ?? 'Add to invoice' }}</button>
|
||||
</form>
|
||||
|
||||
@if ($workspaceVisit->bill)
|
||||
<div class="mt-6 border-t border-slate-100 pt-4">
|
||||
<p class="text-xs font-semibold uppercase tracking-wide text-slate-500">Current invoice {{ $workspaceVisit->bill->invoice_number }}</p>
|
||||
<ul class="mt-2 space-y-1 text-sm">
|
||||
@forelse ($workspaceVisit->bill->lineItems as $line)
|
||||
<li class="flex justify-between gap-3">
|
||||
<span>{{ $line->description }}</span>
|
||||
<span class="tabular-nums">{{ number_format($line->total_minor / 100, 2) }}</span>
|
||||
</li>
|
||||
@empty
|
||||
<li class="text-slate-500">No line items yet.</li>
|
||||
@endforelse
|
||||
</ul>
|
||||
<a href="{{ route('care.bills.show', $workspaceVisit->bill) }}" class="mt-3 inline-flex text-sm font-medium text-indigo-600">Open bill</a>
|
||||
</div>
|
||||
@endif
|
||||
</section>
|
||||
@elseif (! empty($clinicalFields))
|
||||
@include('care.specialty.partials.clinical-form')
|
||||
@elseif ($activeTab === 'orders')
|
||||
<section class="rounded-2xl border border-slate-200 bg-white p-5">
|
||||
<h3 class="text-sm font-semibold text-slate-900">Orders</h3>
|
||||
<p class="mt-2 text-sm text-slate-500">Order lab / imaging from the consultation flow. Specialty order sets can extend this later.</p>
|
||||
<div class="mt-3 flex flex-wrap gap-3">
|
||||
<a href="{{ route('care.lab.requests.index') }}" class="text-sm font-medium text-indigo-600">Lab requests</a>
|
||||
@if ($workspaceVisit->appointment)
|
||||
<a href="{{ route('care.appointments.show', $workspaceVisit->appointment) }}" class="text-sm font-medium text-indigo-600">Appointment</a>
|
||||
@endif
|
||||
</div>
|
||||
</section>
|
||||
@elseif ($activeTab === 'documents')
|
||||
<section class="rounded-2xl border border-slate-200 bg-white p-5">
|
||||
<h3 class="text-sm font-semibold text-slate-900">Documents</h3>
|
||||
<p class="mt-1 text-xs text-slate-500">Specialty documents attach to the patient chart for this episode.</p>
|
||||
|
||||
<form method="POST" action="{{ route('care.specialty.documents.upload', ['module' => $moduleKey, 'visit' => $workspaceVisit]) }}" enctype="multipart/form-data" class="mt-4 space-y-3">
|
||||
@csrf
|
||||
<input type="file" name="attachment" required accept=".pdf,.jpg,.jpeg,.png,.webp" class="block w-full text-sm">
|
||||
<button type="submit" class="btn-primary">Upload document</button>
|
||||
</form>
|
||||
|
||||
<ul class="mt-4 space-y-2 text-sm">
|
||||
@forelse ($visitDocuments ?? [] as $doc)
|
||||
<li class="flex items-center justify-between gap-3 rounded-xl border border-slate-100 bg-slate-50 px-3 py-2">
|
||||
<div class="min-w-0">
|
||||
<p class="truncate font-medium text-slate-800">{{ $doc->original_name }}</p>
|
||||
<p class="text-xs text-slate-500">{{ $doc->document_type }} · {{ $doc->created_at?->format('d M Y H:i') }}</p>
|
||||
</div>
|
||||
@if ($doc->file_path)
|
||||
<a href="{{ \Illuminate\Support\Facades\Storage::disk('public')->url($doc->file_path) }}" target="_blank" class="shrink-0 text-xs font-medium text-sky-600">Open</a>
|
||||
@endif
|
||||
</li>
|
||||
@empty
|
||||
<li class="text-slate-500">No documents yet.</li>
|
||||
@endforelse
|
||||
</ul>
|
||||
|
||||
@if ($workspaceVisit->patient)
|
||||
<a href="{{ route('care.patients.show', $workspaceVisit->patient) }}" class="mt-3 inline-flex text-sm font-medium text-indigo-600">Patient chart</a>
|
||||
@endif
|
||||
</section>
|
||||
@else
|
||||
<section class="rounded-2xl border border-slate-200 bg-white p-5">
|
||||
<h3 class="text-sm font-semibold text-slate-900">Overview</h3>
|
||||
<dl class="mt-3 grid gap-3 text-sm sm:grid-cols-2">
|
||||
<div>
|
||||
<dt class="text-slate-500">Visit status</dt>
|
||||
<dd class="font-medium text-slate-900">{{ ucfirst(str_replace('_', ' ', $workspaceVisit->status)) }}</dd>
|
||||
</div>
|
||||
<div>
|
||||
<dt class="text-slate-500">Checked in</dt>
|
||||
<dd class="font-medium text-slate-900">{{ $workspaceVisit->checked_in_at?->format('d M Y H:i') ?? '—' }}</dd>
|
||||
</div>
|
||||
<div>
|
||||
<dt class="text-slate-500">Department</dt>
|
||||
<dd class="font-medium text-slate-900">{{ $workspaceVisit->appointment?->department?->name ?? '—' }}</dd>
|
||||
</div>
|
||||
<div>
|
||||
<dt class="text-slate-500">Queue</dt>
|
||||
<dd class="font-medium text-slate-900">
|
||||
{{ $workspaceVisit->appointment?->queue_ticket_number ?? '—' }}
|
||||
@if ($workspaceVisit->appointment?->queue_ticket_status)
|
||||
<span class="text-slate-500">({{ $workspaceVisit->appointment->queue_ticket_status }})</span>
|
||||
@endif
|
||||
</dd>
|
||||
</div>
|
||||
</dl>
|
||||
|
||||
@if (! empty($clinicalAlerts))
|
||||
<div class="mt-4 space-y-1.5 border-t border-slate-100 pt-4">
|
||||
<p class="text-xs font-semibold uppercase tracking-wide text-slate-500">Clinical alerts</p>
|
||||
@foreach ($clinicalAlerts as $alert)
|
||||
<p class="text-sm {{ ($alert['severity'] ?? '') === 'critical' ? 'text-rose-700' : 'text-amber-800' }}">
|
||||
{{ $alert['message'] ?? '' }}
|
||||
</p>
|
||||
@endforeach
|
||||
</div>
|
||||
@endif
|
||||
</section>
|
||||
@endif
|
||||
</div>
|
||||
|
||||
<div class="lg:col-span-2">
|
||||
<div class="space-y-4">
|
||||
@if ($activeTab === 'timeline')
|
||||
@include('care.partials.patient-timeline', ['events' => $timeline ?? []])
|
||||
</div>
|
||||
@elseif ($activeTab === 'billing')
|
||||
<section class="rounded-2xl border border-slate-200 bg-white p-5">
|
||||
<h3 class="text-sm font-semibold text-slate-900">Add specialty service</h3>
|
||||
<form method="POST" action="{{ route('care.specialty.services.add', ['module' => $moduleKey, 'visit' => $workspaceVisit]) }}" class="mt-3 space-y-3">
|
||||
@csrf
|
||||
<select name="service_code" required class="w-full rounded-xl border border-slate-200 px-3 py-2 text-sm">
|
||||
<option value="">Select service…</option>
|
||||
@foreach ($services as $service)
|
||||
<option value="{{ $service['code'] }}">
|
||||
{{ $service['label'] }} — {{ $currency ?? 'GHS' }} {{ number_format(((int) $service['amount_minor']) / 100, 2) }}
|
||||
</option>
|
||||
@endforeach
|
||||
</select>
|
||||
<button type="submit" class="btn-primary">{{ $actions['invoice'] ?? 'Add to invoice' }}</button>
|
||||
</form>
|
||||
|
||||
@if ($workspaceVisit->bill)
|
||||
<div class="mt-6 border-t border-slate-100 pt-4">
|
||||
<p class="text-xs font-semibold uppercase tracking-wide text-slate-500">Current invoice {{ $workspaceVisit->bill->invoice_number }}</p>
|
||||
<ul class="mt-2 space-y-1 text-sm">
|
||||
@forelse ($workspaceVisit->bill->lineItems as $line)
|
||||
<li class="flex justify-between gap-3">
|
||||
<span>{{ $line->description }}</span>
|
||||
<span class="tabular-nums">{{ number_format($line->total_minor / 100, 2) }}</span>
|
||||
</li>
|
||||
@empty
|
||||
<li class="text-slate-500">No line items yet.</li>
|
||||
@endforelse
|
||||
</ul>
|
||||
<a href="{{ route('care.bills.show', $workspaceVisit->bill) }}" class="mt-3 inline-flex text-sm font-medium text-indigo-600">Open bill</a>
|
||||
</div>
|
||||
@endif
|
||||
</section>
|
||||
@elseif (! empty($clinicalFields))
|
||||
@include('care.specialty.partials.clinical-form')
|
||||
@elseif ($activeTab === 'orders')
|
||||
<section class="rounded-2xl border border-slate-200 bg-white p-5">
|
||||
<h3 class="text-sm font-semibold text-slate-900">Orders</h3>
|
||||
<p class="mt-2 text-sm text-slate-500">Order lab / imaging from the consultation flow. Specialty order sets can extend this later.</p>
|
||||
<div class="mt-3 flex flex-wrap gap-3">
|
||||
<a href="{{ route('care.lab.requests.index') }}" class="text-sm font-medium text-indigo-600">Lab requests</a>
|
||||
@if ($workspaceVisit->appointment)
|
||||
<a href="{{ route('care.appointments.show', $workspaceVisit->appointment) }}" class="text-sm font-medium text-indigo-600">Appointment</a>
|
||||
@endif
|
||||
</div>
|
||||
</section>
|
||||
@elseif ($activeTab === 'documents')
|
||||
<section class="rounded-2xl border border-slate-200 bg-white p-5">
|
||||
<h3 class="text-sm font-semibold text-slate-900">Documents</h3>
|
||||
<p class="mt-1 text-xs text-slate-500">Specialty documents attach to the patient chart for this episode.</p>
|
||||
|
||||
<form method="POST" action="{{ route('care.specialty.documents.upload', ['module' => $moduleKey, 'visit' => $workspaceVisit]) }}" enctype="multipart/form-data" class="mt-4 space-y-3">
|
||||
@csrf
|
||||
<input type="file" name="attachment" required accept=".pdf,.jpg,.jpeg,.png,.webp" class="block w-full text-sm">
|
||||
<button type="submit" class="btn-primary">Upload document</button>
|
||||
</form>
|
||||
|
||||
<ul class="mt-4 space-y-2 text-sm">
|
||||
@forelse ($visitDocuments ?? [] as $doc)
|
||||
<li class="flex items-center justify-between gap-3 rounded-xl border border-slate-100 bg-slate-50 px-3 py-2">
|
||||
<div class="min-w-0">
|
||||
<p class="truncate font-medium text-slate-800">{{ $doc->original_name }}</p>
|
||||
<p class="text-xs text-slate-500">{{ $doc->document_type }} · {{ $doc->created_at?->format('d M Y H:i') }}</p>
|
||||
</div>
|
||||
@if ($doc->file_path)
|
||||
<a href="{{ \Illuminate\Support\Facades\Storage::disk('public')->url($doc->file_path) }}" target="_blank" class="shrink-0 text-xs font-medium text-sky-600">Open</a>
|
||||
@endif
|
||||
</li>
|
||||
@empty
|
||||
<li class="text-slate-500">No documents yet.</li>
|
||||
@endforelse
|
||||
</ul>
|
||||
|
||||
@if ($workspaceVisit->patient)
|
||||
<a href="{{ route('care.patients.show', $workspaceVisit->patient) }}" class="mt-3 inline-flex text-sm font-medium text-indigo-600">Patient chart</a>
|
||||
@endif
|
||||
</section>
|
||||
@else
|
||||
<section class="rounded-2xl border border-slate-200 bg-white p-5">
|
||||
<h3 class="text-sm font-semibold text-slate-900">Overview</h3>
|
||||
<dl class="mt-3 grid gap-3 text-sm sm:grid-cols-2">
|
||||
<div>
|
||||
<dt class="text-slate-500">Visit status</dt>
|
||||
<dd class="font-medium text-slate-900">{{ ucfirst(str_replace('_', ' ', $workspaceVisit->status)) }}</dd>
|
||||
</div>
|
||||
<div>
|
||||
<dt class="text-slate-500">Checked in</dt>
|
||||
<dd class="font-medium text-slate-900">{{ $workspaceVisit->checked_in_at?->format('d M Y H:i') ?? '—' }}</dd>
|
||||
</div>
|
||||
<div>
|
||||
<dt class="text-slate-500">Department</dt>
|
||||
<dd class="font-medium text-slate-900">{{ $workspaceVisit->appointment?->department?->name ?? '—' }}</dd>
|
||||
</div>
|
||||
<div>
|
||||
<dt class="text-slate-500">Queue</dt>
|
||||
<dd class="font-medium text-slate-900">
|
||||
{{ $workspaceVisit->appointment?->queue_ticket_number ?? '—' }}
|
||||
@if ($workspaceVisit->appointment?->queue_ticket_status)
|
||||
<span class="text-slate-500">({{ $workspaceVisit->appointment->queue_ticket_status }})</span>
|
||||
@endif
|
||||
</dd>
|
||||
</div>
|
||||
</dl>
|
||||
|
||||
@if (! empty($clinicalAlerts))
|
||||
<div class="mt-4 space-y-1.5 border-t border-slate-100 pt-4">
|
||||
<p class="text-xs font-semibold uppercase tracking-wide text-slate-500">Clinical alerts</p>
|
||||
@foreach ($clinicalAlerts as $alert)
|
||||
<p class="text-sm {{ ($alert['severity'] ?? '') === 'critical' ? 'text-rose-700' : 'text-amber-800' }}">
|
||||
{{ $alert['message'] ?? '' }}
|
||||
</p>
|
||||
@endforeach
|
||||
</div>
|
||||
@endif
|
||||
</section>
|
||||
@endif
|
||||
</div>
|
||||
@endif
|
||||
|
||||
@@ -31,6 +31,20 @@
|
||||
'actionsView' => 'care.specialty.partials.actions-menu',
|
||||
'title' => 'Actions',
|
||||
])
|
||||
|
||||
@php
|
||||
$completeConsultation = $workspaceVisit?->appointment?->consultation;
|
||||
@endphp
|
||||
@if ($completeConsultation && $completeConsultation->status !== \App\Models\Consultation::STATUS_COMPLETED)
|
||||
<x-confirm-dialog
|
||||
:name="'complete-consultation-'.$completeConsultation->id"
|
||||
title="Complete this consultation?"
|
||||
message="Mark the consultation as finished. You can still prescribe or generate a bill afterward."
|
||||
:action="route('care.consultations.complete', $completeConsultation)"
|
||||
confirm-label="Complete consultation"
|
||||
variant="primary"
|
||||
/>
|
||||
@endif
|
||||
@elseif ($section === 'history')
|
||||
<div class="flex flex-wrap items-center justify-between gap-3">
|
||||
<div>
|
||||
|
||||
Reference in New Issue
Block a user