Форматирование
This commit is contained in:
@@ -4,20 +4,9 @@ namespace App\Http\Controllers\Web;
|
||||
|
||||
use App\Exports\StatisticsExport;
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Models\Department;
|
||||
use App\Models\MetrikaForm;
|
||||
use App\Models\MetrikaGroup;
|
||||
use App\Models\MetrikaItem;
|
||||
use App\Models\MetrikaResult;
|
||||
use App\Models\Report;
|
||||
use App\Services\DateRangeService;
|
||||
use App\Services\StatisticsService;
|
||||
use Illuminate\Database\Eloquent\Builder;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Illuminate\Support\Facades\Cache;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
use Illuminate\Support\Facades\Validator;
|
||||
use Inertia\Inertia;
|
||||
use Maatwebsite\Excel\Facades\Excel;
|
||||
|
||||
@@ -26,7 +15,7 @@ class StatisticController extends Controller
|
||||
public function __construct(
|
||||
protected DateRangeService $dateService,
|
||||
protected StatisticsService $statisticsService
|
||||
) { }
|
||||
) {}
|
||||
|
||||
public function index(Request $request)
|
||||
{
|
||||
@@ -38,7 +27,7 @@ class StatisticController extends Controller
|
||||
$isRangeOneDay = $this->dateService->isRangeOneDay($startDate, $endDate);
|
||||
|
||||
// Генерируем ключ кэша на основе параметров запроса
|
||||
// $cacheKey = $this->generateCacheKey($user, $startDate, $endDate, $isRangeOneDay);
|
||||
// $cacheKey = $this->generateCacheKey($user, $startDate, $endDate, $isRangeOneDay);
|
||||
|
||||
// Получаем данные из кэша или вычисляем
|
||||
$finalData = $this->statisticsService->getStatisticsData($user, $startDate, $endDate, $isRangeOneDay);
|
||||
@@ -46,7 +35,7 @@ class StatisticController extends Controller
|
||||
$isHeadOrAdmin = $user->isAdmin() || $user->isHeadOfDepartment();
|
||||
$date = $isHeadOrAdmin ? [
|
||||
$this->dateService->parseDate($isRangeOneDay ? $endDate : $startDate)->getTimestampMs(),
|
||||
$this->dateService->parseDate($endDate)->getTimestampMs()
|
||||
$this->dateService->parseDate($endDate)->getTimestampMs(),
|
||||
] : $this->dateService->parseDate($endDate)->getTimestampMs();
|
||||
|
||||
return Inertia::render('Statistic/Index', [
|
||||
@@ -56,7 +45,7 @@ class StatisticController extends Controller
|
||||
'isHeadOrAdmin' => $isHeadOrAdmin,
|
||||
'date' => $date,
|
||||
'isOneDay' => $isRangeOneDay,
|
||||
'recipientPlanOfYear' => $finalData['recipientPlanOfYear']
|
||||
'recipientPlanOfYear' => $finalData['recipientPlanOfYear'],
|
||||
]);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user