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-17 13:22:11 +09:00
parent 70ceecd966
commit 27fefb7e54
4 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/Http/Controllers/Web/StatisticController.php
View File

@@ -23,15 +23,18 @@ class StatisticController extends Controller
$queryStartDate = $request->query('startAt');
$queryEndDate = $request->query('endAt');
$queryDateRange = $this->dateService->getDateRangeFromRequest($request, $user, false);
$isRangeOneDayQuery = $this->dateService->isRangeOneDay($queryDateRange->startDate, $queryDateRange->endDate);
$dateRange = $this->dateService->getDateRangeFromRequest($request, $user);
$isRangeOneDay = $this->dateService->isRangeOneDay($dateRange->startDate, $dateRange->endDate);
$queryStartOfDateRange = $dateRange->start()->copy()->startOfYear();
// Генерируем ключ кэша на основе параметров запроса
// $cacheKey = $this->generateCacheKey($user, $startDate, $endDate, $isRangeOneDay);
// Получаем данные из кэша или вычисляем
$finalData = $this->statisticsService->getStatisticsData($user, $dateRange->startDate, $dateRange->endDate, $isRangeOneDay);
$finalData = $this->statisticsService->getStatisticsData($user, $dateRange->startDate, $dateRange->endDate, $isRangeOneDayQuery);
$isHeadOrAdmin = $user->isSeniorStaff() || $user->isEconomist();
// $date = $isHeadOrAdmin ? [
@@ -46,7 +49,7 @@ class StatisticController extends Controller
'isHeadOrAdmin' => $isHeadOrAdmin,
'date' => [
$dateRange->startDate->getTimestampMs(),
$dateRange->displayEnd()->getTimestampMs(),
$isRangeOneDayQuery ? $dateRange->endDate->getTimestampMs() : $dateRange->displayEnd()->getTimestampMs(),
],
'isOneDay' => $isRangeOneDay,
'recipientPlanOfYear' => $finalData['recipientPlanOfYear'],