Skip to content

Open source personal finance application

Add quick selector for categories in TrnForm

ilkome174d2d2fb507
diff --git a/src/components/categories/form/CategoryForm.vue b/src/components/categories/form/CategoryForm.vue
index f5b3a828..d2ca727d 100644
--- a/src/components/categories/form/CategoryForm.vue
+++ b/src/components/categories/form/CategoryForm.vue
@@ -34,6 +34,7 @@ export default {
name: null,
parentId: 0,
showInLastUsed: true,
+ showInQuickSelector: false,
showStat: true
}
}
@@ -104,6 +105,7 @@ export default {
name: this.category.name,
parentId: this.category.parentId,
showInLastUsed: this.category.showInLastUsed,
+ showInQuickSelector: this.category.showInQuickSelector,
showStat: true
}
@@ -209,6 +211,11 @@ export default {
v-model="category.showInLastUsed"
title="Show in last used categories"
:alt="true")
+ .form-line._p0._clean
+ Checkbox(
+ v-model="category.showInQuickSelector"
+ :title="$lang.categories.form.quickSelector"
+ :alt="true")
.form__actions
Button(
diff --git a/src/components/categories/item/CategoryItem.vue b/src/components/categories/item/CategoryItem.vue
index f821204d..9bd3cbda 100644
--- a/src/components/categories/item/CategoryItem.vue
+++ b/src/components/categories/item/CategoryItem.vue
@@ -14,6 +14,10 @@ export default {
category: {
type: Object,
required: true
+ },
+ ui: {
+ type: String,
+ default: null
}
},
@@ -41,6 +45,7 @@ export default {
<template lang="pug">
.categoryItem(
+ :class="{ [ui]: ui }"
:style="{ background: category.color || $store.state.ui.defaultBgColor }"
@click="handleClick"
)
@@ -48,6 +53,7 @@ export default {
Icon(
@click="handleIconClick"
:icon="category.icon"
+ :small="ui === '_flat'"
:background="category.color || $store.state.ui.defaultBgColor"
:category="true"
)
@@ -72,6 +78,12 @@ export default {
color var(--c-font-1)
border-radius $m3
+ &._flat
+ flex-flow row nowrap
+ margin-right 20px
+ flex 1 0 auto
+ padding 10px 10px
+
@media $media-laptop
padding $m6 0
@@ -80,6 +92,8 @@ export default {
&__icon
padding-bottom $m4
+ ^[0]._flat &
+ padding-bottom 0
&__name
min-height 16px
diff --git a/src/components/categories/list/CategoriesView.vue b/src/components/categories/list/CategoriesView.vue
index 8d03ddd7..2cf40279 100644
--- a/src/components/categories/list/CategoriesView.vue
+++ b/src/components/categories/list/CategoriesView.vue
@@ -30,6 +30,10 @@ export default {
borderTop: {
type: Boolean,
default: false
+ },
+ ui: {
+ type: String,
+ default: null
}
},
@@ -43,15 +47,31 @@ export default {
</script>
<template lang="pug">
-.categories(:class="{ _noPadding: noPadding, _noPaddingBottom: noPaddingBottom, _borderTop: borderTop }")
+.categories(:class="{ _noPadding: noPadding, _noPaddingBottom: noPaddingBottom, _borderTop: borderTop, [ui]: ui }")
.categories__title(v-if="title") {{ title }}
.categories__list
CategoryItem(
v-for="categoryId in categoresIds"
:id="categoryId"
+ :ui="ui"
:key="categoryId"
:category="$store.state.categories.items[categoryId]"
v-on="$listeners"
)
</template>
+
+<style lang="stylus" scoped>
+.categories._flat
+ padding 0
+ overflow hidden
+ overflow-x auto
+
+ .categories__list
+ display flex
+ &:after
+ content ""
+ flex 1 0 1px
+ display block
+ width 1px
+</style>
diff --git a/src/components/categories/store/getters.js b/src/components/categories/store/getters.js
index 1c4672b8..aab1ba69 100644
--- a/src/components/categories/store/getters.js
+++ b/src/components/categories/store/getters.js
@@ -66,7 +66,7 @@ export default {
return childIds
},
- lastUsedCategoriesIds (state, getters, rootState, rootGetters) {
+ lastUsedCategoriesIdsByDate (state, getters, rootState, rootGetters) {
const categories = rootState.categories.items
const trns = rootState.trns.items
const sortedTrnsIds = rootGetters.sortedTrnsIds
@@ -87,6 +87,15 @@ export default {
}
return lastCategoriesIds
+ }
+ },
+
+ lastUsedCategoriesIds (state, getters, rootState, rootGetters) {
+ const lastUsedCategoriesIds = rootGetters.lastUsedCategoriesIdsByDate
+ const categories = rootState.categories.items
+
+ if (lastUsedCategoriesIds) {
+ return lastUsedCategoriesIds
.sort((a, b) => {
if (categories[a] && categories[b]) {
if (categories[a].name < categories[b].name) return -1
@@ -97,6 +106,19 @@ export default {
}
},
+ quickSelectorCategoriesIds (state, getters, rootState, rootGetters) {
+ const categories = rootState.categories.items
+ if (!rootGetters.hasCategories) return []
+
+ return Object.keys(categories)
+ .filter(key => categories[key].parentId !== 0 && categories[key].showInQuickSelector)
+ .sort((a, b) => {
+ if (categories[a].name < categories[b].name) return -1
+ if (categories[a].name > categories[b].name) return 1
+ return 0
+ })
+ },
+
transferCategoryId (state, getters, rootState, rootGetters) {
if (!rootGetters.hasCategories) return null
diff --git a/src/components/icon/Icon.vue b/src/components/icon/Icon.vue
index 10743a6b..e80c3f64 100644
--- a/src/components/icon/Icon.vue
+++ b/src/components/icon/Icon.vue
@@ -105,12 +105,16 @@ export default {
width auto
height auto
padding-bottom $m5
+ &._category._small
+ padding-bottom 0
&__image
font-size 20px
^[0]._category &
font-size 32px
+ ^[0]._category._small &
+ font-size 18px
^[0]._big &
font-size 24px
diff --git a/src/components/trnForm/TrnForm.vue b/src/components/trnForm/TrnForm.vue
index ecb48272..3e19c5bb 100644
--- a/src/components/trnForm/TrnForm.vue
+++ b/src/components/trnForm/TrnForm.vue
@@ -253,7 +253,16 @@ export default {
TrnFormCalendar
.trnForm__dateAndDesc-desc(@click="$store.commit('toogleTrnFormModal', 'description')")
.mdi.mdi-comment-text-outline
+
+ template(v-if="$store.state.ui.mobile && $store.getters.quickSelectorCategoriesIds.length")
+ .trnForm__quickCats
+ CategoriesView(
+ :ids="$store.getters.quickSelectorCategoriesIds"
+ ui="_flat"
+ v-on:onClick="categoryId => $store.commit('setTrnFormValues', { categoryId })")
+
TrnFormAmount(v-on:onFormSubmit="handleSubmitForm")
+
template(v-if="$store.state.ui.mobile")
.trnForm__dateAndDesc
.trnForm__dateAndDesc-date
@@ -287,10 +296,10 @@ export default {
ui="line"
v-on:onClick="walletId => $store.commit('setTrnFormValues', { walletId })")
- .formCategories(v-if="$store.getters.lastUsedCategoriesIds && $store.getters.lastUsedCategoriesIds.length > 0")
+ .formCategories(v-if="$store.getters.quickSelectorCategoriesIds && $store.getters.quickSelectorCategoriesIds.length > 0")
.formTitle(@click="$store.commit('toogleTrnFormModal', 'categories')") Categories
CategoriesView(
- :ids="$store.getters.lastUsedCategoriesIds"
+ :ids="$store.getters.quickSelectorCategoriesIds"
:noPaddingBottom="true"
v-on:onClick="categoryId => $store.commit('setTrnFormValues', { categoryId })")
//- pc: end
@@ -312,6 +321,11 @@ export default {
@import "~@/stylus/variables/margins"
@import "~@/stylus/variables/media"
+.trnForm
+ &__quickCats
+ padding 12px 0
+ border-bottom 1px solid var(--c-bg-1)
+
.trnForm__dateAndDesc
display flex
align-items stretch
diff --git a/src/components/trnForm/TrnFormModalCats.vue b/src/components/trnForm/TrnFormModalCats.vue
index a9508fbd..8aef8c26 100644
--- a/src/components/trnForm/TrnFormModalCats.vue
+++ b/src/components/trnForm/TrnFormModalCats.vue
@@ -79,7 +79,7 @@ TrnFormModal(
template(v-if="$store.state.ui.lastUsedCatsInTrnForm === 'visible'")
.swiper-slide
CategoriesView(
- :ids="$store.getters.lastUsedCategoriesIds"
+ :ids="$store.getters.lastUsedCategoriesIdsByDate"
:noPaddingBottom="true"
v-on:onClick="handleCategoryClick"
)
diff --git a/src/lang/en.json b/src/lang/en.json
index e82d55be..7d82c981 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -57,7 +57,11 @@
"categories": {
"title": "Categories",
"shortTitle": "Cats",
- "new": "New category"
+ "new": "New category",
+ "form": {
+ "quickSelector": "Show in trnForm quick selector",
+ "save": "Save category"
+ }
},
"stat": {
diff --git a/src/lang/ru.json b/src/lang/ru.json
index a7a6b57a..ba6251c9 100644
--- a/src/lang/ru.json
+++ b/src/lang/ru.json
@@ -57,7 +57,11 @@
"categories": {
"title": "Категории",
"shortTitle": "Категории",
- "new": "Новая категория"
+ "new": "Новая категория",
+ "form": {
+ "quickSelector": "Добавить в быстрый выбор при создании транзакции",
+ "save": "Сохранить категорию"
+ }
},
"stat": {