verdnatura/salix-front
verdnatura
/
salix-front
2
3
Fork 1
Code Issues Pull Requests 90 Releases Wiki Activity

Desarrollo de los submodulos basic data, notes y pbx #245

Merged
jsegarra merged 16 commits from :features/ms_submodulos_worker into dev 2024-04-08 06:19:29 +00:00
Conversation 2 Commits 16 Files Changed 9 +136 -188
3 changed files with 136 additions and 188 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1d37b91e09 - Show all commits

303
src/pages/Worker/Card/WorkerBasicData.vue
View File

@ -1,11 +1,10 @@
<script setup>
import { onBeforeMount, ref, watch } from 'vue';
import { reactive, ref } from 'vue';
jsegarra marked this conversation as resolved Outdated
jsegarra commented 2024-03-28 22:34:24 +00:00
Outdated
Review
Copy Link

reactive no está en uso

reactive no está en uso
wbuezas commented 2024-04-02 15:48:47 +00:00
Outdated
Review
Copy Link

Import de reactive eliminado

Commit: 507c979cc2

Import de `reactive` eliminado Commit: https://gitea.verdnatura.es/hyervoni/salix-front-mindshore/commit/507c979cc2d6219a4f2d5e55b21ec6a243b25076
import { useRoute } from 'vue-router';
import { useI18n } from 'vue-i18n';
import axios from 'axios';
import FetchData from 'components/FetchData.vue';
import FormModel from 'src/components/FormModel.vue';
import VnRow from 'components/ui/VnRow.vue';
import VnInput from 'src/components/common/VnInput.vue';
import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
@ -13,17 +12,29 @@ import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
const route = useRoute();
const { t } = useI18n();
const data = ref({});
const formInitialData = reactive({});
const workersOptions = ref([]);
const countriesOptions = ref([]);
const educationLevelsOptions = ref([]);
const workerFilter = { fields: ['id', 'nickname'], where: { id: null } };
const workerFilter = {
include: [
{
relation: 'user',
scope: {
fields: ['name', 'emailVerified'],
include: { relation: 'emailUser', scope: { fields: ['email'] } },
},
},
{ relation: 'sip', scope: { fields: ['extension', 'secret'] } },
{ relation: 'department', scope: { include: { relation: 'department' } } },
],
};
const workersFilter = {
fields: ['id', 'nickname'],
order: 'nickname ASC',
limit: 30,
skip: 60,
};
const countriesFilter = {
fields: ['id', 'country', 'code'],
@ -36,52 +47,6 @@ const maritalStatus = [
{ code: 'M', name: t('Married') },
{ code: 'S', name: t('Single') },
];
onBeforeMount(() => {
getData(route.params.id);
});
watch(
() => route.params.id,
(newValue) => {
getData(newValue);
}
);
const getData = async (id) => {
try {
const worker = await axios.get(`Workers/${id}`);
workerFilter.where.id = worker.data.bossFk;
data.value = worker.data;
const workers = await axios.get('Workers/search', {
params: { filter: JSON.stringify(workerFilter) },
});
data.value.bossFk = Number(workers.data[0].code);
} catch (error) {
data.value = {
SSN: null,
bossFk: null,
educationLevelFk: null,
firstName: null,
lastName: null,
locker: null,
maritalStatus: null,
mobileExtension: null,
originCountryFk: null,
phone: null,
};
console.error(error);
}
};
const saveData = async () => {
try {
await axios.patch(`Workers/${route.params.id}`, data.value);
} catch (error) {
console.error(error);
}
};
</script>
jsegarra marked this conversation as resolved
alexm commented 2024-04-02 06:28:31 +00:00
Review
Copy Link

FechData

FechData
wbuezas commented 2024-04-02 15:47:27 +00:00
Review
Copy Link

Nombre actualizado

Commit: 3569afdb85

Nombre actualizado Commit: https://gitea.verdnatura.es/hyervoni/salix-front-mindshore/commit/3569afdb85f612696e4c36404402ae92fc460d68
jsegarra marked this conversation as resolved Outdated
alexm commented 2024-03-22 06:35:49 +00:00
Outdated
Review
Copy Link

Usar componente FormModel

Usar componente FormModel
cfonseca commented 2024-03-26 22:21:25 +00:00
Outdated
Review
Copy Link

Corregido: 1d37b91e09, se implementa el FormModel en el componente como se solicita, encontré unos puntos de mejora que subiré en el próximo commit.

Corregido: 1d37b91e09, se implementa el FormModel en el componente como se solicita, encontré unos puntos de mejora que subiré en el próximo commit.
<template>
@ -104,141 +69,113 @@ const saveData = async () => {
url="EducationLevels"
/>
<Teleport to="#st-actions">
<QBtnGroup push class="q-gutter-x-sm">
<QBtn
:disabled="!hasChanged"
:label="t('globals.reset')"
:loading="isLoading"
@click="setInitialData"
color="primary"
flat
icon="restart_alt"
/>
<QBtn
:disabled="isLoading"
:label="t('globals.save')"
:loading="isLoading"
@click.stop="saveData"
color="primary"
icon="save"
/>
</QBtnGroup>
</Teleport>
<FormModel
:filter="workerFilter"
:form-initial-data="formInitialData"
:url="`Workers/${route.params.id}`"
auto-load
model="Worker"
>
jsegarra marked this conversation as resolved Outdated
alexm commented 2024-04-02 06:30:55 +00:00
Outdated
Review
Copy Link

Quitar <div class="col">

Quitar `<div class="col">`
wbuezas commented 2024-04-02 15:45:25 +00:00
Outdated
Review
Copy Link

<div class="col"> removidos

Commit: 71b2f7c8dc

`<div class="col">` removidos Commit: https://gitea.verdnatura.es/hyervoni/salix-front-mindshore/commit/71b2f7c8dccccdaa017044f2c9cdcac4b199f656
<template #form="{ data }">
<VnRow class="row q-gutter-md q-mb-md">
<div class="col">
jsegarra marked this conversation as resolved
alexm commented 2024-04-02 06:31:17 +00:00
Review
Copy Link

Quitar <div class="col">

Quitar `<div class="col">`
wbuezas commented 2024-04-02 15:45:21 +00:00
Review
Copy Link

<div class="col"> removidos

Commit: 71b2f7c8dc

`<div class="col">` removidos Commit: https://gitea.verdnatura.es/hyervoni/salix-front-mindshore/commit/71b2f7c8dccccdaa017044f2c9cdcac4b199f656
<VnInput :label="t('Name')" clearable v-model="data.firstName" />
</div>
<div class="col">
<VnInput :label="t('Last name')" clearable v-model="data.lastName" />
</div>
</VnRow>
jsegarra marked this conversation as resolved Outdated
alexm commented 2024-04-02 06:28:53 +00:00
Outdated
Review
Copy Link

Ya no hace falta usar <div class="col"> en los VnRow (por lo menos si teneis vuesta rama /dev actualizada)

Ya no hace falta usar `<div class="col">` en los `VnRow` (por lo menos si teneis vuesta rama /dev actualizada)
wbuezas commented 2024-04-02 15:45:16 +00:00
Outdated
Review
Copy Link

<div class="col"> removidos

Commit: 71b2f7c8dc

`<div class="col">` removidos Commit: https://gitea.verdnatura.es/hyervoni/salix-front-mindshore/commit/71b2f7c8dccccdaa017044f2c9cdcac4b199f656
<div class="full-width flex justify-center">
<QCard class="card-width q-pa-lg">
<QCardSection>
<QForm>
<VnRow class="row q-gutter-md q-mb-md">
<div class="col">
<VnInput
:label="t('Name')"
clearable
v-model="data.firstName"
/>
</div>
<div class="col">
<VnInput
:label="t('Last name')"
clearable
v-model="data.lastName"
/>
</div>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<div class="col">
<VnInput
v-model="data.phone"
:label="t('Business phone')"
clearable
jsegarra marked this conversation as resolved Outdated
alexm commented 2024-04-02 06:31:24 +00:00
Outdated
Review
Copy Link

Quitar <div class="col">

Quitar `<div class="col">`
wbuezas commented 2024-04-02 15:45:08 +00:00
Outdated
Review
Copy Link

<div class="col"> removidos

Commit: 71b2f7c8dc

`<div class="col">` removidos Commit: https://gitea.verdnatura.es/hyervoni/salix-front-mindshore/commit/71b2f7c8dccccdaa017044f2c9cdcac4b199f656
/>
</div>
<div class="col">
<VnInput
v-model="data.mobileExtension"
:label="t('Mobile extension')"
clearable
/>
</div>
</VnRow>
jsegarra marked this conversation as resolved Outdated
alexm commented 2024-04-02 06:31:33 +00:00
Outdated
Review
Copy Link

Quitar <div class="col">

Quitar `<div class="col">`
wbuezas commented 2024-04-02 15:45:05 +00:00
Outdated
Review
Copy Link

<div class="col"> removidos

Commit: 71b2f7c8dc

`<div class="col">` removidos Commit: https://gitea.verdnatura.es/hyervoni/salix-front-mindshore/commit/71b2f7c8dccccdaa017044f2c9cdcac4b199f656
<VnRow class="row q-gutter-md q-mb-md">
<div class="col">
<VnInput
v-model="data.phone"
:label="t('Business phone')"
clearable
/>
</div>
<div class="col">
<VnInput
v-model="data.mobileExtension"
:label="t('Mobile extension')"
clearable
/>
</div>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<div class="col">
<VnSelectFilter
jsegarra marked this conversation as resolved Outdated
jsegarra commented 2024-03-21 06:19:04 +00:00
Outdated
Review
Copy Link

El botón de restarurar no está funcionando o no está habilitado cuando modifico el formulario

El botón de restarurar no está funcionando o no está habilitado cuando modifico el formulario
cfonseca commented 2024-03-26 22:19:31 +00:00
Outdated
Review
Copy Link

Corregido: 1d37b91e09

Corregido: 1d37b91e09
:label="t('Boss')"
:options="workersOptions"
hide-selected
option-label="nickname"
option-value="id"
v-model="data.bossFk"
>
<template #option="scope">
<QItem v-bind="scope.itemProps">
<QItemSection>
<QItemLabel>{{ scope.opt?.name }}</QItemLabel>
<QItemLabel caption>
{{ scope.opt?.nickname }},
{{ scope.opt?.code }}
</QItemLabel>
</QItemSection>
</QItem>
</template>
jsegarra marked this conversation as resolved Outdated
alexm commented 2024-04-02 06:31:43 +00:00
Outdated
Review
Copy Link

Quitar <div class="col">

Quitar `<div class="col">`
wbuezas commented 2024-04-02 15:44:22 +00:00
Outdated
Review
Copy Link

<div class="col"> removidos

Commit: 71b2f7c8dc

`<div class="col">` removidos Commit: https://gitea.verdnatura.es/hyervoni/salix-front-mindshore/commit/71b2f7c8dccccdaa017044f2c9cdcac4b199f656
</VnSelectFilter>
</div>
<div class="col">
<VnSelectFilter
:label="t('Marital status')"
:options="maritalStatus"
hide-selected
option-label="name"
option-value="code"
v-model="data.maritalStatus"
/>
</div>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<div class="col">
<VnSelectFilter
:label="t('Boss')"
:options="workersOptions"
hide-selected
option-label="nickname"
option-value="id"
v-model="data.bossFk"
>
<template #option="scope">
<QItem v-bind="scope.itemProps">
<QItemSection>
<QItemLabel>{{ scope.opt?.name }}</QItemLabel>
<QItemLabel caption>
{{ scope.opt?.nickname }},
{{ scope.opt?.code }}
</QItemLabel>
</QItemSection>
</QItem>
</template>
</VnSelectFilter>
</div>
<div class="col">
<VnSelectFilter
:label="t('Marital status')"
:options="maritalStatus"
hide-selected
option-label="name"
option-value="code"
v-model="data.maritalStatus"
/>
</div>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<div class="col">
<VnSelectFilter
:label="t('Origin country')"
:options="countriesOptions"
hide-selected
option-label="country"
option-value="id"
v-model="data.originCountryFk"
/>
</div>
<div class="col">
<VnSelectFilter
:label="t('Education level')"
:options="educationLevelsOptions"
hide-selected
option-label="name"
option-value="id"
v-model="data.educationLevelFk"
/>
</div>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<div class="col">
<VnSelectFilter
:label="t('Origin country')"
:options="countriesOptions"
hide-selected
option-label="country"
option-value="id"
v-model="data.originCountryFk"
/>
</div>
<div class="col">
<VnSelectFilter
:label="t('Education level')"
:options="educationLevelsOptions"
hide-selected
option-label="name"
option-value="id"
v-model="data.educationLevelFk"
/>
</div>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<div class="col">
<VnInput v-model="data.SSN" :label="t('SSN')" clearable />
</div>
<div class="col">
<VnInput
v-model="data.locker"
type="number"
:label="t('Locker')"
clearable
/>
</div>
</VnRow>
</QForm>
</QCardSection>
</QCard>
</div>
<VnRow class="row q-gutter-md q-mb-md">
<div class="col">
<VnInput v-model="data.SSN" :label="t('SSN')" clearable />
</div>
<div class="col">
<VnInput
v-model="data.locker"
type="number"
:label="t('Locker')"
clearable
/>
</div>
</VnRow>
</template>
</FormModel>
</template>
alexm commented 2024-04-02 06:32:49 +00:00
Outdated
Review
Copy Link

Si alguna de estas traducciones esta de manera global, usarla

Si alguna de estas traducciones esta de manera global, usarla
wbuezas commented 2024-04-02 15:42:05 +00:00
Outdated
Review
Copy Link

No encontré ninguna de las traducciones de WorkerBasicData dentro del objeto de traducciones globals

No encontré ninguna de las traducciones de `WorkerBasicData` dentro del objeto de traducciones `globals`
<i18n>

17
src/pages/Worker/Card/WorkerDescriptor.vue
View File

@ -1,5 +1,5 @@
<script setup>
import { computed, ref } from 'vue';
import { computed, ref, watch } from 'vue';
import { useRoute } from 'vue-router';
import { useI18n } from 'vue-i18n';
import { useSession } from 'src/composables/useSession';
@ -55,7 +55,18 @@ const filter = {
],
};
const sip = computed(() => worker.value?.sip && worker.value.sip.extension);
const sip = ref(null);
watch(
() => [worker.value?.sip?.extension, state.get('extension')],
([newWorkerSip, newStateExtension], [oldWorkerSip, oldStateExtension]) => {
if (newStateExtension !== oldStateExtension || sip.value === oldStateExtension) {
sip.value = newStateExtension;
} else if (newWorkerSip !== oldWorkerSip && sip.value !== newStateExtension) {
sip.value = newWorkerSip;
}
}
);
function getWorkerAvatar() {
const token = getTokenMultimedia();
@ -114,7 +125,7 @@ const setData = (entity) => {
<VnLinkPhone :phone-number="entity.phone" />
</template>
</VnLv>
<VnLv :value="state.get('extension') || sip">
<VnLv :value="sip">
<template #label>
{{ t('worker.summary.sipExtension') }}
<VnLinkPhone v-if="sip" :phone-number="sip" />

4
src/pages/Worker/Card/WorkerNotes.vue
View File

@ -48,7 +48,7 @@ const toWorkerNoteCreate = () => {
<template>
jsegarra marked this conversation as resolved Outdated
jsegarra commented 2024-03-18 14:29:55 +00:00
Outdated
Review
Copy Link

El campo no tiene focus cuando se crea el formulario

El campo no tiene focus cuando se crea el formulario
cfonseca commented 2024-03-20 16:54:44 +00:00
Outdated
Review
Copy Link

Corregido: c06d810fe9

Corregido: c06d810fe9
<div class="full-width flex justify-center">
<QCard class="card-width q-pa-lg" v-if="rows.length">
<QCard class="full-width q-pa-lg" v-if="rows.length">
<div>
<QCard
v-for="(item, index) in rows"
@ -61,7 +61,7 @@ const toWorkerNoteCreate = () => {
}"
>
<div class="flex justify-end">
<p class="color-vn-label">
<p class="color-vn-label q-mb-none">
{{ date.formatDate(item?.created, 'DD-MM-YYYY HH:mm') }}
</p>
</div>