verdnatura/salix-front
verdnatura
/
salix-front
2
3
Fork 1
Code Issues Pull Requests 96 Releases Wiki Activity

feat: refs #8304 added remove option to operator #1195

Merged
jtubau merged 27 commits from 8304-workerChangesAndFixes into dev 2025-02-05 12:25:27 +00:00
Conversation 4 Commits 27 Files Changed 8 +12 -36
1 changed files with 12 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d4d4bed74b - Show all commits

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

@ -181,17 +181,18 @@ watch([year, businessFk], () => refreshData());
ref="WorkerFreelanceRef"
auto-load
/>
<<<<<<< HEAD
<Teleport to="#right-panel" v-if="stateStore.isHeaderMounted()">
<WorkerCalendarFilter
ref="workerCalendarFilterRef"
v-model:business-fk="businessFk"
v-model:year="year"
v-model:absence-type="absenceType"
:contract-holidays="contractHolidays"
:year-holidays="yearHolidays"
/>
</Teleport>
<RightMenu>
jtubau marked this conversation as resolved Outdated
jsegarra commented 2025-01-23 21:38:19 +00:00
Outdated
Review
Copy Link

Tengo dudas de si Teleport es mejor opción que RightMenu
Cual es la motivación de cambiarlo? El v-if?
PEgale un vistazo a este commit 58b8b2f7b0

Tengo dudas de si Teleport es mejor opción que RightMenu Cual es la motivación de cambiarlo? El v-if? PEgale un vistazo a este commit https://gitea.verdnatura.es/verdnatura/salix-front/commit/58b8b2f7b03fc7bc2f1ce76d11ee107179d5fc2c
<template #right-panel>
<WorkerCalendarFilter
ref="workerCalendarFilterRef"
v-model:business-fk="businessFk"
v-model:year="year"
v-model:absence-type="absenceType"
:contract-holidays="contractHolidays"
:year-holidays="yearHolidays"
/>
</template>
</RightMenu>
<Teleport to="#st-data" v-if="stateStore.isSubToolbarShown()">
<div>
<VnNotes
@ -222,31 +223,6 @@ watch([year, businessFk], () => refreshData());
:required="false"
/>
</div>
=======
<RightMenu>
<template #right-panel>
<WorkerCalendarFilter
ref="workerCalendarFilterRef"
v-model:business-fk="businessFk"
v-model:year="year"
v-model:absence-type="absenceType"
:contract-holidays="contractHolidays"
:year-holidays="yearHolidays"
/>
</template>
</RightMenu>
<Teleport to="#st-default" v-if="stateStore.isSubToolbarShown()">
<VnNotes
v-if="canSeeNotes"
:just-input="true"
:url="`Workers/${route.params.id}/business`"
:filter="{fields: ['id', 'notes', 'workerFk']}"
:save-url="saveUrl"
@on-fetch="(data) => { saveUrl = `Businesses/${data[0].id}` }"
:body="body"
:required="false"
/>
>>>>>>> 864e187a4e9a10cf17c75feb85cd721fd51c6bc6
</Teleport>
<QPage class="column items-center">
<QCard v-if="workerIsFreelance">