+
{{ queryStartTime }}
-
@@ -227,8 +227,8 @@
@@ -304,10 +304,10 @@ export default {
return this.$t(querySortingTypeName);
},
queryStartTime() {
- return this.$locale.formatUnixTimeToLongDateTime(this.userStore, this.query.startTime);
+ return this.$locale.formatUnixTimeToLongDateTime(this.userStore, this.query.categoricalChartStartTime);
},
queryEndTime() {
- return this.$locale.formatUnixTimeToLongDateTime(this.userStore, this.query.endTime);
+ return this.$locale.formatUnixTimeToLongDateTime(this.userStore, this.query.categoricalChartEndTime);
},
allChartTypes() {
return this.$locale.getAllCategoricalChartTypes();
@@ -324,6 +324,9 @@ export default {
allDateRanges() {
return datetimeConstants.allDateRanges;
},
+ allDateRangesArray() {
+ return this.$locale.getAllDateRanges(datetimeConstants.allDateRangeScenes.Normal, true);
+ },
showAccountBalance() {
return this.settingsStore.appSettings.showAccountBalance;
},
@@ -465,7 +468,7 @@ export default {
this.showCustomDateRangeSheet = true;
this.showDatePopover = false;
return;
- } else if (this.query.dateType === dateType) {
+ } else if (this.query.categoricalChartDateType === dateType) {
return;
}
@@ -476,9 +479,9 @@ export default {
}
this.statisticsStore.updateTransactionStatisticsFilter({
- dateType: dateRange.dateType,
- startTime: dateRange.minTime,
- endTime: dateRange.maxTime
+ categoricalChartDateType: dateRange.dateType,
+ categoricalChartStartTime: dateRange.minTime,
+ categoricalChartEndTime: dateRange.maxTime
});
this.showDatePopover = false;
@@ -490,9 +493,9 @@ export default {
}
this.statisticsStore.updateTransactionStatisticsFilter({
- dateType: this.allDateRanges.Custom.type,
- startTime: startTime,
- endTime: endTime
+ categoricalChartDateType: this.allDateRanges.Custom.type,
+ categoricalChartStartTime: startTime,
+ categoricalChartEndTime: endTime
});
this.showCustomDateRangeSheet = false;
@@ -500,16 +503,16 @@ export default {
this.reload(null);
},
shiftDateRange(startTime, endTime, scale) {
- if (this.query.dateType === this.allDateRanges.All.type) {
+ if (this.query.categoricalChartDateType === this.allDateRanges.All.type) {
return;
}
- const newDateRange = getShiftedDateRangeAndDateType(startTime, endTime, scale, this.firstDayOfWeek);
+ const newDateRange = getShiftedDateRangeAndDateType(startTime, endTime, scale, this.firstDayOfWeek, datetimeConstants.allDateRangeScenes.Normal);
this.statisticsStore.updateTransactionStatisticsFilter({
- dateType: newDateRange.dateType,
- startTime: newDateRange.minTime,
- endTime: newDateRange.maxTime
+ categoricalChartDateType: newDateRange.dateType,
+ categoricalChartStartTime: newDateRange.minTime,
+ categoricalChartEndTime: newDateRange.maxTime
});
this.reload(null);
@@ -520,7 +523,7 @@ export default {
return this.$t(this.allDateRanges.All.name);
}
- return this.$locale.getDateRangeDisplayName(this.userStore, query.dateType, query.startTime, query.endTime);
+ return this.$locale.getDateRangeDisplayName(this.userStore, query.categoricalChartDateType, query.categoricalChartStartTime, query.categoricalChartEndTime);
},
clickPieChartItem(item) {
this.f7router.navigate(this.getItemLinkUrl(item));
diff --git a/src/views/mobile/transactions/ListPage.vue b/src/views/mobile/transactions/ListPage.vue
index 3924a794..ebcb6289 100644
--- a/src/views/mobile/transactions/ListPage.vue
+++ b/src/views/mobile/transactions/ListPage.vue
@@ -253,10 +253,10 @@
v-model:opened="showDatePopover"
@popover:open="scrollPopoverToSelectedItem">
-
@@ -562,6 +562,9 @@ export default {
allDateRanges() {
return datetimeConstants.allDateRanges;
},
+ allDateRangesArray() {
+ return this.$locale.getAllDateRanges(datetimeConstants.allDateRangeScenes.Normal, true);
+ },
showTotalAmountInTransactionListPage() {
return this.settingsStore.appSettings.showTotalAmountInTransactionListPage;
}
@@ -830,7 +833,7 @@ export default {
return;
}
- const newDateRange = getShiftedDateRangeAndDateType(minTime, maxTime, scale, this.firstDayOfWeek);
+ const newDateRange = getShiftedDateRangeAndDateType(minTime, maxTime, scale, this.firstDayOfWeek, datetimeConstants.allDateRangeScenes.Normal);
this.transactionsStore.updateTransactionListFilter({
dateType: newDateRange.dateType,