From 789dffe2e21e88ed05109542ffd7735cafc5078b Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 19 Jun 2024 12:05:21 +0200
Subject: [PATCH 1/8] refs #6898 vntable, traductions

---
 src/i18n/locale/en.yml              |   8 ++
 src/i18n/locale/es.yml              |   8 ++
 src/pages/Supplier/SupplierList.vue | 141 +++++++++++++++-------------
 3 files changed, 90 insertions(+), 67 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 4e7d7bb8a..f740ba9e0 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -1015,6 +1015,14 @@ supplier:
         payDay: Pay day
         account: Account
         newSupplier: New supplier
+        tableVisibleColumns:
+            id: Id
+            name: Name
+            nif: NIF/CIF
+            nickname: Alias
+            account: Account
+            payMethod: Pay Method
+            payDay: Pay Day
     summary:
         responsible: Responsible
         notes: Notes
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 68ffc4e5b..bf3b60ffc 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -1000,6 +1000,14 @@ supplier:
         payDay: Día de pago
         account: Cuenta
         newSupplier: Nuevo proveedor
+        tableVisibleColumns:
+            id: Id
+            name: Nombre
+            nif: NIF/CIF
+            nickname: Alias
+            account: Cuenta
+            payMethod: Método de pago
+            payDay: Dia de pago
     summary:
         responsible: Responsable
         notes: Notas
diff --git a/src/pages/Supplier/SupplierList.vue b/src/pages/Supplier/SupplierList.vue
index d53781a38..9491a938b 100644
--- a/src/pages/Supplier/SupplierList.vue
+++ b/src/pages/Supplier/SupplierList.vue
@@ -1,85 +1,92 @@
 <script setup>
+import { computed } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useRouter } from 'vue-router';
-import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
-import VnPaginate from 'src/components/ui/VnPaginate.vue';
-import CardList from 'src/components/ui/CardList.vue';
-import VnLv from 'src/components/ui/VnLv.vue';
-import SupplierSummary from './Card/SupplierSummary.vue';
+import VnTable from 'components/VnTable/VnTable.vue';
 import SupplierListFilter from './SupplierListFilter.vue';
-import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import RightMenu from 'src/components/common/RightMenu.vue';
 
-const router = useRouter();
 const { t } = useI18n();
-const { viewSummary } = useSummaryDialog();
 
-function navigate(id) {
-    router.push({ path: `/supplier/${id}` });
-}
-
-const redirectToCreateView = () => {
-    router.push({ name: 'SupplierCreate' });
-};
+const columns = computed(() => [
+    {
+        align: 'left',
+        label: t('supplier.list.tableVisibleColumns.id'),
+        name: 'id',
+        isTitle: true,
+    },
+    {
+        align: 'left',
+        label: t('supplier.list.tableVisibleColumns.name'),
+        name: 'name',
+        create: true,
+        component: 'input',
+    },
+    {
+        align: 'left',
+        label: t('supplier.list.tableVisibleColumns.nif'),
+        name: 'nif',
+        create: true,
+        component: 'input',
+    },
+    {
+        align: 'left',
+        label: t('supplier.list.tableVisibleColumns.nickname'),
+        name: 'nickname',
+        create: true,
+        component: 'input',
+    },
+    {
+        align: 'left',
+        label: t('supplier.list.tableVisibleColumns.account'),
+        name: 'account',
+        create: true,
+        component: 'input',
+    },
+    {
+        align: 'left',
+        label: t('supplier.list.tableVisibleColumns.payMethod'),
+        name: 'payMethodFk',
+        create: true,
+        component: 'select',
+        attrs: {
+            url: 'payMethods',
+            fields: ['id', 'name'],
+        },
+    },
+    {
+        align: 'left',
+        label: t('supplier.list.tableVisibleColumns.payDay'),
+        name: 'payDat',
+        create: true,
+        component: 'input',
+    },
+]);
 </script>
 
 <template>
-    <VnSearchbar data-key="SuppliersList" :limit="20" :label="t('Search suppliers')" />
     <RightMenu>
         <template #right-panel>
             <SupplierListFilter data-key="SuppliersList" />
         </template>
     </RightMenu>
-    <QPage class="column items-center q-pa-md">
-        <div class="vn-card-list">
-            <VnPaginate data-key="SuppliersList" url="Suppliers/filter">
-                <template #body="{ rows }">
-                    <CardList
-                        v-for="row of rows"
-                        :key="row.id"
-                        :title="row.socialName"
-                        :id="row.id"
-                        @click="navigate(row.id)"
-                    >
-                        <template #list-items>
-                            <VnLv label="NIF/CIF" :value="row.nif" />
-                            <VnLv label="Alias" :value="row.alias" />
-                            <VnLv
-                                :label="t('supplier.list.payMethod')"
-                                :value="row.payMethod"
-                            />
-                            <VnLv
-                                :label="t('supplier.list.payDeadline')"
-                                :title-label="t('invoiceOut.list.created')"
-                                :value="row.payDem"
-                            />
-                            <VnLv
-                                :label="t('supplier.list.payDay')"
-                                :value="row.payDay"
-                            />
-                            <VnLv
-                                :label="t('supplier.list.account')"
-                                :value="row.account"
-                            />
-                        </template>
-                        <template #actions>
-                            <QBtn
-                                :label="t('components.smartCard.openSummary')"
-                                @click.stop="viewSummary(row.id, SupplierSummary)"
-                                color="primary"
-                            />
-                        </template>
-                    </CardList>
-                </template>
-            </VnPaginate>
-        </div>
-        <QPageSticky :offset="[20, 20]">
-            <QBtn fab icon="add" color="primary" @click="redirectToCreateView()" />
-            <QTooltip>
-                {{ t('supplier.list.newSupplier') }}
-            </QTooltip>
-        </QPageSticky>
-    </QPage>
+    <VnTable
+        ref="SuppliersRef"
+        data-key="SuppliersList"
+        :url="`Suppliers`"
+        save-url="Suppliers/crud"
+        :create="{
+            urlCreate: 'suppliers',
+            title: t('Create Supplier'),
+            onDataSaved: () => tableRef.reload(),
+        }"
+        order="id ASC"
+        :columns="columns"
+        default-mode="table"
+        auto-load
+        :right-search="false"
+        :is-editable="true"
+        :use-model="true"
+    />
 </template>
 
 <i18n>

From a803250cb913e1a821ff6a1bb2eb230ee20ecf88 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 19 Jun 2024 13:01:31 +0200
Subject: [PATCH 2/8] refs #6898 fix create

---
 src/pages/Supplier/SupplierList.vue | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/pages/Supplier/SupplierList.vue b/src/pages/Supplier/SupplierList.vue
index 9491a938b..89ab12a67 100644
--- a/src/pages/Supplier/SupplierList.vue
+++ b/src/pages/Supplier/SupplierList.vue
@@ -1,11 +1,12 @@
 <script setup>
-import { computed } from 'vue';
+import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import VnTable from 'components/VnTable/VnTable.vue';
-import SupplierListFilter from './SupplierListFilter.vue';
 import RightMenu from 'src/components/common/RightMenu.vue';
+import SupplierListFilter from './SupplierListFilter.vue';
 
 const { t } = useI18n();
+const tableRef = ref();
 
 const columns = computed(() => [
     {
@@ -25,28 +26,24 @@ const columns = computed(() => [
         align: 'left',
         label: t('supplier.list.tableVisibleColumns.nif'),
         name: 'nif',
-        create: true,
         component: 'input',
     },
     {
         align: 'left',
         label: t('supplier.list.tableVisibleColumns.nickname'),
         name: 'nickname',
-        create: true,
         component: 'input',
     },
     {
         align: 'left',
         label: t('supplier.list.tableVisibleColumns.account'),
         name: 'account',
-        create: true,
         component: 'input',
     },
     {
         align: 'left',
         label: t('supplier.list.tableVisibleColumns.payMethod'),
         name: 'payMethodFk',
-        create: true,
         component: 'select',
         attrs: {
             url: 'payMethods',
@@ -57,34 +54,34 @@ const columns = computed(() => [
         align: 'left',
         label: t('supplier.list.tableVisibleColumns.payDay'),
         name: 'payDat',
-        create: true,
         component: 'input',
     },
 ]);
 </script>
 
 <template>
-    <RightMenu>
+    <!-- <RightMenu>
         <template #right-panel>
             <SupplierListFilter data-key="SuppliersList" />
         </template>
-    </RightMenu>
+    </RightMenu> -->
     <VnTable
-        ref="SuppliersRef"
+        ref="tableRef"
         data-key="SuppliersList"
         :url="`Suppliers`"
         save-url="Suppliers/crud"
+        redirect="supplier"
         :create="{
-            urlCreate: 'suppliers',
+            urlCreate: 'Suppliers/newSupplier',
             title: t('Create Supplier'),
-            onDataSaved: () => tableRef.reload(),
+            onDataSaved: ({ id }) => tableRef.redirect(id),
+            formInitialData: {},
         }"
         order="id ASC"
         :columns="columns"
         default-mode="table"
         auto-load
         :right-search="false"
-        :is-editable="true"
         :use-model="true"
     />
 </template>

From def8d4222ba886cab30bc7764ecc554d063db958 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 26 Jun 2024 11:33:02 +0200
Subject: [PATCH 3/8] refs #6898 fix warnings

---
 src/pages/Supplier/SupplierList.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/pages/Supplier/SupplierList.vue b/src/pages/Supplier/SupplierList.vue
index 89ab12a67..0d60e7219 100644
--- a/src/pages/Supplier/SupplierList.vue
+++ b/src/pages/Supplier/SupplierList.vue
@@ -2,8 +2,6 @@
 import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import VnTable from 'components/VnTable/VnTable.vue';
-import RightMenu from 'src/components/common/RightMenu.vue';
-import SupplierListFilter from './SupplierListFilter.vue';
 
 const { t } = useI18n();
 const tableRef = ref();

From efa8791b9d79eeb725e89e4ed3400cca998fcd5f Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 26 Jun 2024 11:40:59 +0200
Subject: [PATCH 4/8] refs #6898 remove comment

---
 src/pages/Supplier/SupplierList.vue | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/pages/Supplier/SupplierList.vue b/src/pages/Supplier/SupplierList.vue
index 0d60e7219..efb86b4bb 100644
--- a/src/pages/Supplier/SupplierList.vue
+++ b/src/pages/Supplier/SupplierList.vue
@@ -58,11 +58,6 @@ const columns = computed(() => [
 </script>
 
 <template>
-    <!-- <RightMenu>
-        <template #right-panel>
-            <SupplierListFilter data-key="SuppliersList" />
-        </template>
-    </RightMenu> -->
     <VnTable
         ref="tableRef"
         data-key="SuppliersList"

From 95a3043359cc30e1f4d0f6b6f87aabf66d8f9aee Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 1 Jul 2024 13:16:25 +0200
Subject: [PATCH 5/8] refs #6898 fix colmns subtoolbar

---
 src/pages/Supplier/SupplierList.vue | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/src/pages/Supplier/SupplierList.vue b/src/pages/Supplier/SupplierList.vue
index efb86b4bb..9a135f1a5 100644
--- a/src/pages/Supplier/SupplierList.vue
+++ b/src/pages/Supplier/SupplierList.vue
@@ -2,6 +2,7 @@
 import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import VnTable from 'components/VnTable/VnTable.vue';
+import VnSubToolbar from 'components/ui/VnSubToolbar.vue';
 
 const { t } = useI18n();
 const tableRef = ref();
@@ -19,24 +20,36 @@ const columns = computed(() => [
         name: 'name',
         create: true,
         component: 'input',
+        columnField: {
+            component: null,
+        },
     },
     {
         align: 'left',
         label: t('supplier.list.tableVisibleColumns.nif'),
         name: 'nif',
         component: 'input',
+        columnField: {
+            component: null,
+        },
     },
     {
         align: 'left',
         label: t('supplier.list.tableVisibleColumns.nickname'),
         name: 'nickname',
         component: 'input',
+        columnField: {
+            component: null,
+        },
     },
     {
         align: 'left',
         label: t('supplier.list.tableVisibleColumns.account'),
         name: 'account',
         component: 'input',
+        columnField: {
+            component: null,
+        },
     },
     {
         align: 'left',
@@ -47,17 +60,24 @@ const columns = computed(() => [
             url: 'payMethods',
             fields: ['id', 'name'],
         },
+        columnField: {
+            component: null,
+        },
     },
     {
         align: 'left',
         label: t('supplier.list.tableVisibleColumns.payDay'),
         name: 'payDat',
         component: 'input',
+        columnField: {
+            component: null,
+        },
     },
 ]);
 </script>
 
 <template>
+    <VnSubToolbar />
     <VnTable
         ref="tableRef"
         data-key="SuppliersList"

From 56017645c24f51a4295e7575393db59817051fda Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 1 Jul 2024 13:20:55 +0200
Subject: [PATCH 6/8] refs #6898 fix search

---
 src/pages/Supplier/SupplierList.vue | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/pages/Supplier/SupplierList.vue b/src/pages/Supplier/SupplierList.vue
index 9a135f1a5..d7ff17ca7 100644
--- a/src/pages/Supplier/SupplierList.vue
+++ b/src/pages/Supplier/SupplierList.vue
@@ -2,7 +2,8 @@
 import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import VnTable from 'components/VnTable/VnTable.vue';
-import VnSubToolbar from 'components/ui/VnSubToolbar.vue';
+import VnSearchbar from 'components/ui/VnSearchbar.vue';
+import RightMenu from 'components/common/RightMenu.vue';
 
 const { t } = useI18n();
 const tableRef = ref();
@@ -77,7 +78,12 @@ const columns = computed(() => [
 </script>
 
 <template>
-    <VnSubToolbar />
+    <VnSearchbar data-key="SuppliersList" :limit="20" :label="t('Search suppliers')" />
+    <RightMenu>
+        <template #right-panel>
+            <SupplierListFilter data-key="SuppliersList" />
+        </template>
+    </RightMenu>
     <VnTable
         ref="tableRef"
         data-key="SuppliersList"

From f4a77f5030d1dfbf677ebadb834beb533a6f9d96 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 1 Jul 2024 13:31:24 +0200
Subject: [PATCH 7/8] refs #6898 fix search datakey

---
 src/pages/Supplier/SupplierList.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/Supplier/SupplierList.vue b/src/pages/Supplier/SupplierList.vue
index d7ff17ca7..c2b63e1b9 100644
--- a/src/pages/Supplier/SupplierList.vue
+++ b/src/pages/Supplier/SupplierList.vue
@@ -4,6 +4,7 @@ import { useI18n } from 'vue-i18n';
 import VnTable from 'components/VnTable/VnTable.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import RightMenu from 'components/common/RightMenu.vue';
+import SupplierListFilter from './SupplierListFilter.vue';
 
 const { t } = useI18n();
 const tableRef = ref();

From 352580270b7c9c8793520f8c06bc94d0fb46e874 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 3 Jul 2024 10:25:21 +0200
Subject: [PATCH 8/8] refs #6989 fix reload

---
 src/pages/Supplier/Card/SupplierSummary.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/pages/Supplier/Card/SupplierSummary.vue b/src/pages/Supplier/Card/SupplierSummary.vue
index d007ad08f..9337724b0 100644
--- a/src/pages/Supplier/Card/SupplierSummary.vue
+++ b/src/pages/Supplier/Card/SupplierSummary.vue
@@ -9,8 +9,6 @@ import { dashIfEmpty } from 'src/filters';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
 
-onUpdated(() => summaryRef.value.fetch());
-
 const route = useRoute();
 const roleState = useRole();
 const { t } = useI18n();