From 744d56e31889eca167e75df315637944cf8f1ac7 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 14 Feb 2025 13:28:39 +0100
Subject: [PATCH 1/2] fix: fix sctions
---
src/i18n/locale/es.yml | 2 +-
src/pages/Worker/Card/WorkerBasicData.vue | 14 ++++++++++++--
src/pages/Worker/Card/WorkerOperator.vue | 7 +++++--
src/pages/Worker/Card/WorkerPBX.vue | 22 ++++++++++++++++------
src/pages/Worker/Card/WorkerPda.vue | 1 +
5 files changed, 35 insertions(+), 11 deletions(-)
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 1dbe253664e..efb1abe5d2d 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -785,7 +785,7 @@ worker:
notes: Notas
operator:
numberOfWagons: Número de vagones
- train: tren
+ train: Tren
itemPackingType: Tipo de embalaje
warehouse: Almacén
sector: Sector
diff --git a/src/pages/Worker/Card/WorkerBasicData.vue b/src/pages/Worker/Card/WorkerBasicData.vue
index fcf0f0369e2..38c2e839e82 100644
--- a/src/pages/Worker/Card/WorkerBasicData.vue
+++ b/src/pages/Worker/Card/WorkerBasicData.vue
@@ -46,8 +46,18 @@ const maritalStatus = [
>
<template #form="{ data }">
<VnRow>
- <VnInput :label="t('Name')" clearable v-model="data.firstName" />
- <VnInput :label="t('Last name')" clearable v-model="data.lastName" />
+ <VnInput
+ :label="t('Name')"
+ clearable
+ v-model="data.firstName"
+ :required="true"
+ />
+ <VnInput
+ :label="t('Last name')"
+ clearable
+ v-model="data.lastName"
+ :required="true"
+ />
</VnRow>
<VnRow>
<VnInput v-model="data.phone" :label="t('Business phone')" clearable />
diff --git a/src/pages/Worker/Card/WorkerOperator.vue b/src/pages/Worker/Card/WorkerOperator.vue
index 6faeefe6704..8ab802b9f29 100644
--- a/src/pages/Worker/Card/WorkerOperator.vue
+++ b/src/pages/Worker/Card/WorkerOperator.vue
@@ -54,9 +54,8 @@ watch(
selected.value = [];
}
},
- { immediate: true, deep: true }
+ { immediate: true, deep: true },
);
-
</script>
<template>
@@ -105,6 +104,7 @@ watch(
:options="trainsData"
hide-selected
v-model="row.trainFk"
+ :required="true"
/>
</VnRow>
<VnRow>
@@ -115,12 +115,14 @@ watch(
option-label="code"
option-value="code"
v-model="row.itemPackingTypeFk"
+ :required="true"
/>
<VnSelect
:label="t('worker.operator.warehouse')"
:options="warehousesData"
hide-selected
v-model="row.warehouseFk"
+ :required="true"
/>
</VnRow>
<VnRow>
@@ -175,6 +177,7 @@ watch(
:label="t('worker.operator.isOnReservationMode')"
v-model="row.isOnReservationMode"
lazy-rules
+ :required="true"
/>
</VnRow>
<VnRow>
diff --git a/src/pages/Worker/Card/WorkerPBX.vue b/src/pages/Worker/Card/WorkerPBX.vue
index 12f2a4b2376..f41fcbce706 100644
--- a/src/pages/Worker/Card/WorkerPBX.vue
+++ b/src/pages/Worker/Card/WorkerPBX.vue
@@ -1,8 +1,8 @@
-src/pages/Worker/Card/WorkerPBX.vue
-
<script setup>
+import { useI18n } from 'vue-i18n';
import FormModel from 'src/components/FormModel.vue';
import VnInput from 'src/components/common/VnInput.vue';
+const { t } = useI18n();
</script>
<template>
@@ -19,10 +19,20 @@ import VnInput from 'src/components/common/VnInput.vue';
auto-load
>
<template #form="{ data }">
- <VnInput
- :label="$t('worker.summary.sipExtension')"
- v-model="data.extension"
- />
+ <VnInput :label="$t('worker.summary.sipExtension')" v-model="data.extension">
+ <template #append>
+ <QIcon name="info" class="cursor-info">
+ <QTooltip>{{
+ t('It must be a 4-digit number and must not end in 00')
+ }}</QTooltip>
+ </QIcon>
+ </template>
+ </VnInput>
</template>
</FormModel>
</template>
+
+<i18n>
+ es:
+ It must be a 4-digit number and must not end in 00: Debe ser un número de 4 cifras y no terminar en 00
+</i18n>
diff --git a/src/pages/Worker/Card/WorkerPda.vue b/src/pages/Worker/Card/WorkerPda.vue
index 47e13cf6d53..d329414946c 100644
--- a/src/pages/Worker/Card/WorkerPda.vue
+++ b/src/pages/Worker/Card/WorkerPda.vue
@@ -140,6 +140,7 @@ function reloadData() {
id="deviceProductionFk"
hide-selected
data-cy="pda-dialog-select"
+ :required="true"
>
<template #option="scope">
<QItem v-bind="scope.itemProps">
From 139389ef9b8dbeaa8de0c79e2f17e504ae10a4fa Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 24 Feb 2025 12:04:33 +0100
Subject: [PATCH 2/2] fix: remove info
---
src/pages/Worker/Card/WorkerPBX.vue | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/src/pages/Worker/Card/WorkerPBX.vue b/src/pages/Worker/Card/WorkerPBX.vue
index f41fcbce706..dae1984388c 100644
--- a/src/pages/Worker/Card/WorkerPBX.vue
+++ b/src/pages/Worker/Card/WorkerPBX.vue
@@ -19,15 +19,10 @@ const { t } = useI18n();
auto-load
>
<template #form="{ data }">
- <VnInput :label="$t('worker.summary.sipExtension')" v-model="data.extension">
- <template #append>
- <QIcon name="info" class="cursor-info">
- <QTooltip>{{
- t('It must be a 4-digit number and must not end in 00')
- }}</QTooltip>
- </QIcon>
- </template>
- </VnInput>
+ <VnInput
+ :label="$t('worker.summary.sipExtension')"
+ v-model="data.extension"
+ />
</template>
</FormModel>
</template>