From 352e65c5296307927970e0e0e642839cff6f8d81 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 26 Jul 2023 15:17:00 +0200
Subject: [PATCH 01/26] refs #5673 feat(claim): add development section

---
 src/composables/useArrayData.js           |  14 +-
 src/i18n/es/index.js                      |   9 +-
 src/pages/Claim/Card/ClaimCard.vue        |   1 -
 src/pages/Claim/Card/ClaimDevelopment.vue | 199 ++++++++++++++++++++++
 src/router/modules/claim.js               |  18 +-
 5 files changed, 228 insertions(+), 13 deletions(-)
 create mode 100644 src/pages/Claim/Card/ClaimDevelopment.vue

diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index c7808f9a8..4535cde0f 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -38,11 +38,11 @@ export function useArrayData(key, userOptions) {
             'limit',
             'skip',
             'userParams',
-            'userFilter'
+            'userFilter',
         ];
         if (typeof userOptions === 'object') {
             for (const option in userOptions) {
-                const isEmpty = userOptions[option] == null || userOptions[option] == ''
+                const isEmpty = userOptions[option] == null || userOptions[option] == '';
                 if (isEmpty || !allowedOptions.includes(option)) continue;
 
                 if (Object.prototype.hasOwnProperty.call(store, option)) {
@@ -73,7 +73,7 @@ export function useArrayData(key, userOptions) {
 
         Object.assign(params, store.userParams);
 
-        store.isLoading = true
+        store.isLoading = true;
         const response = await axios.get(store.url, {
             signal: canceller.signal,
             params,
@@ -94,7 +94,7 @@ export function useArrayData(key, userOptions) {
             updateStateParams();
         }
 
-        store.isLoading = false
+        store.isLoading = false;
 
         canceller = null;
     }
@@ -153,8 +153,8 @@ export function useArrayData(key, userOptions) {
         });
     }
 
-    const totalRows = computed(() => store.data && store.data.length || 0);
-    const isLoading = computed(() => store.isLoading || false)
+    const totalRows = computed(() => (store.data && store.data.length) || 0);
+    const isLoading = computed(() => store.isLoading || false);
 
     return {
         fetch,
@@ -167,6 +167,6 @@ export function useArrayData(key, userOptions) {
         hasMoreData,
         totalRows,
         updateStateParams,
-        isLoading
+        isLoading,
     };
 }
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 6328c8f5d..91a05685c 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -63,7 +63,7 @@ export default {
             webPayments: 'Pagos Web',
             createCustomer: 'Crear cliente',
             basicData: 'Datos básicos',
-            summary: 'Resumen'
+            summary: 'Resumen',
         },
         list: {
             phone: 'Teléfono',
@@ -243,6 +243,7 @@ export default {
             lines: 'Líneas',
             rma: 'RMA',
             photos: 'Fotos',
+            development: 'Trazabilidad',
             log: 'Registros de auditoría',
         },
         list: {
@@ -294,7 +295,7 @@ export default {
             result: 'Consecuencias',
             responsible: 'Responsable',
             worker: 'Trabajador',
-            redelivery: 'Devolución'
+            redelivery: 'Devolución',
         },
         basicData: {
             customer: 'Cliente',
@@ -411,7 +412,7 @@ export default {
             wagonEdit: 'Editar tipo',
             typesList: 'Listado tipos',
             typeCreate: 'Crear tipo',
-            typeEdit: 'Editar tipo'
+            typeEdit: 'Editar tipo',
         },
         type: {
             name: 'Nombre',
@@ -444,7 +445,7 @@ export default {
             minHeightBetweenTrays: 'La distancia mínima entre bandejas es ',
             maxWagonHeight: 'La altura máxima del vagón es ',
             uncompleteTrays: 'Hay bandejas sin completar',
-        }
+        },
     },
     components: {
         topbar: {},
diff --git a/src/pages/Claim/Card/ClaimCard.vue b/src/pages/Claim/Card/ClaimCard.vue
index 2691bbc51..3d22747c0 100644
--- a/src/pages/Claim/Card/ClaimCard.vue
+++ b/src/pages/Claim/Card/ClaimCard.vue
@@ -23,7 +23,6 @@ const entityId = computed(() => {
 });
 const claimSections = [
     { name: 'Notes', url: '/note/index', icon: 'draft' },
-    { name: 'Development', url: '/development', icon: 'vn:traceability' },
     { name: 'Action', url: '/action', icon: 'vn:actions' },
 ];
 
diff --git a/src/pages/Claim/Card/ClaimDevelopment.vue b/src/pages/Claim/Card/ClaimDevelopment.vue
new file mode 100644
index 000000000..b9626b444
--- /dev/null
+++ b/src/pages/Claim/Card/ClaimDevelopment.vue
@@ -0,0 +1,199 @@
+<script setup>
+import { ref, computed } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+import VnPaginate from 'components/ui/VnPaginate.vue';
+import FetchData from 'components/FetchData.vue';
+
+const route = useRoute();
+const { t } = useI18n();
+
+const claimReasons = ref([]);
+const claimResults = ref([]);
+const claimResponsibles = ref([]);
+const claimRedeliveries = ref([]);
+
+const developmentsFilter = {
+    fields: [
+        'id',
+        'claimFk',
+        'claimReasonFk',
+        'claimResultFk',
+        'claimResponsibleFk',
+        'workerFk',
+        'claimRedeliveryFk',
+    ],
+    where: {
+        claimFk: route.params.id,
+    },
+};
+
+const columns = computed(() => [
+    {
+        name: 'reason',
+        label: t('Reason'),
+        field: (row) => row.claimReasonFk,
+        sortable: true,
+        options: claimReasons,
+    },
+    {
+        name: 'result',
+        label: t('Result'),
+        field: (row) => row.claimResultFk,
+        sortable: true,
+        options: claimResults,
+    },
+    {
+        name: 'responsible',
+        label: t('Responsible'),
+        field: (row) => row.claimResponsibleFk,
+        sortable: true,
+    },
+    {
+        name: 'worker',
+        label: t('Worker'),
+        field: (row) => row.workerFk,
+        sortable: true,
+    },
+    {
+        name: 'redelivery',
+        label: t('Redelivery'),
+        field: (row) => row.claimRedeliveryFk,
+        sortable: true,
+    },
+]);
+</script>
+<template>
+    <FetchData
+        url="ClaimReasons"
+        order="description"
+        @on-fetch="(data) => (claimReasons = data)"
+        auto-load
+    />
+    <FetchData
+        url="ClaimResults"
+        order="description"
+        @on-fetch="(data) => (claimResults = data)"
+        auto-load
+    />
+    <FetchData
+        url="ClaimResponsibles"
+        order="description"
+        @on-fetch="(data) => (claimResponsibles = data)"
+        auto-load
+    />
+    <FetchData
+        url="ClaimRedeliveries"
+        order="description"
+        @on-fetch="(data) => (claimRedeliveries = data)"
+        auto-load
+    />
+    <div class="column items-center">
+        <div class="list">
+            <VnPaginate
+                data-key="ClaimDevelopments"
+                url="ClaimDevelopments"
+                :filter="developmentsFilter"
+                auto-load
+            >
+                <template #body="{ rows }">
+                    <QTable
+                        :columns="columns"
+                        :rows="rows"
+                        :dense="$q.screen.lt.md"
+                        :pagination="{ rowsPerPage: 0 }"
+                        row-key="id"
+                        selection="multiple"
+                        hide-pagination
+                    >
+                        <template #body-cell-reason="{ row, column }">
+                            {{ column }}
+                            <QTd auto-width>
+                                <QSelect
+                                    :label="t('Responsible')"
+                                    v-model="row.claimReasonFk"
+                                    :options="claimReasons"
+                                    option-value="id"
+                                    option-label="description"
+                                    emit-value
+                                    map-options
+                                    use-input
+                                />
+                            </QTd>
+                        </template>
+                        <template #body-cell-result="{ row }">
+                            {{ props }}
+                            <QTd auto-width>
+                                <QSelect
+                                    label=""
+                                    v-model="row.claimResultFk"
+                                    :options="claimResults"
+                                    option-value="id"
+                                    option-label="description"
+                                    emit-value
+                                    map-options
+                                    use-input
+                                />
+                            </QTd>
+                        </template>
+                        <template #body-cell-responsible="{ row }">
+                            <QTd auto-width>
+                                <QSelect
+                                    :label="t('Responsible')"
+                                    v-model="row.claimResponsibleFk"
+                                    :options="claimResponsibles"
+                                    option-value="id"
+                                    option-label="description"
+                                    emit-value
+                                    map-options
+                                    use-input
+                                />
+                            </QTd>
+                        </template>
+                    </QTable>
+                </template>
+            </VnPaginate>
+        </div>
+    </div>
+    <q-page-sticky position="bottom-right" :offset="[18, 18]">
+        <q-fab color="purple" icon="keyboard_arrow_up" direction="up">
+            <q-fab-action color="primary" icon="mail" />
+            <q-fab-action color="secondary" icon="alarm" />
+        </q-fab>
+    </q-page-sticky>
+</template>
+
+<style lang="scss" scoped>
+.list {
+    padding-top: 50px;
+    max-width: 900px;
+    width: 100%;
+}
+.grid-style-transition {
+    transition: transform 0.28s, background-color 0.28s;
+}
+</style>
+
+<i18n>
+en:
+    You are about to remove {count} rows: '
+        You are about to remove <strong>{count}</strong> row |
+        You are about to remove  <strong>{count}</strong> rows'
+es:
+    Claimed lines: Líneas reclamadas
+    Delivered: Entregado
+    Quantity: Cantidad
+    Claimed: Reclamada
+    Description: Descripción
+    Price: Precio
+    Discount: Descuento
+    Actions: Acciones
+    Amount: Total
+    Amount Claimed: Cantidad reclamada
+    Delete claimed sales: Eliminar ventas reclamadas
+    Discount updated: Descuento actualizado
+    Claimed quantity: Cantidad reclamada
+    You are about to remove {count} rows: '
+        Vas a eliminar <strong>{count}</strong> línea |
+        Vas a eliminar <strong>{count}</strong> líneas'
+</i18n>
diff --git a/src/router/modules/claim.js b/src/router/modules/claim.js
index c43ed5012..a39e60d8a 100644
--- a/src/router/modules/claim.js
+++ b/src/router/modules/claim.js
@@ -11,7 +11,14 @@ export default {
     redirect: { name: 'ClaimMain' },
     menus: {
         main: ['ClaimList', 'ClaimRmaList'],
-        card: ['ClaimBasicData', 'ClaimLines', 'ClaimRma', 'ClaimPhotos', 'ClaimLog'],
+        card: [
+            'ClaimBasicData',
+            'ClaimLines',
+            'ClaimPhotos',
+            'ClaimDevelopment',
+            'ClaimRma',
+            'ClaimLog',
+        ],
     },
     children: [
         {
@@ -94,6 +101,15 @@ export default {
                     },
                     component: () => import('src/pages/Claim/Card/ClaimPhoto.vue'),
                 },
+                {
+                    name: 'ClaimDevelopment',
+                    path: 'development',
+                    meta: {
+                        title: 'development',
+                        icon: 'vn:traceability',
+                    },
+                    component: () => import('src/pages/Claim/Card/ClaimDevelopment.vue'),
+                },
                 {
                     name: 'ClaimLog',
                     path: 'log',

From b7bbb4ba417cb0cc0d8462fcb79c99ecb0123296 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 27 Jul 2023 16:05:23 +0200
Subject: [PATCH 02/26] refs #5673 feat(claim_development): add translation

---
 src/i18n/en/index.js                      | 9 +++++----
 src/i18n/es/index.js                      | 2 +-
 src/pages/Claim/Card/ClaimCard.vue        | 1 -
 src/pages/Claim/Card/ClaimDevelopment.vue | 6 ++----
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index a43c5fe7c..67c552b5a 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -244,6 +244,7 @@ export default {
             lines: 'Lines',
             rma: 'RMA',
             photos: 'Photos',
+            development: 'Development',
             log: 'Audit logs',
         },
         list: {
@@ -295,7 +296,7 @@ export default {
             result: 'Result',
             responsible: 'Responsible',
             worker: 'Worker',
-            redelivery: 'Redelivery'
+            redelivery: 'Redelivery',
         },
         basicData: {
             customer: 'Customer',
@@ -411,7 +412,7 @@ export default {
             wagonEdit: 'Edit wagon',
             typesList: 'Types List',
             typeCreate: 'Create type',
-            typeEdit: 'Edit type'
+            typeEdit: 'Edit type',
         },
         type: {
             name: 'Name',
@@ -431,7 +432,7 @@ export default {
             plate: 'Plate',
             volume: 'Volume',
             type: 'Type',
-            label: 'Label'
+            label: 'Label',
         },
         warnings: {
             noData: 'No data available',
@@ -444,7 +445,7 @@ export default {
             minHeightBetweenTrays: 'The minimum height between trays is ',
             maxWagonHeight: 'The maximum height of the wagon is ',
             uncompleteTrays: 'There are incomplete trays',
-        }
+        },
     },
     components: {
         topbar: {},
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 91a05685c..b9a344ccf 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -242,8 +242,8 @@ export default {
             basicData: 'Datos básicos',
             lines: 'Líneas',
             rma: 'RMA',
-            photos: 'Fotos',
             development: 'Trazabilidad',
+            photos: 'Fotos',
             log: 'Registros de auditoría',
         },
         list: {
diff --git a/src/pages/Claim/Card/ClaimCard.vue b/src/pages/Claim/Card/ClaimCard.vue
index 3d22747c0..2b6e275f9 100644
--- a/src/pages/Claim/Card/ClaimCard.vue
+++ b/src/pages/Claim/Card/ClaimCard.vue
@@ -76,6 +76,5 @@ es:
     You can search by claim id or customer name: Puedes buscar por id de la reclamación o nombre del cliente
     Details: Detalles
     Notes: Notas
-    Development: Trazabilidad
     Action: Acción
 </i18n>
diff --git a/src/pages/Claim/Card/ClaimDevelopment.vue b/src/pages/Claim/Card/ClaimDevelopment.vue
index b9626b444..0e247b581 100644
--- a/src/pages/Claim/Card/ClaimDevelopment.vue
+++ b/src/pages/Claim/Card/ClaimDevelopment.vue
@@ -106,11 +106,10 @@ const columns = computed(() => [
                         selection="multiple"
                         hide-pagination
                     >
-                        <template #body-cell-reason="{ row, column }">
-                            {{ column }}
+                        <template #body-cell-reason="{ row, col }">
                             <QTd auto-width>
                                 <QSelect
-                                    :label="t('Responsible')"
+                                    :label="col.label"
                                     v-model="row.claimReasonFk"
                                     :options="claimReasons"
                                     option-value="id"
@@ -122,7 +121,6 @@ const columns = computed(() => [
                             </QTd>
                         </template>
                         <template #body-cell-result="{ row }">
-                            {{ props }}
                             <QTd auto-width>
                                 <QSelect
                                     label=""

From e2e34089e254ce47928ce30fb252f730a708b998 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 31 Jul 2023 15:24:34 +0200
Subject: [PATCH 03/26] refs #5673 feat(FormModel): support crud

---
 src/components/FormModel.vue | 157 ++++++++++++++++++++++++++++++++++-
 1 file changed, 153 insertions(+), 4 deletions(-)

diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index 9d0916a8e..0d5f75ec1 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -29,12 +29,26 @@ const $props = defineProps({
         type: String,
         default: null,
     },
+    crud: {
+        type: Boolean,
+        default: null,
+    },
+    primaryKey: {
+        type: String,
+        default: 'id',
+    },
+    dataRequired: {
+        type: Object,
+        default: null,
+    },
 });
 
 const emit = defineEmits(['onFetch']);
 
 defineExpose({
     save,
+    insert,
+    remove,
 });
 
 onMounted(async () => await fetch());
@@ -55,7 +69,7 @@ async function fetch() {
     });
 
     state.set($props.model, data);
-    originalData.value = Object.assign({}, data);
+    originalData.value = JSON.parse(JSON.stringify(data));
 
     watch(formData.value, () => (hasChanges.value = true));
 
@@ -72,7 +86,7 @@ async function save() {
     isLoading.value = true;
     await axios.patch($props.urlUpdate || $props.url, formData.value);
 
-    originalData.value = formData.value;
+    originalData.value = JSON.parse(JSON.stringify(formData.value));
     hasChanges.value = false;
     isLoading.value = false;
 }
@@ -96,22 +110,157 @@ function filter(value, update, filterOptions) {
     );
 }
 
+async function crudSave() {
+    if (!hasChanges.value) {
+        return quasar.notify({
+            type: 'negative',
+            message: t('globals.noChanges'),
+        });
+    }
+    isLoading.value = true;
+    const changes = getChanges();
+    await saveChanges(changes);
+    if (changes.creates?.length) await fetch();
+}
+
+async function saveChanges(changes) {
+    try {
+        await axios.post($props.urlUpdate || $props.url + '/crud', changes);
+    } catch (e) {
+        quasar.notify({
+            type: 'negative',
+            message: 'Some fields are invalid',
+        });
+    }
+
+    originalData.value = JSON.parse(JSON.stringify(formData.value));
+    hasChanges.value = false;
+    isLoading.value = false;
+}
+
+async function insert() {
+    const $index = formData.value.length + 1;
+    formData.value.push(Object.assign({ $index }, $props.dataRequired));
+    hasChanges.value = true;
+}
+
+// function addRemove(ids) {
+//     for (let id of ids) {
+//         const index = removed.value.indexOf(id);
+//         if (index > -1) {
+//             removed.value = removed.value.slice(index, 1);
+//             continue;
+//         }
+//         removed.value.push(id);
+//     }
+// }
+
+async function remove(data) {
+    if (!data.length)
+        return quasar.notify({
+            type: 'warning',
+            message: t('globals.noChanges'),
+        });
+
+    const pk = $props.primaryKey;
+    let ids = data.map((d) => d[pk]).filter(Boolean);
+    let preRemove = data.map((d) => d.$index).filter(Boolean);
+    let newData = formData.value;
+
+    // addRemove(ids);
+    if (preRemove.length) {
+        newData = newData.filter(
+            (form) => !preRemove.some((index) => index == form.$index)
+        );
+        state.set($props.model, newData);
+        const changes = getChanges();
+        if (!changes.creates?.length && !changes.updates?.length)
+            hasChanges.value = false;
+    }
+    if (ids.length) {
+        await saveChanges({ deletes: ids });
+        newData = newData.filter((form) => !ids.some((id) => id == form[pk]));
+        state.set($props.model, newData);
+    }
+}
+
+async function onSubmit() {
+    if ($props.crud) return crudSave();
+    return save();
+}
+
 watch(formUrl, async () => {
     originalData.value = null;
     reset();
     fetch();
 });
+
+function getChanges() {
+    const updates = [];
+    const creates = [];
+
+    const pk = $props.primaryKey;
+
+    for (const [i, row] of formData.value.entries()) {
+        if (!row[pk]) {
+            creates.push(row);
+        } else if (originalData.value) {
+            const data = getDifferences(originalData.value[i], row);
+            if (!isEmpty(data)) {
+                updates.push({
+                    data,
+                    where: { [pk]: row[pk] },
+                });
+            }
+        }
+    }
+    const changes = { updates, creates };
+
+    for (let prop in changes) {
+        if (changes[prop].length === 0) changes[prop] = undefined;
+    }
+
+    return changes;
+}
+
+function getDifferences(obj1, obj2) {
+    let diff = {};
+    for (let key in obj1) {
+        if (obj2[key] && obj1[key] !== obj2[key]) {
+            diff[key] = obj2[key];
+        }
+    }
+    for (let key in obj2) {
+        if (obj1[key] === undefined && obj2[key]) {
+            diff[key] = obj2[key];
+        }
+    }
+    return diff;
+}
+
+function isEmpty(obj) {
+    if (obj == null) return true;
+    if (obj === undefined) return true;
+    if (Object.keys(obj).length === 0) return true;
+
+    if (obj.length > 0) return false;
+}
 </script>
 <template>
     <QBanner v-if="hasChanges" class="text-white bg-warning">
         <QIcon name="warning" size="md" class="q-mr-md" />
         <span>{{ t('globals.changesToSave') }}</span>
     </QBanner>
-    <QForm v-if="formData" @submit="save" @reset="reset" class="q-pa-md">
+    <QForm v-if="formData" @submit="onSubmit" @reset="reset" class="q-pa-md">
         <slot name="form" :data="formData" :validate="validate" :filter="filter"></slot>
         <div class="q-mt-lg">
             <slot name="actions">
-                <QBtn :label="t('globals.save')" type="submit" color="primary" />
+                <QBtn
+                    :label="t('globals.save')"
+                    type="submit"
+                    color="primary"
+                    :disable="!hasChanges"
+                />
                 <QBtn
                     :label="t('globals.reset')"
                     type="reset"

From 6b3a09887fe5db735218e4d80b86cdc3736c722a Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 31 Jul 2023 15:24:56 +0200
Subject: [PATCH 04/26] refs #5673 feat(ClaimDevelopment): use crud

---
 src/pages/Claim/Card/ClaimDevelopment.vue | 216 ++++++++++++++--------
 1 file changed, 143 insertions(+), 73 deletions(-)

diff --git a/src/pages/Claim/Card/ClaimDevelopment.vue b/src/pages/Claim/Card/ClaimDevelopment.vue
index 0e247b581..a4a8dccd4 100644
--- a/src/pages/Claim/Card/ClaimDevelopment.vue
+++ b/src/pages/Claim/Card/ClaimDevelopment.vue
@@ -2,16 +2,19 @@
 import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
-import VnPaginate from 'components/ui/VnPaginate.vue';
+import FormModel from 'components/FormModel.vue';
 import FetchData from 'components/FetchData.vue';
 
 const route = useRoute();
 const { t } = useI18n();
 
+const claimDevelopmentForm = ref();
 const claimReasons = ref([]);
 const claimResults = ref([]);
 const claimResponsibles = ref([]);
 const claimRedeliveries = ref([]);
+const workers = ref([]);
+const selected = ref([]);
 
 const developmentsFilter = {
     fields: [
@@ -34,34 +37,92 @@ const columns = computed(() => [
         label: t('Reason'),
         field: (row) => row.claimReasonFk,
         sortable: true,
-        options: claimReasons,
+        options: claimReasons.value,
+        required: true,
+        model: 'claimReasonFk',
+        optionValue: 'id',
+        optionLabel: 'description',
     },
     {
         name: 'result',
         label: t('Result'),
         field: (row) => row.claimResultFk,
         sortable: true,
-        options: claimResults,
+        options: claimResults.value,
+        required: true,
+        model: 'claimResultFk',
+        optionValue: 'id',
+        optionLabel: 'description',
     },
     {
         name: 'responsible',
         label: t('Responsible'),
         field: (row) => row.claimResponsibleFk,
         sortable: true,
+        options: claimResponsibles.value,
+        required: true,
+        model: 'claimResponsibleFk',
+        optionValue: 'id',
+        optionLabel: 'description',
     },
     {
         name: 'worker',
         label: t('Worker'),
         field: (row) => row.workerFk,
         sortable: true,
+        options: workers.value,
+        model: 'workerFk',
+        optionValue: 'id',
+        optionLabel: 'nickname',
     },
     {
         name: 'redelivery',
         label: t('Redelivery'),
         field: (row) => row.claimRedeliveryFk,
         sortable: true,
+        options: claimRedeliveries.value,
+        required: true,
+        model: 'claimRedeliveryFk',
+        optionValue: 'id',
+        optionLabel: 'description',
     },
 ]);
+
+// function filterFn(val, update) {
+//     if (val === '') {
+//         update(() => {
+//             options.value = stringOptions;
+//         });
+//         return;
+//     }
+
+//     update(() => {
+//         const needle = val.toLowerCase();
+//         options.value = stringOptions.filter((v) => v.toLowerCase().indexOf(needle) > -1);
+//     });
+// }
+
+const basicFilter = (options) => {
+    return {
+        options,
+        filterFn: (options, value) => {
+            const search = value.toLowerCase();
+
+            if (value === '') return options;
+
+            return options.value.filter((row) => {
+                console.log(row);
+                const id = row.id;
+                const name = row.name.toLowerCase();
+
+                const idMatches = id == search;
+                const nameMatches = name.indexOf(search) > -1;
+
+                return idMatches || nameMatches;
+            });
+        },
+    };
+};
 </script>
 <template>
     <FetchData
@@ -88,110 +149,119 @@ const columns = computed(() => [
         @on-fetch="(data) => (claimRedeliveries = data)"
         auto-load
     />
+    <FetchData
+        url="Workers/activeWithInheritedRole"
+        :where="{ role: 'employee' }"
+        @on-fetch="(data) => (workers = data)"
+        auto-load
+    />
     <div class="column items-center">
         <div class="list">
-            <VnPaginate
-                data-key="ClaimDevelopments"
+            <FormModel
                 url="ClaimDevelopments"
+                :crud="true"
                 :filter="developmentsFilter"
-                auto-load
+                model="claim"
+                ref="claimDevelopmentForm"
+                :data-required="{ claimFk: route.params.id }"
             >
-                <template #body="{ rows }">
+                <template #form="{ data, filter }">
                     <QTable
                         :columns="columns"
-                        :rows="rows"
-                        :dense="$q.screen.lt.md"
+                        :rows="data"
                         :pagination="{ rowsPerPage: 0 }"
                         row-key="id"
                         selection="multiple"
                         hide-pagination
+                        v-model:selected="selected"
+                        :grid="$q.screen.lt.md"
                     >
-                        <template #body-cell-reason="{ row, col }">
+                        <template #body-cell="{ row, col }">
                             <QTd auto-width>
                                 <QSelect
                                     :label="col.label"
-                                    v-model="row.claimReasonFk"
-                                    :options="claimReasons"
-                                    option-value="id"
-                                    option-label="description"
+                                    v-model="row[col.model]"
+                                    :options="col.options"
+                                    :option-value="col.optionValue"
+                                    :option-label="col.optionLabel"
                                     emit-value
                                     map-options
                                     use-input
+                                    @filter="
+                                        (value, update) =>
+                                            filter(
+                                                value,
+                                                update,
+                                                basicFilter(col.options)
+                                            )
+                                    "
                                 />
                             </QTd>
                         </template>
-                        <template #body-cell-result="{ row }">
-                            <QTd auto-width>
-                                <QSelect
-                                    label=""
-                                    v-model="row.claimResultFk"
-                                    :options="claimResults"
-                                    option-value="id"
-                                    option-label="description"
-                                    emit-value
-                                    map-options
-                                    use-input
-                                />
-                            </QTd>
-                        </template>
-                        <template #body-cell-responsible="{ row }">
-                            <QTd auto-width>
-                                <QSelect
-                                    :label="t('Responsible')"
-                                    v-model="row.claimResponsibleFk"
-                                    :options="claimResponsibles"
-                                    option-value="id"
-                                    option-label="description"
-                                    emit-value
-                                    map-options
-                                    use-input
-                                />
-                            </QTd>
+                        <template #item="props">
+                            <div class="q-pa-xs col-xs-12 col-sm-6 grid-style-transition">
+                                <QCard bordered flat>
+                                    <QCardSection>
+                                        <QCheckbox v-model="props.selected" dense />
+                                    </QCardSection>
+                                    <QSeparator />
+                                    <QList dense>
+                                        <QItem v-for="col in props.cols" :key="col.name">
+                                            <QItemSection>
+                                                <QSelect
+                                                    :label="col.label"
+                                                    v-model="props.row[col.model]"
+                                                    :options="col.options"
+                                                    :option-value="col.optionValue"
+                                                    :option-label="col.optionLabel"
+                                                    emit-value
+                                                    map-options
+                                                    use-input
+                                                    dense
+                                                    @filter="
+                                                        (value, update) =>
+                                                            filter(
+                                                                value,
+                                                                update,
+                                                                basicFilter(col.options)
+                                                            )
+                                                    "
+                                                />
+                                            </QItemSection>
+                                        </QItem>
+                                    </QList>
+                                </QCard>
+                            </div>
                         </template>
                     </QTable>
                 </template>
-            </VnPaginate>
+            </FormModel>
         </div>
     </div>
-    <q-page-sticky position="bottom-right" :offset="[18, 18]">
-        <q-fab color="purple" icon="keyboard_arrow_up" direction="up">
-            <q-fab-action color="primary" icon="mail" />
-            <q-fab-action color="secondary" icon="alarm" />
-        </q-fab>
-    </q-page-sticky>
+    <QPageSticky position="bottom-right" :offset="[25, 100]">
+        <QBtn
+            fab
+            color="primary"
+            icon="delete"
+            @click="claimDevelopmentForm.remove(selected)"
+        />
+    </QPageSticky>
+    <QPageSticky position="bottom-right" :offset="[25, 25]">
+        <QBtn fab color="primary" icon="add" @click="claimDevelopmentForm.insert()" />
+    </QPageSticky>
 </template>
 
 <style lang="scss" scoped>
-.list {
-    padding-top: 50px;
-    max-width: 900px;
-    width: 100%;
-}
 .grid-style-transition {
     transition: transform 0.28s, background-color 0.28s;
 }
 </style>
 
 <i18n>
-en:
-    You are about to remove {count} rows: '
-        You are about to remove <strong>{count}</strong> row |
-        You are about to remove  <strong>{count}</strong> rows'
 es:
-    Claimed lines: Líneas reclamadas
-    Delivered: Entregado
-    Quantity: Cantidad
-    Claimed: Reclamada
-    Description: Descripción
-    Price: Precio
-    Discount: Descuento
-    Actions: Acciones
-    Amount: Total
-    Amount Claimed: Cantidad reclamada
-    Delete claimed sales: Eliminar ventas reclamadas
-    Discount updated: Descuento actualizado
-    Claimed quantity: Cantidad reclamada
-    You are about to remove {count} rows: '
-        Vas a eliminar <strong>{count}</strong> línea |
-        Vas a eliminar <strong>{count}</strong> líneas'
+    Reason: Motivo
+    Result: Consecuencia
+    Responsible: Responsable
+    Worker: Trabajador
+    Redelivery: Devolución
 </i18n>

From 92e914adad91920e5dda00dcf05fba90696a423f Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 1 Aug 2023 15:17:48 +0200
Subject: [PATCH 05/26] refs #5673 feat(formModel): global qselect filter

---
 src/components/FormModel.vue              |  4 +--
 src/pages/Claim/Card/ClaimDevelopment.vue | 37 ++++++++++++++++++++---
 2 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index 0d5f75ec1..0b22dd3b7 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -99,9 +99,9 @@ function reset() {
 function filter(value, update, filterOptions) {
     update(
         () => {
-            const { options, filterFn } = filterOptions;
+            const { options, filterFn, field } = filterOptions;
 
-            options.value = filterFn(options, value);
+            options.value = filterFn(options, value, field);
         },
         (ref) => {
             ref.setOptionIndex(-1);
diff --git a/src/pages/Claim/Card/ClaimDevelopment.vue b/src/pages/Claim/Card/ClaimDevelopment.vue
index a4a8dccd4..774ecff01 100644
--- a/src/pages/Claim/Card/ClaimDevelopment.vue
+++ b/src/pages/Claim/Card/ClaimDevelopment.vue
@@ -102,10 +102,34 @@ const columns = computed(() => [
 //     });
 // }
 
-const basicFilter = (options) => {
+// const basicFilter = () => {
+//     return {
+//         options: claimReasons,
+//         filterFn: (options, value) => {
+//             console.log('ENTRY', value);
+//             const search = value.toLowerCase();
+//             if (value === '') return claimReasons.value;
+
+//             const arr = options.value.filter((row) => {
+//                 const id = row.id;
+//                 const name = row.description.toLowerCase();
+//                 console.log('SEARCH', search, id);
+//                 const idMatches = id == search;
+//                 const nameMatches = name.indexOf(search) > -1;
+//                 return idMatches || nameMatches;
+//             });
+//             console.log(arr);
+//             return arr;
+//         },
+//     };
+// };
+
+const basicFilter = (options, field) => {
+    console.log(options, field);
     return {
         options,
-        filterFn: (options, value) => {
+        field,
+        filterFn: (options, value, field) => {
             const search = value.toLowerCase();
 
             if (value === '') return options;
@@ -113,7 +137,7 @@ const basicFilter = (options) => {
             return options.value.filter((row) => {
                 console.log(row);
                 const id = row.id;
-                const name = row.name.toLowerCase();
+                const name = row[field ?? 'name'].toLowerCase();
 
                 const idMatches = id == search;
                 const nameMatches = name.indexOf(search) > -1;
@@ -192,7 +216,7 @@ const basicFilter = (options) => {
                                             filter(
                                                 value,
                                                 update,
-                                                basicFilter(col.options)
+                                                basicFilter(col.options, col.optionLabel)
                                             )
                                     "
                                 />
@@ -223,7 +247,10 @@ const basicFilter = (options) => {
                                                             filter(
                                                                 value,
                                                                 update,
-                                                                basicFilter(col.options)
+                                                                basicFilter(
+                                                                    col.options,
+                                                                    col.optionLabel
+                                                                )
                                                             )
                                                     "
                                                 />

From 0cb925abc36d8c9e62ebdb8074cd2391922cb9f5 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 2 Aug 2023 15:15:23 +0200
Subject: [PATCH 06/26] refs #5673 feat: create VnSelectFilter

---
 src/components/common/VnSelectFilter.vue  |  58 +++++++++++
 src/pages/Claim/Card/ClaimCard.vue        |   1 +
 src/pages/Claim/Card/ClaimDevelopment.vue | 111 +++-------------------
 3 files changed, 74 insertions(+), 96 deletions(-)
 create mode 100644 src/components/common/VnSelectFilter.vue

diff --git a/src/components/common/VnSelectFilter.vue b/src/components/common/VnSelectFilter.vue
new file mode 100644
index 000000000..61566f777
--- /dev/null
+++ b/src/components/common/VnSelectFilter.vue
@@ -0,0 +1,58 @@
+<script setup>
+import { ref, watch, toRefs } from 'vue';
+const emit = defineEmits(['update:modelValue', 'update:options']);
+
+const $props = defineProps({
+    modelValue: {
+        type: [String, Number],
+        default: null,
+    },
+    options: {
+        type: Array,
+        default: () => [],
+    },
+    optionLabel: {
+        type: String,
+        default: '',
+    },
+});
+
+const updateValue = (newValue) => emit('update:modelValue', newValue);
+const updateOptions = (newValue) => emit('update:options', newValue);
+const { modelValue } = toRefs($props);
+
+function filterFn(val, update) {
+    update(
+        () => {
+            const needle = val.toLowerCase();
+            console.log($props.options);
+            // $props.options.value = options.value.filter(
+            //     (v) => v[$props.optionLabel.value].toLowerCase().indexOf(needle) > -1
+            // );
+            updateOptions(
+                $props.options.filter(
+                    (v) => v[$props.optionLabel].toLowerCase().indexOf(needle) > -1
+                )
+            );
+        },
+        (ref) => {
+            ref.setOptionIndex(-1);
+            ref.moveOptionSelection(1, true);
+        }
+    );
+}
+</script>
+
+<template>
+    <QSelect
+        v-model="modelValue"
+        @update:model-value="updateValue"
+        :options="options"
+        :option-label="optionLabel"
+        v-bind="$attrs"
+        emit-value
+        map-options
+        use-input
+        @filter="(value, update) => filterFn(value, update)"
+    />
+</template>
diff --git a/src/pages/Claim/Card/ClaimCard.vue b/src/pages/Claim/Card/ClaimCard.vue
index 2b6e275f9..b77f95d38 100644
--- a/src/pages/Claim/Card/ClaimCard.vue
+++ b/src/pages/Claim/Card/ClaimCard.vue
@@ -64,6 +64,7 @@ onMounted(async () => {
         </QScrollArea>
     </QDrawer>
     <QPageContainer>
+        <div id="sub-toolbar"></div>
         <QPage class="q-pa-md">
             <RouterView></RouterView>
         </QPage>
diff --git a/src/pages/Claim/Card/ClaimDevelopment.vue b/src/pages/Claim/Card/ClaimDevelopment.vue
index 774ecff01..ace7b3e4d 100644
--- a/src/pages/Claim/Card/ClaimDevelopment.vue
+++ b/src/pages/Claim/Card/ClaimDevelopment.vue
@@ -4,6 +4,7 @@ import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import FormModel from 'components/FormModel.vue';
 import FetchData from 'components/FetchData.vue';
+import VnSelectFilter from 'components/common/VnSelectFilter.vue';
 
 const route = useRoute();
 const { t } = useI18n();
@@ -87,66 +88,6 @@ const columns = computed(() => [
         optionLabel: 'description',
     },
 ]);
-
-// function filterFn(val, update) {
-//     if (val === '') {
-//         update(() => {
-//             options.value = stringOptions;
-//         });
-//         return;
-//     }
-
-//     update(() => {
-//         const needle = val.toLowerCase();
-//         options.value = stringOptions.filter((v) => v.toLowerCase().indexOf(needle) > -1);
-//     });
-// }
-
-// const basicFilter = () => {
-//     return {
-//         options: claimReasons,
-//         filterFn: (options, value) => {
-//             console.log('ENTRY', value);
-//             const search = value.toLowerCase();
-//             if (value === '') return claimReasons.value;
-
-//             const arr = options.value.filter((row) => {
-//                 const id = row.id;
-//                 const name = row.description.toLowerCase();
-//                 console.log('SEARCH', search, id);
-//                 const idMatches = id == search;
-//                 const nameMatches = name.indexOf(search) > -1;
-//                 return idMatches || nameMatches;
-//             });
-//             console.log(arr);
-//             return arr;
-//         },
-//     };
-// };
-
-const basicFilter = (options, field) => {
-    console.log(options, field);
-    return {
-        options,
-        field,
-        filterFn: (options, value, field) => {
-            const search = value.toLowerCase();
-
-            if (value === '') return options;
-
-            return options.value.filter((row) => {
-                console.log(row);
-                const id = row.id;
-                const name = row[field ?? 'name'].toLowerCase();
-
-                const idMatches = id == search;
-                const nameMatches = name.indexOf(search) > -1;
-
-                return idMatches || nameMatches;
-            });
-        },
-    };
-};
 </script>
 <template>
     <FetchData
@@ -189,7 +130,7 @@ const basicFilter = (options, field) => {
                 ref="claimDevelopmentForm"
                 :data-required="{ claimFk: route.params.id }"
             >
-                <template #form="{ data, filter }">
+                <template #form="{ data }">
                     <QTable
                         :columns="columns"
                         :rows="data"
@@ -202,23 +143,12 @@ const basicFilter = (options, field) => {
                     >
                         <template #body-cell="{ row, col }">
                             <QTd auto-width>
-                                <QSelect
+                                <VnSelectFilter
                                     :label="col.label"
                                     v-model="row[col.model]"
                                     :options="col.options"
                                     :option-value="col.optionValue"
                                     :option-label="col.optionLabel"
-                                    emit-value
-                                    map-options
-                                    use-input
-                                    @filter="
-                                        (value, update) =>
-                                            filter(
-                                                value,
-                                                update,
-                                                basicFilter(col.options, col.optionLabel)
-                                            )
-                                    "
                                 />
                             </QTd>
                         </template>
@@ -232,27 +162,13 @@ const basicFilter = (options, field) => {
                                     <QList dense>
                                         <QItem v-for="col in props.cols" :key="col.name">
                                             <QItemSection>
-                                                <QSelect
+                                                <VnSelectFilter
                                                     :label="col.label"
                                                     v-model="props.row[col.model]"
                                                     :options="col.options"
                                                     :option-value="col.optionValue"
                                                     :option-label="col.optionLabel"
-                                                    emit-value
-                                                    map-options
-                                                    use-input
                                                     dense
-                                                    @filter="
-                                                        (value, update) =>
-                                                            filter(
-                                                                value,
-                                                                update,
-                                                                basicFilter(
-                                                                    col.options,
-                                                                    col.optionLabel
-                                                                )
-                                                            )
-                                                    "
                                                 />
                                             </QItemSection>
                                         </QItem>
@@ -265,14 +181,17 @@ const basicFilter = (options, field) => {
             </FormModel>
         </div>
     </div>
-    <QPageSticky position="bottom-right" :offset="[25, 100]">
-        <QBtn
-            fab
-            color="primary"
-            icon="delete"
-            @click="claimDevelopmentForm.remove(selected)"
-        />
-    </QPageSticky>
+    <Teleport to="#sub-toolbar">
+        <QToolbar class="bg-dark text-white justify-end">
+            <div class="row q-gutter-x-sm">
+                <QBtn
+                    color="primary"
+                    icon="delete"
+                    @click="claimDevelopmentForm.remove(selected)"
+                />
+            </div>
+        </QToolbar>
+    </Teleport>
     <QPageSticky position="bottom-right" :offset="[25, 25]">
         <QBtn fab color="primary" icon="add" @click="claimDevelopmentForm.insert()" />
     </QPageSticky>

From 35ac3afe819c4773365f10ee7ca57f646693da90 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 4 Aug 2023 08:57:11 +0200
Subject: [PATCH 07/26] refs #5673 fix(vnSelectFilter): update options

---
 src/components/common/VnSelectFilter.vue  | 16 +++++++++-------
 src/pages/Claim/Card/ClaimDevelopment.vue | 12 ++++++++++++
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/components/common/VnSelectFilter.vue b/src/components/common/VnSelectFilter.vue
index 61566f777..74aa43082 100644
--- a/src/components/common/VnSelectFilter.vue
+++ b/src/components/common/VnSelectFilter.vue
@@ -18,22 +18,24 @@ const $props = defineProps({
 });
 
 const updateValue = (newValue) => emit('update:modelValue', newValue);
-const updateOptions = (newValue) => emit('update:options', newValue);
-const { modelValue } = toRefs($props);
+const { modelValue, options, optionLabel } = toRefs($props);
 
 function filterFn(val, update) {
     update(
         () => {
             const needle = val.toLowerCase();
-            console.log($props.options);
             // $props.options.value = options.value.filter(
             //     (v) => v[$props.optionLabel.value].toLowerCase().indexOf(needle) > -1
             // );
-            updateOptions(
-                $props.options.filter(
-                    (v) => v[$props.optionLabel].toLowerCase().indexOf(needle) > -1
-                )
+            // updateOptions(
+            //     $props.options.filter(
+            //         (v) => v[$props.optionLabel].toLowerCase().indexOf(needle) > -1
+            //     )
+            // );
+            const filteredOptions = options.value.filter(
+                (v) => v[optionLabel.value].toLowerCase().indexOf(needle) > -1
             );
+            emit('update:options', filteredOptions);
         },
         (ref) => {
             ref.setOptionIndex(-1);
diff --git a/src/pages/Claim/Card/ClaimDevelopment.vue b/src/pages/Claim/Card/ClaimDevelopment.vue
index ace7b3e4d..09a655d3c 100644
--- a/src/pages/Claim/Card/ClaimDevelopment.vue
+++ b/src/pages/Claim/Card/ClaimDevelopment.vue
@@ -147,6 +147,12 @@ const columns = computed(() => [
                                     :label="col.label"
                                     v-model="row[col.model]"
                                     :options="col.options"
+                                    @update:options="
+                                        (newOptions) => {
+                                            console.log(newOptions);
+                                            col.options = newOptions;
+                                        }
+                                    "
                                     :option-value="col.optionValue"
                                     :option-label="col.optionLabel"
                                 />
@@ -166,6 +172,12 @@ const columns = computed(() => [
                                                     :label="col.label"
                                                     v-model="props.row[col.model]"
                                                     :options="col.options"
+                                                    @update:options="
+                                                        (newOptions) => {
+                                                            console.log(newOptions);
+                                                            col.options = newOptions;
+                                                        }
+                                                    "
                                                     :option-value="col.optionValue"
                                                     :option-label="col.optionLabel"
                                                     dense

From 0cdd090daf7afb0a8e72e7059ddfbc50e26bdf9c Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 7 Aug 2023 12:00:42 +0200
Subject: [PATCH 08/26] refs #5673 feat(FormModel): basciFilter, feat: modul
 top toolbar

---
 src/components/FormModel.vue              | 85 ++++++++++++++---------
 src/components/common/VnSelectFilter.vue  | 53 +++++++-------
 src/pages/Claim/Card/ClaimCard.vue        |  8 ++-
 src/pages/Claim/Card/ClaimDevelopment.vue | 38 ++++------
 src/pages/Claim/Card/ClaimPhoto.vue       | 69 ++++--------------
 src/pages/Claim/Card/ClaimRma.vue         | 35 ++++------
 src/pages/Customer/Card/CustomerCard.vue  | 10 +++
 src/router/modules/claim.js               |  1 +
 8 files changed, 136 insertions(+), 163 deletions(-)

diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index 0b22dd3b7..ef0ce173b 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -41,20 +41,10 @@ const $props = defineProps({
         type: Object,
         default: null,
     },
-});
-
-const emit = defineEmits(['onFetch']);
-
-defineExpose({
-    save,
-    insert,
-    remove,
-});
-
-onMounted(async () => await fetch());
-
-onUnmounted(() => {
-    state.unset($props.model);
+    defaultActions: {
+        type: Boolean,
+        default: true,
+    },
 });
 
 const isLoading = ref(false);
@@ -62,12 +52,38 @@ const hasChanges = ref(false);
 const formData = computed(() => state.get($props.model));
 const originalData = ref();
 const formUrl = computed(() => $props.url);
+const stActionsExist = ref(false);
+
+const emit = defineEmits(['onFetch']);
+
+defineExpose({
+    save,
+    insert,
+    remove,
+    onSubmit,
+    reset,
+    hasChanges,
+});
+
+onMounted(async () => {
+    await fetch();
+    stActionsExist.value = !!document.querySelector('#st-actions');
+});
+
+onUnmounted(() => {
+    state.unset($props.model);
+});
 
 async function fetch() {
     const { data } = await axios.get($props.url, {
         params: { filter: $props.filter },
     });
 
+    if (Array.isArray(data)) {
+        let $index = 0;
+        data.map((d) => (d.$index = $index++));
+    }
+
     state.set($props.model, data);
     originalData.value = JSON.parse(JSON.stringify(data));
 
@@ -84,7 +100,11 @@ async function save() {
         });
     }
     isLoading.value = true;
-    await axios.patch($props.urlUpdate || $props.url, formData.value);
+    try {
+        await axios.patch($props.urlUpdate || $props.url, formData.value);
+    } catch {
+        return (isLoading.value = false);
+    }
 
     originalData.value = JSON.parse(JSON.stringify(formData.value));
     hasChanges.value = false;
@@ -93,6 +113,7 @@ async function save() {
 
 function reset() {
     state.set($props.model, originalData.value);
+    watch(formData.value, () => (hasChanges.value = true));
     hasChanges.value = false;
 }
 // eslint-disable-next-line vue/no-dupe-keys
@@ -118,28 +139,25 @@ async function crudSave() {
         });
     }
     isLoading.value = true;
-    const changes = getChanges();
-    await saveChanges(changes);
-    if (changes.creates?.length) await fetch();
+    await saveChanges();
 }
 
-async function saveChanges(changes) {
+async function saveChanges() {
+    const changes = getChanges();
     try {
         await axios.post($props.urlUpdate || $props.url + '/crud', changes);
     } catch (e) {
-        quasar.notify({
-            type: 'negative',
-            message: 'Some fields are invalid',
-        });
+        return (isLoading.value = false);
     }
 
     originalData.value = JSON.parse(JSON.stringify(formData.value));
     hasChanges.value = false;
     isLoading.value = false;
+    if (changes.creates?.length) await fetch();
 }
 
 async function insert() {
-    const $index = formData.value.length + 1;
+    const $index = formData.value[formData.value.length - 1].$index + 1;
     formData.value.push(Object.assign({ $index }, $props.dataRequired));
     hasChanges.value = true;
 }
@@ -156,6 +174,7 @@ async function insert() {
 // }
 
 async function remove(data) {
+    console.log(data);
     if (!data.length)
         return quasar.notify({
             type: 'warning',
@@ -253,25 +272,29 @@ function isEmpty(obj) {
     </QBanner>
     <QForm v-if="formData" @submit="onSubmit" @reset="reset" class="q-pa-md">
         <slot name="form" :data="formData" :validate="validate" :filter="filter"></slot>
-        <div class="q-mt-lg">
-            <slot name="actions">
+    </QForm>
+    <Teleport to="#st-actions" v-if="stActionsExist">
+        <div class="row q-gutter-x-sm">
+            <slot name="moreActions" />
+            <div v-if="$props.defaultActions">
                 <QBtn
                     :label="t('globals.save')"
-                    type="submit"
                     color="primary"
+                    icon="save"
+                    @click="onSubmit"
                     :disable="!hasChanges"
                 />
                 <QBtn
                     :label="t('globals.reset')"
-                    type="reset"
-                    class="q-ml-sm"
                     color="primary"
+                    class="q-ml-sm"
                     flat
+                    @click="reset"
                     :disable="!hasChanges"
                 />
-            </slot>
+            </div>
         </div>
-    </QForm>
+    </Teleport>
     <SkeletonForm v-if="!formData" />
     <QInnerLoading
         :showing="isLoading"
diff --git a/src/components/common/VnSelectFilter.vue b/src/components/common/VnSelectFilter.vue
index 74aa43082..926b1b907 100644
--- a/src/components/common/VnSelectFilter.vue
+++ b/src/components/common/VnSelectFilter.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, watch, toRefs } from 'vue';
+import { ref, toRefs } from 'vue';
 const emit = defineEmits(['update:modelValue', 'update:options']);
 
 const $props = defineProps({
@@ -18,43 +18,42 @@ const $props = defineProps({
 });
 
 const updateValue = (newValue) => emit('update:modelValue', newValue);
-const { modelValue, options, optionLabel } = toRefs($props);
+const { modelValue, optionLabel, options } = toRefs($props);
+const myOptions = ref(JSON.parse(JSON.stringify(options.value)));
+const myOptionsOriginal = ref(JSON.parse(JSON.stringify(options.value)));
 
-function filterFn(val, update) {
-    update(
-        () => {
-            const needle = val.toLowerCase();
-            // $props.options.value = options.value.filter(
-            //     (v) => v[$props.optionLabel.value].toLowerCase().indexOf(needle) > -1
-            // );
-            // updateOptions(
-            //     $props.options.filter(
-            //         (v) => v[$props.optionLabel].toLowerCase().indexOf(needle) > -1
-            //     )
-            // );
-            const filteredOptions = options.value.filter(
-                (v) => v[optionLabel.value].toLowerCase().indexOf(needle) > -1
-            );
-            emit('update:options', filteredOptions);
-        },
-        (ref) => {
-            ref.setOptionIndex(-1);
-            ref.moveOptionSelection(1, true);
-        }
-    );
-}
+const filter = (val, options) => {
+    const search = val.toLowerCase();
+
+    if (val === '') return options;
+    return options.filter((row) => {
+        const id = row.id;
+        const name = row[$props.optionLabel].toLowerCase();
+
+        const idMatches = id == search;
+        const nameMatches = name.indexOf(search) > -1;
+
+        return idMatches || nameMatches;
+    });
+};
+
+const filterHandler = (val, update) => {
+    update(() => {
+        myOptions.value = filter(val, myOptionsOriginal.value);
+    });
+};
 </script>
 
 <template>
     <QSelect
         v-model="modelValue"
         @update:model-value="updateValue"
-        :options="options"
+        :options="myOptions"
         :option-label="optionLabel"
         v-bind="$attrs"
         emit-value
         map-options
         use-input
-        @filter="(value, update) => filterFn(value, update)"
+        @filter="filterHandler"
     />
 </template>
diff --git a/src/pages/Claim/Card/ClaimCard.vue b/src/pages/Claim/Card/ClaimCard.vue
index b77f95d38..141b6e258 100644
--- a/src/pages/Claim/Card/ClaimCard.vue
+++ b/src/pages/Claim/Card/ClaimCard.vue
@@ -64,7 +64,13 @@ onMounted(async () => {
         </QScrollArea>
     </QDrawer>
     <QPageContainer>
-        <div id="sub-toolbar"></div>
+        <QToolbar id="sub-toolbar" class="bg-dark text-white justify-end">
+            <div id="st-data">
+                {{ route.meta?.title && t(`claim.pageTitles.${route.meta.title}`) }}
+            </div>
+            <QSpace />
+            <div id="st-actions"></div>
+        </QToolbar>
         <QPage class="q-pa-md">
             <RouterView></RouterView>
         </QPage>
diff --git a/src/pages/Claim/Card/ClaimDevelopment.vue b/src/pages/Claim/Card/ClaimDevelopment.vue
index 09a655d3c..da297cd81 100644
--- a/src/pages/Claim/Card/ClaimDevelopment.vue
+++ b/src/pages/Claim/Card/ClaimDevelopment.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, computed } from 'vue';
+import { ref, computed, onMounted } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import FormModel from 'components/FormModel.vue';
@@ -126,16 +126,25 @@ const columns = computed(() => [
                 url="ClaimDevelopments"
                 :crud="true"
                 :filter="developmentsFilter"
-                model="claim"
+                model="claimDevelopment"
                 ref="claimDevelopmentForm"
                 :data-required="{ claimFk: route.params.id }"
             >
+                <template #moreActions>
+                    <QBtn
+                        :label="t('globals.remove')"
+                        color="primary"
+                        icon="delete"
+                        @click="claimDevelopmentForm.remove(selected)"
+                        :disable="!selected.length"
+                    />
+                </template>
                 <template #form="{ data }">
                     <QTable
                         :columns="columns"
                         :rows="data"
                         :pagination="{ rowsPerPage: 0 }"
-                        row-key="id"
+                        row-key="$index"
                         selection="multiple"
                         hide-pagination
                         v-model:selected="selected"
@@ -147,12 +156,6 @@ const columns = computed(() => [
                                     :label="col.label"
                                     v-model="row[col.model]"
                                     :options="col.options"
-                                    @update:options="
-                                        (newOptions) => {
-                                            console.log(newOptions);
-                                            col.options = newOptions;
-                                        }
-                                    "
                                     :option-value="col.optionValue"
                                     :option-label="col.optionLabel"
                                 />
@@ -172,12 +175,6 @@ const columns = computed(() => [
                                                     :label="col.label"
                                                     v-model="props.row[col.model]"
                                                     :options="col.options"
-                                                    @update:options="
-                                                        (newOptions) => {
-                                                            console.log(newOptions);
-                                                            col.options = newOptions;
-                                                        }
-                                                    "
                                                     :option-value="col.optionValue"
                                                     :option-label="col.optionLabel"
                                                     dense
@@ -193,17 +190,6 @@ const columns = computed(() => [
             </FormModel>
         </div>
     </div>
-    <Teleport to="#sub-toolbar">
-        <QToolbar class="bg-dark text-white justify-end">
-            <div class="row q-gutter-x-sm">
-                <QBtn
-                    color="primary"
-                    icon="delete"
-                    @click="claimDevelopmentForm.remove(selected)"
-                />
-            </div>
-        </QToolbar>
-    </Teleport>
     <QPageSticky position="bottom-right" :offset="[25, 25]">
         <QBtn fab color="primary" icon="add" @click="claimDevelopmentForm.insert()" />
     </QPageSticky>
diff --git a/src/pages/Claim/Card/ClaimPhoto.vue b/src/pages/Claim/Card/ClaimPhoto.vue
index 839fbefc9..483dbffc1 100644
--- a/src/pages/Claim/Card/ClaimPhoto.vue
+++ b/src/pages/Claim/Card/ClaimPhoto.vue
@@ -4,7 +4,6 @@ import { ref, computed } from 'vue';
 import { useQuasar } from 'quasar';
 import { useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-import { useStateStore } from 'stores/useStateStore';
 import { useSession } from 'composables/useSession';
 import VnConfirm from 'components/ui/VnConfirm.vue';
 import FetchData from 'components/FetchData.vue';
@@ -12,7 +11,6 @@ import FetchData from 'components/FetchData.vue';
 const router = useRouter();
 const quasar = useQuasar();
 const { t } = useI18n();
-const stateStore = useStateStore();
 const session = useSession();
 const token = session.getToken();
 
@@ -237,59 +235,20 @@ function onDrag() {
         </div>
     </div>
 
-    <Teleport
-        v-if="stateStore.isHeaderMounted() && !quasar.platform.is.mobile"
-        to="#actions-prepend"
-    >
-        <div class="row q-gutter-x-sm">
-            <label for="fileInput">
-                <QBtn
-                    @click="inputFile.nativeEl.click()"
-                    icon="add"
-                    color="primary"
-                    dense
-                    rounded
-                >
-                    <QInput
-                        ref="inputFile"
-                        type="file"
-                        style="display: none"
-                        multiple
-                        v-model="files"
-                        @update:model-value="create()"
-                    />
-                    <QTooltip bottom> {{ t('globals.add') }} </QTooltip>
-                </QBtn>
-            </label>
-            <QSeparator vertical />
-        </div>
-    </Teleport>
-
-    <QPageSticky
-        v-if="quasar.platform.is.mobile"
-        position="bottom"
-        :offset="[0, 0]"
-        expand
-    >
-        <QToolbar class="bg-primary text-white q-pa-none">
-            <QTabs class="full-width" align="justify" inline-label narrow-indicator>
-                <QTab
-                    @click="inputFile.nativeEl.click()"
-                    icon="add_circle"
-                    :label="t('globals.add')"
-                >
-                    <QInput
-                        ref="inputFile"
-                        type="file"
-                        style="display: none"
-                        multiple
-                        v-model="files"
-                        @update:model-value="create()"
-                    />
-                    <QTooltip bottom> {{ t('globals.add') }} </QTooltip>
-                </QTab>
-            </QTabs>
-        </QToolbar>
+    <QPageSticky position="bottom-right" :offset="[25, 25]">
+        <label for="fileInput">
+            <QBtn fab @click="inputFile.nativeEl.click()" icon="add" color="primary">
+                <QInput
+                    ref="inputFile"
+                    type="file"
+                    style="display: none"
+                    multiple
+                    v-model="files"
+                    @update:model-value="create()"
+                />
+                <QTooltip bottom> {{ t('globals.add') }} </QTooltip>
+            </QBtn>
+        </label>
     </QPageSticky>
 
     <!-- MULTIMEDIA DIALOG START-->
diff --git a/src/pages/Claim/Card/ClaimRma.vue b/src/pages/Claim/Card/ClaimRma.vue
index c59c11845..de984c8f7 100644
--- a/src/pages/Claim/Card/ClaimRma.vue
+++ b/src/pages/Claim/Card/ClaimRma.vue
@@ -5,7 +5,6 @@ import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
 import { useRoute } from 'vue-router';
 import { useArrayData } from 'src/composables/useArrayData';
-import { useStateStore } from 'stores/useStateStore';
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import FetchData from 'components/FetchData.vue';
 import VnConfirm from 'src/components/ui/VnConfirm.vue';
@@ -15,7 +14,6 @@ import { toDate } from 'src/filters';
 const quasar = useQuasar();
 const route = useRoute();
 const { t } = useI18n();
-const stateStore = useStateStore();
 const arrayData = useArrayData('ClaimRma');
 
 const claim = ref();
@@ -147,29 +145,20 @@ async function remove({ id }) {
         </div>
     </div>
 
-    <Teleport
-        v-if="stateStore.isHeaderMounted() && !quasar.platform.is.mobile"
-        to="#actions-prepend"
-    >
-        <div class="row q-gutter-x-sm">
-            <QBtn @click="addRow()" icon="add" color="primary" dense rounded>
+    <QPageSticky position="bottom-right" :offset="[25, 25]">
+        <label for="fileInput">
+            <QBtn fab @click="inputFile.nativeEl.click()" icon="add" color="primary">
+                <QInput
+                    ref="inputFile"
+                    type="file"
+                    style="display: none"
+                    multiple
+                    v-model="files"
+                    @update:model-value="create()"
+                />
                 <QTooltip bottom> {{ t('globals.add') }} </QTooltip>
             </QBtn>
-            <QSeparator vertical />
-        </div>
-    </Teleport>
-
-    <QPageSticky
-        v-if="quasar.platform.is.mobile"
-        position="bottom"
-        :offset="[0, 0]"
-        expand
-    >
-        <QToolbar class="bg-primary text-white q-pa-none">
-            <QTabs class="full-width" align="justify" inline-label narrow-indicator>
-                <QTab @click="addRow()" icon="add_circle" :label="t('globals.add')" />
-            </QTabs>
-        </QToolbar>
+        </label>
     </QPageSticky>
 </template>
 
diff --git a/src/pages/Customer/Card/CustomerCard.vue b/src/pages/Customer/Card/CustomerCard.vue
index 3a1c28d18..629298622 100644
--- a/src/pages/Customer/Card/CustomerCard.vue
+++ b/src/pages/Customer/Card/CustomerCard.vue
@@ -1,11 +1,14 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
 import { useStateStore } from 'stores/useStateStore';
+import { useRoute } from 'vue-router';
 import CustomerDescriptor from './CustomerDescriptor.vue';
 import LeftMenu from 'components/LeftMenu.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 
 const stateStore = useStateStore();
+const route = useRoute();
+console.log(route);
 const { t } = useI18n();
 </script>
 <template>
@@ -25,6 +28,13 @@ const { t } = useI18n();
         </QScrollArea>
     </QDrawer>
     <QPageContainer>
+        <QToolbar id="sub-toolbar" class="bg-dark text-white justify-end">
+            <div id="st-data">
+                {{ route.meta?.title && t(`customer.pageTitles.${route.meta.title}`) }}
+            </div>
+            <QSpace />
+            <div id="st-actions"></div>
+        </QToolbar>
         <QPage class="q-pa-md">
             <RouterView></RouterView>
         </QPage>
diff --git a/src/router/modules/claim.js b/src/router/modules/claim.js
index a39e60d8a..b48758c32 100644
--- a/src/router/modules/claim.js
+++ b/src/router/modules/claim.js
@@ -107,6 +107,7 @@ export default {
                     meta: {
                         title: 'development',
                         icon: 'vn:traceability',
+                        roles: ['claimManager'],
                     },
                     component: () => import('src/pages/Claim/Card/ClaimDevelopment.vue'),
                 },

From edead9b7be9f733281bf7d419b4b0f6a8c3677d4 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 7 Aug 2023 12:01:48 +0200
Subject: [PATCH 09/26] rrefs #5673 remove console.logs

---
 src/components/FormModel.vue             | 1 -
 src/pages/Customer/Card/CustomerCard.vue | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index ef0ce173b..2897997ed 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -174,7 +174,6 @@ async function insert() {
 // }
 
 async function remove(data) {
-    console.log(data);
     if (!data.length)
         return quasar.notify({
             type: 'warning',
diff --git a/src/pages/Customer/Card/CustomerCard.vue b/src/pages/Customer/Card/CustomerCard.vue
index 629298622..16c756e6a 100644
--- a/src/pages/Customer/Card/CustomerCard.vue
+++ b/src/pages/Customer/Card/CustomerCard.vue
@@ -8,7 +8,6 @@ import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 
 const stateStore = useStateStore();
 const route = useRoute();
-console.log(route);
 const { t } = useI18n();
 </script>
 <template>

From c139e8034bceed3c7854afe646f2f66cc76bf247 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 16 Aug 2023 15:04:16 +0200
Subject: [PATCH 10/26] refs #5673 feat(CrudModel): separate from FormModel

---
 src/components/CrudModel.vue                  | 339 ++++++++++++++++++
 src/components/FormModel.vue                  | 222 ++----------
 src/components/ui/SkeletonTable.vue           |  50 +++
 src/components/ui/VnPaginate.vue              |   9 +-
 src/css/app.scss                              |  15 +
 src/pages/Claim/Card/ClaimCard.vue            |   7 +-
 src/pages/Claim/Card/ClaimDevelopment.vue     |  27 +-
 src/pages/Claim/Card/ClaimLines.vue           |  99 +----
 src/stores/useStateStore.js                   |  11 +
 .../integration/claimDevelopment.spec.js      |  55 +++
 10 files changed, 541 insertions(+), 293 deletions(-)
 create mode 100644 src/components/CrudModel.vue
 create mode 100644 src/components/ui/SkeletonTable.vue
 create mode 100755 test/cypress/integration/claimDevelopment.spec.js

diff --git a/src/components/CrudModel.vue b/src/components/CrudModel.vue
new file mode 100644
index 000000000..6b8c577a0
--- /dev/null
+++ b/src/components/CrudModel.vue
@@ -0,0 +1,339 @@
+<script setup>
+import axios from 'axios';
+import { onMounted, onUnmounted, computed, ref, watch } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useQuasar } from 'quasar';
+import { useState } from 'src/composables/useState';
+import { useValidator } from 'src/composables/useValidator';
+import { useStateStore } from 'stores/useStateStore';
+import VnPaginate from 'components/ui/VnPaginate.vue';
+import VnConfirm from 'components/ui/VnConfirm.vue';
+import SkeletonTable from 'components/ui/SkeletonTable.vue';
+
+const quasar = useQuasar();
+const state = useState();
+const stateStore = useStateStore();
+const { t } = useI18n();
+const { validate } = useValidator();
+
+const $props = defineProps({
+    model: {
+        type: String,
+        default: '',
+    },
+    url: {
+        type: String,
+        default: '',
+    },
+    saveUrl: {
+        type: String,
+        default: null,
+    },
+    primaryKey: {
+        type: String,
+        default: 'id',
+    },
+    dataRequired: {
+        type: Object,
+        default: null,
+    },
+    defaultSave: {
+        type: Boolean,
+        default: true,
+    },
+    defaultReset: {
+        type: Boolean,
+        default: true,
+    },
+    defaultRemove: {
+        type: Boolean,
+        default: true,
+    },
+    selected: {
+        type: Object,
+        default: null,
+    },
+});
+
+const isLoading = ref(false);
+const hasChanges = ref(false);
+const originalData = ref();
+const vnPaginateRef = ref();
+const formData = computed(() => state.get($props.model));
+const formUrl = computed(() => $props.url);
+
+const emit = defineEmits(['onFetch', 'update:selected']);
+
+defineExpose({
+    insert,
+    remove,
+    onSubmit,
+    reset,
+    hasChanges,
+});
+
+onMounted(async () => {
+    await fetch();
+});
+
+onUnmounted(() => {
+    state.unset($props.model);
+});
+
+function tMobile(...args) {
+    if (!quasar.platform.is.mobile) return t(...args);
+}
+async function fetch(data) {
+    if (data && Array.isArray(data)) {
+        let $index = 0;
+        data.map((d) => (d.$index = $index++));
+    }
+
+    state.set($props.model, data);
+    originalData.value = data && JSON.parse(JSON.stringify(data));
+
+    watch(formData.value, () => (hasChanges.value = true));
+
+    emit('onFetch', state.get($props.model));
+}
+
+function reset() {
+    state.set($props.model, originalData.value);
+    watch(formData.value, () => (hasChanges.value = true));
+    hasChanges.value = false;
+}
+// eslint-disable-next-line vue/no-dupe-keys
+function filter(value, update, filterOptions) {
+    update(
+        () => {
+            const { options, filterFn, field } = filterOptions;
+
+            options.value = filterFn(options, value, field);
+        },
+        (ref) => {
+            ref.setOptionIndex(-1);
+            ref.moveOptionSelection(1, true);
+        }
+    );
+}
+
+async function onSubmit() {
+    if (!hasChanges.value) {
+        return quasar.notify({
+            type: 'negative',
+            message: t('globals.noChanges'),
+        });
+    }
+    isLoading.value = true;
+    await saveChanges();
+}
+
+async function saveChanges(data) {
+    const changes = data || getChanges();
+    try {
+        await axios.post($props.saveUrl || $props.url + '/crud', changes);
+    } catch (e) {
+        return (isLoading.value = false);
+    }
+
+    originalData.value = JSON.parse(JSON.stringify(formData.value));
+    hasChanges.value = false;
+    isLoading.value = false;
+    if (changes.creates?.length) await vnPaginateRef.value.fetch();
+}
+
+async function insert() {
+    const $index = formData.value.length
+        ? formData.value[formData.value.length - 1].$index + 1
+        : 0;
+    formData.value.push(Object.assign({ $index }, $props.dataRequired));
+    hasChanges.value = true;
+}
+
+// function addRemove(ids) {
+//     for (let id of ids) {
+//         const index = removed.value.indexOf(id);
+//         if (index > -1) {
+//             removed.value = removed.value.slice(index, 1);
+//             continue;
+//         }
+//         removed.value.push(id);
+//     }
+// }
+
+async function remove(data) {
+    if (!data.length)
+        return quasar.notify({
+            type: 'warning',
+            message: t('globals.noChanges'),
+        });
+
+    const pk = $props.primaryKey;
+    let ids = data.map((d) => d[pk]).filter(Boolean);
+    let preRemove = data.map((d) => (d[pk] ? null : d.$index)).filter(Boolean);
+    let newData = formData.value;
+
+    // addRemove(ids);
+    if (preRemove.length) {
+        newData = newData.filter(
+            (form) => !preRemove.some((index) => index == form.$index)
+        );
+        state.set($props.model, newData);
+        const changes = getChanges();
+        if (!changes.creates?.length && !changes.updates?.length)
+            hasChanges.value = false;
+    }
+    if (ids.length) {
+        quasar
+            .dialog({
+                component: VnConfirm,
+                componentProps: {
+                    title: t('confirmDeletion'),
+                    message: t('confirmDeletionMessage'),
+                    newData,
+                    ids,
+                },
+            })
+            .onOk(async () => {
+                await saveChanges({ deletes: ids });
+                newData = newData.filter((form) => !ids.some((id) => id == form[pk]));
+                state.set($props.model, newData);
+            });
+    }
+    emit('update:selected', []);
+}
+
+watch(formUrl, async () => {
+    originalData.value = null;
+    reset();
+    fetch();
+});
+
+function getChanges() {
+    const updates = [];
+    const creates = [];
+
+    const pk = $props.primaryKey;
+
+    for (const [i, row] of formData.value.entries()) {
+        if (!row[pk]) {
+            creates.push(row);
+        } else if (originalData.value) {
+            const data = getDifferences(originalData.value[i], row);
+            if (!isEmpty(data)) {
+                updates.push({
+                    data,
+                    where: { [pk]: row[pk] },
+                });
+            }
+        }
+    }
+    const changes = { updates, creates };
+
+    for (let prop in changes) {
+        if (changes[prop].length === 0) changes[prop] = undefined;
+    }
+
+    return changes;
+}
+
+function getDifferences(obj1, obj2) {
+    let diff = {};
+    for (let key in obj1) {
+        if (obj2[key] && obj1[key] !== obj2[key]) {
+            diff[key] = obj2[key];
+        }
+    }
+    for (let key in obj2) {
+        if (obj1[key] === undefined && obj2[key]) {
+            diff[key] = obj2[key];
+        }
+    }
+    return diff;
+}
+
+function isEmpty(obj) {
+    if (obj == null) return true;
+    if (obj === undefined) return true;
+    if (Object.keys(obj).length === 0) return true;
+
+    if (obj.length > 0) return false;
+}
+</script>
+<template>
+    <QBanner v-if="hasChanges" class="text-white bg-warning">
+        <QIcon name="warning" size="md" class="q-mr-md" />
+        <span>{{ t('globals.changesToSave') }}</span>
+    </QBanner>
+    <VnPaginate
+        @submit="onSubmit"
+        @reset="reset"
+        :url="url"
+        v-bind="$attrs"
+        @on-fetch="fetch"
+        class="q-pa-md"
+        :skeleton="false"
+        ref="vnPaginateRef"
+    >
+        <template #body v-if="formData">
+            <slot
+                name="body"
+                :rows="formData"
+                :validate="validate"
+                :filter="filter"
+            ></slot>
+        </template>
+    </VnPaginate>
+    <SkeletonTable v-if="!formData" />
+    <Teleport to="#st-actions" v-if="stateStore.isSubToolbarShown()">
+        <QBtnGroup push class="q-gutter-x-sm">
+            <slot name="moreActions" />
+            <QBtn
+                :label="tMobile('globals.remove')"
+                color="primary"
+                icon="delete"
+                @click="remove(selected)"
+                :disable="!selected?.length"
+                :title="t('globals.remove')"
+                v-if="$props.defaultRemove"
+            />
+            <QBtn
+                :label="tMobile('globals.reset')"
+                color="primary"
+                icon="restart_alt"
+                flat
+                @click="reset"
+                :disable="!hasChanges"
+                :title="t('globals.reset')"
+                v-if="$props.defaultReset"
+            />
+            <QBtn
+                :label="tMobile('globals.save')"
+                color="primary"
+                icon="save"
+                @click="onSubmit"
+                :disable="!hasChanges"
+                :title="t('globals.save')"
+                v-if="$props.defaultSave"
+            />
+        </QBtnGroup>
+    </Teleport>
+    <QInnerLoading
+        :showing="isLoading"
+        :label="t('globals.pleaseWait')"
+        color="primary"
+    />
+</template>
+
+<i18n>
+    {
+        "en": {
+            "confirmDeletion": "Confirm deletion",
+            "confirmDeletionMessage": "Are you sure you want to delete this?"
+        },
+        "es": {
+            "confirmDeletion": "Confirmar eliminación",
+            "confirmDeletionMessage": "Seguro que quieres eliminar?"
+        }
+    }
+</i18n>
diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index 2897997ed..3c05333f5 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -4,12 +4,14 @@ import { onMounted, onUnmounted, computed, ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
 import { useState } from 'src/composables/useState';
+import { useStateStore } from 'stores/useStateStore';
 import { useValidator } from 'src/composables/useValidator';
 import SkeletonForm from 'components/ui/SkeletonForm.vue';
 
 const quasar = useQuasar();
-const { t } = useI18n();
 const state = useState();
+const stateStore = useStateStore();
+const { t } = useI18n();
 const { validate } = useValidator();
 
 const $props = defineProps({
@@ -29,63 +31,41 @@ const $props = defineProps({
         type: String,
         default: null,
     },
-    crud: {
-        type: Boolean,
-        default: null,
-    },
-    primaryKey: {
-        type: String,
-        default: 'id',
-    },
-    dataRequired: {
-        type: Object,
-        default: null,
-    },
     defaultActions: {
         type: Boolean,
         default: true,
     },
 });
 
-const isLoading = ref(false);
-const hasChanges = ref(false);
-const formData = computed(() => state.get($props.model));
-const originalData = ref();
-const formUrl = computed(() => $props.url);
-const stActionsExist = ref(false);
-
 const emit = defineEmits(['onFetch']);
 
 defineExpose({
     save,
-    insert,
-    remove,
-    onSubmit,
-    reset,
-    hasChanges,
 });
 
-onMounted(async () => {
-    await fetch();
-    stActionsExist.value = !!document.querySelector('#st-actions');
-});
+onMounted(async () => await fetch());
 
 onUnmounted(() => {
     state.unset($props.model);
 });
 
+const isLoading = ref(false);
+const hasChanges = ref(false);
+const originalData = ref();
+const formData = computed(() => state.get($props.model));
+const formUrl = computed(() => $props.url);
+
+function tMobile(...args) {
+    if (!quasar.platform.is.mobile) return t(...args);
+}
+
 async function fetch() {
     const { data } = await axios.get($props.url, {
         params: { filter: $props.filter },
     });
 
-    if (Array.isArray(data)) {
-        let $index = 0;
-        data.map((d) => (d.$index = $index++));
-    }
-
     state.set($props.model, data);
-    originalData.value = JSON.parse(JSON.stringify(data));
+    originalData.value = Object.assign({}, data);
 
     watch(formData.value, () => (hasChanges.value = true));
 
@@ -100,29 +80,24 @@ async function save() {
         });
     }
     isLoading.value = true;
-    try {
-        await axios.patch($props.urlUpdate || $props.url, formData.value);
-    } catch {
-        return (isLoading.value = false);
-    }
+    await axios.patch($props.urlUpdate || $props.url, formData.value);
 
-    originalData.value = JSON.parse(JSON.stringify(formData.value));
+    originalData.value = formData.value;
     hasChanges.value = false;
     isLoading.value = false;
 }
 
 function reset() {
     state.set($props.model, originalData.value);
-    watch(formData.value, () => (hasChanges.value = true));
     hasChanges.value = false;
 }
 // eslint-disable-next-line vue/no-dupe-keys
 function filter(value, update, filterOptions) {
     update(
         () => {
-            const { options, filterFn, field } = filterOptions;
+            const { options, filterFn } = filterOptions;
 
-            options.value = filterFn(options, value, field);
+            options.value = filterFn(options, value);
         },
         (ref) => {
             ref.setOptionIndex(-1);
@@ -131,167 +106,42 @@ function filter(value, update, filterOptions) {
     );
 }
 
-async function crudSave() {
-    if (!hasChanges.value) {
-        return quasar.notify({
-            type: 'negative',
-            message: t('globals.noChanges'),
-        });
-    }
-    isLoading.value = true;
-    await saveChanges();
-}
-
-async function saveChanges() {
-    const changes = getChanges();
-    try {
-        await axios.post($props.urlUpdate || $props.url + '/crud', changes);
-    } catch (e) {
-        return (isLoading.value = false);
-    }
-
-    originalData.value = JSON.parse(JSON.stringify(formData.value));
-    hasChanges.value = false;
-    isLoading.value = false;
-    if (changes.creates?.length) await fetch();
-}
-
-async function insert() {
-    const $index = formData.value[formData.value.length - 1].$index + 1;
-    formData.value.push(Object.assign({ $index }, $props.dataRequired));
-    hasChanges.value = true;
-}
-
-// function addRemove(ids) {
-//     for (let id of ids) {
-//         const index = removed.value.indexOf(id);
-//         if (index > -1) {
-//             removed.value = removed.value.slice(index, 1);
-//             continue;
-//         }
-//         removed.value.push(id);
-//     }
-// }
-
-async function remove(data) {
-    if (!data.length)
-        return quasar.notify({
-            type: 'warning',
-            message: t('globals.noChanges'),
-        });
-
-    const pk = $props.primaryKey;
-    let ids = data.map((d) => d[pk]).filter(Boolean);
-    let preRemove = data.map((d) => d.$index).filter(Boolean);
-    let newData = formData.value;
-
-    // addRemove(ids);
-    if (preRemove.length) {
-        newData = newData.filter(
-            (form) => !preRemove.some((index) => index == form.$index)
-        );
-        state.set($props.model, newData);
-        const changes = getChanges();
-        if (!changes.creates?.length && !changes.updates?.length)
-            hasChanges.value = false;
-    }
-    if (ids.length) {
-        await saveChanges({ deletes: ids });
-        newData = newData.filter((form) => !ids.some((id) => id == form[pk]));
-        state.set($props.model, newData);
-    }
-}
-
-async function onSubmit() {
-    if ($props.crud) return crudSave();
-    return save();
-}
-
 watch(formUrl, async () => {
     originalData.value = null;
     reset();
     fetch();
 });
-
-function getChanges() {
-    const updates = [];
-    const creates = [];
-
-    const pk = $props.primaryKey;
-
-    for (const [i, row] of formData.value.entries()) {
-        if (!row[pk]) {
-            creates.push(row);
-        } else if (originalData.value) {
-            const data = getDifferences(originalData.value[i], row);
-            if (!isEmpty(data)) {
-                updates.push({
-                    data,
-                    where: { [pk]: row[pk] },
-                });
-            }
-        }
-    }
-    const changes = { updates, creates };
-
-    for (let prop in changes) {
-        if (changes[prop].length === 0) changes[prop] = undefined;
-    }
-
-    return changes;
-}
-
-function getDifferences(obj1, obj2) {
-    let diff = {};
-    for (let key in obj1) {
-        if (obj2[key] && obj1[key] !== obj2[key]) {
-            diff[key] = obj2[key];
-        }
-    }
-    for (let key in obj2) {
-        if (obj1[key] === undefined && obj2[key]) {
-            diff[key] = obj2[key];
-        }
-    }
-    return diff;
-}
-
-function isEmpty(obj) {
-    if (obj == null) return true;
-    if (obj === undefined) return true;
-    if (Object.keys(obj).length === 0) return true;
-
-    if (obj.length > 0) return false;
-}
 </script>
 <template>
     <QBanner v-if="hasChanges" class="text-white bg-warning">
         <QIcon name="warning" size="md" class="q-mr-md" />
         <span>{{ t('globals.changesToSave') }}</span>
     </QBanner>
-    <QForm v-if="formData" @submit="onSubmit" @reset="reset" class="q-pa-md">
+    <QForm v-if="formData" @submit="save" @reset="reset" class="q-pa-md">
         <slot name="form" :data="formData" :validate="validate" :filter="filter"></slot>
     </QForm>
-    <Teleport to="#st-actions" v-if="stActionsExist">
-        <div class="row q-gutter-x-sm">
-            <slot name="moreActions" />
-            <div v-if="$props.defaultActions">
+    <Teleport to="#st-actions" v-if="stateStore.isSubToolbarShown()">
+        <div v-if="$props.defaultActions">
+            <QBtnGoup push class="q-gutter-x-sm">
+                <slot name="moreActions" />
                 <QBtn
-                    :label="t('globals.save')"
+                    :label="tMobile('globals.reset')"
                     color="primary"
-                    icon="save"
-                    @click="onSubmit"
-                    :disable="!hasChanges"
-                />
-                <QBtn
-                    :label="t('globals.reset')"
-                    color="primary"
-                    class="q-ml-sm"
+                    icon="restart_alt"
                     flat
                     @click="reset"
                     :disable="!hasChanges"
+                    :title="t('globals.reset')"
                 />
-            </div>
+                <QBtn
+                    :label="tMobile('globals.save')"
+                    color="primary"
+                    icon="save"
+                    @click="save"
+                    :disable="!hasChanges"
+                    :title="t('globals.save')"
+                />
+            </QBtnGoup>
         </div>
     </Teleport>
     <SkeletonForm v-if="!formData" />
diff --git a/src/components/ui/SkeletonTable.vue b/src/components/ui/SkeletonTable.vue
new file mode 100644
index 000000000..d58253f90
--- /dev/null
+++ b/src/components/ui/SkeletonTable.vue
@@ -0,0 +1,50 @@
+<template>
+    <div class="q-pa-md w">
+        <div class="row q-gutter-md q-mb-md">
+            <div class="col-1">
+                <QSkeleton type="rect" square />
+            </div>
+            <div class="col">
+                <QSkeleton type="rect" square />
+            </div>
+            <div class="col">
+                <QSkeleton type="rect" square />
+            </div>
+            <div class="col">
+                <QSkeleton type="rect" square />
+            </div>
+            <div class="col">
+                <QSkeleton type="rect" square />
+            </div>
+            <div class="col">
+                <QSkeleton type="rect" square />
+            </div>
+        </div>
+
+        <div class="row q-gutter-md q-mb-md" v-for="n in 5" :key="n">
+            <div class="col-1">
+                <QSkeleton type="QInput" square />
+            </div>
+            <div class="col">
+                <QSkeleton type="QInput" square />
+            </div>
+            <div class="col">
+                <QSkeleton type="QInput" square />
+            </div>
+            <div class="col">
+                <QSkeleton type="QInput" square />
+            </div>
+            <div class="col">
+                <QSkeleton type="QInput" square />
+            </div>
+            <div class="col">
+                <QSkeleton type="QInput" square />
+            </div>
+        </div>
+    </div>
+</template>
+<style lang="scss" scoped>
+.w {
+    width: 80vw;
+}
+</style>
diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue
index 2a5b878f5..9c8cd6223 100644
--- a/src/components/ui/VnPaginate.vue
+++ b/src/components/ui/VnPaginate.vue
@@ -46,6 +46,10 @@ const props = defineProps({
         type: Number,
         default: 500,
     },
+    skeleton: {
+        type: Boolean,
+        default: true,
+    },
 });
 
 const emit = defineEmits(['onFetch', 'onPaginate']);
@@ -144,7 +148,10 @@ async function onLoad(...params) {
                 {{ t('No results found') }}
             </h5>
         </div>
-        <div v-if="props.autoLoad && !store.data" class="card-list q-gutter-y-md">
+        <div
+            v-if="props.skeleton && props.autoLoad && !store.data"
+            class="card-list q-gutter-y-md"
+        >
             <QCard class="card" v-for="$index in $props.limit" :key="$index">
                 <QItem v-ripple class="q-pa-none items-start cursor-pointer q-hoverable">
                     <QItemSection class="q-pa-md">
diff --git a/src/css/app.scss b/src/css/app.scss
index 466219906..1f12fb1cc 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -35,4 +35,19 @@ body.body--light {
             color: white;
         }
     }
+    --vn-text: #000000;
+    --vn-gray: #dddddd;
+    --vn-label: #5f5f5f;
+    --vn-dark: white;
+}
+
+body.body--dark {
+    --vn-text: #ffffff;
+    --vn-gray: #313131;
+    --vn-label: #a8a8a8;
+    --vn-dark: #292929;
+}
+
+.bg-vn-dark {
+    background-color: var(--vn-dark);
 }
diff --git a/src/pages/Claim/Card/ClaimCard.vue b/src/pages/Claim/Card/ClaimCard.vue
index 141b6e258..142657ba5 100644
--- a/src/pages/Claim/Card/ClaimCard.vue
+++ b/src/pages/Claim/Card/ClaimCard.vue
@@ -29,6 +29,7 @@ const claimSections = [
 let salixUrl;
 onMounted(async () => {
     salixUrl = await getUrl(`claim/${entityId.value}`);
+    stateStore.setSubtoolbar();
 });
 </script>
 <template>
@@ -64,10 +65,8 @@ onMounted(async () => {
         </QScrollArea>
     </QDrawer>
     <QPageContainer>
-        <QToolbar id="sub-toolbar" class="bg-dark text-white justify-end">
-            <div id="st-data">
-                {{ route.meta?.title && t(`claim.pageTitles.${route.meta.title}`) }}
-            </div>
+        <QToolbar class="bg-vn-dark justify-end">
+            <div id="st-data"></div>
             <QSpace />
             <div id="st-actions"></div>
         </QToolbar>
diff --git a/src/pages/Claim/Card/ClaimDevelopment.vue b/src/pages/Claim/Card/ClaimDevelopment.vue
index da297cd81..764b64def 100644
--- a/src/pages/Claim/Card/ClaimDevelopment.vue
+++ b/src/pages/Claim/Card/ClaimDevelopment.vue
@@ -1,8 +1,8 @@
 <script setup>
-import { ref, computed, onMounted } from 'vue';
+import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
-import FormModel from 'components/FormModel.vue';
+import CrudModel from 'components/CrudModel.vue';
 import FetchData from 'components/FetchData.vue';
 import VnSelectFilter from 'components/common/VnSelectFilter.vue';
 
@@ -122,27 +122,20 @@ const columns = computed(() => [
     />
     <div class="column items-center">
         <div class="list">
-            <FormModel
+            <CrudModel
+                data-key="ClaimDevelopments"
                 url="ClaimDevelopments"
-                :crud="true"
-                :filter="developmentsFilter"
                 model="claimDevelopment"
+                :filter="developmentsFilter"
                 ref="claimDevelopmentForm"
                 :data-required="{ claimFk: route.params.id }"
+                v-model:selected="selected"
+                auto-load
             >
-                <template #moreActions>
-                    <QBtn
-                        :label="t('globals.remove')"
-                        color="primary"
-                        icon="delete"
-                        @click="claimDevelopmentForm.remove(selected)"
-                        :disable="!selected.length"
-                    />
-                </template>
-                <template #form="{ data }">
+                <template #body="{ rows }">
                     <QTable
                         :columns="columns"
-                        :rows="data"
+                        :rows="rows"
                         :pagination="{ rowsPerPage: 0 }"
                         row-key="$index"
                         selection="multiple"
@@ -187,7 +180,7 @@ const columns = computed(() => [
                         </template>
                     </QTable>
                 </template>
-            </FormModel>
+            </CrudModel>
         </div>
     </div>
     <QPageSticky position="bottom-right" :offset="[25, 25]">
diff --git a/src/pages/Claim/Card/ClaimLines.vue b/src/pages/Claim/Card/ClaimLines.vue
index 9d2a12804..ecd56df49 100644
--- a/src/pages/Claim/Card/ClaimLines.vue
+++ b/src/pages/Claim/Card/ClaimLines.vue
@@ -6,7 +6,7 @@ import { useQuasar } from 'quasar';
 import { useRoute } from 'vue-router';
 import { useArrayData } from 'composables/useArrayData';
 import { useStateStore } from 'stores/useStateStore';
-import VnPaginate from 'components/ui/VnPaginate.vue';
+import CrudModel from 'components/CrudModel.vue';
 import FetchData from 'components/FetchData.vue';
 import VnConfirm from 'components/ui/VnConfirm.vue';
 
@@ -36,6 +36,7 @@ const linesFilter = {
     },
 };
 
+const claimLinesForm = ref();
 const claim = ref(null);
 async function onFetchClaim(data) {
     claim.value = data;
@@ -46,6 +47,7 @@ async function onFetchClaim(data) {
 const amount = ref(0);
 const amountClaimed = ref(0);
 async function onFetch(rows) {
+    if (!rows || rows.length) return;
     amount.value = rows.reduce(
         (acumulator, { sale }) => acumulator + sale.price * sale.quantity,
         0
@@ -141,47 +143,6 @@ function onUpdateDiscount(response) {
     });
 }
 
-async function confirmRemove() {
-    const rows = selected.value;
-    const count = rows.length;
-
-    if (count === 0) {
-        return quasar.notify({
-            message: 'You must select at least one row',
-            type: 'warning',
-        });
-    }
-
-    quasar
-        .dialog({
-            component: VnConfirm,
-            componentProps: {
-                title: t('Delete claimed sales'),
-                message: t('You are about to remove {count} rows', count, { count }),
-                data: { rows },
-                promise: remove,
-            },
-        })
-        .onOk(() => {
-            for (const row of rows) {
-                const orgData = store.data;
-                const index = orgData.findIndex((item) => item.id === row.id);
-                store.data.splice(index, 1);
-                selected.value = [];
-            }
-        });
-}
-
-async function remove({ rows }) {
-    if (!rows.length) return;
-    const body = { deletes: rows.map((row) => row.id) };
-    await axios.post(`ClaimBeginnings/crud`, body);
-    quasar.notify({
-        type: 'positive',
-        message: t('globals.rowRemoved'),
-    });
-}
-
 function showImportDialog() {
     quasar
         .dialog({
@@ -191,10 +152,8 @@ function showImportDialog() {
 }
 </script>
 <template>
-    <QPageSticky position="top" :offset="[0, 0]" expand>
+    <Teleport to="#st-data" v-if="stateStore.isSubToolbarShown()">
         <QToolbar class="bg-dark text-white">
-            <QToolbarTitle> {{ t('Claimed lines') }} </QToolbarTitle>
-            <QSpace />
             <div class="row q-gutter-md">
                 <div>
                     {{ t('Amount') }}
@@ -211,7 +170,7 @@ function showImportDialog() {
                 </div>
             </div>
         </QToolbar>
-    </QPageSticky>
+    </Teleport>
 
     <FetchData
         :url="`Claims/${route.params.id}`"
@@ -221,11 +180,16 @@ function showImportDialog() {
     />
     <div class="column items-center">
         <div class="list">
-            <VnPaginate
+            <CrudModel
                 data-key="ClaimLines"
+                ref="claimLinesForm"
                 :url="`Claims/${route.params.id}/lines`"
+                save-url="ClaimBeginnings/crud"
                 :filter="linesFilter"
                 @on-fetch="onFetch"
+                v-model:selected="selected"
+                :default-save="false"
+                :default-reset="false"
                 auto-load
             >
                 <template #body="{ rows }">
@@ -361,46 +325,12 @@ function showImportDialog() {
                         </template>
                     </QTable>
                 </template>
-            </VnPaginate>
+            </CrudModel>
         </div>
     </div>
 
-    <Teleport
-        v-if="stateStore.isHeaderMounted() && !$q.screen.lt.sm"
-        to="#actions-prepend"
-    >
-        <div class="row q-gutter-x-sm">
-            <QBtn
-                v-if="selected.length > 0"
-                @click="confirmRemove"
-                icon="delete"
-                color="primary"
-                flat
-                dense
-                rounded
-            >
-                <QTooltip bottom> {{ t('globals.remove') }} </QTooltip>
-            </QBtn>
-            <QBtn @click="showImportDialog" icon="add" color="primary" flat dense rounded>
-                <QTooltip bottom> {{ t('globals.add') }} </QTooltip>
-            </QBtn>
-            <QSeparator vertical />
-        </div>
-    </Teleport>
-    <!-- v-if="quasar.platform.is.mobile" -->
-    <QPageSticky v-if="$q.screen.lt.sm" position="bottom" :offset="[0, 0]" expand>
-        <QToolbar class="bg-primary text-white q-pa-none">
-            <QTabs class="full-width" align="justify" inline-label narrow-indicator>
-                <QTab @click="showImportDialog" icon="add" :label="t('globals.add')" />
-                <QSeparator vertical inset />
-                <QTab
-                    @click="confirmRemove"
-                    icon="delete"
-                    :label="t('globals.remove')"
-                    :disable="selected.length === 0"
-                />
-            </QTabs>
-        </QToolbar>
+    <QPageSticky position="bottom-right" :offset="[25, 25]">
+        <QBtn fab color="primary" icon="add" @click="showImportDialog()" />
     </QPageSticky>
 </template>
 
@@ -421,7 +351,6 @@ en:
         You are about to remove <strong>{count}</strong> row |
         You are about to remove  <strong>{count}</strong> rows'
 es:
-    Claimed lines: Líneas reclamadas
     Delivered: Entregado
     Quantity: Cantidad
     Claimed: Reclamada
diff --git a/src/stores/useStateStore.js b/src/stores/useStateStore.js
index 8704c46e4..cf259a767 100644
--- a/src/stores/useStateStore.js
+++ b/src/stores/useStateStore.js
@@ -5,6 +5,7 @@ export const useStateStore = defineStore('stateStore', () => {
     const isMounted = ref(false);
     const leftDrawer = ref(false);
     const rightDrawer = ref(false);
+    const subToolbar = ref(false);
 
     function toggleLeftDrawer() {
         leftDrawer.value = !leftDrawer.value;
@@ -18,6 +19,10 @@ export const useStateStore = defineStore('stateStore', () => {
         isMounted.value = true;
     }
 
+    function setSubtoolbar() {
+        subToolbar.value = true;
+    }
+
     function isHeaderMounted() {
         return isMounted.value;
     }
@@ -30,6 +35,10 @@ export const useStateStore = defineStore('stateStore', () => {
         return rightDrawer.value;
     }
 
+    function isSubToolbarShown() {
+        return subToolbar.value;
+    }
+
     return {
         leftDrawer,
         rightDrawer,
@@ -39,5 +48,7 @@ export const useStateStore = defineStore('stateStore', () => {
         toggleRightDrawer,
         isLeftDrawerShown,
         isRightDrawerShown,
+        setSubtoolbar,
+        isSubToolbarShown,
     };
 });
diff --git a/test/cypress/integration/claimDevelopment.spec.js b/test/cypress/integration/claimDevelopment.spec.js
new file mode 100755
index 000000000..ec41e92a3
--- /dev/null
+++ b/test/cypress/integration/claimDevelopment.spec.js
@@ -0,0 +1,55 @@
+/// <reference types="cypress" />
+describe('ClaimPhoto', () => {
+    beforeEach(() => {
+        const claimId = 1;
+        cy.login('developer');
+        cy.visit(`/#/claim/${claimId}/photos`);
+    });
+
+    it('should add new file', () => {
+        cy.get('label > .q-btn').click();
+        cy.get('label > .q-btn input').selectFile('test/cypress/fixtures/image.jpg', {
+            force: true,
+        });
+        cy.get('.q-notification__message').should('have.text', 'Data saved');
+    });
+
+    it('should add new file with drag and drop', () => {
+        cy.get('.container').selectFile('test/cypress/fixtures/image.jpg', {
+            action: 'drag-drop',
+        });
+        cy.get('.q-notification__message').should('have.text', 'Data saved');
+    });
+
+    it('should open first image dialog change to second and close', () => {
+        cy.get(
+            ':nth-child(1) > .q-card > .q-img > .q-img__container > .q-img__image'
+        ).click();
+        cy.get('.q-carousel__slide > .q-img > .q-img__container > .q-img__image').should(
+            'be.visible'
+        );
+
+        cy.get('.q-carousel__control > .q-btn > .q-btn__content > .q-icon').click();
+
+        cy.get(
+            '.q-dialog__inner > .q-toolbar > .q-btn > .q-btn__content > .q-icon'
+        ).click();
+        cy.get('.q-carousel__slide > .q-img > .q-img__container > .q-img__image').should(
+            'not.be.visible'
+        );
+    });
+
+    it('should remove third and fourth file', () => {
+        cy.get(
+            '.multimediaParent > :nth-child(3) > .q-btn > .q-btn__content > .q-icon'
+        ).click();
+        cy.get('.q-btn--unelevated > .q-btn__content > .block').click();
+        cy.get('.q-notification__message').should('have.text', 'Data deleted');
+
+        cy.get(
+            '.multimediaParent > :nth-child(3) > .q-btn > .q-btn__content > .q-icon'
+        ).click();
+        cy.get('.q-btn--unelevated > .q-btn__content > .block').click();
+        cy.get('.q-notification__message').should('have.text', 'Data deleted');
+    });
+});

From ee9319de117693417574f6e3441245bc546972d5 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 17 Aug 2023 15:32:56 +0200
Subject: [PATCH 11/26] refs #5673 test: add crudModel test

---
 .../components/common/CrudModel.spec.js       | 35 +++++++++++
 .../__tests__/pages/Claims/ClaimLines.spec.js | 61 +++++++------------
 2 files changed, 56 insertions(+), 40 deletions(-)
 create mode 100644 test/vitest/__tests__/components/common/CrudModel.spec.js

diff --git a/test/vitest/__tests__/components/common/CrudModel.spec.js b/test/vitest/__tests__/components/common/CrudModel.spec.js
new file mode 100644
index 000000000..6547437ca
--- /dev/null
+++ b/test/vitest/__tests__/components/common/CrudModel.spec.js
@@ -0,0 +1,35 @@
+import { createWrapper } from 'app/test/vitest/helper';
+import CrudModel from 'components/CrudModel.vue';
+import { vi, afterEach, beforeAll, describe, expect, it } from 'vitest';
+
+describe.only('CrudModel', () => {
+    let vm;
+    beforeAll(() => {
+        vm = createWrapper(CrudModel, {
+            global: {
+                stubs: ['VnPaginate', 'useState'],
+            },
+            propsData: {
+                dataRequired: {
+                    id: 1,
+                    name: 'name',
+                    autoLoad: true,
+                },
+            },
+        }).vm;
+    });
+
+    afterEach(() => {
+        vi.clearAllMocks();
+    });
+
+    describe('insert()', () => {
+        it('should new element in list', () => {
+            vm.insert();
+
+            expect(vm.message).toEqual(
+                `A minimum amount of 50€ (VAT excluded) is required for your order ${orderId} of ${shipped} to receive it without additional shipping costs.`
+            );
+        });
+    });
+});
diff --git a/test/vitest/__tests__/pages/Claims/ClaimLines.spec.js b/test/vitest/__tests__/pages/Claims/ClaimLines.spec.js
index dda59a98d..6dd6b89e6 100644
--- a/test/vitest/__tests__/pages/Claims/ClaimLines.spec.js
+++ b/test/vitest/__tests__/pages/Claims/ClaimLines.spec.js
@@ -5,7 +5,6 @@ import ClaimLines from 'pages/Claim/Card/ClaimLines.vue';
 describe('ClaimLines', () => {
     let vm;
 
-
     beforeAll(() => {
         vm = createWrapper(ClaimLines, {
             global: {
@@ -13,25 +12,26 @@ describe('ClaimLines', () => {
                 mocks: {
                     fetch: vi.fn(),
                 },
-            }
+            },
         }).vm;
     });
 
     beforeEach(() => {
         vm.claim = {
             id: 1,
-            ticketFk: 1
-        }
+            ticketFk: 1,
+        };
         vm.store.data = [
             {
                 id: 1,
                 quantity: 10,
                 sale: {
-                    id: 1, discount: 0
-                }
-            }
-        ]
-    })
+                    id: 1,
+                    discount: 0,
+                },
+            },
+        ];
+    });
 
     afterEach(() => {
         vi.clearAllMocks();
@@ -42,13 +42,17 @@ describe('ClaimLines', () => {
             vi.spyOn(axios, 'post').mockResolvedValue({ data: true });
             vi.spyOn(vm.quasar, 'notify');
 
-            const canceller = new AbortController()
+            const canceller = new AbortController();
             await vm.updateDiscount({ saleFk: 1, discount: 5, canceller });
 
-            const expectedData = { salesIds: [1], newDiscount: 5 }
-            expect(axios.post).toHaveBeenCalledWith('Tickets/1/updateDiscount', expectedData, {
-                signal: canceller.signal
-            })
+            const expectedData = { salesIds: [1], newDiscount: 5 };
+            expect(axios.post).toHaveBeenCalledWith(
+                'Tickets/1/updateDiscount',
+                expectedData,
+                {
+                    signal: canceller.signal,
+                }
+            );
         });
     });
 
@@ -56,37 +60,14 @@ describe('ClaimLines', () => {
         it('should make a POST request and then set the discount on the original row', async () => {
             vi.spyOn(vm.quasar, 'notify');
 
-
             vm.onUpdateDiscount({ discount: 5, rowIndex: 0 });
-            const firstRow = vm.store.data[0]
+            const firstRow = vm.store.data[0];
 
-            expect(firstRow.sale.discount).toEqual(5)
+            expect(firstRow.sale.discount).toEqual(5);
             expect(vm.quasar.notify).toHaveBeenCalledWith(
                 expect.objectContaining({
                     message: 'Discount updated',
-                    type: 'positive'
-                })
-            );
-        });
-    });
-
-    describe('remove()', () => {
-        it('should make a POST request and then call to the quasar notify() method', async () => {
-            vi.spyOn(axios, 'post').mockResolvedValue({ data: true });
-            vi.spyOn(vm.quasar, 'notify');
-
-            await vm.remove({
-                rows: [
-                    { id: 1 }
-                ]
-            });
-            const expectedData = { deletes: [1] }
-
-            expect(axios.post).toHaveBeenCalledWith('ClaimBeginnings/crud', expectedData)
-            expect(vm.quasar.notify).toHaveBeenCalledWith(
-                expect.objectContaining({
-                    message: 'Row removed',
-                    type: 'positive'
+                    type: 'positive',
                 })
             );
         });

From 98552bcd9e0f4f03480a66efe17a79dcf971b03b Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 21 Aug 2023 15:14:19 +0200
Subject: [PATCH 12/26] refs #5673 test(CrudModel): front and e2e

---
 .eslintrc.js                                  |   2 +-
 cypress/fixtures/example.json                 |   5 +
 cypress/support/commands.js                   |  25 ++++
 src/components/CrudModel.vue                  |   4 +-
 src/components/FormModel.vue                  |   7 +-
 src/pages/Claim/Card/ClaimCard.vue            |  15 ++-
 src/stores/useStateStore.js                   |  11 +-
 .../integration/claimDevelopment.spec.js      | 108 +++++++++++-------
 test/cypress/support/commands.js              |  67 +++++++++++
 .../components/common/CrudModel.spec.js       |  40 +++++--
 test/vitest/helper.js                         |   5 +
 11 files changed, 218 insertions(+), 71 deletions(-)
 create mode 100644 cypress/fixtures/example.json
 create mode 100644 cypress/support/commands.js

diff --git a/.eslintrc.js b/.eslintrc.js
index 09dc09c1e..c8bdecb1a 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -64,7 +64,7 @@ module.exports = {
     },
     overrides: [
         {
-            files: ['test/cypress/**/*.spec.{js,ts}'],
+            files: ['test/cypress/**/*.*'],
             extends: [
                 // Add Cypress-specific lint rules, globals and Cypress plugin
                 // See https://github.com/cypress-io/eslint-plugin-cypress#rules
diff --git a/cypress/fixtures/example.json b/cypress/fixtures/example.json
new file mode 100644
index 000000000..02e425437
--- /dev/null
+++ b/cypress/fixtures/example.json
@@ -0,0 +1,5 @@
+{
+  "name": "Using fixtures to represent data",
+  "email": "hello@cypress.io",
+  "body": "Fixtures are a great way to mock data for responses to routes"
+}
diff --git a/cypress/support/commands.js b/cypress/support/commands.js
new file mode 100644
index 000000000..66ea16ef0
--- /dev/null
+++ b/cypress/support/commands.js
@@ -0,0 +1,25 @@
+// ***********************************************
+// This example commands.js shows you how to
+// create various custom commands and overwrite
+// existing commands.
+//
+// For more comprehensive examples of custom
+// commands please read more here:
+// https://on.cypress.io/custom-commands
+// ***********************************************
+//
+//
+// -- This is a parent command --
+// Cypress.Commands.add('login', (email, password) => { ... })
+//
+//
+// -- This is a child command --
+// Cypress.Commands.add('drag', { prevSubject: 'element'}, (subject, options) => { ... })
+//
+//
+// -- This is a dual command --
+// Cypress.Commands.add('dismiss', { prevSubject: 'optional'}, (subject, options) => { ... })
+//
+//
+// -- This will overwrite an existing command --
+// Cypress.Commands.overwrite('visit', (originalFn, url, options) => { ... })
\ No newline at end of file
diff --git a/src/components/CrudModel.vue b/src/components/CrudModel.vue
index 6b8c577a0..280282ffd 100644
--- a/src/components/CrudModel.vue
+++ b/src/components/CrudModel.vue
@@ -285,8 +285,8 @@ function isEmpty(obj) {
         </template>
     </VnPaginate>
     <SkeletonTable v-if="!formData" />
-    <Teleport to="#st-actions" v-if="stateStore.isSubToolbarShown()">
-        <QBtnGroup push class="q-gutter-x-sm">
+    <Teleport to="#st-actions" v-if="stateStore?.isSubToolbarShown()">
+        <QBtnGroup push flat class="q-gutter-x-sm">
             <slot name="moreActions" />
             <QBtn
                 :label="tMobile('globals.remove')"
diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index 3c05333f5..28a3759b8 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -65,7 +65,7 @@ async function fetch() {
     });
 
     state.set($props.model, data);
-    originalData.value = Object.assign({}, data);
+    originalData.value = data && JSON.parse(JSON.stringify(data));
 
     watch(formData.value, () => (hasChanges.value = true));
 
@@ -82,13 +82,14 @@ async function save() {
     isLoading.value = true;
     await axios.patch($props.urlUpdate || $props.url, formData.value);
 
-    originalData.value = formData.value;
+    originalData.value = JSON.parse(JSON.stringify(formData.value));
     hasChanges.value = false;
     isLoading.value = false;
 }
 
 function reset() {
     state.set($props.model, originalData.value);
+    watch(formData.value, () => (hasChanges.value = true));
     hasChanges.value = false;
 }
 // eslint-disable-next-line vue/no-dupe-keys
@@ -120,7 +121,7 @@ watch(formUrl, async () => {
     <QForm v-if="formData" @submit="save" @reset="reset" class="q-pa-md">
         <slot name="form" :data="formData" :validate="validate" :filter="filter"></slot>
     </QForm>
-    <Teleport to="#st-actions" v-if="stateStore.isSubToolbarShown()">
+    <Teleport to="#st-actions" v-if="stateStore?.isSubToolbarShown()">
         <div v-if="$props.defaultActions">
             <QBtnGoup push class="q-gutter-x-sm">
                 <slot name="moreActions" />
diff --git a/src/pages/Claim/Card/ClaimCard.vue b/src/pages/Claim/Card/ClaimCard.vue
index 142657ba5..d52b918e1 100644
--- a/src/pages/Claim/Card/ClaimCard.vue
+++ b/src/pages/Claim/Card/ClaimCard.vue
@@ -29,7 +29,6 @@ const claimSections = [
 let salixUrl;
 onMounted(async () => {
     salixUrl = await getUrl(`claim/${entityId.value}`);
-    stateStore.setSubtoolbar();
 });
 </script>
 <template>
@@ -65,13 +64,13 @@ onMounted(async () => {
         </QScrollArea>
     </QDrawer>
     <QPageContainer>
-        <QToolbar class="bg-vn-dark justify-end">
-            <div id="st-data"></div>
-            <QSpace />
-            <div id="st-actions"></div>
-        </QToolbar>
-        <QPage class="q-pa-md">
-            <RouterView></RouterView>
+        <QPage>
+            <QToolbar class="bg-vn-dark justify-end">
+                <div id="st-data"></div>
+                <QSpace />
+                <div id="st-actions"></div>
+            </QToolbar>
+            <div class="q-pa-md"><RouterView></RouterView></div>
         </QPage>
     </QPageContainer>
 </template>
diff --git a/src/stores/useStateStore.js b/src/stores/useStateStore.js
index cf259a767..74b65e71f 100644
--- a/src/stores/useStateStore.js
+++ b/src/stores/useStateStore.js
@@ -5,7 +5,6 @@ export const useStateStore = defineStore('stateStore', () => {
     const isMounted = ref(false);
     const leftDrawer = ref(false);
     const rightDrawer = ref(false);
-    const subToolbar = ref(false);
 
     function toggleLeftDrawer() {
         leftDrawer.value = !leftDrawer.value;
@@ -19,10 +18,6 @@ export const useStateStore = defineStore('stateStore', () => {
         isMounted.value = true;
     }
 
-    function setSubtoolbar() {
-        subToolbar.value = true;
-    }
-
     function isHeaderMounted() {
         return isMounted.value;
     }
@@ -36,7 +31,10 @@ export const useStateStore = defineStore('stateStore', () => {
     }
 
     function isSubToolbarShown() {
-        return subToolbar.value;
+        return (
+            !!document.querySelector('#st-data') &&
+            !!document.querySelector('#st-actions')
+        );
     }
 
     return {
@@ -48,7 +46,6 @@ export const useStateStore = defineStore('stateStore', () => {
         toggleRightDrawer,
         isLeftDrawerShown,
         isRightDrawerShown,
-        setSubtoolbar,
         isSubToolbarShown,
     };
 });
diff --git a/test/cypress/integration/claimDevelopment.spec.js b/test/cypress/integration/claimDevelopment.spec.js
index ec41e92a3..f05710eea 100755
--- a/test/cypress/integration/claimDevelopment.spec.js
+++ b/test/cypress/integration/claimDevelopment.spec.js
@@ -1,55 +1,77 @@
 /// <reference types="cypress" />
-describe('ClaimPhoto', () => {
+describe('ClaimDevelopment', () => {
+    const claimId = 1;
+
     beforeEach(() => {
-        const claimId = 1;
+        cy.viewport(1920, 1080);
         cy.login('developer');
-        cy.visit(`/#/claim/${claimId}/photos`);
+        cy.visit(`/#/claim/${claimId}/development`);
     });
 
-    it('should add new file', () => {
-        cy.get('label > .q-btn').click();
-        cy.get('label > .q-btn input').selectFile('test/cypress/fixtures/image.jpg', {
-            force: true,
-        });
-        cy.get('.q-notification__message').should('have.text', 'Data saved');
-    });
-
-    it('should add new file with drag and drop', () => {
-        cy.get('.container').selectFile('test/cypress/fixtures/image.jpg', {
-            action: 'drag-drop',
-        });
-        cy.get('.q-notification__message').should('have.text', 'Data saved');
-    });
-
-    it('should open first image dialog change to second and close', () => {
+    it('should reset line', () => {
+        cy.get('tbody > :nth-child(1) > :nth-child(2)').click();
+        cy.selectOption('Novato');
+        cy.get('[title="Reset"]').click();
         cy.get(
-            ':nth-child(1) > .q-card > .q-img > .q-img__container > .q-img__image'
-        ).click();
-        cy.get('.q-carousel__slide > .q-img > .q-img__container > .q-img__image').should(
-            'be.visible'
-        );
-
-        cy.get('.q-carousel__control > .q-btn > .q-btn__content > .q-icon').click();
-
-        cy.get(
-            '.q-dialog__inner > .q-toolbar > .q-btn > .q-btn__content > .q-icon'
-        ).click();
-        cy.get('.q-carousel__slide > .q-img > .q-img__container > .q-img__image').should(
-            'not.be.visible'
-        );
+            ':nth-child(1) > :nth-child(2) > .q-field > .q-field__inner > .q-field__control > .q-field__control-container > .q-field__native > span'
+        ).should('have.text', 'Prisas');
     });
 
-    it('should remove third and fourth file', () => {
-        cy.get(
-            '.multimediaParent > :nth-child(3) > .q-btn > .q-btn__content > .q-icon'
-        ).click();
-        cy.get('.q-btn--unelevated > .q-btn__content > .block').click();
-        cy.get('.q-notification__message').should('have.text', 'Data deleted');
+    it('should edit line', () => {
+        cy.get('tbody > :nth-child(1) > :nth-child(2)').click();
+        cy.selectOption('Novato');
+        cy.get('[title="Save"]').click();
 
+        cy.visit(`/#/claim/${claimId}/development`);
         cy.get(
-            '.multimediaParent > :nth-child(3) > .q-btn > .q-btn__content > .q-icon'
-        ).click();
-        cy.get('.q-btn--unelevated > .q-btn__content > .block').click();
-        cy.get('.q-notification__message').should('have.text', 'Data deleted');
+            ':nth-child(1) > :nth-child(2) > .q-field > .q-field__inner > .q-field__control > .q-field__control-container > .q-field__native > span'
+        ).should('have.text', 'Novato');
+
+        //Restart data
+        cy.get('tbody > :nth-child(1) > :nth-child(2)');
+        cy.selectOption('Prisas');
+        cy.get('[title="Save"]').click();
     });
+
+    it('should add new line', () => {
+        //check third if row exist
+        cy.get('.q-page-sticky > div > .q-btn').click();
+        cy.get('tbody > :nth-child(3)').should('exist');
+
+        //fill in data
+        const rowData = ['', '', ''];
+        cy.fillTableRow(3, rowData);
+    });
+
+    // it('should remove last line', () => {
+    //     cy.get(
+    //         ':nth-child(1) > .q-card > .q-img > .q-img__container > .q-img__image'
+    //     ).click();
+    //     cy.get('.q-carousel__slide > .q-img > .q-img__container > .q-img__image').should(
+    //         'be.visible'
+    //     );
+
+    //     cy.get('.q-carousel__control > .q-btn > .q-btn__content > .q-icon').click();
+
+    //     cy.get(
+    //         '.q-dialog__inner > .q-toolbar > .q-btn > .q-btn__content > .q-icon'
+    //     ).click();
+    //     cy.get('.q-carousel__slide > .q-img > .q-img__container > .q-img__image').should(
+    //         'not.be.visible'
+    //     );
+    // });
+
+    // it('should remove third and fourth file', () => {
+    //     cy.get(
+    //         '.multimediaParent > :nth-child(3) > .q-btn > .q-btn__content > .q-icon'
+    //     ).click();
+    //     cy.get('.q-btn--unelevated > .q-btn__content > .block').click();
+    //     cy.get('.q-notification__message').should('have.text', 'Data deleted');
+
+    //     cy.get(
+    //         '.multimediaParent > :nth-child(3) > .q-btn > .q-btn__content > .q-icon'
+    //     ).click();
+    //     cy.get('.q-btn--unelevated > .q-btn__content > .block').click();
+    //     cy.get('.q-notification__message').should('have.text', 'Data deleted');
+    // });
 });
diff --git a/test/cypress/support/commands.js b/test/cypress/support/commands.js
index a3a61c423..eca5f6c8c 100755
--- a/test/cypress/support/commands.js
+++ b/test/cypress/support/commands.js
@@ -40,4 +40,71 @@ Cypress.Commands.add('login', (user) => {
         window.localStorage.setItem('token', response.body.token);
     });
 });
+
+Cypress.Commands.add('selectOption', (option) => {
+    //cy.visit('/#/login');
+    cy.get('.q-item__label').then(() => {
+        cy.contains('.q-item__label', option).click();
+    });
+});
+
+// Cypress.Commands.add('fillRow', (row, options) => {
+//     //cy.visit('/#/login');
+//     for (let [i, option] of options.entries()) {
+//         i++;
+//         console.log(i);
+//         const selector = `tbody > :nth-child(${row}) > :nth-child(${i})`;
+//         if (cy.get(selector).should('have.class', 'q-select'))
+//             cy.selectOption(selector, option);
+//     }
+// });
+Cypress.Commands.add('fillTableRow', (rowNumber, data) => {
+    // Obtener todas las filas de la tabla
+    cy.get('table tbody tr').eq(rowNumber).as('currentRow');
+
+    // Iterar sobre cada dato en el array 'data'
+    data.forEach((value, index) => {
+        // Basándonos en el índice, encontramos la celda correspondiente y verificamos el tipo de input
+        cy.get('@currentRow')
+            .find('td')
+            .eq(index)
+            .find('input')
+            .invoke('attr', 'type')
+            .then((type) => {
+                switch (type) {
+                    case 'text':
+                        cy.get('@currentRow')
+                            .find('td')
+                            .eq(index)
+                            .find('input[type="text"]')
+                            .clear()
+                            .type(value);
+                        break;
+
+                    case 'checkbox':
+                        if (value) {
+                            // Puede adaptar esto según cómo represente los valores booleanos en su array 'data'
+                            cy.get('@currentRow')
+                                .find('td')
+                                .eq(index)
+                                .find('input[type="checkbox"]')
+                                .check();
+                        } else {
+                            cy.get('@currentRow')
+                                .find('td')
+                                .eq(index)
+                                .find('input[type="checkbox"]')
+                                .uncheck();
+                        }
+                        break;
+
+                    // ... Puede agregar más casos para otros tipos de inputs según sea necesario
+
+                    default:
+                        // Manejar cualquier otro tipo de input o agregar lógica de error aquí si es necesario
+                        break;
+                }
+            });
+    });
+});
 // registerCommands();
diff --git a/test/vitest/__tests__/components/common/CrudModel.spec.js b/test/vitest/__tests__/components/common/CrudModel.spec.js
index 6547437ca..518c3ad60 100644
--- a/test/vitest/__tests__/components/common/CrudModel.spec.js
+++ b/test/vitest/__tests__/components/common/CrudModel.spec.js
@@ -1,13 +1,16 @@
-import { createWrapper } from 'app/test/vitest/helper';
+import { createWrapper, axios } from 'app/test/vitest/helper';
 import CrudModel from 'components/CrudModel.vue';
-import { vi, afterEach, beforeAll, describe, expect, it } from 'vitest';
+import { vi, afterEach, beforeAll, beforeEach, describe, expect, it } from 'vitest';
 
 describe.only('CrudModel', () => {
     let vm;
     beforeAll(() => {
         vm = createWrapper(CrudModel, {
             global: {
-                stubs: ['VnPaginate', 'useState'],
+                stubs: ['vnPaginate', 'useState', 'arrayData', 'useStateStore'],
+                mocks: {
+                    fetch: vi.fn(),
+                },
             },
             propsData: {
                 dataRequired: {
@@ -15,6 +18,15 @@ describe.only('CrudModel', () => {
                     name: 'name',
                     autoLoad: true,
                 },
+                dataKey: 'crudModelKey',
+                model: 'crudModel',
+                url: 'crudModelUrl',
+            },
+            attrs: {
+                url: 'crudModelUrl',
+                dataKey: 'CustomerList',
+                order: 'id DESC',
+                limit: 3,
             },
         }).vm;
     });
@@ -24,12 +36,26 @@ describe.only('CrudModel', () => {
     });
 
     describe('insert()', () => {
-        it('should new element in list', () => {
+        it('should new element in list with index 0 if formData not has data', () => {
+            vi.mock('src/composables/useValidator', () => ({
+                default: () => {},
+                fetch: () => {
+                    vi.fn();
+                },
+            }));
+            vi.spyOn(axios, 'get').mockResolvedValue({
+                data: [
+                    { id: 1, name: 'Tony Stark' },
+                    { id: 2, name: 'Jessica Jones' },
+                    { id: 3, name: 'Bruce Wayne' },
+                ],
+            });
+            vm.state.set('crudModel', []);
             vm.insert();
 
-            expect(vm.message).toEqual(
-                `A minimum amount of 50€ (VAT excluded) is required for your order ${orderId} of ${shipped} to receive it without additional shipping costs.`
-            );
+            expect(vm.formData.length).toEqual(1);
+            expect(vm.formData[0].id).toEqual(1);
+            expect(vm.formData[0].$index).toEqual(0);
         });
     });
 });
diff --git a/test/vitest/helper.js b/test/vitest/helper.js
index 8a6fb1415..186f4ee3a 100644
--- a/test/vitest/helper.js
+++ b/test/vitest/helper.js
@@ -64,6 +64,10 @@ export function createWrapper(component, options) {
         global: {
             plugins: [i18n, pinia],
         },
+        mocks: {
+            t: (tKey) => tKey,
+            $t: (tKey) => tKey,
+        },
     };
 
     const mountOptions = Object.assign({}, defaultOptions);
@@ -75,6 +79,7 @@ export function createWrapper(component, options) {
             mountOptions.global.plugins = defaultOptions.global.plugins;
         }
     }
+    console.log(mountOptions);
 
     const wrapper = mount(component, mountOptions);
     const vm = wrapper.vm;

From 169e4863b2501d9d2af99c4d84354c1176769557 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 23 Aug 2023 15:09:03 +0200
Subject: [PATCH 13/26] refs #5673 fix: front, e2e, fix: VnSelectFilter

---
 src/components/CrudModel.vue                  |   7 +-
 src/components/common/VnSelectFilter.vue      |   5 +-
 src/components/ui/VnPaginate.vue              |   2 +-
 src/pages/Claim/Card/ClaimDevelopment.vue     | 123 ++++++++---------
 .../integration/claimDevelopment.spec.js      |  72 +++++-----
 test/cypress/support/commands.js              | 128 ++++++++++--------
 6 files changed, 172 insertions(+), 165 deletions(-)

diff --git a/src/components/CrudModel.vue b/src/components/CrudModel.vue
index 280282ffd..13e8ca3e3 100644
--- a/src/components/CrudModel.vue
+++ b/src/components/CrudModel.vue
@@ -261,10 +261,6 @@ function isEmpty(obj) {
 }
 </script>
 <template>
-    <QBanner v-if="hasChanges" class="text-white bg-warning">
-        <QIcon name="warning" size="md" class="q-mr-md" />
-        <span>{{ t('globals.changesToSave') }}</span>
-    </QBanner>
     <VnPaginate
         @submit="onSubmit"
         @reset="reset"
@@ -286,12 +282,13 @@ function isEmpty(obj) {
     </VnPaginate>
     <SkeletonTable v-if="!formData" />
     <Teleport to="#st-actions" v-if="stateStore?.isSubToolbarShown()">
-        <QBtnGroup push flat class="q-gutter-x-sm">
+        <QBtnGroup push class="q-gutter-x-sm">
             <slot name="moreActions" />
             <QBtn
                 :label="tMobile('globals.remove')"
                 color="primary"
                 icon="delete"
+                flat
                 @click="remove(selected)"
                 :disable="!selected?.length"
                 :title="t('globals.remove')"
diff --git a/src/components/common/VnSelectFilter.vue b/src/components/common/VnSelectFilter.vue
index 926b1b907..2fc8ce4ad 100644
--- a/src/components/common/VnSelectFilter.vue
+++ b/src/components/common/VnSelectFilter.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, toRefs } from 'vue';
+import { ref, toRefs, computed } from 'vue';
 const emit = defineEmits(['update:modelValue', 'update:options']);
 
 const $props = defineProps({
@@ -16,10 +16,9 @@ const $props = defineProps({
         default: '',
     },
 });
-
+const myOptions = computed(() => $props.options);
 const updateValue = (newValue) => emit('update:modelValue', newValue);
 const { modelValue, optionLabel, options } = toRefs($props);
-const myOptions = ref(JSON.parse(JSON.stringify(options.value)));
 const myOptionsOriginal = ref(JSON.parse(JSON.stringify(options.value)));
 
 const filter = (val, options) => {
diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue
index 9c8cd6223..d84e8f1af 100644
--- a/src/components/ui/VnPaginate.vue
+++ b/src/components/ui/VnPaginate.vue
@@ -171,7 +171,7 @@ async function onLoad(...params) {
             </QCard>
         </div>
     </div>
-    <QInfiniteScroll v-if="store.data" @load="onLoad" :offset="offset">
+    <QInfiniteScroll v-if="store.data" @load="onLoad" :offset="offset" class="full-width">
         <slot name="body" :rows="store.data"></slot>
         <div v-if="isLoading" class="info-row q-pa-md text-center">
             <QSpinner color="orange" size="md" />
diff --git a/src/pages/Claim/Card/ClaimDevelopment.vue b/src/pages/Claim/Card/ClaimDevelopment.vue
index 764b64def..b293fcc8b 100644
--- a/src/pages/Claim/Card/ClaimDevelopment.vue
+++ b/src/pages/Claim/Card/ClaimDevelopment.vue
@@ -121,67 +121,65 @@ const columns = computed(() => [
         auto-load
     />
     <div class="column items-center">
-        <div class="list">
-            <CrudModel
-                data-key="ClaimDevelopments"
-                url="ClaimDevelopments"
-                model="claimDevelopment"
-                :filter="developmentsFilter"
-                ref="claimDevelopmentForm"
-                :data-required="{ claimFk: route.params.id }"
-                v-model:selected="selected"
-                auto-load
-            >
-                <template #body="{ rows }">
-                    <QTable
-                        :columns="columns"
-                        :rows="rows"
-                        :pagination="{ rowsPerPage: 0 }"
-                        row-key="$index"
-                        selection="multiple"
-                        hide-pagination
-                        v-model:selected="selected"
-                        :grid="$q.screen.lt.md"
-                    >
-                        <template #body-cell="{ row, col }">
-                            <QTd auto-width>
-                                <VnSelectFilter
-                                    :label="col.label"
-                                    v-model="row[col.model]"
-                                    :options="col.options"
-                                    :option-value="col.optionValue"
-                                    :option-label="col.optionLabel"
-                                />
-                            </QTd>
-                        </template>
-                        <template #item="props">
-                            <div class="q-pa-xs col-xs-12 col-sm-6 grid-style-transition">
-                                <QCard bordered flat>
-                                    <QCardSection>
-                                        <QCheckbox v-model="props.selected" dense />
-                                    </QCardSection>
-                                    <QSeparator />
-                                    <QList dense>
-                                        <QItem v-for="col in props.cols" :key="col.name">
-                                            <QItemSection>
-                                                <VnSelectFilter
-                                                    :label="col.label"
-                                                    v-model="props.row[col.model]"
-                                                    :options="col.options"
-                                                    :option-value="col.optionValue"
-                                                    :option-label="col.optionLabel"
-                                                    dense
-                                                />
-                                            </QItemSection>
-                                        </QItem>
-                                    </QList>
-                                </QCard>
-                            </div>
-                        </template>
-                    </QTable>
-                </template>
-            </CrudModel>
-        </div>
+        <CrudModel
+            data-key="ClaimDevelopments"
+            url="ClaimDevelopments"
+            model="claimDevelopment"
+            :filter="developmentsFilter"
+            ref="claimDevelopmentForm"
+            :data-required="{ claimFk: route.params.id }"
+            v-model:selected="selected"
+            auto-load
+        >
+            <template #body="{ rows }">
+                <QTable
+                    :columns="columns"
+                    :rows="rows"
+                    :pagination="{ rowsPerPage: 0 }"
+                    row-key="$index"
+                    selection="multiple"
+                    hide-pagination
+                    v-model:selected="selected"
+                    :grid="$q.screen.lt.md"
+                >
+                    <template #body-cell="{ row, col }">
+                        <QTd auto-width>
+                            <VnSelectFilter
+                                :label="col.label"
+                                v-model="row[col.model]"
+                                :options="col.options"
+                                :option-value="col.optionValue"
+                                :option-label="col.optionLabel"
+                            />
+                        </QTd>
+                    </template>
+                    <template #item="props">
+                        <div class="q-pa-xs col-xs-12 col-sm-6 grid-style-transition">
+                            <QCard bordered flat>
+                                <QCardSection>
+                                    <QCheckbox v-model="props.selected" dense />
+                                </QCardSection>
+                                <QSeparator />
+                                <QList dense>
+                                    <QItem v-for="col in props.cols" :key="col.name">
+                                        <QItemSection>
+                                            <VnSelectFilter
+                                                :label="col.label"
+                                                v-model="props.row[col.model]"
+                                                :options="col.options"
+                                                :option-value="col.optionValue"
+                                                :option-label="col.optionLabel"
+                                                dense
+                                            />
+                                        </QItemSection>
+                                    </QItem>
+                                </QList>
+                            </QCard>
+                        </div>
+                    </template>
+                </QTable>
+            </template>
+        </CrudModel>
     </div>
     <QPageSticky position="bottom-right" :offset="[25, 25]">
         <QBtn fab color="primary" icon="add" @click="claimDevelopmentForm.insert()" />
@@ -192,6 +190,9 @@ const columns = computed(() => [
 .grid-style-transition {
     transition: transform 0.28s, background-color 0.28s;
 }
+.maxwidth {
+    width: 100%;
+}
 </style>
 
 <i18n>
diff --git a/test/cypress/integration/claimDevelopment.spec.js b/test/cypress/integration/claimDevelopment.spec.js
index f05710eea..8a882d0e6 100755
--- a/test/cypress/integration/claimDevelopment.spec.js
+++ b/test/cypress/integration/claimDevelopment.spec.js
@@ -1,6 +1,8 @@
 /// <reference types="cypress" />
 describe('ClaimDevelopment', () => {
     const claimId = 1;
+    const firstLineReason = 'tbody > :nth-child(1) > :nth-child(2)';
+    const thirdRow = 'tbody > :nth-child(3)';
 
     beforeEach(() => {
         cy.viewport(1920, 1080);
@@ -9,58 +11,46 @@ describe('ClaimDevelopment', () => {
     });
 
     it('should reset line', () => {
-        cy.get('tbody > :nth-child(1) > :nth-child(2)').click();
-        cy.selectOption('Novato');
-        cy.get('[title="Reset"]').click();
-        cy.get(
-            ':nth-child(1) > :nth-child(2) > .q-field > .q-field__inner > .q-field__control > .q-field__control-container > .q-field__native > span'
-        ).should('have.text', 'Prisas');
+        cy.selectOption(firstLineReason, 'Novato');
+        cy.resetCard();
+        cy.getValue(firstLineReason).should('have.text', 'Prisas');
     });
 
     it('should edit line', () => {
-        cy.get('tbody > :nth-child(1) > :nth-child(2)').click();
-        cy.selectOption('Novato');
-        cy.get('[title="Save"]').click();
+        cy.selectOption(firstLineReason, 'Novato');
+        cy.saveCard();
 
-        cy.visit(`/#/claim/${claimId}/development`);
-        cy.get(
-            ':nth-child(1) > :nth-child(2) > .q-field > .q-field__inner > .q-field__control > .q-field__control-container > .q-field__native > span'
-        ).should('have.text', 'Novato');
+        cy.reload();
+        cy.getValue(firstLineReason).should('have.text', 'Novato');
 
         //Restart data
-        cy.get('tbody > :nth-child(1) > :nth-child(2)');
-        cy.selectOption('Prisas');
-        cy.get('[title="Save"]').click();
+        cy.selectOption(firstLineReason, 'Prisas');
+        cy.saveCard();
     });
 
-    it('should add new line', () => {
-        //check third if row exist
-        cy.get('.q-page-sticky > div > .q-btn').click();
-        cy.get('tbody > :nth-child(3)').should('exist');
+    it('should add and remove new line', () => {
+        //add row
+        cy.addCard();
+        cy.get(thirdRow).should('exist');
 
-        //fill in data
-        const rowData = ['', '', ''];
-        cy.fillTableRow(3, rowData);
+        const rowData = [false, 'Novato', 'Roces', 'Compradores', 'employeeNick', 'Tour'];
+        cy.fillRow(thirdRow, rowData);
+        cy.saveCard();
+        cy.validateRow(thirdRow, rowData);
+
+        cy.reload();
+        cy.validateRow(thirdRow, rowData);
+
+        //remove row
+        cy.fillRow(thirdRow, [true]);
+        cy.removeCard();
+        cy.clickConfirm();
+        cy.get(thirdRow).should('not.exist');
+
+        cy.reload();
+        cy.get(thirdRow).should('not.exist');
     });
 
-    // it('should remove last line', () => {
-    //     cy.get(
-    //         ':nth-child(1) > .q-card > .q-img > .q-img__container > .q-img__image'
-    //     ).click();
-    //     cy.get('.q-carousel__slide > .q-img > .q-img__container > .q-img__image').should(
-    //         'be.visible'
-    //     );
-
-    //     cy.get('.q-carousel__control > .q-btn > .q-btn__content > .q-icon').click();
-
-    //     cy.get(
-    //         '.q-dialog__inner > .q-toolbar > .q-btn > .q-btn__content > .q-icon'
-    //     ).click();
-    //     cy.get('.q-carousel__slide > .q-img > .q-img__container > .q-img__image').should(
-    //         'not.be.visible'
-    //     );
-    // });
-
     // it('should remove third and fourth file', () => {
     //     cy.get(
     //         '.multimediaParent > :nth-child(3) > .q-btn > .q-btn__content > .q-icon'
diff --git a/test/cypress/support/commands.js b/test/cypress/support/commands.js
index eca5f6c8c..2eb14e463 100755
--- a/test/cypress/support/commands.js
+++ b/test/cypress/support/commands.js
@@ -41,70 +41,90 @@ Cypress.Commands.add('login', (user) => {
     });
 });
 
-Cypress.Commands.add('selectOption', (option) => {
-    //cy.visit('/#/login');
-    cy.get('.q-item__label').then(() => {
-        cy.contains('.q-item__label', option).click();
+Cypress.Commands.add('waitForElement', (element) => {
+    cy.get(element, { timeout: 2000 }).should('be.visible');
+});
+
+Cypress.Commands.add('getValue', (selector) => {
+    cy.get(selector).then(($el) => {
+        if ($el.find('.q-checkbox__inner').length > 0) {
+            return cy.get(selector + '.q-checkbox__inner');
+        }
+        // Si es un QSelect
+        else if ($el.find('.q-select__dropdown-icon').length) {
+            return cy.get(
+                selector +
+                    '> .q-field > .q-field__inner > .q-field__control > .q-field__control-container > .q-field__native > span'
+            );
+        } else {
+            // Puedes añadir un log o lanzar un error si el elemento no es reconocido
+            cy.log('Elemento no soportado');
+        }
     });
 });
 
-// Cypress.Commands.add('fillRow', (row, options) => {
-//     //cy.visit('/#/login');
-//     for (let [i, option] of options.entries()) {
-//         i++;
-//         console.log(i);
-//         const selector = `tbody > :nth-child(${row}) > :nth-child(${i})`;
-//         if (cy.get(selector).should('have.class', 'q-select'))
-//             cy.selectOption(selector, option);
-//     }
-// });
-Cypress.Commands.add('fillTableRow', (rowNumber, data) => {
-    // Obtener todas las filas de la tabla
-    cy.get('table tbody tr').eq(rowNumber).as('currentRow');
+// Fill Inputs
+Cypress.Commands.add('selectOption', (selector, option) => {
+    cy.get(selector).find('.q-select__dropdown-icon').click();
+    cy.get('.q-menu .q-item').contains(option).click();
+});
+
+Cypress.Commands.add('checkOption', (selector) => {
+    cy.wrap(selector).find('.q-checkbox__inner').click();
+});
+
+// Global buttons
+Cypress.Commands.add('saveCard', () => {
+    cy.get('[title="Save"]').click();
+    cy.get('[title="Save"]').should('have.class', 'disabled');
+});
+Cypress.Commands.add('resetCard', () => {
+    cy.get('[title="Reset"]').click();
+});
+Cypress.Commands.add('removeCard', () => {
+    cy.get('[title="Remove"]').click();
+});
+Cypress.Commands.add('addCard', () => {
+    cy.waitForElement('tbody');
+    cy.get('.q-page-sticky > div > .q-btn').click();
+});
+Cypress.Commands.add('clickConfirm', () => {
+    cy.get('.q-btn--unelevated > .q-btn__content > .block').click();
+});
+
+Cypress.Commands.add('fillRow', (rowSelector, data) => {
+    // Usar el selector proporcionado para obtener la fila deseada
+    cy.waitForElement('tbody');
+    cy.get(rowSelector).as('currentRow');
 
-    // Iterar sobre cada dato en el array 'data'
     data.forEach((value, index) => {
-        // Basándonos en el índice, encontramos la celda correspondiente y verificamos el tipo de input
+        if (value === null) return;
         cy.get('@currentRow')
             .find('td')
             .eq(index)
-            .find('input')
-            .invoke('attr', 'type')
-            .then((type) => {
-                switch (type) {
-                    case 'text':
-                        cy.get('@currentRow')
-                            .find('td')
-                            .eq(index)
-                            .find('input[type="text"]')
-                            .clear()
-                            .type(value);
-                        break;
-
-                    case 'checkbox':
-                        if (value) {
-                            // Puede adaptar esto según cómo represente los valores booleanos en su array 'data'
-                            cy.get('@currentRow')
-                                .find('td')
-                                .eq(index)
-                                .find('input[type="checkbox"]')
-                                .check();
-                        } else {
-                            cy.get('@currentRow')
-                                .find('td')
-                                .eq(index)
-                                .find('input[type="checkbox"]')
-                                .uncheck();
-                        }
-                        break;
-
-                    // ... Puede agregar más casos para otros tipos de inputs según sea necesario
-
-                    default:
-                        // Manejar cualquier otro tipo de input o agregar lógica de error aquí si es necesario
-                        break;
+            .then((td) => {
+                if (td.find('.q-select__dropdown-icon').length) {
+                    cy.selectOption(td, value);
+                }
+                if (td.find('.q-checkbox__inner').length && value) {
+                    cy.checkOption(td);
                 }
             });
     });
 });
+
+Cypress.Commands.add('validateRow', (rowSelector, expectedValues) => {
+    cy.waitForElement('tbody');
+    cy.get(rowSelector).within(() => {
+        for (const [index, value] of expectedValues.entries()) {
+            cy.log('CHECKING ', index, value);
+            if (typeof value == 'boolean') {
+                const prefix = value ? '' : 'not.';
+                cy.getValue(`:nth-child(${index + 1})`).should(`${prefix}be.checked`);
+                continue;
+            }
+            cy.getValue(`:nth-child(${index + 1})`).should('have.text', value);
+        }
+    });
+});
 // registerCommands();

From c365682e3c032ee3969edcd5b4af627108786fc0 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 24 Aug 2023 15:05:31 +0200
Subject: [PATCH 14/26] refs #5673 fix: crudModel and finish e2e

---
 src/components/CrudModel.vue                  |  5 ++-
 src/components/FormModel.vue                  |  8 +++--
 src/components/common/VnSelectFilter.vue      | 15 ++++++--
 src/components/ui/VnPaginate.vue              |  1 +
 src/composables/useValidator.js               | 21 +++++------
 src/pages/Claim/Card/ClaimLines.vue           |  2 +-
 .../integration/claimDevelopment.spec.js      | 14 --------
 .../components/common/CrudModel.spec.js       | 35 ++++++++++---------
 .../__tests__/pages/Claims/ClaimLines.spec.js |  3 ++
 9 files changed, 53 insertions(+), 51 deletions(-)

diff --git a/src/components/CrudModel.vue b/src/components/CrudModel.vue
index 13e8ca3e3..17b21b0e6 100644
--- a/src/components/CrudModel.vue
+++ b/src/components/CrudModel.vue
@@ -98,8 +98,7 @@ async function fetch(data) {
 }
 
 function reset() {
-    state.set($props.model, originalData.value);
-    watch(formData.value, () => (hasChanges.value = true));
+    fetch(originalData.value);
     hasChanges.value = false;
 }
 // eslint-disable-next-line vue/no-dupe-keys
@@ -317,7 +316,7 @@ function isEmpty(obj) {
     </Teleport>
     <QInnerLoading
         :showing="isLoading"
-        :label="t('globals.pleaseWait')"
+        :label="t && t('globals.pleaseWait')"
         color="primary"
     />
 </template>
diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index 28a3759b8..540c37d01 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -89,7 +89,11 @@ async function save() {
 
 function reset() {
     state.set($props.model, originalData.value);
+    originalData.value = JSON.parse(JSON.stringify(originalData.value));
+
     watch(formData.value, () => (hasChanges.value = true));
+
+    emit('onFetch', state.get($props.model));
     hasChanges.value = false;
 }
 // eslint-disable-next-line vue/no-dupe-keys
@@ -123,7 +127,7 @@ watch(formUrl, async () => {
     </QForm>
     <Teleport to="#st-actions" v-if="stateStore?.isSubToolbarShown()">
         <div v-if="$props.defaultActions">
-            <QBtnGoup push class="q-gutter-x-sm">
+            <QBtnGroup push class="q-gutter-x-sm">
                 <slot name="moreActions" />
                 <QBtn
                     :label="tMobile('globals.reset')"
@@ -142,7 +146,7 @@ watch(formUrl, async () => {
                     :disable="!hasChanges"
                     :title="t('globals.save')"
                 />
-            </QBtnGoup>
+            </QBtnGroup>
         </div>
     </Teleport>
     <SkeletonForm v-if="!formData" />
diff --git a/src/components/common/VnSelectFilter.vue b/src/components/common/VnSelectFilter.vue
index 2fc8ce4ad..95150cadc 100644
--- a/src/components/common/VnSelectFilter.vue
+++ b/src/components/common/VnSelectFilter.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, toRefs, computed } from 'vue';
+import { ref, toRefs, watch } from 'vue';
 const emit = defineEmits(['update:modelValue', 'update:options']);
 
 const $props = defineProps({
@@ -16,10 +16,15 @@ const $props = defineProps({
         default: '',
     },
 });
-const myOptions = computed(() => $props.options);
 const updateValue = (newValue) => emit('update:modelValue', newValue);
 const { modelValue, optionLabel, options } = toRefs($props);
-const myOptionsOriginal = ref(JSON.parse(JSON.stringify(options.value)));
+const myOptions = ref([]);
+const myOptionsOriginal = ref([]);
+function setOptions(data) {
+    myOptions.value = JSON.parse(JSON.stringify(data));
+    myOptionsOriginal.value = JSON.parse(JSON.stringify(data));
+}
+setOptions(options.value);
 
 const filter = (val, options) => {
     const search = val.toLowerCase();
@@ -41,6 +46,10 @@ const filterHandler = (val, update) => {
         myOptions.value = filter(val, myOptionsOriginal.value);
     });
 };
+
+watch(options, (newValue) => {
+    setOptions(newValue);
+});
 </script>
 
 <template>
diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue
index d84e8f1af..ebc7d5973 100644
--- a/src/components/ui/VnPaginate.vue
+++ b/src/components/ui/VnPaginate.vue
@@ -53,6 +53,7 @@ const props = defineProps({
 });
 
 const emit = defineEmits(['onFetch', 'onPaginate']);
+defineExpose({ fetch });
 const isLoading = ref(false);
 const pagination = ref({
     sortBy: props.order,
diff --git a/src/composables/useValidator.js b/src/composables/useValidator.js
index ef2dcbd90..bc48332a2 100644
--- a/src/composables/useValidator.js
+++ b/src/composables/useValidator.js
@@ -3,15 +3,13 @@ import { useI18n } from 'vue-i18n';
 import axios from 'axios';
 import validator from 'validator';
 
-
 const models = ref(null);
 
 export function useValidator() {
     if (!models.value) fetch();
 
     function fetch() {
-        axios.get('Schemas/ModelInfo')
-            .then(response => models.value = response.data)
+        axios.get('Schemas/ModelInfo').then((response) => (models.value = response.data));
     }
 
     function validate(propertyRule) {
@@ -38,19 +36,18 @@ export function useValidator() {
 
     const { t } = useI18n();
     const validations = function (validation) {
-
         return {
             presence: (value) => {
                 let message = `Value can't be empty`;
                 if (validation.message)
-                    message = t(validation.message) || validation.message
+                    message = t(validation.message) || validation.message;
 
-                return !validator.isEmpty(value ? String(value) : '') || message
+                return !validator.isEmpty(value ? String(value) : '') || message;
             },
             length: (value) => {
                 const options = {
                     min: validation.min || validation.is,
-                    max: validation.max || validation.is
+                    max: validation.max || validation.is,
                 };
 
                 value = String(value);
@@ -69,14 +66,14 @@ export function useValidator() {
             },
             numericality: (value) => {
                 if (validation.int)
-                    return validator.isInt(value) || 'Value should be integer'
-                return validator.isNumeric(value) || 'Value should be a number'
+                    return validator.isInt(value) || 'Value should be integer';
+                return validator.isNumeric(value) || 'Value should be a number';
             },
-            custom: (value) => validation.bindedFunction(value) || 'Invalid value'
+            custom: (value) => validation.bindedFunction(value) || 'Invalid value',
         };
     };
 
     return {
-        validate
+        validate,
     };
-}
\ No newline at end of file
+}
diff --git a/src/pages/Claim/Card/ClaimLines.vue b/src/pages/Claim/Card/ClaimLines.vue
index ecd56df49..f2814458b 100644
--- a/src/pages/Claim/Card/ClaimLines.vue
+++ b/src/pages/Claim/Card/ClaimLines.vue
@@ -8,7 +8,6 @@ import { useArrayData } from 'composables/useArrayData';
 import { useStateStore } from 'stores/useStateStore';
 import CrudModel from 'components/CrudModel.vue';
 import FetchData from 'components/FetchData.vue';
-import VnConfirm from 'components/ui/VnConfirm.vue';
 
 import { toDate, toCurrency, toPercentage } from 'filters/index';
 import VnDiscount from 'components/common/vnDiscount.vue';
@@ -17,6 +16,7 @@ import ClaimLinesImport from './ClaimLinesImport.vue';
 const quasar = useQuasar();
 const route = useRoute();
 const { t } = useI18n();
+console.log(t);
 const stateStore = useStateStore();
 const arrayData = useArrayData('ClaimLines');
 const store = arrayData.store;
diff --git a/test/cypress/integration/claimDevelopment.spec.js b/test/cypress/integration/claimDevelopment.spec.js
index 8a882d0e6..77ce2bb45 100755
--- a/test/cypress/integration/claimDevelopment.spec.js
+++ b/test/cypress/integration/claimDevelopment.spec.js
@@ -50,18 +50,4 @@ describe('ClaimDevelopment', () => {
         cy.reload();
         cy.get(thirdRow).should('not.exist');
     });
-
-    // it('should remove third and fourth file', () => {
-    //     cy.get(
-    //         '.multimediaParent > :nth-child(3) > .q-btn > .q-btn__content > .q-icon'
-    //     ).click();
-    //     cy.get('.q-btn--unelevated > .q-btn__content > .block').click();
-    //     cy.get('.q-notification__message').should('have.text', 'Data deleted');
-
-    //     cy.get(
-    //         '.multimediaParent > :nth-child(3) > .q-btn > .q-btn__content > .q-icon'
-    //     ).click();
-    //     cy.get('.q-btn--unelevated > .q-btn__content > .block').click();
-    //     cy.get('.q-notification__message').should('have.text', 'Data deleted');
-    // });
 });
diff --git a/test/vitest/__tests__/components/common/CrudModel.spec.js b/test/vitest/__tests__/components/common/CrudModel.spec.js
index 518c3ad60..9c000e48d 100644
--- a/test/vitest/__tests__/components/common/CrudModel.spec.js
+++ b/test/vitest/__tests__/components/common/CrudModel.spec.js
@@ -1,15 +1,23 @@
 import { createWrapper, axios } from 'app/test/vitest/helper';
 import CrudModel from 'components/CrudModel.vue';
 import { vi, afterEach, beforeAll, beforeEach, describe, expect, it } from 'vitest';
+import { onMounted, ref } from 'vue';
 
 describe.only('CrudModel', () => {
     let vm;
     beforeAll(() => {
         vm = createWrapper(CrudModel, {
             global: {
-                stubs: ['vnPaginate', 'useState', 'arrayData', 'useStateStore'],
+                stubs: [
+                    'vnPaginate',
+                    'useState',
+                    'arrayData',
+                    'useStateStore',
+                    'useValidator',
+                ],
                 mocks: {
                     fetch: vi.fn(),
+                    validate: vi.fn(),
                 },
             },
             propsData: {
@@ -19,7 +27,6 @@ describe.only('CrudModel', () => {
                     autoLoad: true,
                 },
                 dataKey: 'crudModelKey',
-                model: 'crudModel',
                 url: 'crudModelUrl',
             },
             attrs: {
@@ -37,20 +44,16 @@ describe.only('CrudModel', () => {
 
     describe('insert()', () => {
         it('should new element in list with index 0 if formData not has data', () => {
-            vi.mock('src/composables/useValidator', () => ({
-                default: () => {},
-                fetch: () => {
-                    vi.fn();
-                },
-            }));
-            vi.spyOn(axios, 'get').mockResolvedValue({
-                data: [
-                    { id: 1, name: 'Tony Stark' },
-                    { id: 2, name: 'Jessica Jones' },
-                    { id: 3, name: 'Bruce Wayne' },
-                ],
-            });
-            vm.state.set('crudModel', []);
+            // vi.spyOn(axios, 'get').mockResolvedValue({
+            //     data: [
+            //         { id: 1, name: 'Tony Stark' },
+            //         { id: 2, name: 'Jessica Jones' },
+            //         { id: 3, name: 'Bruce Wayne' },
+            //     ],
+            // });
+            // vm.state.set('crudModel', []);
+            vm.formData = ref([]);
+
             vm.insert();
 
             expect(vm.formData.length).toEqual(1);
diff --git a/test/vitest/__tests__/pages/Claims/ClaimLines.spec.js b/test/vitest/__tests__/pages/Claims/ClaimLines.spec.js
index 6dd6b89e6..e846eebf0 100644
--- a/test/vitest/__tests__/pages/Claims/ClaimLines.spec.js
+++ b/test/vitest/__tests__/pages/Claims/ClaimLines.spec.js
@@ -14,6 +14,9 @@ describe('ClaimLines', () => {
                 },
             },
         }).vm;
+        vi.mock('src/composables/useValidator', () => ({
+            fetch: () => vi.fn(),
+        }));
     });
 
     beforeEach(() => {

From 6260b7ed5e6149449dd31a337cfeaf7933df7228 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 25 Aug 2023 10:56:03 +0200
Subject: [PATCH 15/26] resf #5673 test(claimDevelopment): front test

---
 src/pages/Claim/Card/ClaimLines.vue           |  2 +-
 src/pages/Wagon/WagonCreate.vue               |  2 +-
 .../components/common/CrudModel.spec.js       | 23 +++++++++---------
 .../__tests__/pages/Claims/ClaimLines.spec.js |  3 ---
 .../pages/Wagons/WagonCreate.spec.js          | 24 +++++++------------
 test/vitest/helper.js                         |  6 ++++-
 6 files changed, 27 insertions(+), 33 deletions(-)

diff --git a/src/pages/Claim/Card/ClaimLines.vue b/src/pages/Claim/Card/ClaimLines.vue
index f2814458b..8680ff922 100644
--- a/src/pages/Claim/Card/ClaimLines.vue
+++ b/src/pages/Claim/Card/ClaimLines.vue
@@ -16,7 +16,7 @@ import ClaimLinesImport from './ClaimLinesImport.vue';
 const quasar = useQuasar();
 const route = useRoute();
 const { t } = useI18n();
-console.log(t);
+
 const stateStore = useStateStore();
 const arrayData = useArrayData('ClaimLines');
 const store = arrayData.store;
diff --git a/src/pages/Wagon/WagonCreate.vue b/src/pages/Wagon/WagonCreate.vue
index 3f7824975..123e01d36 100644
--- a/src/pages/Wagon/WagonCreate.vue
+++ b/src/pages/Wagon/WagonCreate.vue
@@ -20,7 +20,7 @@ const $props = defineProps({
 });
 const entityId = computed(() => $props.id || route.params.id);
 
-let wagonTypes;
+let wagonTypes = [];
 let originalData = {};
 const wagon = ref({});
 const filteredWagonTypes = ref(wagonTypes);
diff --git a/test/vitest/__tests__/components/common/CrudModel.spec.js b/test/vitest/__tests__/components/common/CrudModel.spec.js
index 9c000e48d..3e0fe06f2 100644
--- a/test/vitest/__tests__/components/common/CrudModel.spec.js
+++ b/test/vitest/__tests__/components/common/CrudModel.spec.js
@@ -1,7 +1,6 @@
 import { createWrapper, axios } from 'app/test/vitest/helper';
 import CrudModel from 'components/CrudModel.vue';
-import { vi, afterEach, beforeAll, beforeEach, describe, expect, it } from 'vitest';
-import { onMounted, ref } from 'vue';
+import { vi, afterEach, beforeAll, describe, expect, it } from 'vitest';
 
 describe.only('CrudModel', () => {
     let vm;
@@ -13,7 +12,7 @@ describe.only('CrudModel', () => {
                     'useState',
                     'arrayData',
                     'useStateStore',
-                    'useValidator',
+                    'vue-i18n',
                 ],
                 mocks: {
                     fetch: vi.fn(),
@@ -27,6 +26,7 @@ describe.only('CrudModel', () => {
                     autoLoad: true,
                 },
                 dataKey: 'crudModelKey',
+                model: 'crudModel',
                 url: 'crudModelUrl',
             },
             attrs: {
@@ -44,15 +44,14 @@ describe.only('CrudModel', () => {
 
     describe('insert()', () => {
         it('should new element in list with index 0 if formData not has data', () => {
-            // vi.spyOn(axios, 'get').mockResolvedValue({
-            //     data: [
-            //         { id: 1, name: 'Tony Stark' },
-            //         { id: 2, name: 'Jessica Jones' },
-            //         { id: 3, name: 'Bruce Wayne' },
-            //     ],
-            // });
-            // vm.state.set('crudModel', []);
-            vm.formData = ref([]);
+            vi.spyOn(axios, 'get').mockResolvedValue({
+                data: [
+                    { id: 1, name: 'Tony Stark' },
+                    { id: 2, name: 'Jessica Jones' },
+                    { id: 3, name: 'Bruce Wayne' },
+                ],
+            });
+            vm.state.set('crudModel', []);
 
             vm.insert();
 
diff --git a/test/vitest/__tests__/pages/Claims/ClaimLines.spec.js b/test/vitest/__tests__/pages/Claims/ClaimLines.spec.js
index e846eebf0..6dd6b89e6 100644
--- a/test/vitest/__tests__/pages/Claims/ClaimLines.spec.js
+++ b/test/vitest/__tests__/pages/Claims/ClaimLines.spec.js
@@ -14,9 +14,6 @@ describe('ClaimLines', () => {
                 },
             },
         }).vm;
-        vi.mock('src/composables/useValidator', () => ({
-            fetch: () => vi.fn(),
-        }));
     });
 
     beforeEach(() => {
diff --git a/test/vitest/__tests__/pages/Wagons/WagonCreate.spec.js b/test/vitest/__tests__/pages/Wagons/WagonCreate.spec.js
index bc6b92639..f195c183f 100644
--- a/test/vitest/__tests__/pages/Wagons/WagonCreate.spec.js
+++ b/test/vitest/__tests__/pages/Wagons/WagonCreate.spec.js
@@ -7,9 +7,11 @@ describe('WagonCreate', () => {
     const entityId = 1;
 
     beforeAll(() => {
-        vmEdit = createWrapper(WagonCreate, {propsData: {
+        vmEdit = createWrapper(WagonCreate, {
+            propsData: {
                 id: entityId,
-            }}).vm;
+            },
+        }).vm;
         vmCreate = createWrapper(WagonCreate).vm;
     });
 
@@ -29,9 +31,7 @@ describe('WagonCreate', () => {
 
             await vmCreate.onSubmit();
 
-            expect(axios.patch).toHaveBeenCalledWith(
-                `Wagons`, vmCreate.wagon
-            );
+            expect(axios.patch).toHaveBeenCalledWith(`Wagons`, vmCreate.wagon);
         });
 
         it('should update a wagon', async () => {
@@ -46,9 +46,7 @@ describe('WagonCreate', () => {
 
             await vmEdit.onSubmit();
 
-            expect(axios.patch).toHaveBeenCalledWith(
-                `Wagons`, vmEdit.wagon
-            );
+            expect(axios.patch).toHaveBeenCalledWith(`Wagons`, vmEdit.wagon);
         });
     });
 
@@ -88,16 +86,12 @@ describe('WagonCreate', () => {
 
     describe('fetch()', () => {
         it('should fetch data', async () => {
-            vi.spyOn(axios, 'get').mockResolvedValue({ data: true });
+            vi.spyOn(axios, 'get').mockResolvedValue({ data: [] });
 
             await vmEdit.fetch();
 
-            expect(axios.get).toHaveBeenCalledWith(
-                `WagonTypes`
-            );
-            expect(axios.get).toHaveBeenCalledWith(
-                `Wagons/${entityId}`
-            );
+            expect(axios.get).toHaveBeenCalledWith(`WagonTypes`);
+            expect(axios.get).toHaveBeenCalledWith(`Wagons/${entityId}`);
         });
     });
 });
diff --git a/test/vitest/helper.js b/test/vitest/helper.js
index 186f4ee3a..8f4dc3221 100644
--- a/test/vitest/helper.js
+++ b/test/vitest/helper.js
@@ -5,6 +5,7 @@ import { vi } from 'vitest';
 import { i18n } from 'src/boot/i18n';
 import { Notify, Dialog } from 'quasar';
 import axios from 'axios';
+import * as useValidator from 'src/composables/useValidator';
 
 installQuasarPlugin({
     plugins: {
@@ -34,6 +35,10 @@ vi.mock('vue-router', () => ({
     }),
 }));
 
+vi.spyOn(useValidator, 'useValidator').mockImplementation(() => {
+    return { validate: vi.fn(), fetch: vi.fn() };
+});
+
 class FormDataMock {
     append() {
         vi.fn();
@@ -79,7 +84,6 @@ export function createWrapper(component, options) {
             mountOptions.global.plugins = defaultOptions.global.plugins;
         }
     }
-    console.log(mountOptions);
 
     const wrapper = mount(component, mountOptions);
     const vm = wrapper.vm;

From b54dfe726770f5337bc58e10b517842617afc350 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 25 Aug 2023 11:03:15 +0200
Subject: [PATCH 16/26] refs #5673 fix: unnecessary files

---
 cypress/fixtures/example.json |  5 -----
 cypress/support/commands.js   | 25 -------------------------
 2 files changed, 30 deletions(-)
 delete mode 100644 cypress/fixtures/example.json
 delete mode 100644 cypress/support/commands.js

diff --git a/cypress/fixtures/example.json b/cypress/fixtures/example.json
deleted file mode 100644
index 02e425437..000000000
--- a/cypress/fixtures/example.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "name": "Using fixtures to represent data",
-  "email": "hello@cypress.io",
-  "body": "Fixtures are a great way to mock data for responses to routes"
-}
diff --git a/cypress/support/commands.js b/cypress/support/commands.js
deleted file mode 100644
index 66ea16ef0..000000000
--- a/cypress/support/commands.js
+++ /dev/null
@@ -1,25 +0,0 @@
-// ***********************************************
-// This example commands.js shows you how to
-// create various custom commands and overwrite
-// existing commands.
-//
-// For more comprehensive examples of custom
-// commands please read more here:
-// https://on.cypress.io/custom-commands
-// ***********************************************
-//
-//
-// -- This is a parent command --
-// Cypress.Commands.add('login', (email, password) => { ... })
-//
-//
-// -- This is a child command --
-// Cypress.Commands.add('drag', { prevSubject: 'element'}, (subject, options) => { ... })
-//
-//
-// -- This is a dual command --
-// Cypress.Commands.add('dismiss', { prevSubject: 'optional'}, (subject, options) => { ... })
-//
-//
-// -- This will overwrite an existing command --
-// Cypress.Commands.overwrite('visit', (originalFn, url, options) => { ... })
\ No newline at end of file

From 367141a80d92fd83e0a2dbcf28bd9e565844d273 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 25 Aug 2023 12:33:38 +0200
Subject: [PATCH 17/26] refs #5673 test(CrudModel): add getChanges
 getDifferences front test

---
 src/components/CrudModel.vue                  |  24 +---
 .../components/common/CrudModel.spec.js       | 118 +++++++++++++++---
 2 files changed, 104 insertions(+), 38 deletions(-)

diff --git a/src/components/CrudModel.vue b/src/components/CrudModel.vue
index 17b21b0e6..98e2ff62f 100644
--- a/src/components/CrudModel.vue
+++ b/src/components/CrudModel.vue
@@ -149,17 +149,6 @@ async function insert() {
     hasChanges.value = true;
 }
 
-// function addRemove(ids) {
-//     for (let id of ids) {
-//         const index = removed.value.indexOf(id);
-//         if (index > -1) {
-//             removed.value = removed.value.slice(index, 1);
-//             continue;
-//         }
-//         removed.value.push(id);
-//     }
-// }
-
 async function remove(data) {
     if (!data.length)
         return quasar.notify({
@@ -172,7 +161,6 @@ async function remove(data) {
     let preRemove = data.map((d) => (d[pk] ? null : d.$index)).filter(Boolean);
     let newData = formData.value;
 
-    // addRemove(ids);
     if (preRemove.length) {
         newData = newData.filter(
             (form) => !preRemove.some((index) => index == form.$index)
@@ -202,12 +190,6 @@ async function remove(data) {
     emit('update:selected', []);
 }
 
-watch(formUrl, async () => {
-    originalData.value = null;
-    reset();
-    fetch();
-});
-
 function getChanges() {
     const updates = [];
     const creates = [];
@@ -258,6 +240,12 @@ function isEmpty(obj) {
 
     if (obj.length > 0) return false;
 }
+
+watch(formUrl, async () => {
+    originalData.value = null;
+    reset();
+    fetch();
+});
 </script>
 <template>
     <VnPaginate
diff --git a/test/vitest/__tests__/components/common/CrudModel.spec.js b/test/vitest/__tests__/components/common/CrudModel.spec.js
index 3e0fe06f2..a26b47e21 100644
--- a/test/vitest/__tests__/components/common/CrudModel.spec.js
+++ b/test/vitest/__tests__/components/common/CrudModel.spec.js
@@ -1,6 +1,6 @@
 import { createWrapper, axios } from 'app/test/vitest/helper';
 import CrudModel from 'components/CrudModel.vue';
-import { vi, afterEach, beforeAll, describe, expect, it } from 'vitest';
+import { vi, afterEach, beforeEach, beforeAll, describe, expect, it } from 'vitest';
 
 describe.only('CrudModel', () => {
     let vm;
@@ -21,43 +21,121 @@ describe.only('CrudModel', () => {
             },
             propsData: {
                 dataRequired: {
-                    id: 1,
-                    name: 'name',
-                    autoLoad: true,
+                    fk: 1,
                 },
                 dataKey: 'crudModelKey',
                 model: 'crudModel',
                 url: 'crudModelUrl',
             },
-            attrs: {
-                url: 'crudModelUrl',
-                dataKey: 'CustomerList',
-                order: 'id DESC',
-                limit: 3,
-            },
         }).vm;
     });
 
+    beforeEach(() => {
+        vm.state.set('crudModel', []);
+    });
+
     afterEach(() => {
         vi.clearAllMocks();
     });
 
     describe('insert()', () => {
         it('should new element in list with index 0 if formData not has data', () => {
-            vi.spyOn(axios, 'get').mockResolvedValue({
-                data: [
-                    { id: 1, name: 'Tony Stark' },
-                    { id: 2, name: 'Jessica Jones' },
-                    { id: 3, name: 'Bruce Wayne' },
-                ],
-            });
-            vm.state.set('crudModel', []);
-
             vm.insert();
 
             expect(vm.formData.length).toEqual(1);
-            expect(vm.formData[0].id).toEqual(1);
+            expect(vm.formData[0].fk).toEqual(1);
             expect(vm.formData[0].$index).toEqual(0);
         });
     });
+
+    describe('getChanges()', () => {
+        it('should return correct updates and creates', async () => {
+            vm.originalData = [
+                { id: 1, name: 'Tony Starks', $index: 1 },
+                { id: 2, name: 'Jessica Jones', $index: 2 },
+                { id: 3, name: 'Bruce Wayne', $index: 3 },
+            ];
+            vm.state.set('crudModel', [
+                { id: 1, name: 'New name one', $index: 1 },
+                { id: 2, name: 'New name two', $index: 2 },
+                { id: 3, name: 'Bruce Wayne', $index: 3 },
+            ]);
+
+            vm.insert();
+            const result = vm.getChanges();
+
+            const expected = {
+                creates: [
+                    {
+                        $index: 4,
+                        fk: 1,
+                    },
+                ],
+                updates: [
+                    {
+                        data: {
+                            name: 'New name one',
+                        },
+                        where: {
+                            id: 1,
+                        },
+                    },
+                    {
+                        data: {
+                            name: 'New name two',
+                        },
+                        where: {
+                            id: 2,
+                        },
+                    },
+                ],
+            };
+
+            expect(result).toEqual(expected);
+        });
+    });
+
+    // TODO: remove test
+    // describe('remove()', () => {
+    //     it('should remove', async () => {
+    //         vi.spyOn(vm.quasar, 'dialog');
+
+    //         vm.originalData = [
+    //             { id: 1, name: 'Tony Starks', $index: 1 },
+    //             { id: 2, name: 'Jessica Jones', $index: 2 },
+    //             { id: 3, name: 'Bruce Wayne', $index: 3 },
+    //         ];
+    //         vm.state.set('crudModel', [
+    //             { id: 1, name: 'New name one', $index: 1 },
+    //             { id: 2, name: 'New name two', $index: 2 },
+    //             { id: 3, name: 'Bruce Wayne', $index: 3 },
+    //         ]);
+
+    //         vm.remove([{ id: 1 }]);
+
+    //         expect(vm.quasar.dialog).toHaveBeenCalled();
+    //     });
+    // });
+
+    describe('getDifferences()', () => {
+        it('should return the differences between two objects', async () => {
+            const obj1 = {
+                a: 1,
+                b: 2,
+                c: 3,
+            };
+            const obj2 = {
+                a: 1,
+                b: 4,
+                d: 5,
+            };
+
+            const result = vm.getDifferences(obj1, obj2);
+
+            expect(result).toEqual({
+                b: 4,
+                d: 5,
+            });
+        });
+    });
 });

From ea346cdca2c128cfd1d78404e7342061d499386c Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 25 Aug 2023 12:56:00 +0200
Subject: [PATCH 18/26] refs #5673 test(CrudModel): skip remove test

---
 .../components/common/CrudModel.spec.js       | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/test/vitest/__tests__/components/common/CrudModel.spec.js b/test/vitest/__tests__/components/common/CrudModel.spec.js
index a26b47e21..b425351af 100644
--- a/test/vitest/__tests__/components/common/CrudModel.spec.js
+++ b/test/vitest/__tests__/components/common/CrudModel.spec.js
@@ -96,26 +96,26 @@ describe.only('CrudModel', () => {
     });
 
     // TODO: remove test
-    // describe('remove()', () => {
-    //     it('should remove', async () => {
-    //         vi.spyOn(vm.quasar, 'dialog');
+    describe.skip('remove()', () => {
+        it('should remove', async () => {
+            vi.spyOn(vm.quasar, 'dialog');
 
-    //         vm.originalData = [
-    //             { id: 1, name: 'Tony Starks', $index: 1 },
-    //             { id: 2, name: 'Jessica Jones', $index: 2 },
-    //             { id: 3, name: 'Bruce Wayne', $index: 3 },
-    //         ];
-    //         vm.state.set('crudModel', [
-    //             { id: 1, name: 'New name one', $index: 1 },
-    //             { id: 2, name: 'New name two', $index: 2 },
-    //             { id: 3, name: 'Bruce Wayne', $index: 3 },
-    //         ]);
+            vm.originalData = [
+                { id: 1, name: 'Tony Starks', $index: 1 },
+                { id: 2, name: 'Jessica Jones', $index: 2 },
+                { id: 3, name: 'Bruce Wayne', $index: 3 },
+            ];
+            vm.state.set('crudModel', [
+                { id: 1, name: 'New name one', $index: 1 },
+                { id: 2, name: 'New name two', $index: 2 },
+                { id: 3, name: 'Bruce Wayne', $index: 3 },
+            ]);
 
-    //         vm.remove([{ id: 1 }]);
+            vm.remove([{ id: 1 }]);
 
-    //         expect(vm.quasar.dialog).toHaveBeenCalled();
-    //     });
-    // });
+            expect(vm.quasar.dialog).toHaveBeenCalled();
+        });
+    });
 
     describe('getDifferences()', () => {
         it('should return the differences between two objects', async () => {

From 1f169d31e50899aedaf23a2a663387db5dcbadb9 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 25 Aug 2023 13:47:56 +0200
Subject: [PATCH 19/26] typo

---
 test/vitest/__tests__/components/common/CrudModel.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/vitest/__tests__/components/common/CrudModel.spec.js b/test/vitest/__tests__/components/common/CrudModel.spec.js
index b425351af..870226309 100644
--- a/test/vitest/__tests__/components/common/CrudModel.spec.js
+++ b/test/vitest/__tests__/components/common/CrudModel.spec.js
@@ -2,7 +2,7 @@ import { createWrapper, axios } from 'app/test/vitest/helper';
 import CrudModel from 'components/CrudModel.vue';
 import { vi, afterEach, beforeEach, beforeAll, describe, expect, it } from 'vitest';
 
-describe.only('CrudModel', () => {
+describe('CrudModel', () => {
     let vm;
     beforeAll(() => {
         vm = createWrapper(CrudModel, {

From 8bd590447daee302b0227107097ef297c14e1e55 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 25 Aug 2023 14:17:11 +0200
Subject: [PATCH 20/26] refs #5673 feat: add toolbar in all cards

---
 src/pages/Claim/Card/ClaimNotes.vue          |  2 +-
 src/pages/Customer/Card/CustomerCard.vue     | 16 +++++++---------
 src/pages/InvoiceOut/Card/InvoiceOutCard.vue |  9 +++++++--
 src/pages/Ticket/Card/TicketCard.vue         |  9 +++++++--
 src/pages/Worker/Card/WorkerCard.vue         |  9 +++++++--
 5 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/src/pages/Claim/Card/ClaimNotes.vue b/src/pages/Claim/Card/ClaimNotes.vue
index 94b53c8a2..84d350e38 100644
--- a/src/pages/Claim/Card/ClaimNotes.vue
+++ b/src/pages/Claim/Card/ClaimNotes.vue
@@ -25,7 +25,7 @@ const body = {
 };
 </script>
 <template>
-    <div class="col items-center">
+    <div class="column items-center">
         <VnNotes
             :add-note="true"
             :id="id"
diff --git a/src/pages/Customer/Card/CustomerCard.vue b/src/pages/Customer/Card/CustomerCard.vue
index 16c756e6a..c833d0cf9 100644
--- a/src/pages/Customer/Card/CustomerCard.vue
+++ b/src/pages/Customer/Card/CustomerCard.vue
@@ -27,15 +27,13 @@ const { t } = useI18n();
         </QScrollArea>
     </QDrawer>
     <QPageContainer>
-        <QToolbar id="sub-toolbar" class="bg-dark text-white justify-end">
-            <div id="st-data">
-                {{ route.meta?.title && t(`customer.pageTitles.${route.meta.title}`) }}
-            </div>
-            <QSpace />
-            <div id="st-actions"></div>
-        </QToolbar>
-        <QPage class="q-pa-md">
-            <RouterView></RouterView>
+        <QPage>
+            <QToolbar class="bg-vn-dark justify-end">
+                <div id="st-data"></div>
+                <QSpace />
+                <div id="st-actions"></div>
+            </QToolbar>
+            <div class="q-pa-md"><RouterView></RouterView></div>
         </QPage>
     </QPageContainer>
 </template>
diff --git a/src/pages/InvoiceOut/Card/InvoiceOutCard.vue b/src/pages/InvoiceOut/Card/InvoiceOutCard.vue
index 5cbe72396..d24eb3ef2 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutCard.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutCard.vue
@@ -25,8 +25,13 @@ const { t } = useI18n();
         </QScrollArea>
     </QDrawer>
     <QPageContainer>
-        <QPage class="q-pa-md">
-            <RouterView></RouterView>
+        <QPage>
+            <QToolbar class="bg-vn-dark justify-end">
+                <div id="st-data"></div>
+                <QSpace />
+                <div id="st-actions"></div>
+            </QToolbar>
+            <div class="q-pa-md"><RouterView></RouterView></div>
         </QPage>
     </QPageContainer>
 </template>
diff --git a/src/pages/Ticket/Card/TicketCard.vue b/src/pages/Ticket/Card/TicketCard.vue
index e0ad5054d..91921f827 100644
--- a/src/pages/Ticket/Card/TicketCard.vue
+++ b/src/pages/Ticket/Card/TicketCard.vue
@@ -25,8 +25,13 @@ const { t } = useI18n();
         </QScrollArea>
     </QDrawer>
     <QPageContainer>
-        <QPage class="q-pa-md">
-            <RouterView></RouterView>
+        <QPage>
+            <QToolbar class="bg-vn-dark justify-end">
+                <div id="st-data"></div>
+                <QSpace />
+                <div id="st-actions"></div>
+            </QToolbar>
+            <div class="q-pa-md"><RouterView></RouterView></div>
         </QPage>
     </QPageContainer>
 </template>
diff --git a/src/pages/Worker/Card/WorkerCard.vue b/src/pages/Worker/Card/WorkerCard.vue
index 3d6b46e11..972eb52ec 100644
--- a/src/pages/Worker/Card/WorkerCard.vue
+++ b/src/pages/Worker/Card/WorkerCard.vue
@@ -25,8 +25,13 @@ const { t } = useI18n();
         </QScrollArea>
     </QDrawer>
     <QPageContainer>
-        <QPage class="q-pa-md">
-            <RouterView></RouterView>
+        <QPage>
+            <QToolbar class="bg-vn-dark justify-end">
+                <div id="st-data"></div>
+                <QSpace />
+                <div id="st-actions"></div>
+            </QToolbar>
+            <div class="q-pa-md"><RouterView></RouterView></div>
         </QPage>
     </QPageContainer>
 </template>

From 6786ac97e41b36abf19a706b124b3f9dd4cfa09e Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Wed, 30 Aug 2023 12:53:18 +0200
Subject: [PATCH 21/26] refs #5995 Improved external CMR

---
 src/i18n/en/index.js            |  4 ++-
 src/i18n/es/index.js            |  4 ++-
 src/pages/Route/Cmr/CmrList.vue | 58 +++++++++++++++++++++++++++------
 3 files changed, 54 insertions(+), 12 deletions(-)

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 4cafee136..fc091862e 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -482,7 +482,7 @@ export default {
         cmr: {
             list: {
                 total: 'Total records',
-                cmrFk: 'Cmr id',
+                cmrFk: 'CMR id',
                 hasCmrDms: `Attached in gestdoc`,
                 true: 'Yes',
                 false: 'No',
@@ -490,6 +490,8 @@ export default {
                 country: 'Country',
                 clientFk: 'Client id',
                 shipped: 'Preparation date',
+                viewCmr: 'View CMR',
+                downloadCmr: 'Download CMR',
             },
         },
     },
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 13e3fd626..6ed9d1b24 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -482,7 +482,7 @@ export default {
         cmr: {
             list: {
                 total: 'Total registros',
-                cmrFk: 'Id cmr',
+                cmrFk: 'Id CMR',
                 hasCmrDms: 'Adjuntado en gestdoc',
                 true: 'Sí',
                 false: 'No',
@@ -490,6 +490,8 @@ export default {
                 country: 'País',
                 clientFk: 'Id cliente',
                 shipped: 'Fecha preparación',
+                viewCmr: 'Ver CMR',
+                downloadCmr: 'Descargar CMR',
             },
         },
     },
diff --git a/src/pages/Route/Cmr/CmrList.vue b/src/pages/Route/Cmr/CmrList.vue
index 497d20914..fc966bc47 100644
--- a/src/pages/Route/Cmr/CmrList.vue
+++ b/src/pages/Route/Cmr/CmrList.vue
@@ -6,6 +6,8 @@ import VnPaginate from 'components/ui/VnPaginate.vue';
 import { useSession } from 'src/composables/useSession';
 import { toDate } from 'filters/index';
 import CmrFilter from './CmrFilter.vue';
+import TicketDescriptorProxy from 'pages/Ticket/Card/TicketDescriptorProxy.vue';
+import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy.vue';
 
 const stateStore = useStateStore();
 const { t } = useI18n();
@@ -54,10 +56,18 @@ const columns = computed(() => [
         sortable: true,
         headerStyle: 'padding-left: 33px',
     },
+    {
+        name: 'icons',
+        align: 'center',
+        field: (row) => row.cmrFk,
+    },
 ]);
 function getProjectUrl() {
     return new URL(window.location).origin;
 }
+function getCmrLink(cmrFk) {
+    return `${getProjectUrl()}/api/Routes/${cmrFk}/cmr?access_token=${token}`;
+}
 </script>
 <template>
     <div class="column items-center">
@@ -82,16 +92,6 @@ function getProjectUrl() {
                         <template #top>
                             {{ `${t('route.cmr.list.total')}: ${rows.length}` }}
                         </template>
-                        <template #body-cell-cmrFk="{ value }">
-                            <QTd align="right" class="text-primary">
-                                <a
-                                    :href="`${getProjectUrl()}/api/Routes/${value}/cmr?access_token=${token}`"
-                                    target="_blank"
-                                >
-                                    <span class="text-primary">{{ value }}</span>
-                                </a>
-                            </QTd>
-                        </template>
                         <template #body-cell-hasCmrDms="{ value }">
                             <QTd align="center">
                                 <QBadge
@@ -104,6 +104,44 @@ function getProjectUrl() {
                                 />
                             </QTd>
                         </template>
+                        <template #body-cell-ticketFk="{ value }">
+                            <QTd align="right" class="text-primary">
+                                <span class="text-primary link">{{ value }}</span>
+                                <TicketDescriptorProxy :id="value" />
+                            </QTd>
+                        </template>
+                        <template #body-cell-clientFk="{ value }">
+                            <QTd align="right" class="text-primary">
+                                <span class="text-primary link">{{ value }}</span>
+                                <CustomerDescriptorProxy :id="value" />
+                            </QTd>
+                        </template>
+                        <template #body-cell-icons="{ value }">
+                            <QTd align="center">
+                                <a :href="getCmrLink(value)" target="_blank">
+                                    <QIcon
+                                        name="visibility"
+                                        color="primary"
+                                        size="2em"
+                                        class="q-mr-sm q-ml-sm"
+                                    />
+                                    <QTooltip>
+                                        {{ t('route.cmr.list.viewCmr') }}
+                                    </QTooltip>
+                                </a>
+                                <a :href="getCmrLink(value)" download>
+                                    <QIcon
+                                        name="cloud_download"
+                                        color="primary"
+                                        size="2em"
+                                        class="q-mr-sm q-ml-sm"
+                                    />
+                                    <QTooltip>
+                                        {{ t('route.cmr.list.downloadCmr') }}
+                                    </QTooltip>
+                                </a>
+                            </QTd>
+                        </template>
                     </QTable>
                 </template>
             </VnPaginate>

From 71c6b865b61e574e66de9152a0a8b0d0d3de279b Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Fri, 1 Sep 2023 12:11:56 +0200
Subject: [PATCH 22/26] refs #5995 Improved external CMR

---
 src/i18n/en/index.js              |  8 +++--
 src/i18n/es/index.js              |  6 ++--
 src/pages/Route/Cmr/CmrFilter.vue | 41 ++++++++++++++++++----
 src/pages/Route/Cmr/CmrList.vue   | 57 ++++++++++++++++++++++---------
 4 files changed, 83 insertions(+), 29 deletions(-)

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index fc091862e..f37af64ff 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -32,10 +32,11 @@ export default {
         rowAdded: 'Row added',
         rowRemoved: 'Row removed',
         pleaseWait: 'Please wait...',
-        noPinnedModules: 'You have dont have any pinned modules',
+        noPinnedModules: `You don't have any pinned modules`,
         summary: {
             basicData: 'Basic data',
         },
+        noSelectedRows: `You don't have any line selected`,
     },
     errors: {
         statusUnauthorized: 'Access denied',
@@ -481,17 +482,18 @@ export default {
         },
         cmr: {
             list: {
-                total: 'Total records',
+                results: 'results',
                 cmrFk: 'CMR id',
                 hasCmrDms: `Attached in gestdoc`,
                 true: 'Yes',
                 false: 'No',
                 ticketFk: 'Ticketd id',
+                routeFk: 'Route id',
                 country: 'Country',
                 clientFk: 'Client id',
                 shipped: 'Preparation date',
                 viewCmr: 'View CMR',
-                downloadCmr: 'Download CMR',
+                downloadCmrs: 'Download CMRs',
             },
         },
     },
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 6ed9d1b24..2d46bdd41 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -36,6 +36,7 @@ export default {
         summary: {
             basicData: 'Datos básicos',
         },
+        noSelectedRows: `No tienes ninguna línea seleccionada`,
     },
     errors: {
         statusUnauthorized: 'Acceso denegado',
@@ -481,17 +482,18 @@ export default {
         },
         cmr: {
             list: {
-                total: 'Total registros',
+                results: 'resultados',
                 cmrFk: 'Id CMR',
                 hasCmrDms: 'Adjuntado en gestdoc',
                 true: 'Sí',
                 false: 'No',
                 ticketFk: 'Id ticket',
+                routeFk: 'Id ruta',
                 country: 'País',
                 clientFk: 'Id cliente',
                 shipped: 'Fecha preparación',
                 viewCmr: 'Ver CMR',
-                downloadCmr: 'Descargar CMR',
+                downloadCmrs: 'Descargar CMRs',
             },
         },
     },
diff --git a/src/pages/Route/Cmr/CmrFilter.vue b/src/pages/Route/Cmr/CmrFilter.vue
index eeb111304..b8948652a 100644
--- a/src/pages/Route/Cmr/CmrFilter.vue
+++ b/src/pages/Route/Cmr/CmrFilter.vue
@@ -28,7 +28,11 @@ const countries = ref();
             <QList dense>
                 <QItem>
                     <QItemSection>
-                        <QInput :label="t('route.cmr.list.cmrFk')" v-model="params.cmrFk" lazy-rules>
+                        <QInput
+                            :label="t('route.cmr.list.cmrFk')"
+                            v-model="params.cmrFk"
+                            lazy-rules
+                        >
                             <template #prepend>
                                 <QIcon name="article" size="sm"></QIcon>
                             </template>
@@ -46,7 +50,11 @@ const countries = ref();
                 </QItem>
                 <QItem>
                     <QItemSection>
-                        <QInput :label="t('route.cmr.list.ticketFk')" v-model="params.ticketFk" lazy-rules>
+                        <QInput
+                            :label="t('route.cmr.list.ticketFk')"
+                            v-model="params.ticketFk"
+                            lazy-rules
+                        >
                             <template #prepend>
                                 <QIcon name="vn:ticket" size="sm"></QIcon>
                             </template>
@@ -55,7 +63,24 @@ const countries = ref();
                 </QItem>
                 <QItem>
                     <QItemSection>
-                        <QInput :label="t('route.cmr.list.clientFk')" v-model="params.clientFk" lazy-rules>
+                        <QInput
+                            :label="t('route.cmr.list.routeFk')"
+                            v-model="params.routeFk"
+                            lazy-rules
+                        >
+                            <template #prepend>
+                                <QIcon name="vn:delivery" size="sm"></QIcon>
+                            </template>
+                        </QInput>
+                    </QItemSection>
+                </QItem>
+                <QItem>
+                    <QItemSection>
+                        <QInput
+                            :label="t('route.cmr.list.clientFk')"
+                            v-model="params.clientFk"
+                            lazy-rules
+                        >
                             <template #prepend>
                                 <QIcon name="vn:client" size="sm"></QIcon>
                             </template>
@@ -78,9 +103,9 @@ const countries = ref();
                             emit-value
                             map-options
                         >
-                        <template #prepend>
-                            <QIcon name="flag" size="sm"></QIcon>
-                        </template>
+                            <template #prepend>
+                                <QIcon name="flag" size="sm"></QIcon>
+                            </template>
                         </QSelect>
                     </QItemSection>
                 </QItem>
@@ -99,7 +124,9 @@ const countries = ref();
                                         transition-hide="rotate"
                                     >
                                         <QDate v-model="params.shipped" minimal>
-                                            <div class="row items-center justify-end q-gutter-sm">
+                                            <div
+                                                class="row items-center justify-end q-gutter-sm"
+                                            >
                                                 <QBtn
                                                     :label="t('globals.close')"
                                                     color="primary"
diff --git a/src/pages/Route/Cmr/CmrList.vue b/src/pages/Route/Cmr/CmrList.vue
index fc966bc47..e9355eed0 100644
--- a/src/pages/Route/Cmr/CmrList.vue
+++ b/src/pages/Route/Cmr/CmrList.vue
@@ -1,6 +1,7 @@
 <script setup>
 import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
+import { Notify } from 'quasar';
 import { useStateStore } from 'stores/useStateStore';
 import VnPaginate from 'components/ui/VnPaginate.vue';
 import { useSession } from 'src/composables/useSession';
@@ -13,6 +14,7 @@ const stateStore = useStateStore();
 const { t } = useI18n();
 const session = useSession();
 const token = session.getToken();
+const selected = ref([]);
 
 const columns = computed(() => [
     {
@@ -35,6 +37,12 @@ const columns = computed(() => [
         field: (row) => row.ticketFk,
         sortable: true,
     },
+    {
+        name: 'routeFkFk',
+        label: t('route.cmr.list.routeFk'),
+        field: (row) => row.routeFk,
+        sortable: true,
+    },
     {
         name: 'clientFk',
         label: t('route.cmr.list.clientFk'),
@@ -62,11 +70,24 @@ const columns = computed(() => [
         field: (row) => row.cmrFk,
     },
 ]);
-function getProjectUrl() {
+function getApiUrl() {
     return new URL(window.location).origin;
 }
-function getCmrLink(cmrFk) {
-    return `${getProjectUrl()}/api/Routes/${cmrFk}/cmr?access_token=${token}`;
+function getCmrUrl(value) {
+    return `${getApiUrl()}/api/Routes/${value}/cmr?access_token=${token}`;
+}
+function downloadPdfs() {
+    if (!selected.value.length) {
+        Notify.create({
+            message: t('globals.noSelectedRows'),
+            type: 'warning',
+        });
+        return;
+    }
+    let cmrs = [];
+    for (let value of selected.value) cmrs.push(value.cmrFk);
+    // prettier-ignore
+    return window.open(`${getApiUrl()}/api/Routes/downloadCmrsZip?ids=${cmrs.join(',')}&access_token=${token}`);
 }
 </script>
 <template>
@@ -86,11 +107,18 @@ function getCmrLink(cmrFk) {
                         :dense="$q.screen.lt.md"
                         :pagination="{ rowsPerPage: null }"
                         hide-pagination
+                        row-key="cmrFk"
+                        selection="multiple"
+                        v-model:selected="selected"
                         :grid="$q.screen.lt.md"
                         auto-load
                     >
                         <template #top>
-                            {{ `${t('route.cmr.list.total')}: ${rows.length}` }}
+                            <div style="width: 100%; display: table">
+                                <div style="float: right; color: lightgray">
+                                    {{ `${rows.length} ${t('route.cmr.list.results')}` }}
+                                </div>
+                            </div>
                         </template>
                         <template #body-cell-hasCmrDms="{ value }">
                             <QTd align="center">
@@ -118,7 +146,7 @@ function getCmrLink(cmrFk) {
                         </template>
                         <template #body-cell-icons="{ value }">
                             <QTd align="center">
-                                <a :href="getCmrLink(value)" target="_blank">
+                                <a :href="getCmrUrl(value)" target="_blank">
                                     <QIcon
                                         name="visibility"
                                         color="primary"
@@ -129,26 +157,21 @@ function getCmrLink(cmrFk) {
                                         {{ t('route.cmr.list.viewCmr') }}
                                     </QTooltip>
                                 </a>
-                                <a :href="getCmrLink(value)" download>
-                                    <QIcon
-                                        name="cloud_download"
-                                        color="primary"
-                                        size="2em"
-                                        class="q-mr-sm q-ml-sm"
-                                    />
-                                    <QTooltip>
-                                        {{ t('route.cmr.list.downloadCmr') }}
-                                    </QTooltip>
-                                </a>
                             </QTd>
                         </template>
                     </QTable>
                 </template>
             </VnPaginate>
         </div>
+        <QPageSticky :offset="[20, 20]">
+            <QBtn @click="downloadPdfs" fab icon="cloud_download" color="primary" />
+        </QPageSticky>
         <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
             <QScrollArea class="fit text-grey-8">
                 <CmrFilter data-key="CmrList" />
+                <QTooltip>
+                    {{ t('route.cmr.list.downloadCmrs') }}
+                </QTooltip>
             </QScrollArea>
         </QDrawer>
     </div>
@@ -158,7 +181,7 @@ function getCmrLink(cmrFk) {
 .list {
     padding-top: 15px;
     padding-bottom: 15px;
-    max-width: 900px;
+    max-width: 1000px;
     width: 100%;
 }
 .grid-style-transition {

From ea8a7de6d2b01ee26826fcd002e66dcc7889292b Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 18 Sep 2023 14:56:14 +0200
Subject: [PATCH 23/26] refs #5673 feat(crudModel): works with null values

---
 src/components/CrudModel.vue                             | 2 +-
 src/components/common/VnSelectFilter.vue                 | 2 ++
 src/pages/Claim/Card/ClaimDevelopment.vue                | 8 ++++----
 .../vitest/__tests__/components/common/CrudModel.spec.js | 9 +++++----
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/components/CrudModel.vue b/src/components/CrudModel.vue
index 98e2ff62f..e724bc0c5 100644
--- a/src/components/CrudModel.vue
+++ b/src/components/CrudModel.vue
@@ -226,7 +226,7 @@ function getDifferences(obj1, obj2) {
         }
     }
     for (let key in obj2) {
-        if (obj1[key] === undefined && obj2[key]) {
+        if (obj1[key] === undefined || obj1[key] !== obj2[key]) {
             diff[key] = obj2[key];
         }
     }
diff --git a/src/components/common/VnSelectFilter.vue b/src/components/common/VnSelectFilter.vue
index 95150cadc..1a1986c80 100644
--- a/src/components/common/VnSelectFilter.vue
+++ b/src/components/common/VnSelectFilter.vue
@@ -63,5 +63,7 @@ watch(options, (newValue) => {
         map-options
         use-input
         @filter="filterHandler"
+        clearable
+        clear-icon="close"
     />
 </template>
diff --git a/src/pages/Claim/Card/ClaimDevelopment.vue b/src/pages/Claim/Card/ClaimDevelopment.vue
index b293fcc8b..8c57d78ee 100644
--- a/src/pages/Claim/Card/ClaimDevelopment.vue
+++ b/src/pages/Claim/Card/ClaimDevelopment.vue
@@ -34,7 +34,7 @@ const developmentsFilter = {
 
 const columns = computed(() => [
     {
-        name: 'reason',
+        name: 'claimReason',
         label: t('Reason'),
         field: (row) => row.claimReasonFk,
         sortable: true,
@@ -45,7 +45,7 @@ const columns = computed(() => [
         optionLabel: 'description',
     },
     {
-        name: 'result',
+        name: 'claimResult',
         label: t('Result'),
         field: (row) => row.claimResultFk,
         sortable: true,
@@ -56,7 +56,7 @@ const columns = computed(() => [
         optionLabel: 'description',
     },
     {
-        name: 'responsible',
+        name: 'claimResponsible',
         label: t('Responsible'),
         field: (row) => row.claimResponsibleFk,
         sortable: true,
@@ -77,7 +77,7 @@ const columns = computed(() => [
         optionLabel: 'nickname',
     },
     {
-        name: 'redelivery',
+        name: 'claimRedelivery',
         label: t('Redelivery'),
         field: (row) => row.claimRedeliveryFk,
         sortable: true,
diff --git a/test/vitest/__tests__/components/common/CrudModel.spec.js b/test/vitest/__tests__/components/common/CrudModel.spec.js
index 870226309..b4770e2e8 100644
--- a/test/vitest/__tests__/components/common/CrudModel.spec.js
+++ b/test/vitest/__tests__/components/common/CrudModel.spec.js
@@ -95,8 +95,8 @@ describe('CrudModel', () => {
         });
     });
 
-    // TODO: remove test
-    describe.skip('remove()', () => {
+    // TODO: test .onOk()
+    describe('remove()', () => {
         it('should remove', async () => {
             vi.spyOn(vm.quasar, 'dialog');
 
@@ -111,7 +111,7 @@ describe('CrudModel', () => {
                 { id: 3, name: 'Bruce Wayne', $index: 3 },
             ]);
 
-            vm.remove([{ id: 1 }]);
+            await vm.remove([{ id: 1 }]);
 
             expect(vm.quasar.dialog).toHaveBeenCalled();
         });
@@ -125,7 +125,7 @@ describe('CrudModel', () => {
                 c: 3,
             };
             const obj2 = {
-                a: 1,
+                a: null,
                 b: 4,
                 d: 5,
             };
@@ -133,6 +133,7 @@ describe('CrudModel', () => {
             const result = vm.getDifferences(obj1, obj2);
 
             expect(result).toEqual({
+                a: null,
                 b: 4,
                 d: 5,
             });

From 52fcbdb68936a1f7af0a14024bcb14616325e65d Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 19 Sep 2023 10:21:24 +0200
Subject: [PATCH 24/26] refs #5673 feat(crudModel): add saveFn prop

---
 src/components/CrudModel.vue                  | 13 ++++++----
 src/pages/Worker/Card/WorkerSummary.vue       |  3 +--
 .../components/common/CrudModel.spec.js       | 24 +------------------
 3 files changed, 10 insertions(+), 30 deletions(-)

diff --git a/src/components/CrudModel.vue b/src/components/CrudModel.vue
index e724bc0c5..7a22d8373 100644
--- a/src/components/CrudModel.vue
+++ b/src/components/CrudModel.vue
@@ -53,6 +53,10 @@ const $props = defineProps({
         type: Object,
         default: null,
     },
+    saveFn: {
+        type: Function,
+        default: null,
+    },
 });
 
 const isLoading = ref(false);
@@ -83,6 +87,7 @@ onUnmounted(() => {
 function tMobile(...args) {
     if (!quasar.platform.is.mobile) return t(...args);
 }
+
 async function fetch(data) {
     if (data && Array.isArray(data)) {
         let $index = 0;
@@ -128,17 +133,18 @@ async function onSubmit() {
 }
 
 async function saveChanges(data) {
+    if ($props.saveFn) return $props.saveFn(data, getChanges);
     const changes = data || getChanges();
     try {
         await axios.post($props.saveUrl || $props.url + '/crud', changes);
     } catch (e) {
         return (isLoading.value = false);
     }
-
     originalData.value = JSON.parse(JSON.stringify(formData.value));
+    if (changes.creates?.length) await vnPaginateRef.value.fetch();
+
     hasChanges.value = false;
     isLoading.value = false;
-    if (changes.creates?.length) await vnPaginateRef.value.fetch();
 }
 
 async function insert() {
@@ -249,12 +255,9 @@ watch(formUrl, async () => {
 </script>
 <template>
     <VnPaginate
-        @submit="onSubmit"
-        @reset="reset"
         :url="url"
         v-bind="$attrs"
         @on-fetch="fetch"
-        class="q-pa-md"
         :skeleton="false"
         ref="vnPaginateRef"
     >
diff --git a/src/pages/Worker/Card/WorkerSummary.vue b/src/pages/Worker/Card/WorkerSummary.vue
index 05ccdc373..7c8accc5d 100644
--- a/src/pages/Worker/Card/WorkerSummary.vue
+++ b/src/pages/Worker/Card/WorkerSummary.vue
@@ -1,6 +1,5 @@
 <script setup>
-import axios from 'axios';
-import { ref, onMounted, computed, onUpdated } from 'vue';
+import { ref, onMounted, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import CardSummary from 'components/ui/CardSummary.vue';
diff --git a/test/vitest/__tests__/components/common/CrudModel.spec.js b/test/vitest/__tests__/components/common/CrudModel.spec.js
index b4770e2e8..87c0dc5bf 100644
--- a/test/vitest/__tests__/components/common/CrudModel.spec.js
+++ b/test/vitest/__tests__/components/common/CrudModel.spec.js
@@ -1,4 +1,4 @@
-import { createWrapper, axios } from 'app/test/vitest/helper';
+import { createWrapper } from 'app/test/vitest/helper';
 import CrudModel from 'components/CrudModel.vue';
 import { vi, afterEach, beforeEach, beforeAll, describe, expect, it } from 'vitest';
 
@@ -95,28 +95,6 @@ describe('CrudModel', () => {
         });
     });
 
-    // TODO: test .onOk()
-    describe('remove()', () => {
-        it('should remove', async () => {
-            vi.spyOn(vm.quasar, 'dialog');
-
-            vm.originalData = [
-                { id: 1, name: 'Tony Starks', $index: 1 },
-                { id: 2, name: 'Jessica Jones', $index: 2 },
-                { id: 3, name: 'Bruce Wayne', $index: 3 },
-            ];
-            vm.state.set('crudModel', [
-                { id: 1, name: 'New name one', $index: 1 },
-                { id: 2, name: 'New name two', $index: 2 },
-                { id: 3, name: 'Bruce Wayne', $index: 3 },
-            ]);
-
-            await vm.remove([{ id: 1 }]);
-
-            expect(vm.quasar.dialog).toHaveBeenCalled();
-        });
-    });
-
     describe('getDifferences()', () => {
         it('should return the differences between two objects', async () => {
             const obj1 = {

From 685c835d13e578354692fcb24924c9d5c5cc081e Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 21 Sep 2023 15:04:21 +0200
Subject: [PATCH 25/26] refs #5673 fix(crudModel): fix formData watcher and
 removed useState

---
 src/components/CrudModel.vue | 24 ++++++------------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/src/components/CrudModel.vue b/src/components/CrudModel.vue
index 7a22d8373..e25e527dc 100644
--- a/src/components/CrudModel.vue
+++ b/src/components/CrudModel.vue
@@ -3,7 +3,6 @@ import axios from 'axios';
 import { onMounted, onUnmounted, computed, ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
-import { useState } from 'src/composables/useState';
 import { useValidator } from 'src/composables/useValidator';
 import { useStateStore } from 'stores/useStateStore';
 import VnPaginate from 'components/ui/VnPaginate.vue';
@@ -11,7 +10,6 @@ import VnConfirm from 'components/ui/VnConfirm.vue';
 import SkeletonTable from 'components/ui/SkeletonTable.vue';
 
 const quasar = useQuasar();
-const state = useState();
 const stateStore = useStateStore();
 const { t } = useI18n();
 const { validate } = useValidator();
@@ -63,7 +61,7 @@ const isLoading = ref(false);
 const hasChanges = ref(false);
 const originalData = ref();
 const vnPaginateRef = ref();
-const formData = computed(() => state.get($props.model));
+const formData = ref();
 const formUrl = computed(() => $props.url);
 
 const emit = defineEmits(['onFetch', 'update:selected']);
@@ -76,14 +74,6 @@ defineExpose({
     hasChanges,
 });
 
-onMounted(async () => {
-    await fetch();
-});
-
-onUnmounted(() => {
-    state.unset($props.model);
-});
-
 function tMobile(...args) {
     if (!quasar.platform.is.mobile) return t(...args);
 }
@@ -94,12 +84,11 @@ async function fetch(data) {
         data.map((d) => (d.$index = $index++));
     }
 
-    state.set($props.model, data);
     originalData.value = data && JSON.parse(JSON.stringify(data));
+    formData.value = data && JSON.parse(JSON.stringify(data));
+    watch(formData, () => (hasChanges.value = true), { deep: true });
 
-    watch(formData.value, () => (hasChanges.value = true));
-
-    emit('onFetch', state.get($props.model));
+    emit('onFetch', data);
 }
 
 function reset() {
@@ -171,10 +160,10 @@ async function remove(data) {
         newData = newData.filter(
             (form) => !preRemove.some((index) => index == form.$index)
         );
-        state.set($props.model, newData);
         const changes = getChanges();
         if (!changes.creates?.length && !changes.updates?.length)
             hasChanges.value = false;
+        fetch(newData);
     }
     if (ids.length) {
         quasar
@@ -190,7 +179,7 @@ async function remove(data) {
             .onOk(async () => {
                 await saveChanges({ deletes: ids });
                 newData = newData.filter((form) => !ids.some((id) => id == form[pk]));
-                state.set($props.model, newData);
+                fetch(newData);
             });
     }
     emit('update:selected', []);
@@ -250,7 +239,6 @@ function isEmpty(obj) {
 watch(formUrl, async () => {
     originalData.value = null;
     reset();
-    fetch();
 });
 </script>
 <template>

From 1637921fab4fda96709e77fda0aad40498321d03 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 25 Sep 2023 12:06:49 +0200
Subject: [PATCH 26/26] refs #5673 fix: VnSelect update model,
 feat(claimDevelopment) add reload function

---
 cypress.config.js                             |   2 +-
 src/components/CrudModel.vue                  |  16 ++-
 src/components/common/VnSelectFilter.vue      |  17 ++-
 src/components/ui/CardDescriptor.vue          |   6 +-
 src/pages/Claim/Card/ClaimDescriptor.vue      |   4 +
 src/pages/Claim/Card/ClaimDevelopment.vue     | 120 ++++++++--------
 src/pages/Claim/Card/ClaimRma.vue             | 132 ++++++------------
 .../components/common/CrudModel.spec.js       |  24 ++--
 8 files changed, 150 insertions(+), 171 deletions(-)

diff --git a/cypress.config.js b/cypress.config.js
index 31aad6a86..2b5b40d08 100644
--- a/cypress.config.js
+++ b/cypress.config.js
@@ -7,7 +7,7 @@ module.exports = defineConfig({
         screenshotsFolder: 'test/cypress/screenshots',
         supportFile: 'test/cypress/support/index.js',
         videosFolder: 'test/cypress/videos',
-        video: true,
+        video: false,
         specPattern: 'test/cypress/integration/*.spec.js',
         experimentalRunAllSpecs: true,
         component: {
diff --git a/src/components/CrudModel.vue b/src/components/CrudModel.vue
index e25e527dc..ed869a565 100644
--- a/src/components/CrudModel.vue
+++ b/src/components/CrudModel.vue
@@ -1,6 +1,6 @@
 <script setup>
 import axios from 'axios';
-import { onMounted, onUnmounted, computed, ref, watch } from 'vue';
+import { computed, ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
 import { useValidator } from 'src/composables/useValidator';
@@ -33,7 +33,7 @@ const $props = defineProps({
     },
     dataRequired: {
         type: Object,
-        default: null,
+        default: () => {},
     },
     defaultSave: {
         type: Boolean,
@@ -67,6 +67,7 @@ const formUrl = computed(() => $props.url);
 const emit = defineEmits(['onFetch', 'update:selected']);
 
 defineExpose({
+    reload,
     insert,
     remove,
     onSubmit,
@@ -91,8 +92,8 @@ async function fetch(data) {
     emit('onFetch', data);
 }
 
-function reset() {
-    fetch(originalData.value);
+async function reset() {
+    await fetch(originalData.value);
     hasChanges.value = false;
 }
 // eslint-disable-next-line vue/no-dupe-keys
@@ -215,6 +216,9 @@ function getChanges() {
 
 function getDifferences(obj1, obj2) {
     let diff = {};
+    delete obj1.$index;
+    delete obj2.$index;
+
     for (let key in obj1) {
         if (obj2[key] && obj1[key] !== obj2[key]) {
             diff[key] = obj2[key];
@@ -236,6 +240,10 @@ function isEmpty(obj) {
     if (obj.length > 0) return false;
 }
 
+async function reload() {
+    vnPaginateRef.value.fetch();
+}
+
 watch(formUrl, async () => {
     originalData.value = null;
     reset();
diff --git a/src/components/common/VnSelectFilter.vue b/src/components/common/VnSelectFilter.vue
index 1a1986c80..9ccb94e33 100644
--- a/src/components/common/VnSelectFilter.vue
+++ b/src/components/common/VnSelectFilter.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, toRefs, watch } from 'vue';
+import { ref, toRefs, watch, computed } from 'vue';
 const emit = defineEmits(['update:modelValue', 'update:options']);
 
 const $props = defineProps({
@@ -16,8 +16,7 @@ const $props = defineProps({
         default: '',
     },
 });
-const updateValue = (newValue) => emit('update:modelValue', newValue);
-const { modelValue, optionLabel, options } = toRefs($props);
+const { optionLabel, options } = toRefs($props);
 const myOptions = ref([]);
 const myOptionsOriginal = ref([]);
 function setOptions(data) {
@@ -50,12 +49,20 @@ const filterHandler = (val, update) => {
 watch(options, (newValue) => {
     setOptions(newValue);
 });
+
+const value = computed({
+    get() {
+        return $props.modelValue;
+    },
+    set(value) {
+        emit('update:modelValue', value);
+    },
+});
 </script>
 
 <template>
     <QSelect
-        v-model="modelValue"
-        @update:model-value="updateValue"
+        v-model="value"
         :options="myOptions"
         :option-label="optionLabel"
         v-bind="$attrs"
diff --git a/src/components/ui/CardDescriptor.vue b/src/components/ui/CardDescriptor.vue
index 65a89ee28..f63b75de6 100644
--- a/src/components/ui/CardDescriptor.vue
+++ b/src/components/ui/CardDescriptor.vue
@@ -29,12 +29,14 @@ const $props = defineProps({
 
 const slots = useSlots();
 const { t } = useI18n();
+const entity = ref();
 
-onMounted(() => fetch());
+onMounted(async () => {
+    await fetch();
+});
 
 const emit = defineEmits(['onFetch']);
 
-const entity = ref();
 async function fetch() {
     const params = {};
 
diff --git a/src/pages/Claim/Card/ClaimDescriptor.vue b/src/pages/Claim/Card/ClaimDescriptor.vue
index 914de2eb2..af7e84d38 100644
--- a/src/pages/Claim/Card/ClaimDescriptor.vue
+++ b/src/pages/Claim/Card/ClaimDescriptor.vue
@@ -3,6 +3,8 @@ import { ref, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { toDate } from 'src/filters';
+import { useState } from 'src/composables/useState';
+
 import TicketDescriptorProxy from 'pages/Ticket/Card/TicketDescriptorProxy.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 import ClaimDescriptorMenu from 'pages/Claim/Card/ClaimDescriptorMenu.vue';
@@ -19,6 +21,7 @@ const $props = defineProps({
 });
 
 const route = useRoute();
+const state = useState();
 const { t } = useI18n();
 
 const entityId = computed(() => {
@@ -67,6 +70,7 @@ function stateColor(code) {
 const data = ref(useCardDescription());
 const setData = (entity) => {
     data.value = useCardDescription(entity.client.name, entity.id);
+    state.set('ClaimDescriptor', entity);
 };
 </script>
 
diff --git a/src/pages/Claim/Card/ClaimDevelopment.vue b/src/pages/Claim/Card/ClaimDevelopment.vue
index 8c57d78ee..ea4b178b5 100644
--- a/src/pages/Claim/Card/ClaimDevelopment.vue
+++ b/src/pages/Claim/Card/ClaimDevelopment.vue
@@ -120,67 +120,65 @@ const columns = computed(() => [
         @on-fetch="(data) => (workers = data)"
         auto-load
     />
-    <div class="column items-center">
-        <CrudModel
-            data-key="ClaimDevelopments"
-            url="ClaimDevelopments"
-            model="claimDevelopment"
-            :filter="developmentsFilter"
-            ref="claimDevelopmentForm"
-            :data-required="{ claimFk: route.params.id }"
-            v-model:selected="selected"
-            auto-load
-        >
-            <template #body="{ rows }">
-                <QTable
-                    :columns="columns"
-                    :rows="rows"
-                    :pagination="{ rowsPerPage: 0 }"
-                    row-key="$index"
-                    selection="multiple"
-                    hide-pagination
-                    v-model:selected="selected"
-                    :grid="$q.screen.lt.md"
-                >
-                    <template #body-cell="{ row, col }">
-                        <QTd auto-width>
-                            <VnSelectFilter
-                                :label="col.label"
-                                v-model="row[col.model]"
-                                :options="col.options"
-                                :option-value="col.optionValue"
-                                :option-label="col.optionLabel"
-                            />
-                        </QTd>
-                    </template>
-                    <template #item="props">
-                        <div class="q-pa-xs col-xs-12 col-sm-6 grid-style-transition">
-                            <QCard bordered flat>
-                                <QCardSection>
-                                    <QCheckbox v-model="props.selected" dense />
-                                </QCardSection>
-                                <QSeparator />
-                                <QList dense>
-                                    <QItem v-for="col in props.cols" :key="col.name">
-                                        <QItemSection>
-                                            <VnSelectFilter
-                                                :label="col.label"
-                                                v-model="props.row[col.model]"
-                                                :options="col.options"
-                                                :option-value="col.optionValue"
-                                                :option-label="col.optionLabel"
-                                                dense
-                                            />
-                                        </QItemSection>
-                                    </QItem>
-                                </QList>
-                            </QCard>
-                        </div>
-                    </template>
-                </QTable>
-            </template>
-        </CrudModel>
-    </div>
+    <CrudModel
+        data-key="ClaimDevelopments"
+        url="ClaimDevelopments"
+        model="claimDevelopment"
+        :filter="developmentsFilter"
+        ref="claimDevelopmentForm"
+        :data-required="{ claimFk: route.params.id }"
+        v-model:selected="selected"
+        auto-load
+    >
+        <template #body="{ rows }">
+            <QTable
+                :columns="columns"
+                :rows="rows"
+                :pagination="{ rowsPerPage: 0 }"
+                row-key="$index"
+                selection="multiple"
+                hide-pagination
+                v-model:selected="selected"
+                :grid="$q.screen.lt.md"
+            >
+                <template #body-cell="{ row, col }">
+                    <QTd auto-width>
+                        <VnSelectFilter
+                            :label="col.label"
+                            v-model="row[col.model]"
+                            :options="col.options"
+                            :option-value="col.optionValue"
+                            :option-label="col.optionLabel"
+                        />
+                    </QTd>
+                </template>
+                <template #item="props">
+                    <div class="q-pa-xs col-xs-12 col-sm-6 grid-style-transition">
+                        <QCard bordered flat>
+                            <QCardSection>
+                                <QCheckbox v-model="props.selected" dense />
+                            </QCardSection>
+                            <QSeparator />
+                            <QList dense>
+                                <QItem v-for="col in props.cols" :key="col.name">
+                                    <QItemSection>
+                                        <VnSelectFilter
+                                            :label="col.label"
+                                            v-model="props.row[col.model]"
+                                            :options="col.options"
+                                            :option-value="col.optionValue"
+                                            :option-label="col.optionLabel"
+                                            dense
+                                        />
+                                    </QItemSection>
+                                </QItem>
+                            </QList>
+                        </QCard>
+                    </div>
+                </template>
+            </QTable>
+        </template>
+    </CrudModel>
     <QPageSticky position="bottom-right" :offset="[25, 25]">
         <QBtn fab color="primary" icon="add" @click="claimDevelopmentForm.insert()" />
     </QPageSticky>
diff --git a/src/pages/Claim/Card/ClaimRma.vue b/src/pages/Claim/Card/ClaimRma.vue
index de984c8f7..bba901d7b 100644
--- a/src/pages/Claim/Card/ClaimRma.vue
+++ b/src/pages/Claim/Card/ClaimRma.vue
@@ -1,46 +1,34 @@
 <script setup>
 import axios from 'axios';
-import { ref } from 'vue';
+import { watch, ref, computed, onUnmounted, onMounted } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
-import { useRoute } from 'vue-router';
-import { useArrayData } from 'src/composables/useArrayData';
-import VnPaginate from 'src/components/ui/VnPaginate.vue';
-import FetchData from 'components/FetchData.vue';
-import VnConfirm from 'src/components/ui/VnConfirm.vue';
+import CrudModel from 'components/CrudModel.vue';
+import { useState } from 'src/composables/useState';
 
 import { toDate } from 'src/filters';
 
 const quasar = useQuasar();
-const route = useRoute();
+const state = useState();
 const { t } = useI18n();
-const arrayData = useArrayData('ClaimRma');
+const selected = ref([]);
+const claimRmaRef = ref();
+const claim = computed(() => state.get('ClaimDescriptor'));
 
-const claim = ref();
-const claimFilter = {
-    fields: ['rma'],
-};
-
-async function onFetch(data) {
-    claim.value = data;
-
-    const filter = {
-        include: {
-            relation: 'worker',
-            scope: {
-                include: {
-                    relation: 'user',
-                },
+const claimRmaFilter = {
+    include: {
+        relation: 'worker',
+        scope: {
+            include: {
+                relation: 'user',
             },
         },
-        order: 'created DESC',
-        where: {
-            code: claim.value.rma,
-        },
-    };
-
-    arrayData.applyFilter({ filter });
-}
+    },
+    order: 'created DESC',
+    where: {
+        code: claim.value?.rma,
+    },
+};
 
 async function addRow() {
     if (!claim.value.rma) {
@@ -54,7 +42,7 @@ async function addRow() {
     };
 
     await axios.post(`ClaimRmas`, formData);
-    await arrayData.refresh();
+    await claimRmaRef.value.reload();
 
     quasar.notify({
         type: 'positive',
@@ -63,38 +51,33 @@ async function addRow() {
     });
 }
 
-function confirmRemove(id) {
-    quasar
-        .dialog({
-            component: VnConfirm,
-            componentProps: {
-                data: { id },
-                promise: remove,
-            },
-        })
-        .onOk(async () => await arrayData.refresh());
-}
-
-async function remove({ id }) {
-    await axios.delete(`ClaimRmas/${id}`);
-    quasar.notify({
-        type: 'positive',
-        message: t('globals.rowRemoved'),
-    });
-}
+onMounted(() => {
+    if (claim.value) claimRmaRef.value.reload();
+});
+watch(
+    claim,
+    () => {
+        claimRmaRef.value.reload();
+    },
+    { deep: true }
+);
 </script>
 <template>
-    <FetchData
-        :url="`Claims/${route.params.id}`"
-        :filter="claimFilter"
-        @on-fetch="onFetch"
-        auto-load
-    />
     <div class="column items-center">
         <div class="list">
-            <VnPaginate data-key="ClaimRma" url="ClaimRmas">
+            <CrudModel
+                data-key="ClaimRma"
+                url="ClaimRmas"
+                model="ClaimRma"
+                :filter="claimRmaFilter"
+                v-model:selected="selected"
+                ref="claimRmaRef"
+                :default-save="false"
+                :default-reset="false"
+                :default-remove="false"
+            >
                 <template #body="{ rows }">
-                    <QCard class="card">
+                    <QCard>
                         <template v-for="(row, index) of rows" :key="row.id">
                             <QItem class="q-pa-none items-start">
                                 <QItemSection class="q-pa-md">
@@ -105,7 +88,7 @@ async function remove({ id }) {
                                                     {{ t('claim.rma.user') }}
                                                 </QItemLabel>
                                                 <QItemLabel>
-                                                    {{ row.worker.user.name }}
+                                                    {{ row?.worker?.user?.name }}
                                                 </QItemLabel>
                                             </QItemSection>
                                         </QItem>
@@ -131,7 +114,7 @@ async function remove({ id }) {
                                         round
                                         color="orange"
                                         icon="vn:bin"
-                                        @click="confirmRemove(row.id)"
+                                        @click="claimRmaRef.remove([row])"
                                     >
                                         <QTooltip>{{ t('globals.remove') }}</QTooltip>
                                     </QBtn>
@@ -141,24 +124,11 @@ async function remove({ id }) {
                         </template>
                     </QCard>
                 </template>
-            </VnPaginate>
+            </CrudModel>
         </div>
     </div>
-
     <QPageSticky position="bottom-right" :offset="[25, 25]">
-        <label for="fileInput">
-            <QBtn fab @click="inputFile.nativeEl.click()" icon="add" color="primary">
-                <QInput
-                    ref="inputFile"
-                    type="file"
-                    style="display: none"
-                    multiple
-                    v-model="files"
-                    @update:model-value="create()"
-                />
-                <QTooltip bottom> {{ t('globals.add') }} </QTooltip>
-            </QBtn>
-        </label>
+        <QBtn fab color="primary" icon="add" @click="addRow()" />
     </QPageSticky>
 </template>
 
@@ -167,16 +137,6 @@ async function remove({ id }) {
     width: 100%;
     max-width: 60em;
 }
-.q-toolbar {
-    background-color: $grey-9;
-}
-.sticky-page {
-    padding-top: 66px;
-}
-
-.q-page-sticky {
-    z-index: 2998;
-}
 </style>
 
 <i18n>
diff --git a/test/vitest/__tests__/components/common/CrudModel.spec.js b/test/vitest/__tests__/components/common/CrudModel.spec.js
index 87c0dc5bf..6ce93e59c 100644
--- a/test/vitest/__tests__/components/common/CrudModel.spec.js
+++ b/test/vitest/__tests__/components/common/CrudModel.spec.js
@@ -15,7 +15,6 @@ describe('CrudModel', () => {
                     'vue-i18n',
                 ],
                 mocks: {
-                    fetch: vi.fn(),
                     validate: vi.fn(),
                 },
             },
@@ -31,7 +30,7 @@ describe('CrudModel', () => {
     });
 
     beforeEach(() => {
-        vm.state.set('crudModel', []);
+        vm.fetch([]);
     });
 
     afterEach(() => {
@@ -50,24 +49,25 @@ describe('CrudModel', () => {
 
     describe('getChanges()', () => {
         it('should return correct updates and creates', async () => {
-            vm.originalData = [
-                { id: 1, name: 'Tony Starks', $index: 1 },
-                { id: 2, name: 'Jessica Jones', $index: 2 },
-                { id: 3, name: 'Bruce Wayne', $index: 3 },
-            ];
-            vm.state.set('crudModel', [
-                { id: 1, name: 'New name one', $index: 1 },
-                { id: 2, name: 'New name two', $index: 2 },
-                { id: 3, name: 'Bruce Wayne', $index: 3 },
+            vm.fetch([
+                { id: 1, name: 'New name one' },
+                { id: 2, name: 'New name two' },
+                { id: 3, name: 'Bruce Wayne' },
             ]);
 
+            vm.originalData = [
+                { id: 1, name: 'Tony Starks' },
+                { id: 2, name: 'Jessica Jones' },
+                { id: 3, name: 'Bruce Wayne' },
+            ];
+
             vm.insert();
             const result = vm.getChanges();
 
             const expected = {
                 creates: [
                     {
-                        $index: 4,
+                        $index: 3,
                         fk: 1,
                     },
                 ],