0
0
Fork 0

Merge branch 'dev' into 6425-fixDevTranslations

This commit is contained in:
Alex Moreno 2024-04-16 12:32:46 +00:00
commit 4f286cd032
25 changed files with 2263 additions and 1244 deletions

View File

@ -32,6 +32,7 @@
"@intlify/unplugin-vue-i18n": "^0.8.1",
"@pinia/testing": "^0.1.2",
"@quasar/app-vite": "^1.7.3",
"@quasar/quasar-app-extension-qcalendar": "4.0.0-beta.15",
"@quasar/quasar-app-extension-testing-unit-vitest": "^0.4.0",
"@vue/test-utils": "^2.4.4",
"autoprefixer": "^10.4.14",

View File

@ -49,6 +49,9 @@ devDependencies:
'@quasar/app-vite':
specifier: ^1.7.3
version: 1.7.3(eslint@8.56.0)(pinia@2.1.7)(quasar@2.14.5)(vue-router@4.2.5)(vue@3.4.19)
'@quasar/quasar-app-extension-qcalendar':
specifier: 4.0.0-beta.15
version: 4.0.0-beta.15
'@quasar/quasar-app-extension-testing-unit-vitest':
specifier: ^0.4.0
version: 0.4.0(@vue/test-utils@2.4.4)(quasar@2.14.5)(vite@5.1.4)(vitest@0.31.4)(vue@3.4.19)
@ -912,6 +915,13 @@ packages:
resolution: {integrity: sha512-SlOhwzXyPQHWgQIS2ncyDdYdksCJvUYNtgsDQqzAKEG3r3d/ejOxvThle79HTK3Q6HB+gQWFG21Ux00Osr5XSw==}
dev: false
/@quasar/quasar-app-extension-qcalendar@4.0.0-beta.15:
resolution: {integrity: sha512-i6hQkcP70LXLfVMPZMKQjSg3681gjZmASV3vq6ULzc0LhtBiPneLdVNNtH2itkWxAmaUj+1heQDI5Pa0F7VKLQ==}
engines: {node: '>= 10.0.0', npm: '>= 5.6.0', yarn: '>= 1.6.0'}
dependencies:
'@quasar/quasar-ui-qcalendar': 4.0.0-beta.19
dev: true
/@quasar/quasar-app-extension-testing-unit-vitest@0.4.0(@vue/test-utils@2.4.4)(quasar@2.14.5)(vite@5.1.4)(vitest@0.31.4)(vue@3.4.19):
resolution: {integrity: sha512-eyzdUdmZiCueNS+5nedjMmzdbpCetSrtdGIwW6KplW1dTzRbLiNvYUjpBOxQGmJCgEhWy9zuswJ7MZ/bTql24Q==}
engines: {node: '>= 12.22.1', npm: '>= 6.14.12', yarn: '>= 1.17.3'}
@ -939,6 +949,10 @@ packages:
- vite
dev: true
/@quasar/quasar-ui-qcalendar@4.0.0-beta.19:
resolution: {integrity: sha512-BT0G2JjgKl1bqNrY5utcYeoy8gK+U9k3Pz1YDi1OB265W/jHU6nFoWMEUdY3JdvMccwkXTL2DLVyl3eqAUyLyg==}
dev: true
/@quasar/render-ssr-error@1.0.3:
resolution: {integrity: sha512-A8RF99q6/sOSe1Ighnh5syEIbliD3qUYEJd2HyfFyBPSMF+WYGXon5dmzg4nUoK662NgOggInevkDyBDJcZugg==}
engines: {node: '>= 16'}

View File

@ -1,7 +1,6 @@
{
"@quasar/testing-unit-vitest": {
"options": [
"scripts"
]
}
}
"@quasar/testing-unit-vitest": {
"options": ["scripts"]
},
"@quasar/qcalendar": {}
}

View File

@ -47,7 +47,7 @@ const arrayData = useArrayData($props.dataKey || $props.module, {
skip: 0,
});
const { store } = arrayData;
const entity = computed(() => store.data);
const entity = computed(() =>Array.isArray( store.data) ? store.data[0] : store.data);
const isLoading = ref(false);
defineExpose({
@ -67,7 +67,7 @@ async function getData() {
try {
const { data } = await arrayData.fetch({ append: false, updateRouter: false });
state.set($props.dataKey, data);
emit('onFetch', data);
emit('onFetch', Array.isArray(data) ? data[0] : data);
} finally {
isLoading.value = false;
}

View File

@ -32,7 +32,7 @@ const arrayData = useArrayData(props.dataKey || route.meta.moduleName, {
skip: 0,
});
const { store } = arrayData;
const entity = computed(() => store.data);
const entity = computed(() => Array.isArray(store.data) ? store.data[0] : store.data);
const isLoading = ref(false);
defineExpose({

View File

@ -0,0 +1,66 @@
<script setup>
import { computed } from 'vue';
import { useQuasar } from 'quasar';
import '@quasar/quasar-ui-qcalendar/src/QCalendarVariables.sass';
const $props = defineProps({
bordered: {
type: Boolean,
default: false,
},
transparentBackground: {
type: Boolean,
default: false,
},
});
const $q = useQuasar();
const containerClasses = computed(() => {
const classes = ['main-container-background'];
if ($props.bordered) classes.push('--bordered');
if ($props.transparentBackground) classes.push('transparent-background');
else classes.push($q.dark.isActive ? '--dark' : '--light');
return classes;
});
</script>
<template>
<div :class="containerClasses">
<div class="nav-container row"><slot name="header" /></div>
<slot name="calendar" />
</div>
</template>
<style lang="scss">
.main-container-background {
--calendar-current-background-dark: transparent;
&.--dark {
background-color: var(--calendar-background-dark);
}
&.--light {
background-color: var(--calendar-background);
}
&.--bordered {
border: 1px solid black;
}
}
.transparent-background {
--calendar-background-dark: transparent;
--calendar-background: transparent;
--calendar-outside-background-dark: transparent;
}
.nav-container {
display: flex;
align-items: center;
&.--bordered {
border: 1px solid black;
}
}
</style>

View File

@ -1,5 +1,6 @@
// app global css in SCSS form
@import './icons.scss';
@import '@quasar/quasar-ui-qcalendar/src/QCalendarMonth.sass';
body.body--light {
--font-color: black;
@ -159,4 +160,15 @@ input::-webkit-inner-spin-button {
appearance: none;
-webkit-appearance: none;
-moz-appearance: none;
}
}
// Clases para modificar el color de fecha seleccionada en componente QCalendarMonth
.q-dark div .q-calendar-mini .q-calendar-month__day.q-selected .q-calendar__button {
background-color: $primary !important;
color: white !important;
}
.q-calendar-mini .q-calendar-month__day.q-selected .q-calendar__button {
background-color: $primary !important;
color: white !important;
}

View File

@ -127,13 +127,12 @@ dashboard:
customer:
pageTitles:
customers: Customers
create: Create
list: List
webPayments: Web Payments
extendedList: Extended list
notifications: Notifications
defaulter: Defaulter
createCustomer: Create customer
customerCreate: New customer
summary: Summary
basicData: Basic data
fiscalData: Fiscal data
@ -281,7 +280,7 @@ entry:
notes: Notes
dms: File management
log: Log
create: Create
entryCreate: New entry
latestBuys: Latest buys
list:
newEntry: New entry
@ -396,7 +395,7 @@ ticket:
pageTitles:
tickets: Tickets
list: List
createTicket: Create ticket
ticketCreate: New ticket
summary: Summary
basicData: Basic Data
boxing: Boxing
@ -472,7 +471,7 @@ claim:
pageTitles:
claims: Claims
list: List
createClaim: Create claim
claimCreate: New claim
summary: Summary
basicData: Basic Data
lines: Lines
@ -545,7 +544,7 @@ invoiceOut:
list: List
negativeBases: Negative Bases
globalInvoicing: Global invoicing
createInvoiceOut: Create invoice out
invoiceOutCreate: Create invoice out
summary: Summary
basicData: Basic Data
list:
@ -618,7 +617,7 @@ shelving:
pageTitles:
shelving: Shelving
shelvingList: Shelving List
create: Create
shelvingCreate: New shelving
summary: Summary
basicData: Basic Data
log: Logs
@ -651,7 +650,7 @@ invoiceIn:
pageTitles:
invoiceIns: Invoices In
list: List
createInvoiceIn: Create invoice in
invoiceInCreate: Create invoice in
summary: Summary
basicData: Basic data
vat: VAT
@ -712,7 +711,7 @@ order:
pageTitles:
order: Orders
orderList: List
create: Create
orderCreate: New order
summary: Summary
basicData: Basic Data
catalog: Catalog
@ -789,6 +788,7 @@ worker:
dms: My documentation
pbx: Private Branch Exchange
log: Log
calendar: Calendar
list:
name: Name
email: Email
@ -905,7 +905,7 @@ route:
routes: Routes
cmrsList: External CMRs list
RouteList: List
create: Create
routeCreate: New route
basicData: Basic Data
summary: Summary
RouteRoadmap: Roadmaps
@ -932,7 +932,7 @@ supplier:
suppliers: Suppliers
supplier: Supplier
list: List
create: Create
supplierCreate: New supplier
summary: Summary
basicData: Basic data
fiscalData: Fiscal data
@ -1038,7 +1038,6 @@ travel:
pageTitles:
travel: Travels
list: List
create: Create
summary: Summary
extraCommunity: Extra community
travelCreate: New travel
@ -1096,7 +1095,7 @@ item:
list: List
diary: Diary
tags: Tags
create: Create
itemCreate: New item
descriptor:
item: Item
buyer: Buyer
@ -1150,3 +1149,24 @@ components:
VnLv:
copyText: '{copyValue} has been copied to the clipboard'
iban_tooltip: 'IBAN: ES21 1234 5678 90 0123456789'
weekdays:
sun: Sunday
mon: Monday
tue: Tuesday
wed: Wednesday
thu: Thursday
fri: Friday
sat: Saturday
months:
jan: January
feb: February
mar: March
apr: April
may: May
jun: June
jul: July
aug: August
sep: September
oct: October
nov: November
dec: December

File diff suppressed because it is too large Load Diff

View File

@ -27,6 +27,7 @@ const workerFilter = {
},
{ relation: 'sip', scope: { fields: ['extension', 'secret'] } },
{ relation: 'department', scope: { include: { relation: 'department' } } },
{ relation: 'client', scope: {fields:['phone']} },
],
};
const workersFilter = {
@ -86,6 +87,7 @@ const maritalStatus = [
:label="t('Mobile extension')"
clearable
/>
<VnInput v-model="data.client.phone" :label="t('Personal phone')" clearable />
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
@ -157,6 +159,7 @@ es:
Last name: Apellidos
Business phone: Teléfono de empresa
Mobile extension: Extensión móvil
Personal phone: Teléfono personal
Boss: Jefe
Marital status: Estado civil
Married: Casado/a

View File

@ -0,0 +1,239 @@
<script setup>
import { ref, watch } from 'vue';
import { useI18n } from 'vue-i18n';
import { useRoute } from 'vue-router';
import WorkerCalendarFilter from 'pages/Worker/Card/WorkerCalendarFilter.vue';
import FetchData from 'components/FetchData.vue';
import WorkerCalendarItem from 'pages/Worker/Card/WorkerCalendarItem.vue';
import { useStateStore } from 'stores/useStateStore';
import axios from 'axios';
const stateStore = useStateStore();
const route = useRoute();
const { t } = useI18n();
const workerCalendarFilterRef = ref(null);
const workerCalendarRef = ref(null);
const absenceType = ref(null);
const hasWorkCenter = ref(false);
const isSubordinate = ref(false);
const businessFk = ref(null);
const year = ref(Date.vnNew().getFullYear());
const contractHolidays = ref(null);
const yearHolidays = ref(null);
const eventsMap = ref({});
const festiveEventsMap = ref({});
const onFetchActiveContract = (data) => {
if (!data) return;
businessFk.value = data?.businessFk;
hasWorkCenter.value = Boolean(data?.workCenterFk);
};
const addEvent = (day, newEvent, isFestive = false) => {
const timestamp = new Date(day).getTime();
let event = eventsMap.value[timestamp];
if (!event) {
eventsMap.value[timestamp] = newEvent;
if (isFestive)
festiveEventsMap.value[timestamp] = JSON.parse(JSON.stringify(newEvent));
} else {
const oldName = event.name;
const oldEventWasFestive = event.isFestive;
Object.assign(event, newEvent);
event.isFestive = oldEventWasFestive;
event.name = `${oldName}, ${event.name}`;
}
};
const onFetchAbsences = (data) => {
if (!data) return;
eventsMap.value = {};
if (data.holidays) {
data.holidays.forEach((holiday) => {
const holidayDetail = holiday?.detail?.name;
const holidayType = holiday?.type?.name;
const holidayName = holidayDetail || holidayType;
addEvent(
holiday.dated,
{
name: holidayName,
isFestive: true,
},
true
);
});
}
if (data.absences) {
data.absences.forEach((absence) => {
let type = absence.absenceType;
addEvent(absence.dated, {
name: type.name,
color: type.rgb,
type: type.code,
absenceId: absence.id,
isFestive: false,
});
});
}
};
const getAbsences = async () => {
try {
const params = {
workerFk: route.params.id,
businessFk: businessFk.value,
year: year.value,
};
const { data } = await axios.get('Calendars/absences', { params });
if (data) onFetchAbsences(data);
return data;
} catch (error) {
console.error('Error fetching absences:', error);
return null;
}
};
const getHolidays = async (params) => {
try {
const { data } = await axios.get(`Workers/${route.params.id}/holidays`, {
params,
});
return data;
} catch (error) {
console.error('Error fetching holidays:', error);
return null;
}
};
const updateContractHolidays = async () => {
contractHolidays.value = await getHolidays({
businessFk: businessFk.value,
year: year.value,
});
};
const updateYearHolidays = async () => {
yearHolidays.value = await getHolidays({ year: year.value });
};
const refreshData = () => {
updateYearHolidays();
updateContractHolidays();
getAbsences();
};
const onDeletedEvent = (timestamp) => {
delete eventsMap.value[timestamp];
// Si el evento que eliminamos se encontraba dentro de un dia festivo, volvemos a agregar el evento festivo
if (festiveEventsMap.value[timestamp])
eventsMap.value[timestamp] = festiveEventsMap.value[timestamp];
};
watch([year, businessFk], () => refreshData());
</script>
<template>
<FetchData
:url="`Workers/${route.params.id}/activeContract`"
@on-fetch="onFetchActiveContract"
auto-load
/>
<FetchData
:url="`Workers/${route.params.id}/isSubordinate`"
@on-fetch="(data) => (isSubordinate = data)"
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
ref="workerCalendarFilterRef"
v-model:business-fk="businessFk"
v-model:year="year"
v-model:absence-type="absenceType"
:contract-holidays="contractHolidays"
:year-holidays="yearHolidays"
/>
</QScrollArea>
</QDrawer>
<QPage class="column items-center">
<QCard v-if="!hasWorkCenter">
<QCardSection class="text-center">
{{ t('Autonomous worker') }}
</QCardSection>
</QCard>
<QCard v-else class="full-width">
<QIcon
v-if="isSubordinate"
name="info"
size="sm"
class="absolute"
style="top: 14px; right: 14px"
>
<QTooltip max-width="250px">
{{ t('addAbsencesText') }}
</QTooltip>
</QIcon>
<div class="calendar-container">
<WorkerCalendarItem
ref="workerCalendarRef"
v-for="month in 12"
:key="month"
:year="year"
:month="month"
:absence-type="absenceType"
:business-fk="businessFk"
:events="eventsMap"
@refresh="refreshData"
@on-deleted-event="onDeletedEvent"
/>
</div>
</QCard>
</QPage>
</template>
<style lang="scss" scoped>
.calendar-container {
display: flex;
flex-wrap: wrap;
justify-content: center;
align-items: center;
gap: 32px;
padding: 40px;
justify-content: center;
}
</style>
<i18n>
en:
addAbsencesText: To start adding absences, click an absence type from the right menu and then on the day you want to add an absence
es:
Search worker: Buscar trabajador
You can search by worker id or name: Puedes buscar por id o nombre del trabajador
addAbsencesText: Para empezar a añadir ausencias, haz clic en un tipo de ausencia desde el menu de la derecha y después en el día que quieres añadir la ausencia
</i18n>

View File

@ -0,0 +1,248 @@
<script setup>
import WorkerEventLabel from 'pages/Worker/Card/WorkerEventLabel.vue';
import FetchData from 'components/FetchData.vue';
import { useI18n } from 'vue-i18n';
import VnSelectFilter from 'components/common/VnSelectFilter.vue';
import { useRoute } from 'vue-router';
import { computed, ref } from 'vue';
import { toDateFormat } from '../../../filters/date';
const { t } = useI18n();
const route = useRoute();
const props = defineProps({
businessFk: {
type: Number,
default: null,
},
year: {
type: [Number, String],
default: null,
},
absenceType: {
type: Object,
default: null,
},
contractHolidays: {
type: Object,
default: null,
},
yearHolidays: {
type: Object,
default: null,
},
});
const emit = defineEmits(['update:businessFk', 'update:year', 'update:absenceType']);
const selectedBusinessFk = computed({
get: () => props.businessFk,
set: (value) => emit('update:businessFk', value),
});
const selectedYear = computed({
get: () => props.year,
set: (value) => emit('update:year', value),
});
const selectedAbsenceType = computed({
get: () => props.absenceType,
set: (value) => {
if (value === props.absenceType) value = null;
emit('update:absenceType', value);
},
});
const generateYears = () => {
const now = Date.vnNew();
const maxYear = now.getFullYear() + 1;
return Array.from({ length: 5 }, (_, i) => String(maxYear - i)) || [];
};
const absenceTypeList = ref([]);
const contractList = ref([]);
const yearList = ref(generateYears());
</script>
<template>
<FetchData
url="AbsenceTypes"
@on-fetch="(data) => (absenceTypeList = data)"
auto-load
/>
<FetchData
:url="`Workers/${route.params.id}/contracts`"
:filter="{ fields: ['businessFk', 'started', 'ended'] }"
@on-fetch="(data) => (contractList = data)"
auto-load
/>
<div
v-if="contractHolidays"
class="q-pa-md q-mb-md q-ma-md color-vn-text"
style="border: 2px solid black"
>
<QCardSection horizontal>
<span class="text-weight-bold text-subtitle1 text-center full-width">
{{ t('Contract') }} #{{ selectedBusinessFk }}
</span>
</QCardSection>
<QCardSection class="column items-center" horizontal>
<span>
{{
t('usedDays', {
holidaysEnjoyed: contractHolidays.holidaysEnjoyed || 0,
totalHolidays: contractHolidays.totalHolidays || 0,
})
}}
</span>
</QCardSection>
<QCardSection class="column items-center" horizontal>
<span>
{{
t('spentHours', {
hoursEnjoyed: contractHolidays.hoursEnjoyed || 0,
totalHours: contractHolidays.totalHours || 0,
})
}}
</span>
</QCardSection>
<QCardSection class="column items-center" horizontal>
<span>
{{
t('paidHolidays', {
payedHolidays: contractHolidays.payedHolidays || 0,
})
}}
</span>
</QCardSection>
</div>
<div
v-if="yearHolidays"
class="q-pa-md q-mb-md q-ma-md color-vn-text"
style="border: 2px solid black"
>
<QCardSection horizontal>
<span class="text-weight-bold text-subtitle1 text-center full-width">
{{ t('Year') }} {{ selectedYear }}
</span>
</QCardSection>
<QCardSection class="column items-center" horizontal>
<span>
{{
t('usedDays', {
holidaysEnjoyed: yearHolidays.holidaysEnjoyed || 0,
totalHolidays: yearHolidays.totalHolidays || 0,
})
}}
</span>
</QCardSection>
<QCardSection class="column items-center" horizontal>
{{
t('spentHours', {
hoursEnjoyed: yearHolidays.hoursEnjoyed || 0,
totalHours: yearHolidays.totalHours || 0,
})
}}
</QCardSection>
</div>
<QList dense class="list q-gutter-y-sm q-my-lg">
<QItem>
<QItemSection>
<VnSelectFilter
:label="t('Year')"
v-model="selectedYear"
:options="yearList"
dense
outlined
rounded
use-input
:is-clearable="false"
/>
</QItemSection>
</QItem>
<QItem>
<QItemSection>
<VnSelectFilter
:label="t('Contract')"
v-model="selectedBusinessFk"
:options="contractList"
option-value="businessFk"
option-label="businessFk"
dense
outlined
rounded
use-input
:is-clearable="false"
>
<template #option="scope">
<QItem v-bind="scope.itemProps">
<QItemSection>
<QItemLabel># {{ scope.opt?.businessFk }}</QItemLabel>
<QItemLabel caption>
{{ toDateFormat(scope.opt?.started) }} -
{{
scope.opt?.ended
? toDateFormat(scope.opt?.ended)
: 'Indef.'
}}
</QItemLabel>
</QItemSection>
</QItem>
</template>
</VnSelectFilter>
</QItemSection>
</QItem>
</QList>
<QList dense class="list q-gutter-y-xs q-my-md">
<QItem v-for="type in absenceTypeList" :key="type.id">
<WorkerEventLabel
:color="type.rgb"
:selected="selectedAbsenceType?.id === type.id"
@click="selectedAbsenceType = type"
>
{{ type.name }}
</WorkerEventLabel>
</QItem>
</QList>
<QSeparator />
<QList dense class="list q-my-md no-pointer-events">
<QItem>
<WorkerEventLabel avatar-class="worker-calendar-festive">
{{ t('Festive') }}
</WorkerEventLabel>
<WorkerEventLabel avatar-class="worker-calendar-today">
{{ t('Current day') }}
</WorkerEventLabel>
</QItem>
</QList>
</template>
<style lang="scss">
.worker-calendar-festive {
border: 2px solid $negative;
}
.worker-calendar-today {
border: 2px solid $info;
}
</style>
<i18n>
en:
spentHours: Spent {hoursEnjoyed} of {totalHours} hours
usedDays: Used {holidaysEnjoyed} of {totalHolidays} days
paidHolidays: Paid holidays {payedHolidays} days
es:
Paid holidays: Vacaciones pagadas
Year: Año
Contract: Contrato
Festive: Festivo
Current day: Día actual
spentHours: Utilizadas {hoursEnjoyed} de {totalHours} horas
usedDays: Utilizados {holidaysEnjoyed} de {totalHolidays} días
paidHolidays: Vacaciones pagadas {payedHolidays} días
</i18n>

View File

@ -0,0 +1,313 @@
<script setup>
import { onBeforeMount, ref, watch, computed } from 'vue';
import { useI18n } from 'vue-i18n';
import { date } from 'quasar';
import { useRoute } from 'vue-router';
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 useNotify from 'src/composables/useNotify.js';
import axios from 'axios';
const props = defineProps({
year: {
type: Number,
required: true,
},
month: {
type: Number,
required: true,
},
absenceType: {
type: Object,
default: null,
},
businessFk: {
type: Number,
default: null,
},
events: {
type: Object,
default: null,
},
});
const emit = defineEmits(['refresh', 'onDeletedEvent']);
const route = useRoute();
const { t } = useI18n();
const { notify } = useNotify();
const { locale } = useI18n();
const calendarRef = ref(null);
const weekdayStore = useWeekdayStore();
const selectedDate = ref();
const calendarEventDates = [];
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 _year = computed(() => props.year);
const updateSelectedDate = (year) => {
const _date = new Date(year, props.month - 1, 1);
selectedDate.value = date.formatDate(_date, 'YYYY-MM-DD');
};
const createEvent = async (date) => {
try {
const params = {
dated: date,
absenceTypeId: props.absenceType.id,
businessFk: props.businessFk,
};
const { data } = await axios.post(
`Workers/${route.params.id}/createAbsence`,
params
);
if (data) emit('refresh');
} catch (error) {
console.error('error creating event:: ', error);
}
};
const editEvent = async (event) => {
try {
const absenceType = props.absenceType;
const params = {
absenceId: event.absenceId,
absenceTypeId: absenceType.id,
};
const { data } = await axios.patch(
`Workers/${route.params.id}/updateAbsence`,
params
);
if (data) emit('refresh');
} catch (error) {
console.error('error editing event:: ', error);
}
};
const deleteEvent = async (event, date) => {
const params = { absenceId: event.absenceId };
const { data } = await axios.delete(`Workers/${route.params.id}/deleteAbsence`, {
params,
});
if (data) emit('onDeletedEvent', date.getTime());
};
const handleDateSelected = (date) => {
if (!props.absenceType) {
notify(t('Choose an absence type from the right menu'), 'warning');
return;
}
const { year, month, day } = date.scope.timestamp;
const _date = new Date(year, month - 1, day);
const stamp = _date.getTime();
const event = props.events[stamp];
if (!event) createEvent(_date);
};
const handleEventSelected = (event, { year, month, day }) => {
if (!props.absenceType) {
notify(t('Choose an absence type from the right menu'), 'warning');
return;
}
const date = new Date(year, month - 1, day);
if (!event.absenceId) createEvent(date);
else if (event.type == props.absenceType.code) deleteEvent(event, date);
else editEvent(event);
};
const getEventByTimestamp = ({ year, month, day }) => {
const stamp = new Date(year, month - 1, day).getTime();
return props.events[stamp] || null;
};
const getEventAttrs = (timestamp) => {
const event = getEventByTimestamp(timestamp);
if (!event) return {};
const { name, color, isFestive } = event;
// Atributos a asignar a cada slot que representa un evento en el calendario
const attrs = {
title: name,
style: color ? `background-color: ${color};` : '',
label: timestamp.day,
};
if (isFestive) {
attrs.class = '--festive';
attrs.label = event.absenceId ? timestamp.day : '';
}
return attrs;
};
const isToday = (timestamp) => {
const { year, month, day } = timestamp;
return todayTimestamp.value === new Date(year, month - 1, day).getTime();
};
onBeforeMount(() => {
updateSelectedDate(_year.value);
});
watch(_year, (newValue) => {
updateSelectedDate(newValue);
});
</script>
<template>
<QCalendarMonthWrapper
style="height: 290px; width: 310px"
class="outline"
bordered
transparent-background
>
<template #header>
<span class="full-width text-center text-body1 q-py-sm">{{
weekdayStore.getLocaleMonths[$props.month - 1].locale
}}</span>
</template>
<template #calendar>
<QCalendarMonth
ref="calendarRef"
v-model="selectedDate"
@click-date="handleDateSelected"
show-work-weeks
no-outside-days
:selected-dates="calendarEventDates"
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="
handleEventSelected(getEventByTimestamp(timestamp), timestamp)
"
rounded
dense
flat
class="calendar-event"
:class="{
'--today': isToday(timestamp),
}"
/>
</template>
</QCalendarMonth>
</template>
</QCalendarMonthWrapper>
</template>
<style lang="scss">
@import '../../../css/quasar.variables.scss';
:root {
// Cambia los colores del día actual del calendario por los de salix
--calendar-border-current-dark: #84d0e2 2px solid;
--calendar-border-current: #84d0e2 2px solid;
--calendar-current-color-dark: #ec8916;
}
.q-calendar__button {
width: 32px;
height: 32px;
font-size: 13px;
&:hover {
background-color: var(--vn-accent-color);
cursor: pointer;
}
}
.q-calendar-month__week--days > div:nth-child(6),
.q-calendar-month__week--days > div:nth-child(7) {
// Cambia el color de los días sábado y domingo
color: #777777;
}
.q-calendar-month__week--wrapper {
margin-bottom: 4px;
}
.q-calendar-month__workweek {
height: 32px;
display: flex;
justify-content: center;
}
.q-calendar__button--bordered {
color: $info !important;
}
.q-calendar-month__day--content {
position: absolute;
top: 1;
left: 0;
display: flex;
justify-content: center;
align-items: center;
}
.q-outside .calendar-event {
display: none;
}
.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;
}
&.--festive {
border: 2px solid $negative;
}
&:hover {
opacity: 0.8;
}
}
.q-calendar-month__workweek,
.q-calendar-month__head--workweek,
.q-calendar-month__head--weekday.q-calendar__center.q-calendar__ellipsis {
text-transform: capitalize;
color: #777;
font-weight: bold;
font-size: 0.8rem;
text-align: center;
}
</style>
<i18n>
es:
Choose an absence type from the right menu: Elige un tipo de ausencia desde el menú de la derecha
</i18n>

View File

@ -31,29 +31,7 @@ const entityId = computed(() => {
});
const worker = ref();
const filter = {
include: [
{
relation: 'user',
scope: {
fields: ['email', 'name', 'nickname'],
},
},
{
relation: 'department',
scope: {
include: [
{
relation: 'department',
},
],
},
},
{
relation: 'sip',
},
],
};
const filter = { where: { id: route.params.id}};
const sip = ref(null);
@ -82,7 +60,7 @@ const setData = (entity) => {
<CardDescriptor
module="Worker"
data-key="workerData"
:url="`Workers/${entityId}`"
:url="`Workers/summary`"
:filter="filter"
:title="data.title"
:subtitle="data.subtitle"

View File

@ -0,0 +1,33 @@
<script setup>
defineProps({
color: {
type: String,
default: null,
},
avatarClass: {
type: String,
default: null,
},
selected: {
type: Boolean,
default: undefined,
},
});
defineEmits(['update:selected']);
</script>
<template>
<QChip
class="text-white q-ma-none"
:selected="selected"
:style="{ backgroundColor: selected ? color : 'black' }"
@update:selected="$emit('update:selected', $event)"
>
<QAvatar
:color="color"
:class="avatarClass"
:style="{ backgroundColor: color }"
/>
<slot />
</QChip>
</template>

View File

@ -10,7 +10,7 @@ import CardSummary from 'components/ui/CardSummary.vue';
import VnUserLink from 'src/components/ui/VnUserLink.vue';
import VnTitle from 'src/components/common/VnTitle.vue';
const route = useRoute();
const { params } = useRoute();
const { t } = useI18n();
const $props = defineProps({
@ -20,53 +20,18 @@ const $props = defineProps({
},
});
const entityId = computed(() => $props.id || route.params.id);
const entityId = computed(() => $props.id || params.id);
const workerUrl = ref();
onMounted(async () => {
workerUrl.value = (await getUrl('')) + `worker/${entityId.value}/`;
});
const filter = {
include: [
{
relation: 'user',
scope: {
fields: ['email', 'name', 'nickname', 'roleFk'],
include: {
relation: 'role',
scope: {
fields: ['name'],
},
},
},
},
{
relation: 'department',
scope: {
include: {
relation: 'department',
scope: {
fields: ['name'],
},
},
},
},
{
relation: 'boss',
},
{
relation: 'client',
},
{
relation: 'sip',
},
],
};
const filter = { where: { id: entityId.value } };
</script>
<template>
<CardSummary ref="summary" :url="`Workers/${entityId}`" :filter="filter">
<CardSummary ref="summary" :url="`Workers/summary`" :filter="filter">
<template #header="{ entity }">
<div>{{ entity.id }} - {{ entity.firstName }} {{ entity.lastName }}</div>
</template>
@ -103,12 +68,6 @@ const filter = {
<VnLinkPhone :phone-number="worker.phone" />
</template>
</VnLv>
<VnLv :value="worker.client?.phone">
<template #label>
{{ t('worker.summary.personalPhone') }}
<VnLinkPhone :phone-number="worker.client?.phone" />
</template>
</VnLv>
<VnLv :label="t('worker.summary.locker')" :value="worker.locker" />
</QCard>
<QCard class="vn-one">

View File

@ -45,7 +45,8 @@ export default {
path: 'create',
name: 'SupplierCreate',
meta: {
title: 'create',
title: 'supplierCreate',
icon: 'add',
},
component: () => import('src/pages/Supplier/SupplierCreate.vue'),
},

View File

@ -55,7 +55,8 @@ export default {
path: 'create',
name: 'CustomerCreate',
meta: {
title: 'create',
title: 'customerCreate',
icon: 'add',
},
component: () => import('src/pages/Customer/CustomerCreate.vue'),
},

View File

@ -34,7 +34,8 @@ export default {
path: 'create',
name: 'EntryCreate',
meta: {
title: 'create',
title: 'entryCreate',
icon: 'add',
},
component: () => import('src/pages/Entry/EntryCreate.vue'),
},

View File

@ -34,7 +34,8 @@ export default {
path: 'create',
name: 'OrderCreate',
meta: {
title: 'create',
title: 'orderCreate',
icon: 'add',
},
component: () => import('src/pages/Order/Card/OrderForm.vue'),
},

View File

@ -34,7 +34,8 @@ export default {
path: 'create',
name: 'RouteCreate',
meta: {
title: 'create',
title: 'routeCreate',
icon: 'add',
},
component: () => import('src/pages/Route/Card/RouteForm.vue'),
},

View File

@ -34,7 +34,8 @@ export default {
path: 'create',
name: 'ShelvingCreate',
meta: {
title: 'create',
title: 'shelvingCreate',
icon: 'add',
},
component: () => import('src/pages/Shelving/Card/ShelvingForm.vue'),
},

View File

@ -44,6 +44,7 @@ export default {
name: 'TravelCreate',
meta: {
title: 'travelCreate',
icon: 'add',
},
component: () => import('src/pages/Travel/TravelCreate.vue'),
},

View File

@ -19,6 +19,7 @@ export default {
'WorkerNotificationsManager',
'WorkerPBX',
'WorkerLog',
'WorkerCalendar',
'WorkerDms',
],
departmentCard: ['BasicData'],
@ -53,7 +54,7 @@ export default {
name: 'WorkerCreate',
meta: {
title: 'workerCreate',
icon: '',
icon: 'add',
},
component: () => import('src/pages/Worker/WorkerCreate.vue'),
},
@ -146,6 +147,15 @@ export default {
},
component: () => import('src/pages/Worker/Card/WorkerLog.vue'),
},
{
name: 'WorkerCalendar',
path: 'calendar',
meta: {
title: 'calendar',
icon: 'calendar_today',
},
component: () => import('src/pages/Worker/Card/WorkerCalendar.vue'),
},
],
},
],

View File

@ -0,0 +1,95 @@
import { reactive, ref, computed } from 'vue';
import { useI18n } from 'vue-i18n';
import { defineStore } from 'pinia';
export const useWeekdayStore = defineStore('weekdayStore', () => {
const { t } = useI18n();
const weekdays = [
{ code: 'sun', name: 'Sunday' },
{ code: 'mon', name: 'Monday' },
{ code: 'tue', name: 'Tuesday' },
{ code: 'wed', name: 'Wednesday' },
{ code: 'thu', name: 'Thursday' },
{ code: 'fri', name: 'Friday' },
{ code: 'sat', name: 'Saturday' },
];
const monthCodes = [
'jan',
'feb',
'mar',
'apr',
'may',
'jun',
'jul',
'aug',
'sep',
'oct',
'nov',
'dec',
];
const localeOrder = {
es: ['mon', 'tue', 'wed', 'thu', 'fri', 'sat', 'sun'],
en: ['sun', 'mon', 'tue', 'wed', 'thu', 'fri', 'sat'],
};
const weekdaysMap = reactive({});
const localeWeekdays = ref([]);
const initStore = () => {
getWeekdaysMap();
};
const getWeekdaysMap = () => {
if (Object.keys(weekdaysMap).length > 0) return weekdaysMap;
weekdays.forEach((day, i) => {
const obj = {
...day,
index: i,
char: day.name.substr(0, 1),
abr: day.name.substr(0, 3),
};
weekdaysMap[day.code] = obj;
});
};
const getLocales = computed(() => {
// El día de mañana esto permitirá ordenar los weekdays en base a el locale si se lo desea reemplazando localeOrder.es por localeOrder[locale]
const locales = [];
for (let code of localeOrder.es) {
const obj = {
...weekdaysMap[code],
locale: t(`weekdays.${weekdaysMap[code].code}`),
localeChar: t(`weekdays.${weekdaysMap[code].code}`).substr(0, 1),
localeAbr: t(`weekdays.${weekdaysMap[code].code}`).substr(0, 3),
};
locales.push(obj);
}
return locales;
});
const getLocaleMonths = computed(() => {
const locales = [];
for (let code of monthCodes) {
const obj = {
code: code,
locale: t(`months.${code}`),
};
locales.push(obj);
}
return locales;
});
return {
initStore,
weekdaysMap,
localeWeekdays,
getLocales,
weekdays,
monthCodes,
getLocaleMonths,
};
});