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

support setting timezone type in reconciliation statement dialog / page

Browse Source
This commit is contained in:
MaysWind
2026-01-04 00:36:00 +08:00
parent 43154832b6
commit 43bc04012d
10 changed files with 213 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/datetime.ts
+102 -97
View File
@@ -12,6 +12,8 @@ import {
CalendarType
} from '@/core/calendar.ts';
import {
type DateTimeUnit,
type DateTimeSetObject,
type DateTime,
type DateTimeFormatOptions,
type TextualYearMonth,
@@ -307,8 +309,32 @@ class MomentDateTime implements DateTime {
return this.instance.utcOffset();
}
public getDateTimeAfterDays(days: number): DateTime {
return MomentDateTime.of(this.instance.clone().add(days, 'days'));
public setTimezoneByUtcOffsetMinutes(ufcOffset: number): DateTime {
return MomentDateTime.of(this.instance.clone().tz(getFixedTimezoneName(ufcOffset)));
}
public setTimezoneByIANATimeZoneName(timezoneName: string): DateTime {
return MomentDateTime.of(this.instance.clone().tz(timezoneName));
}
public add(amount: number, unit: DateTimeUnit): DateTime {
return MomentDateTime.of(this.instance.clone().add(amount, unit));
}
public subtract(amount: number, unit: DateTimeUnit): DateTime {
return MomentDateTime.of(this.instance.clone().subtract(amount, unit));
}
public set(value: DateTimeSetObject): DateTime {
return MomentDateTime.of(this.instance.clone().set({
year: value.year,
month: isDefined(value.month) ? value.month - 1 : undefined,
date: value.dayOfMonth,
hour: value.hour,
minute: value.minute,
second: value.second,
millisecond: value.millisecond
}));
}
public toGregorianCalendarYearMonthDay(): YearMonthDay {
@@ -378,6 +404,14 @@ class MomentDateTime implements DateTime {
return new MomentDateTime(instance);
}
public static ofUnixTime(unixTime: number): DateTime {
return new MomentDateTime(moment.unix(unixTime));
}
public static ofFullDateTime(year: number, month: number, day: number, hour: number, minute: number, second: number, millisecond: number): DateTime {
return new MomentDateTime(moment().set({ year: year, month: month - 1, date: day, hour: hour, minute: minute, second: second, millisecond: millisecond }));
}
public static now(): DateTime {
return new MomentDateTime(moment());
}
@@ -560,45 +594,39 @@ export function getUnixTimeFromLocalDatetime(datetime: Date): number {
}
export function getSameDateTimeWithCurrentTimezone(dateTime: DateTime): DateTime {
const newDateTime = moment().set({
return MomentDateTime.now().set({
year: dateTime.getGregorianCalendarYear(),
month: dateTime.getGregorianCalendarMonth() - 1,
date: dateTime.getGregorianCalendarDay(),
month: dateTime.getGregorianCalendarMonth(),
dayOfMonth: dateTime.getGregorianCalendarDay(),
hour: dateTime.getHour(),
minute: dateTime.getMinute(),
second: dateTime.getSecond(),
millisecond: 0
});
return MomentDateTime.of(newDateTime);
}
export function getSameDateTimeWithBrowserTimezone(dateTime: DateTime): DateTime {
const newDateTime = moment().tz(getBrowserTimezoneName()).set({
return MomentDateTime.now().setTimezoneByIANATimeZoneName(getBrowserTimezoneName()).set({
year: dateTime.getGregorianCalendarYear(),
month: dateTime.getGregorianCalendarMonth() - 1,
date: dateTime.getGregorianCalendarDay(),
hour: dateTime.getHour(),
minute: dateTime.getMinute(),
second: dateTime.getSecond(),
millisecond: 0,
});
return MomentDateTime.of(newDateTime);
}
export function getSameDateTimeWithTimezoneOffset(dateTime: DateTime, utcOffset: number): DateTime {
const newDateTime = moment().tz(getFixedTimezoneName(utcOffset)).set({
year: dateTime.getGregorianCalendarYear(),
month: dateTime.getGregorianCalendarMonth() - 1,
date: dateTime.getGregorianCalendarDay(),
month: dateTime.getGregorianCalendarMonth(),
dayOfMonth: dateTime.getGregorianCalendarDay(),
hour: dateTime.getHour(),
minute: dateTime.getMinute(),
second: dateTime.getSecond(),
millisecond: 0
});
}
return MomentDateTime.of(newDateTime);
export function getSameDateTimeWithTimezoneOffset(dateTime: DateTime, utcOffset: number): DateTime {
return MomentDateTime.now().setTimezoneByUtcOffsetMinutes(utcOffset).set({
year: dateTime.getGregorianCalendarYear(),
month: dateTime.getGregorianCalendarMonth(),
dayOfMonth: dateTime.getGregorianCalendarDay(),
hour: dateTime.getHour(),
minute: dateTime.getMinute(),
second: dateTime.getSecond(),
millisecond: 0
});
}
export function getCurrentDateTime(): DateTime {
@@ -610,20 +638,19 @@ export function getCurrentUnixTime(): number {
}
export function getYearMonthDayDateTime(year: number, month: number, day: number): DateTime {
const date = moment().set({ year: year, month: month - 1, date: day, hour: 0, minute: 0, second: 0, millisecond: 0 });
return MomentDateTime.of(date);
return MomentDateTime.ofFullDateTime(year, month, day, 0, 0, 0, 0);
}
export function parseDateTimeFromUnixTime(unixTime: number): DateTime {
return MomentDateTime.of(moment.unix(unixTime));
return MomentDateTime.ofUnixTime(unixTime);
}
export function parseDateTimeFromUnixTimeWithBrowserTimezone(unixTime: number): DateTime {
return MomentDateTime.of(moment.unix(unixTime).tz(getBrowserTimezoneName()));
return MomentDateTime.ofUnixTime(unixTime).setTimezoneByIANATimeZoneName(getBrowserTimezoneName());
}
export function parseDateTimeFromUnixTimeWithTimezoneOffset(unixTime: number, utcOffset: number): DateTime {
return MomentDateTime.of(moment.unix(unixTime).tz(getFixedTimezoneName(utcOffset)));
return MomentDateTime.ofUnixTime(unixTime).setTimezoneByUtcOffsetMinutes(utcOffset);
}
export function parseDateTimeFromKnownDateTimeFormat(dateTime: string, format: KnownDateTimeFormat): DateTime | undefined {
@@ -804,27 +831,21 @@ export function getThisYearLastUnixTime(): number {
return moment.unix(getThisYearFirstUnixTime()).add(1, 'years').subtract(1, 'seconds').unix();
}
export function getYearFirstUnixTimeBySpecifiedUnixTime(unixTime: number, utcOffset?: number): number {
export function getYearFirstDateTimeBySpecifiedDateTime(unixTime: number, utcOffset?: number): DateTime {
let date = moment.unix(unixTime);
if (isNumber(utcOffset)) {
date = date.tz(getFixedTimezoneName(utcOffset));
}
return date.set({ hour: 0, minute: 0, second: 0, millisecond: 0 }).subtract(date.dayOfYear() - 1, 'days').unix();
return MomentDateTime.of(date.set({ hour: 0, minute: 0, second: 0, millisecond: 0 }).subtract(date.dayOfYear() - 1, 'days'));
}
export function getYearLastUnixTimeBySpecifiedUnixTime(unixTime: number, utcOffset?: number): number {
let date = moment.unix(getYearFirstUnixTimeBySpecifiedUnixTime(unixTime, utcOffset));
if (isNumber(utcOffset)) {
date = date.tz(getFixedTimezoneName(utcOffset));
}
return date.add(1, 'years').subtract(1, 'seconds').unix();
export function getYearLastDateTimeBySpecifiedUnixTime(unixTime: number, utcOffset?: number): DateTime {
return getYearFirstDateTimeBySpecifiedDateTime(unixTime, utcOffset).add(1, 'years').subtract(1, 'seconds');
}
export function getQuarterFirstUnixTimeBySpecifiedUnixTime(unixTime: number, utcOffset?: number): number {
export function getQuarterFirstTimeTimeBySpecifiedUnixTime(unixTime: number, utcOffset?: number): DateTime {
let date = moment.unix(unixTime);
if (isNumber(utcOffset)) {
@@ -834,57 +855,39 @@ export function getQuarterFirstUnixTimeBySpecifiedUnixTime(unixTime: number, utc
date = date.set({ hour: 0, minute: 0, second: 0, millisecond: 0 });
const month = date.month();
const quarterStartMonth = Math.floor(month / 3) * 3;
return date.set({ month: quarterStartMonth, date: 1 }).unix();
return MomentDateTime.of(date.set({ month: quarterStartMonth, date: 1 }));
}
export function getQuarterLastUnixTimeBySpecifiedUnixTime(unixTime: number, utcOffset?: number): number {
let date = moment.unix(getQuarterFirstUnixTimeBySpecifiedUnixTime(unixTime, utcOffset));
if (isNumber(utcOffset)) {
date = date.tz(getFixedTimezoneName(utcOffset));
}
return date.add(3, 'months').subtract(1, 'seconds').unix();
export function getQuarterLastTimeTimeBySpecifiedUnixTime(unixTime: number, utcOffset?: number): DateTime {
return getQuarterFirstTimeTimeBySpecifiedUnixTime(unixTime, utcOffset).add(3, 'months').subtract(1, 'seconds');
}
export function getMonthFirstUnixTimeBySpecifiedUnixTime(unixTime: number, utcOffset?: number): number {
export function getMonthFirstDateTimeBySpecifiedUnixTime(unixTime: number, utcOffset?: number): DateTime {
let date = moment.unix(unixTime);
if (isNumber(utcOffset)) {
date = date.tz(getFixedTimezoneName(utcOffset));
}
return date.set({ hour: 0, minute: 0, second: 0, millisecond: 0 }).subtract(date.date() - 1, 'days').unix();
return MomentDateTime.of(date.set({ hour: 0, minute: 0, second: 0, millisecond: 0 }).subtract(date.date() - 1, 'days'));
}
export function getMonthLastUnixTimeBySpecifiedUnixTime(unixTime: number, utcOffset?: number): number {
let date = moment.unix(getMonthFirstUnixTimeBySpecifiedUnixTime(unixTime, utcOffset));
if (isNumber(utcOffset)) {
date = date.tz(getFixedTimezoneName(utcOffset));
}
return date.add(1, 'months').subtract(1, 'seconds').unix();
export function getMonthLastDateTimeBySpecifiedUnixTime(unixTime: number, utcOffset?: number): DateTime {
return getMonthFirstDateTimeBySpecifiedUnixTime(unixTime, utcOffset).add(1, 'months').subtract(1, 'seconds');
}
export function getDayFirstUnixTimeBySpecifiedUnixTime(unixTime: number, utcOffset?: number): number {
export function getDayFirstDateTimeBySpecifiedUnixTime(unixTime: number, utcOffset?: number): DateTime {
let date = moment.unix(unixTime);
if (isNumber(utcOffset)) {
date = date.tz(getFixedTimezoneName(utcOffset));
}
return date.set({ hour: 0, minute: 0, second: 0, millisecond: 0 }).unix();
return MomentDateTime.of(date.set({ hour: 0, minute: 0, second: 0, millisecond: 0 }));
}
export function getDayLastUnixTimeBySpecifiedUnixTime(unixTime: number, utcOffset?: number): number {
let date = moment.unix(unixTime);
if (isNumber(utcOffset)) {
date = date.tz(getFixedTimezoneName(utcOffset));
}
return date.set({ hour: 0, minute: 0, second: 0, millisecond: 0 }).add(1, 'days').subtract(1, 'seconds').unix();
export function getDayLastDateTimeBySpecifiedUnixTime(unixTime: number, utcOffset?: number): DateTime {
return getDayFirstDateTimeBySpecifiedUnixTime(unixTime, utcOffset).add(1, 'days').subtract(1, 'seconds');
}
export function getYearFirstUnixTime(year: number): number {
@@ -1114,11 +1117,11 @@ export function getAllDaysStartAndEndUnixTimes(startUnixTime: number, endUnixTim
while (unixTime <= endUnixTime) {
const currentDateTime = parseDateTimeFromUnixTime(unixTime);
const currentDayMinUnixTime = getDayFirstUnixTimeBySpecifiedUnixTime(unixTime);
const currentDayMaxUnixTime = getDayLastUnixTimeBySpecifiedUnixTime(unixTime);
const currentDayMinDateTime = getDayFirstDateTimeBySpecifiedUnixTime(unixTime);
const currentDayMaxDateTime = getDayLastDateTimeBySpecifiedUnixTime(unixTime);
allYearMonthDayTimes.push(YearMonthDayUnixTime.of(currentDateTime.toGregorianCalendarYearMonthDay(), currentDayMinUnixTime, currentDayMaxUnixTime));
unixTime = currentDayMaxUnixTime + 1;
allYearMonthDayTimes.push(YearMonthDayUnixTime.of(currentDateTime.toGregorianCalendarYearMonthDay(), currentDayMinDateTime.getUnixTime(), currentDayMaxDateTime.getUnixTime()));
unixTime = currentDayMaxDateTime.getUnixTime() + 1;
}
return allYearMonthDayTimes;
@@ -1450,14 +1453,14 @@ export function getFullMonthDateRange(minTime: number, maxTime: number, firstDay
return getDateRangeByDateType(DateRange.ThisMonth.type, firstDayOfWeek, fiscalYearStart);
}
const monthFirstUnixTime = getMonthFirstUnixTimeBySpecifiedUnixTime(minTime);
const monthLastUnixTime = getMonthLastUnixTimeBySpecifiedUnixTime(minTime);
const dateType = getDateTypeByDateRange(monthFirstUnixTime, monthLastUnixTime, firstDayOfWeek, fiscalYearStart, DateRangeScene.Normal);
const monthFirstDateTime = getMonthFirstDateTimeBySpecifiedUnixTime(minTime);
const monthLastDateTime = getMonthLastDateTimeBySpecifiedUnixTime(minTime);
const dateType = getDateTypeByDateRange(monthFirstDateTime.getUnixTime(), monthLastDateTime.getUnixTime(), firstDayOfWeek, fiscalYearStart, DateRangeScene.Normal);
const dateRange: TimeRangeAndDateType = {
dateType: dateType,
maxTime: monthLastUnixTime,
minTime: monthFirstUnixTime
maxTime: monthLastDateTime.getUnixTime(),
minTime: monthFirstDateTime.getUnixTime()
};
return dateRange;
@@ -1487,8 +1490,8 @@ export function getCombinedDateAndTimeValues(date: Date, numeralSystem: NumeralS
}
export function getValidMonthDayOrCurrentDayShortDate(unixTime: number, currentShortDate: string): TextualYearMonthDay {
const currentTime = moment();
const monthLastTime = moment.unix(getMonthLastUnixTimeBySpecifiedUnixTime(unixTime));
const currentTime = getCurrentDateTime();
const monthLastTime = getMonthLastDateTimeBySpecifiedUnixTime(unixTime);
if (currentShortDate) {
const yearMonthDay = currentShortDate.split('-');
@@ -1496,17 +1499,17 @@ export function getValidMonthDayOrCurrentDayShortDate(unixTime: number, currentS
if (yearMonthDay.length === 3) {
const currentDay = parseInt(yearMonthDay[2] as string);
if (currentDay < monthLastTime.date()) {
return MomentDateTime.of(monthLastTime.set({ date: currentDay })).getGregorianCalendarYearDashMonthDashDay();
if (currentDay < monthLastTime.getGregorianCalendarDay()) {
return monthLastTime.set({ dayOfMonth: currentDay }).getGregorianCalendarYearDashMonthDashDay();
}
}
}
if (monthLastTime.year() === currentTime.year() && monthLastTime.month() === currentTime.month()) {
return MomentDateTime.of(currentTime).getGregorianCalendarYearDashMonthDashDay();
if (monthLastTime.getGregorianCalendarYear() === currentTime.getGregorianCalendarYear() && monthLastTime.getGregorianCalendarMonth() === currentTime.getGregorianCalendarMonth()) {
return currentTime.getGregorianCalendarYearDashMonthDashDay();
}
return MomentDateTime.of(monthLastTime).getGregorianCalendarYearDashMonthDashDay();
return monthLastTime.getGregorianCalendarYearDashMonthDashDay();
}
export function isDateRangeMatchFullYears(minTime: number, maxTime: number): boolean {
@@ -1567,7 +1570,7 @@ export function getFiscalYearFromUnixTime(unixTime: number, fiscalYearStartValue
return year + 1;
}
export function getFiscalYearStartUnixTime(unixTime: number, fiscalYearStartValue: number, utcOffset?: number): number {
export function getFiscalYearStartDateTime(unixTime: number, fiscalYearStartValue: number, utcOffset?: number): DateTime {
let date = moment.unix(unixTime);
if (isNumber(utcOffset)) {
@@ -1582,7 +1585,7 @@ export function getFiscalYearStartUnixTime(unixTime: number, fiscalYearStartValu
finalDate = finalDate.tz(getFixedTimezoneName(utcOffset));
}
return finalDate.year(date.year()).month(0).date(1).hour(0).minute(0).second(0).millisecond(0).unix();
return MomentDateTime.of(finalDate.year(date.year()).month(0).date(1).hour(0).minute(0).second(0).millisecond(0));
}
let fiscalYearStart = FiscalYearStart.valueOf(fiscalYearStartValue);
@@ -1611,7 +1614,7 @@ export function getFiscalYearStartUnixTime(unixTime: number, fiscalYearStartValu
finalDate = finalDate.tz(getFixedTimezoneName(utcOffset));
}
return finalDate.set({
return MomentDateTime.of(finalDate.set({
year: startYear,
month: fiscalYearStart.month - 1, // 0-index
date: fiscalYearStart.day,
@@ -1619,17 +1622,19 @@ export function getFiscalYearStartUnixTime(unixTime: number, fiscalYearStartValu
minute: 0,
second: 0,
millisecond: 0,
}).unix();
}));
}
export function getFiscalYearEndDateTime(unixTime: number, fiscalYearStart: number, utcOffset?: number): DateTime {
return getFiscalYearStartDateTime(unixTime, fiscalYearStart, utcOffset).add(1, 'years').subtract(1, 'seconds');
}
export function getFiscalYearStartUnixTime(unixTime: number, fiscalYearStart: number, utcOffset?: number): number {
return getFiscalYearStartDateTime(unixTime, fiscalYearStart, utcOffset).getUnixTime();
}
export function getFiscalYearEndUnixTime(unixTime: number, fiscalYearStart: number, utcOffset?: number): number {
let date = moment.unix(getFiscalYearStartUnixTime(unixTime, fiscalYearStart));
if (isNumber(utcOffset)) {
date = date.tz(getFixedTimezoneName(utcOffset));
}
return date.add(1, 'years').subtract(1, 'seconds').unix();
return getFiscalYearEndDateTime(unixTime, fiscalYearStart, utcOffset).getUnixTime();
}
export function getCurrentFiscalYear(fiscalYearStart: number, utcOffset?: number): number {