Lock nursing note shift from duty roster or clock.
Deploy Ladill Care / deploy (push) Successful in 46s
Deploy Ladill Care / deploy (push) Successful in 46s
Nurses can no longer pick a shift on the form; the server sets it from today's unit roster, falling back to the current clock window. Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
@@ -10,6 +10,7 @@ use App\Models\WardHandover;
|
||||
use App\Services\Care\CarePermissions;
|
||||
use App\Services\Care\CareUnitCensusService;
|
||||
use App\Services\Care\NursingDocumentationService;
|
||||
use App\Services\Care\RosterService;
|
||||
use Illuminate\Http\RedirectResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Validation\Rule;
|
||||
@@ -19,7 +20,7 @@ class NursingDocumentationController extends Controller
|
||||
{
|
||||
use ScopesToAccount;
|
||||
|
||||
public function unitNotes(Request $request, CareUnit $careUnit, NursingDocumentationService $docs, CareUnitCensusService $census): View
|
||||
public function unitNotes(Request $request, CareUnit $careUnit, NursingDocumentationService $docs, CareUnitCensusService $census, RosterService $roster): View
|
||||
{
|
||||
$this->authorizeAbility($request, 'nursing.notes.view');
|
||||
$this->authorizeOwner($request, $careUnit);
|
||||
@@ -31,18 +32,25 @@ class NursingDocumentationController extends Controller
|
||||
$selectedVisitId = 0;
|
||||
}
|
||||
|
||||
$lockedShiftCode = $roster->dutyShiftCodeForMember(
|
||||
$careUnit,
|
||||
$this->member($request),
|
||||
$this->ownerRef($request),
|
||||
);
|
||||
|
||||
return view('care.nursing.notes', [
|
||||
'unit' => $careUnit->load('department.branch'),
|
||||
'notes' => $docs->notesForUnit($careUnit, $this->ownerRef($request)),
|
||||
'placedVisits' => $placedVisits,
|
||||
'selectedVisitId' => $selectedVisitId ?: (int) old('visit_id', 0),
|
||||
'lockedShiftCode' => $lockedShiftCode,
|
||||
'canWrite' => app(CarePermissions::class)->can($this->member($request), 'nursing.notes.manage'),
|
||||
'noteTypes' => config('care.nursing_note_types'),
|
||||
'shiftCodes' => config('care.staff_shift_codes'),
|
||||
]);
|
||||
}
|
||||
|
||||
public function storeNote(Request $request, CareUnit $careUnit, NursingDocumentationService $docs, CareUnitCensusService $census): RedirectResponse
|
||||
public function storeNote(Request $request, CareUnit $careUnit, NursingDocumentationService $docs, CareUnitCensusService $census, RosterService $roster): RedirectResponse
|
||||
{
|
||||
$this->authorizeAbility($request, 'nursing.notes.manage');
|
||||
$this->authorizeOwner($request, $careUnit);
|
||||
@@ -50,7 +58,6 @@ class NursingDocumentationController extends Controller
|
||||
$validated = $request->validate([
|
||||
'visit_id' => ['required', 'integer', 'exists:care_visits,id'],
|
||||
'note_type' => ['required', 'string', Rule::in(array_keys(config('care.nursing_note_types')))],
|
||||
'shift_code' => ['nullable', 'string', Rule::in(array_keys(config('care.staff_shift_codes')))],
|
||||
'body' => ['required', 'string', 'max:5000'],
|
||||
]);
|
||||
|
||||
@@ -61,13 +68,19 @@ class NursingDocumentationController extends Controller
|
||||
|
||||
$visit = $census->ensurePlaced($visit, $careUnit, $this->ownerRef($request), $this->actorRef($request));
|
||||
|
||||
$shiftCode = $roster->dutyShiftCodeForMember(
|
||||
$careUnit,
|
||||
$this->member($request),
|
||||
$this->ownerRef($request),
|
||||
);
|
||||
|
||||
$docs->addNote(
|
||||
$visit,
|
||||
$this->ownerRef($request),
|
||||
$this->actorRef($request),
|
||||
$validated['body'],
|
||||
$validated['note_type'],
|
||||
$validated['shift_code'] ?? null,
|
||||
$shiftCode,
|
||||
$careUnit->id,
|
||||
);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user