0
0
Fork 0

Merge branch 'dev' into 6907_fix_input_clearable_hover

This commit is contained in:
Javier Segarra 2024-04-18 06:18:02 +00:00
commit 5382f306e2
24 changed files with 2493 additions and 1247 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"
]
}
"options": ["scripts"]
},
"@quasar/qcalendar": {}
}

View File

@ -1,7 +1,6 @@
import { boot } from 'quasar/wrappers';
import { createI18n } from 'vue-i18n';
import messages from 'src/i18n';
import { locales } from 'src/i18n/handle';
const i18n = createI18n({
locale: navigator.language || navigator.userLanguage,
@ -13,9 +12,8 @@ const i18n = createI18n({
legacy: false,
});
export default boot(async ({ app }) => {
export default boot(({ app }) => {
// Set i18n instance on app
await locales();
app.use(i18n);
});

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

@ -3,31 +3,29 @@ import { useRole } from './useRole';
import { useUserConfig } from './useUserConfig';
import axios from 'axios';
import useNotify from './useNotify';
const TOKEN_MULTIMEDIA = 'tokenMultimedia';
const TOKEN = 'token';
export function useSession() {
const { notify } = useNotify();
function getToken() {
const localToken = localStorage.getItem('token');
const sessionToken = sessionStorage.getItem('token');
const localToken = localStorage.getItem(TOKEN);
const sessionToken = sessionStorage.getItem(TOKEN);
return localToken || sessionToken || '';
}
function getTokenMultimedia() {
const localTokenMultimedia = localStorage.getItem('token'); // Temporal
const sessionTokenMultimedia = sessionStorage.getItem('token'); // Temporal
const localTokenMultimedia = localStorage.getItem(TOKEN_MULTIMEDIA);
const sessionTokenMultimedia = sessionStorage.getItem(TOKEN_MULTIMEDIA);
return localTokenMultimedia || sessionTokenMultimedia || '';
}
function setToken(data) {
if (data.keepLogin) {
localStorage.setItem('token', data.token);
localStorage.setItem('tokenMultimedia', data.tokenMultimedia);
} else {
sessionStorage.setItem('token', data.token);
sessionStorage.setItem('tokenMultimedia', data.tokenMultimedia);
}
const storage = data.keepLogin ? localStorage : sessionStorage;
storage.setItem(TOKEN, data.token);
storage.setItem(TOKEN_MULTIMEDIA, data.tokenMultimedia);
}
async function destroyToken(url, storage, key) {
if (storage.getItem(key)) {
@ -71,8 +69,8 @@ export function useSession() {
}
function isLoggedIn() {
const localToken = localStorage.getItem('token');
const sessionToken = sessionStorage.getItem('token');
const localToken = localStorage.getItem(TOKEN);
const sessionToken = sessionStorage.getItem(TOKEN);
return !!(localToken || sessionToken);
}

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;
@ -160,3 +161,14 @@ input::-webkit-inner-spin-button {
-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

@ -1,17 +0,0 @@
const modules = import.meta.glob(`../pages/**/locale/**.yml`);
import translations from './index';
const LOCALE_EXTENSION = '.yml';
export async function locales() {
for await (const module of Object.keys(modules)) {
const splittedFile = module.split('/');
const lang = splittedFile.pop().split(LOCALE_EXTENSION)[0];
const moduleFiles = splittedFile.join('/') + '/' + lang + LOCALE_EXTENSION;
import(moduleFiles).then((t) => {
Object.assign(translations[lang], t.default);
});
}
return translations;
}
export default translations;

View File

@ -1,10 +1,23 @@
const files = import.meta.glob(`./locale/*.yml`);
const modules = import.meta.glob(`../pages/**/locale/*.yml`);
const translations = {};
for (const file in files) {
const lang = file.split('/').at(2).split('.')[0];
import(file).then((t) => {
translations[lang] = t.default;
files[file]()
.then((g) => {
translations[lang] = g.default;
})
.finally(() => {
const actualLang = lang + '.yml';
for (const module in modules) {
if (!module.endsWith(actualLang)) continue;
modules[module]().then((t) => {
Object.assign(translations[lang], t.default);
})
}
});
}

View File

@ -788,6 +788,7 @@ worker:
dms: My documentation
pbx: Private Branch Exchange
log: Log
calendar: Calendar
list:
name: Name
email: Email
@ -1094,6 +1095,7 @@ item:
list: List
diary: Diary
tags: Tags
wasteBreakdown: Waste breakdown
itemCreate: New item
descriptor:
item: Item
@ -1122,6 +1124,13 @@ item:
stemMultiplier: Multiplier
producer: Producer
landed: Landed
create:
name: Name
tag: Tag
priority: Priority
type: Type
intrastat: Intrastat
origin: Origin
components:
topbar: {}
userPanel:
@ -1148,3 +1157,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

View File

@ -786,6 +786,7 @@ worker:
dms: Mi documentación
pbx: Centralita
log: Historial
calendar: Calendario
list:
name: Nombre
email: Email
@ -1093,6 +1094,7 @@ item:
list: Listado
diary: Histórico
tags: Etiquetas
wasteBreakdown: Deglose de mermas
itemCreate: Nuevo artículo
descriptor:
item: Artículo
@ -1121,6 +1123,13 @@ item:
stemMultiplier: Multiplicador
producer: Productor
landed: F. entrega
create:
name: Nombre
tag: Etiqueta
priority: Prioridad
type: Tipo
intrastat: Intrastat
origin: Origen
components:
topbar: {}
userPanel:
@ -1147,3 +1156,24 @@ components:
VnLv:
copyText: '{copyValue} se ha copiado al portapepeles'
iban_tooltip: 'IBAN: ES21 1234 5678 90 0123456789'
weekdays:
sun: Domingo
mon: Lunes
tue: Martes
wed: Miércoles
thu: Jueves
fri: Viernes
sat: Sábado
months:
jan: Enero
feb: Febrero
mar: Marzo
apr: Abril
may: Mayo
jun: Junio
jul: Julio
aug: Agosto
sep: Septiembre
oct: Octubre
nov: Noviembre
dec: Diciembre

View File

@ -1,4 +1,4 @@
customerFilter:
filter:
name: Name
socialName: Social name
name: 'Name'
socialName: 'Social name'

View File

@ -1,4 +1,4 @@
customerFilter:
filter:
name: Nombre
socialName: Razón Social
name: 'Nombre'
socialName: 'Razón Social'

View File

@ -268,16 +268,11 @@ const importBuys = () => {
const toggleGroupingMode = async (buy, mode) => {
try {
const grouping = 1;
const packing = 2;
const groupingMode = mode === 'grouping' ? grouping : packing;
const newGroupingMode = buy.groupingMode === groupingMode ? 0 : groupingMode;
const groupingMode = mode === 'grouping' ? mode : 'packing';
const newGroupingMode = buy.groupingMode === groupingMode ? null : groupingMode;
const params = {
groupingMode: newGroupingMode,
};
await axios.patch(`Buys/${buy.id}`, params);
buy.groupingMode = newGroupingMode;
} catch (err) {
@ -287,9 +282,9 @@ const toggleGroupingMode = async (buy, mode) => {
const lockIconType = (groupingMode, mode) => {
if (mode === 'packing') {
return groupingMode === 2 ? 'lock' : 'lock_open';
return groupingMode === 'packing' ? 'lock' : 'lock_open';
} else {
return groupingMode === 1 ? 'lock' : 'lock_open';
return groupingMode === 'grouping' ? 'lock' : 'lock_open';
}
};
</script>

View File

@ -0,0 +1 @@
<template>Item basic data</template>

View File

@ -1 +1,170 @@
<template>Item create view</template>
<script setup>
import { reactive, ref, onBeforeMount } from 'vue';
import { useI18n } from 'vue-i18n';
import { useRouter } from 'vue-router';
import FetchData from 'components/FetchData.vue';
import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
import FormModel from 'components/FormModel.vue';
import VnRow from 'components/ui/VnRow.vue';
import VnInput from 'src/components/common/VnInput.vue';
import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
import axios from 'axios';
const { t } = useI18n();
const router = useRouter();
const newItemForm = reactive({});
const originsOptions = ref([]);
const tagsOptions = ref([]);
const validPriorities = ref([]);
const itemTypesOptions = ref([]);
const intrastatsOptions = ref([]);
const fetchDefaultPriorityTag = async () => {
const filter = {
fields: ['defaultPriority', 'defaultTag', 'validPriorities'],
limit: 1,
};
const { data } = await axios.get(`ItemConfigs`, { filter });
if (!data) return;
const dataRow = data[0];
validPriorities.value = [...dataRow.validPriorities];
newItemForm.priority = dataRow.defaultPriority;
newItemForm.tag = dataRow.defaultTag;
};
const redirectToItemBasicData = (_, { id }) => {
router.push({ name: 'ItemBasicData', params: { id } });
};
onBeforeMount(async () => {
await fetchDefaultPriorityTag();
});
</script>
<template>
<FetchData
url="Origins"
@on-fetch="(data) => (originsOptions = data)"
:filter="{ order: 'name' }"
auto-load
/>
<FetchData
url="Tags"
:filter="{ fields: ['id', 'name'], order: 'name ASC' }"
@on-fetch="(data) => (tagsOptions = data)"
auto-load
/>
<FetchData
url="ItemTypes"
:filter="{
fields: ['id', 'code', 'categoryFk', 'name'],
include: 'category',
order: 'name ASC',
}"
@on-fetch="(data) => (itemTypesOptions = data)"
auto-load
/>
<FetchData
url="Intrastats"
:filter="{ fields: ['id', 'description'], order: 'description ASC' }"
@on-fetch="(data) => (intrastatsOptions = data)"
auto-load
/>
<QPage>
<VnSubToolbar />
<FormModel
url-create="Items/new"
model="item"
:form-initial-data="newItemForm"
observe-form-changes
@on-data-saved="redirectToItemBasicData"
>
<template #form="{ data }">
<VnRow class="row q-gutter-md q-mb-md">
<VnInput
v-model="data.provisionalName"
:label="t('item.create.name')"
/>
<VnSelectFilter
:label="t('item.create.tag')"
v-model="data.tag"
:options="tagsOptions"
option-value="id"
option-label="name"
hide-selected
/>
<VnSelectFilter
:label="t('item.create.priority')"
v-model="data.priority"
:options="validPriorities"
option-value="priority"
option-label="priority"
hide-selected
/>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnSelectFilter
:label="t('item.create.type')"
v-model="data.typeFk"
:options="itemTypesOptions"
option-label="name"
option-value="id"
hide-selected
>
<template #option="scope">
<QItem class="column" v-bind="scope.itemProps">
<QItemLabel class="row">
<span style="width: 3em">
{{ scope.opt?.code }}
</span>
<span>
{{ scope.opt?.name }}
</span>
</QItemLabel>
<QItemLabel v-if="scope.opt?.category" caption>
{{ scope.opt?.category?.name }}
</QItemLabel>
</QItem>
</template>
</VnSelectFilter>
<VnSelectFilter
:label="t('item.create.intrastat')"
v-model="data.intrastatFk"
:options="intrastatsOptions"
option-label="description"
option-value="id"
hide-selected
>
<template #option="scope">
<QItem v-bind="scope.itemProps">
<QItemSection>
<QItemLabel>
{{ scope.opt?.description }}
</QItemLabel>
<QItemLabel caption>
#{{ scope.opt?.id }}
</QItemLabel>
</QItemSection>
</QItem>
</template>
</VnSelectFilter>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnSelectFilter
:label="t('item.create.origin')"
v-model="data.originFk"
:options="originsOptions"
option-value="id"
option-label="name"
hide-selected
/>
</VnRow>
</template>
</FormModel>
</QPage>
</template>

View File

@ -1,10 +1,9 @@
<script setup>
import { onMounted, ref, computed, onUpdated } from 'vue';
import { ref, computed, onUpdated } from 'vue';
import { useRoute } from 'vue-router';
import { useI18n } from 'vue-i18n';
import CardSummary from 'components/ui/CardSummary.vue';
import VnLv from 'src/components/ui/VnLv.vue';
import { getUrl } from 'src/composables/getUrl';
import { useRole } from 'src/composables/useRole';
import { dashIfEmpty } from 'src/filters';
import VnUserLink from 'src/components/ui/VnUserLink.vue';
@ -28,12 +27,6 @@ const entityId = computed(() => $props.id || route.params.id);
const summaryRef = ref();
const supplier = ref();
const supplierUrl = ref();
onMounted(async () => {
await roleState.fetch();
supplierUrl.value = (await getUrl('supplier/')) + entityId.value;
});
async function setData(data) {
if (data) {
@ -44,6 +37,10 @@ async function setData(data) {
const isAdministrative = computed(() => {
return roleState.hasAny(['administrative']);
});
function getUrl(section) {
return isAdministrative.value && `#/supplier/${entityId.value}/${section}`;
}
</script>
<template>
@ -58,15 +55,10 @@ const isAdministrative = computed(() => {
<template #body>
<QCard class="vn-one">
<router-link
v-if="isAdministrative"
class="header link"
:to="{ name: 'SupplierBasicData', params: { id: entityId } }"
>
{{ t('globals.summary.basicData') }}
<QIcon name="open_in_new" />
</router-link>
<span v-else> {{ t('globals.summary.basicData') }}</span>
<VnTitle
:url="getUrl('basic-data')"
:text="t('globals.summary.basicData')"
/>
<VnLv label="Id" :value="supplier.id" />
<VnLv label="Alias" :value="supplier.nickname" />
<VnLv :label="t('supplier.summary.responsible')">
@ -94,15 +86,10 @@ const isAdministrative = computed(() => {
/>
</QCard>
<QCard class="vn-one">
<router-link
v-if="isAdministrative"
class="header link"
:to="{ name: 'SupplierBillingData', params: { id: entityId } }"
>
{{ t('supplier.summary.billingData') }}
<QIcon name="open_in_new" />
</router-link>
<span v-else> {{ t('supplier.summary.billingData') }}</span>
<VnTitle
:url="getUrl('billing-data')"
:text="t('supplier.summary.billingData')"
/>
<VnLv
:label="t('supplier.summary.payMethod')"
:value="supplier.payMethod?.name"
@ -117,15 +104,10 @@ const isAdministrative = computed(() => {
<VnLv :label="t('supplier.summary.account')" :value="supplier.account" />
</QCard>
<QCard class="vn-one">
<router-link
v-if="isAdministrative"
class="header link"
:to="{ name: 'SupplierFiscalData', params: { id: entityId } }"
>
{{ t('supplier.summary.fiscalData') }}
<QIcon name="open_in_new" />
</router-link>
<span v-else> {{ t('supplier.summary.fiscalData') }}</span>
<VnTitle
:url="getUrl('fiscal-data')"
:text="t('supplier.summary.fiscalData')"
/>
<VnLv
:label="t('supplier.summary.sageTaxType')"
:value="supplier.sageTaxType?.vat"
@ -152,15 +134,10 @@ const isAdministrative = computed(() => {
/>
</QCard>
<QCard class="vn-one">
<router-link
v-if="isAdministrative"
class="header link"
:to="{ name: 'SupplierFiscalData', params: { id: entityId } }"
>
{{ t('supplier.summary.fiscalAddress') }}
<QIcon name="open_in_new" />
</router-link>
<span v-else> {{ t('supplier.summary.fiscalAddress') }}</span>
<VnTitle
:url="getUrl('fiscal-data')"
:text="t('supplier.summary.fiscalAddress')"
/>
<VnLv :label="t('supplier.summary.socialName')" :value="supplier.name" />
<VnLv :label="t('supplier.summary.taxNumber')" :value="supplier.nif" />
<VnLv :label="t('supplier.summary.street')" :value="supplier.street" />

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

@ -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,8 +10,8 @@ export default {
component: RouterView,
redirect: { name: 'ItemMain' },
menus: {
main: ['ItemList'],
card: [],
main: ['ItemList', 'WasteBreakdown'],
card: ['ItemBasicData'],
},
children: [
{
@ -37,6 +37,19 @@ export default {
},
component: () => import('src/pages/Item/ItemCreate.vue'),
},
{
path: 'waste-breakdown',
name: 'WasteBreakdown',
meta: {
title: 'wasteBreakdown',
icon: 'vn:claims',
},
beforeEnter: (to, from, next) => {
next({ name: 'ItemList' });
window.location.href =
'https://grafana.verdnatura.es/d/TTNXQAxVk';
},
},
],
},
{
@ -72,6 +85,15 @@ export default {
},
component: () => import('src/pages/Item/Card/ItemTags.vue'),
},
{
path: 'basic-data',
name: 'ItemBasicData',
meta: {
title: 'basicData',
icon: 'vn:settings',
},
component: () => import('src/pages/Item/Card/ItemBasicData.vue'),
},
],
},
],

View File

@ -19,6 +19,7 @@ export default {
'WorkerNotificationsManager',
'WorkerPBX',
'WorkerLog',
'WorkerCalendar',
'WorkerDms',
],
departmentCard: ['BasicData'],
@ -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,
};
});