AOKB/onboard
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Исправление календаря в отчетах

Browse Source
This commit is contained in:
Brusnitsyn
2026-07-07 01:16:30 +00:00
parent fec4b798bd
commit cd794b17cc
3 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/Web/NurseReportController.php
View File

@@ -34,7 +34,7 @@ class NurseReportController extends Controller
$selectedUserId = $request->query('userId') ? (int) $request->query('userId') : null;
$departmentId = $request->query('departmentId') ? (int) $request->query('departmentId') : null;
$department = Department::where('department_id', $departmentId)->firstOrFail();
$dateRange = $this->dateRangeService->getDateRangeFromRequest($request, $user);
$dateRange = $this->dateRangeService->getDateRangeFromRequest($request, $user, extendRangeEnd: false);
$isRangeOneDay = $this->dateRangeService->isRangeOneDay($dateRange->startDate, $dateRange->endDate);
// Проверяем, есть ли отчет за этот период
@@ -117,7 +117,7 @@ class NurseReportController extends Controller
$selectedUserId = $request->input('userId') ? (int) $request->input('userId') : null;
$departmentId = $request->input('departmentId') ? (int) $request->input('departmentId') : null;
$dateRange = $this->dateRangeService->getDateRangeFromRequest($request, $user);
$dateRange = $this->dateRangeService->getDateRangeFromRequest($request, $user, extendRangeEnd: false);
$report = $this->nurseReportService->saveReport($dateRange, null, $selectedUserId, $departmentId);
$this->nurseReportService->saveSnapshot($dateRange, $report, null, auth()->id());