From 3bfbed9e545c1c1462c59ef2ac2ed7d40a4f2030 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 10 Jun 2024 13:19:09 +0200
Subject: [PATCH 01/12] refs #7529 create WorkerPIT

---
 src/pages/Worker/Card/WorkerPit.vue | 112 ++++++++++++++++++++++++++++
 src/router/modules/worker.js        |   9 +++
 2 files changed, 121 insertions(+)
 create mode 100644 src/pages/Worker/Card/WorkerPit.vue

diff --git a/src/pages/Worker/Card/WorkerPit.vue b/src/pages/Worker/Card/WorkerPit.vue
new file mode 100644
index 000000000..6e088ba76
--- /dev/null
+++ b/src/pages/Worker/Card/WorkerPit.vue
@@ -0,0 +1,112 @@
+<script setup>
+import { ref } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+import VnInputDate from 'src/components/common/VnInputDate.vue';
+import FetchData from 'components/FetchData.vue';
+import FormModel from 'src/components/FormModel.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
+
+const route = useRoute();
+const { t } = useI18n();
+const router = useRouter();
+
+const toCustomerAddressCreate = () => {
+    router.push({ name: 'CustomerAddressCreate' });
+};
+</script>
+
+<template>
+    <FetchData
+        url="disabilityGrades"
+        @on-fetch="(data) => (disabilityGradesOptions = data)"
+        auto-load
+    />
+    <FormModel
+        :url="`Workers/${route.params.id}/WorkerIrpfs`"
+        auto-load
+        model="WorkerIrpf"
+    >
+        <template #form="{ data }">
+            <VnRow>
+                <VnInput
+                    :label="t('familySituation')"
+                    clearable
+                    v-model="data.familySituation"
+                />
+                <VnInput :label="t('spouseNif')" clearable v-model="data.spouseNif" />
+            </VnRow>
+            <VnRow>
+                <VnSelect
+                    :label="t('disabilityGrades')"
+                    :options="disabilityGradesOptions"
+                    hide-selected
+                    option-label="description"
+                    option-value="id"
+                    v-model="data.disabilityGradeFk"
+                />
+
+                <VnInputDate
+                    :label="t('geographicMobilityDate')"
+                    v-model="data.geographicMobilityDate"
+                />
+            </VnRow>
+
+            <VnRow>
+                <VnInput
+                    clearable
+                    v-model="data.childPension"
+                    :label="t(`childPension`)"
+                />
+                <VnInput
+                    clearable
+                    v-model="data.spousePension"
+                    :label="t(`spousePension`)"
+                />
+            </VnRow>
+
+            <VnRow>
+                <QCheckbox
+                    size="sm"
+                    v-model="data.isDependend"
+                    :label="t(`isDependend`)"
+                />
+                <QCheckbox
+                    size="sm"
+                    v-model="data.hasHousingPaymentBefore"
+                    :label="t(`hasHousingPaymentBefore`)"
+                />
+            </VnRow>
+            <VnRow>
+                <QCheckbox
+                    size="sm"
+                    v-model="data.hasHousingPaymentAfter"
+                    :label="t(`hasHousingPaymentAfter`)"
+                />
+
+                <QCheckbox
+                    size="sm"
+                    v-model="data.hasExtendedWorking"
+                    :label="t(`hasExtendedWorking`)"
+                />
+            </VnRow>
+            <QSeparator class="q-mx-lg" vertical />
+        </template>
+    </FormModel>
+</template>
+
+<i18n>
+es:
+    familySituation: Situación familiar
+    disabilityGrades: Discapacidad
+    geographicMobilityDate: Movilidad geografica
+    childPension: Pensión hijos
+    spousePension: Pensión cónyuge
+    isDependend: Ayuda / Movilidad reducida
+    spouseNif: NIF cónyuge
+    hasHousingPaymentBefore: Pagos vivienda anterior 2011
+    hasHousingPaymentAfter: Pagos vivienda posterior 2011
+    hasExtendedWorking: Prolongación actividad laboral
+</i18n>
diff --git a/src/router/modules/worker.js b/src/router/modules/worker.js
index 927d11802..14b0708ac 100644
--- a/src/router/modules/worker.js
+++ b/src/router/modules/worker.js
@@ -176,6 +176,15 @@ export default {
                     },
                     component: () => import('src/pages/Worker/Card/WorkerLocker.vue'),
                 },
+                {
+                    name: 'WorkerPit',
+                    path: 'pit',
+                    meta: {
+                        title: 'pit',
+                        icon: 'lock',
+                    },
+                    component: () => import('src/pages/Worker/Card/WorkerPit.vue'),
+                },
             ],
         },
     ],
-- 
2.40.1


From 657dbc67615af7372b1dac8d1b93f004933369b9 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 13 Jun 2024 08:24:36 +0200
Subject: [PATCH 02/12] refs #7529 route

---
 src/router/modules/worker.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/router/modules/worker.js b/src/router/modules/worker.js
index 14b0708ac..77b2586fa 100644
--- a/src/router/modules/worker.js
+++ b/src/router/modules/worker.js
@@ -23,6 +23,7 @@ export default {
             'WorkerDms',
             'WorkerTimeControl',
             'WorkerLocker',
+            'WorkerPit',
         ],
     },
     children: [
-- 
2.40.1


From 87bce8fc216a9ed0ff9f0e67e7ca6b0944857b69 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 18 Sep 2024 12:08:38 +0200
Subject: [PATCH 03/12] refs #7529 fix workerPit

---
 src/i18n/locale/en.yml              |  1 +
 src/i18n/locale/es.yml              |  1 +
 src/pages/Worker/Card/WorkerPit.vue | 28 +++++++++++++++++++++++-----
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index e27dc7bd4..499b40537 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -272,6 +272,7 @@ globals:
         clientsActionsMonitor: Clients and actions
         serial: Serial
         medical: Mutual
+        pit: IRPF
     supplier: Supplier
     created: Created
     worker: Worker
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index ed34c8761..34f45b3ca 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -275,6 +275,7 @@ globals:
         clientsActionsMonitor: Clientes y acciones
         serial: Facturas por serie
         medical: Mutua
+        pit: IRPF
     supplier: Proveedor
     created: Fecha creación
     worker: Trabajador
diff --git a/src/pages/Worker/Card/WorkerPit.vue b/src/pages/Worker/Card/WorkerPit.vue
index 6e088ba76..e01878340 100644
--- a/src/pages/Worker/Card/WorkerPit.vue
+++ b/src/pages/Worker/Card/WorkerPit.vue
@@ -24,11 +24,7 @@ const toCustomerAddressCreate = () => {
         @on-fetch="(data) => (disabilityGradesOptions = data)"
         auto-load
     />
-    <FormModel
-        :url="`Workers/${route.params.id}/WorkerIrpfs`"
-        auto-load
-        model="WorkerIrpf"
-    >
+    <FormModel :url="`Workers/${route.params.id}/irpf`" auto-load model="WorkerIrpfs">
         <template #form="{ data }">
             <VnRow>
                 <VnInput
@@ -95,6 +91,17 @@ const toCustomerAddressCreate = () => {
             <QSeparator class="q-mx-lg" vertical />
         </template>
     </FormModel>
+    <FormModel
+        :url="`Workers/${route.params.id}/workerRelative`"
+        auto-load
+        model="WorkerRelatives"
+    >
+        <VnRow>
+            <VnInputDate size="sm" v-model="data.birthed" :label="t(`birthed`)" />
+
+            <VnInput size="sm" v-model="data.adoptionYear" :label="t(`adoptionYear`)" />
+        </VnRow>
+    </FormModel>
 </template>
 
 <i18n>
@@ -109,4 +116,15 @@ es:
     hasHousingPaymentBefore: Pagos vivienda anterior 2011
     hasHousingPaymentAfter: Pagos vivienda posterior 2011
     hasExtendedWorking: Prolongación actividad laboral
+en:
+    familySituation: Family Situation
+    disabilityGrades: Disability Grades
+    geographicMobilityDate: Geographic Mobility Date
+    childPension: Child Pension
+    spousePension: Spouse Pension
+    isDependend: Dependent Support / Reduced Mobility
+    spouseNif: Spouse NIF (Tax ID)
+    hasHousingPaymentBefore: Housing Payments Before 2011
+    hasHousingPaymentAfter: Housing Payments After 2011
+    hasExtendedWorking: Extended Work Activity
 </i18n>
-- 
2.40.1


From ee2f80e9bba8c9369780d03e21a69161c9f598fd Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 19 Sep 2024 10:25:22 +0200
Subject: [PATCH 04/12] refs #7529 crudModel workerPit

---
 src/pages/Worker/Card/WorkerPit.vue | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/pages/Worker/Card/WorkerPit.vue b/src/pages/Worker/Card/WorkerPit.vue
index e01878340..4a6cd12df 100644
--- a/src/pages/Worker/Card/WorkerPit.vue
+++ b/src/pages/Worker/Card/WorkerPit.vue
@@ -8,6 +8,7 @@ import FormModel from 'src/components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
+import CrudModel from 'components/CrudModel.vue';
 
 const route = useRoute();
 const { t } = useI18n();
@@ -91,17 +92,29 @@ const toCustomerAddressCreate = () => {
             <QSeparator class="q-mx-lg" vertical />
         </template>
     </FormModel>
-    <FormModel
+    <CrudModel
+        ref="workerPitCrudRef"
+        data-key="workerPit"
         :url="`Workers/${route.params.id}/workerRelative`"
         auto-load
         model="WorkerRelatives"
     >
-        <VnRow>
+        <template #body="{ rows }">
+            <QTable
+                :columns="columns"
+                :rows="rows"
+                row-key="$index"
+                selection="multiple"
+                v-model:selected="selected"
+                table-header-class="text-left"
+            ></QTable>
+        </template>
+        <!-- <VnRow>
             <VnInputDate size="sm" v-model="data.birthed" :label="t(`birthed`)" />
 
             <VnInput size="sm" v-model="data.adoptionYear" :label="t(`adoptionYear`)" />
-        </VnRow>
-    </FormModel>
+        </VnRow> -->
+    </CrudModel>
 </template>
 
 <i18n>
-- 
2.40.1


From 1aefad58e916b5ed9065c1413883013987de9281 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 18 Oct 2024 14:05:38 +0200
Subject: [PATCH 05/12] fix: refs #7529 fix front

---
 src/pages/Worker/Card/WorkerPit.vue | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/pages/Worker/Card/WorkerPit.vue b/src/pages/Worker/Card/WorkerPit.vue
index 4a6cd12df..ac3e75026 100644
--- a/src/pages/Worker/Card/WorkerPit.vue
+++ b/src/pages/Worker/Card/WorkerPit.vue
@@ -13,7 +13,7 @@ import CrudModel from 'components/CrudModel.vue';
 const route = useRoute();
 const { t } = useI18n();
 const router = useRouter();
-
+const disabilityGradesOptions = ref();
 const toCustomerAddressCreate = () => {
     router.push({ name: 'CustomerAddressCreate' });
 };
@@ -21,11 +21,16 @@ const toCustomerAddressCreate = () => {
 
 <template>
     <FetchData
-        url="disabilityGrades"
+        url="DisabilityGrades"
         @on-fetch="(data) => (disabilityGradesOptions = data)"
         auto-load
     />
-    <FormModel :url="`Workers/${route.params.id}/irpf`" auto-load model="WorkerIrpfs">
+    <FormModel
+        url="WorkerIrpfs"
+        :filter="{ where: { workerFk: route.params.id } }"
+        auto-load
+        model="WorkerIrpfs"
+    >
         <template #form="{ data }">
             <VnRow>
                 <VnInput
@@ -95,9 +100,8 @@ const toCustomerAddressCreate = () => {
     <CrudModel
         ref="workerPitCrudRef"
         data-key="workerPit"
-        :url="`Workers/${route.params.id}/workerRelative`"
+        url="WorkerRelatives"
         auto-load
-        model="WorkerRelatives"
     >
         <template #body="{ rows }">
             <QTable
-- 
2.40.1


From 8b2fbefc35a08cfb4dc167269a00af369eabf75e Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 29 Oct 2024 14:00:04 +0100
Subject: [PATCH 06/12] fix: refs #7529 front

---
 src/pages/Worker/Card/WorkerPit.vue | 285 +++++++++++++++++++---------
 1 file changed, 197 insertions(+), 88 deletions(-)

diff --git a/src/pages/Worker/Card/WorkerPit.vue b/src/pages/Worker/Card/WorkerPit.vue
index ac3e75026..97f8289a5 100644
--- a/src/pages/Worker/Card/WorkerPit.vue
+++ b/src/pages/Worker/Card/WorkerPit.vue
@@ -1,21 +1,48 @@
 <script setup>
 import { ref } from 'vue';
-import { useRoute, useRouter } from 'vue-router';
+import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
+import axios from 'axios';
 import FetchData from 'components/FetchData.vue';
 import FormModel from 'src/components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import CrudModel from 'components/CrudModel.vue';
-
+import VnTitle from 'src/components/common/VnTitle.vue';
+import { useQuasar } from 'quasar';
+import VnConfirm from 'components/ui/VnConfirm.vue';
+import useNotify from 'src/composables/useNotify.js';
+const { notify } = useNotify();
 const route = useRoute();
 const { t } = useI18n();
-const router = useRouter();
 const disabilityGradesOptions = ref();
-const toCustomerAddressCreate = () => {
-    router.push({ name: 'CustomerAddressCreate' });
+const workerPitCrudRef = ref({});
+const insertTag = () => {
+    workerPitCrudRef.value.insert();
+};
+const quasar = useQuasar();
+const deleteRelative = async (id) => {
+    await new Promise((resolve) => {
+        quasar
+            .dialog({
+                component: VnConfirm,
+                componentProps: {
+                    title: t('Remove Relative'),
+                    message: t('Do you want to remove this relative?'),
+                },
+            })
+            .onOk(() => {
+                resolve(true);
+            })
+            .onCancel(() => {
+                resolve(false);
+            });
+    });
+    await axios.delete(`WorkerRelatives/${id}`);
+    workerPitCrudRef.value.reload();
+    notify('Relative removed', 'positive');
 };
 </script>
 
@@ -25,100 +52,170 @@ const toCustomerAddressCreate = () => {
         @on-fetch="(data) => (disabilityGradesOptions = data)"
         auto-load
     />
+
     <FormModel
         url="WorkerIrpfs"
         :filter="{ where: { workerFk: route.params.id } }"
         auto-load
-        model="WorkerIrpfs"
+        data-key="workerIrpfs"
     >
         <template #form="{ data }">
-            <VnRow>
-                <VnInput
-                    :label="t('familySituation')"
-                    clearable
-                    v-model="data.familySituation"
-                />
-                <VnInput :label="t('spouseNif')" clearable v-model="data.spouseNif" />
-            </VnRow>
-            <VnRow>
-                <VnSelect
-                    :label="t('disabilityGrades')"
-                    :options="disabilityGradesOptions"
-                    hide-selected
-                    option-label="description"
-                    option-value="id"
-                    v-model="data.disabilityGradeFk"
-                />
+            <QCard class="q-px-lg q-py-lg">
+                <VnTitle :text="t('IRPF')" />
+                <VnRow>
+                    <VnInput
+                        :label="t('familySituation')"
+                        clearable
+                        v-model="data.familySituation"
+                    />
+                    <VnInput :label="t('spouseNif')" clearable v-model="data.spouseNif" />
+                </VnRow>
+                <VnRow>
+                    <VnSelect
+                        :label="t('disabilityGrades')"
+                        :options="disabilityGradesOptions"
+                        option-label="description"
+                        option-value="id"
+                        v-model="data.disabilityGradeFk"
+                    />
 
-                <VnInputDate
-                    :label="t('geographicMobilityDate')"
-                    v-model="data.geographicMobilityDate"
-                />
-            </VnRow>
+                    <VnInputDate
+                        :label="t('geographicMobilityDate')"
+                        v-model="data.geographicMobilityDate"
+                    />
+                </VnRow>
+                <VnRow>
+                    <VnInput
+                        clearable
+                        v-model="data.childPension"
+                        :label="t(`childPension`)"
+                    />
+                    <VnInput
+                        clearable
+                        v-model="data.spousePension"
+                        :label="t(`spousePension`)"
+                    />
+                </VnRow>
+                <VnRow>
+                    <QCheckbox v-model="data.isDependend" :label="t(`isDependend`)" />
+                    <QCheckbox
+                        v-model="data.hasHousingPaymentBefore"
+                        :label="t(`hasHousingPaymentBefore`)"
+                    />
+                </VnRow>
+                <VnRow>
+                    <QCheckbox
+                        v-model="data.hasHousingPaymentAfter"
+                        :label="t(`hasHousingPaymentAfter`)"
+                    />
+                    <QCheckbox
+                        v-model="data.hasExtendedWorking"
+                        :label="t(`hasExtendedWorking`)"
+                    />
+                </VnRow>
+            </QCard>
 
-            <VnRow>
-                <VnInput
-                    clearable
-                    v-model="data.childPension"
-                    :label="t(`childPension`)"
-                />
-                <VnInput
-                    clearable
-                    v-model="data.spousePension"
-                    :label="t(`spousePension`)"
-                />
-            </VnRow>
+            <CrudModel
+                ref="workerPitCrudRef"
+                data-key="workerPit"
+                url="WorkerRelatives"
+                auto-load
+                :filter="{
+                    where: { workerFk: route.params.id },
+                }"
+                :data-required="{ workerFk: route.params.id }"
+                :has-sub-toolbar="false"
+            >
+                <template #body="{ rows }">
+                    <QCard class="q-px-lg q-py-lg" flat>
+                        <div class="row no-wrap justify-between q-pb-md">
+                            <VnTitle :text="t('Relatives')" />
+                            <QBtnGroup push style="column-gap: 10px">
+                                <QBtn
+                                    color="primary"
+                                    icon="restart_alt"
+                                    flat
+                                    @click="workerPitCrudRef.reset"
+                                    :disable="!workerPitCrudRef.hasChanges"
+                                    :title="t('globals.reset')"
+                                />
+                                <QBtn
+                                    ref="saveButtonRef"
+                                    color="primary"
+                                    icon="save"
+                                    @click="workerPitCrudRef.onSubmit"
+                                    :disable="!workerPitCrudRef.hasChanges"
+                                    :title="t('globals.save')"
+                                />
+                            </QBtnGroup>
+                        </div>
+                        <VnRow
+                            v-for="(row, index) in rows"
+                            :key="index"
+                            class="row q-gutter-lg q-mb-lg"
+                            padding="none"
+                        >
+                            <VnSelect
+                                :options="[
+                                    { id: 0, name: 'Ascendiente' },
+                                    { id: 1, name: 'Descendiente' },
+                                ]"
+                                :label="t('isDescendant')"
+                                v-model="row.isDescendant"
+                            />
+                            <VnSelect
+                                :label="t('disabilityGrades')"
+                                :options="disabilityGradesOptions"
+                                option-label="description"
+                                option-value="id"
+                                v-model="row.disabilityGradeFk"
+                                padding="none"
+                            />
+                            <VnInput
+                                type="number"
+                                v-model="row.birthed"
+                                :label="t(`birthed`)"
+                            />
 
-            <VnRow>
-                <QCheckbox
-                    size="sm"
-                    v-model="data.isDependend"
-                    :label="t(`isDependend`)"
-                />
-                <QCheckbox
-                    size="sm"
-                    v-model="data.hasHousingPaymentBefore"
-                    :label="t(`hasHousingPaymentBefore`)"
-                />
-            </VnRow>
-            <VnRow>
-                <QCheckbox
-                    size="sm"
-                    v-model="data.hasHousingPaymentAfter"
-                    :label="t(`hasHousingPaymentAfter`)"
-                />
-
-                <QCheckbox
-                    size="sm"
-                    v-model="data.hasExtendedWorking"
-                    :label="t(`hasExtendedWorking`)"
-                />
-            </VnRow>
-            <QSeparator class="q-mx-lg" vertical />
+                            <VnInput
+                                type="number"
+                                v-model="row.adoptionYear"
+                                :label="t(`adoptionYear`)"
+                            />
+                            <QCheckbox
+                                v-model="row.isDependend"
+                                :label="t(`isDependend`)"
+                            />
+                            <QCheckbox
+                                v-model="row.isJointCustody"
+                                :label="t(`isJointCustody`)"
+                                size="xs"
+                            />
+                            <QBtn
+                                @click="deleteRelative(rows[0].id)"
+                                class="cursor-pointer"
+                                color="primary"
+                                flat
+                                icon="delete"
+                                style="flex: 0"
+                            />
+                        </VnRow>
+                        <VnRow class="justify-left items-center">
+                            <QBtn
+                                @click="insertTag(rows)"
+                                class="cursor-pointer"
+                                color="primary"
+                                flat
+                                icon="add"
+                                shortcut="+"
+                                style="flex: 0"
+                            />
+                        </VnRow>
+                    </QCard>
+                </template>
+            </CrudModel>
         </template>
     </FormModel>
-    <CrudModel
-        ref="workerPitCrudRef"
-        data-key="workerPit"
-        url="WorkerRelatives"
-        auto-load
-    >
-        <template #body="{ rows }">
-            <QTable
-                :columns="columns"
-                :rows="rows"
-                row-key="$index"
-                selection="multiple"
-                v-model:selected="selected"
-                table-header-class="text-left"
-            ></QTable>
-        </template>
-        <!-- <VnRow>
-            <VnInputDate size="sm" v-model="data.birthed" :label="t(`birthed`)" />
-
-            <VnInput size="sm" v-model="data.adoptionYear" :label="t(`adoptionYear`)" />
-        </VnRow> -->
-    </CrudModel>
 </template>
 
 <i18n>
@@ -133,6 +230,12 @@ es:
     hasHousingPaymentBefore: Pagos vivienda anterior 2011
     hasHousingPaymentAfter: Pagos vivienda posterior 2011
     hasExtendedWorking: Prolongación actividad laboral
+    isDescendant: Descen/Ascen
+    disabilityGradeFk: Discapacidad
+    birthed: Año nacimiento
+    adoptionYear: Año adopción
+    isJointCustody: Computo por entero
+    Relatives: Relacionados
 en:
     familySituation: Family Situation
     disabilityGrades: Disability Grades
@@ -144,4 +247,10 @@ en:
     hasHousingPaymentBefore: Housing Payments Before 2011
     hasHousingPaymentAfter: Housing Payments After 2011
     hasExtendedWorking: Extended Work Activity
+    isDescendant: Descendant/Ascendant
+    disabilityGradeFk: Disability Grade
+    birthed: Birth Year
+    adoptionYear: Adoption Year
+    isJointCustody: Joint custody
+    Relatives: Relatives
 </i18n>
-- 
2.40.1


From 04f610790930853fcb9e8690ffb4da83a71fdf0b Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 7 Nov 2024 14:38:54 +0100
Subject: [PATCH 07/12] fix: refs #7529 fix scss

---
 src/components/FormModel.vue        |  6 +++++-
 src/pages/Worker/Card/WorkerPit.vue | 11 +++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index c668769e5..bfb470c48 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -91,6 +91,10 @@ const $props = defineProps({
         type: Boolean,
         default: true,
     },
+    maxWidth: {
+        type: [String, Boolean],
+        default: '800px',
+    },
 });
 const emit = defineEmits(['onFetch', 'onDataSaved']);
 const modelValue = computed(
@@ -283,6 +287,7 @@ defineExpose({
             @submit="save"
             @reset="reset"
             class="q-pa-md"
+            :style="maxWidth ? 'max-width: ' + maxWidth : ''"
             id="formModel"
         >
             <QCard>
@@ -371,7 +376,6 @@ defineExpose({
     color: black;
 }
 #formModel {
-    max-width: 800px;
     width: 100%;
 }
 
diff --git a/src/pages/Worker/Card/WorkerPit.vue b/src/pages/Worker/Card/WorkerPit.vue
index 97f8289a5..4ad7f2b9e 100644
--- a/src/pages/Worker/Card/WorkerPit.vue
+++ b/src/pages/Worker/Card/WorkerPit.vue
@@ -58,6 +58,8 @@ const deleteRelative = async (id) => {
         :filter="{ where: { workerFk: route.params.id } }"
         auto-load
         data-key="workerIrpfs"
+        :max-width="false"
+        :data-required="{ workerFk: route.params.id }"
     >
         <template #form="{ data }">
             <QCard class="q-px-lg q-py-lg">
@@ -149,10 +151,10 @@ const deleteRelative = async (id) => {
                                 />
                             </QBtnGroup>
                         </div>
-                        <VnRow
+                        <div
                             v-for="(row, index) in rows"
                             :key="index"
-                            class="row q-gutter-lg q-mb-lg"
+                            class="row no-wrap q-mb-lg q-gutter-lg"
                             padding="none"
                         >
                             <VnSelect
@@ -162,6 +164,7 @@ const deleteRelative = async (id) => {
                                 ]"
                                 :label="t('isDescendant')"
                                 v-model="row.isDescendant"
+                                class="q-gutter-xs q-mb-xs"
                             />
                             <VnSelect
                                 :label="t('disabilityGrades')"
@@ -169,7 +172,7 @@ const deleteRelative = async (id) => {
                                 option-label="description"
                                 option-value="id"
                                 v-model="row.disabilityGradeFk"
-                                padding="none"
+                                class="q-gutter-xs q-mb-xs"
                             />
                             <VnInput
                                 type="number"
@@ -199,7 +202,7 @@ const deleteRelative = async (id) => {
                                 icon="delete"
                                 style="flex: 0"
                             />
-                        </VnRow>
+                        </div>
                         <VnRow class="justify-left items-center">
                             <QBtn
                                 @click="insertTag(rows)"
-- 
2.40.1


From 991ef7b243a51bb60e01f50d2bb549945a828905 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 21 Nov 2024 09:32:45 +0100
Subject: [PATCH 08/12] fix: refs #7529 fix te2e

---
 src/components/common/VnInput.vue             |  1 +
 src/components/common/VnSelect.vue            |  1 +
 .../integration/worker/workerPit.spec.js      | 28 +++++++++++++++++++
 3 files changed, 30 insertions(+)
 create mode 100644 test/cypress/integration/worker/workerPit.spec.js

diff --git a/src/components/common/VnInput.vue b/src/components/common/VnInput.vue
index 7979b6d6e..683e47b97 100644
--- a/src/components/common/VnInput.vue
+++ b/src/components/common/VnInput.vue
@@ -93,6 +93,7 @@ const mixinRules = [
             :rules="mixinRules"
             :lazy-rules="true"
             hide-bottom-space
+            :data-cy="$attrs.dataCy ?? $attrs.label + '_input'"
         >
             <template v-if="$slots.prepend" #prepend>
                 <slot name="prepend" />
diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index f24f054a5..c0b99e88f 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -283,6 +283,7 @@ async function onScroll({ to, direction, from, index }) {
         :input-debounce="useURL ? '300' : '0'"
         :loading="isLoading"
         @virtual-scroll="onScroll"
+        :data-cy="$attrs.dataCy ?? $attrs.label + '_select'"
     >
         <template v-if="isClearable" #append>
             <QIcon
diff --git a/test/cypress/integration/worker/workerPit.spec.js b/test/cypress/integration/worker/workerPit.spec.js
new file mode 100644
index 000000000..ae2a779a1
--- /dev/null
+++ b/test/cypress/integration/worker/workerPit.spec.js
@@ -0,0 +1,28 @@
+describe('WorkerPit', () => {
+    const familySituationInput = '[data-cy="Family Situation_input"]';
+    const familySituation = '1';
+    const disabilityGradesSelect = '[data-cy="Disability Grades_select"]';
+    const childPensionInput = '[data-cy="Child Pension_input"]';
+    const childPension = '120';
+
+    beforeEach(() => {
+        cy.viewport(1920, 1080);
+        cy.login('developer');
+        cy.visit(`/#/worker/1107/pit`);
+    });
+
+    it('complete PIT', () => {
+        cy.get(familySituationInput).type(familySituation);
+        cy.get(disabilityGradesSelect).click('{downArrow}{enter}');
+        cy.get(childPensionInput).type(childPension);
+        // cy.get('.q-notification__message').should('have.text', 'Data created');
+    });
+
+    // it('delete pda', () => {
+    //     cy.get('.q-card > .q-item > .q-item__section--side > .q-icon').click();
+    //     cy.get(
+    //         '.q-card__actions > .q-btn--unelevated > .q-btn__content > .block'
+    //     ).click();
+    //     cy.get('.q-notification__message').should('have.text', 'PDA deallocated');
+    // });
+});
-- 
2.40.1


From 3352cea0e7bdff72085f8bbc5b4bacd3bfec381d Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 22 Nov 2024 06:08:11 +0100
Subject: [PATCH 09/12] fix: refs #7529 fix e2e

---
 src/pages/Worker/Card/WorkerPit.vue           |  8 +++-
 .../integration/worker/workerPit.spec.js      | 38 ++++++++++++-------
 2 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/src/pages/Worker/Card/WorkerPit.vue b/src/pages/Worker/Card/WorkerPit.vue
index 4ad7f2b9e..c58196c7b 100644
--- a/src/pages/Worker/Card/WorkerPit.vue
+++ b/src/pages/Worker/Card/WorkerPit.vue
@@ -59,7 +59,6 @@ const deleteRelative = async (id) => {
         auto-load
         data-key="workerIrpfs"
         :max-width="false"
-        :data-required="{ workerFk: route.params.id }"
     >
         <template #form="{ data }">
             <QCard class="q-px-lg q-py-lg">
@@ -79,6 +78,9 @@ const deleteRelative = async (id) => {
                         option-label="description"
                         option-value="id"
                         v-model="data.disabilityGradeFk"
+                        id="disabilityGrades"
+                        data-cy="disabilityGrades"
+                        hide-selected
                     />
 
                     <VnInputDate
@@ -148,6 +150,7 @@ const deleteRelative = async (id) => {
                                     @click="workerPitCrudRef.onSubmit"
                                     :disable="!workerPitCrudRef.hasChanges"
                                     :title="t('globals.save')"
+                                    data-cy="workerPitRelativeSaveBtn"
                                 />
                             </QBtnGroup>
                         </div>
@@ -212,6 +215,7 @@ const deleteRelative = async (id) => {
                                 icon="add"
                                 shortcut="+"
                                 style="flex: 0"
+                                data-cy="addRelative"
                             />
                         </VnRow>
                     </QCard>
@@ -245,7 +249,7 @@ en:
     geographicMobilityDate: Geographic Mobility Date
     childPension: Child Pension
     spousePension: Spouse Pension
-    isDependend: Dependent Support / Reduced Mobility
+    isDependend: Dependent Suport / Reduced Mobility
     spouseNif: Spouse NIF (Tax ID)
     hasHousingPaymentBefore: Housing Payments Before 2011
     hasHousingPaymentAfter: Housing Payments After 2011
diff --git a/test/cypress/integration/worker/workerPit.spec.js b/test/cypress/integration/worker/workerPit.spec.js
index ae2a779a1..8b7c53bf8 100644
--- a/test/cypress/integration/worker/workerPit.spec.js
+++ b/test/cypress/integration/worker/workerPit.spec.js
@@ -1,9 +1,19 @@
 describe('WorkerPit', () => {
     const familySituationInput = '[data-cy="Family Situation_input"]';
     const familySituation = '1';
-    const disabilityGradesSelect = '[data-cy="Disability Grades_select"]';
     const childPensionInput = '[data-cy="Child Pension_input"]';
     const childPension = '120';
+    const spouseNifInput = '[data-cy="Spouse Pension_input"]';
+    const spouseNif = '65117125P';
+    const spousePensionInput = '[data-cy="Spouse Pension_input"]';
+    const spousePension = '120';
+    const addRelative = '[data-cy="addRelative"]';
+    const isDescendantSelect = '[data-cy="Descendant/Ascendant_select"]';
+    const birthedInput = '[data-cy="Birth Year_input"]';
+    const birthed = '2002';
+    const adoptionYearInput = '[data-cy="Adoption Year_input"]';
+    const adoptionYear = '2004';
+    const saveRelative = '[data-cy="workerPitRelativeSaveBtn"]';
 
     beforeEach(() => {
         cy.viewport(1920, 1080);
@@ -11,18 +21,18 @@ describe('WorkerPit', () => {
         cy.visit(`/#/worker/1107/pit`);
     });
 
-    it('complete PIT', () => {
-        cy.get(familySituationInput).type(familySituation);
-        cy.get(disabilityGradesSelect).click('{downArrow}{enter}');
-        cy.get(childPensionInput).type(childPension);
-        // cy.get('.q-notification__message').should('have.text', 'Data created');
-    });
-
-    // it('delete pda', () => {
-    //     cy.get('.q-card > .q-item > .q-item__section--side > .q-icon').click();
-    //     cy.get(
-    //         '.q-card__actions > .q-btn--unelevated > .q-btn__content > .block'
-    //     ).click();
-    //     cy.get('.q-notification__message').should('have.text', 'PDA deallocated');
+    // it('complete PIT', () => {
+    //     cy.get(familySituationInput).type(familySituation);
+    //     cy.get(childPensionInput).type(childPension);
+    //     cy.get(spouseNifInput).type(spouseNif);
+    //     cy.get(spousePensionInput).type(spousePension);
     // });
+
+    it('delete relative', () => {
+        cy.get(addRelative).click();
+        cy.get(isDescendantSelect).type('{downArrow}{downArrow}{enter}');
+        cy.get(birthedInput).type(birthed);
+        cy.get(adoptionYearInput).type(adoptionYear);
+        cy.get(saveRelative).click();
+    });
 });
-- 
2.40.1


From 095c1f477f376bf03e6b9de8a484b52be069ec97 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 22 Nov 2024 07:34:39 +0100
Subject: [PATCH 10/12] fix: refs #7529 add save

---
 test/cypress/integration/worker/workerPit.spec.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/test/cypress/integration/worker/workerPit.spec.js b/test/cypress/integration/worker/workerPit.spec.js
index 8b7c53bf8..8e8514193 100644
--- a/test/cypress/integration/worker/workerPit.spec.js
+++ b/test/cypress/integration/worker/workerPit.spec.js
@@ -21,12 +21,13 @@ describe('WorkerPit', () => {
         cy.visit(`/#/worker/1107/pit`);
     });
 
-    // it('complete PIT', () => {
-    //     cy.get(familySituationInput).type(familySituation);
-    //     cy.get(childPensionInput).type(childPension);
-    //     cy.get(spouseNifInput).type(spouseNif);
-    //     cy.get(spousePensionInput).type(spousePension);
-    // });
+    it('complete PIT', () => {
+        cy.get(familySituationInput).type(familySituation);
+        cy.get(childPensionInput).type(childPension);
+        cy.get(spouseNifInput).type(spouseNif);
+        cy.get(spousePensionInput).type(spousePension);
+        cy.saveCard();
+    });
 
     it('delete relative', () => {
         cy.get(addRelative).click();
-- 
2.40.1


From 2bc2217406613fee7170cc07c35254163567b767 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 25 Nov 2024 13:49:01 +0100
Subject: [PATCH 11/12] fix: refs #7529 fix workerPit e2e

---
 test/cypress/integration/worker/workerPit.spec.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/cypress/integration/worker/workerPit.spec.js b/test/cypress/integration/worker/workerPit.spec.js
index 8e8514193..a130042c4 100644
--- a/test/cypress/integration/worker/workerPit.spec.js
+++ b/test/cypress/integration/worker/workerPit.spec.js
@@ -14,6 +14,7 @@ describe('WorkerPit', () => {
     const adoptionYearInput = '[data-cy="Adoption Year_input"]';
     const adoptionYear = '2004';
     const saveRelative = '[data-cy="workerPitRelativeSaveBtn"]';
+    const savePIT = '#st-actions > .q-btn-group > .q-btn--standard';
 
     beforeEach(() => {
         cy.viewport(1920, 1080);
@@ -26,7 +27,7 @@ describe('WorkerPit', () => {
         cy.get(childPensionInput).type(childPension);
         cy.get(spouseNifInput).type(spouseNif);
         cy.get(spousePensionInput).type(spousePension);
-        cy.saveCard();
+        cy.get(savePIT).click();
     });
 
     it('delete relative', () => {
-- 
2.40.1


From dfcaf4e692bbac6de5bf594e86e789a4dbf42d1d Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 25 Nov 2024 13:53:22 +0100
Subject: [PATCH 12/12] fix: refs #7529 fix e2e

---
 test/cypress/integration/worker/workerPit.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/cypress/integration/worker/workerPit.spec.js b/test/cypress/integration/worker/workerPit.spec.js
index a130042c4..cc3a87637 100644
--- a/test/cypress/integration/worker/workerPit.spec.js
+++ b/test/cypress/integration/worker/workerPit.spec.js
@@ -30,7 +30,7 @@ describe('WorkerPit', () => {
         cy.get(savePIT).click();
     });
 
-    it('delete relative', () => {
+    it('complete relative', () => {
         cy.get(addRelative).click();
         cy.get(isDescendantSelect).type('{downArrow}{downArrow}{enter}');
         cy.get(birthedInput).type(birthed);
-- 
2.40.1