diff --git a/app/Services/Care/CarePermissions.php b/app/Services/Care/CarePermissions.php index 5b14dcb..921feb4 100644 --- a/app/Services/Care/CarePermissions.php +++ b/app/Services/Care/CarePermissions.php @@ -657,7 +657,7 @@ class CarePermissions } /** - * Bedside nurse station (My ward) — floor + ward nursing roles with clinical vitals. + * Bedside nurse station (My care unit) — floor + ward nursing roles with clinical vitals. * Not granted to GPs / ambulance solely because they also chart vitals. * * @param list $abilities diff --git a/resources/views/care/admin/care-units/show.blade.php b/resources/views/care/admin/care-units/show.blade.php index 1d74c02..50d8997 100644 --- a/resources/views/care/admin/care-units/show.blade.php +++ b/resources/views/care/admin/care-units/show.blade.php @@ -21,7 +21,7 @@ @if ($canAdminUnits) Care units @elseif ($canStation) - My ward + My care unit @else Care units @endif diff --git a/resources/views/care/nursing/my-shifts.blade.php b/resources/views/care/nursing/my-shifts.blade.php index 54c0a94..2f0efdb 100644 --- a/resources/views/care/nursing/my-shifts.blade.php +++ b/resources/views/care/nursing/my-shifts.blade.php @@ -36,7 +36,7 @@ auth()->user() ? app(\App\Services\Care\OrganizationResolver::class)->memberFor(auth()->user()) : null, 'nursing.station.view' )) - Open ward + Open care unit @endif {{ config('care.roster_entry_statuses.'.$entry->status, $entry->status) }} diff --git a/resources/views/care/nursing/station.blade.php b/resources/views/care/nursing/station.blade.php index e700003..a0c41c0 100644 --- a/resources/views/care/nursing/station.blade.php +++ b/resources/views/care/nursing/station.blade.php @@ -1,8 +1,8 @@ - +
-

My ward

+

My care unit

Patients on units you’re rostered or placed on today — chart meds, vitals, notes, and handovers.

diff --git a/resources/views/partials/sidebar.blade.php b/resources/views/partials/sidebar.blade.php index b000a35..531384b 100644 --- a/resources/views/partials/sidebar.blade.php +++ b/resources/views/partials/sidebar.blade.php @@ -33,7 +33,7 @@ } if ($permissions->can($member, 'nursing.station.view')) { - $nav[] = ['name' => 'My ward', 'route' => route('care.nursing.station'), 'active' => request()->routeIs('care.nursing.station') + $nav[] = ['name' => 'My care unit', 'route' => route('care.nursing.station'), 'active' => request()->routeIs('care.nursing.station') || (request()->routeIs('care.care-units.mar') || request()->routeIs('care.care-units.notes') || request()->routeIs('care.care-units.handovers*') diff --git a/tests/Feature/CareMyShiftsAndNavPermissionsTest.php b/tests/Feature/CareMyShiftsAndNavPermissionsTest.php index 17b403c..58d8699 100644 --- a/tests/Feature/CareMyShiftsAndNavPermissionsTest.php +++ b/tests/Feature/CareMyShiftsAndNavPermissionsTest.php @@ -120,7 +120,7 @@ class CareMyShiftsAndNavPermissionsTest extends TestCase ->assertOk() ->assertDontSee('>Care units<', false) ->assertDontSee('>Nursing Services<', false) - ->assertDontSee('>My ward<', false) + ->assertDontSee('>My care unit<', false) ->assertSee('My shifts', false); } @@ -213,7 +213,7 @@ class CareMyShiftsAndNavPermissionsTest extends TestCase $this->actingAs($user) ->get(route('care.nursing.station')) ->assertOk() - ->assertSee('My ward') + ->assertSee('My care unit') ->assertSee('No unit assigned for today'); $this->actingAs($user) @@ -223,7 +223,7 @@ class CareMyShiftsAndNavPermissionsTest extends TestCase ->assertDontSee('>Departments<', false) ->assertDontSee('>Nursing Services<', false) ->assertDontSee('>Nursing<', false) - ->assertSee('>My ward<', false) + ->assertSee('>My care unit<', false) ->assertSee('My shifts', false); } @@ -305,6 +305,6 @@ class CareMyShiftsAndNavPermissionsTest extends TestCase $this->actingAs($user) ->get(route('care.my-shifts')) ->assertOk() - ->assertSee('Open ward'); + ->assertSee('Open care unit'); } }