robonen/education-project
1
0
Fork 0
mirror of https://github.com/robonen/education-project.git synced 2026-03-20 10:54:31 +00:00
Code Activity

по умолчанию возврат на текущую неделю

Browse Source
This commit is contained in:
nikden13
2020-12-10 00:14:00 +07:00
parent 127da069bd
commit 2e2942e42c
2 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/Filters/TimetableFilter.php
View File

@@ -30,11 +30,12 @@ class TimetableFilter extends QueryFilter
protected function date($value)
{
$start_date = str_replace('/', '-', $value);
$end_date = Carbon::parse($start_date)
$formatValue = str_replace('/', '-', $value);
$weekStartDate = Carbon::parse($formatValue)->startOfWeek()->format('Y-m-d');
$weekEndDate = Carbon::parse($weekStartDate)
->addDays(5)
->format('Y-m-d');
$this->builder = $this->builder->whereBetween('date', [$start_date, $end_date]);
$this->builder = $this->builder->whereBetween('date', [$weekStartDate, $weekEndDate]);
}
}