use the daylight saving time zone as default time zone rather than the current standard time zone during the DST

2026-05-18 16:54:25 +08:00 · 2025-12-24 00:33:47 +08:00
parent c35cbbda15
commit 76af5d946a
96 changed files with 1179 additions and 882 deletions
@@ -129,6 +129,7 @@ import { useUserStore } from '@/stores/user.ts';
 import { useExchangeRatesStore } from '@/stores/exchangeRates.ts';

 import { findNameByValue } from '@/lib/common.ts';
+import { parseDateTimeFromUnixTime } from '@/lib/datetime.ts';
 import { getClientDisplayVersion, getDesktopVersionPath } from '@/lib/version.ts';
 import { isUserScheduledTransactionEnabled } from '@/lib/server_settings.ts';
 import { setExpenseAndIncomeAmountColor } from '@/lib/ui/common.ts';
@@ -137,7 +138,7 @@ const props = defineProps<{
    f7router: Router.Router;
 }>();

-const { tt, formatUnixTimeToLongDate, initLocale } = useI18n();
+const { tt, formatDateTimeToLongDate, initLocale } = useI18n();
 const { showToast, showConfirm } = useI18nUIComponents();
 const { allThemes, allTimezones, timeZone, isAutoUpdateExchangeRatesData, showAccountBalance } = useAppSettingPageBase();

@@ -197,8 +198,12 @@ const isEnableAnimate = computed<boolean>({
 const isEnableApplicationLock = computed<boolean>(() => settingsStore.appSettings.applicationLock);

 const exchangeRatesLastUpdateDate = computed<string>(() => {
-    const exchangeRatesLastUpdateTime = exchangeRatesStore.exchangeRatesLastUpdateTime;
-    return exchangeRatesLastUpdateTime ? formatUnixTimeToLongDate(exchangeRatesLastUpdateTime) : '';
+    if (!exchangeRatesStore.exchangeRatesLastUpdateTime) {
+        return '';
+    }
+
+    const exchangeRatesLastUpdateTime = parseDateTimeFromUnixTime(exchangeRatesStore.exchangeRatesLastUpdateTime);
+    return formatDateTimeToLongDate(exchangeRatesLastUpdateTime);
 });

 function switchToDesktopVersion(): void {
@@ -233,8 +233,10 @@
                    </div>
                </template>
                <date-time-selection-sheet :init-mode="accountContext.balanceDateTimeSheetMode"
+                                           :timezone-utc-offset="getDefaultTimezoneOffsetMinutes(account)"
+                                           :model-value="account.balanceTime"
                                           v-model:show="accountContext.showBalanceDateTimeSheet"
-                                           v-model="account.balanceTime">
+                                           @update:model-value="updateAccountBalanceTime(account, $event)">
                </date-time-selection-sheet>
            </f7-list-item>

@@ -475,8 +477,10 @@
                        </div>
                    </template>
                    <date-time-selection-sheet :init-mode="subAccountContexts[idx]!.balanceDateTimeSheetMode"
+                                               :timezone-utc-offset="getDefaultTimezoneOffsetMinutes(subAccount)"
+                                               :model-value="subAccount.balanceTime"
                                               v-model:show="subAccountContexts[idx]!.showBalanceDateTimeSheet"
-                                               v-model="subAccount.balanceTime">
+                                               @update:model-value="updateAccountBalanceTime(subAccount, $event)">
                    </date-time-selection-sheet>
                </f7-list-item>

@@ -538,8 +542,7 @@ import { isDefined, findDisplayNameByType } from '@/lib/common.ts';
 import { generateRandomUUID } from '@/lib/misc.ts';
 import {
    getTimezoneOffsetMinutes,
-    getBrowserTimezoneOffsetMinutes,
-    getActualUnixTimeForStore
+    parseDateTimeFromUnixTimeWithTimezoneOffset
 } from '@/lib/datetime.ts';

 interface AccountContext {
@@ -561,8 +564,8 @@ const {
    tt,
    getAllCurrencies,
    getCurrencyName,
-    formatUnixTimeToLongDate,
-    formatUnixTimeToLongTime,
+    formatDateTimeToLongDate,
+    formatDateTimeToLongTime,
    formatAmountToLocalizedNumeralsWithCurrency
 } = useI18n();

@@ -582,7 +585,9 @@ const {
    allAccountTypes,
    allAvailableMonthDays,
    isAccountSupportCreditCardStatementDate,
+    getDefaultTimezoneOffsetMinutes,
    getAccountCreditCardStatementDate,
+    updateAccountBalanceTime,
    isNewAccount,
    addSubAccount,
    setAccount
@@ -621,7 +626,8 @@ function formatAccountBalanceDate(account: Account): string {
        return '';
    }

-    return formatUnixTimeToLongDate(getActualUnixTimeForStore(account.balanceTime, getTimezoneOffsetMinutes(), getBrowserTimezoneOffsetMinutes()));
+    const dateTime = parseDateTimeFromUnixTimeWithTimezoneOffset(account.balanceTime, getTimezoneOffsetMinutes(account.balanceTime));
+    return formatDateTimeToLongDate(dateTime);
 }

 function formatAccountBalanceTime(account: Account): string {
@@ -629,7 +635,8 @@ function formatAccountBalanceTime(account: Account): string {
        return '';
    }

-    return formatUnixTimeToLongTime(getActualUnixTimeForStore(account.balanceTime, getTimezoneOffsetMinutes(), getBrowserTimezoneOffsetMinutes()));
+    const dateTime = parseDateTimeFromUnixTimeWithTimezoneOffset(account.balanceTime, getTimezoneOffsetMinutes(account.balanceTime));
+    return formatDateTimeToLongTime(dateTime);
 }

 function init(): void {
@@ -51,10 +51,10 @@
                </template>
                <template #footer>
                    <div v-if="dateRange.isUserCustomRange && queryDateRangeType === dateRange.type && startTime && endTime">
-                        <span>{{ displayStartTime }}</span>
+                        <span>{{ displayStartDateTime }}</span>
                        <span>&nbsp;-&nbsp;</span>
                        <br/>
-                        <span>{{ displayEndTime }}</span>
+                        <span>{{ displayEndDateTime }}</span>
                    </div>
                </template>
            </f7-list-item>
@@ -227,7 +227,7 @@
                                    <div class="transaction-footer display-flex justify-content-space-between">
                                        <div class="flex-shrink-0">
                                            <span>{{ getDisplayTime(item.transaction) }}</span>
-                                            <span v-if="item.transaction.utcOffset !== currentTimezoneOffsetMinutes">{{ `(${getDisplayTimezone(item.transaction)})` }}</span>
+                                            <span style="margin-inline-start: 4px" v-if="!isSameAsDefaultTimezoneOffsetMinutes(item.transaction)">{{ `(${getDisplayTimezone(item.transaction)})` }}</span>
                                        </div>
                                        <div class="account-balance flex-shrink-1">
                                            <span>{{ isCurrentLiabilityAccount ? tt('Outstanding Balance') : tt('Balance') }}</span>
@@ -388,7 +388,6 @@ const {
    tt,
    getCurrentLanguageTextDirection,
    getAllDateRanges,
-    formatUnixTimeToLongDateTime,
    formatNumberToLocalizedNumerals
 } = useI18n();

@@ -402,7 +401,6 @@ const {
    firstDayOfWeek,
    fiscalYearStart,
    allDateAggregationTypes,
-    currentTimezoneOffsetMinutes,
    isCurrentLiabilityAccount,
    currentAccount,
    currentAccountCurrency,
@@ -416,6 +414,7 @@ const {
    setReconciliationStatements,
    getDisplayDate,
    getDisplayTime,
+    isSameAsDefaultTimezoneOffsetMinutes,
    getDisplayTimezone,
    getDisplaySourceAmount,
    getDisplayDestinationAmount,
@@ -446,8 +445,6 @@ const virtualDataItems = ref<ReconciliationStatementVirtualListData>({
 const textDirection = computed<TextDirection>(() => getCurrentLanguageTextDirection());
 const validQuery = computed(() => currentAccount.value && currentAccount.value.type === AccountType.SingleAccount.type);
 const allAvailableDateRanges = computed(() => getAllDateRanges(DateRangeScene.Normal, true, !!accountsStore.getAccountStatementDate(accountId.value)));
-const displayStartTime = computed<string>(() => formatUnixTimeToLongDateTime(startTime.value));
-const displayEndTime = computed<string>(() => formatUnixTimeToLongDateTime(endTime.value));

 const allReconciliationStatementVirtualListItems = computed<ReconciliationStatementVirtualListItem[]>(() => {
    const ret: ReconciliationStatementVirtualListItem[] = [];
@@ -124,8 +124,9 @@ import { useI18n } from '@/locales/helpers.ts';
 import { useSettingsStore } from '@/stores/setting.ts';

 import { TextDirection } from '@/core/text.ts';
+import { type DateTime } from '@/core/datetime.ts';
 import { FontSize } from '@/core/font.ts';
-import { parseDateTimeFromUnixTime, getCurrentUnixTime } from '@/lib/datetime.ts';
+import { getCurrentDateTime } from '@/lib/datetime.ts';
 import { setAppFontSize, getFontSizePreviewClassName } from '@/lib/ui/mobile.ts';

 const props = defineProps<{
@@ -136,23 +137,23 @@ const {
    tt,
    getCurrentLanguageTextDirection,
    getWeekdayShortName,
-    getCalendarDisplayDayOfMonthFromUnixTime,
-    formatUnixTimeToShortTime,
-    formatUnixTimeToGregorianLikeLongYearMonth,
+    getCalendarDisplayDayOfMonthFromDateTime,
+    formatDateTimeToShortTime,
+    formatDateTimeToGregorianLikeLongYearMonth,
    formatAmountToLocalizedNumeralsWithCurrency
 } = useI18n();

 const settingsStore = useSettingsStore();

-const currentUnixTime = ref<number>(getCurrentUnixTime());
+const currentDateTime = ref<DateTime>(getCurrentDateTime());
 const fontSize = ref<number>(settingsStore.appSettings.fontSize);

 const textDirection = computed<string>(() => getCurrentLanguageTextDirection());
 const fontSizePreviewClassName = computed<string>(() => getFontSizePreviewClassName(fontSize.value));
-const currentLongYearMonth = computed<string>(() => formatUnixTimeToGregorianLikeLongYearMonth(currentUnixTime.value));
-const currentDayOfMonth = computed<string>(() => getCalendarDisplayDayOfMonthFromUnixTime(currentUnixTime.value));
-const currentDayOfWeek = computed<string>(() => getWeekdayShortName(parseDateTimeFromUnixTime(currentUnixTime.value).getWeekDay()));
-const currentShortTime = computed<string>(() => formatUnixTimeToShortTime(currentUnixTime.value));
+const currentLongYearMonth = computed<string>(() => formatDateTimeToGregorianLikeLongYearMonth(currentDateTime.value));
+const currentDayOfMonth = computed<string>(() => getCalendarDisplayDayOfMonthFromDateTime(currentDateTime.value));
+const currentDayOfWeek = computed<string>(() => getWeekdayShortName(currentDateTime.value.getWeekDay()));
+const currentShortTime = computed<string>(() => formatDateTimeToShortTime(currentDateTime.value));

 function getFontSizeName(): string {
    return '';
@@ -251,8 +251,10 @@
                    </div>
                </template>
                <date-time-selection-sheet :init-mode="transactionDateTimeSheetMode"
+                                           :timezone-utc-offset="transaction.utcOffset"
+                                           :model-value="transaction.time"
                                           v-model:show="showTransactionDateTimeSheet"
-                                           v-model="transaction.time">
+                                           @update:model-value="updateTransactionTime">
                </date-time-selection-sheet>
            </f7-list-item>

@@ -323,8 +325,9 @@
                                           :filter-placeholder="tt('Timezone')"
                                           :filter-no-items-text="tt('No results')"
                                           :items="allTimezones"
+                                           :model-value="transaction.timeZone"
                                           v-model:show="showTimezonePopup"
-                                           v-model="transaction.timeZone">
+                                           @update:model-value="updateTransactionTimezone">
                </list-item-selection-popup>
            </f7-list-item>

@@ -512,10 +515,9 @@ import type { TransactionPictureInfoBasicResponse } from '@/models/transaction_p
 import { Transaction } from '@/models/transaction.ts';

 import {
-    getActualUnixTimeForStore,
-    getBrowserTimezoneOffsetMinutes,
    getTimezoneOffset,
-    getTimezoneOffsetMinutes
+    getTimezoneOffsetMinutes,
+    parseDateTimeFromUnixTimeWithTimezoneOffset
 } from '@/lib/datetime.ts';
 import { formatCoordinate } from '@/lib/coordinate.ts';
 import { generateRandomUUID } from '@/lib/misc.ts';
@@ -536,8 +538,8 @@ const {
    tt,
    getMultiMonthdayShortNames,
    getMultiWeekdayLongNames,
-    formatUnixTimeToLongDate,
-    formatUnixTimeToLongTime,
+    formatDateTimeToLongDate,
+    formatDateTimeToLongTime,
    formatGregorianTextualYearMonthDayToLongDate,
    parseAmountFromLocalizedNumerals
 } = useI18n();
@@ -589,6 +591,8 @@ const {
    geoLocationStatusInfo,
    inputEmptyProblemMessage,
    inputIsEmpty,
+    updateTransactionTime,
+    updateTransactionTimezone,
    swapTransactionData,
    getDisplayAmount,
    getTransactionPictureUrl
@@ -655,19 +659,23 @@ const destinationAmountClass = computed<Record<string, boolean>>(() => {

 const transactionDisplayDate = computed<string>(() => {
    if (mode.value !== TransactionEditPageMode.View || !showTimeInDefaultTimezone.value) {
-        return formatUnixTimeToLongDate(getActualUnixTimeForStore(transaction.value.time, getTimezoneOffsetMinutes(), getBrowserTimezoneOffsetMinutes()));
+        const dateTime = parseDateTimeFromUnixTimeWithTimezoneOffset(transaction.value.time, transaction.value.utcOffset);
+        return formatDateTimeToLongDate(dateTime);
    }

-    return formatUnixTimeToLongDate(getActualUnixTimeForStore(transaction.value.time, transaction.value.utcOffset, getBrowserTimezoneOffsetMinutes()));
+    const dateTime = parseDateTimeFromUnixTimeWithTimezoneOffset(transaction.value.time, getTimezoneOffsetMinutes(transaction.value.time));
+    return formatDateTimeToLongDate(dateTime);
 });

 const transactionDisplayTime = computed<string>(() => {
    if (mode.value !== TransactionEditPageMode.View || !showTimeInDefaultTimezone.value) {
-        return formatUnixTimeToLongTime(getActualUnixTimeForStore(transaction.value.time, getTimezoneOffsetMinutes(), getBrowserTimezoneOffsetMinutes()));
+        const dateTime = parseDateTimeFromUnixTimeWithTimezoneOffset(transaction.value.time, transaction.value.utcOffset);
+        return formatDateTimeToLongTime(dateTime);
    }

-    const utcOffset = numeralSystem.value.replaceWesternArabicDigitsToLocalizedDigits(getTimezoneOffset(settingsStore.appSettings.timeZone));
-    return `${formatUnixTimeToLongTime(getActualUnixTimeForStore(transaction.value.time, transaction.value.utcOffset, getBrowserTimezoneOffsetMinutes()))} (UTC${utcOffset})`;
+    const dateTime = parseDateTimeFromUnixTimeWithTimezoneOffset(transaction.value.time, getTimezoneOffsetMinutes(transaction.value.time));
+    const utcOffset = numeralSystem.value.replaceWesternArabicDigitsToLocalizedDigits(getTimezoneOffset(transaction.value.time));
+    return `${formatDateTimeToLongTime(dateTime)} (UTC${utcOffset})`;
 });

 const transactionDisplayTimezoneName = computed<string>(() => {
@@ -949,7 +957,6 @@ function init(): void {
                tagIds: query['tagIds'],
                comment: query['comment']
            },
-            pageTypeAndMode.type === TransactionEditPageType.Transaction && (mode.value === TransactionEditPageMode.Edit || mode.value === TransactionEditPageMode.View),
            pageTypeAndMode.type === TransactionEditPageType.Transaction && (mode.value === TransactionEditPageMode.Edit || mode.value === TransactionEditPageMode.View)
        );

@@ -205,7 +205,7 @@
                            <template #media>
                                <div class="display-flex flex-direction-column transaction-date" :style="getTransactionDateStyle(transaction, idx > 0 ? transactionMonthList.items[idx - 1] : undefined)">
                                    <span class="transaction-day full-line flex-direction-column">
-                                        {{ getCalendarDisplayDayOfMonthFromUnixTime(transaction.time) }}
+                                        {{ transaction.gregorianCalendarDayOfMonth ? numeralSystem.formatNumber(transaction.gregorianCalendarDayOfMonth) : '' }}
                                    </span>
                                    <span class="transaction-day-of-week full-line flex-direction-column" v-if="transaction.displayDayOfWeek">
                                        {{ getWeekdayShortName(transaction.displayDayOfWeek) }}
@@ -265,7 +265,7 @@
                                            </div>
                                            <div class="transaction-footer">
                                                <span>{{ getDisplayTime(transaction) }}</span>
-                                                <span v-if="transaction.utcOffset !== currentTimezoneOffsetMinutes">{{ `(${getDisplayTimezone(transaction)})` }}</span>
+                                                <span v-if="!isSameAsDefaultTimezoneOffsetMinutes(transaction)">{{ `(${getDisplayTimezone(transaction)})` }}</span>
                                                <span v-if="transaction.sourceAccount">·</span>
                                                <span v-if="transaction.sourceAccount">{{ transaction.sourceAccount.name }}</span>
                                                <f7-icon class="transaction-account-arrow icon-with-direction" f7="arrow_right" v-if="transaction.sourceAccount && transaction.type === TransactionType.Transfer && transaction.destinationAccount && transaction.sourceAccount.id !== transaction.destinationAccount.id"></f7-icon>
@@ -624,7 +624,7 @@ import {
    DateRangeScene,
    DateRange
 } from '@/core/datetime.ts';
-import { AmountFilterType } from '@/core/numeral.ts';
+import { type NumeralSystem, AmountFilterType } from '@/core/numeral.ts';
 import { TransactionType } from '@/core/transaction.ts';
 import type { TransactionCategory } from '@/models/transaction_category.ts';
 import { type Transaction, TransactionTagFilter } from '@/models/transaction.ts';
@@ -637,8 +637,6 @@ import {
 import {
    getCurrentUnixTime,
    parseDateTimeFromUnixTime,
-    getBrowserTimezoneOffsetMinutes,
-    getActualUnixTimeForStore,
    getDayFirstUnixTimeBySpecifiedUnixTime,
    getYearMonthFirstUnixTime,
    getYearMonthLastUnixTime,
@@ -664,8 +662,8 @@ const props = defineProps<{
 const {
    tt,
    getCurrentLanguageTextDirection,
-    getWeekdayShortName,
-    getCalendarDisplayDayOfMonthFromUnixTime
+    getCurrentNumeralSystemType,
+    getWeekdayShortName
 } = useI18n();

 const { showAlert, showToast, routeBackOnError } = useI18nUIComponents();
@@ -676,7 +674,6 @@ const {
    customMinDatetime,
    customMaxDatetime,
    currentCalendarDate,
-    currentTimezoneOffsetMinutes,
    firstDayOfWeek,
    fiscalYearStart,
    defaultCurrency,
@@ -711,6 +708,7 @@ const {
    transactionCalendarMaxDate,
    currentMonthTransactionData,
    hasSubCategoryInQuery,
+    isSameAsDefaultTimezoneOffsetMinutes,
    canAddTransaction,
    getDisplayTime,
    getDisplayLongYearMonth,
@@ -737,6 +735,7 @@ const showCustomMonthSheet = ref<boolean>(false);
 const showDeleteActionSheet = ref<boolean>(false);

 const textDirection = computed<TextDirection>(() => getCurrentLanguageTextDirection());
+const numeralSystem = computed<NumeralSystem>(() => getCurrentNumeralSystemType());
 const isDarkMode = computed<boolean>(() => environmentsStore.framework7DarkMode || false);

 const transactions = computed<TransactionMonthList[]>(() => {
@@ -1057,7 +1056,7 @@ function changePageType(type: number): void {
 function changeDateFilter(dateType: number): void {
    if (dateType === DateRange.Custom.type) { // Custom
        if (!query.value.minTime || !query.value.maxTime) {
-            customMaxDatetime.value = getActualUnixTimeForStore(getCurrentUnixTime(), currentTimezoneOffsetMinutes.value, getBrowserTimezoneOffsetMinutes());
+            customMaxDatetime.value = getCurrentUnixTime();
            customMinDatetime.value = getDayFirstUnixTimeBySpecifiedUnixTime(customMaxDatetime.value);
        } else {
            customMaxDatetime.value = query.value.maxTime;
@@ -58,6 +58,7 @@ import { TextDirection } from '@/core/text.ts';
 import { type TokenInfoResponse, SessionDeviceType, SessionInfo } from '@/models/token.ts';

 import { isEquals } from '@/lib/common.ts';
+import { parseDateTimeFromUnixTime } from '@/lib/datetime.ts';
 import { parseSessionInfo } from '@/lib/session.ts';

 class MobilePageSessionInfo extends SessionInfo {
@@ -69,7 +70,7 @@ class MobilePageSessionInfo extends SessionInfo {
        super(sessionInfo.tokenId, sessionInfo.isCurrent, sessionInfo.deviceType, sessionInfo.deviceInfo, sessionInfo.deviceName, sessionInfo.lastSeen);
        this.domId = getTokenDomId(sessionInfo.tokenId);
        this.icon = getTokenIcon(sessionInfo.deviceType);
-        this.lastSeenDateTime = sessionInfo.lastSeen ? formatUnixTimeToLongDateTime(sessionInfo.lastSeen) : '-';
+        this.lastSeenDateTime = sessionInfo.lastSeen ? formatDateTimeToLongDateTime(parseDateTimeFromUnixTime(sessionInfo.lastSeen)) : '-';
    }
 }

@@ -77,7 +78,12 @@ const props = defineProps<{
    f7router: Router.Router;
 }>();

-const { tt, getCurrentLanguageTextDirection, formatUnixTimeToLongDateTime } = useI18n();
+const {
+    tt,
+    getCurrentLanguageTextDirection,
+    formatDateTimeToLongDateTime
+} = useI18n();
+
 const { showConfirm, showToast, routeBackOnError } = useI18nUIComponents();

 const tokensStore = useTokensStore();