Open source personal finance application
feat(TrnasferCategory): refactor
ilkome28eb51598e7a
diff --git a/components/categories/getCategories.ts b/components/categories/getCategories.tsindex 1ca0f932..7b01d46e 100644--- a/components/categories/getCategories.ts+++ b/components/categories/getCategories.ts@@ -1,5 +1,7 @@+import type { CategoryID } from '~/components/categories/types'+// TODO: add typings-export function getCatsIds(catsIds, catsItems) {+export function getCatsIds(catsIds: CategoryID[], catsItems) {const ids = []for (const catId of catsIds) {@@ -13,8 +15,9 @@ export function getCatsIds(catsIds, catsItems) {}// TODO: add typings-export function getTransferCategoriesIds(categoriesItems) {+export function getTransferCategoriesIds(categoriesItems): CategoryID[] {const names = ['перевод', 'transfer']+const categoriesIdsByName = Object.keys(categoriesItems).filter(id => names.includes(categoriesItems[id].name.toLowerCase()))diff --git a/components/stat/ChartLines.vue b/components/stat/ChartLines.vueindex ad60c197..a0f08b41 100644--- a/components/stat/ChartLines.vue+++ b/components/stat/ChartLines.vue@@ -3,7 +3,7 @@ import { Chart } from 'highcharts-vue'import chartOptions from '~/components/stat/chartOptions'import useChart from '~/components/chart/useChart'import useFilter from '~/modules/filter/useFilter'-import { getCatsIds } from '~/components/categories/getCategories'+import { getCatsIds, getTransferCategoriesIds } from '~/components/categories/getCategories'import { getTotal } from '~/components/trns/getTotal'import { getTrnsIds } from '~/components/trns/getTrns'@@ -88,9 +88,10 @@ export default defineComponent({const periodName = this.filterPeriodNameAllReplacedToYearconst chartPeriods = this.$store.state.chart.periodsconst trnsItems = this.$store.state.trns.items- const catsItems = this.$store.state.categories.items+ const categoriesItems = this.$store.state.categories.itemsconst walletsItems = this.$store.state.wallets.itemsconst storeFilter = this.$store.state.filter+ const transferCategoriesIds = getTransferCategoriesIds(categoriesItems)// diff periods from oldest trn and todayconst oldestTrnDate = this.$day(trnsItems[this.$store.getters['trns/firstCreatedTrnId']].date).endOf(periodName)@@ -107,7 +108,7 @@ export default defineComponent({// count total periodconst periodDate = this.$day().startOf(periodName).subtract(index, periodName).valueOf()- const categoriesIds = storeFilter.catsIds.length > 0 ? getCatsIds(storeFilter.catsIds, catsItems) : null+ const categoriesIds = storeFilter.catsIds.length > 0 ? getCatsIds(storeFilter.catsIds, categoriesItems) : nullconst walletsIds = storeFilter.walletsIds.length > 0 ? storeFilter.walletsIds : nullconst trnsIds = getTrnsIds({@@ -122,6 +123,7 @@ export default defineComponent({trnsIds,trnsItems,walletsItems,+ transferCategoriesIds,})let format = 'MM'diff --git a/components/stat/sum/Group.vue b/components/stat/sum/Group.vueindex 8d92fda1..4abea336 100644--- a/components/stat/sum/Group.vue+++ b/components/stat/sum/Group.vue@@ -20,7 +20,7 @@ const typeNumber = computed(() => moneyTypes.find(t => t.id === `${props.typeTex.pr-6.text-3xlAmount(:amount="statPage.current[typeText].total"- :colorize="typeNumber === 1 ? 'income': 'expense'"+ :colorize="typeText":currency="$store.state.currencies.base":isShowBaseRate="false":type="typeNumber"@@ -30,7 +30,7 @@ const typeNumber = computed(() => moneyTypes.find(t => t.id === `${props.typeTex//- TODO: change everything to expense and incomeLazyStatSummaryRowItemView(v-if="statPage.average[typeText] !== 0"- :amount="statPage.average[typeText === 'expense' ? 'expense' : 'income']"+ :amount="statPage.average[typeText]":title="$t(`money.average.${typeText}`)":type="typeNumber")diff --git a/locales/en-US.js b/locales/en-US.jsindex 9870040b..d759dda1 100644--- a/locales/en-US.js+++ b/locales/en-US.js@@ -261,10 +261,7 @@ export default {money: {income: 'Income',expense: 'Expense',-total: 'Net income',- income: 'Income',- expense: 'Expense',sum: 'Net income',transfer: 'Transfer',diff --git a/locales/ru-RU.js b/locales/ru-RU.jsindex 990d8387..b44772cf 100644--- a/locales/ru-RU.js+++ b/locales/ru-RU.js@@ -263,9 +263,6 @@ export default {income: 'Доход',expense: 'Расход',total: 'Баланс',-- income: 'Доход',- expense: 'Расход',sum: 'Баланс',transfer: 'Перевод',diff --git a/store/categories/actions.js b/store/categories/actions.jsindex 98fff994..5d84d3a0 100644--- a/store/categories/actions.js+++ b/store/categories/actions.js@@ -15,8 +15,24 @@ export default {}}+ // Add missing propsfor (const categoryId in items) {const cat = items[categoryId]++ if (cat.showInLastUsed === undefined) {+ items[categoryId] = {+ ...cat,+ showInLastUsed: false,+ }+ }++ if (cat.showInQuickSelector === undefined) {+ items[categoryId] = {+ ...cat,+ showInQuickSelector: false,+ }+ }+if (cat.childIds) {items[categoryId] = {...cat,diff --git a/store/categories/getters.js b/store/categories/getters.jsdeleted file mode 100644index 9761eb22..00000000--- a/store/categories/getters.js+++ /dev/null@@ -1,134 +0,0 @@-export default {- hasCategories(state) {- if (state.items) {- // More than 1 because categories has 1 static category "Transfer"- if (Object.keys(state.items).length > 1)- return true- }- return false- },-- categoriesIds(state, getters) {- if (!getters.hasCategories)- return []- return Object.keys(state.items)- },-- categoriesRootIds(state, getters) {- if (!getters.hasCategories)- return []-- return Object.keys(state.items)- .filter(id => state.items[id].parentId === 0)- .sort((a, b) => {- if (state.items[a].order < state.items[b].order)- return -1- if (state.items[a].order > state.items[b].order)- return 1- return 0- })- },-- categoriesForBeParent(state, getters, rootState) {- const categories = state.items- const categoriesRootIds = getters.categoriesRootIds- const trns = rootState.trns.items- const categoriesForBeParent = []-- for (const categoryId of categoriesRootIds) {- let hasTrnsIn = false- for (const trnId in trns) {- if (trns[trnId].categoryId === categoryId) {- hasTrnsIn = true- break- }- }- // TODO: use new getTransferCategoriesIds- if (!hasTrnsIn && categoryId !== 'transfer' && categories[categoryId].name.toLowerCase() !== 'перевод' && categories[categoryId].name.toLowerCase() !== 'transfer')- categoriesForBeParent.push(categoryId)- }-- return categoriesForBeParent- },-- isCategoryHasChildren: (state, getters) => (categoryId) => {- if (!getters.hasCategories)- return []- return state.items[categoryId].childIds?.length > 0- },-- getChildCategoriesIds: (state, getters) => (categoryId) => {- if (!getters.hasCategories)- return []- const category = state.items[categoryId]- return category?.childIds || []- },-- lastUsedCategoriesIdsByDate(state, getters, rootState, rootGetters) {- if (!getters.hasCategories)- return []-- const trnsItems = rootState.trns.items- const trnsIds = Object.keys(trnsItems)- .filter(trnId => trnsItems[trnId].type !== 2)- .sort((a, b) => {- if (trnsItems[a].date > trnsItems[b].date)- return -1- if (trnsItems[a].date < trnsItems[b].date)- return 1- return 0- })-- const transferCategoryId = getters.transferCategoryId- const lastCategoriesIds = []-- if (state.items && rootGetters['trns/hasTrns']) {- for (const trnId of trnsIds.slice(0, 500)) {- if (lastCategoriesIds.length < 16) {- const categoryId = trnsItems[trnId].categoryId- const category = state.items[categoryId]- if (category && (category.showInLastUsed || category.showInLastUsed === undefined)) {- if (categoryId !== transferCategoryId) {- if (!lastCategoriesIds.includes(categoryId) && !getters.quickSelectorCategoriesIds.includes(categoryId))- lastCategoriesIds.push(categoryId)- }- }- }- }-- return lastCategoriesIds.sort((a, b) => {- if (state.items[a] && state.items[b]) {- if (state.items[a].name < state.items[b].name)- return -1- if (state.items[a].name > state.items[b].name)- return 1- }- return 0- })- }- },-- quickSelectorCategoriesIds(state, getters) {- if (!getters.hasCategories)- return []-- return Object.keys(state.items)- .filter(key => state.items[key].showInQuickSelector)- .sort((a, b) => {- if (state.items[a].name < state.items[b].name)- return -1- if (state.items[a].name > state.items[b].name)- return 1- return 0- })- },-- transferCategoryId(state, getters) {- if (!getters.hasCategories)- return null-- // TODO: use new getTransferCategoriesIds- return Object.keys(state.items)- .find(id => state.items[id].name === 'Перевод' || state.items[id].name === 'Transfer') || state.items.transfer- },-}diff --git a/store/categories/getters.ts b/store/categories/getters.tsnew file mode 100644index 00000000..c57e4fed--- /dev/null+++ b/store/categories/getters.ts@@ -0,0 +1,122 @@+import { getTransferCategoriesIds } from '~/components/categories/getCategories'++export default {+ hasCategories(state) {+ if (!state.items)+ return false++ // More than 1 because categories has 1 static category "Transfer"+ // TODO: use get transfers categories and exclude them from the list+ if (Object.keys(state.items).length > 1)+ return true+ },++ categoriesIds(state, getters) {+ if (!getters.hasCategories)+ return []+ return Object.keys(state.items)+ },++ categoriesRootIds(state, getters) {+ if (!getters.hasCategories)+ return []++ return Object.keys(state.items)+ .filter(id => state.items[id].parentId === 0)+ .sort((a, b) => {+ if (state.items[a].order < state.items[b].order)+ return -1+ if (state.items[a].order > state.items[b].order)+ return 1+ return 0+ })+ },++ categoriesForBeParent(state, getters, rootState) {+ const categoriesItems = state.items+ const trnsItems = rootState.trns.items+ const transferCategoriesIds = getTransferCategoriesIds(categoriesItems)++ return getters.categoriesRootIds.filter((categoryId) => {+ const hasTrnsIn = Object.values(trnsItems).some(trn => trn.categoryId === categoryId)+ const isTransferCategory = transferCategoriesIds.includes(categoryId)++ if (hasTrnsIn || isTransferCategory)+ return false++ return categoryId+ })+ },++ isCategoryHasChildren: (state, getters) => (categoryId) => {+ if (!getters.hasCategories)+ return []++ return state.items[categoryId].childIds?.length > 0+ },++ getChildCategoriesIds: (state, getters) => (categoryId) => {+ if (!getters.hasCategories)+ return []++ return state.items[categoryId]?.childIds || []+ },++ lastUsedCategoriesIdsByDate(state, getters, rootState, rootGetters) {+ if (!getters.hasCategories || !rootGetters['trns/hasTrns'])+ return []++ const trnsItems = rootState.trns.items+ const categoriesItems = rootState.categories.items+ const transferCategoriesIds = getTransferCategoriesIds(categoriesItems)++ const trnsIds = Object.keys(trnsItems)+ .filter(trnId => trnsItems[trnId].type !== 2)+ .sort((a, b) => trnsItems[b].date - trnsItems[a].date)++ const lastCategoriesIds = []++ for (const trnId of trnsIds.slice(0, 500)) {+ if (lastCategoriesIds.length > 16)+ break++ const categoryId = trnsItems[trnId].categoryId+ const category = state.items[categoryId]++ if (!category || !category.showInLastUsed)+ continue++ const isCategoryAlreadyAdded = lastCategoriesIds.includes(categoryId)+ const isTransferCategory = transferCategoriesIds.includes(categoryId)+ const isCategoryInQuickSelector = getters.quickSelectorCategoriesIds.includes(categoryId)++ if (!isCategoryAlreadyAdded && !isTransferCategory && !isCategoryInQuickSelector)+ lastCategoriesIds.push(categoryId)+ }++ lastCategoriesIds.sort((a, b) => {+ if (state.items[a].name > state.items[b].name)+ return 1+ if (state.items[a].name < state.items[b].name)+ return -1+ return 0+ })++ return lastCategoriesIds+ },++ quickSelectorCategoriesIds(state, getters) {+ if (!getters.hasCategories)+ return []++ return Object.keys(state.items)+ .filter(key => state.items[key].showInQuickSelector)+ .sort((a, b) => {+ if (state.items[a].name < state.items[b].name)+ return -1+ if (state.items[a].name > state.items[b].name)+ return 1+ return 0+ })+ },+}diff --git a/store/stat/getters.ts b/store/stat/getters.tsindex 67e13c4e..02deb2e5 100644--- a/store/stat/getters.ts+++ b/store/stat/getters.ts@@ -1,114 +1,34 @@import dayjs from 'dayjs'-import { getCatsIds } from '~/components/categories/getCategories'+import { getCatsIds, getTransferCategoriesIds } from '~/components/categories/getCategories'import { getTotal } from '~/components/trns/getTotal'import { getTrnsIds } from '~/components/trns/getTrns'export default {- statAverage(_state, _getters, rootState, rootGetters) {- const trnsItems = rootState.trns.items- const walletsItems = rootState.wallets.items- const baseRate = rootState.currencies.base- const rates = rootState.currencies.rates- const transferCategoryId = rootGetters['categories/transferCategoryId']- const trnsIds = rootGetters['trns/selectedTrnsIds']- const periodName = rootState.filter.period- if (periodName === 'all')- return-- const oldestTrn = trnsItems[rootGetters['trns/firstCreatedTrnId']]- if (!oldestTrn)- return-- const oldestTrnDate = dayjs(oldestTrn.date).endOf(periodName)- let periodsToShow = dayjs().endOf(periodName).diff(oldestTrnDate, periodName) + 1- periodsToShow = rootState.chart.periods[periodName].showedPeriods >= periodsToShow- ? periodsToShow- : rootState.chart.periods[periodName].showedPeriods-- let income = 0- let expense = 0-- // Start from 1 to remove last period from average- for (let period = 1; period < periodsToShow; period++) {- const dateStartOfPeriod = dayjs().subtract(period, periodName).startOf(periodName)- const dateEndOfPeriod = dayjs().subtract(period, periodName).endOf(periodName)-- // TODO: use getTrnsIds- const trnsIdsInPeriod = trnsIds- .filter(trnId =>- trnsItems[trnId].date >= dateStartOfPeriod- && trnsItems[trnId].date <= dateEndOfPeriod- && trnsItems[trnId].categoryId !== transferCategoryId,- )-- const total = getTotal({- baseRate,- rates,- trnsIds: trnsIdsInPeriod,- trnsItems,- walletsItems,- })-- income += total.incomeTransactions- expense += total.expenseTransactions- }-- // When just this period and last- const delimiter = periodsToShow - 1- if (delimiter === 1)- return { income: 0, expense: 0, sum: 0 }-- return {- income: Math.ceil(income / delimiter),- expense: Math.ceil(expense / delimiter),- sum: Math.ceil((income - expense) / delimiter),- }- },-- isOldestPeriodSelected(state, getters, rootState, rootGetters) {- if (!rootGetters['trns/hasTrns'])- return false-- if (dayjs(rootState.filter.date).isSame(dayjs(), rootState.filter.period))- return true- },-- isNewestPeriodSelected(state, getters, rootState, rootGetters) {- if (!rootGetters['trns/hasTrns'])- return true-- const trns = rootState.trns.items- const firstCreatedTrnIdFromSelectedTrns = rootGetters['trns/firstCreatedTrnIdFromSelectedTrns']- const firstCreatedTrn = trns[firstCreatedTrnIdFromSelectedTrns]- if (!firstCreatedTrn)- return true-- const firstCreatedTrnDate = dayjs(firstCreatedTrn.date).startOf(state.period).valueOf()- const filterDate = dayjs(rootState.filter.date).startOf(state.period).valueOf()-- if (filterDate <= firstCreatedTrnDate)- return true- },-- statCurrentPeriod(_state, _getters, rootState, rootGetters) {+ /**+ * Stat for current period+ */+ statCurrentPeriod(_state, _getters, rootState) {const trnsItems = rootState.trns.itemsconst categoriesItems = rootState.categories.itemsconst walletsItems = rootState.wallets.itemsconst baseRate = rootState.currencies.baseconst rates = rootState.currencies.ratesconst storeFilter = rootState.filter+ const transferCategoriesIds = getTransferCategoriesIds(categoriesItems)const categoriesIds = rootState.filter.catsIds.length > 0? getCatsIds(rootState.filter.catsIds, categoriesItems): null- const walletsIds = storeFilter.walletsIds.length > 0 ? storeFilter.walletsIds : null+ const walletsIds = storeFilter.walletsIds.length > 0+ ? storeFilter.walletsIds+ : nullconst trnsIds = getTrnsIds({- trnsItems,- walletsIds,categoriesIds,- periodName: storeFilter.period,date: storeFilter.date,+ periodName: storeFilter.period,+ trnsItems,+ walletsIds,})function getRootCategoryIdFromTrnId(trnId) {@@ -120,9 +40,9 @@ export default {function getCatsIdsWithTrnsIds() {const filterCategoryId = rootState.filter.categoryId- const transferCategoryId = rootGetters['categories/transferCategoryId']const categoriesWithTrnsIds = {}+ // TODO: map, filterfor (const trnId of trnsIds) {if (trnsItems[trnId]) {let categoryId@@ -130,15 +50,13 @@ export default {? categoryId = trnsItems[trnId].categoryId: categoryId = getRootCategoryIdFromTrnId(trnId)- // Push trnId to category. Exclude transfer category- // TODO: place transfer category in one place- if (categoryId !== transferCategoryId) {- if (!categoriesWithTrnsIds[categoryId])- categoriesWithTrnsIds[categoryId] = [trnId]+ const isTransferCategory = transferCategoriesIds.includes(categoryId)+ if (isTransferCategory)+ continue- else- categoriesWithTrnsIds[categoryId].push(trnId)- }+ !categoriesWithTrnsIds[categoryId]+ ? categoriesWithTrnsIds[categoryId] = [trnId]+ : categoriesWithTrnsIds[categoryId].push(trnId)}}@@ -237,4 +155,93 @@ export default {return stat},++ /**+ * Stat average+ */+ statAverage(_state, _getters, rootState, rootGetters) {+ const trnsItems = rootState.trns.items+ const walletsItems = rootState.wallets.items+ const categoriesItems = rootState.categories.items+ const baseRate = rootState.currencies.base+ const rates = rootState.currencies.rates+ const trnsIds = rootGetters['trns/selectedTrnsIds']+ const periodName = rootState.filter.period+ const transferCategoriesIds = getTransferCategoriesIds(categoriesItems)++ if (periodName === 'all')+ return++ const oldestTrn = trnsItems[rootGetters['trns/firstCreatedTrnId']]+ if (!oldestTrn)+ return++ const oldestTrnDate = dayjs(oldestTrn.date).endOf(periodName)+ let periodsToShow = dayjs().endOf(periodName).diff(oldestTrnDate, periodName) + 1+ periodsToShow = rootState.chart.periods[periodName].showedPeriods >= periodsToShow+ ? periodsToShow+ : rootState.chart.periods[periodName].showedPeriods++ let income = 0+ let expense = 0++ // Start from 1 to remove last period from average+ for (let period = 1; period < periodsToShow; period++) {+ const dateStartOfPeriod = dayjs().subtract(period, periodName).startOf(periodName)+ const dateEndOfPeriod = dayjs().subtract(period, periodName).endOf(periodName)++ const trnsIdsInPeriod = trnsIds.filter(trnId =>+ trnsItems[trnId].date >= dateStartOfPeriod+ && trnsItems[trnId].date <= dateEndOfPeriod+ && !transferCategoriesIds.includes(trnsItems[trnId].categoryId),+ )++ const total = getTotal({+ baseRate,+ rates,+ trnsIds: trnsIdsInPeriod,+ trnsItems,+ walletsItems,+ })++ income += total.incomeTransactions+ expense += total.expenseTransactions+ }++ // When just this period and last+ const delimiter = periodsToShow - 1+ if (delimiter === 1)+ return { income: 0, expense: 0, sum: 0 }++ return {+ income: Math.ceil(income / delimiter),+ expense: Math.ceil(expense / delimiter),+ sum: Math.ceil((income - expense) / delimiter),+ }+ },++ isOldestPeriodSelected(_state, _getters, rootState, rootGetters) {+ if (!rootGetters['trns/hasTrns'])+ return false++ if (dayjs(rootState.filter.date).isSame(dayjs(), rootState.filter.period))+ return true+ },++ isNewestPeriodSelected(state, _getters, rootState, rootGetters) {+ if (!rootGetters['trns/hasTrns'])+ return true++ const trns = rootState.trns.items+ const firstCreatedTrnIdFromSelectedTrns = rootGetters['trns/firstCreatedTrnIdFromSelectedTrns']+ const firstCreatedTrn = trns[firstCreatedTrnIdFromSelectedTrns]+ if (!firstCreatedTrn)+ return true++ const firstCreatedTrnDate = dayjs(firstCreatedTrn.date).startOf(state.period).valueOf()+ const filterDate = dayjs(rootState.filter.date).startOf(state.period).valueOf()++ if (filterDate <= firstCreatedTrnDate)+ return true+ },}diff --git a/store/trns/getters.js b/store/trns/getters.jsindex 911fd393..66947306 100644--- a/store/trns/getters.js+++ b/store/trns/getters.js@@ -1,5 +1,5 @@import dayjs from 'dayjs'-import { getCatsIds } from '~/components/categories/getCategories'+import { getCatsIds, getTransferCategoriesIds } from '~/components/categories/getCategories'import { getTrnsIds } from '~/components/trns/getTrns'export default {@@ -11,27 +11,20 @@ export default {return false},- lastCreatedTrnId(state, getters, rootState, rootGetters) {+ lastCreatedTrnId(_state, getters, rootState) {if (!getters.hasTrns)returnconst trnsItems = rootState.trns.items- const transferCategoryId = rootGetters['categories/transferCategoryId']- const trnsIds = Object.keys(trnsItems)- .sort((a, b) => {- if (trnsItems[a].date > trnsItems[b].date)- return -1- if (trnsItems[a].date < trnsItems[b].date)- return 1- return 0- })-- if (trnsIds.length) {- for (const trnId of trnsIds) {- if (trnsItems[trnId].categoryId !== transferCategoryId && trnsItems[trnId].type !== 2)- return trnId- }- }+ const categoriesItems = rootState.categories.items+ const transferCategoriesIds = getTransferCategoriesIds(categoriesItems)++ return Object.keys(trnsItems)+ .sort((a, b) => trnsItems[b].date - trnsItems[a].date)+ .some(trnId =>+ !transferCategoriesIds.includes(trnsItems[trnId].categoryId)+ && trnsItems[trnId].type !== 2,+ )},firstCreatedTrnId(_state, getters, rootState) {@@ -40,19 +33,13 @@ export default {const trnsItems = rootState.trns.itemsconst trnsIds = Object.keys(trnsItems)- .sort((a, b) => {- if (trnsItems[a].date > trnsItems[b].date)- return -1- if (trnsItems[a].date < trnsItems[b].date)- return 1- return 0- })+ .sort((a, b) => trnsItems[b].date - trnsItems[a].date).reverse()return trnsIds[0]},- firstCreatedTrnIdFromSelectedTrns(state, getters) {+ firstCreatedTrnIdFromSelectedTrns(_state, getters) {const trnsIds = [...getters.selectedTrnsIds].reverse()if (trnsIds.length)return trnsIds[0]@@ -67,8 +54,12 @@ export default {const catsItems = rootState.categories.itemsconst storeFilter = rootState.filter- const categoriesIds = rootState.filter.catsIds.length > 0 ? getCatsIds(rootState.filter.catsIds, catsItems) : null- const walletsIds = storeFilter.walletsIds.length > 0 ? storeFilter.walletsIds : null+ const categoriesIds = rootState.filter.catsIds.length > 0+ ? getCatsIds(rootState.filter.catsIds, catsItems)+ : null+ const walletsIds = storeFilter.walletsIds.length > 0+ ? storeFilter.walletsIds+ : nullreturn getTrnsIds({trnsItems,@@ -82,7 +73,7 @@ export default {if (!getters.hasTrns)return []- const trns = rootState.trns.items+ const trnsItems = rootState.trns.itemsconst filterDate = dayjs(rootState.filter.date)const filterPeriod = rootState.filter.periodconst startDateValue = filterDate.startOf(filterPeriod).valueOf()@@ -91,21 +82,11 @@ export default {// filter dateif (filterPeriod !== 'all') {- trnsIds = trnsIds.filter(- trnId =>- (trns[trnId].date >= startDateValue)- && (trns[trnId].date <= endDateValue))+ trnsIds = trnsIds.filter(trnId =>+ (trnsItems[trnId].date >= startDateValue)+ && (trnsItems[trnId].date <= endDateValue))}- trnsIds = trnsIds- .sort((a, b) => {- if (trns[a].date > trns[b].date)- return -1- if (trns[a].date < trns[b].date)- return 1- return 0- })-- return trnsIds+ return trnsIds.sort((a, b) => trnsItems[b].date - trnsItems[a].date)},}