diff --git a/resources/views/care/patients/show.blade.php b/resources/views/care/patients/show.blade.php index 9bacad1..5465176 100644 --- a/resources/views/care/patients/show.blade.php +++ b/resources/views/care/patients/show.blade.php @@ -142,25 +142,15 @@ @else

This patient is not on a care unit right now.

- @if (($nurseDutyUnits ?? collect())->isNotEmpty()) -

- You are on duty at - {{ $nurseDutyUnits->pluck('name')->join(', ') }} — - this chart is about the patient’s placement, not yours. -

-

- @foreach ($nurseDutyUnits as $dutyUnit) - - Open {{ $dutyUnit->name }} - - @endforeach -

- @else -

- Ask a charge nurse to place them, or open - My care unit. -

- @endif +

+ @forelse ($nurseDutyUnits ?? [] as $dutyUnit) + + Open {{ $dutyUnit->name }} + + @empty + My care unit + @endforelse +

@endif diff --git a/tests/Feature/CareMyShiftsAndNavPermissionsTest.php b/tests/Feature/CareMyShiftsAndNavPermissionsTest.php index 24f76b4..abb7c38 100644 --- a/tests/Feature/CareMyShiftsAndNavPermissionsTest.php +++ b/tests/Feature/CareMyShiftsAndNavPermissionsTest.php @@ -408,9 +408,8 @@ class CareMyShiftsAndNavPermissionsTest extends TestCase ->get(route('care.patients.show', $patient)) ->assertOk() ->assertSee('This patient is not on a care unit right now.') - ->assertSee('You are on duty at') - ->assertSee('Medical Ward') ->assertSee('Open Medical Ward') + ->assertDontSee('You are on duty at') ->assertDontSee('Not placed on a care unit right now.'); } }