jev/opensem
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix articles datatables, enhance statistics

Browse Source
This commit is contained in:
ludo
2024-01-28 19:56:13 +01:00
parent 0bb75125a7
commit 502b71617a
7 changed files with 81 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/Repositories/Core/DateRange.php
View File

@@ -3,7 +3,6 @@
namespace App\Repositories\Core;
use Carbon\Carbon;
use function League\Period\interval_after;
use League\Period\Period;
class DateRange
@@ -201,9 +200,9 @@ class DateRange
public static function getPeriods($begin, $end, $duration)
{
$range = [];
$period = new Period($begin, $end);
foreach ($period->getDatePeriod($duration) as $day) {
$range[] = interval_after($day, $duration);
$interval = Period::fromDate($begin, $end);
foreach ($interval->splitForward($duration) as $day) {
$range[] = $day;
}
return $range;
@@ -222,8 +221,8 @@ class DateRange
public static function periodToCarbon($period)
{
return [
'start' => self::DatePointToCarbon($period->getStartDate()),
'end' => self::DatePointToCarbon($period->getEndDate()),
'start' => self::DatePointToCarbon($period->startDate),
'end' => self::DatePointToCarbon($period->endDate),
];
}