mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-10-15 08:35:00 +00:00
First code for new balance chart
This commit is contained in:
@@ -89,10 +89,10 @@ class Navigation
|
||||
|
||||
if (!array_key_exists($repeatFreq, $functionMap)) {
|
||||
Log::error(sprintf(
|
||||
'The periodicity %s is unknown. Choose one of available periodicity: %s',
|
||||
$repeatFreq,
|
||||
join(', ', array_keys($functionMap))
|
||||
));
|
||||
'The periodicity %s is unknown. Choose one of available periodicity: %s',
|
||||
$repeatFreq,
|
||||
join(', ', array_keys($functionMap))
|
||||
));
|
||||
return $theDate;
|
||||
}
|
||||
|
||||
@@ -515,6 +515,25 @@ class Navigation
|
||||
return $date->format('Y-m-d');
|
||||
}
|
||||
|
||||
/**
|
||||
* Same as preferredCarbonFormat but by string
|
||||
*
|
||||
* @param string $period
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
public function preferredCarbonFormatByPeriod(string $period): string
|
||||
{
|
||||
return match ($period) {
|
||||
default => 'Y-m-d',
|
||||
//'1D' => 'Y-m-d',
|
||||
'1W' => '\WW,Y',
|
||||
'1M' => 'Y-m',
|
||||
'3M', '6M' => '\QQ,Y',
|
||||
'1Y' => 'Y',
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* If the date difference between start and end is less than a month, method returns trans(config.month_and_day).
|
||||
* If the difference is less than a year, method returns "config.month". If the date difference is larger, method
|
||||
@@ -540,6 +559,25 @@ class Navigation
|
||||
return $format;
|
||||
}
|
||||
|
||||
/**
|
||||
* Same as preferredCarbonLocalizedFormat but based on the period.
|
||||
*
|
||||
* @param string $period
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
public function preferredCarbonLocalizedFormatByPeriod(string $period): string
|
||||
{
|
||||
$locale = app('steam')->getLocale();
|
||||
return match ($period) {
|
||||
default => (string)trans('config.month_and_day_js', [], $locale),
|
||||
'1W' => (string)trans('config.week_in_year_js', [], $locale),
|
||||
'1M' => (string)trans('config.month_js', [], $locale),
|
||||
'3M', '6M' => (string)trans('config.half_year_js', [], $locale),
|
||||
'1Y' => (string)trans('config.year_js', [], $locale),
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* If the date difference between start and end is less than a month, method returns "endOfDay". If the difference
|
||||
* is less than a year, method returns "endOfMonth". If the date difference is larger, method returns "endOfYear".
|
||||
|
Reference in New Issue
Block a user