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

8
app/Http/Controllers/Web/DutyReportController.php
View File

@@ -48,7 +48,7 @@ class DutyReportController extends Controller
$department = Department::where('department_id', $departmentId)->firstOrFail();
$bedsInDepartment = DepartmentMetrikaDefault::where('rf_department_id', $departmentId)
->where('rf_metrika_item_id', 1)->first()->value ?? 0;
$dateRange = $this->dateRangeService->getDateRangeFromRequest($request, $user);
$dateRange = $this->dateRangeService->getDateRangeFromRequest($request, $user, extendRangeEnd: false);
$isRangeOneDay = $this->dateRangeService->isRangeOneDay($dateRange->startDate, $dateRange->endDate);
$isPastPeriod = $this->dateRangeService->isPastPeriod($dateRange);
@@ -331,7 +331,7 @@ class DutyReportController extends Controller
$selectedDepartmentId = $request->get('departmentId') ? (int) $request->get('departmentId') : null;
$staff = (int) $request->get('staff', 0);
$dateRange = $this->dateRangeService->getDateRangeFromRequest($request, $user);
$dateRange = $this->dateRangeService->getDateRangeFromRequest($request, $user, extendRangeEnd: false);
$report = $this->dutyReportService->saveReport($dateRange, null, $selectedUserId, $selectedDepartmentId);
$stats = $this->dutyReportService->saveSnapshot($dateRange, $report, null, auth()->id());
$this->dutyReportService->saveObservables($observables, $report);
@@ -345,7 +345,7 @@ class DutyReportController extends Controller
public function closeObservation(Request $request)
{
$user = auth()->user();
$dateRange = $this->dateRangeService->getDateRangeFromRequest($request, $user);
$dateRange = $this->dateRangeService->getDateRangeFromRequest($request, $user, extendRangeEnd: false);
$observable = $request->get('observable');
$observableId = $observable['id'] ?? null;
@@ -369,7 +369,7 @@ class DutyReportController extends Controller
$queryDepartmentId = $request->query('departmentId', $user->department->department_id);
$department = Department::findOrFail($queryDepartmentId);
$dateRange = $this->dateRangeService->getDateRangeFromRequest($request, $user);
$dateRange = $this->dateRangeService->getDateRangeFromRequest($request, $user, extendRangeEnd: false);
$reportDutyIds = ReportDuty::where('rf_department_id', $department->department_id)
->where('period_start', '>=', $dateRange->startSql())