Merge branch 'dev' of https: refs #6919//gitea.verdnatura.es/verdnatura/salix-front into 6919-syncData

src/i18n/locale/en.yml

@@ -326,6 +326,7 @@ globals:
         ticketsMonitor: Tickets monitor
         clientsActionsMonitor: Clients and actions
         serial: Serial
+        business: Business
         medical: Mutual
         pit: IRPF
         wasteRecalc: Waste recaclulate
@@ -509,6 +510,24 @@ department:
     hasToSendMail: Send check-ins by email
     departmentRemoved: Department removed
 worker:
+    pageTitles:
+        workers: Workers
+        list: List
+        basicData: Basic data
+        summary: Summary
+        notifications: Notifications
+        workerCreate: New worker
+        department: Department
+        pda: PDA
+        notes: Notas
+        dms: My documentation
+        pbx: Private Branch Exchange
+        log: Log
+        calendar: Calendar
+        timeControl: Time control
+        locker: Locker
+        balance: Balance
+        medical: Medical
     list:
         department: Department
         schedule: Schedule
@@ -524,15 +543,24 @@ worker:
         role: Role
         sipExtension: Extension
         locker: Locker
-        fiDueDate: FI due date
+        fiDueDate: DNI expiration date
         sex: Sex
-        seniority: Seniority
+        seniority: Antiquity
         fi: DNI/NIE/NIF
         birth: Birth
         isFreelance: Freelance
         isSsDiscounted: SS Bonification
         hasMachineryAuthorized: Machinery authorized
         isDisable: Disable
+        business: Business
+        started: Started
+        ended: Ended
+        reasonEnd: Reason End
+        department: Departament
+        workerBusinessCategory: Worker Business Category
+        notes: Notes
+        workCenter: Center
+        professionalCategory: Professional Category
     notificationsManager:
         activeNotifications: Active notifications
         availableNotifications: Available notifications
@@ -591,6 +619,23 @@ worker:
         sizeLimit: Size limit
         isOnReservationMode: Reservation mode
         machine: Machine
+    business:
+        tableVisibleColumns:
+            started: Start Date
+            ended: End Date
+            company: Company
+            reasonEnd: Reason for Termination
+            department: Department
+            professionalCategory: Professional Category
+            calendarType: Work Calendar
+            workCenter: Work Center
+            payrollCategories: Contract Category
+            occupationCode: Contribution Code
+            rate: Rate
+            businessType: Contract Type
+            amount: Salary
+            basicSalary: Transport Workers Salary
+            notes: Notes
 wagon:
     type:
         submit: Submit

src/i18n/locale/es.yml

@@ -326,6 +326,7 @@ globals:
         ticketsMonitor: Monitor de tickets
         clientsActionsMonitor: Clientes y acciones
         serial: Facturas por serie
+        business: Contratos
         medical: Mutua
         pit: IRPF
         wasteRecalc: Recalcular mermas
@@ -481,6 +482,26 @@ department:
     hasToSendMail: Enviar fichadas por mail
     departmentRemoved: Departamento eliminado
 worker:
+    pageTitles:
+        workers: Trabajadores
+        list: Listado
+        basicData: Datos básicos
+        summary: Resumen
+        notifications: Notificaciones
+        workerCreate: Nuevo trabajador
+        department: Departamentos
+        pda: PDA
+        notes: Notas
+        dms: Mi documentación
+        pbx: Centralita
+        log: Historial
+        calendar: Calendario
+        timeControl: Control de horario
+        locker: Taquilla
+        balance: Balance
+        business: Contrato
+        formation: Formación
+        medical: Mutua
     list:
         department: Departamento
         schedule: Horario
@@ -505,6 +526,15 @@ worker:
         isSsDiscounted: Bonificación SS
         hasMachineryAuthorized: Autorizado para maquinaria
         isDisable: Deshabilitado
+        business: Contrato
+        started: Antigüedad
+        ended: Fin
+        reasonEnd: Motivo finalización
+        department: Departamento
+        workerBusinessCategory: Categoria profesional
+        notes: Notas
+        workCenter: Centro
+        professionalCategory: Categoria profesional
     notificationsManager:
         activeNotifications: Notificaciones activas
         availableNotifications: Notificaciones disponibles
@@ -551,6 +581,23 @@ worker:
             debit: Debe
             credit: Haber
             concept: Concepto
+    business:
+        tableVisibleColumns:
+            started: Fecha inicio
+            ended: Fecha fin
+            company: Empresa
+            reasonEnd: Motivo finalización
+            department: Departamento
+            professionalCategory: Categoria profesional
+            calendarType: Calendario laboral
+            workCenter: Centro
+            payrollCategories: Categoria contrato
+            occupationCode: Cotización
+            rate: Tarifa
+            businessType: Contrato
+            amount: Salario
+            basicSalary: Salario transportistas
+            notes: Notas
     operator:
         numberOfWagons: Número de vagones
         train: tren
@@ -563,7 +610,6 @@ worker:
         sizeLimit: Tamaño límite
         isOnReservationMode: Modo de reserva
         machine: Máquina
-
 wagon:
     type:
         submit: Guardar

src/pages/Worker/Card/WorkerBusiness.vue

@@ -0,0 +1,234 @@
+<script setup>
+import { ref, computed } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+import VnTable from 'components/VnTable/VnTable.vue';
+import { toDate } from 'src/filters';
+import { useQuasar } from 'quasar';
+import axios from 'axios';
+
+const { t } = useI18n();
+const route = useRoute();
+const tableRef = ref();
+const entityId = computed(() => route.params.id);
+const quasar = useQuasar();
+
+async function reactivateWorker() {
+    const hasToReactive = tableRef.value.CrudModelRef.formData.find(
+        (data) => !data.ended
+    );
+    if (hasToReactive) {
+        quasar
+            .dialog({
+                message: t('Do you want to reactivate the user?'),
+                ok: {
+                    push: true,
+                    color: 'primary',
+                },
+                cancel: true,
+            })
+            .onOk(async () => {
+                await axios.patch(`Workers/${entityId.value}`, {
+                    isDisable: false,
+                });
+            });
+    }
+}
+const columns = computed(() => [
+    {
+        name: 'started',
+        label: t('worker.business.tableVisibleColumns.started'),
+        align: 'left',
+        format: ({ started }) => toDate(started),
+        component: 'date',
+        cardVisible: true,
+        create: true,
+    },
+
+    {
+        name: 'ended',
+        label: t('worker.business.tableVisibleColumns.ended'),
+        align: 'left',
+        format: ({ ended }) => toDate(ended),
+        component: 'date',
+        cardVisible: true,
+        create: true,
+    },
+    {
+        label: t('worker.business.tableVisibleColumns.company'),
+        align: 'left',
+        name: 'companyCodeFk',
+        component: 'select',
+        attrs: {
+            url: 'Companies',
+            fields: ['code'],
+            optionLabel: 'code',
+            optionValue: 'code',
+        },
+        cardVisible: true,
+        create: true,
+    },
+    {
+        align: 'left',
+        name: 'reasonEndFk',
+        component: 'select',
+        label: t('worker.business.tableVisibleColumns.reasonEnd'),
+        attrs: {
+            url: 'BusinessReasonEnds',
+            fields: ['id', 'reason'],
+            optionLabel: 'reason',
+        },
+        cardVisible: true,
+    },
+    {
+        align: 'left',
+        name: 'departmentFk',
+        component: 'select',
+        label: t('worker.business.tableVisibleColumns.department'),
+        attrs: {
+            url: 'Departments',
+            fields: ['id', 'name'],
+            optionLabel: 'name',
+        },
+        cardVisible: true,
+        create: true,
+    },
+    {
+        align: 'left',
+        name: 'workerBusinessProfessionalCategoryFk',
+        component: 'select',
+        label: t('worker.business.tableVisibleColumns.professionalCategory'),
+        attrs: {
+            url: 'WorkerBusinessProfessionalCategories',
+            fields: ['id', 'description', 'code'],
+            optionLabel: 'description',
+        },
+        cardVisible: true,
+        create: true,
+    },
+    {
+        align: 'left',
+        name: 'calendarTypeFk',
+        component: 'select',
+        label: t('worker.business.tableVisibleColumns.calendarType'),
+        attrs: {
+            url: 'CalendarTypes',
+            fields: ['id', 'description'],
+            optionLabel: 'description',
+        },
+        cardVisible: true,
+        create: true,
+    },
+    {
+        align: 'left',
+        name: 'workcenterFk',
+        component: 'select',
+        label: t('worker.business.tableVisibleColumns.workCenter'),
+        attrs: {
+            url: 'WorkCenters',
+            fields: ['id', 'name'],
+            optionLabel: 'name',
+        },
+        cardVisible: true,
+        create: true,
+    },
+    {
+        align: 'left',
+        name: 'workerBusinessCategoryFk',
+        component: 'select',
+        label: t('worker.business.tableVisibleColumns.payrollCategories'),
+        attrs: {
+            url: 'payrollCategories',
+            fields: ['id', 'description'],
+            optionLabel: 'description',
+        },
+        cardVisible: true,
+        create: true,
+    },
+    {
+        align: 'left',
+        name: 'occupationCodeFk',
+        component: 'select',
+        label: t('worker.business.tableVisibleColumns.occupationCode'),
+        attrs: {
+            url: 'OccupationCodes',
+            fields: ['code', 'name'],
+            optionValue: 'code',
+        },
+        cardVisible: true,
+        create: true,
+    },
+    {
+        align: 'left',
+        name: 'rate',
+        label: t('worker.business.tableVisibleColumns.rate'),
+        component: 'input',
+        cardVisible: true,
+        create: true,
+    },
+    {
+        align: 'left',
+        name: 'workerBusinessTypeFk',
+        component: 'select',
+        label: t('worker.business.tableVisibleColumns.businessType'),
+        attrs: {
+            url: 'WorkerBusinessTypes',
+            fields: ['id', 'name'],
+        },
+        cardVisible: true,
+        create: true,
+    },
+    {
+        align: 'left',
+        label: t('worker.business.tableVisibleColumns.amount'),
+        name: 'amount',
+        component: 'input',
+        cardVisible: true,
+        create: true,
+    },
+    {
+        align: 'left',
+        label: t('worker.business.tableVisibleColumns.basicSalary'),
+        name: 'basicSalary',
+        component: 'input',
+        cardVisible: true,
+        create: true,
+    },
+    {
+        name: 'notes',
+        label: t('worker.business.tableVisibleColumns.notes'),
+        align: 'left',
+        component: 'input',
+        cardVisible: true,
+    },
+]);
+</script>
+
+<template>
+    <VnTable
+        ref="tableRef"
+        data-key="WorkerBusiness"
+        :url="`Workers/${entityId}/Business`"
+        save-url="/Businesses/crud"
+        :create="{
+            urlCreate: `Workers/${entityId}/Business`,
+            title: 'Create business',
+            onDataSaved: () => tableRef.reload(),
+            formInitialData: {},
+        }"
+        order="id DESC"
+        :columns="columns"
+        default-mode="card"
+        auto-load
+        :disable-option="{ table: true }"
+        :right-search="false"
+        card-class="grid-two q-gutter-x-xl q-gutter-y-md q-pr-lg q-py-lg"
+        :is-editable="true"
+        :use-model="true"
+        @save-changes="(data) => reactivateWorker(data)"
+    />
+</template>
+<i18n>
+es:
+    Do you want to reactivate the user?: desea reactivar el usuario?
+</i18n>

src/pages/Worker/Card/WorkerSummary.vue

@@ -12,6 +12,7 @@ import RoleDescriptorProxy from 'src/pages/Account/Role/Card/RoleDescriptorProxy
 import DepartmentDescriptorProxy from 'src/pages/Department/Card/DepartmentDescriptorProxy.vue';
 import { useAdvancedSummary } from 'src/composables/useAdvancedSummary';
 import WorkerDescriptorMenu from './WorkerDescriptorMenu.vue';
+import axios from 'axios';
 
 const route = useRoute();
 const { t } = useI18n();
@@ -27,6 +28,76 @@ const entityId = computed(() => $props.id || route.params.id);
 const basicDataUrl = ref(null);
 const advancedSummary = ref();
 
+const filter = {
+    include: [
+        {
+            relation: 'user',
+            scope: {
+                fields: ['name', 'nickname', 'roleFk'],
+
+                include: [
+                    {
+                        relation: 'role',
+                        scope: {
+                            fields: ['name'],
+                        },
+                    },
+                    {
+                        relation: 'emailUser',
+                        scope: {
+                            fields: ['email'],
+                        },
+                    },
+                ],
+            },
+        },
+        {
+            relation: 'department',
+            scope: {
+                include: {
+                    relation: 'department',
+                    scope: {
+                        fields: ['name'],
+                    },
+                },
+            },
+        },
+        {
+            relation: 'boss',
+        },
+        {
+            relation: 'client',
+        },
+        {
+            relation: 'sip',
+        },
+        {
+            relation: 'business',
+            scope: {
+                include: [
+                    {
+                        relation: 'department',
+                        scope: {
+                            fields: ['id', 'name'],
+                        },
+                    },
+                    {
+                        relation: 'reasonEnd',
+                        scope: {
+                            fields: ['id', 'reason'],
+                        },
+                    },
+                    {
+                        relation: 'workerBusinessProfessionalCategory',
+                        scope: {
+                            fields: ['id', 'description'],
+                        },
+                    },
+                ],
+            },
+        },
+    ],
+};
 onBeforeMount(async () => {
     advancedSummary.value = await useAdvancedSummary('Workers', entityId.value);
     basicDataUrl.value = `#/worker/${entityId.value}/basic-data`;
@@ -37,7 +108,7 @@ onBeforeMount(async () => {
     <CardSummary
         ref="summary"
         :url="`Workers/summary`"
-        :filter="{ where: { id: entityId } }"
+        :user-filter="{ where: { id: entityId }, filter }"
         data-key="Worker"
     >
         <template #header="{ entity }">
@@ -143,6 +214,29 @@ onBeforeMount(async () => {
                 </VnLv>
                 <VnLv :label="t('queue')" :value="worker.sip?.queueMember?.queue" />
             </QCard>
+            <QCard class="vn-one" v-if="advancedSummary">
+                <VnTitle
+                    :url="`#/worker/${entityId}/business`"
+                    :text="t('worker.summary.business')"
+                />
+                <VnLv
+                    :label="t('worker.summary.started')"
+                    :value="toDate(advancedSummary.currentBusiness?.started)"
+                />
+                <VnLv
+                    :label="t('worker.summary.ended')"
+                    :value="toDate(advancedSummary.currentBusiness?.ended)"
+                />
+
+                <VnLv
+                    :label="t('worker.summary.reasonEnd')"
+                    :value="advancedSummary.currentBusiness?.reasonEnd?.reason"
+                />
+                <VnLv
+                    :label="t('worker.summary.notes')"
+                    :value="advancedSummary.currentBusiness?.notes"
+                />
+            </QCard>
         </template>
     </CardSummary>
 </template>

src/router/modules/worker.js

@@ -8,6 +8,7 @@ const workerCard = {
     meta: {
         menu: [
             'WorkerBasicData',
+            'WorkerBusiness',
             'WorkerNotes',
             'WorkerPda',
             'WorkerNotificationsManager',
@@ -50,6 +51,15 @@ const workerCard = {
             },
             component: () => import('src/pages/Worker/Card/WorkerBasicData.vue'),
         },
+        {
+            path: 'business',
+            name: 'WorkerBusiness',
+            meta: {
+                title: 'business',
+                icon: 'handshake',
+            },
+            component: () => import('src/pages/Worker/Card/WorkerBusiness.vue'),
+        },
         {
             path: 'notes',
             name: 'NotesCard',

test/cypress/integration/invoiceIn/invoiceInDescriptor.spec.js

@@ -1,7 +1,7 @@
 describe('InvoiceInDescriptor', () => {
-    const dialogBtns = '.q-card__actions button';
+    const book = '.summaryHeader > .no-wrap > .q-btn';
-    const firstDescritorOpt = '.q-menu > .q-list > :nth-child(1) > .q-item__section';
+    const firstDescritorOpt = '.q-menu > .q-list > :nth-child(5) > .q-item__section';
-    const isBookedField = '.q-card:nth-child(3) .vn-label-value:nth-child(5) .q-checkbox';
+    const checkbox = ':nth-child(5) > .q-checkbox';
 
     it('should booking and unbooking the invoice properly', () => {
         cy.viewport(1280, 720);
@@ -9,13 +9,13 @@ describe('InvoiceInDescriptor', () => {
         cy.visit('/#/invoice-in/1/summary');
         cy.waitForElement('.q-page');
 
-        cy.openActionsDescriptor();
+        cy.get(book).click();
-        cy.get(firstDescritorOpt).click();
+        cy.dataCy('VnConfirm_confirm').click();
-        cy.get(dialogBtns).eq(1).click();
+        cy.get(checkbox).invoke('attr', 'aria-checked').should('eq', 'true');
-        cy.get(isBookedField).should('have.attr', 'aria-checked', 'true');
 
+        cy.dataCy('descriptor-more-opts').first().click();
         cy.get(firstDescritorOpt).click();
-        cy.get(dialogBtns).eq(1).click();
+        cy.dataCy('VnConfirm_confirm').click();
-        cy.get(isBookedField).should('have.attr', 'aria-checked', 'false');
+        cy.get(checkbox).invoke('attr', 'aria-checked').should('eq', 'false');
     });
 });