@@ -214,7 +214,7 @@
@click="setDateFilter(dateRange.type)">
+ v-if="dateRange.type === allDateRanges.Custom.type && query.dateType === allDateRanges.Custom.type && query.startTime && query.endTime">
{{ query.startTime | moment($t('format.datetime.long-without-second')) }}
-
@@ -284,15 +284,15 @@ export default {
totalAmount: 0
};
- if (self.query.chartDataType === self.$constants.statistics.allChartDataTypes.ExpenseByAccount.type ||
- self.query.chartDataType === self.$constants.statistics.allChartDataTypes.ExpenseByPrimaryCategory.type ||
- self.query.chartDataType === self.$constants.statistics.allChartDataTypes.ExpenseBySecondaryCategory.type ||
- self.query.chartDataType === self.$constants.statistics.allChartDataTypes.IncomeByAccount.type ||
- self.query.chartDataType === self.$constants.statistics.allChartDataTypes.IncomeByPrimaryCategory.type ||
- self.query.chartDataType === self.$constants.statistics.allChartDataTypes.IncomeBySecondaryCategory.type) {
+ if (self.query.chartDataType === self.allChartDataTypes.ExpenseByAccount.type ||
+ self.query.chartDataType === self.allChartDataTypes.ExpenseByPrimaryCategory.type ||
+ self.query.chartDataType === self.allChartDataTypes.ExpenseBySecondaryCategory.type ||
+ self.query.chartDataType === self.allChartDataTypes.IncomeByAccount.type ||
+ self.query.chartDataType === self.allChartDataTypes.IncomeByPrimaryCategory.type ||
+ self.query.chartDataType === self.allChartDataTypes.IncomeBySecondaryCategory.type) {
combinedData = this.$store.getters.statisticsItemsByTransactionStatisticsData;
- } else if (self.query.chartDataType === self.$constants.statistics.allChartDataTypes.AccountTotalAssets.type ||
- self.query.chartDataType === self.$constants.statistics.allChartDataTypes.AccountTotalLiabilities.type) {
+ } else if (self.query.chartDataType === self.allChartDataTypes.AccountTotalAssets.type ||
+ self.query.chartDataType === self.allChartDataTypes.AccountTotalLiabilities.type) {
combinedData = this.$store.getters.statisticsItemsByAccountsData;
}
@@ -368,13 +368,13 @@ export default {
let defaultChartDataType = self.$settings.getStatisticsDefaultChartDataType();
- if (defaultChartDataType < self.$constants.statistics.allChartDataTypes.ExpenseByAccount.type || defaultChartDataType > self.$constants.statistics.allChartDataTypes.AccountTotalLiabilities.type) {
+ if (defaultChartDataType < self.allChartDataTypes.ExpenseByAccount.type || defaultChartDataType > self.allChartDataTypes.AccountTotalLiabilities.type) {
defaultChartDataType = self.$constants.statistics.defaultChartDataType;
}
let defaultDateRange = self.$settings.getStatisticsDefaultDateRange();
- if (defaultDateRange < self.$constants.datetime.allDateRanges.All.type || defaultDateRange >= self.$constants.datetime.allDateRanges.Custom.type) {
+ if (defaultDateRange < self.allDateRanges.All.type || defaultDateRange >= self.allDateRanges.Custom.type) {
defaultDateRange = self.$constants.statistics.defaultDataRangeType;
}
@@ -451,7 +451,7 @@ export default {
this.showChartDataTypePopover = false;
},
setDateFilter(dateType) {
- if (dateType === this.$constants.datetime.allDateRanges.Custom.type) { // Custom
+ if (dateType === this.allDateRanges.Custom.type) { // Custom
this.showCustomDateRangeSheet = true;
this.showDatePopover = false;
return;
@@ -480,7 +480,7 @@ export default {
}
this.$store.dispatch('updateTransactionStatisticsFilter', {
- dateType: this.$constants.datetime.allDateRanges.Custom.type,
+ dateType: this.allDateRanges.Custom.type,
startTime: startTime,
endTime: endTime
});
@@ -490,19 +490,19 @@ export default {
this.reload(null);
},
shiftDateRange(startTime, endTime, scale) {
- if (this.query.dateType === this.$constants.datetime.allDateRanges.All.type) {
+ if (this.query.dateType === this.allDateRanges.All.type) {
return;
}
const newDateRange = this.$utilities.getShiftedDateRange(startTime, endTime, scale);
- let newDateType = this.$constants.datetime.allDateRanges.Custom.type;
+ let newDateType = this.allDateRanges.Custom.type;
- for (let dateRangeField in this.$constants.datetime.allDateRanges) {
- if (!Object.prototype.hasOwnProperty.call(this.$constants.datetime.allDateRanges, dateRangeField)) {
+ for (let dateRangeField in this.allDateRanges) {
+ if (!Object.prototype.hasOwnProperty.call(this.allDateRanges, dateRangeField)) {
continue;
}
- const dateRangeType = this.$constants.datetime.allDateRanges[dateRangeField];
+ const dateRangeType = this.allDateRanges[dateRangeField];
const dateRange = this.$utilities.getDateRangeByDateType(dateRangeType.type, this.firstDayOfWeek);
if (dateRange && dateRange.minTime === newDateRange.minTime && dateRange.maxTime === newDateRange.maxTime) {
@@ -520,8 +520,8 @@ export default {
this.reload(null);
},
dateRangeName(query) {
- if (query.chartDataType === this.$constants.statistics.allChartDataTypes.AccountTotalAssets.type ||
- query.chartDataType === this.$constants.statistics.allChartDataTypes.AccountTotalLiabilities.type) {
+ if (query.chartDataType === this.allChartDataTypes.AccountTotalAssets.type ||
+ query.chartDataType === this.allChartDataTypes.AccountTotalLiabilities.type) {
return this.$t(this.allDateRanges.All.name);
}
@@ -571,7 +571,7 @@ export default {
return `${displayStartTime} ~ ${displayEndTime}`;
},
clickPieChartItem(item) {
- this.$f7router.navigate(this.$options.filters.itemLinkUrl(item, this.query, this.$constants.statistics.allChartDataTypes));
+ this.$f7router.navigate(this.$options.filters.itemLinkUrl(item, this.query, this.allChartDataTypes));
},
filterAccounts() {
this.$f7router.navigate('/statistic/filter/account');