wbuezas
/
salix-front-mindshore-fork2
forked from verdnatura/salix-front
0
0
Fork 0
Code Pull Requests Activity

Merge branch 'dev' into 7311_boilerplate_users

This commit is contained in:
Javier Segarra 2024-05-23 08:53:10 +02:00
parent 06664cc2d0 406c095ed2
commit 433564507e
23 changed files with 676 additions and 342 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "salix-front",
"version": "24.22.0",
"version": "24.24.0",
"description": "Salix frontend",
"productName": "Salix",
"author": "Verdnatura",

2
src/components/common/VnDmsList.vue
View File

@ -35,7 +35,7 @@ const $props = defineProps({
downloadModel: {
type: String,
required: false,
default: null,
default: undefined,
},
defaultDmsCode: {
type: String,

2
src/filters/dateRange.js
View File

@ -1,7 +1,7 @@
export default function dateRange(value) {
const minHour = new Date(value);
minHour.setHours(0, 0, 0, 0);
const maxHour = new Date(value);
const maxHour = new Date();
maxHour.setHours(23, 59, 59, 59);
return [minHour, maxHour];

10
src/i18n/locale/en.yml
View File

@ -831,6 +831,7 @@ worker:
calendar: Calendar
timeControl: Time control
locker: Locker
list:
name: Name
email: Email
@ -862,6 +863,15 @@ worker:
role: Role
sipExtension: Extension
locker: Locker
fiDueDate: Fecha de caducidad del DNI
sex: Sexo
seniority: Antigüedad
fi: DNI/NIE/NIF
birth: Cumpleaños
isFreelance: Autónomo
isSsDiscounted: Bonificación SS
hasMachineryAuthorized: Autorizado para llevar maquinaria
isDisable: Trabajador desactivado
notificationsManager:
activeNotifications: Active notifications
availableNotifications: Available notifications

76
src/pages/Customer/Defaulter/CustomerDefaulter.vue
View File

@ -14,9 +14,10 @@ import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.v
import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
import VnInput from 'src/components/common/VnInput.vue';
import CustomerDefaulterAddObservation from './CustomerDefaulterAddObservation.vue';
import axios from 'axios';
const stateStore = useStateStore();
const { t, locale } = useI18n();
const { t } = useI18n();
const quasar = useQuasar();
const dataRef = ref(null);
@ -26,7 +27,7 @@ const selected = ref([]);
const tableColumnComponents = {
client: {
component: QBtn,
props: () => ({ flat: true, color: 'blue', noCaps: true }),
props: () => ({ flat: true, class: 'link', noCaps: true }),
event: () => {},
},
isWorker: {
@ -39,7 +40,12 @@ const tableColumnComponents = {
},
salesPerson: {
component: QBtn,
props: () => ({ flat: true, color: 'blue', noCaps: true }),
props: () => ({ flat: true, class: 'link', noCaps: true }),
event: () => {},
},
department: {
component: 'span',
props: () => {},
event: () => {},
},
country: {
@ -59,7 +65,7 @@ const tableColumnComponents = {
},
author: {
component: QBtn,
props: () => ({ flat: true, color: 'blue', noCaps: true }),
props: () => ({ flat: true, class: 'link', noCaps: true }),
event: () => {},
},
lastObservation: {
@ -82,6 +88,16 @@ const tableColumnComponents = {
props: () => {},
event: () => {},
},
finished: {
component: QCheckbox,
props: (prop) => ({
disable: true,
'model-value': prop.value,
class: 'disabled-checkbox',
}),
event: () => {},
},
};
const columns = computed(() => [
@ -105,6 +121,13 @@ const columns = computed(() => [
name: 'salesPerson',
sortable: true,
},
{
align: 'left',
field: 'departmentName',
label: t('Department'),
name: 'department',
sortable: true,
},
{
align: 'left',
field: 'country',
@ -166,6 +189,12 @@ const columns = computed(() => [
name: 'from',
sortable: true,
},
{
align: 'left',
field: 'finished',
label: t('Has recover'),
name: 'finished',
},
]);
const viewAddObservation = (rowsSelected) => {
@ -178,7 +207,39 @@ const viewAddObservation = (rowsSelected) => {
});
};
const onFetch = (data) => {
const departments = ref(new Map());
const onFetch = async (data) => {
const salesPersonFks = data.map((item) => item.salesPersonFk);
const departmentNames = salesPersonFks.map(async (salesPersonFk) => {
try {
const { data: workerDepartment } = await axios.get(
`WorkerDepartments/${salesPersonFk}`
);
const { data: department } = await axios.get(
`Departments/${workerDepartment.departmentFk}`
);
departments.value.set(salesPersonFk, department.name);
} catch (error) {
console.error('Err: ', error);
}
});
const recoveryData = await axios.get('Recoveries');
const recoveries = recoveryData.data.map(({ clientFk, finished }) => ({
clientFk,
finished,
}));
await Promise.all(departmentNames);
data.forEach((item) => {
item.departmentName = departments.value.get(item.salesPersonFk);
item.isWorker = item.businessTypeFk === 'worker';
const recovery = recoveries.find(({ clientFk }) => clientFk === item.clientFk);
item.finished = recovery?.finished === null;
});
for (const element of data) element.isWorker = element.businessTypeFk === 'worker';
balanceDueTotal.value = data.reduce((acc, { amount = 0 }) => acc + amount, 0);
@ -191,6 +252,7 @@ function exprBuilder(param, value) {
case 'creditInsurance':
case 'amount':
case 'workerFk':
case 'departmentFk':
case 'countryFk':
case 'payMethod':
case 'salesPersonFk':
@ -243,7 +305,6 @@ function exprBuilder(param, value) {
</div>
</template>
</VnSubToolbar>
<QPage class="column items-center q-pa-md">
<VnPaginate
ref="dataRef"
@ -302,7 +363,7 @@ function exprBuilder(param, value) {
)
"
>
<template v-if="props.col.name !== 'isWorker'">
<template v-if="typeof props.value !== 'boolean'">
<div
v-if="
props.col.name === 'lastObservation'
@ -354,6 +415,7 @@ es:
Client: Cliente
Is worker: Es trabajador
Salesperson: Comercial
Department: Departamento
Country: País
P. Method: F. Pago
Pay method: Forma de pago

10
src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue
View File

@ -45,11 +45,10 @@ const authors = ref();
</div>
</template>
<template #body="{ params }">
<QItem class="q-mb-sm q-mt-sm">
<template #body="{ params, searchFn }">
<QItem class="q-mb-sm">
<QItemSection v-if="clients">
<VnSelect
:input-debounce="0"
:label="t('Client')"
:options="clients"
dense
@ -62,6 +61,8 @@ const authors = ref();
rounded
use-input
v-model="params.clientFk"
@update:model-value="searchFn()"
auto-load
/>
</QItemSection>
<QItemSection v-else>
@ -85,6 +86,7 @@ const authors = ref();
rounded
use-input
v-model="params.salesPersonFk"
@update:model-value="searchFn()"
/>
</QItemSection>
<QItemSection v-else>
@ -108,6 +110,7 @@ const authors = ref();
rounded
use-input
v-model="params.countryFk"
@update:model-value="searchFn()"
/>
</QItemSection>
<QItemSection v-else>
@ -153,6 +156,7 @@ const authors = ref();
rounded
use-input
v-model="params.workerFk"
@update:model-value="searchFn()"
/>
</QItemSection>
<QItemSection v-else>

47
src/pages/Department/Card/DepartmentDescriptor.vue
View File

@ -3,7 +3,7 @@ import { computed, ref } from 'vue';
import { useRoute, useRouter } from 'vue-router';
import { useI18n } from 'vue-i18n';
import { useQuasar } from 'quasar';
import { useVnConfirm } from 'composables/useVnConfirm';
import VnLv from 'src/components/ui/VnLv.vue';
import CardDescriptor from 'src/components/ui/CardDescriptor.vue';
import useCardDescription from 'src/composables/useCardDescription';
@ -43,30 +43,17 @@ const setData = (entity) => {
data.value = useCardDescription(entity.name, entity.id);
};
const removeDepartment = () => {
quasar
.dialog({
title: 'Are you sure you want to delete it?',
message: 'Delete department',
ok: {
push: true,
color: 'primary',
},
cancel: true,
})
.onOk(async () => {
try {
await axios.post(
`/Departments/${entityId.value}/removeChild`,
entityId.value
);
router.push({ name: 'WorkerDepartment' });
notify('department.departmentRemoved', 'positive');
} catch (err) {
console.error('Error removing department');
}
});
const removeDepartment = async () => {
try {
await axios.post(`/Departments/${entityId.value}/removeChild`, entityId.value);
router.push({ name: 'WorkerDepartment' });
notify('department.departmentRemoved', 'positive');
} catch (err) {
console.error('Error removing department');
}
};
const { openConfirmationModal } = useVnConfirm();
</script>
<template>
<CardDescriptor
@ -84,7 +71,17 @@ const removeDepartment = () => {
"
>
<template #menu="{}">
<QItem v-ripple clickable @click="removeDepartment()">
<QItem
v-ripple
clickable
@click="
openConfirmationModal(
t('Are you sure you want to delete it?'),
t('Delete department'),
removeDepartment
)
"
>
<QItemSection>{{ t('Delete') }}</QItemSection>
</QItem>
</template>

28
src/pages/Route/Card/RouteForm.vue
View File

@ -28,7 +28,7 @@ const defaultInitialData = {
workerFk: null,
isOk: false,
};
const maxDistance = ref();
const workerList = ref([]);
const agencyList = ref([]);
const vehicleList = ref([]);
@ -81,12 +81,7 @@ const onSave = (data, response) => {
};
</script>
<template>
<VnSubToolbar />
<template v-if="stateStore.isHeaderMounted()">
<Teleport to="#searchbar">
<RouteSearchbar />
</Teleport>
</template>
<VnSubToolbar v-if="isNew" />
<FetchData
url="Workers/search"
:filter="{ fields: ['id', 'nickname'] }"
@ -111,6 +106,12 @@ const onSave = (data, response) => {
@on-fetch="(data) => (vehicleList = data)"
auto-load
/>
<FetchData
url="RouteConfigs/findOne"
@on-fetch="({ kmMax }) => (maxDistance = kmMax)"
auto-load
sort-by="id ASC"
/>
<FormModel
:url="isNew ? null : `Routes/${route.params?.id}`"
:url-create="isNew ? 'Routes' : null"
@ -174,7 +175,17 @@ const onSave = (data, response) => {
<template v-if="!isNew">
<VnRow class="row q-gutter-md q-mb-md">
<VnInput v-model="data.kmStart" :label="t('Km Start')" clearable />
<VnInput v-model="data.kmEnd" :label="t('Km End')" clearable />
<QInput
v-model.number="data.kmEnd"
:label="t('Km End')"
:rules="[
(val) =>
val < maxDistance ||
t('Distance must be lesser than 4000'),
]"
clearable
type="number"
/>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnInputTime
@ -221,4 +232,5 @@ es:
Description: Descripción
Is served: Se ha servido
Created: Creado
Distance must be lesser than {maxDistance}: La distancia debe ser inferior a {maxDistance}
</i18n>

5
src/pages/Route/RouteTickets.vue
View File

@ -222,11 +222,6 @@ const openSmsDialog = async () => {
</script>
<template>
<template v-if="stateStore.isHeaderMounted()">
<Teleport to="#searchbar">
<RouteSearchbar />
</Teleport>
</template>
<FetchData
@on-fetch="(data) => (routeEntity = data)"
auto-load

58
src/pages/Ticket/Card/TicketSummary.vue
View File

@ -13,6 +13,7 @@ import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
import { getUrl } from 'src/composables/getUrl';
import VnUserLink from 'src/components/ui/VnUserLink.vue';
import VnTitle from 'src/components/common/VnTitle.vue';
import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
const route = useRoute();
const router = useRouter();
@ -262,9 +263,12 @@ async function changeState(value) {
:url="ticketUrl + 'sale'"
:text="t('ticket.summary.saleLines')"
/>
<QTable :rows="ticket.sales">
<QTable :rows="ticket.sales" style="text-align: center">
<template #body-cell="{ value }">
<QTd>{{ value }}</QTd>
</template>
<template #header="props">
<QTr :props="props">
<QTr class="tr-header" :props="props">
<QTh auto-width></QTh>
<QTh auto-width>{{ t('ticket.summary.item') }}</QTh>
<QTh auto-width>{{ t('ticket.summary.visible') }}</QTh>
@ -360,23 +364,29 @@ async function changeState(value) {
</QTooltip>
</QIcon>
</QTd>
<QTd class="link">{{ props.row.itemFk }}</QTd>
<QTd>
<QBtn class="link" flat>
{{ props.row.itemFk }}
<ItemDescriptorProxy :id="props.row.itemFk" />
</QBtn>
</QTd>
<QTd>{{ props.row.visible }}</QTd>
<QTd>{{ props.row.available }}</QTd>
<QTd>{{ props.row.quantity }}</QTd>
<QTd>
<div class="fetched-tags">
<span>{{ props.row.item.name }}</span>
<span v-if="props.row.item.subName" class="subName">{{
props.row.item.subName
}}</span>
<QTd class="description-cell">
<div class="row full-width justify-between">
{{ props.row.item.name }}
<div v-if="props.row.item.subName" class="subName">
{{ props.row.item.subName.toUpperCase() }}
</div>
</div>
<fetched-tags
<FetchedTags
class="fetched-tags"
:item="props.row.item"
:max-length="5"
></fetched-tags>
></FetchedTags>
</QTd>
<QTd>{{ props.row.price }}</QTd>
<QTd>{{ props.row.price }} €</QTd>
<QTd>{{ props.row.discount }} %</QTd>
<QTd
>{{
@ -453,4 +463,28 @@ async function changeState(value) {
padding: 1%;
}
}
.q-table {
tr,
th,
.q-td {
border-bottom: 1px solid black;
}
}
.subName {
margin-left: 10%;
}
.tr-header,
.subName {
color: var(--vn-label-color);
}
.description-cell {
width: 25%;
}
.fetched-tags {
max-width: 70%;
}
</style>

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

@ -2,7 +2,7 @@
import { ref } from 'vue';
import { useRoute } from 'vue-router';
import { useI18n } from 'vue-i18n';
import VnInputDate from 'src/components/common/VnInputDate.vue';
import FetchData from 'components/FetchData.vue';
import FormModel from 'src/components/FormModel.vue';
import VnRow from 'components/ui/VnRow.vue';
@ -74,12 +74,11 @@ const maritalStatus = [
model="Worker"
>
<template #form="{ data }">
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnInput :label="t('Name')" clearable v-model="data.firstName" />
<VnInput :label="t('Last name')" clearable v-model="data.lastName" />
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnInput v-model="data.phone" :label="t('Business phone')" clearable />
<VnInput
v-model="data.mobileExtension"
@ -88,7 +87,7 @@ const maritalStatus = [
/>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnSelect
:label="t('Boss')"
:options="workersOptions"
@ -119,7 +118,7 @@ const maritalStatus = [
/>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnSelect
:label="t('Origin country')"
:options="countriesOptions"
@ -138,7 +137,7 @@ const maritalStatus = [
/>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnInput v-model="data.SSN" :label="t('SSN')" clearable />
<VnInput
v-model="data.locker"
@ -147,6 +146,36 @@ const maritalStatus = [
clearable
/>
</VnRow>
<VnRow>
<VnInputDate :label="t('fiDueDate')" v-model="data.fiDueDate" />
<VnInput v-model="data.sex" :label="t('sex')" clearable />
</VnRow>
<VnRow>
<VnInputDate :label="t('seniority')" v-model="data.seniority" />
<VnInput v-model="data.fi" :label="t('fi')" />
</VnRow>
<VnRow>
<VnInputDate :label="t('birth')" v-model="data.birth" />
</VnRow>
<VnRow>
<QCheckbox
size="sm"
:label="t('isFreelance')"
v-model="data.isFreelance"
/>
<QCheckbox
size="sm"
v-model="data.isSsDiscounted"
:label="t(`isSsDiscounted`)"
/>
<QCheckbox
size="sm"
v-model="data.hasMachineryAuthorized"
:label="t(`hasMachineryAuthorized`)"
/>
<QCheckbox size="sm" v-model="data.isDisable" :label="t(`isDisable`)" />
</VnRow>
</template>
</FormModel>
</template>
@ -165,4 +194,13 @@ es:
Education level: Nivel educación
SSN: NSS
Locker: Taquilla
fiDueDate: Fecha de caducidad del DNI
seniority: Antigüedad
hasMachineryAuthorized: Autorizado para llevar maquinaria
isFreelance: Autónomo
isDisable: Trabajador desactivado
fi: DNI/NIE/NIF
sex: Sexo
birth: Cumpleaños
isSsDiscounted: Bonificación SS
</i18n>

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

@ -170,23 +170,6 @@ watch([year, businessFk], () => refreshData());
ref="WorkerFreelanceRef"
auto-load
/>
<template v-if="stateStore.isHeaderMounted()">
<Teleport to="#actions-append">
<div class="row q-gutter-x-sm">
<QBtn
flat
@click="stateStore.toggleRightDrawer()"
round
dense
icon="menu"
>
<QTooltip bottom anchor="bottom right">
{{ t('globals.collapseMenu') }}
</QTooltip>
</QBtn>
</div>
</Teleport>
</template>
<QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
<QScrollArea class="fit text-grey-8">
<WorkerCalendarFilter

290
src/pages/Worker/Card/WorkerPda.vue
View File

@ -1,140 +1,212 @@
<script setup>
import { useI18n } from 'vue-i18n';
import { useRoute } from 'vue-router';
import { onMounted, ref, computed } from 'vue';
import FetchData from 'components/FetchData.vue';
import FormModel from 'components/FormModel.vue';
import VnSelect from 'src/components/common/VnSelect.vue';
import useNotify from 'src/composables/useNotify.js';
import axios from 'axios';
import { useRole } from 'src/composables/useRole';
import { ref, computed } from 'vue';
import axios from 'axios';
import useNotify from 'src/composables/useNotify.js';
import FetchData from 'components/FetchData.vue';
import FormModelPopup from 'src/components/FormModelPopup.vue';
import { useVnConfirm } from 'composables/useVnConfirm';
import VnPaginate from 'src/components/ui/VnPaginate.vue';
import VnRow from 'components/ui/VnRow.vue';
import VnSelect from 'src/components/common/VnSelect.vue';
import VnInput from 'src/components/common/VnInput.vue';
const route = useRoute();
const { t } = useI18n();
const { notify } = useNotify();
const { hasAny } = useRole();
const fetchCurrentDeviceRef = ref(null);
const deviceProductionsFilter = {
fields: ['id', 'serialNumber', 'modelFk'],
where: { stateFk: 'idle' },
order: 'id',
};
const deviceProductionsOptions = ref([]);
const newPDA = ref({});
const currentPDA = ref(null);
const paginate = ref();
const dialog = ref();
const route = useRoute();
const { openConfirmationModal } = useVnConfirm();
const routeId = computed(() => route.params.id);
const isAllowedToEdit = computed(() => hasAny(['hr', 'productionAssi']));
const initialData = computed(() => {
return {
userFk: routeId.value,
deviceProductionFk: null,
simSerialNumber: null,
};
});
const setCurrentPDA = (data) => {
currentPDA.value = data;
currentPDA.value.description = `ID: ${currentPDA.value.deviceProductionFk} ${t(
'worker.pda.model'
)}: ${currentPDA.value.deviceProduction.modelFk} ${t('worker.pda.serialNumber')}: ${
currentPDA.value.deviceProduction.serialNumber
}`;
};
const deallocatePDA = async (data) => {
const deallocatePDA = async (deviceProductionFk) => {
try {
await axios.post(`Workers/${route.params.id}/deallocatePDA`, {
pda: currentPDA.value.deviceProductionFk,
pda: deviceProductionFk,
});
data.pda = null;
currentPDA.value = null;
await fetchCurrentDeviceRef.value.fetch();
notify(t('PDA deallocated'), 'positive');
} catch (err) {
console.error('Error deallocating PDA');
}
paginate.value.fetch();
};
onMounted(async () => await fetchCurrentDeviceRef.value.fetch());
function reloadData() {
initialData.value.deviceProductionFk = null;
initialData.value.simSerialNumber = null;
paginate.value.fetch();
}
</script>
<template>
<FetchData
url="DeviceProductions"
:filter="deviceProductionsFilter"
auto-load
@on-fetch="(data) => (deviceProductionsOptions = data)"
/>
<FetchData
ref="fetchCurrentDeviceRef"
url="DeviceProductionUsers"
:filter="{
where: { userFk: route.params.id },
include: { relation: 'deviceProduction' },
}"
auto-load
@on-fetch="(data) => setCurrentPDA(data[0])"
/>
<QPage class="column items-center q-pa-md">
<FormModel
url="DeviceProductionUsers"
:url-create="`Workers/${route.params.id}/allocatePDA`"
model="DeviceProductionUser"
:form-initial-data="newPDA"
<QPage class="column items-center q-pa-md centerCard">
<FetchData
url="workers/getAvailablePda"
@on-fetch="(data) => (deviceProductions = data)"
auto-load
/>
<VnPaginate
ref="paginate"
data-key="WorkerPda"
url="DeviceProductionUsers"
:filter="{ where: { userFk: routeId } }"
order="id"
auto-load
:default-buttons="{ save: { label: 'globals.assign', color: 'primary' } }"
@on-data-saved="(_, data) => setCurrentPDA(data)"
>
<template #form="{ data }">
<QField
v-if="currentPDA && currentPDA.description"
:label="t('worker.pda.currentPDA')"
:model-value="currentPDA.description"
:editable="false"
class="full-width"
<template #body="{ rows }">
<QCard
flat
bordered
:key="row.id"
v-for="row of rows"
class="card q-pt-xs q-mb-sm"
>
<template #control>
<div tabindex="0">
{{ currentPDA.description }}
</div>
</template>
<template v-if="isAllowedToEdit" #append>
<QIcon
name="delete"
size="sm"
class="cursor-pointer"
color="primary"
@click="deallocatePDA(data)"
>
<QTooltip>
{{ t('worker.pda.removePDA') }}
</QTooltip>
</QIcon>
</template>
</QField>
<VnSelect
v-else
:label="t('worker.pda.newPDA')"
v-model="data.pda"
:options="deviceProductionsOptions"
option-label="serialNumber"
option-value="id"
hide-selected
:disable="!isAllowedToEdit"
>
<template #option="scope">
<QItem v-bind="scope.itemProps">
<QItemSection>
<QItemLabel>ID: {{ scope.opt?.id }}</QItemLabel>
<QItemLabel caption>
{{ scope.opt?.modelFk }},
{{ scope.opt?.serialNumber }}
</QItemLabel>
</QItemSection>
</QItem>
</template>
</VnSelect>
<QItem>
<QItemSection side-left>
<VnRow>
<QField
:label="t('worker.pda.currentPDA')"
:model-value="row?.deviceProductionFk"
disable
>
<template #control>
<div tabindex="0" style="padding: none">
<span>Id: </span>
<span>
{{ row?.deviceProductionFk }}&nbsp;
</span>
<span>{{ t('Model') }}: </span>
<span>
{{ row?.deviceProduction?.modelFk }}&nbsp;
</span>
<span>{{ t('SIM serial number') }}: </span>
<span>
{{
row?.deviceProduction?.serialNumber
}}&nbsp;
</span>
</div>
</template>
</QField>
<QField
:label="t('Current SIM')"
:model-value="row?.simSerialNumber"
disable
>
<template #control>
<div tabindex="0">{{ row?.simSerialNumber }}</div>
</template>
</QField>
</VnRow>
</QItemSection>
<QItemSection side>
<QIcon
name="delete"
size="sm"
class="cursor-pointer"
color="primary"
@click="
openConfirmationModal(
t(`Remove PDA`),
t('Do you want to remove this PDA?'),
() => deallocatePDA(row.deviceProductionFk)
)
"
>
<QTooltip>
{{ t('worker.pda.removePDA') }}
</QTooltip>
</QIcon>
</QItemSection>
</QItem>
</QCard>
</template>
</FormModel>
</VnPaginate>
<QPageSticky :offset="[18, 18]">
<QBtn @click.stop="dialog.show()" color="primary" fab icon="add">
<QDialog ref="dialog">
<FormModelPopup
:title="t('Add new device')"
url-create="DeviceProductionUsers"
model="DeviceProductionUser"
:form-initial-data="initialData"
@on-data-saved="reloadData()"
>
<template #form-inputs="{ data }">
<VnRow class="row q-gutter-md q-mb-md">
<VnSelect
:label="t('worker.pda.newPDA')"
v-model="data.deviceProductionFk"
:options="deviceProductions"
option-label="id"
option-value="id"
id="deviceProductionFk"
hide-selected
>
<template #option="scope">
<QItem v-bind="scope.itemProps">
<QItemSection>
<QItemLabel
>ID: {{ scope.opt?.id }}</QItemLabel
>
<QItemLabel caption>
{{ scope.opt?.modelFk }},
{{ scope.opt?.serialNumber }}
</QItemLabel>
</QItemSection>
</QItem>
</template>
</VnSelect>
<VnInput
v-model="data.simSerialNumber"
:label="t('SIM serial number')"
id="simSerialNumber"
use-input
/>
</VnRow>
</template>
</FormModelPopup>
</QDialog>
</QBtn>
<QTooltip>
{{ t('globals.new') }}
</QTooltip>
</QPageSticky>
</QPage>
</template>
<style lang="scss" scoped>
.centerCard {
padding: 5%;
width: 100%;
max-width: 70%;
margin: 0 auto;
}
.label {
color: red;
}
.q-field {
height: 65px;
}
</style>
<i18n>
es:
Remove PDA: Eliminar PDA
Do you want to remove this PDA?: ¿Desea eliminar este PDA?
PDA deallocated: PDA desasignada
SIM serial number: Número de serie de la SIM
Model: Modelo
This PDA is already assigned to another user: Este PDA ya está asignado a otro usuario
Add new device: Añadir nuevo dispositivo
</i18n>

43
src/pages/Worker/Card/WorkerSummary.vue
View File

@ -2,7 +2,7 @@
import { ref, onMounted, computed } from 'vue';
import { useRoute } from 'vue-router';
import { useI18n } from 'vue-i18n';
import { dashIfEmpty } from 'src/filters';
import { dashIfEmpty, toDate } from 'src/filters';
import { getUrl } from 'src/composables/getUrl';
import VnLv from 'src/components/ui/VnLv.vue';
import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
@ -111,6 +111,47 @@ const filter = {
</VnLv>
<VnLv :label="t('worker.summary.locker')" :value="worker.locker" />
</QCard>
<QCard class="vn-one">
<VnTitle
:url="workerUrl + `basic-data`"
:text="t('worker.summary.basicData')"
/>
<VnLv
:label="t('worker.summary.fiDueDate')"
:value="toDate(worker.fiDueDate)"
/>
<VnLv :label="t('worker.summary.sex')" :value="worker.sex" />
<VnLv
:label="t('worker.summary.seniority')"
:value="toDate(worker.seniority)"
/>
<VnLv :label="t('worker.summary.fi')" :value="worker.fi" />
<VnLv :label="t('worker.summary.birth')" :value="toDate(worker.birth)" />
<QCheckbox
class="padding-none"
:label="t('worker.summary.isFreelance')"
v-model="worker.isFreelance"
:disable="true"
/>
<QCheckbox
class="padding-none"
:label="t('worker.summary.isSsDiscounted')"
v-model="worker.isSsDiscounted"
:disable="true"
/>
<QCheckbox
class="padding-none"
:label="t('worker.summary.hasMachineryAuthorized')"
v-model="worker.hasMachineryAuthorized"
:disable="true"
/>
<QCheckbox
class="padding-none"
:label="t('worker.summary.isDisable')"
v-model="worker.isDisable"
:disable="true"
/>
</QCard>
<QCard class="vn-one">
<VnTitle :text="t('worker.summary.userData')" />
<VnLv :label="t('worker.summary.userId')" :value="worker.user.id" />

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

@ -489,23 +489,6 @@ onMounted(async () => {
</QBtnGroup>
</div>
</Teleport>
<template v-if="stateStore.isHeaderMounted()">
<Teleport to="#actions-append">
<div class="row q-gutter-x-sm">
<QBtn
flat
@click="stateStore.toggleRightDrawer()"
round
dense
icon="menu"
>
<QTooltip bottom anchor="bottom right">
{{ t('globals.collapseMenu') }}
</QTooltip>
</QBtn>
</div>
</Teleport>
</template>
<QDrawer v-model="stateStore.rightDrawer" side="right" :width="260" class="q-pa-md">
<div class="q-pa-md q-mb-md" style="border: 2px solid #222">
<QCardSection horizontal>

27
src/pages/Zone/Card/ZoneCard.vue
View File

@ -1,8 +1,35 @@
<script setup>
import { useI18n } from 'vue-i18n';
import { useRoute } from 'vue-router';
import { computed } from 'vue';
import VnCard from 'components/common/VnCard.vue';
import ZoneDescriptor from './ZoneDescriptor.vue';
import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
import { useStateStore } from 'stores/useStateStore';
const { t } = useI18n();
const stateStore = useStateStore();
const route = useRoute();
const routeName = computed(() => route.name);
const searchBarDataKeys = {
ZoneWarehouses: 'ZoneWarehouses',
ZoneSummary: 'ZoneSummary',
};
</script>
<template>
<template v-if="stateStore.isHeaderMounted()">
<Teleport to="#searchbar">
<VnSearchbar
:data-key="searchBarDataKeys[routeName]"
:custom-route-redirect-name="routeName"
:label="t('list.searchZone')"
:info="t('list.searchInfo')"
/>
</Teleport>
</template>
<VnCard
data-key="Zone"
base-url="Zones"

47
src/pages/Zone/Card/ZoneCreateWarehouse.vue Normal file
View File

@ -0,0 +1,47 @@
<script setup>
import { reactive, ref } from 'vue';
import { useI18n } from 'vue-i18n';
import VnSelect from 'src/components/common/VnSelect.vue';
import FetchData from 'components/FetchData.vue';
import VnRow from 'components/ui/VnRow.vue';
import FormPopup from 'components/FormPopup.vue';
const emit = defineEmits(['onSubmitCreateWarehouse']);
const { t } = useI18n();
const ZoneWarehouseFormData = reactive({
warehouseFk: null,
});
const warehousesOptions = ref([]);
</script>
<template>
<FetchData
url="Warehouses"
:filter="{ order: 'name' }"
auto-load
@on-fetch="(data) => (warehousesOptions = data)"
/>
<FormPopup
model="ZoneWarehouse"
@on-submit="emit('onSubmitCreateWarehouse', ZoneWarehouseFormData)"
>
<template #form-inputs>
<VnRow class="row q-gutter-md q-mb-md">
<div class="col">
<VnSelect
:label="t('warehouses.warehouse')"
v-model="ZoneWarehouseFormData.warehouseFk"
:options="warehousesOptions"
option-value="id"
option-label="name"
hide-selected
:required="true"
/>
</div>
</VnRow>
</template>
</FormPopup>
</template>

10
src/pages/Zone/Card/ZoneDescriptorMenuItems.vue
View File

@ -74,20 +74,20 @@ function openConfirmDialog(callback) {
<QItemSection avatar>
<QIcon name="delete" />
</QItemSection>
<QItemSection>{{ t('deleteOrder') }}</QItemSection>
<QItemSection>{{ t('deleteZone') }}</QItemSection>
</QItem>
</template>
<i18n>
en:
deleteOrder: Delete order
deleteZone: Delete zone
confirmDeletion: Confirm deletion
confirmDeletionMessage: Are you sure you want to delete this order?
confirmDeletionMessage: Are you sure you want to delete this zone?
es:
To clone zone: Clonar zone
deleteOrder: Eliminar pedido
deleteZone: Eliminar zona
confirmDeletion: Confirmar eliminación
confirmDeletionMessage: Seguro que quieres eliminar este pedido?
confirmDeletionMessage: Seguro que quieres eliminar este zona?
</i18n>

128
src/pages/Zone/Card/ZoneWarehouses.vue
View File

@ -1,53 +1,119 @@
<script setup>
import { useRoute } from 'vue-router';
import { computed, ref, watch } from 'vue';
import { useI18n } from 'vue-i18n';
import VnPaginate from 'components/ui/VnPaginate.vue';
import CardList from 'components/CardList.vue';
import VnLv from 'components/ui/VnLv.vue';
import ZoneCreateWarehouse from './ZoneCreateWarehouse.vue';
import { useVnConfirm } from 'composables/useVnConfirm';
import { useArrayData } from 'composables/useArrayData';
import axios from 'axios';
const { t } = useI18n();
const route = useRoute();
const { openConfirmationModal } = useVnConfirm();
const deleteWarehouse = () => {
return true;
const paginateRef = ref(null);
const createWarehouseDialogRef = ref(null);
const arrayData = useArrayData('ZoneWarehouses');
const store = arrayData.store;
const data = computed(() => store.data);
const urlPath = computed(() => `Zones/${route.params.id}/warehouses`);
const columns = computed(() => [
{
name: 'name',
},
{
name: 'action',
},
]);
const deleteWarehouse = async (row) => {
try {
await axios.delete(`${urlPath.value}/${row.id}`);
fetchWarehouses();
} catch (error) {
console.error(error);
}
};
const createZoneWarehouse = async (ZoneWarehouseFormData) => {
try {
await axios.post(urlPath.value, ZoneWarehouseFormData);
fetchWarehouses();
} catch (error) {
console.error(error);
}
};
watch(
() => route.params.id,
() => {
store.url = urlPath.value;
store.filter.include = 'warehouse';
fetchWarehouses();
}
);
const fetchWarehouses = () => paginateRef.value.fetch();
const openCreateWarehouseForm = () => createWarehouseDialogRef.value.show();
</script>
<template>
<QPage class="column items-center q-pa-md">
<div class="vn-card-list">
<div class="full-width" style="max-width: 400px">
<VnPaginate
ref="paginateRef"
data-key="ZoneWarehouses"
:url="`Zones/${route.params.id}/warehouses`"
:filter="{ include: 'warehouse' }"
:url="urlPath"
auto-load
>
<template #body="{ rows }">
<CardList
v-for="row of rows"
:key="row.id"
:title="row.name"
:id="row.id"
>
<template #list-items>
<VnLv :value="row.name" />
<QIcon
name="delete"
size="sm"
class="cursor-pointer"
color="primary"
@click="deleteWarehouse()"
>
<QTooltip>
{{ t('Remove row') }}
</QTooltip>
</QIcon>
<QTable :rows="data" :columns="columns" hide-header>
<template #body="{ row, rowIndex }">
<QTr>
<QTd>
<span>{{ row.warehouse?.name }}</span>
</QTd>
<QTd style="width: 50px !important">
<QIcon
name="delete"
size="sm"
class="cursor-pointer"
color="primary"
@click="
openConfirmationModal(
t('warehouses.deleteTitle'),
t('warehouses.deleteSubtitle'),
() => deleteWarehouse(row, rows, rowIndex)
)
"
>
<QTooltip>
{{ t('warehouses.delete') }}
</QTooltip>
</QIcon>
</QTd>
</QTr>
</template>
</CardList>
</QTable>
</template>
</VnPaginate>
</div>
<QDialog ref="createWarehouseDialogRef">
<ZoneCreateWarehouse @on-submit-create-warehouse="createZoneWarehouse" />
</QDialog>
<QPageSticky position="bottom-right" :offset="[18, 18]">
<QBtn fab icon="add" color="primary" @click="openCreateWarehouseForm()">
<QTooltip>{{ t('warehouses.add') }}</QTooltip>
</QBtn>
</QPageSticky>
</QPage>
</template>
<i18n>
es:
Remove row: Eliminar fila
</i18n>

8
src/pages/Zone/locale/en.yml
View File

@ -3,8 +3,10 @@ zone:
zones: Zone
zonesList: Zones
zoneCreate: Create zone
locations: Locations
deliveryDays: Delivery days
upcomingList: Upcoming deliveries
warehouses: Warehouses
list:
clone: Clone
id: Id
@ -56,3 +58,9 @@ zoneClosingTable:
price: Price
preview: Preview
zones: Zones
warehouses:
delete: Delete
deleteTitle: This item will be deleted
deleteSubtitle: Are you sure you want to continue?
warehouse: Warehouse
add: Add

8
src/pages/Zone/locale/es.yml
View File

@ -3,8 +3,10 @@ zone:
zones: Zonas
zonesList: Zonas
zoneCreate: Nueva zona
locations: Localizaciones
deliveryDays: Días de entrega
upcomingList: Próximos repartos
warehouses: Almacenes
list:
clone: Clonar
id: Id
@ -58,3 +60,9 @@ zoneClosingTable:
zones: Zonas
Search zones: Buscar zonas
You can search by zone reference: Puedes buscar por referencia de la zona
warehouses:
delete: Eliminar
deleteTitle: Este elemento será eliminado
deleteSubtitle: ¿Seguro que quieres continuar?
warehouse: Almacén
add: Añadir

107
src/router/modules/zone.js
View File

@ -12,7 +12,7 @@ export default {
redirect: { name: 'ZoneMain' },
menus: {
main: ['ZoneList', 'ZoneDeliveryDays', 'ZoneUpcomingList'],
card: ['ZoneBasicData', 'ZoneHistory', 'ZoneLocations'],
card: ['ZoneBasicData', 'ZoneWarehouses', 'ZoneHistory', 'ZoneLocations'],
},
children: [
{
@ -57,15 +57,6 @@ export default {
},
component: () => import('src/pages/Zone/ZoneCreate.vue'),
},
// {
// path: 'counter',
// name: 'ZoneCounter',
// meta: {
// title: 'zoneCounter',
// icon: 'add_circle',
// },
// component: () => import('src/pages/Zone/ZoneCounter.vue'),
// },
],
},
{
@ -83,6 +74,15 @@ export default {
},
component: () => import('src/pages/Zone/Card/ZoneSummary.vue'),
},
{
name: 'ZoneBasicData',
path: 'basic-data',
meta: {
title: 'basicData',
icon: 'vn:settings',
},
component: () => import('src/pages/Zone/Card/ZoneBasicData.vue'),
},
{
name: 'ZoneLocations',
path: 'location',
@ -93,13 +93,13 @@ export default {
component: () => import('src/pages/Zone/Card/ZoneLocations.vue'),
},
{
name: 'ZoneBasicData',
path: 'basic-data',
name: 'ZoneWarehouses',
path: 'warehouses',
meta: {
title: 'basicData',
icon: 'vn:settings',
title: 'warehouses',
icon: 'home',
},
component: () => import('src/pages/Zone/Card/ZoneBasicData.vue'),
component: () => import('src/pages/Zone/Card/ZoneWarehouses.vue'),
},
{
name: 'ZoneHistory',
@ -110,83 +110,6 @@ export default {
},
component: () => import('src/pages/Zone/Card/ZoneLog.vue'),
},
// {
// path: '/zone/delivery',
// name: 'ZoneDeliveryMain',
// component: () => import('src/pages/Zone/ZoneMain.vue'),
// redirect: { name: 'ZoneDeliveryList' },
// children: [
// {
// path: 'list',
// name: 'ZoneDeliveryList',
// meta: {
// title: 'deliveryList',
// icon: 'today',
// },
// component: () =>
// import('src/pages/Zone/Delivery/ZoneDeliveryList.vue'),
// },
// {
// path: 'create',
// name: 'ZoneDeliveryCreate',
// meta: {
// title: 'deliveryCreate',
// icon: 'create',
// },
// component: () =>
// import('src/pages/Zone/Delivery/ZoneDeliveryCreate.vue'),
// },
// {
// path: ':id/edit',
// name: 'ZoneDeliveryEdit',
// meta: {
// title: 'deliveryEdit',
// icon: 'edit',
// },
// component: () =>
// import('src/pages/Zone/Delivery/ZoneDeliveryCreate.vue'),
// },
// ],
// },
// {
// path: '/zone/upcoming',
// name: 'ZoneUpcomingMain',
// component: () => import('src/pages/Zone/ZoneMain.vue'),
// redirect: { name: 'ZoneUpcomingList' },
// children: [
// {
// path: 'list',
// name: 'ZoneUpcomingList',
// meta: {
// title: 'upcomingList',
// icon: 'today',
// },
// component: () =>
// import('src/pages/Zone/Upcoming/ZoneUpcomingList.vue'),
// },
// {
// path: 'create',
// name: 'ZoneUpcomingCreate',
// meta: {
// title: 'upcomingCreate',
// icon: 'create',
// },
// component: () =>
// import('src/pages/Zone/Upcoming/ZoneUpcomingCreate.vue'),
// },
// {
// path: ':id/edit',
// name: 'ZoneUpcomingEdit',
// meta: {
// title: 'upcomingEdit',
// icon: 'edit',
// },
// component: () =>
// import('src/pages/Zone/Upcoming/ZoneUpcomingCreate.vue'),
// },
// ],
// },
],
},
],

24
test/cypress/integration/worker/workerPda.spec.js Normal file
View File

@ -0,0 +1,24 @@
describe('WorkerPda', () => {
const deviceProductionField =
'.vn-row > .q-field > .q-field__inner > .q-field__control > .q-field__control-container';
beforeEach(() => {
cy.viewport(1920, 1080);
cy.login('developer');
cy.visit(`/#/worker/1110/pda`);
});
it('assign pda', () => {
cy.get('.q-page-sticky > div > .q-btn > .q-btn__content > .q-icon').click();
cy.get(deviceProductionField).type('{downArrow}{enter}');
cy.get('.vn-row > #simSerialNumber').type('123{enter}');
cy.get('.q-notification__message').should('have.text', 'Data created');
});
it('delete pda', () => {
cy.get('.q-card > .q-item > .q-item__section--side > .q-icon').click();
cy.get(
'.q-card__actions > .q-btn--unelevated > .q-btn__content > .block'
).click();
cy.get('.q-notification__message').should('have.text', 'PDA deallocated');
});
});