refactor: refs #8322 changed Worker component to use VnSection/VnCardBeta
gitea/salix-front/pipeline/pr-dev This commit looks good Details

This commit is contained in:
PAU ROVIRA ROSALENY 2024-12-27 14:51:23 +01:00
parent bd5daa8368
commit b03efbc977
5 changed files with 401 additions and 378 deletions

View File

@ -1,21 +1,7 @@
<script setup> <script setup>
import VnCard from 'components/common/VnCard.vue';
import WorkerDescriptor from './WorkerDescriptor.vue'; import WorkerDescriptor from './WorkerDescriptor.vue';
import WorkerFilter from '../WorkerFilter.vue'; import VnCardBeta from 'src/components/common/VnCardBeta.vue';
</script> </script>
<template> <template>
<VnCard <VnCardBeta data-key="Worker" custom-url="Workers/summary" :descriptor="WorkerDescriptor" />
data-key="Worker"
custom-url="Workers/summary"
:descriptor="WorkerDescriptor"
:filter-panel="WorkerFilter"
search-data-key="WorkerList"
:searchbar-props="{
url: 'Workers/filter',
label: 'Search worker',
info: 'You can search by worker id or name',
order: 'id DESC',
}"
:redirect-on-error="true"
/>
</template> </template>

View File

@ -2,7 +2,6 @@
import { onBeforeMount, computed, ref } from 'vue'; import { onBeforeMount, computed, ref } from 'vue';
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';
import { useSummaryDialog } from 'src/composables/useSummaryDialog'; import { useSummaryDialog } from 'src/composables/useSummaryDialog';
import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
import VnTable from 'src/components/VnTable/VnTable.vue'; import VnTable from 'src/components/VnTable/VnTable.vue';
import WorkerSummary from './Card/WorkerSummary.vue'; import WorkerSummary from './Card/WorkerSummary.vue';
import VnRow from 'src/components/ui/VnRow.vue'; import VnRow from 'src/components/ui/VnRow.vue';
@ -14,12 +13,11 @@ import VnLocation from 'src/components/common/VnLocation.vue';
import VnSelectDialog from 'src/components/common/VnSelectDialog.vue'; import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
import CreateBankEntityForm from 'src/components/CreateBankEntityForm.vue'; import CreateBankEntityForm from 'src/components/CreateBankEntityForm.vue';
import FetchData from 'src/components/FetchData.vue'; import FetchData from 'src/components/FetchData.vue';
import RightMenu from 'src/components/common/RightMenu.vue';
import WorkerFilter from './WorkerFilter.vue'; import WorkerFilter from './WorkerFilter.vue';
import { useState } from 'src/composables/useState'; import { useState } from 'src/composables/useState';
import axios from 'axios'; import axios from 'axios';
import VnSelectWorker from 'src/components/common/VnSelectWorker.vue'; import VnSelectWorker from 'src/components/common/VnSelectWorker.vue';
import VnSection from 'src/components/common/VnSection.vue';
const { t } = useI18n(); const { t } = useI18n();
const tableRef = ref(); const tableRef = ref();
const { viewSummary } = useSummaryDialog(); const { viewSummary } = useSummaryDialog();
@ -31,6 +29,7 @@ const postcodesOptions = ref([]);
const user = useState().getUser(); const user = useState().getUser();
const defaultPayMethod = ref(); const defaultPayMethod = ref();
const bankEntitiesRef = ref(); const bankEntitiesRef = ref();
const dataKey = 'WorkerList';
const columns = computed(() => [ const columns = computed(() => [
{ {
align: 'left', align: 'left',
@ -170,11 +169,6 @@ async function autofillBic(worker) {
} }
</script> </script>
<template> <template>
<VnSearchbar
data-key="WorkerList"
:label="t('Search worker')"
:info="t('You can search by worker id or name')"
/>
<FetchData <FetchData
url="Companies" url="Companies"
@on-fetch="(data) => (companiesOptions = data)" @on-fetch="(data) => (companiesOptions = data)"
@ -191,173 +185,203 @@ async function autofillBic(worker) {
@on-fetch="(data) => (bankEntitiesOptions = data)" @on-fetch="(data) => (bankEntitiesOptions = data)"
auto-load auto-load
/> />
<RightMenu>
<template #right-panel> <VnSection
:data-key="dataKey"
:columns="columns"
prefix="workerSearch"
:array-data-props="{
url: 'Workers/filter',
order: ['id DESC'],
exprBuilder,
}"
>
<template #rightMenu>
<WorkerFilter data-key="WorkerList" /> <WorkerFilter data-key="WorkerList" />
</template> </template>
</RightMenu> <template #body>
<VnTable <VnTable
v-if="defaultPayMethod" v-if="defaultPayMethod"
ref="tableRef" ref="tableRef"
data-key="WorkerList" :data-key="dataKey"
url="Workers/filter" :create="{
:create="{ urlCreate: 'Workers/new',
urlCreate: 'Workers/new', title: t('Create worker'),
title: t('Create worker'), onDataSaved: ({ id }) => tableRef.redirect(id),
onDataSaved: ({ id }) => tableRef.redirect(id), formInitialData: {
formInitialData: { payMethodFk: defaultPayMethod,
payMethodFk: defaultPayMethod, companyFk: user.companyFk,
companyFk: user.companyFk, isFreelance: false,
isFreelance: false, },
}, }"
}" default-mode="table"
:columns="columns" :columns="columns"
default-mode="table" redirect="worker"
redirect="worker" :right-search="false"
:right-search="false" >
:order="['id DESC']" <template #more-create-dialog="{ data }">
> <div class="q-pa-lg full-width">
<template #more-create-dialog="{ data }"> <VnRadio
<div class="q-pa-lg full-width"> v-model="data.isFreelance"
<VnRadio :val="false"
v-model="data.isFreelance" :label="`${t('Internal')}`"
:val="false" @update:model-value="data.payMethodFk = defaultPayMethod"
:label="`${t('Internal')}`" />
@update:model-value="data.payMethodFk = defaultPayMethod" <VnRadio
/> v-model="data.isFreelance"
<VnRadio :val="true"
v-model="data.isFreelance" :label="`${t('External')}`"
:val="true" @update:model-value="delete data.payMethodFk"
:label="`${t('External')}`" />
@update:model-value="delete data.payMethodFk" <VnRow>
/> <VnInput
<VnRow> next
<VnInput v-model="data.firstName"
next :label="t('globals.name')"
v-model="data.firstName" @update:model-value="generateCodeUser(data)"
:label="t('globals.name')" />
@update:model-value="generateCodeUser(data)" <VnInput
/> v-model="data.lastNames"
<VnInput :label="t('worker.create.lastName')"
v-model="data.lastNames" @update:model-value="generateCodeUser(data)"
:label="t('worker.create.lastName')" />
@update:model-value="generateCodeUser(data)" <VnInput
/> v-model="data.code"
<VnInput v-model="data.code" :label="t('worker.create.code')" /> :label="t('worker.create.code')"
</VnRow> />
<VnRow> </VnRow>
<VnInput v-model="data.name" :label="t('worker.create.webUser')" /> <VnRow>
<VnInput <VnInput
v-model="data.email" v-model="data.name"
type="email" :label="t('worker.create.webUser')"
:label="t('worker.create.personalEmail')" />
/> <VnInput
</VnRow> v-model="data.email"
<VnRow> type="email"
<VnSelect :label="t('worker.create.personalEmail')"
:label="t('globals.company')" />
v-model="data.companyFk" </VnRow>
:options="companiesOptions" <VnRow>
option-value="id" <VnSelect
option-label="code" :label="t('globals.company')"
hide-selected v-model="data.companyFk"
/> :options="companiesOptions"
<VnSelectWorker option-value="id"
:label="t('worker.summary.boss')" option-label="code"
v-model="data.bossFk" hide-selected
/> />
</VnRow> <VnSelectWorker
<VnRow> :label="t('worker.summary.boss')"
<VnInput v-model="data.fi" :label="t('worker.create.fi')" /> v-model="data.bossFk"
<VnInputDate />
v-model="data.birth" </VnRow>
:label="t('worker.create.birth')" <VnRow>
:disable="data.isFreelance" <VnInput v-model="data.fi" :label="t('worker.create.fi')" />
/> <VnInputDate
<VnInput v-model="data.birth"
v-model="data.phone" :label="t('worker.create.birth')"
:label="t('globals.phone')" :disable="data.isFreelance"
:disable="data.isFreelance" />
/> <VnInput
</VnRow> v-model="data.phone"
<VnRow> :label="t('globals.phone')"
<VnLocation :disable="data.isFreelance"
:roles-allowed-to-create="['deliveryAssistant']" />
:acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]" </VnRow>
:options="postcodesOptions" <VnRow>
@update:model-value="(location) => handleLocation(data, location)" <VnLocation
:disable="data.isFreelance" :roles-allowed-to-create="['deliveryAssistant']"
> :acls="[
</VnLocation> { model: 'Town', props: '*', accessType: 'WRITE' },
</VnRow> ]"
<VnRow> :options="postcodesOptions"
<VnInput @update:model-value="
:label="t('globals.street')" (location) => handleLocation(data, location)
:model-value="uppercaseStreetModel(data).get()" "
@update:model-value="uppercaseStreetModel(data).set" :disable="data.isFreelance"
:disable="data.isFreelance" >
/> </VnLocation>
</VnRow> </VnRow>
<VnRow> <VnRow>
<VnSelect <VnInput
:label="t('worker.create.payMethods')" :label="t('globals.street')"
v-model="data.payMethodFk" :model-value="uppercaseStreetModel(data).get()"
:options="payMethodsOptions" @update:model-value="uppercaseStreetModel(data).set"
option-value="id" :disable="data.isFreelance"
option-label="name" />
map-options </VnRow>
hide-selected <VnRow>
:disable="data.isFreelance" <VnSelect
@update:model-value="(val) => !val && delete data.payMethodFk" :label="t('worker.create.payMethods')"
/> v-model="data.payMethodFk"
<VnInput :options="payMethodsOptions"
v-model="data.iban" option-value="id"
:label="t('worker.create.iban')" option-label="name"
:disable="data.isFreelance" map-options
@update:model-value="autofillBic(data)" hide-selected
> :disable="data.isFreelance"
<template #append> @update:model-value="
<QIcon name="info" class="cursor-info"> (val) => !val && delete data.payMethodFk
<QTooltip>{{ t('components.iban_tooltip') }}</QTooltip>
</QIcon>
</template>
</VnInput>
</VnRow>
<VnRow>
<VnSelectDialog
:label="t('worker.create.bankEntity')"
v-model="data.bankEntityFk"
:options="bankEntitiesOptions"
option-label="name"
option-value="id"
hide-selected
:acls="[{ model: 'BankEntity', props: '*', accessType: 'WRITE' }]"
:disable="data.isFreelance"
@update:model-value="autofillBic(data)"
:filter-options="['bic', 'name']"
>
<template #form>
<CreateBankEntityForm
@on-data-saved="
(_, resp) => handleNewBankEntity(data, resp)
" "
/> />
</template> <VnInput
<template #option="scope"> v-model="data.iban"
<QItem v-bind="scope.itemProps"> :label="t('worker.create.iban')"
<QItemSection v-if="scope.opt"> :disable="data.isFreelance"
<QItemLabel @update:model-value="autofillBic(data)"
>{{ scope.opt.bic }} >
{{ scope.opt.name }}</QItemLabel <template #append>
> <QIcon name="info" class="cursor-info">
</QItemSection> <QTooltip>{{
</QItem> t('components.iban_tooltip')
</template> }}</QTooltip>
</VnSelectDialog> </QIcon>
</VnRow> </template>
</div> </VnInput>
</VnRow>
<VnRow>
<VnSelectDialog
:label="t('worker.create.bankEntity')"
v-model="data.bankEntityFk"
:options="bankEntitiesOptions"
option-label="name"
option-value="id"
hide-selected
:acls="[
{
model: 'BankEntity',
props: '*',
accessType: 'WRITE',
},
]"
:disable="data.isFreelance"
@update:model-value="autofillBic(data)"
:filter-options="['bic', 'name']"
>
<template #form>
<CreateBankEntityForm
@on-data-saved="
(_, resp) => handleNewBankEntity(data, resp)
"
/>
</template>
<template #option="scope">
<QItem v-bind="scope.itemProps">
<QItemSection v-if="scope.opt">
<QItemLabel
>{{ scope.opt.bic }}
{{ scope.opt.name }}</QItemLabel
>
</QItemSection>
</QItem>
</template>
</VnSelectDialog>
</VnRow>
</div>
</template>
</VnTable>
</template> </template>
</VnTable> </VnSection>
</template> </template>
<i18n> <i18n>

View File

@ -1,3 +1,6 @@
workerSearch:
search: Search worker
searchInfo: Search worker by id or name
passwordRequirements: 'The password must have at least { length } length characters, {nAlpha} alphabetic characters, {nUpper} capital letters, {nDigits} digits and {nPunct} symbols (Ex: $%&.)\n' passwordRequirements: 'The password must have at least { length } length characters, {nAlpha} alphabetic characters, {nUpper} capital letters, {nDigits} digits and {nPunct} symbols (Ex: $%&.)\n'
tableColumns: tableColumns:
id: ID id: ID

View File

@ -1,5 +1,6 @@
Search worker: Buscar trabajador workerSearch:
You can search by worker id or name: Puedes buscar por id o nombre del trabajador search: Buscar trabajador
searchInfo: Buscar trabajador por id o nombre
Locker: Taquilla Locker: Taquilla
Internal: Interno Internal: Interno
External: Externo External: Externo

View File

@ -1,19 +1,12 @@
import { RouterView } from 'vue-router'; import { RouterView } from 'vue-router';
export default { const workerCard = {
path: '/worker', name: 'WorkerCard',
name: 'Worker', path: ':id',
component: () => import('src/pages/Worker/Card/WorkerCard.vue'),
redirect: { name: 'WorkerSummary' },
meta: { meta: {
title: 'workers', menu: [
icon: 'vn:worker',
moduleName: 'Worker',
keyBinding: 'w',
},
component: RouterView,
redirect: { name: 'WorkerMain' },
menus: {
main: ['WorkerList', 'WorkerDepartment'],
card: [
'WorkerBasicData', 'WorkerBasicData',
'WorkerNotes', 'WorkerNotes',
'WorkerPda', 'WorkerPda',
@ -31,21 +24,207 @@ export default {
'WorkerOperator', 'WorkerOperator',
], ],
}, },
children: [
{
name: 'WorkerSummary',
path: 'summary',
meta: {
title: 'summary',
icon: 'launch',
},
component: () => import('src/pages/Worker/Card/WorkerSummary.vue'),
},
{
path: 'basic-data',
name: 'WorkerBasicData',
meta: {
title: 'basicData',
icon: 'vn:settings',
acls: [
{
model: 'Worker',
props: 'updateAttributes',
accessType: 'WRITE',
},
],
},
component: () => import('src/pages/Worker/Card/WorkerBasicData.vue'),
},
{
path: 'notes',
name: 'NotesCard',
redirect: { name: 'WorkerNotes' },
children: [
{
path: '',
name: 'WorkerNotes',
meta: {
title: 'notes',
icon: 'vn:notes',
},
component: () =>
import('src/pages/Worker/Card/WorkerNotes.vue'),
},
],
},
{
name: 'WorkerTimeControl',
path: 'time-control',
meta: {
title: 'timeControl',
icon: 'access_time',
},
component: () =>
import('src/pages/Worker/Card/WorkerTimeControl.vue'),
},
{
name: 'WorkerCalendar',
path: 'calendar',
meta: {
title: 'calendar',
icon: 'calendar_today',
},
component: () => import('src/pages/Worker/Card/WorkerCalendar.vue'),
},
{
name: 'WorkerPda',
path: 'pda',
meta: {
title: 'pda',
icon: 'phone_android',
},
component: () => import('src/pages/Worker/Card/WorkerPda.vue'),
},
{
name: 'WorkerNotificationsManager',
path: 'notifications',
meta: {
title: 'notifications',
icon: 'notifications',
},
component: () =>
import('src/pages/Worker/Card/WorkerNotificationsManager.vue'),
},
{
path: 'pbx',
name: 'WorkerPBX',
meta: {
title: 'pbx',
icon: 'vn:pbx',
},
component: () => import('src/pages/Worker/Card/WorkerPBX.vue'),
},
{
name: 'WorkerDms',
path: 'dms',
meta: {
title: 'dms',
icon: 'cloud_upload',
},
component: () => import('src/pages/Worker/Card/WorkerDms.vue'),
},
{
name: 'WorkerLog',
path: 'log',
meta: {
title: 'log',
icon: 'vn:History',
acls: [{ model: 'WorkerLog', props: 'find', accessType: 'READ' }],
},
component: () => import('src/pages/Worker/Card/WorkerLog.vue'),
},
{
name: 'WorkerLocker',
path: 'locker',
meta: {
title: 'locker',
icon: 'lock',
},
component: () => import('src/pages/Worker/Card/WorkerLocker.vue'),
},
{
name: 'WorkerBalance',
path: 'balance',
meta: {
title: 'balance',
icon: 'balance',
},
component: () => import('src/pages/Worker/Card/WorkerBalance.vue'),
},
{
name: 'WorkerFormation',
path: 'formation',
meta: {
title: 'formation',
icon: 'clinical_notes',
},
component: () => import('src/pages/Worker/Card/WorkerFormation.vue'),
},
{
name: 'WorkerMedical',
path: 'medical',
meta: {
title: 'medical',
icon: 'medical_information',
},
component: () => import('src/pages/Worker/Card/WorkerMedical.vue'),
},
{
name: 'WorkerPit',
path: 'pit',
meta: {
title: 'pit',
icon: 'lock',
},
component: () => import('src/pages/Worker/Card/WorkerPit.vue'),
},
{
name: 'WorkerOperator',
path: 'operator',
meta: {
title: 'operator',
icon: 'person',
},
component: () => import('src/pages/Worker/Card/WorkerOperator.vue'),
},
],
};
export default {
name: 'Worker',
path: '/worker',
meta: {
title: 'workers',
icon: 'vn:worker',
moduleName: 'Worker',
keyBinding: 'w',
menu: ['WorkerList', 'WorkerDepartment'],
},
component: RouterView,
redirect: { name: 'WorkerMain' },
children: [ children: [
{ {
path: '', path: '',
name: 'WorkerMain', name: 'WorkerMain',
component: () => import('src/components/common/VnModule.vue'), component: () => import('src/components/common/VnModule.vue'),
redirect: { name: 'WorkerList' }, redirect: { name: 'WorkerIndexMain' },
children: [ children: [
{ {
path: 'list', path: '',
name: 'WorkerList', name: 'WorkerIndexMain',
meta: { redirect: { name: 'WorkerList' },
title: 'list',
icon: 'view_list',
},
component: () => import('src/pages/Worker/WorkerList.vue'), component: () => import('src/pages/Worker/WorkerList.vue'),
children: [
{
name: 'WorkerList',
path: 'list',
meta: {
title: 'list',
icon: 'view_list',
},
},
workerCard,
]
}, },
{ {
path: 'department', path: 'department',
@ -67,175 +246,5 @@ export default {
}, },
], ],
}, },
{
name: 'WorkerCard',
path: ':id',
component: () => import('src/pages/Worker/Card/WorkerCard.vue'),
redirect: { name: 'WorkerSummary' },
children: [
{
name: 'WorkerSummary',
path: 'summary',
meta: {
title: 'summary',
icon: 'launch',
},
component: () => import('src/pages/Worker/Card/WorkerSummary.vue'),
},
{
path: 'basic-data',
name: 'WorkerBasicData',
meta: {
title: 'basicData',
icon: 'vn:settings',
acls: [
{
model: 'Worker',
props: 'updateAttributes',
accessType: 'WRITE',
},
],
},
component: () => import('src/pages/Worker/Card/WorkerBasicData.vue'),
},
{
path: 'notes',
name: 'NotesCard',
redirect: { name: 'WorkerNotes' },
children: [
{
path: '',
name: 'WorkerNotes',
meta: {
title: 'notes',
icon: 'vn:notes',
},
component: () =>
import('src/pages/Worker/Card/WorkerNotes.vue'),
},
],
},
{
name: 'WorkerTimeControl',
path: 'time-control',
meta: {
title: 'timeControl',
icon: 'access_time',
},
component: () =>
import('src/pages/Worker/Card/WorkerTimeControl.vue'),
},
{
name: 'WorkerCalendar',
path: 'calendar',
meta: {
title: 'calendar',
icon: 'calendar_today',
},
component: () => import('src/pages/Worker/Card/WorkerCalendar.vue'),
},
{
name: 'WorkerPda',
path: 'pda',
meta: {
title: 'pda',
icon: 'phone_android',
},
component: () => import('src/pages/Worker/Card/WorkerPda.vue'),
},
{
name: 'WorkerNotificationsManager',
path: 'notifications',
meta: {
title: 'notifications',
icon: 'notifications',
},
component: () =>
import('src/pages/Worker/Card/WorkerNotificationsManager.vue'),
},
{
path: 'pbx',
name: 'WorkerPBX',
meta: {
title: 'pbx',
icon: 'vn:pbx',
},
component: () => import('src/pages/Worker/Card/WorkerPBX.vue'),
},
{
name: 'WorkerDms',
path: 'dms',
meta: {
title: 'dms',
icon: 'cloud_upload',
},
component: () => import('src/pages/Worker/Card/WorkerDms.vue'),
},
{
name: 'WorkerLog',
path: 'log',
meta: {
title: 'log',
icon: 'vn:History',
acls: [{ model: 'WorkerLog', props: 'find', accessType: 'READ' }],
},
component: () => import('src/pages/Worker/Card/WorkerLog.vue'),
},
{
name: 'WorkerLocker',
path: 'locker',
meta: {
title: 'locker',
icon: 'lock',
},
component: () => import('src/pages/Worker/Card/WorkerLocker.vue'),
},
{
name: 'WorkerBalance',
path: 'balance',
meta: {
title: 'balance',
icon: 'balance',
},
component: () => import('src/pages/Worker/Card/WorkerBalance.vue'),
},
{
name: 'WorkerFormation',
path: 'formation',
meta: {
title: 'formation',
icon: 'clinical_notes',
},
component: () => import('src/pages/Worker/Card/WorkerFormation.vue'),
},
{
name: 'WorkerMedical',
path: 'medical',
meta: {
title: 'medical',
icon: 'medical_information',
},
component: () => import('src/pages/Worker/Card/WorkerMedical.vue'),
},
{
name: 'WorkerPit',
path: 'pit',
meta: {
title: 'pit',
icon: 'lock',
},
component: () => import('src/pages/Worker/Card/WorkerPit.vue'),
},
{
name: 'WorkerOperator',
path: 'operator',
meta: {
title: 'operator',
icon: 'person',
},
component: () => import('src/pages/Worker/Card/WorkerOperator.vue'),
},
],
},
], ],
}; };