mirror/ezbookkeeping
1
0
Fork 0
mirror of https://github.com/mayswind/ezbookkeeping.git synced 2026-05-18 00:34:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

use the preset name if custom date range matches a preset item

Browse Source
This commit is contained in:
MaysWind
2024-06-03 00:47:39 +08:00
parent 809172bf34
commit 72f6a9e9a3
5 changed files with 31 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/datetime.js
+12 -6
View File
@@ -366,6 +366,16 @@ export function getShiftedDateRange(minTime, maxTime, scale) {
export function getShiftedDateRangeAndDateType(minTime, maxTime, scale, firstDayOfWeek, scene) {
const newDateRange = getShiftedDateRange(minTime, maxTime, scale);
const newDateType = getDateTypeByDateRange(newDateRange.minTime, newDateRange.maxTime, firstDayOfWeek, scene);
return {
dateType: newDateType,
minTime: newDateRange.minTime,
maxTime: newDateRange.maxTime
};
}
export function getDateTypeByDateRange(minTime, maxTime, firstDayOfWeek, scene) {
let newDateType = dateTimeConstants.allDateRanges.Custom.type;
for (let dateRangeField in dateTimeConstants.allDateRanges) {
@@ -381,17 +391,13 @@ export function getShiftedDateRangeAndDateType(minTime, maxTime, scale, firstDay
const dateRange = getDateRangeByDateType(dateRangeType.type, firstDayOfWeek);
if (dateRange && dateRange.minTime === newDateRange.minTime && dateRange.maxTime === newDateRange.maxTime) {
if (dateRange && dateRange.minTime === minTime && dateRange.maxTime === maxTime) {
newDateType = dateRangeType.type;
break;
}
}
return {
dateType: newDateType,
minTime: newDateRange.minTime,
maxTime: newDateRange.maxTime
};
return newDateType;
}
export function getDateRangeByDateType(dateType, firstDayOfWeek) {