kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-31 02:36:28 +00:00
Code Issues Projects Releases Wiki Activity

Fix code and tests.

Browse Source
This commit is contained in:
James Cole
2024-03-17 12:26:56 +01:00
parent 3913fa5086
commit b359d51d3a
12 changed files with 46 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
app/Support/Navigation.php
View File

@@ -161,7 +161,7 @@ class Navigation
public function startOfPeriod(Carbon $theDate, string $repeatFreq): Carbon
{
$date = clone $theDate;
Log::debug(sprintf('Now in startOfPeriod("%s", "%s")', $date->toIso8601String(), $repeatFreq));
$functionMap = [
'1D' => 'startOfDay',
'daily' => 'startOfDay',
@@ -178,15 +178,33 @@ class Navigation
'yearly' => 'startOfYear',
'1Y' => 'startOfYear',
];
$parameterMap = [
'startOfWeek' => [Carbon::MONDAY],
];
if (array_key_exists($repeatFreq, $functionMap)) {
$function = $functionMap[$repeatFreq];
Log::debug(sprintf('Function is ->%s()', $function));
if(array_key_exists($function, $parameterMap)) {
Log::debug(sprintf('Parameter map, function becomes ->%s(%s)', $function, join(', ', $parameterMap[$function])));
$date->{$function}($parameterMap[$function][0]);
Log::debug(sprintf('Result is "%s"', $date->toIso8601String()));
return $date;
}
$date->{$function}(); // @phpstan-ignore-line
Log::debug(sprintf('Result is "%s"', $date->toIso8601String()));
return $date;
}
if ('half-year' === $repeatFreq || '6M' === $repeatFreq) {
$skipTo = $date->month > 7 ? 6 : 0;
$date->startOfYear()->addMonths($skipTo);
Log::debug(sprintf('Custom call for "%s": addMonths(%d)', $repeatFreq, $skipTo));
Log::debug(sprintf('Result is "%s"', $date->toIso8601String()));
return $date;
}
@@ -202,10 +220,12 @@ class Navigation
default => null,
};
if (null !== $result) {
Log::debug(sprintf('Result is "%s"', $date->toIso8601String()));
return $result;
}
if ('custom' === $repeatFreq) {
Log::debug(sprintf('Custom, result is "%s"', $date->toIso8601String()));
return $date; // the date is already at the start.
}
Log::error(sprintf('Cannot do startOfPeriod for $repeat_freq "%s"', $repeatFreq));
@@ -216,6 +236,7 @@ class Navigation
public function endOfPeriod(Carbon $end, string $repeatFreq): Carbon
{
$currentEnd = clone $end;
Log::debug(sprintf('Now in endOfPeriod("%s", "%s").', $currentEnd->toIso8601String(), $repeatFreq));
$functionMap = [
'1D' => 'endOfDay',
@@ -296,6 +317,7 @@ class Navigation
if (in_array($repeatFreq, $subDay, true)) {
$currentEnd->subDay();
}
Log::debug(sprintf('Final result: %s', $currentEnd->toIso8601String()));
return $currentEnd;
}
@@ -471,11 +493,11 @@ class Navigation
public function preferredCarbonFormat(Carbon $start, Carbon $end): string
{
$format = 'Y-m-d';
if ($start->diffInMonths($end, true) > 0) {
if ((int)$start->diffInMonths($end, true) > 1) {
$format = 'Y-m';
}
if ($start->diffInMonths($end, true) > 12) {
if ((int)$start->diffInMonths($end, true) > 12) {
$format = 'Y';
}
@@ -558,11 +580,11 @@ class Navigation
public function preferredEndOfPeriod(Carbon $start, Carbon $end): string
{
$format = 'endOfDay';
if ($start->diffInMonths($end, true) > 1) {
if ((int)$start->diffInMonths($end, true) > 1) {
$format = 'endOfMonth';
}
if ($start->diffInMonths($end, true) > 12) {
if ((int)$start->diffInMonths($end, true) > 12) {
$format = 'endOfYear';
}
@@ -576,11 +598,11 @@ class Navigation
public function preferredRangeFormat(Carbon $start, Carbon $end): string
{
$format = '1D';
if ($start->diffInMonths($end, true) > 1) {
if ((int)$start->diffInMonths($end, true) > 1) {
$format = '1M';
}
if ($start->diffInMonths($end, true) > 12) {
if ((int)$start->diffInMonths($end, true) > 12) {
$format = '1Y';
}
@@ -594,11 +616,11 @@ class Navigation
public function preferredSqlFormat(Carbon $start, Carbon $end): string
{
$format = '%Y-%m-%d';
if ($start->diffInMonths($end, true) > 1) {
if ((int)$start->diffInMonths($end, true) > 1) {
$format = '%Y-%m';
}
if ($start->diffInMonths($end, true) > 12) {
if ((int)$start->diffInMonths($end, true) > 12) {
$format = '%Y';
}

4
app/Support/ParseDateString.php
View File

@@ -126,8 +126,8 @@ class ParseDateString
default => $today,
'yesterday' => $today->subDay(),
'tomorrow' => $today->addDay(),
'start of this week' => $today->startOfWeek(),
'end of this week' => $today->endOfWeek(),
'start of this week' => $today->startOfWeek(Carbon::MONDAY),
'end of this week' => $today->endOfWeek(Carbon::SUNDAY),
'start of this month' => $today->startOfMonth(),
'end of this month' => $today->endOfMonth(),
'start of this quarter' => $today->startOfQuarter(),