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

Merge branch 'dev' into 7187-refactorWokerPda

This commit is contained in:
Pablo Natek 2024-05-20 23:06:07 +00:00
parent 45f56078d7 936f921864
commit e32e922c45
22 changed files with 1167 additions and 197 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/components/common/VnInput.vue
View File

@ -37,14 +37,6 @@ const styleAttrs = computed(() => {
: {};
});
const onEnterPress = () => {
emit('keyup.enter');
};
const handleValue = (val = null) => {
value.value = val;
};
const focus = () => {
vnInputRef.value.focus();
};
@ -73,7 +65,7 @@ const inputRules = [
v-bind="{ ...$attrs, ...styleAttrs }"
:type="$attrs.type"
:class="{ required: $attrs.required }"
@keyup.enter="onEnterPress()"
@keyup.enter="emit('keyup.enter')"
:clearable="false"
:rules="inputRules"
:lazy-rules="true"
@ -83,13 +75,13 @@ const inputRules = [
<slot name="prepend" />
</template>
<template #append v-if="!!$attrs.disabled">
<slot name="append" v-if="$slots.append" />
<template #append>
<slot name="append" v-if="$slots.append && !$attrs.disabled" />
<QIcon
name="close"
size="xs"
v-if="hover && value"
@click="handleValue(null)"
v-if="$slots.append && hover && value && !$attrs.disabled"
@click="value = null"
></QIcon>
</template>
</QInput>

10
src/components/common/VnSelect.vue
View File

@ -22,6 +22,10 @@ const $props = defineProps({
type: String,
default: '',
},
optionFilter: {
type: String,
default: null,
},
url: {
type: String,
default: '',
@ -59,7 +63,7 @@ const $props = defineProps({
const { t } = useI18n();
const requiredFieldRule = (val) => val ?? t('globals.fieldRequired');
const { optionLabel, optionValue, options, modelValue } = toRefs($props);
const { optionLabel, optionValue, optionFilter, options, modelValue } = toRefs($props);
const myOptions = ref([]);
const myOptionsOriginal = ref([]);
const vnSelectRef = ref();
@ -109,9 +113,9 @@ async function fetchFilter(val) {
const { fields, sortBy, limit } = $props;
let key = optionLabel.value;
if (new RegExp(/\d/g).test(val)) key = optionValue.value;
if (new RegExp(/\d/g).test(val)) key = optionFilter.value ?? optionValue.value;
const where = { [key]: { like: `%${val}%` } };
const where = { ...{ [key]: { like: `%${val}%` } }, ...$props.where };
return dataRef.value.fetch({ fields, where, order: sortBy, limit });
}

2
src/components/ui/QCalendarMonthWrapper.vue
View File

@ -108,7 +108,7 @@ const containerClasses = computed(() => {
font-size: 13px;
&:hover {
background-color: var(--vn-accent-color);
background-color: var(--vn-label-color);
cursor: pointer;
}
}

3
src/composables/useArrayData.js
View File

@ -130,7 +130,8 @@ export function useArrayData(key, userOptions) {
store.filter = {};
if (params) store.userParams = Object.assign({}, params);
await fetch({ append: false });
const response = await fetch({ append: false });
return response;
}
async function addFilter({ filter, params }) {

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

@ -830,6 +830,7 @@ worker:
calendar: Calendar
timeControl: Time control
locker: Locker
list:
name: Name
email: Email
@ -861,6 +862,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

35
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 () => {
const removeDepartment = async () => {
try {
await axios.post(
`/Departments/${entityId.value}/removeChild`,
entityId.value
);
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>

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>
<fetched-tags
</div>
<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>

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" />

2
src/pages/Worker/WorkerCreate.vue
View File

@ -56,7 +56,7 @@ const onBankEntityCreated = (data) => {
};
function handleLocation(data, location) {
const { town, postcode: code, provinceFk, countryFk } = location ?? {};
const { town, code, provinceFk, countryFk } = location ?? {};
data.postcode = code;
data.city = town;
data.provinceFk = provinceFk;

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>

110
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" />
<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="deleteWarehouse()"
@click="
openConfirmationModal(
t('warehouses.deleteTitle'),
t('warehouses.deleteSubtitle'),
() => deleteWarehouse(row, rows, rowIndex)
)
"
>
<QTooltip>
{{ t('Remove row') }}
{{ 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>

112
src/pages/Zone/ZoneClosingTable.vue Normal file
View File

@ -0,0 +1,112 @@
<script setup>
import { useI18n } from 'vue-i18n';
import { useRouter } from 'vue-router';
import { computed } from 'vue';
import { toCurrency } from 'src/filters';
import ZoneSummary from 'src/pages/Zone/Card/ZoneSummary.vue';
import { useSummaryDialog } from 'src/composables/useSummaryDialog';
import { toTimeFormat } from 'filters/date.js';
const { t } = useI18n();
const router = useRouter();
const { viewSummary } = useSummaryDialog();
defineProps({
rows: {
type: Array,
required: true,
default: () => [],
},
});
const columns = computed(() => [
{
label: t('zoneClosingTable.id'),
name: 'id',
field: 'id',
sortable: true,
align: 'left',
},
{
label: t('zoneClosingTable.name'),
name: 'name',
field: 'name',
sortable: true,
align: 'left',
},
{
label: t('zoneClosingTable.agency'),
name: 'agency',
field: 'agencyModeName',
sortable: true,
align: 'left',
},
{
label: t('zoneClosingTable.closing'),
name: 'close',
field: 'hour',
sortable: true,
align: 'left',
format: (val) => toTimeFormat(val),
},
{
label: t('zoneClosingTable.price'),
name: 'price',
field: 'price',
sortable: true,
align: 'left',
format: (val) => toCurrency(val),
},
{
name: 'actions',
align: 'left',
},
]);
const redirectToZoneSummary = (id) => {
router.push({ name: 'ZoneSummary', params: { id } });
};
</script>
<template>
<div>
<div class="header">
<span>{{ t('zoneClosingTable.zones') }}</span>
</div>
<QTable
:rows="rows"
:columns="columns"
@row-click="(_, row) => redirectToZoneSummary(row.id)"
style="max-height: 400px"
>
<template #body-cell-actions="props">
<QTd :props="props">
<div class="table-actions">
<QIcon
name="preview"
size="sm"
color="primary"
@click.stop="viewSummary(props.row.id, ZoneSummary)"
>
<QTooltip>{{ t('zoneClosingTable.preview') }}</QTooltip>
</QIcon>
</div>
</QTd>
</template>
</QTable>
</div>
</template>
<style scoped lang="scss">
.header {
width: 100%;
height: 34px;
display: flex;
justify-content: center;
align-items: center;
font-weight: bold;
background-color: $primary;
}
</style>

192
src/pages/Zone/ZoneDeliveryCalendar.vue Normal file
View File

@ -0,0 +1,192 @@
<script setup>
import { ref, computed } from 'vue';
import { useI18n } from 'vue-i18n';
import { date } from 'quasar';
import ZoneClosingTable from './ZoneClosingTable.vue';
import QCalendarMonthWrapper from 'src/components/ui/QCalendarMonthWrapper.vue';
import { QCalendarMonth } from '@quasar/quasar-ui-qcalendar/src/index.js';
import '@quasar/quasar-ui-qcalendar/src/QCalendarVariables.sass';
import { useWeekdayStore } from 'src/stores/useWeekdayStore';
import axios from 'axios';
const props = defineProps({
year: {
type: Number,
required: true,
},
month: {
type: Number,
required: true,
},
monthDate: {
type: Object,
default: null,
},
geoExclusions: {
type: Object,
default: () => {},
},
exclusions: {
type: Object,
default: () => {},
},
daysMap: {
type: Object,
default: null,
},
});
const { locale } = useI18n();
const calendarRef = ref(null);
const weekdayStore = useWeekdayStore();
const showZoneClosingTable = ref(false);
const zoneClosingData = ref(null);
const today = ref(date.formatDate(Date.vnNew(), 'YYYY-MM-DD'));
const todayTimestamp = computed(() => {
const date = Date.vnNew();
date.setHours(0, 0, 0, 0);
return date.getTime();
});
const _monthDate = computed(() => date.formatDate(props.monthDate, 'YYYY-MM-DD'));
const onEventSelection = async ({ year, month, day }) => {
const date = new Date(year, month - 1, day);
const stamp = date.getTime();
const events = props.daysMap[stamp];
if (!events) return;
const zoneIds = [];
for (let event of events) zoneIds.push(event.zoneFk);
const params = {
zoneIds: zoneIds,
date: date,
};
const { data } = await axios.post('Zones/getZoneClosing', params);
zoneClosingData.value = data;
showZoneClosingTable.value = true;
};
const getEventByTimestamp = ({ year, month, day }) => {
const stamp = new Date(year, month - 1, day).getTime();
return (
props.daysMap[stamp] ||
props.exclusions[stamp] ||
props.geoExclusions[stamp] ||
null
);
};
const getEventAttrs = ({ year, month, day }) => {
const stamp = new Date(year, month - 1, day).getTime();
let colorClass = '--event';
if (props.geoExclusions[stamp]) colorClass = '--geoExcluded';
else if (props.exclusions[stamp]) colorClass = '--excluded';
const attrs = {
class: colorClass,
label: day,
};
return attrs;
};
const isToday = (timestamp) => {
const { year, month, day } = timestamp;
return todayTimestamp.value === new Date(year, month - 1, day).getTime();
};
const calendarHeaderTitle = computed(() => {
return `${weekdayStore.getLocaleMonths[props.month - 1].locale} ${props.year}`;
});
</script>
<template>
<QCalendarMonthWrapper
style="height: 290px; width: 290px"
transparent-background
view-customization="workerCalendar"
>
<template #header>
<span class="full-width text-center text-body1 q-py-sm">{{
calendarHeaderTitle
}}</span>
</template>
<template #calendar>
<QCalendarMonth
ref="calendarRef"
:model-value="_monthDate"
show-work-weeks
no-outside-days
no-active-date
:weekdays="[1, 2, 3, 4, 5, 6, 0]"
short-weekday-label
:locale="locale"
:now="today"
mini-mode
>
<template #day="{ scope: { timestamp } }">
<!-- Este slot representa cada día del calendario y muestra un botón representando el correspondiente evento -->
<QBtn
v-if="getEventByTimestamp(timestamp)"
v-bind="{ ...getEventAttrs(timestamp) }"
@click="onEventSelection(timestamp)"
rounded
dense
flat
class="calendar-event"
:class="{
'--today': isToday(timestamp),
}"
>
<QPopupProxy>
<ZoneClosingTable
v-if="zoneClosingData && zoneClosingData.length"
:rows="zoneClosingData"
/>
</QPopupProxy>
</QBtn>
</template>
</QCalendarMonth>
</template>
</QCalendarMonthWrapper>
</template>
<style lang="scss">
.calendar-event {
display: flex;
justify-content: center;
width: 32px;
height: 32px;
font-size: 13px;
line-height: 1.715em;
cursor: pointer;
color: white;
&.--today {
border: 2px solid $info;
}
&.--event {
background-color: $positive;
color: black;
}
&.--excluded {
background-color: $negative;
}
&.--geoExcluded {
background-color: $primary;
}
&:hover {
opacity: 0.8;
}
}
</style>

258
src/pages/Zone/ZoneDeliveryDays.vue
View File

@ -1 +1,257 @@
<template>Zone Delivery days</template>
<script setup>
import { computed, onMounted, ref, watch, onUnmounted } from 'vue';
import { useI18n } from 'vue-i18n';
import ZoneDeliveryPanel from './ZoneDeliveryPanel.vue';
import ZoneDeliveryCalendar from './ZoneDeliveryCalendar.vue';
import { useStateStore } from 'stores/useStateStore';
import { useWeekdayStore } from 'src/stores/useWeekdayStore';
import { useArrayData } from 'src/composables/useArrayData';
const { t } = useI18n();
const stateStore = useStateStore();
const weekdayStore = useWeekdayStore();
const nMonths = ref(4);
const _date = ref(Date.vnNew());
const _data = ref(null);
const firstDay = ref(null);
const lastDay = ref(null);
const months = ref([]);
const days = ref({});
const exclusions = ref({});
const geoExclusions = ref({});
const events = ref([]);
const arrayData = useArrayData('ZoneDeliveryDays', {
url: 'Zones/getEvents',
});
const { store } = arrayData;
const refreshEvents = () => {
days.value = {};
if (!data.value) return;
let day = new Date(firstDay.value.getTime());
while (day <= lastDay.value) {
let stamp = day.getTime();
let wday = day.getDay();
let dayEvents = [];
let _exclusions = exclusions.value[stamp] || [];
if (events.value) {
for (let event of events.value) {
let match;
switch (event.type) {
case 'day':
match = event.dated == stamp;
break;
default:
match =
event.wdays[wday] &&
(!event.started || stamp >= event.started) &&
(!event.ended || stamp <= event.ended);
break;
}
if (match && !_exclusions.find((e) => e.zoneFk == event.zoneFk)) {
dayEvents.push(event);
}
}
}
if (dayEvents.length) days.value[stamp] = dayEvents;
day.setDate(day.getDate() + 1);
}
};
const date = computed({
get: () => _date.value,
set: (value) => {
_date.value = value;
let stamp = value.getTime();
firstDay.value = new Date(stamp);
firstDay.value.setDate(1);
lastDay.value = new Date(stamp);
lastDay.value.setMonth(lastDay.value.getMonth() + nMonths.value);
lastDay.value.setDate(0);
months.value = [];
for (let i = 0; i < nMonths.value; i++) {
let monthDate = new Date(stamp);
monthDate.setMonth(value.getMonth() + i);
months.value.push(monthDate);
}
refreshEvents();
},
});
const data = computed({
get: () => {
return _data.value;
},
set: (value) => {
_data.value = value;
value = value || {};
events.value = value.events;
function toStamp(date) {
return date && new Date(date).setHours(0, 0, 0, 0);
}
exclusions.value = {};
let _exclusions = value.exclusions;
if (_exclusions) {
for (let exclusion of _exclusions) {
let stamp = toStamp(exclusion.dated);
if (!exclusions[stamp]) exclusions.value[stamp] = [];
exclusions.value[stamp].push(exclusion);
}
}
geoExclusions.value = {};
let _geoExclusions = value.geoExclusions;
if (_geoExclusions) {
for (let geoExclusion of _geoExclusions) {
let stamp = toStamp(geoExclusion.dated);
if (!geoExclusions[stamp]) geoExclusions.value[stamp] = [];
geoExclusions.value[stamp].push(geoExclusion);
}
}
let _events = value.events;
if (_events) {
for (let event of _events) {
event.dated = toStamp(event.dated);
event.ended = toStamp(event.ended);
event.started = toStamp(event.started);
event.wdays = weekdayStore.fromSet(event.weekDays || '');
}
}
refreshEvents();
},
});
watch(
() => store.data,
(value) => {
data.value = value;
},
{ immediate: true }
);
const getMonthNameAndYear = (date) => {
const monthName = weekdayStore.getLocaleMonths[date.getMonth()].locale;
const year = date.getFullYear();
return `${monthName} ${year}`;
};
const headerTitle = computed(() => {
if (!months.value?.length) return;
const firstMonth = getMonthNameAndYear(months.value[0]);
const lastMonth = getMonthNameAndYear(months.value[months.value.length - 1]);
return `${firstMonth} - ${lastMonth}`;
});
const step = (direction) => {
const _date = new Date(date.value);
_date.setMonth(_date.getMonth() + nMonths.value * direction);
date.value = _date;
};
onMounted(async () => {
stateStore.rightDrawer = true;
let initialDate = Date.vnNew();
initialDate.setDate(1);
initialDate.setHours(0, 0, 0, 0);
date.value = initialDate;
weekdayStore.initStore();
});
onUnmounted(() => arrayData.destroy());
</script>
<template>
<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">
<ZoneDeliveryPanel />
</QScrollArea>
</QDrawer>
<QPage class="q-pa-md flex justify-center">
<QCard style="height: max-content">
<div class="calendars-header">
<QBtn
icon="arrow_left"
size="sm"
flat
class="full-height"
@click="step(-1)"
/>
<span>{{ headerTitle }}</span>
<QBtn
icon="arrow_right"
size="sm"
flat
class="full-height"
@click="step(1)"
/>
</div>
<div class="calendars-container">
<ZoneDeliveryCalendar
v-for="(month, index) in months"
:key="index"
:month="month.getMonth() + 1"
:year="month.getFullYear()"
:month-date="month"
:geo-exclusions="geoExclusions"
:exclusions="exclusions"
:days-map="days"
/>
</div>
</QCard>
</QPage>
</template>
<style lang="scss" scoped>
.calendars-header {
height: 45px;
display: flex;
justify-content: space-between;
align-items: center;
background-color: $primary;
font-weight: bold;
font-size: 16px;
}
.calendars-container {
max-width: 800px;
display: flex;
flex-wrap: wrap;
justify-content: space-evenly;
}
</style>

149
src/pages/Zone/ZoneDeliveryPanel.vue Normal file
View File

@ -0,0 +1,149 @@
<script setup>
import { onMounted, ref, reactive } from 'vue';
import { useI18n } from 'vue-i18n';
import FetchData from 'components/FetchData.vue';
import VnSelect from 'src/components/common/VnSelect.vue';
import { useArrayData } from 'src/composables/useArrayData';
import axios from 'axios';
import useNotify from 'src/composables/useNotify.js';
import { watch } from 'vue';
const { t } = useI18n();
const { notify } = useNotify();
const deliveryMethodFk = ref(null);
const deliveryMethods = ref([]);
const formData = reactive({});
const arrayData = useArrayData('ZoneDeliveryDays', {
url: 'Zones/getEvents',
});
const fetchDeliveryMethods = async (filter) => {
try {
const params = { filter: JSON.stringify(filter) };
const { data } = await axios.get('DeliveryMethods', { params });
return data.map((deliveryMethod) => deliveryMethod.id);
} catch (err) {
console.error('Error fetching delivery methods: ', err);
}
};
watch(
() => deliveryMethodFk.value,
async (val) => {
let filter;
if (val === 'pickUp') filter = { where: { code: 'PICKUP' } };
else filter = { where: { code: { inq: ['DELIVERY', 'AGENCY'] } } };
deliveryMethods.value = await fetchDeliveryMethods(filter);
},
{ immediate: true }
);
const fetchData = async (params) => {
try {
const { data } = params
? await arrayData.applyFilter({
params,
})
: await arrayData.fetch({ append: false });
if (!data.events || !data.events.length)
notify(t('deliveryPanel.noEventsWarning'), 'warning');
} catch (err) {
console.error('Error fetching events: ', err);
}
};
const onSubmit = async () => {
const params = { deliveryMethodFk: deliveryMethodFk.value, ...formData };
await fetchData(params);
};
onMounted(async () => {
deliveryMethodFk.value = 'delivery';
formData.geoFk = arrayData.store?.userParams?.geoFk;
formData.agencyModeFk = arrayData.store?.userParams?.agencyModeFk;
if (formData.geoFk || formData.agencyModeFk) await fetchData();
});
</script>
<template>
<QForm @submit="onSubmit()" class="q-pa-md">
<div class="column q-gutter-y-sm">
<QRadio
v-model="deliveryMethodFk"
dense
val="pickUp"
:label="t('deliveryPanel.pickup')"
/>
<QRadio
v-model="deliveryMethodFk"
dense
val="delivery"
:label="t('deliveryPanel.delivery')"
class="q-mb-sm"
/>
<VnSelect
v-if="deliveryMethodFk === 'delivery'"
:label="t('deliveryPanel.postcode')"
v-model="formData.geoFk"
url="Postcodes/location"
:fields="['geoFk', 'code', 'townFk']"
sort-by="code, townFk"
option-value="geoFk"
option-label="code"
option-filter="code"
hide-selected
dense
outlined
rounded
>
<template #option="{ itemProps, opt }">
<QItem v-bind="itemProps">
<QItemSection v-if="opt.code">
<QItemLabel>{{ opt.code }}</QItemLabel>
<QItemLabel caption
>{{ opt.town?.province?.name }},
{{ opt.town?.province?.country?.country }}</QItemLabel
>
</QItemSection>
</QItem>
</template>
</VnSelect>
<VnSelect
:label="
t(
deliveryMethodFk === 'delivery'
? 'deliveryPanel.agency'
: 'deliveryPanel.warehouse'
)
"
v-model="formData.agencyModeFk"
url="AgencyModes/isActive"
:fields="['id', 'name']"
:where="{
deliveryMethodFk: { inq: deliveryMethods },
}"
sort-by="name ASC"
option-value="id"
option-label="name"
hide-selected
dense
outlined
rounded
/>
</div>
<QBtn
:label="t('deliveryPanel.query')"
type="submit"
color="primary"
class="q-mt-md full-width"
unelevated
rounded
dense
/>
</QForm>
</template>

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

@ -3,8 +3,10 @@ zone:
zones: Zone
zonesList: Zones
zoneCreate: Create zone
deliveryList: Delivery days
locations: Locations
deliveryDays: Delivery days
upcomingList: Upcoming deliveries
warehouses: Warehouses
list:
clone: Clone
id: Id
@ -40,3 +42,25 @@ summary:
filterPanel:
name: Name
agencyModeFk: Agency
deliveryPanel:
pickup: Pick up
delivery: Delivery
postcode: Postcode
agency: Agency
warehouse: Warehouse
query: Query
noEventsWarning: No service for the specified zone
zoneClosingTable:
id: Id
name: Name
agency: Agency
closing: Closing
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

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

@ -3,8 +3,10 @@ zone:
zones: Zonas
zonesList: Zonas
zoneCreate: Nueva zona
deliveryList: Días de entrega
locations: Localizaciones
deliveryDays: Días de entrega
upcomingList: Próximos repartos
warehouses: Almacenes
list:
clone: Clonar
id: Id
@ -40,3 +42,27 @@ summary:
filterPanel:
name: Nombre
agencyModeFk: Agencia
deliveryPanel:
pickup: Recogida
delivery: Entrega
postcode: Código postal
agency: Agencia
warehouse: Almacén
query: Consultar
noEventsWarning: No hay servicio para la zona especificada
zoneClosingTable:
id: Id
name: Nombre
agency: Agencia
closing: Cierre
preview: Vista previa
price: Precio
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

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

@ -11,8 +11,8 @@ export default {
component: RouterView,
redirect: { name: 'ZoneMain' },
menus: {
main: ['ZoneList', 'ZoneDeliveryList', 'ZoneUpcomingList'],
card: ['ZoneBasicData', 'ZoneHistory', 'ZoneLocations'],
main: ['ZoneList', 'ZoneDeliveryDays', 'ZoneUpcomingList'],
card: ['ZoneBasicData', 'ZoneWarehouses', 'ZoneHistory', 'ZoneLocations'],
},
children: [
{
@ -30,6 +30,15 @@ export default {
},
component: () => import('src/pages/Zone/ZoneList.vue'),
},
{
path: 'delivery-days',
name: 'ZoneDeliveryDays',
meta: {
title: 'deliveryDays',
icon: 'vn:calendar',
},
component: () => import('src/pages/Zone/ZoneDeliveryDays.vue'),
},
{
path: 'create',
name: 'ZoneCreate',
@ -48,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'),
// },
],
},
{
@ -74,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',
@ -84,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',
@ -101,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'),
// },
// ],
// },
],
},
],

22
src/stores/useWeekdayStore.js
View File

@ -85,6 +85,27 @@ export const useWeekdayStore = defineStore('weekdayStore', () => {
return locales;
});
/**
* Transforms weekday set into an array whose indexes are weekday index
* with selected days set to %true.
*
* @param {String} weekDays Weekday codes separated by commas
* @return {Array<Boolean>} Array with selected days set to %true
*/
const fromSet = (_weekDays) => {
let wdays = [];
if (_weekDays) {
let codes = _weekDays.split(',');
for (let code of codes) {
let data = weekdaysMap[code];
if (data) wdays[data.index] = true;
}
}
return wdays;
};
return {
initStore,
weekdaysMap,
@ -93,5 +114,6 @@ export const useWeekdayStore = defineStore('weekdayStore', () => {
weekdays,
monthCodes,
getLocaleMonths,
fromSet,
};
});