From 1a0dfa0e45362a198377f35be64fecc44fd2b57e Mon Sep 17 00:00:00 2001 From: elweyn Date: Wed, 18 Jan 2023 12:18:30 +0100 Subject: [PATCH 1/4] Add a watch on gdt prop and when changed to true loads the gdt datas. --- frontend/src/pages/Transactions.vue | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/frontend/src/pages/Transactions.vue b/frontend/src/pages/Transactions.vue index 40d883886..50e71f1ae 100644 --- a/frontend/src/pages/Transactions.vue +++ b/frontend/src/pages/Transactions.vue @@ -79,7 +79,7 @@ export default { this.$emit('update-transactions', pagination) }, }, - created() { + mounted() { if (this.gdt) { this.updateGdt() } @@ -90,6 +90,11 @@ export default { this.updateGdt() } }, + gdt() { + if (this.gdt) { + this.updateGdt() + } + }, }, } From 02e1b33839b7e061442fc692935938e489acdce7 Mon Sep 17 00:00:00 2001 From: elweyn Date: Wed, 18 Jan 2023 12:59:28 +0100 Subject: [PATCH 2/4] Pagination for Gdt and Gdd was not working correctly. --- frontend/src/pages/Transactions.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frontend/src/pages/Transactions.vue b/frontend/src/pages/Transactions.vue index 50e71f1ae..7eb0cef3c 100644 --- a/frontend/src/pages/Transactions.vue +++ b/frontend/src/pages/Transactions.vue @@ -5,6 +5,7 @@ v-model="currentPage" :transactionsGdt="transactionsGdt" :transactionGdtCount="transactionGdtCount" + :showPagination="true" :pageSize="pageSize" /> @@ -15,6 +16,7 @@ :transactionLinkCount="transactionLinkCount" :transactions="transactions" :showPagination="true" + :pageSize="pageSize" @update-transactions="updateTransactions" v-on="$listeners" /> @@ -46,7 +48,7 @@ export default { transactionsGdt: [], transactionGdtCount: 0, currentPage: 1, - pageSize: 25, + pageSize: 5, tabIndex: 0, } }, From 3247c1c9f54eae1fcf8109e393abdfa79cb1a1a7 Mon Sep 17 00:00:00 2001 From: elweyn Date: Wed, 18 Jan 2023 13:12:43 +0100 Subject: [PATCH 3/4] Fix on 25 transactions --- frontend/src/pages/Transactions.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/frontend/src/pages/Transactions.vue b/frontend/src/pages/Transactions.vue index 7eb0cef3c..494e10190 100644 --- a/frontend/src/pages/Transactions.vue +++ b/frontend/src/pages/Transactions.vue @@ -5,7 +5,6 @@ v-model="currentPage" :transactionsGdt="transactionsGdt" :transactionGdtCount="transactionGdtCount" - :showPagination="true" :pageSize="pageSize" /> @@ -48,7 +47,7 @@ export default { transactionsGdt: [], transactionGdtCount: 0, currentPage: 1, - pageSize: 5, + pageSize: 25, tabIndex: 0, } }, From 7d949a5b37ffe6090e40c43e74616e2eba855d9a Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Wed, 18 Jan 2023 13:26:52 +0100 Subject: [PATCH 4/4] Update frontend/src/pages/Transactions.vue --- frontend/src/pages/Transactions.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/pages/Transactions.vue b/frontend/src/pages/Transactions.vue index 50e71f1ae..4074b3d19 100644 --- a/frontend/src/pages/Transactions.vue +++ b/frontend/src/pages/Transactions.vue @@ -79,7 +79,7 @@ export default { this.$emit('update-transactions', pagination) }, }, - mounted() { + created() { if (this.gdt) { this.updateGdt() }