Merge branch 'dev' into 7679_improve_newPostcode_form

CHANGELOG.md

@@ -1,3 +1,183 @@
+# Version 24.40 - 2024-10-02
+
+### Added 🆕
+
+-   chore: refs #4074 admit several acls by:jorgep
+-   chore: refs #4074 drop workerCreate by:jorgep
+-   chore: refs #4074 fix tests by:jorgep
+-   chore: refs #4074 wip replace useRole for useAcl by:jorgep
+-   chore: refs #7155 remove console.log by:alexm
+-   chore: refs #7155 typo by:alexm
+-   chore: refs #7663 add test by:jorgep
+-   chore: refs #7663 create test wip by:jorgep
+-   chore: refs #7663 drop useless code (origin/7663-setWeight) by:jorgep
+-   chore: refs #7828 fix e2e by:jorgep
+-   feat(AccountBasicData): add twoFactorFk by:alexm
+-   feat: add max rule by:Javier Segarra
+-   feat: add shortcut add event in some subSections by:Javier Segarra
+-   feat: add shortcut more buttons (origin/add_shortcut_add_subSections) by:Javier Segarra
+-   feat: add tooltip CustomerNewCustomAgent by:Javier Segarra
+-   feat: apply color when today by:Javier Segarra
+-   feat: change label because its more natural by:Javier Segarra
+-   feat: change order by:Javier Segarra
+-   feat: change QBadge color by:Javier Segarra
+-   feat: change url CustomerList by:Javier Segarra
+-   feat: copy customer countryFk by:Javier Segarra
+-   feat: create VnSelectEnum and add in AccountBasicData and ClaimBasicData by:alexm
+-   feat: CustomerBalance by:Javier Segarra
+-   feat: CustomerConsumptionFilter by:Javier Segarra
+-   feat: customer consumption (origin/7830-customerDesplegables, 7830-customerDesplegables) by:alexm
+-   feat: CustomerCreateTicket by:Javier Segarra
+-   feat: CustomerCredit section by:Javier Segarra
+-   feat: CustomerGreuges by:Javier Segarra
+-   feat: CustomerSample to VnTable by:Javier Segarra
+-   feat: global handler (origin/fix_global_handler, fix_global_handler) by:alexm
+-   feat: goToSupplier by:Javier Segarra
+-   feat: handle newValue by:Javier Segarra
+-   feat: handle same multiple CP by:Javier Segarra
+-   feat: hide menus on small view (origin/hideMenu) by:jorgep
+-   feat: minor changes by:Javier Segarra
+-   feat: orderCreateDialog by:Javier Segarra
+-   feat: refs #4074 drop useless code by:jorgep
+-   feat: refs #4074 useAcl in vnSelectDialog by:jorgep
+-   feat: refs #6346 new wagon type section by:Jon
+-   feat: refs #7404 add m3 and fix detail by:pablone
+-   feat: refs #7404 add some style to the form and reorganize fields by:pablone
+-   feat: refs #7404 add travel m3 to reserves form by:pablone
+-   feat: refs #7404 style dynamic text color by:pablone
+-   feat: refs #7404 travel m3 form by:pablone
+-   feat: refs #7500 added VnImg to show files by:Jon
+-   feat: refs #7663 add setWeight menu opt (wip) by:jorgep
+-   feat: refs #7663 fine tunning by:jorgep
+-   feat: refs #7828 create axios instance which no manage errors (origin/7828-makeCorrectCalls) by:jorgep
+-   feat: refs #7828 useAcl & cherry pick mail data worker by:jorgep
+-   feat: remove cli warnings by:Javier Segarra
+-   feat: show preparation field by:Javier Segarra
+-   feat: stateGroupedFilter by:Javier Segarra
+-   feat: translations fixed by:jgallego
+-   feat(TravelList): add daysOnward by:alexm
+-   feat: travel m3 by:pablone
+-   feat: use disableInifiniteScroll property by:Javier Segarra
+-   feat: VnImg draggable by:Javier Segarra
+-   feat: vnLocation changes by:Javier Segarra
+-   feat: vnSelect exprBuilder by:Javier Segarra
+-   fix: refs #7404 remove some style by:pablone
+-   fix: refs #7404 style non center pop up (origin/7404-fixFront) by:pablone
+-   fix: refs #7404 translates and some minor style fixes by:pablone
+-   fix: styles by:Javier Segarra
+-   perf: improve style by:Javier Segarra
+
+### Changed 📦
+
+-   perf: CustomerBalance by:Javier Segarra
+-   perf: CustomerBasicData by:Javier Segarra
+-   perf: CustomerBasicData.salesPersonFk by:Javier Segarra
+-   perf: CustomerSummary by:Javier Segarra
+-   perf: customerSummaryTable by:Javier Segarra
+-   perf: disable card option by:Javier Segarra
+-   perf: i18n by:Javier Segarra
+-   perf: improve by:Javier Segarra
+-   perf: improve style by:Javier Segarra
+-   perf: imrpove exprBuilder by:Javier Segarra
+-   perf: minor comments by:Javier Segarra
+-   perf: refs #6346 previous changes by:Jon
+-   perf: sendEmail customerConsumption by:Javier Segarra
+-   perf: solve reload CardSummary component by:Javier Segarra
+-   perf: update CustommerDescriptor by:Javier Segarra
+-   refactor: refs #4074 accept array by:jorgep
+-   refactor: refs #4074 rollback by:jorgep
+-   refactor: refs #4074 use acl & drop useless roles by:jorgep
+-   refactor: refs #4074 useAcl in navigationStore & router by:jorgep
+-   refactor: refs #4074 use fn (origin/4074-useAcls) by:jorgep
+-   refactor: refs #4074 use VnTitle by:jorgep
+-   refactor: refs #6346 deleted front error checking by:Jon
+-   refactor: refs #6346 requested changes by:Jon
+-   refactor: refs #6346 wagons to VnTable by:Jon
+-   refactor: refs #7500 deleted useless code by:Jon
+-   refactor: refs #7500 refactor vnimg when storage is dms by:Jon
+-   refactor: refs #7828 wip by:jorgep
+
+### Fixed 🛠️
+
+-   chore: refs #4074 fix tests by:jorgep
+-   chore: refs #7828 fix e2e by:jorgep
+-   feat: refs #7404 add m3 and fix detail by:pablone
+-   feat: translations fixed by:jgallego
+-   fix: #5938 grouped filter by:Javier Segarra
+-   fix: #6943 fix customerSummaryTable by:Javier Segarra
+-   fix: #6943 show nickname salesPerson by:Javier Segarra
+-   fix: address-create i18n by:Javier Segarra
+-   fix: comments (origin/6943_fix_customer_module, 6943_fix_customer_module) by:Javier Segarra
+-   fix: CusomerSummary to Address by:Javier Segarra
+-   fix: CustomerAddress mobile by:Javier Segarra
+-   fix: CustomerBillingData by:Javier Segarra
+-   fix: Customerconsumption by:Javier Segarra
+-   fix: customer credit opinion by:alexm
+-   fix: CustomerCreditOpinion workerDescriptor by:Javier Segarra
+-   fix: CustomerDescriptorAccount by:Javier Segarra
+-   fix: CustomerDescriptor.bussinessTypeFk by:Javier Segarra
+-   fix: CustomerFilter by:Javier Segarra
+-   fix: CustomerGreuges by:Javier Segarra
+-   fix: CustomerMandates by:Javier Segarra
+-   fix: Customer module find salesPersons out of first get by:Javier Segarra
+-   fix: CustomerRecovery transalate label by:Javier Segarra
+-   fix: CustomerSamples by:Javier Segarra
+-   fix: customerSummaryToTicketList button by:Javier Segarra
+-   fix: CustomerWebPayment by:Javier Segarra
+-   fix: CustommerSummaryTable Proxy by:Javier Segarra
+-   fix: deleted code by:Jon
+-   fix: duplicate code by:alexm
+-   fix: emit:updateModelValue by:Javier Segarra
+-   fix: fixed wagon tests by:Jon
+-   fix: fix wagon list reload by:Jon
+-   fix: i18n en preparation label by:Javier Segarra
+-   fix: infiniteScroll by:Javier Segarra
+-   fix: isFullMovable checkbox by:Javier Segarra
+-   fix: merge conflicts by:Javier Segarra
+-   fix: merge in dev by:alexm
+-   fix: missing code by:Jon
+-   fix: Options VnSelect properties by:Javier Segarra
+-   fix: refs #4074 await to watch by:jorgep
+-   fix: refs #4074 drop wrong acl by:jorgep
+-   fix: refs #4074 workerCard data-key by:jorgep
+-   fix: refs #6346 fix list and create by:pablone
+-   fix: refs #6943 prevent null (origin/6943-warmfix-preventNull) by:jorgep
+-   fix: refs #7155 remove userParams in watcher (7155-travel_daysOnward) by:alexm
+-   fix: refs #7155 use chip-locale (origin/7155-travel_daysOnward_2, 7155-travel_daysOnward_2) by:alexm
+-   fix: refs #7404 remove console.log by:pablone
+-   fix: refs #7404 remove from test by:pablone
+-   fix: refs #7404 remove some style by:pablone
+-   fix: refs #7404 revert commit prevent production access by:pablone
+-   fix: refs #7404 style non center pop up (origin/7404-fixFront) by:pablone
+-   fix: refs #7404 translates and some minor style fixes by:pablone
+-   fix: refs #7500 fixed e2e test by:Jon
+-   fix: refs #7500 fixed showing images wrongly by:Jon
+-   fix: refs #7830 customer credit by:pablone
+-   fix: refs #7830 remove console.log by:pablone
+-   fix: remove console.log by:pablone
+-   fix: remove FetchData by:Javier Segarra
+-   fix: remove FIXME (origin/6943_fix_customerSummaryTable) by:Javier Segarra
+-   fix: remove print variable by:Javier Segarra
+-   fix: remove promise execution by:Javier Segarra
+-   fix: reset VnTable scroll properties by:Javier Segarra
+-   fix: rule by:Javier Segarra
+-   fix: solve conflicts from master to test by:Javier Segarra
+-   fix: split params (origin/warmfix-addSearchUrl) by:jorgep
+-   fix: state cell by:Javier Segarra
+-   fix: stop call back event hasMoreData by:Javier Segarra
+-   fix: styles by:Javier Segarra
+-   fix: SupplierFiscalData VnLocation (origin/fix_supplierFD_location) by:Javier Segarra
+-   fix: VnLocation test by:Javier Segarra
+-   fix(VnTable): header background-color by:alexm
+-   fix(VnTable): sanitizer value is defined by:carlossa
+-   fix: wagon reload (origin/FixWagonRedirect) by:Jon
+-   fix: workerDms filter workerFk by:alexm
+-   fix(WorkerList): add type email by:alexm
+-   Merge remote-tracking branch 'origin/7830-customerDesplegables' into 6943_fix_customerSummaryTable by:Javier Segarra
+-   refs #7155 scopeDays fix (origin/7155-scopeDays) by:carlossa
+-   revert: vnUSerLink change by:Javier Segarra
+-   test: fix test (7677_vnLocation_perf) by:Javier Segarra
+
 # Version 24.38 - 2024-09-17
 
 ### Added 🆕

src/components/RefundInvoiceForm.vue

@@ -24,9 +24,9 @@ const { notify } = useNotify();
 
 const rectificativeTypeOptions = ref([]);
 const siiTypeInvoiceOutsOptions = ref([]);
-const inheritWarehouse = ref(true);
 const invoiceParams = reactive({
     id: $props.invoiceOutData?.id,
+    inheritWarehouse: true,
 });
 const invoiceCorrectionTypesOptions = ref([]);
 
@@ -138,7 +138,7 @@ const refund = async () => {
                     <div>
                         <QCheckbox
                             :label="t('Inherit warehouse')"
-                            v-model="inheritWarehouse"
+                            v-model="invoiceParams.inheritWarehouse"
                         />
                         <QIcon name="info" class="cursor-info q-ml-sm" size="sm">
                             <QTooltip>{{ t('Inherit warehouse tooltip') }}</QTooltip>

src/components/VnTable/VnTable.vue

@@ -317,7 +317,7 @@ defineExpose({
     params,
 });
 
-function handleOnDataSaved(_, res) {
+function handleOnDataSaved(_) {
     if (_.onDataSaved) _.onDataSaved({ CrudModelRef: CrudModelRef.value });
     else $props.create.onDataSaved(_);
 }
@@ -497,6 +497,7 @@ function handleOnDataSaved(_, res) {
                         auto-width
                         class="no-margin q-px-xs"
                         :class="[getColAlign(col), col.columnClass]"
+                        :style="col.style"
                         v-if="col.visible ?? true"
                         @click.ctrl="
                             ($event) =>
@@ -525,6 +526,7 @@ function handleOnDataSaved(_, res) {
                         :class="getColAlign(col)"
                         class="sticky no-padding"
                         @click="stopEventPropagation($event)"
+                        :style="col.style"
                     >
                         <QBtn
                             v-for="(btn, index) of col.actions"
@@ -710,7 +712,7 @@ function handleOnDataSaved(_, res) {
             icon="add"
             shortcut="+"
         />
-        <QTooltip>
+        <QTooltip self="top right">
             {{ createForm?.title }}
         </QTooltip>
     </QPageSticky>
@@ -771,16 +773,6 @@ es:
     color: var(--vn-text-color);
 }
 
-.q-table--dark .q-table__bottom,
-.q-table--dark thead,
-.q-table--dark tr {
-    border-color: var(--vn-section-color);
-}
-
-.q-table__container > div:first-child {
-    background-color: var(--vn-page-color);
-}
-
 .grid-three {
     display: grid;
     grid-template-columns: repeat(auto-fit, minmax(400px, max-content));

src/components/common/VnChangePassword.vue

@@ -0,0 +1,136 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import VnRow from '../ui/VnRow.vue';
+import VnInput from './VnInput.vue';
+import FetchData from '../FetchData.vue';
+import useNotify from 'src/composables/useNotify';
+
+const props = defineProps({
+    submitFn: { type: Function, default: () => {} },
+    askOldPass: { type: Boolean, default: false },
+});
+const emit = defineEmits(['onSubmit']);
+const { t } = useI18n();
+const { notify } = useNotify();
+
+const form = ref();
+const changePassDialog = ref();
+const passwords = ref({ newPassword: null, repeatPassword: null });
+const requirements = ref([]);
+const isLoading = ref(false);
+
+const validate = async () => {
+    const { newPassword, repeatPassword, oldPassword } = passwords.value;
+
+    if (!newPassword) {
+        notify(t('You must enter a new password'), 'negative');
+        return;
+    }
+    if (newPassword !== repeatPassword) {
+        notify(t("Passwords don't match"), 'negative');
+        return;
+    }
+
+    try {
+        isLoading.value = true;
+        await props.submitFn(newPassword, oldPassword);
+        emit('onSubmit');
+    } catch (e) {
+        notify('errors.writeRequest', 'negative');
+    } finally {
+        changePassDialog.value.hide();
+        isLoading.value = false;
+    }
+};
+
+defineExpose({ show: () => changePassDialog.value.show() });
+</script>
+<template>
+    <FetchData
+        url="UserPasswords/findOne"
+        auto-load
+        @on-fetch="(data) => (requirements = data)"
+    />
+    <QDialog ref="changePassDialog">
+        <QCard style="width: 350px">
+            <QCardSection>
+                <slot name="header">
+                    <VnRow class="items-center" style="flex-direction: row">
+                        <span class="text-h6" v-text="t('globals.changePass')" />
+                        <QIcon
+                            class="cursor-pointer"
+                            name="close"
+                            size="xs"
+                            style="flex: 0"
+                            v-close-popup
+                        />
+                    </VnRow>
+                </slot>
+            </QCardSection>
+            <QForm ref="form">
+                <QCardSection>
+                    <VnInput
+                        v-if="props.askOldPass"
+                        :label="t('Old password')"
+                        v-model="passwords.oldPassword"
+                        type="password"
+                        :required="true"
+                        autofocus
+                    />
+                    <VnInput
+                        :label="t('New password')"
+                        v-model="passwords.newPassword"
+                        type="password"
+                        :required="true"
+                        :info="
+                            t('passwordRequirements', {
+                                length: requirements.length,
+                                nAlpha: requirements.nAlpha,
+                                nUpper: requirements.nUpper,
+                                nDigits: requirements.nDigits,
+                                nPunct: requirements.nPunct,
+                            })
+                        "
+                        autofocus
+                    />
+
+                    <VnInput
+                        :label="t('Repeat password')"
+                        v-model="passwords.repeatPassword"
+                        type="password"
+                    />
+                </QCardSection>
+            </QForm>
+            <QCardActions>
+                <slot name="actions">
+                    <QBtn
+                        :disabled="isLoading"
+                        :loading="isLoading"
+                        :label="t('globals.cancel')"
+                        class="q-ml-sm"
+                        color="primary"
+                        flat
+                        type="reset"
+                        v-close-popup
+                    />
+                    <QBtn
+                        :disabled="isLoading"
+                        :loading="isLoading"
+                        :label="t('globals.confirm')"
+                        color="primary"
+                        @click="validate"
+                    />
+                </slot>
+            </QCardActions>
+        </QCard>
+    </QDialog>
+</template>
+
+<i18n>
+es:
+    New password: Nueva contraseña
+    Repeat password: Repetir contraseña
+    You must enter a new password: Debes introducir la nueva contraseña
+    Passwords don't match: Las contraseñas no coinciden
+</i18n>

src/components/ui/CatalogItem.vue

@@ -31,7 +31,7 @@ const dialog = ref(null);
     <div class="container order-catalog-item overflow-hidden">
         <QCard class="card shadow-6">
             <div class="img-wrapper">
-                <VnImg :id="item.id" class="image" />
+                <VnImg :id="item.id" class="image" zoom-resolution="1600x900" />
                 <div v-if="item.hex && isCatalog" class="item-color-container">
                     <div
                         class="item-color"

src/components/ui/VnPaginate.vue

@@ -56,7 +56,7 @@ const props = defineProps({
     },
     offset: {
         type: Number,
-        default: 0,
+        default: undefined,
     },
     skeleton: {
         type: Boolean,

src/composables/useArrayData.js

@@ -114,7 +114,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
             for (const row of response.data) store.data.push(row);
         } else {
             store.data = response.data;
-            if (!document.querySelectorAll('[role="dialog"]').length)
+            if (!document.querySelectorAll('[role="dialog"][aria-modal="true"]').length)
                 updateRouter && updateStateParams();
         }
 

src/i18n/locale/en.yml

@@ -105,6 +105,7 @@ globals:
     campaign: Campaign
     weight: Weight
     error: Ups! Something went wrong
+    recalc: Recalculate
     pageTitles:
         logIn: Login
         addressEdit: Update address
@@ -275,6 +276,7 @@ globals:
         serial: Serial
         medical: Mutual
         RouteExtendedList: Router
+        wasteRecalc: Waste recaclulate
     supplier: Supplier
     created: Created
     worker: Worker
@@ -293,6 +295,7 @@ globals:
     maxTemperature: Max
     minTemperature: Min
     params:
+        id: ID
         clientFk: Client id
         salesPersonFk: Sales person
         warehouseFk: Warehouse
@@ -300,6 +303,12 @@ globals:
         from: From
         To: To
         stateFk: State
+        departmentFk: Department
+        email: Email
+        SSN: SSN
+        fi: FI
+    changePass: Change password
+    deleteConfirmTitle: Delete selected elements
 errors:
     statusUnauthorized: Access denied
     statusInternalServerError: An internal server error has ocurred
@@ -806,14 +815,14 @@ worker:
         bankEntity: Swift / BIC
     formation:
         tableVisibleColumns:
-            course: Curso
+            course: Course
-            startDate: Fecha Inicio
+            startDate: Start date
-            endDate: Fecha Fin
+            endDate: End date
-            center: Centro Formación
+            center: Training center
-            invoice: Factura
+            invoice: Invoice
-            amount: Importe
+            amount: Amount
-            remark: Bonficado
+            remark: Remark
-            hasDiploma: Diploma
+            hasDiploma: Has diploma
     medical:
         tableVisibleColumns:
             date: Date
@@ -870,35 +879,7 @@ wagon:
         minHeightBetweenTrays: 'The minimum height between trays is '
         maxWagonHeight: 'The maximum height of the wagon is '
         uncompleteTrays: There are incomplete trays
-route:
+
-    pageTitles:
-        agency: Agency List
-        routes: Routes
-        cmrsList: CMRs list
-        RouteList: List
-        routeCreate: New route
-        basicData: Basic Data
-        summary: Summary
-        RouteRoadmap: Roadmaps
-        RouteRoadmapCreate: Create roadmap
-        tickets: Tickets
-        log: Log
-        autonomous: Autonomous
-        RouteExtendedList: Router
-    cmr:
-        list:
-            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
-            downloadCmrs: Download CMRs
 supplier:
     list:
         payMethod: Pay method

src/i18n/locale/es.yml

@@ -107,6 +107,7 @@ globals:
     campaign: Campaña
     weight: Peso
     error: ¡Ups! Algo salió mal
+    recalc: Recalcular
     pageTitles:
         logIn: Inicio de sesión
         addressEdit: Modificar consignatario
@@ -279,6 +280,7 @@ globals:
         clientsActionsMonitor: Clientes y acciones
         serial: Facturas por serie
         medical: Mutua
+        wasteRecalc: Recalcular mermas
     supplier: Proveedor
     created: Fecha creación
     worker: Trabajador
@@ -297,6 +299,7 @@ globals:
     maxTemperature: Máx
     minTemperature: Mín
     params:
+        id: Id
         clientFk: Id cliente
         salesPersonFk: Comercial
         warehouseFk: Almacén
@@ -304,6 +307,12 @@ globals:
         from: Desde
         To: Hasta
         stateFk: Estado
+        departmentFk: Departamento
+        email: Correo
+        SSN: NSS
+        fi: NIF
+    changePass: Cambiar contraseña
+    deleteConfirmTitle: Eliminar los elementos seleccionados
 errors:
     statusUnauthorized: Acceso denegado
     statusInternalServerError: Ha ocurrido un error interno del servidor
@@ -868,21 +877,6 @@ wagon:
         minHeightBetweenTrays: 'La distancia mínima entre bandejas es '
         maxWagonHeight: 'La altura máxima del vagón es '
         uncompleteTrays: Hay bandejas sin completar
-route:
-    cmr:
-        list:
-            results: resultados
-            cmrFk: Id CMR
-            hasCmrDms: Gestdoc
-            'true': Sí
-            'false': 'No'
-            ticketFk: Id ticket
-            routeFk: Id ruta
-            country: País
-            clientFk: Id cliente
-            shipped: Fecha preparación
-            viewCmr: Ver CMR
-            downloadCmrs: Descargar CMRs
 supplier:
     list:
         payMethod: Método de pago

src/pages/Account/AccountList.vue

@@ -5,7 +5,8 @@ import VnTable from 'components/VnTable/VnTable.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import AccountSummary from './Card/AccountSummary.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
-
+import AccountFilter from './AccountFilter.vue';
+import RightMenu from 'src/components/common/RightMenu.vue';
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
 const tableRef = ref();
@@ -20,14 +21,6 @@ const columns = computed(() => [
         isId: true,
         field: 'id',
         cardVisible: true,
-        columnFilter: {
-            component: 'select',
-            name: 'search',
-            attrs: {
-                url: 'VnUsers/preview',
-                fields: ['id', 'name'],
-            },
-        },
     },
     {
         align: 'left',
@@ -53,9 +46,6 @@ const columns = computed(() => [
         columnField: {
             component: null,
         },
-        columnFilter: {
-            inWhere: true,
-        },
         cardVisible: true,
         create: true,
     },
@@ -67,9 +57,6 @@ const columns = computed(() => [
         columnField: {
             component: null,
         },
-        columnFilter: {
-            inWhere: true,
-        },
         cardVisible: true,
         create: true,
     },
@@ -123,6 +110,11 @@ const exprBuilder = (param, value) => {
         :info="t('account.searchInfo')"
         :filter="filter"
     />
+    <RightMenu>
+        <template #right-panel>
+            <AccountFilter data-key="AccountUsers" />
+        </template>
+    </RightMenu>
     <VnTable
         ref="tableRef"
         data-key="AccountUsers"
@@ -133,6 +125,8 @@ const exprBuilder = (param, value) => {
         default-mode="table"
         redirect="account"
         :use-model="true"
+        :right-search="false"
+        auto-load
     />
 </template>
 

src/pages/Account/Card/AccountCard.vue

@@ -10,10 +10,7 @@ const { t } = useI18n();
     <VnCard
         data-key="Account"
         :descriptor="AccountDescriptor"
-        search-data-key="AccountUsers"
+        search-data-key="AccountList"
-        :filter="{
-            include: { relation: 'role', scope: { fields: ['id', 'name'] } },
-        }"
         :searchbar-props="{
             url: 'VnUsers/preview',
             label: t('account.search'),

src/pages/Account/Card/AccountDescriptorMenu.vue

@@ -4,9 +4,12 @@ import { computed, ref, toRefs } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useVnConfirm } from 'composables/useVnConfirm';
 import { useRoute } from 'vue-router';
+import { useAcl } from 'src/composables/useAcl';
 import { useArrayData } from 'src/composables/useArrayData';
 import VnConfirm from 'src/components/ui/VnConfirm.vue';
+import VnChangePassword from 'src/components/common/VnChangePassword.vue';
 import useNotify from 'src/composables/useNotify.js';
+
 const $props = defineProps({
     hasAccount: {
         type: Boolean,
@@ -62,6 +65,19 @@ async function sync() {
 }
 </script>
 <template>
+    <VnChangePassword
+        ref="changePassRef"
+        :ask-old-pass="true"
+        :submit-fn="
+            async (newPassword, oldPassword) => {
+                await axios.patch(`Accounts/change-password`, {
+                    userId: entityId,
+                    newPassword,
+                    oldPassword,
+                });
+            }
+        "
+    />
     <VnConfirm
         v-model="showSyncDialog"
         :message="t('account.card.actions.sync.message')"
@@ -92,6 +108,17 @@ async function sync() {
             />
         </template>
     </VnConfirm>
+    <QItem
+        v-if="
+            entityId == account.id &&
+            useAcl().hasAny([{ model: 'Account', props: '*', accessType: 'WRITE' }])
+        "
+        v-ripple
+        clickable
+        @click="$refs.changePassRef.show()"
+    >
+        <QItemSection>{{ t('globals.changePass') }}</QItemSection>
+    </QItem>
     <QItem
         v-if="account.hasAccount"
         v-ripple
@@ -138,6 +165,5 @@ async function sync() {
     <QItem v-ripple clickable @click="showSyncDialog = true">
         <QItemSection>{{ t('account.card.actions.sync.name') }}</QItemSection>
     </QItem>
-
     <QSeparator />
 </template>

src/pages/Customer/Card/CustomerUnpaid.vue

@@ -92,7 +92,7 @@ const onSubmit = async () => {
         notify('globals.dataSaved', 'positive');
         unpaidClient.value = true;
     } catch (error) {
-        notify('errors.create', 'negative');
+        notify('errors.writeRequest', 'negative');
     } finally {
         isLoading.value = false;
     }

src/pages/Customer/Card/CustomerWebAccess.vue

@@ -3,14 +3,11 @@ import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import axios from 'axios';
-import { useQuasar } from 'quasar';
-
 import VnInput from 'src/components/common/VnInput.vue';
-import CustomerChangePassword from 'src/pages/Customer/components/CustomerChangePassword.vue';
 import FormModel from 'components/FormModel.vue';
+import VnChangePassword from 'src/components/common/VnChangePassword.vue';
 
 const { t } = useI18n();
-const quasar = useQuasar();
 const route = useRoute();
 const canChangePassword = ref(0);
 
@@ -21,21 +18,11 @@ const filter = computed(() => {
     };
 });
 
-const showChangePasswordDialog = () => {
-    quasar.dialog({
-        component: CustomerChangePassword,
-        componentProps: {
-            id: route.params.id,
-        },
-    });
-};
-
 async function hasCustomerRole() {
     const { data } = await axios(`Clients/${route.params.id}/hasCustomerRole`);
     canChangePassword.value = data;
 }
 </script>
-
 <template>
     <FormModel
         url="VnUsers/preview"
@@ -69,21 +56,29 @@ async function hasCustomerRole() {
         </template>
         <template #moreActions>
             <QBtn
-                :label="t('Change password')"
+                :label="t('globals.changePass')"
                 color="primary"
                 icon="edit"
                 :disable="!canChangePassword"
-                @click="showChangePasswordDialog()"
+                @click="$refs.changePassRef.show"
             />
         </template>
     </FormModel>
+    <VnChangePassword
+        ref="changePassRef"
+        :submit-fn="
+            async (newPass) => {
+                await axios.patch(`Clients/${$route.params.id}/setPassword`, {
+                    newPassword: newPass,
+                });
+            }
+        "
+    />
 </template>
-
 <i18n>
 es:
     Enable web access: Habilitar acceso web
     User: Usuario
     Recovery email: Correo de recuperacion
     This email is used for user to regain access their account: Este correo electrónico se usa para que el usuario recupere el acceso a su cuenta
-    Change password: Cambiar contraseña
 </i18n>

src/pages/Customer/components/CustomerChangePassword.vue

@@ -1,138 +0,0 @@
-<script setup>
-import { ref } from 'vue';
-import { useI18n } from 'vue-i18n';
-
-import axios from 'axios';
-import { useDialogPluginComponent } from 'quasar';
-
-import useNotify from 'src/composables/useNotify';
-
-import VnRow from 'components/ui/VnRow.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import FetchData from 'src/components/FetchData.vue';
-
-const { dialogRef } = useDialogPluginComponent();
-const { notify } = useNotify();
-const { t } = useI18n();
-
-const $props = defineProps({
-    id: {
-        type: String,
-        required: true,
-    },
-    promise: {
-        type: Function,
-        required: true,
-    },
-});
-const userPasswords = ref({});
-
-const closeButton = ref(null);
-const isLoading = ref(false);
-const newPassword = ref('');
-const requestPassword = ref('');
-
-const onSubmit = async () => {
-    isLoading.value = true;
-
-    if (newPassword.value !== requestPassword.value) {
-        notify(t("Passwords don't match"), 'negative');
-        isLoading.value = false;
-        return;
-    }
-
-    const payload = {
-        newPassword: newPassword.value,
-    };
-    try {
-        await axios.patch(`Clients/${$props.id}/setPassword`, payload);
-    } catch (error) {
-        notify('errors.create', 'negative');
-    } finally {
-        isLoading.value = false;
-        if (closeButton.value) closeButton.value.click();
-    }
-};
-</script>
-
-<template>
-    <QDialog ref="dialogRef">
-        <FetchData
-            @on-fetch="(data) => (userPasswords = data[0])"
-            auto-load
-            url="UserPasswords"
-        />
-        <QCard class="q-pa-lg">
-            <QCardSection>
-                <QForm @submit.prevent="onSubmit">
-                    <span
-                        ref="closeButton"
-                        class="row justify-end close-icon"
-                        v-close-popup
-                    >
-                        <QIcon name="close" size="sm" />
-                    </span>
-
-                    <VnRow class="row q-gutter-md q-mb-md" style="flex-direction: column">
-                        <div class="col">
-                            <VnInput
-                                :label="t('New password')"
-                                clearable
-                                v-model="newPassword"
-                                type="password"
-                            >
-                                <template #append>
-                                    <QIcon name="info" class="cursor-info">
-                                        <QTooltip>
-                                            {{
-                                                t('customer.card.passwordRequirements', {
-                                                    ...userPasswords,
-                                                })
-                                            }}
-                                        </QTooltip>
-                                    </QIcon>
-                                </template>
-                            </VnInput>
-                        </div>
-                        <div class="col">
-                            <VnInput
-                                :label="t('Request password')"
-                                clearable
-                                v-model="requestPassword"
-                                type="password"
-                            />
-                        </div>
-                    </VnRow>
-
-                    <div class="q-mt-lg row justify-end">
-                        <QBtn
-                            :disabled="isLoading"
-                            :label="t('globals.cancel')"
-                            :loading="isLoading"
-                            class="q-ml-sm"
-                            color="primary"
-                            flat
-                            type="reset"
-                            v-close-popup
-                        />
-                        <QBtn
-                            :disabled="isLoading"
-                            :label="t('Change password')"
-                            :loading="isLoading"
-                            color="primary"
-                            type="submit"
-                        />
-                    </div>
-                </QForm>
-            </QCardSection>
-        </QCard>
-    </QDialog>
-</template>
-
-<i18n>
-es:
-    New password: Nueva contraseña
-    Request password: Repetir contraseña
-    Change password: Cambiar contraseña
-    Passwords don't match: Las contraseñas no coinciden
-</i18n>

src/pages/Customer/components/CustomerSamplesCreate.vue

@@ -138,7 +138,7 @@ const onSubmit = async () => {
         notify('globals.dataSaved', 'positive');
         onDataSaved(data);
     } catch (error) {
-        notify('errors.create', 'negative');
+        notify('errors.writeRequest', 'negative');
     } finally {
         isLoading.value = false;
     }

src/pages/Entry/EntryStockBought.vue

@@ -45,6 +45,7 @@ const columns = [
             optionValue: 'id',
             useLike: false,
         },
+        columnFilter: false,
     },
     {
         align: 'center',
@@ -157,7 +158,7 @@ function round(value) {
                 @on-fetch="
                     (data) => {
                         travel = data.find(
-                            (data) => data.warehouseIn.code.toLowerCase() === 'vnh'
+                            (data) => data.warehouseIn?.code.toLowerCase() === 'vnh'
                         );
                     }
                 "
@@ -165,7 +166,7 @@ function round(value) {
             <VnRow class="travel">
                 <div v-if="travel">
                     <span style="color: var(--vn-label-color)">
-                        {{ t('Booked trucks') }}:
+                        {{ t('Purchase Spaces') }}:
                     </span>
                     <span>
                         {{ travel?.m3 }}
@@ -236,6 +237,7 @@ function round(value) {
                 :footer="true"
                 table-height="80vh"
                 auto-load
+                :column-search="false"
             >
                 <template #column-workerFk="{ row }">
                     <span class="link" @click.stop>
@@ -279,7 +281,6 @@ function round(value) {
     display: flex;
     flex-direction: column;
     align-items: center;
-    width: 35%;
 }
 .text-negative {
     color: $negative !important;
@@ -289,7 +290,7 @@ function round(value) {
     es:
         Edit travel: Editar envío
         Travel: Envíos
-        Booked trucks: Camiones reservados
+        Purchase Spaces: Espacios de compra
         Buyer: Comprador
         Reserve: Reservado
         Bought: Comprado

src/pages/Entry/EntryWasteRecalc.vue

@@ -0,0 +1,72 @@
+<script setup>
+import { ref, computed, watch } from 'vue';
+import VnInputDate from 'components/common/VnInputDate.vue';
+import useNotify from 'src/composables/useNotify.js';
+import axios from 'axios';
+
+const isLoading = ref(false);
+const dateFrom = ref();
+const dateTo = ref();
+
+const optionsTo = computed(() => (date) => {
+    if (!dateFrom.value) return true;
+    return new Date(date) >= new Date(dateFrom.value);
+});
+
+watch(dateFrom, (newDateFrom) => {
+    if (dateTo.value && new Date(dateTo.value) < new Date(newDateFrom))
+        dateTo.value = newDateFrom;
+});
+
+const recalc = async () => {
+    const { notify } = useNotify();
+
+    const params = {
+        schema: 'bs',
+        params: [new Date(dateFrom.value), new Date(dateTo.value)],
+    };
+
+    try {
+        isLoading.value = true;
+        await axios.post('Applications/waste_addSales/execute-proc', params);
+        notify('wasteRecalc.recalcOk', 'positive');
+    } catch (err) {
+        console.error(err);
+    } finally {
+        isLoading.value = false;
+    }
+};
+</script>
+
+<template>
+    <div class="q-pa-lg row justify-center">
+        <QCard class="bg-light" style="width: 300px">
+            <QCardSection>
+                <VnInputDate
+                    class="q-mb-lg"
+                    v-model="dateFrom"
+                    :label="$t('globals.from')"
+                    rounded
+                    dense
+                />
+                <VnInputDate
+                    class="q-mb-lg"
+                    v-model="dateTo"
+                    :options="optionsTo"
+                    :label="$t('globals.to')"
+                    :disable="!dateFrom"
+                    rounded
+                    dense
+                />
+                <QBtn
+                    color="primary"
+                    text-color="white"
+                    :label="$t('globals.recalc')"
+                    :loading="isLoading"
+                    :disable="isLoading || !(dateFrom && dateTo)"
+                    @click="recalc()"
+                />
+            </QCardSection>
+        </QCard>
+    </div>
+</template>

src/pages/Entry/locale/en.yml

@@ -18,3 +18,5 @@ myEntries:
     warehouseInFk: Warehouse in
     daysOnward: Days onward
     daysAgo: Days ago
+wasteRecalc:
+    recalcOk: The wastes were successfully recalculated

src/pages/Entry/locale/es.yml

@@ -21,3 +21,5 @@ myEntries:
     warehouseInFk: Alm. entrada
     daysOnward: Días adelante
     daysAgo: Días atras
+wasteRecalc:
+    recalcOk: Se han recalculado las mermas correctamente

src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue

@@ -9,7 +9,6 @@ import RefundInvoiceForm from 'src/components/RefundInvoiceForm.vue';
 import SendEmailDialog from 'components/common/SendEmailDialog.vue';
 
 import useNotify from 'src/composables/useNotify';
-import { useSession } from 'src/composables/useSession';
 import { usePrintService } from 'composables/usePrintService';
 import { useVnConfirm } from 'composables/useVnConfirm';
 import { getUrl } from 'src/composables/getUrl';
@@ -30,8 +29,6 @@ const $props = defineProps({
 
 const { notify } = useNotify();
 const router = useRouter();
-const session = useSession();
-const token = session.getToken();
 const { t } = useI18n();
 const { openReport, sendEmail } = usePrintService();
 const { openConfirmationModal } = useVnConfirm();

src/pages/Item/Card/ItemTags.vue

@@ -171,7 +171,6 @@ const insertTag = (rows) => {
                             <QBtn
                                 @click="insertTag(rows)"
                                 class="cursor-pointer"
-                                :disable="!validRow"
                                 color="primary"
                                 flat
                                 icon="add"

src/pages/Item/ItemList.vue

@@ -491,9 +491,8 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                         <QTd>
                             <VnImg
                                 size="50x50"
+                                zoom-resolution="1600x900"
                                 :id="row.id"
-                                height="50px"
-                                width="50px"
                                 class="image"
                             />
                         </QTd>

src/pages/Monitor/MonitorOrders.vue

@@ -139,33 +139,35 @@ const openTab = (id) =>
         :disable-option="{ card: true }"
     >
         <template #top-left>
-            <QBtn
+            <div class="q-mt-sm">
-                icon="refresh"
+                <QBtn
-                size="md"
+                    icon="refresh"
-                color="primary"
+                    size="md"
-                dense
+                    color="primary"
-                flat
+                    dense
-                @click="$refs.table.reload()"
+                    flat
-            >
+                    @click="$refs.table.reload()"
-                <QTooltip>{{ $t('globals.refresh') }}</QTooltip>
+                >
-            </QBtn>
+                    <QTooltip>{{ $t('globals.refresh') }}</QTooltip>
-            <QBtn
+                </QBtn>
-                v-if="selectedRows.length"
+                <QBtn
-                icon="delete"
+                    v-if="selectedRows.length"
-                size="md"
+                    icon="delete"
-                dense
+                    size="md"
-                flat
+                    dense
-                color="primary"
+                    flat
-                @click="
+                    color="primary"
-                    openConfirmationModal(
+                    @click="
-                        $t('salesOrdersTable.deleteConfirmTitle'),
+                        openConfirmationModal(
-                        $t('salesOrdersTable.deleteConfirmMessage'),
+                            $t('globals.deleteConfirmTitle'),
-                        removeOrders
+                            $t('salesOrdersTable.deleteConfirmMessage'),
-                    )
+                            removeOrders
-                "
+                        )
-            >
+                    "
-                <QTooltip>{{ t('salesOrdersTable.delete') }}</QTooltip>
+                >
-            </QBtn>
+                    <QTooltip>{{ t('salesOrdersTable.delete') }}</QTooltip>
+                </QBtn>
+            </div>
         </template>
         <template #column-dateSend="{ row }">
             <QTd>

src/pages/Monitor/locale/en.yml

@@ -15,7 +15,6 @@ salesOrdersTable:
     dateMake: Make date
     client: Client
     salesPerson: Salesperson
-    deleteConfirmTitle: Delete selected elements
     deleteConfirmMessage: All the selected elements will be deleted. Are you sure you want to continue?
     agency: Agency
     import: Import

src/pages/Monitor/locale/es.yml

@@ -15,7 +15,6 @@ salesOrdersTable:
     dateMake: Fecha de realización
     client: Cliente
     salesPerson: Comercial
-    deleteConfirmTitle: Eliminar los elementos seleccionados
     deleteConfirmMessage: Todos los elementos seleccionados serán eliminados. ¿Seguro que quieres continuar?
     agency: Agencia
     import: Importe

src/pages/Order/Card/OrderCatalog.vue

@@ -130,4 +130,5 @@ function extractValueTags(items) {
 <i18n>
 es:
     You can search items by name or id: Puedes buscar items por nombre o id
+    Search items: Buscar items
 </i18n>

src/pages/Order/Card/OrderCatalogFilter.vue

@@ -247,6 +247,7 @@ function addOrder(value, field, params) {
                         rounded
                         emit-value
                         use-input
+                        sort-by="name ASC"
                         :disable="!selectedCategoryFk"
                         @update:model-value="
                             (value) => {

src/pages/Order/Card/OrderCatalogItemDialog.vue

@@ -20,8 +20,10 @@ const props = defineProps({
 
 const fields = ref((props.prices || []).map((item) => ({ ...item, quantity: 0 })));
 const descriptorData = useArrayData('orderData');
-
+const isLoading = ref(false);
 const addToOrder = async () => {
+    if (isLoading.value) return;
+    isLoading.value = true;
     const items = (fields.value || []).filter((item) => Number(item.quantity) > 0);
     await axios.post('/OrderRows/addToOrder', {
         items,
@@ -30,6 +32,10 @@ const addToOrder = async () => {
     notify(t('globals.dataSaved'), 'positive');
     emit('added');
     descriptorData.fetch({});
+    isLoading.value = false;
+};
+const canAddToOrder = () => {
+    return (fields.value || []).some((item) => Number(item.quantity) > 0);
 };
 </script>
 
@@ -68,7 +74,11 @@ const addToOrder = async () => {
                 </tbody>
             </QMarkupTable>
             <div class="flex justify-center q-mt-lg">
-                <QBtn color="primary" type="submit">
+                <QBtn
+                    color="primary"
+                    type="submit"
+                    :disable="!isLoading && !canAddToOrder()"
+                >
                     {{ t('globals.add') }}
                 </QBtn>
             </div>
@@ -81,3 +91,10 @@ const addToOrder = async () => {
     width: 200px;
 }
 </style>
+
+<i18n>
+es:
+    noAmount: La cantidad no puede ser 0
+en:
+    noAmount: Amount can not be 0
+</i18n>

src/pages/Order/Card/OrderCreateDialog.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { useRoute, useRouter } from 'vue-router';
+import { useRouter } from 'vue-router';
 import { onMounted, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import axios from 'axios';
@@ -13,12 +13,10 @@ import { reactive } from 'vue';
 import FetchData from 'components/FetchData.vue';
 
 const { t } = useI18n();
-const route = useRoute();
 const state = useState();
 const ORDER_MODEL = 'order';
 
 const router = useRouter();
-const clientList = ref([]);
 const agencyList = ref([]);
 const addressList = ref([]);
 defineEmits(['confirm', ...useDialogPluginComponent.emits]);

src/pages/Order/Card/OrderLines.vue

@@ -278,7 +278,11 @@ watch(
     >
         <template #column-image="{ row }">
             <div class="image-wrapper">
-                <VnImg :id="parseInt(row?.item?.image)" class="rounded" />
+                <VnImg
+                    :id="parseInt(row?.item?.image)"
+                    class="rounded"
+                    zoom-resolution="1600x900"
+                />
             </div>
         </template>
         <template #column-id="{ row }">

src/pages/Route/Agency/Card/AgencyWorkcenter.vue

@@ -46,13 +46,13 @@ async function deleteWorCenter(id) {
 }
 </script>
 <template>
+    <FetchData
+        url="workCenters"
+        sort-by="name"
+        @on-fetch="(data) => (warehouses = data)"
+        auto-load
+    />
     <div class="centerCard">
-        <FetchData
-            url="workCenters"
-            sort-by="name"
-            @on-fetch="(data) => (warehouses = data)"
-            auto-load
-        />
         <VnPaginate
             ref="paginate"
             data-key="AgencyWorkCenters"

src/pages/Route/locale/en.yml

@@ -23,3 +23,17 @@ route:
     Summary: Summary
     Route is closed: Route is closed
     Route is not served: Route is not served
+    cmr:
+        list:
+            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
+            downloadCmrs: Download CMRs

src/pages/Route/locale/es.yml

@@ -23,3 +23,17 @@ route:
     Summary: Resumen
     Route is closed: La ruta está cerrada
     Route is not served: La ruta no está servida
+    cmr:
+        list:
+            results: resultados
+            cmrFk: Id CMR
+            hasCmrDms: Gestdoc
+            'true': Sí
+            'false': 'No'
+            ticketFk: Id ticket
+            routeFk: Id ruta
+            country: País
+            clientFk: Id cliente
+            shipped: Fecha preparación
+            viewCmr: Ver CMR
+            downloadCmrs: Descargar CMRs

src/pages/Supplier/Card/SupplierAgencyTermCreate.vue

@@ -15,12 +15,12 @@ const route = useRoute();
 const agenciesOptions = ref(null);
 const newAgencyTermForm = reactive({
     agencyFk: null,
-    minimumM3: null,
+    minimumM3: 0,
-    packagePrice: null,
+    packagePrice: 0,
-    kmPrice: null,
+    kmPrice: 0,
-    m3Price: null,
+    m3Price: 0,
     routePrice: null,
-    minimumKm: null,
+    minimumKm: 0,
     supplierFk: route.params.id,
 });
 

src/pages/Ticket/Card/TicketNotes.vue

@@ -49,7 +49,13 @@ async function handleSave() {
 
 <template>
     <FetchData
-        @on-fetch="(data) => (observationTypes = data)"
+        @on-fetch="
+            (data) =>
+                (observationTypes = data.map((type) => {
+                    type.label = t(`ticketNotes.observationTypes.${type.description}`);
+                    return type;
+                }))
+        "
         auto-load
         url="ObservationTypes"
     />
@@ -76,7 +82,7 @@ async function handleSave() {
                             :label="t('ticketNotes.observationType')"
                             :options="observationTypes"
                             hide-selected
-                            option-label="description"
+                            option-label="label"
                             option-value="id"
                             v-model="row.observationTypeFk"
                             :disable="!!row.id"

src/pages/Ticket/Card/TicketSale.vue

@@ -663,6 +663,13 @@ watch(
                 </QTooltip>
             </QIcon>
         </template>
+        <template #body-cell-picture="{ row }">
+            <QTd>
+                <div class="image-wrapper">
+                    <VnImg :id="row.itemFk" class="rounded" zoom-resolution="1600x900" />
+                </div>
+            </QTd>
+        </template>
         <template #column-image="{ row }">
             <div class="image-wrapper">
                 <VnImg :id="parseInt(row?.item?.id)" class="rounded" />

src/pages/Ticket/Card/TicketSummary.vue

@@ -82,29 +82,6 @@ async function changeState(value) {
     }
 }
 
-function getNoteValue(description) {
-    switch (description) {
-        case 'ItemPicker':
-            return t('ItemPicker');
-        case 'Packager':
-            return t('Packager');
-        case 'Delivery':
-            return t('Delivery');
-        case 'SalesPerson':
-            return t('SalesPerson');
-        case 'Administrative':
-            return t('Administrative');
-        case 'Weight':
-            return t('Weight');
-        case 'InvoiceOut':
-            return t('InvoiceOut');
-        case 'DropOff':
-            return t('DropOff');
-        case 'Sustitución':
-            return t('Sustitución');
-    }
-}
-
 function toTicketUrl(section) {
     return '#/ticket/' + entityId.value + '/' + section;
 }
@@ -276,23 +253,32 @@ function toTicketUrl(section) {
                     :url="toTicketUrl('observation')"
                     :text="t('ticket.pageTitles.notes')"
                 />
-                <VnLv
+                <QVirtualScroll
-                    v-for="note in entity.notes"
+                    :items="entity.notes"
-                    :key="note.id"
+                    v-slot="{ item, index }"
-                    :label="getNoteValue(note.observationType.description)"
+                    style="max-height: 300px"
-                    :value="note.description"
+                    separator
                 >
-                    <template #value>
+                    <QItem
-                        <QInput
+                        :key="index"
-                            v-model="note.description"
+                        class="vn-label-value"
-                            filled
+                        style="
-                            type="textarea"
+                            display: inline-block;
-                            class="notes"
+                            padding: unset;
-                            readonly
+                            min-height: max-content;
-                            autogrow
+                        "
-                        />
+                    >
-                    </template>
+                        <span class="label" style="margin-right: 4px">
-                </VnLv>
+                            ({{
+                                t(
+                                    `ticketNotes.observationTypes.${item.observationType.description}`
+                                )
+                            }}):
+                        </span>
+
+                        <span>{{ item.description }}</span>
+                    </QItem>
+                </QVirtualScroll>
             </QCard>
             <QCard class="vn-one">
                 <VnTitle :text="t('ticket.summary.summaryAmount')" />
@@ -621,28 +607,3 @@ function toTicketUrl(section) {
     color: $primary-light;
 }
 </style>
-
-<i18n>
-en:
-    ItemPicker: Item Picker
-    Packager: Packager
-    Delivery: Delivery
-    SalesPerson: Sales Person
-    Administrative: Administrative
-    Weight: Weight
-    InvoiceOut: Invoice Out
-    DropOff: Drop Off
-    Sustitución: Sustitution
-es:
-    ItemPicker: Items
-    Packager: Encajador
-    Delivery: Envío
-    SalesPerson: Comercial
-    Administrative: Administrativa
-    Weight: Peso
-    InvoiceOut: Facturas
-    DropOff: Despacho
-    Sustitución: Sustitución
-    Accepted: Aceptado
-    Denied: Denegado
-</i18n>

src/pages/Ticket/locale/en.yml

@@ -14,6 +14,16 @@ ticketNotes:
     description: Description
     removeNote: Remove note
     addNote: Add note
+    observationTypes:
+        ItemPicker: Item picker
+        Packager: Packager
+        Delivery: Delivery
+        SalesPerson: Sales person
+        Administrative: Administrative
+        Weight: Weight
+        InvoiceOut: Invoice Out
+        DropOff: Drop Off
+        Sustitución: Sustitution
 ticketSale:
     id: Id
     visible: Visible

src/pages/Ticket/locale/es.yml

@@ -29,6 +29,18 @@ ticketNotes:
     description: Descripción
     removeNote: Quitar nota
     addNote: Añadir nota
+    observationTypes:
+        ItemPicker: Sacador
+        Packager: Encajador
+        Delivery: Envío
+        SalesPerson: Comercial
+        Administrative: Administrativa
+        Weight: Peso
+        InvoiceOut: Facturas
+        DropOff: Despacho
+        Sustitución: Sustitución
+        Accepted: Aceptado
+        Denied: Denegado
 purchaseRequest:
     Id: Id
     description: Descripción
@@ -86,7 +98,7 @@ weeklyTickets:
     search: Buscar por tickets programados
     searchInfo: Buscar tickets programados por el identificador o el identificador del cliente
 advanceTickets:
-    preparation: Preparación    
+    preparation: Preparación
     origin: Origen
     destination: Destinatario
     originAgency: 'Agencia origen: {agency}'

src/pages/Travel/Card/TravelThermographsForm.vue

@@ -30,18 +30,9 @@ const router = useRouter();
 const state = useState();
 const { notify } = useNotify();
 
-const thermographFilter = {
-    fields: ['id', 'thermographFk'],
-    where: {
-        or: [{ travelFk: null }, { travelFk: route.params.id }],
-    },
-    order: 'thermographFk ASC',
-};
-
 const fetchTravelThermographsRef = ref(null);
 const allowedContentTypes = ref('');
 const user = state.getUser();
-const thermographsOptions = ref([]);
 const dmsTypesOptions = ref([]);
 const companiesOptions = ref([]);
 const warehousesOptions = ref([]);
@@ -172,13 +163,6 @@ const onThermographCreated = async (data) => {
         auto-load
         url="Temperatures"
     />
-    <FetchData
-        ref="fetchTravelThermographsRef"
-        url="TravelThermographs"
-        @on-fetch="(data) => (thermographsOptions = data)"
-        :filter="thermographFilter"
-        auto-load
-    />
     <QPage class="column items-center full-width">
         <QForm
             model="travel"
@@ -214,7 +198,12 @@ const onThermographCreated = async (data) => {
                     <VnSelectDialog
                         :label="t('travel.thermographs.thermograph')"
                         v-model="thermographForm.travelThermographFk"
-                        :options="thermographsOptions"
+                        url="TravelThermographs"
+                        :fields="['id', 'thermographFk']"
+                        :where="{
+                            or: [{ travelFk: null }, { travelFk: $route.params.id }],
+                        }"
+                        sort-by="thermographFk ASC"
                         option-label="thermographFk"
                         :disable="viewAction === 'edit'"
                         :tooltip="t('New thermograph')"

src/pages/Worker/Card/WorkerBalance.vue

@@ -57,9 +57,21 @@ const columns = computed(() => [
         field: 'concept',
         cardVisible: true,
     },
+    {
+        align: 'right',
+        name: 'tableActions',
+        style: 'max-width: 20px; text-align: initial;',
+        actions: [
+            {
+                title: t('delete'),
+                icon: 'delete',
+                action: async (row) => await tableRef.value.CrudModelRef.remove([row]),
+                isPrimary: true,
+            },
+        ],
+    },
 ]);
 </script>
-
 <template>
     <VnTable
         ref="tableRef"
@@ -69,7 +81,7 @@ const columns = computed(() => [
         save-url="WorkerIncomes/crud"
         :create="{
             urlCreate: 'workerIncomes',
-            title: t('Create workerBalance'),
+            title: t('Create balance'),
             onDataSaved: () => tableRef.reload(),
             formInitialData: {
                 workerFk: entityId,
@@ -81,10 +93,10 @@ const columns = computed(() => [
         :right-search="false"
         :is-editable="true"
         :use-model="true"
+        :default-remove="false"
     />
 </template>
-
 <i18n>
     es:
-        Create workerBalance: Crear balance
+        Create balance: Crear balance
 </i18n>

src/pages/Worker/Card/WorkerChangePasswordForm.vue

@@ -1,99 +0,0 @@
-<script setup>
-import { ref, reactive, onMounted } from 'vue';
-import { useI18n } from 'vue-i18n';
-
-import VnRow from 'components/ui/VnRow.vue';
-import FormPopup from 'src/components/FormPopup.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-
-import axios from 'axios';
-import useNotify from 'src/composables/useNotify.js';
-
-const $props = defineProps({
-    id: {
-        type: Object,
-        default: () => {},
-    },
-});
-
-const emit = defineEmits(['onSubmit']);
-
-const { t } = useI18n();
-const { notify } = useNotify();
-
-const formData = reactive({
-    newPassword: null,
-    repeatPassword: null,
-});
-
-const passRequirements = ref([]);
-
-const setPassword = async () => {
-    try {
-        if (!formData.newPassword) {
-            notify(t('You must enter a new password'), 'negative');
-            return;
-        }
-
-        if (formData.newPassword != formData.repeatPassword) {
-            notify(t(`Passwords don't match`), 'negative');
-            return;
-        }
-
-        await axios.patch(`Workers/${$props.id}/setPassword`, {
-            newPass: formData.newPassword,
-        });
-        notify(t('Password changed!'), 'positive');
-        emit('onSubmit');
-    } catch (err) {
-        console.error('Error setting password', err);
-    }
-};
-
-const getPassRequirements = async () => {
-    const { data } = await axios.get('UserPasswords/findOne');
-    passRequirements.value = data;
-};
-
-onMounted(async () => await getPassRequirements());
-</script>
-
-<template>
-    <FormPopup :title="t('Reset password')" @on-submit="setPassword()">
-        <template #form-inputs>
-            <VnRow>
-                <VnInput
-                    :label="t('New password')"
-                    v-model="formData.newPassword"
-                    type="password"
-                    :required="true"
-                    :info="
-                        t('passwordRequirements', {
-                            length: passRequirements.length,
-                            nAlpha: passRequirements.nAlpha,
-                            nUpper: passRequirements.nUpper,
-                            nDigits: passRequirements.nDigits,
-                            nPunct: passRequirements.nPunct,
-                        })
-                    "
-                />
-            </VnRow>
-            <VnRow>
-                <VnInput
-                    :label="t('Repeat password')"
-                    v-model="formData.repeatPassword"
-                    type="password"
-                />
-            </VnRow>
-        </template>
-    </FormPopup>
-</template>
-
-<i18n>
-es:
-    Reset password: Restablecer contraseña
-    New password: Nueva contraseña
-    Repeat password: Repetir contraseña
-    You must enter a new password: Debes introducir la nueva contraseña
-    Passwords don't match: Las contraseñas no coinciden
-</i18n>

src/pages/Worker/Card/WorkerDescriptor.vue

@@ -5,7 +5,7 @@ import { useI18n } from 'vue-i18n';
 import CardDescriptor from 'src/components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
-import WorkerChangePasswordForm from 'src/pages/Worker/Card/WorkerChangePasswordForm.vue';
+import VnChangePassword from 'src/components/common/VnChangePassword.vue';
 import { useState } from 'src/composables/useState';
 import axios from 'axios';
 import VnImg from 'src/components/ui/VnImg.vue';
@@ -24,18 +24,13 @@ const route = useRoute();
 const { t } = useI18n();
 const state = useState();
 const user = state.getUser();
-const changePasswordFormDialog = ref(null);
-const cardDescriptorRef = ref(null);
 const showEditPhotoForm = ref(false);
 const toggleEditPictureForm = () => {
     showEditPhotoForm.value = !showEditPhotoForm.value;
 };
-
 const entityId = computed(() => {
     return $props.id || route.params.id;
 });
-
-const worker = ref();
 const workerExcluded = ref(false);
 
 const getIsExcluded = async () => {
@@ -61,10 +56,10 @@ const handleExcluded = async () => {
 
     workerExcluded.value = !workerExcluded.value;
 };
+
 const handlePhotoUpdated = (evt = false) => {
     image.value.reload(evt);
 };
-const refetch = async () => await cardDescriptorRef.value.getData();
 </script>
 <template>
     <CardDescriptor
@@ -74,15 +69,10 @@ const refetch = async () => await cardDescriptorRef.value.getData();
         url="Workers/descriptor"
         :filter="{ where: { id: entityId } }"
         title="user.nickname"
-        @on-fetch="
+        @on-fetch="getIsExcluded"
-            (data) => {
-                worker = data;
-                getIsExcluded();
-            }
-        "
     >
-        <template #menu="{}">
+        <template #menu="{ entity }">
-            <QItem v-ripple clickable @click="handleExcluded()">
+            <QItem v-ripple clickable @click="handleExcluded">
                 <QItemSection>
                     {{
                         workerExcluded
@@ -92,16 +82,13 @@ const refetch = async () => await cardDescriptorRef.value.getData();
                 </QItemSection>
             </QItem>
             <QItem
-                v-if="!worker.user.emailVerified && user.id != worker.id"
+                v-if="!entity.user.emailVerified && user.id != entity.id"
                 v-ripple
                 clickable
-                @click="$refs.changePasswordFormDialog.show()"
+                @click="$refs.changePassRef.show"
             >
                 <QItemSection>
-                    {{ t('Change password') }}
+                    {{ t('globals.changePass') }}
-                    <QDialog ref="changePasswordFormDialog">
-                        <WorkerChangePasswordForm @on-submit="refetch()" :id="entityId" />
-                    </QDialog>
                 </QItemSection>
             </QItem>
         </template>
@@ -167,10 +154,10 @@ const refetch = async () => await cardDescriptorRef.value.getData();
                     <VnLinkPhone :phone-number="entity.phone" />
                 </template>
             </VnLv>
-            <VnLv :value="worker?.sip?.extension">
+            <VnLv :value="entity?.sip?.extension">
                 <template #label>
                     {{ t('worker.summary.sipExtension') }}
-                    <VnLinkPhone :phone-number="worker?.sip?.extension" />
+                    <VnLinkPhone :phone-number="entity?.sip?.extension" />
                 </template>
             </VnLv>
         </template>
@@ -201,6 +188,15 @@ const refetch = async () => await cardDescriptorRef.value.getData();
             </QCardActions>
         </template>
     </CardDescriptor>
+    <VnChangePassword
+        ref="changePassRef"
+        :submit-fn="
+            async (newPass) => {
+                await axios.patch(`Workers/${$route.params.id}/setPassword`, { newPass });
+            }
+        "
+        @on-submit="$refs.cardDescriptorRef?.getData"
+    />
 </template>
 
 <style lang="scss" scoped>
@@ -213,5 +209,4 @@ const refetch = async () => await cardDescriptorRef.value.getData();
 es:
     Click to allow the user to be disabled: Marcar para deshabilitar
     Click to exclude the user from getting disabled: Marcar para no deshabilitar
-    Change password: Cambiar contraseña
 </i18n>

src/pages/Worker/Card/WorkerFormation.vue

@@ -96,10 +96,23 @@ const columns = computed(() => [
         label: t('worker.formation.tableVisibleColumns.hasDiploma'),
         create: true,
     },
+    {
+        align: 'right',
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('delete'),
+                icon: 'delete',
+                action: async (row) => await tableRef.value.CrudModelRef.remove([row]),
+                isPrimary: true,
+            },
+        ],
+    },
 ]);
 </script>
 <template>
     <VnTable
+        class="worker-formation"
         ref="tableRef"
         data-key="WorkerFormation"
         :url="`Workers/${entityId}/trainingCourse`"
@@ -120,8 +133,15 @@ const columns = computed(() => [
         :right-search="false"
         :is-editable="true"
         :use-model="true"
+        :default-remove="false"
     />
 </template>
+<style lang="scss" scoped>
+:global(.worker-formation thead > tr > th:nth-child(7)),
+:global(.worker-formation thead > tr > th:nth-child(8)) {
+    max-width: 50px;
+}
+</style>
 <i18n>
 es:
     Create training course: Crear curso de formación

src/pages/Worker/Card/WorkerMedical.vue

@@ -65,6 +65,18 @@ const columns = [
         create: true,
         component: 'input',
     },
+    {
+        align: 'right',
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('delete'),
+                icon: 'delete',
+                action: async (row) => await tableRef.value.CrudModelRef.remove([row]),
+                isPrimary: true,
+            },
+        ],
+    },
 ];
 </script>
 <template>
@@ -87,5 +99,6 @@ const columns = [
         :right-search="false"
         :is-editable="true"
         :use-model="true"
+        :default-remove="false"
     />
 </template>

src/pages/Worker/Card/WorkerTimeControl.vue

@@ -326,16 +326,20 @@ const updateData = async () => {
 };
 
 const getMailStates = async (date) => {
+    const url = `WorkerTimeControls/${route.params.id}/getMailStates`;
+    const month = date.getMonth() + 1;
+    const prevMonth = month == 1 ? 12 : month - 1;
     const params = {
-        month: date.getMonth() + 1,
+        month,
         year: date.getFullYear(),
     };
 
-    const { data } = await axios.get(
+    const curMonthStates = (await axios.get(url, { params })).data;
-        `WorkerTimeControls/${route.params.id}/getMailStates`,
+    const prevMonthStates = (
-        { params }
+        await axios.get(url, { params: { ...params, month: prevMonth } })
-    );
+    ).data;
-    workerTimeControlMails.value = data;
+
+    workerTimeControlMails.value = curMonthStates.concat(prevMonthStates);
 };
 
 const showWorkerTimeForm = (propValue, formType) => {

src/pages/Worker/WorkerFilter.vue

@@ -7,7 +7,7 @@ import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 
-const { t } = useI18n();
+const { t, te } = useI18n();
 const props = defineProps({
     dataKey: {
         type: String,
@@ -16,6 +16,11 @@ const props = defineProps({
 });
 
 const departments = ref();
+
+const getLocale = (label) => {
+    const globalLocale = `globals.params.${label}`;
+    return te(globalLocale) ? t(globalLocale) : t(`params.${label}`);
+};
 </script>
 
 <template>
@@ -23,7 +28,7 @@ const departments = ref();
     <VnFilterPanel :data-key="props.dataKey" :search-button="true">
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
-                <strong>{{ t(`params.${tag.label}`) }}: </strong>
+                <strong>{{ getLocale(tag.label) }}: </strong>
                 <span>{{ formatFn(tag.value) }}</span>
             </div>
         </template>
@@ -64,10 +69,7 @@ const departments = ref();
                 </QItemSection>
             </QItem>
             <QItem>
-                <QItemSection v-if="!departments">
+                <QItemSection>
-                    <QSkeleton type="QInput" class="full-width" />
-                </QItemSection>
-                <QItemSection v-if="departments">
                     <VnSelect
                         :label="t('Department')"
                         v-model="params.departmentFk"
@@ -82,6 +84,11 @@ const departments = ref();
                     />
                 </QItemSection>
             </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput :label="t('Email')" v-model="params.email" is-outlined />
+                </QItemSection>
+            </QItem>
             <QItem>
                 <QItemSection>
                     <VnInput
@@ -99,23 +106,17 @@ const departments = ref();
 en:
     params:
         search: Contains
-        fi: FI
         firstName: First name
         lastName: Last name
         userName: User
         extension: Extension
-        departmentFk: Department
-        id: ID
 es:
     params:
         search: Contiene
-        fi: NIF
         firstName: Nombre
         lastName: Apellidos
         userName: Usuario
         extension: Extensión
-        departmentFk: Departamento
-        id: ID
     FI: NIF
     First Name: Nombre
     Last Name: Apellidos

src/pages/Worker/WorkerList.vue

@@ -39,13 +39,31 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        name: 'nickname',
+        name: 'firstName',
-        label: t('tableColumns.name'),
+        label: t('tableColumns.firstName'),
         isTitle: true,
         columnFilter: {
             name: 'firstName',
         },
     },
+    {
+        align: 'left',
+        name: 'lastName',
+        label: t('tableColumns.lastName'),
+        isTitle: true,
+        columnFilter: {
+            name: 'lastName',
+        },
+    },
+    {
+        align: 'left',
+        name: 'nickname',
+        label: t('tableColumns.userName'),
+        isTitle: true,
+        columnFilter: {
+            name: 'userName',
+        },
+    },
     {
         align: 'left',
         name: 'departmentFk',
@@ -66,10 +84,17 @@ const columns = computed(() => [
         label: t('tableColumns.email'),
         cardVisible: true,
         columnFilter: {
-            alias: 'mu',
+            name: 'email',
-            inWhere: true,
+        },
+    },
+    {
+        align: 'left',
+        name: 'extension',
+        label: t('tableColumns.extension'),
+        cardVisible: true,
+        columnFilter: {
+            name: 'extension',
         },
-        hidden: true,
     },
     {
         align: 'right',
@@ -180,7 +205,7 @@ async function autofillBic(worker) {
         default-mode="table"
         redirect="worker"
         :right-search="false"
-        auto-load
+        :order="['id DESC']"
     >
         <template #more-create-dialog="{ data }">
             <div class="q-pa-lg full-width">

src/pages/Worker/locale/en.yml

@@ -1,6 +1,11 @@
 passwordRequirements: 'The password must have at least { length } length characters, {nAlpha} alphabetic characters, {nUpper} capital letters, {nDigits} digits and {nPunct} symbols (Ex: $%&.)\n'
 tableColumns:
     id: ID
-    name: Name
+    firstName: First name
+    lastName: Last Name
+    userName: User Name
     department: Department
     email: Email
+    fi: FI
+    SSN: SSN
+    extension: Extension

src/pages/Worker/locale/es.yml

@@ -6,6 +6,11 @@ External: Externo
 passwordRequirements: 'La contraseña debe tener al menos { length } caracteres de longitud, {nAlpha} caracteres alfabéticos, {nUpper} letras mayúsculas, {nDigits} dígitos y {nPunct} símbolos (Ej: $%&.)'
 tableColumns:
     id: ID
-    name: Nombre
+    firstName: Nombre
+    lastName: Apellidos
+    userName: Nombre de usuario
     department: Departamento
     email: Email
+    fi: NIF
+    SSN: NSS
+    extension: Extensión

src/pages/Zone/ZoneDeliveryPanel.vue

@@ -94,7 +94,7 @@ watch(
                 url="Postcodes/location"
                 :fields="['geoFk', 'code', 'townFk', 'countryFk']"
                 sort-by="code, townFk"
-                option-value="geoFk"
+                option-value="code"
                 option-label="code"
                 option-filter="code"
                 hide-selected

src/router/modules/entry.js

@@ -12,7 +12,13 @@ export default {
     component: RouterView,
     redirect: { name: 'EntryMain' },
     menus: {
-        main: ['EntryList', 'MyEntries', 'EntryLatestBuys', 'EntryStockBought'],
+        main: [
+            'EntryList',
+            'MyEntries',
+            'EntryLatestBuys',
+            'EntryStockBought',
+            'EntryWasteRecalc',
+        ],
         card: ['EntryBasicData', 'EntryBuys', 'EntryNotes', 'EntryDms', 'EntryLog'],
     },
     children: [
@@ -67,6 +73,15 @@ export default {
                     },
                     component: () => import('src/pages/Entry/EntryStockBought.vue'),
                 },
+                {
+                    path: 'waste-recalc',
+                    name: 'EntryWasteRecalc',
+                    meta: {
+                        title: 'wasteRecalc',
+                        icon: 'compost',
+                    },
+                    component: () => import('src/pages/Entry/EntryWasteRecalc.vue'),
+                },
             ],
         },
         {

src/router/modules/worker.js

@@ -168,6 +168,7 @@ export default {
                     meta: {
                         title: 'log',
                         icon: 'vn:History',
+                        acls: [{ model: 'WorkerLog', props: 'find', accessType: 'READ' }],
                     },
                     component: () => import('src/pages/Worker/Card/WorkerLog.vue'),
                 },

test/cypress/integration/route/agency/agencyWorkCenter.spec.js

@@ -4,12 +4,12 @@ describe('AgencyWorkCenter', () => {
         cy.login('developer');
         cy.visit(`/#/agency/11/workCenter`);
     });
+    const createButton = '.q-page-sticky > div > .q-btn > .q-btn__content > .q-icon';
+    const workCenterCombobox = 'input[role="combobox"]';
 
     it('assign workCenter', () => {
-        cy.get('.q-page-sticky > div > .q-btn > .q-btn__content > .q-icon').click();
+        cy.get(createButton).click();
-        cy.get(
+        cy.get(workCenterCombobox).type('workCenterOne{enter}');
-            '.vn-row > .q-field > .q-field__inner > .q-field__control > .q-field__control-container'
-        ).type('workCenterOne{enter}');
         cy.get('.q-notification__message').should('have.text', 'Data created');
     });
 
@@ -22,12 +22,10 @@ describe('AgencyWorkCenter', () => {
     });
 
     it('error on duplicate workCenter', () => {
-        cy.get('.q-page-sticky > div > .q-btn > .q-btn__content > .q-icon').click();
+        cy.get(createButton).click();
-        cy.get(
+        cy.get(workCenterCombobox).type('workCenterOne{enter}');
-            '.vn-row > .q-field > .q-field__inner > .q-field__control > .q-field__control-container'
-        ).type('workCenterOne{enter}');
         cy.get('.q-notification__message').should('have.text', 'Data created');
-        cy.get('.q-page-sticky > div > .q-btn > .q-btn__content > .q-icon').click();
+        cy.get(createButton).click();
         cy.get(
             '.vn-row > .q-field > .q-field__inner > .q-field__control > .q-field__control-container'
         ).type('workCenterOne{enter}');

test/cypress/integration/route/routeList.spec.js

@@ -2,7 +2,7 @@ describe('Route', () => {
     beforeEach(() => {
         cy.viewport(1920, 1080);
         cy.login('developer');
-        cy.visit(`/#/route/list`);
+        cy.visit(`/#/route/extended-list`);
     });
     const getVnSelect =
         '> :nth-child(1) > .column > .q-field > .q-field__inner > .q-field__control > .q-field__control-container';

test/vitest/__tests__/components/common/VnChangePassword.spec.js

@@ -0,0 +1,70 @@
+import { createWrapper, axios } from 'app/test/vitest/helper';
+import VnChangePassword from 'src/components/common/VnChangePassword.vue';
+import { vi, beforeEach, afterEach, beforeAll, describe, expect, it } from 'vitest';
+import { Notify } from 'quasar';
+
+describe('VnSmsDialog', () => {
+    let vm;
+
+    beforeAll(() => {
+        vi.spyOn(axios, 'get').mockResolvedValue({
+            data: [],
+        });
+        vm = createWrapper(VnChangePassword, {
+            propsData: {
+                submitFn: vi.fn(),
+            },
+        }).vm;
+    });
+
+    beforeEach(() => {
+        Notify.create = vi.fn();
+    });
+
+    afterEach(() => {
+        vi.clearAllMocks();
+    });
+
+    it('should notify when new password is empty', async () => {
+        vm.passwords.newPassword = '';
+        vm.passwords.repeatPassword = 'password';
+
+        await vm.validate();
+        expect(Notify.create).toHaveBeenCalledWith(
+            expect.objectContaining({
+                message: 'You must enter a new password',
+                type: 'negative',
+            })
+        );
+    });
+
+    it("should notify when passwords don't match", async () => {
+        vm.passwords.newPassword = 'password1';
+        vm.passwords.repeatPassword = 'password2';
+        await vm.validate();
+        expect(Notify.create).toHaveBeenCalledWith(
+            expect.objectContaining({
+                message: `Passwords don't match`,
+                type: 'negative',
+            })
+        );
+    });
+
+    describe('if passwords match', () => {
+        it('should call submitFn and emit password', async () => {
+            vm.passwords.newPassword = 'password';
+            vm.passwords.repeatPassword = 'password';
+            await vm.validate();
+            expect(vm.props.submitFn).toHaveBeenCalledWith('password', undefined);
+        });
+
+        it('should call submitFn and emit password and old password', async () => {
+            vm.passwords.newPassword = 'password';
+            vm.passwords.repeatPassword = 'password';
+            vm.passwords.oldPassword = 'oldPassword';
+
+            await vm.validate();
+            expect(vm.props.submitFn).toHaveBeenCalledWith('password', 'oldPassword');
+        });
+    });
+});