statistics analysis supports filtering tags

src/views/mobile/settings/TransactionTagFilterSettingsPage.vue

@@ -42,6 +42,17 @@
         </f7-list>
 
         <f7-block class="combination-list-wrapper margin-vertical" key="default" v-show="!loading && hasAnyVisibleTag">
+            <f7-list class="margin-top-half margin-bottom" strong inset dividers v-if="type === 'statisticsCurrent'">
+                <f7-list-item radio
+                              :title="filterType.displayName"
+                              :value="filterType.type"
+                              :checked="tagFilterType === filterType.type"
+                              :key="filterType.type"
+                              v-for="filterType in allTagFilterTypes"
+                              @change="tagFilterType = filterType.type">
+                </f7-list-item>
+            </f7-list>
+
             <f7-accordion-item :opened="collapseStates['default'].opened"
                                @accordion:open="collapseStates['default'].opened = true"
                                @accordion:close="collapseStates['default'].opened = false">
@@ -103,6 +114,9 @@
 import { mapStores } from 'pinia';
 import { useTransactionTagsStore } from '@/stores/transactionTag.js';
 import { useTransactionsStore } from '@/stores/transaction.js';
+import { useStatisticsStore } from '@/stores/statistics.js';
+
+import transactionConstants from '@/consts/transaction.js';
 
 import {
     selectAll,
@@ -121,6 +135,7 @@ export default {
             loadingError: null,
             type: null,
             filterTagIds: {},
+            tagFilterType: transactionConstants.defaultTransactionTagFilterType.type,
             showHidden: false,
             collapseStates: {
                 'default': {
@@ -131,7 +146,7 @@ export default {
         }
     },
     computed: {
-        ...mapStores(useTransactionTagsStore, useTransactionsStore),
+        ...mapStores(useTransactionTagsStore, useTransactionsStore, useStatisticsStore),
         title() {
             return 'Filter Transaction Tags';
         },
@@ -141,6 +156,9 @@ export default {
         allTags() {
             return this.transactionTagsStore.allTransactionTags;
         },
+        allTagFilterTypes() {
+            return this.$locale.getAllTransactionTagFilterTypes();
+        },
         hasAnyAvailableTag() {
             return this.transactionTagsStore.allAvailableTagsCount > 0;
         },
@@ -174,7 +192,20 @@ export default {
                 allTransactionTagIds[transactionTag.id] = true;
             }
 
-            if (self.type === 'transactionListCurrent') {
+            if (self.type === 'statisticsCurrent') {
+                let transactionTagIds = self.statisticsStore.transactionStatisticsFilter.tagIds ? self.statisticsStore.transactionStatisticsFilter.tagIds.split(',') : [];
+
+                for (let i = 0; i < transactionTagIds.length; i++) {
+                    const transactionTagId = transactionTagIds[i];
+                    const transactionTag = self.transactionTagsStore.allTransactionTagsMap[transactionTagId];
+
+                    if (transactionTag) {
+                        allTransactionTagIds[transactionTag.id] = false;
+                    }
+                }
+                self.filterTagIds = allTransactionTagIds;
+                self.tagFilterType = self.statisticsStore.transactionStatisticsFilter.tagFilterType;
+            } else if (self.type === 'transactionListCurrent') {
                 for (let transactionTagId in self.transactionsStore.allFilterTagIds) {
                     if (!Object.prototype.hasOwnProperty.call(self.transactionsStore.allFilterTagIds, transactionTagId)) {
                         continue;
@@ -210,6 +241,7 @@ export default {
 
             const filteredTagIds = {};
             let finalTagIds = '';
+            let changed = true;
 
             for (let transactionTagId in self.filterTagIds) {
                 if (!Object.prototype.hasOwnProperty.call(self.filterTagIds, transactionTagId)) {
@@ -229,8 +261,17 @@ export default {
                 }
             }
 
-            if (this.type === 'transactionListCurrent') {
-                const changed = self.transactionsStore.updateTransactionListFilter({
+            if (this.type === 'statisticsCurrent') {
+                changed = self.statisticsStore.updateTransactionStatisticsFilter({
+                    tagIds: finalTagIds,
+                    tagFilterType: self.tagFilterType
+                });
+
+                if (changed) {
+                    self.statisticsStore.updateTransactionStatisticsInvalidState(true);
+                }
+            } else if (this.type === 'transactionListCurrent') {
+                changed = self.transactionsStore.updateTransactionListFilter({
                     tagIds: finalTagIds
                 });
 

src/views/mobile/statistics/TransactionPage.vue

@@ -311,6 +311,7 @@
             <f7-actions-group>
                 <f7-actions-button @click="filterAccounts">{{ $t('Filter Accounts') }}</f7-actions-button>
                 <f7-actions-button @click="filterCategories">{{ $t('Filter Transaction Categories') }}</f7-actions-button>
+                <f7-actions-button @click="filterTags">{{ $t('Filter Transaction Tags') }}</f7-actions-button>
             </f7-actions-group>
             <f7-actions-group>
                 <f7-actions-button @click="settings">{{ $t('Settings') }}</f7-actions-button>
@@ -812,6 +813,9 @@ export default {
         filterCategories() {
             this.f7router.navigate('/settings/filter/category?type=statisticsCurrent');
         },
+        filterTags() {
+            this.f7router.navigate('/settings/filter/tag?type=statisticsCurrent');
+        },
         settings() {
             this.f7router.navigate('/statistic/settings');
         },

src/views/mobile/transactions/ListPage.vue

@@ -767,7 +767,8 @@ export default {
             type: parseInt(query.type) > 0 ? parseInt(query.type) : undefined,
             categoryIds: query.categoryIds,
             accountIds: query.accountIds,
-            tagIds: query.tagIds
+            tagIds: query.tagIds,
+            tagFilterType: query.tagFilterType && parseInt(query.tagFilterType) >= 0 ? parseInt(query.tagFilterType) : undefined
         });
 
         this.reload(null);