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

add all date type range in transaction list page

Browse Source
This commit is contained in:
MaysWind
2023-08-01 22:25:55 +08:00
parent 6e798f739f
commit 43522e9c81
3 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/datetime.js
+15 -5
View File
@@ -375,15 +375,25 @@ export function getRecentMonthDateRanges(monthCount) {
return recentDateRanges;
}
export function getRecentDateRangeTypeByDateType(allRecentMonthDateRanges, dateType) {
for (let i = 0; i < allRecentMonthDateRanges.length; i++) {
if (!allRecentMonthDateRanges[i].isPreset && allRecentMonthDateRanges[i].dateType === dateType) {
return i;
}
}
return -1;
}
export function getRecentDateRangeType(allRecentMonthDateRanges, dateType, minTime, maxTime, firstDayOfWeek) {
let dateRange = getDateRangeByDateType(dateType, firstDayOfWeek);
if (dateRange && dateRange.dateType === dateTimeConstants.allDateRanges.All.type) {
return allRecentMonthDateRanges.length - 1; // Custom
return getRecentDateRangeTypeByDateType(allRecentMonthDateRanges, dateTimeConstants.allDateRanges.All.type);
}
if (!dateRange && (!maxTime || !minTime)) {
return allRecentMonthDateRanges.length - 1; // Custom
return getRecentDateRangeTypeByDateType(allRecentMonthDateRanges, dateTimeConstants.allDateRanges.Custom.type);
}
if (!dateRange) {
@@ -394,15 +404,15 @@ export function getRecentDateRangeType(allRecentMonthDateRanges, dateType, minTi
};
}
for (let i = 0; i < allRecentMonthDateRanges.length - 1; i++) {
for (let i = 0; i < allRecentMonthDateRanges.length; i++) {
const recentDateRange = allRecentMonthDateRanges[i];
if (recentDateRange.minTime === dateRange.minTime && recentDateRange.maxTime === dateRange.maxTime) {
if (recentDateRange.isPreset && recentDateRange.minTime === dateRange.minTime && recentDateRange.maxTime === dateRange.maxTime) {
return i;
}
}
return allRecentMonthDateRanges.length - 1; // Custom
return getRecentDateRangeTypeByDateType(allRecentMonthDateRanges, dateTimeConstants.allDateRanges.Custom.type);
}
export function isDateRangeMatchFullYears(minTime, maxTime) {