From 813abd8d8de38c935430e37e7626c4335a8b7a71 Mon Sep 17 00:00:00 2001
From: MaysWind <i@mayswind.net>
Date: Sun, 3 Jan 2021 13:25:21 +0800
Subject: [PATCH] show filter being used in tab bar in transaction list page

---
 src/Mobile.vue                         | 14 +++++
 src/locales/en.js                      |  1 +
 src/locales/zh_Hans.js                 |  1 +
 src/views/mobile/transactions/List.vue | 76 ++++++++++++++++++++++----
 4 files changed, 80 insertions(+), 12 deletions(-)

diff --git a/src/Mobile.vue b/src/Mobile.vue
index a375f737..12099bb5 100644
--- a/src/Mobile.vue
+++ b/src/Mobile.vue
@@ -132,6 +132,20 @@ i.icon.la, i.icon.las, i.icon.lab {
     height: 13px;
 }
 
+.tabbar-text-with-ellipsis > span {
+    display: block;
+    width: 100%;
+    overflow: hidden;
+    text-align: center;
+    text-overflow: ellipsis;
+    word-break: break-all;
+    white-space: nowrap;
+}
+
+.tabbar-item-changed {
+    color: var(--f7-theme-color);
+}
+
 .nested-list-item .item-title {
     width: 100%;
 }
diff --git a/src/locales/en.js b/src/locales/en.js
index 28002b85..dab896ac 100644
--- a/src/locales/en.js
+++ b/src/locales/en.js
@@ -440,6 +440,7 @@ export default {
     'Last month': 'Last month',
     'This year': 'This year',
     'Last year': 'Last year',
+    'Custom Date': 'Custom Date',
     'Begin Time': 'Begin Time',
     'End Time': 'End Time',
     'Custom': 'Custom',
diff --git a/src/locales/zh_Hans.js b/src/locales/zh_Hans.js
index 871242c9..adc723ba 100644
--- a/src/locales/zh_Hans.js
+++ b/src/locales/zh_Hans.js
@@ -440,6 +440,7 @@ export default {
     'Last month': '上月',
     'This year': '今年',
     'Last year': '去年',
+    'Custom Date': '自定义日期',
     'Begin Time': '开始时间',
     'End Time': '结束时间',
     'Custom': '自定义',
diff --git a/src/views/mobile/transactions/List.vue b/src/views/mobile/transactions/List.vue
index e3424dbc..ff45891c 100644
--- a/src/views/mobile/transactions/List.vue
+++ b/src/views/mobile/transactions/List.vue
@@ -24,17 +24,17 @@
         </f7-navbar>
 
         <f7-toolbar tabbar bottom>
-            <f7-link popover-open=".date-popover-menu">
-                <span :class="{ 'tabbar-item-changed': query.maxTime > 0 || query.minTime > 0 }">{{ $t('Date') }}</span>
+            <f7-link class="tabbar-text-with-ellipsis" popover-open=".date-popover-menu">
+                <span :class="{ 'tabbar-item-changed': query.maxTime > 0 || query.minTime > 0 }">{{ query.dateType | dateName('Date') | t }}</span>
             </f7-link>
-            <f7-link popover-open=".type-popover-menu">
-                <span :class="{ 'tabbar-item-changed': query.type > 0 }">{{ $t('Type') }}</span>
+            <f7-link class="tabbar-text-with-ellipsis" popover-open=".type-popover-menu">
+                <span :class="{ 'tabbar-item-changed': query.type > 0 }">{{ query.type | typeName('Type') | t }}</span>
             </f7-link>
-            <f7-link popover-open=".category-popover-menu" :class="{ 'disabled': query.type === 1 }">
-                <span :class="{ 'tabbar-item-changed': query.categoryId > 0 }">{{ $t('Category') }}</span>
+            <f7-link class="tabbar-text-with-ellipsis" popover-open=".category-popover-menu" :class="{ 'disabled': query.type === 1 }">
+                <span :class="{ 'tabbar-item-changed': query.categoryId > 0 }">{{ query.categoryId | categoryName(allCategories, $t('Category')) }}</span>
             </f7-link>
-            <f7-link popover-open=".account-popover-menu">
-                <span :class="{ 'tabbar-item-changed': query.accountId > 0 }">{{ $t('Account') }}</span>
+            <f7-link class="tabbar-text-with-ellipsis" popover-open=".account-popover-menu">
+                <span :class="{ 'tabbar-item-changed': query.accountId > 0 }">{{ query.accountId | accountName(allAccounts, $t('Account')) }}</span>
             </f7-link>
         </f7-toolbar>
 
@@ -948,6 +948,62 @@ export default {
                 color: 'transparent'
             }
         },
+        dateName(dateType, defaultName) {
+            switch (dateType){
+                case 1:
+                    return 'Today';
+                case 2:
+                    return 'Yesterday';
+                case 3:
+                    return 'Recent 7 days';
+                case 4:
+                    return 'Recent 30 days';
+                case 5:
+                    return 'This week';
+                case 6:
+                    return 'Last week';
+                case 7:
+                    return 'This month';
+                case 8:
+                    return 'Last month';
+                case 9:
+                    return 'This year';
+                case 10:
+                    return 'Last year';
+                case 11:
+                    return 'Custom Date';
+                default:
+                    return defaultName;
+            }
+        },
+        typeName(type, defaultName) {
+            switch (type){
+                case 1:
+                    return 'Modify Balance';
+                case 2:
+                    return 'Income';
+                case 3:
+                    return 'Expense';
+                case 4:
+                    return 'Transfer';
+                default:
+                    return defaultName;
+            }
+        },
+        categoryName(categoryId, allCategories, defaultName) {
+            if (allCategories[categoryId]) {
+                return allCategories[categoryId].name;
+            }
+
+            return defaultName;
+        },
+        accountName(accountId, allAccounts, defaultName) {
+            if (allAccounts[accountId]) {
+                return allAccounts[accountId].name;
+            }
+
+            return defaultName;
+        },
         income(value, incomplete) {
             return '+' + value + (incomplete ? '+' : '');
         },
@@ -1032,10 +1088,6 @@ export default {
     transform: scaleY(calc(1 / var(--f7-device-pixel-ratio)));
 }
 
-.tabbar-item-changed {
-    color: var(--f7-theme-color);
-}
-
 .date-popover-menu .popover-inner, .category-popover-menu .popover-inner, .account-popover-menu .popover-inner {
     max-height: 400px;
     overflow-Y: auto;