Open source personal finance application
update TrnItem to use new Amount
ilkomeacdb6644c28e
diff --git a/components/trns/item/TrnItem.vue b/components/trns/item/TrnItem.vueindex ba41d62f..9694b968 100644--- a/components/trns/item/TrnItem.vue+++ b/components/trns/item/TrnItem.vue@@ -31,8 +31,7 @@ export default {return {_detailed: this.ui === 'detailed',_history: this.ui === 'history',- _stat: this.ui === 'stat',- _lastTrns: this.ui === 'lastTrns'+ _stat: this.ui === 'stat'}},formatedDate () {@@ -61,9 +60,11 @@ export default {methods: {handleClick () {- this.$store.commit('categories/hideCategoryModal')- this.$store.commit('trns/showTrnModal')- this.$store.commit('trns/setTrnModalId', this.trnId)+ if (!this.$store.state.trns.modal.show) {+ this.$store.commit('categories/hideCategoryModal')+ this.$store.commit('trns/showTrnModal')+ this.$store.commit('trns/setTrnModalId', this.trnId)+ }},setTrnEdit () {@@ -76,158 +77,187 @@ export default {<template lang="pug">.trnItem(- v-if="category && wallet"+ v-if="(category && wallet) || trn.type === 2"@click="handleClick":class="className")-- //- detailed view+ //- Transfer//---------------------------------------------------------------------------- template(v-if="ui === 'detailed'")- .trnItem__categoryIcon(@click.stop="setTrnEdit")- Icon(- :background="category.color"- :big="true"- :icon="category.icon"- :round="true"- )- .trnItem__categoryName {{ category.name }}- .trnItem__wallet- .walletIcon+ template(v-if="trn.type === 2")+ //- Transfer: Detailed+ //---------------------------------------------------------------------------+ template(v-if="ui === 'detailed'")+ .trnItem__categoryIconIcon(- :abbr="wallet.name"- :background="wallet.color"- small+ background="var(--c-bg-3)"+ icon="mdi mdi-repeat"+ big+ round+ )+ .trnItem__categoryName {{ $t('trnForm.transferTitle') }}+ .trnItem__date {{ formatedDate }}+ .trnItem__wallet+ WalletItem(+ :id="trn.fromWalletId"+ ui="tile"+ )+ .trnFormHeaderSeparator: .mdi.mdi-chevron-right+ WalletItem(+ :id="trn.toWalletId"+ ui="tile")- .walletName {{ wallet.name }}+ .trnItem__desc(v-if="trn.description") {{ trn.description }}- .trnItem__date {{ formatedDate }}- .trnItem__amount(@click.stop="setTrnEdit")- Amount(- :currency="wallet.currency"- :type="trn.type"- :value="trn.amount"- vertical="center"- size="xl"- )+ .trnItem__amount(@click.stop="setTrnEdit")+ Amount(+ :currency="$store.state.wallets.items[trn.fromWalletId].currency"+ :value="trn.fromAmount"+ :type="trn.type"+ vertical="center"+ size="xl"+ )++ //- Transfer: History+ //-------------------------------------------------------------------------+ template(v-else)+ .trnItem__categoryIcon+ Icon(+ background="var(--c-bg-3)"+ icon="mdi mdi-repeat"+ round+ )- .trnItem__desc(v-if="trn.description") {{ trn.description }}+ .trnItem__categoryName+ div {{ $t('trnForm.transferTitle') }}+ .transfer+ div {{ $t('trnForm.transfer.fromShort') }}: {{ $store.state.wallets.items[trn.fromWalletId].name }}+ div {{ $t('trnForm.transfer.toShort') }}: {{ $store.state.wallets.items[trn.toWalletId].name }}- //- stat view- template(v-else-if="ui === 'stat'")- .trnItem__statWrap- .trnItem__date {{ formatedDateDay }}+ .trnItem__amount(@click.stop="setTrnEdit")+ Amount(+ :currency="$store.state.wallets.items[trn.fromWalletId].currency"+ :isColorize="false"+ :type="0"+ :value="trn.fromAmount"+ isShowPrefix+ )+ Amount(+ :currency="$store.state.wallets.items[trn.toWalletId].currency"+ :isColorize="false"+ :type="1"+ :value="trn.toAmount"+ isShowPrefix+ )++ .trnItem__desc+ div(v-if="trn.description") {{ trn.description }}++ //- Transaction+ //---------------------------------------------------------------------------+ template(v-else)+ //- Detailed+ //-------------------------------------------------------------------------+ template(v-if="ui === 'detailed'")+ .trnItem__categoryIcon+ Icon(+ :background="category.color"+ big+ :icon="category.icon"+ round+ )+ .trnItem__categoryName {{ category.name }}.trnItem__wallet.walletIconIcon(:abbr="wallet.name":background="wallet.color"- :small="true")+ small+ )+.walletName {{ wallet.name }}- .trnItem__desc(v-if="trn.description") {{ trn.description }}++ .trnItem__date {{ formatedDate }}.trnItem__amount(@click.stop="setTrnEdit")Amount(:currency="wallet.currency"+ :type="trn.type":value="trn.amount"- :type="trn.type")-- //- last trns. shows category and wallet based on active filters- template(v-else-if="ui === 'lastTrns'")- .trnItem__statWrap- .trnItem__date {{ formatedDateDay2 }}-- //- category selected- template(v-if="$store.state.filter.categoryId")- //- category with children- template(v-if="$store.getters['categories/isCategoryHasChildren']($store.state.filter.categoryId)")- .trnItem__wallet+ vertical="center"+ size="xl"+ isShowPrefix+ )++ .trnItem__desc(v-if="trn.description") {{ trn.description }}++ //- Stat+ //-------------------------------------------------------------------------+ template(v-else-if="ui === 'stat'")+ .trnItem__statWrap+ .trnItem__date {{ formatedDateDay }}+ .trnItem__wallet+ .walletIconIcon(:abbr="wallet.name":background="wallet.color"- :medium="true":small="true")- .trnItem__categoryIcon- Icon(- :background="category.color"- :icon="category.icon"- :medium="true"- :round="true")- .trnItem__categoryName {{ category.name }}- template(v-else)- .trnItem__wallet- .walletIcon- Icon(- :abbr="wallet.name"- :background="wallet.color"- :small="true")- .walletName {{ wallet.name }}-- //- wallet selected- template(v-else-if="$store.state.filter.walletId")- .trnItem__categoryIcon- Icon(- :background="category.color"- :icon="category.icon"- :medium="true"- :round="true")- .trnItem__categoryName {{ category.name }}-- //- base- template(v-else)- .trnItem__wallet- Icon(- :abbr="wallet.name"- :background="wallet.color"- :medium="true"- :small="true")- .trnItem__categoryIcon- Icon(- :background="category.color"- :icon="category.icon"- :medium="true"- :round="true")- .trnItem__categoryName {{ category.name }}- .trnItem__desc(v-if="trn.description") {{ trn.description }}+ .walletName {{ wallet.name }}+ .trnItem__desc(v-if="trn.description") {{ trn.description }}+ .trnItem__amount(@click.stop="setTrnEdit")+ Amount(+ :currency="wallet.currency"+ :value="trn.amount"+ :type="trn.type"+ isShowPrefix+ )++ //- History+ //-------------------------------------------------------------------------+ template(v-else)+ .trnItem__categoryIcon+ Icon(+ :background="category.color"+ :icon="category.icon"+ round+ )++ .trnItem__categoryName+ | {{ category.name }}+ .trnItem__groups(v-if="trn.groups") In group+ .trnItem__budgets(v-if="trn.budgets") In budget++ .trnItem__walletFloatIcon+ Icon(+ :abbr="wallet.name"+ :background="wallet.color"+ :small="true"+ )+.trnItem__amount(@click.stop="setTrnEdit")Amount(:currency="wallet.currency":value="trn.amount"- :type="trn.type")+ :type="trn.type"+ :isColorize="trn.type === 1"+ isShowPrefix+ )- //- history view- template(v-else)- .trnItem__categoryIcon(@click.stop="setTrnEdit")- Icon(- :background="category.color"- :icon="category.icon"- :round="true")- .trnItem__categoryName- | {{ category.name }}- .trnItem__groups(v-if="trn.groups") In group- .trnItem__budgets(v-if="trn.budgets") In budget-- .trnItem__walletFloatIcon- Icon(- :abbr="wallet.name"- :background="wallet.color"- :small="true")- .trnItem__amount(@click.stop="setTrnEdit")- Amount(- :currency="wallet.currency"- :value="trn.amount"- :type="trn.type"- )- .trnItem__desc- div(v-if="trn.description") {{ trn.description }}-- .trnItem__line+ .trnItem__desc+ div(v-if="trn.description") {{ trn.description }}</template><style lang="stylus" scoped>@import "~assets/stylus/variables/margins"@import "~assets/stylus/variables/media"+.transfer+ padding-top $m5+ font-size 14px++.trnFormHeaderSeparator+ color var(--c-font-1)+ font-size 32px+.trnItemposition relativecolor var(--c-font-4)@@ -253,7 +283,6 @@ export default {margin-top 0&._stat- &._lastTrnsmargin-top -1pxpadding-top 10pxpadding-right 10px@@ -262,13 +291,9 @@ export default {@media $media-laptoppadding-left 62px- &._lastTrns- padding-left 10px-&:hover&._history&._stat- &._lastTrns@media $media-laptopbackground var(--c-bg-5)@@ -278,25 +303,17 @@ export default {&__amountalign-self center- ^[0]._detailed &- //-^[0]._history &grid-column 3 / 4grid-row 1 / 2^[0]._stat &- ^[0]._lastTrns &margin-left auto&__categoryIcon^[0]._detailed &padding-bottom 12px- ^[0]._lastTrns &- flex 0 0 24px- padding-right 10px-&__categoryNamewhite-space nowrapoverflow hidden@@ -313,9 +330,6 @@ export default {grid-row 1 / 2align-self center- ^[0]._lastTrns &- padding-right 20px-&__datefont-size 13px@@ -324,12 +338,8 @@ export default {font-size 14px^[0]._stat &- ^[0]._lastTrns &padding-right 20px- ^[0]._lastTrns &- flex 0 0 80px-&__desccolor var(--c-font-2)font-size 14px@@ -344,25 +354,11 @@ export default {padding-bottom 5px^[0]._stat &- ^[0]._lastTrns &overflow hiddenpadding-right 10pxwhite-space nowraptext-overflow ellipsis- &__line- ^[0]._history &- grid-column 2 / 4- grid-row 4 / 5- padding-top 9px-- ^[0]._history:hover &- @media $media-laptop- border-color transparent-- ^[0]._history:last-child &- border-color transparent-&__statWrapdisplay flexalign-items center@@ -370,18 +366,15 @@ export default {border-bottom 1px solid var(--c-bg-6)^[0]._stat:hover &- ^[0]._lastTrns:hover &@media $media-laptopborder-color transparent^[0]._stat:last-child &- ^[0]._lastTrns:last-child &border-color transparent&__wallet^[0]._detailed &^[0]._stat &- ^[0]._lastTrns &display flexalign-items center@@ -400,8 +393,6 @@ export default {^[0]._stat &padding-right 20px- ^[0]._lastTrns &- padding-right 20px&__walletFloatIconposition absolute