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

Исправление ввода +1 при выборе даты из кнопок календаря

Browse Source
This commit is contained in:
brusnitsyn
2026-07-24 17:02:27 +09:00
parent d80068bcd6
commit 904d56a787
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,7 +25,7 @@ class StatisticController extends Controller
$queryEndDate = $request->query('endAt'); $queryEndDate = $request->query('endAt');
$queryDateRange = $this->dateService->getDateRangeFromRequest($request, $user, false); $queryDateRange = $this->dateService->getDateRangeFromRequest($request, $user, false);
$isRangeOneDayQuery = $this->dateService->isRangeOneDay($queryDateRange->startDate, $queryDateRange->endDate); $isRangeOneDayQuery = $this->dateService->isRangeOneDay($queryDateRange->startDate, $queryDateRange->endDate);
$dateRange = $this->dateService->getDateRangeFromRequest($request, $user); $dateRange = $this->dateService->getDateRangeFromRequest($request, $user, true);
$isRangeOneDay = $this->dateService->isRangeOneDay($dateRange->startDate, $dateRange->endDate); $isRangeOneDay = $this->dateService->isRangeOneDay($dateRange->startDate, $dateRange->endDate);
$queryStartOfDateRange = $dateRange->start()->copy()->startOfYear(); $queryStartOfDateRange = $dateRange->start()->copy()->startOfYear();
@@ -49,7 +49,7 @@ class StatisticController extends Controller
'isHeadOrAdmin' => $isHeadOrAdmin, 'isHeadOrAdmin' => $isHeadOrAdmin,
'date' => [ 'date' => [
$dateRange->startDate->getTimestampMs(), $dateRange->startDate->getTimestampMs(),
$isRangeOneDayQuery ? $dateRange->endDate->getTimestampMs() : $dateRange->displayEnd()->getTimestampMs(), $dateRange->displayEnd()->getTimestampMs(),
], ],
'isOneDay' => $isRangeOneDay, 'isOneDay' => $isRangeOneDay,
'recipientPlanOfYear' => $finalData['recipientPlanOfYear'], 'recipientPlanOfYear' => $finalData['recipientPlanOfYear'],

6
resources/js/Components/DatePickerQuery.vue
View File

@@ -153,7 +153,7 @@ const shortcuts = {
'Вчера': () => getPreviousShift(), 'Вчера': () => getPreviousShift(),
'За 7 дней': () => { 'За 7 дней': () => {
const currentShift = getCurrentShift() const currentShift = getCurrentShift()
const end = currentShift[1] const end = new Date() //currentShift[1]
const start = new Date(end) const start = new Date(end)
start.setDate(start.getDate() - 7) start.setDate(start.getDate() - 7)
start.setHours(9, 0, 0, 0) start.setHours(9, 0, 0, 0)
@@ -161,7 +161,7 @@ const shortcuts = {
}, },
'За 30 дней': () => { 'За 30 дней': () => {
const currentShift = getCurrentShift() const currentShift = getCurrentShift()
const end = currentShift[1] const end = new Date() //currentShift[1]
const start = new Date(end) const start = new Date(end)
start.setDate(start.getDate() - 30) start.setDate(start.getDate() - 30)
start.setHours(9, 0, 0, 0) start.setHours(9, 0, 0, 0)
@@ -169,7 +169,7 @@ const shortcuts = {
}, },
'Текущий год': () => { 'Текущий год': () => {
const currentShift = getCurrentShift() const currentShift = getCurrentShift()
const end = currentShift[1] const end = new Date() //currentShift[1]
const start = new Date(end.getFullYear(), 0, 1) const start = new Date(end.getFullYear(), 0, 1)
start.setHours(9, 0, 0, 0) start.setHours(9, 0, 0, 0)
return [start, end] return [start, end]