Let nurses open specialty visits from the queue list.
Deploy Ladill Care / deploy (push) Successful in 51s

Open on waiting/called cards no longer requires consultations.manage so
view roles can re-enter Emergency and other specialty workspaces.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
isaacclad
2026-07-19 13:52:28 +00:00
co-authored by Cursor
parent f82964b2a0
commit 64e3f75159
3 changed files with 122 additions and 11 deletions
@@ -3,20 +3,34 @@
Expected: $appointment, $stage (waiting|called|in_care|done), Expected: $appointment, $stage (waiting|called|in_care|done),
$canConsult, $queueIntegration, $startRouteName, $openInCareUrl (callable) $canConsult, $queueIntegration, $startRouteName, $openInCareUrl (callable)
Open (view workspace / form) is available whenever a destination URL exists
not gated by canConsult. Start / Call again remain consult-manage only.
--}} --}}
@php @php
$stage = $stage ?? 'waiting'; $stage = $stage ?? 'waiting';
$ticketStatus = $appointment->queue_ticket_status ?? null; $ticketStatus = $appointment->queue_ticket_status ?? null;
$isCalled = in_array($ticketStatus, ['called', 'serving'], true); $isCalled = in_array($ticketStatus, ['called', 'serving'], true);
$openUrl = isset($openInCareUrl) ? $openInCareUrl($appointment) : null; $openUrl = isset($openInCareUrl) ? $openInCareUrl($appointment) : null;
$canConsult = $canConsult ?? false;
@endphp @endphp
<article @class([ <article
'group relative flex gap-3 rounded-xl border px-3 py-3 transition', @if ($openUrl)
'border-indigo-200 bg-indigo-50/70 ring-1 ring-indigo-100' => $stage === 'called' || ($stage === 'waiting' && $isCalled), role="link"
'border-emerald-200 bg-emerald-50/60' => $stage === 'in_care', tabindex="0"
'border-slate-100 bg-slate-50/80' => $stage === 'waiting' && ! $isCalled, data-href="{{ $openUrl }}"
'border-slate-100 bg-white opacity-90' => $stage === 'done', onclick="if (! event.target.closest('a, button, form, input, select, textarea, label')) { window.location.href = this.dataset.href }"
])> onkeydown="if ((event.key === 'Enter' || event.key === ' ') && ! event.target.closest('a, button, form, input, select, textarea, label')) { event.preventDefault(); window.location.href = this.dataset.href }"
@endif
@class([
'group relative flex gap-3 rounded-xl border px-3 py-3 transition',
'cursor-pointer hover:shadow-sm' => (bool) $openUrl,
'border-indigo-200 bg-indigo-50/70 ring-1 ring-indigo-100' => $stage === 'called' || ($stage === 'waiting' && $isCalled),
'border-emerald-200 bg-emerald-50/60' => $stage === 'in_care',
'border-slate-100 bg-slate-50/80' => $stage === 'waiting' && ! $isCalled,
'border-slate-100 bg-white opacity-90' => $stage === 'done',
])
>
<div class="min-w-0 flex-1 space-y-1.5"> <div class="min-w-0 flex-1 space-y-1.5">
@if (! empty($queueIntegration['enabled']) && $appointment->queue_ticket_number) @if (! empty($queueIntegration['enabled']) && $appointment->queue_ticket_number)
@include('care.partials.queue-ticket', [ @include('care.partials.queue-ticket', [
@@ -51,7 +65,7 @@
</div> </div>
</div> </div>
<div class="flex shrink-0 flex-col items-end justify-center gap-1.5"> <div class="relative z-10 flex shrink-0 flex-col items-end justify-center gap-1.5" @click.stop>
@if ($stage === 'waiting' || $stage === 'called') @if ($stage === 'waiting' || $stage === 'called')
@if (! empty($queueIntegration['enabled']) && $appointment->queue_ticket_uuid && $isCalled && $canConsult) @if (! empty($queueIntegration['enabled']) && $appointment->queue_ticket_uuid && $isCalled && $canConsult)
<form method="POST" action="{{ route('care.queue.recall', $appointment) }}"> <form method="POST" action="{{ route('care.queue.recall', $appointment) }}">
@@ -71,6 +85,13 @@
</button> </button>
</form> </form>
@endif @endif
@if ($openUrl)
<a href="{{ $openUrl }}" @class([
'rounded-lg px-2.5 py-1.5 text-xs font-semibold',
'bg-indigo-600 text-white hover:bg-indigo-700' => ! $canConsult,
'border border-slate-200 bg-white text-slate-700 hover:bg-slate-50' => $canConsult,
])>Open</a>
@endif
@elseif ($stage === 'in_care') @elseif ($stage === 'in_care')
@if (! empty($queueIntegration['enabled']) && $appointment->queue_ticket_uuid && $isCalled && $canConsult) @if (! empty($queueIntegration['enabled']) && $appointment->queue_ticket_uuid && $isCalled && $canConsult)
<form method="POST" action="{{ route('care.queue.recall', $appointment) }}"> <form method="POST" action="{{ route('care.queue.recall', $appointment) }}">
@@ -81,6 +102,8 @@
@if ($openUrl) @if ($openUrl)
<a href="{{ $openUrl }}" class="rounded-lg bg-emerald-600 px-2.5 py-1.5 text-xs font-semibold text-white hover:bg-emerald-700">Open</a> <a href="{{ $openUrl }}" class="rounded-lg bg-emerald-600 px-2.5 py-1.5 text-xs font-semibold text-white hover:bg-emerald-700">Open</a>
@endif @endif
@elseif ($stage === 'done' && $openUrl)
<a href="{{ $openUrl }}" class="rounded-lg border border-slate-200 bg-white px-2.5 py-1.5 text-xs font-semibold text-slate-700 hover:bg-slate-50">Open</a>
@endif @endif
</div> </div>
</article> </article>
@@ -8,7 +8,8 @@
- $canConsult (bool) - $canConsult (bool)
- $queueCallNextRoute, $queueCallNextParams (optional if set, Call next renders above board) - $queueCallNextRoute, $queueCallNextParams (optional if set, Call next renders above board)
- $startRouteName (default care.queue.start) route(name, $appointment) - $startRouteName (default care.queue.start) route(name, $appointment)
- $openInCareUrl (callable Appointment $a): ?string link for in-care Open - $openInCareUrl (callable Appointment $a): ?string workspace/form URL for Open
(waiting / called / in-care / done; not gated by canConsult)
- $inCareLabel (default "In care") - $inCareLabel (default "In care")
- $lockToPractitioner, $canSwitchBranch, $branches, $practitioners, $practitionerId (filter bar) - $lockToPractitioner, $canSwitchBranch, $branches, $practitioners, $practitionerId (filter bar)
- $showFilters (default true) - $showFilters (default true)
+89 -2
View File
@@ -212,20 +212,107 @@ class CarePatientQueueAccessTest extends TestCase
'checked_in_at' => now(), 'checked_in_at' => now(),
]); ]);
$this->actingAs($nurseUser) $workspaceUrl = route('care.specialty.workspace', [
'module' => 'blood_bank',
'visit' => $visit,
], absolute: false);
$listHtml = $this->actingAs($nurseUser)
->get(route('care.specialty.show', 'blood_bank')) ->get(route('care.specialty.show', 'blood_bank'))
->assertOk() ->assertOk()
->assertSee('Blood Bank') ->assertSee('Blood Bank')
->assertSee('Patient flow') ->assertSee('Patient flow')
->assertSee('Waiting') ->assertSee('Waiting')
->assertSee('Kwame Donor') ->assertSee('Kwame Donor')
->assertDontSee('No open visit selected'); ->assertSee('Open')
->assertDontSee('No open visit selected')
->getContent();
$this->assertStringContainsString($workspaceUrl, $listHtml);
$this->assertStringNotContainsString('>Start</button>', $listHtml);
$this->actingAs($nurseUser)
->get(route('care.specialty.workspace', ['module' => 'blood_bank', 'visit' => $visit]))
->assertOk();
$this->actingAs($nurseUser) $this->actingAs($nurseUser)
->get(route('care.specialty.workspace', 'blood_bank')) ->get(route('care.specialty.workspace', 'blood_bank'))
->assertRedirect(route('care.specialty.show', 'blood_bank')); ->assertRedirect(route('care.specialty.show', 'blood_bank'));
} }
public function test_nurse_can_open_emergency_visit_from_specialty_list(): void
{
[$nurseUser] = $this->makeStaff('nurse', 'nurse-er-open');
$modules = app(SpecialtyModuleService::class);
$modules->ensureDefaultModulesProvisioned($this->organization, $this->owner->public_id);
$modules->activate($this->organization->fresh(), $this->owner->public_id, 'emergency');
$department = Department::query()
->where('branch_id', $this->branch->id)
->where('type', 'emergency')
->firstOrFail();
$patient = Patient::create([
'owner_ref' => $this->owner->public_id,
'organization_id' => $this->organization->id,
'branch_id' => $this->branch->id,
'patient_number' => 'P-ER-OPEN',
'first_name' => 'Akosua',
'last_name' => 'Owusu',
'gender' => 'female',
'date_of_birth' => '1990-03-15',
]);
$visit = Visit::create([
'owner_ref' => $this->owner->public_id,
'organization_id' => $this->organization->id,
'branch_id' => $this->branch->id,
'patient_id' => $patient->id,
'status' => Visit::STATUS_OPEN,
'checked_in_at' => now(),
'specialty_stage' => 'arrival',
]);
Appointment::create([
'owner_ref' => $this->owner->public_id,
'organization_id' => $this->organization->id,
'branch_id' => $this->branch->id,
'patient_id' => $patient->id,
'department_id' => $department->id,
'visit_id' => $visit->id,
'type' => Appointment::TYPE_WALK_IN,
'status' => Appointment::STATUS_WAITING,
'scheduled_at' => now(),
'waiting_at' => now(),
'checked_in_at' => now(),
'queue_ticket_number' => 'ER002',
'queue_ticket_status' => 'waiting',
]);
$workspaceUrl = route('care.specialty.workspace', [
'module' => 'emergency',
'visit' => $visit,
], absolute: false);
$html = $this->actingAs($nurseUser)
->get(route('care.specialty.show', 'emergency'))
->assertOk()
->assertSee('Akosua Owusu')
->assertSee('ER002')
->assertSee('Open')
->assertDontSee('>Start</button>', false)
->getContent();
$this->assertStringContainsString($workspaceUrl, $html);
$this->actingAs($nurseUser)
->get(route('care.specialty.workspace', ['module' => 'emergency', 'visit' => $visit]))
->assertOk()
->assertSee('Akosua Owusu')
->assertDontSee('No open visit selected');
}
public function test_nurse_specialty_show_redirects_to_workspace_not_queue(): void public function test_nurse_specialty_show_redirects_to_workspace_not_queue(): void
{ {
[$nurseUser] = $this->makeStaff('nurse', 'nurse-spec-er'); [$nurseUser] = $this->makeStaff('nurse', 'nurse-spec-er');