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

* добавил объединение изменений движений

Browse Source 
* добавил автоматическое создание движения при редактировании
* добавил функционал для сохранения отчета и пациентов
* изменил форматирование дат
* добавил частичную перезагрузку при сохранении изменений
This commit is contained in:
brusnitsyn
2026-05-05 17:06:15 +09:00
parent 51a4b5b9de
commit 717641e4bb
18 changed files with 712 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/Services/DateRangeService.php
View File

@@ -55,8 +55,8 @@ class DateRangeService
? $this->parseDate($startAtInput)
: Carbon::now('Asia/Yakutsk');
$endDate = $endDate->copy()->setTime(7, 0);
$startDate = $startDate->copy()->subDay()->setTime(7, 0);
$endDate = $endDate->copy()->setTime(9, 0);
$startDate = $startDate->copy()->subDay()->setTime(9, 0);
return new DateRange(
startDate: $startDate,
@@ -85,10 +85,10 @@ class DateRangeService
$startDate = Carbon::now('Asia/Yakutsk')
->startOfYear() // 1 января текущего года
->subDay()
->setTime(7, 0);
->setTime(9, 0);
$endDate = Carbon::now('Asia/Yakutsk')
->setTime(7, 0);
->setTime(9, 0);
return [
$startDate->format('Y-m-d H:i:s'),
@@ -123,11 +123,11 @@ class DateRangeService
$endDate = $this->parseDate($endAt);
if ($startDate->isSameDay($endDate)) {
$startDate = $startDate->subDay()->setTime(7, 0);
$endDate = $endDate->setTime(7, 0);
$startDate = $startDate->subDay()->setTime(9, 0);
$endDate = $endDate->setTime(9, 0);
} else {
$startDate = $startDate->setTime(7, 0);
$endDate = $endDate->setTime(7, 0);
$startDate = $startDate->setTime(9, 0);
$endDate = $endDate->setTime(9, 0);
}
return [
@@ -140,10 +140,10 @@ class DateRangeService
{
$startDate = Carbon::now('Asia/Yakutsk')
->subDay()
->setTime(7, 0);
->setTime(9, 0);
$endDate = Carbon::now('Asia/Yakutsk')
->setTime(7, 0);
->setTime(9, 0);
return [
$startDate->format('Y-m-d H:i:s'),
@@ -197,8 +197,8 @@ class DateRangeService
{
// Для автоматического заполнения используем логику как для врача
// (вчера 07:00 - сегодня 07:00)
$startDate = $date->copy()->subDay()->setTime(7, 0);
$endDate = $date->copy()->setTime(7, 0);
$startDate = $date->copy()->subDay()->setTime(9, 0);
$endDate = $date->copy()->setTime(9, 0);
return new DateRange(
startDate: $startDate,