diff --git a/src/desktop-main.js b/src/desktop-main.js index 4a15532e..db43c77c 100644 --- a/src/desktop-main.js +++ b/src/desktop-main.js @@ -11,6 +11,7 @@ import { VBtn } from 'vuetify/components/VBtn'; import { VBtnGroup } from 'vuetify/components/VBtnGroup'; import { VBtnToggle } from 'vuetify/components/VBtnToggle'; import { VCard, VCardActions, VCardItem, VCardSubtitle, VCardText, VCardTitle } from 'vuetify/components/VCard'; +import { VCheckbox, VCheckboxBtn } from 'vuetify/components/VCheckbox'; import { VChip } from 'vuetify/components/VChip'; import { VDialog } from 'vuetify/components/VDialog'; import { VDivider } from 'vuetify/components/VDivider'; @@ -109,6 +110,8 @@ const vuetify = createVuetify({ VCardSubtitle, VCardText, VCardTitle, + VCheckbox, + VCheckboxBtn, VChip, VDialog, VDivider, diff --git a/src/views/desktop/app/settings/AppStatisticsSettingTab.vue b/src/views/desktop/app/settings/AppStatisticsSettingTab.vue index 9a04b33b..a1b639e4 100644 --- a/src/views/desktop/app/settings/AppStatisticsSettingTab.vue +++ b/src/views/desktop/app/settings/AppStatisticsSettingTab.vue @@ -62,15 +62,11 @@ - - - + - - - + @@ -81,7 +77,14 @@ import { useSettingsStore } from '@/stores/setting.js'; import statisticsConstants from '@/consts/statistics.js'; +import AccountFilterSettingsCard from '@/views/desktop/statistics/AccountFilterSettingsCard.vue'; +import CategoryFilterSettingsCard from '@/views/desktop/statistics/CategoryFilterSettingsCard.vue'; + export default { + components: { + AccountFilterSettingsCard, + CategoryFilterSettingsCard + }, computed: { ...mapStores(useSettingsStore), allChartTypes() { diff --git a/src/views/desktop/statistics/AccountFilterSettingsCard.vue b/src/views/desktop/statistics/AccountFilterSettingsCard.vue new file mode 100644 index 00000000..6ed56b79 --- /dev/null +++ b/src/views/desktop/statistics/AccountFilterSettingsCard.vue @@ -0,0 +1,366 @@ + + + + + diff --git a/src/views/desktop/statistics/CategoryFilterSettingsCard.vue b/src/views/desktop/statistics/CategoryFilterSettingsCard.vue new file mode 100644 index 00000000..860e0201 --- /dev/null +++ b/src/views/desktop/statistics/CategoryFilterSettingsCard.vue @@ -0,0 +1,396 @@ + + + + + + diff --git a/src/views/desktop/statistics/TransactionPage.vue b/src/views/desktop/statistics/TransactionPage.vue index 2a2f78f4..22cf781c 100644 --- a/src/views/desktop/statistics/TransactionPage.vue +++ b/src/views/desktop/statistics/TransactionPage.vue @@ -105,10 +105,10 @@ + @click="showFilterAccountDialog = true"> + @click="showFilterCategoryDialog = true"> + + + + + + + + + @@ -234,13 +247,22 @@ import { mdiDotsVertical, } from '@mdi/js'; +import AccountFilterSettingsCard from '@/views/desktop/statistics/AccountFilterSettingsCard.vue'; +import CategoryFilterSettingsCard from '@/views/desktop/statistics/CategoryFilterSettingsCard.vue'; + export default { + components: { + AccountFilterSettingsCard, + CategoryFilterSettingsCard + }, data() { return { activeTab: 'statisticsPage', initing: true, loading: true, showCustomDateRangeDialog: false, + showFilterAccountDialog: false, + showFilterCategoryDialog: false, icons: { check: mdiCheck, left: mdiArrowLeft, @@ -576,12 +598,6 @@ export default { }, clickPieChartItem(item) { this.$router.push(this.getItemLinkUrl(item)); - }, - filterAccounts() { - - }, - filterCategories() { - }, settings() { this.$router.push('/app/settings?tab=statisticsSetting');