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

Merge branch 'master' into hotFix_vnJsonValue_showHours
gitea/salix-front/pipeline/pr-master This commit looks good Details

This commit is contained in:
Alex Moreno 2025-04-08 12:19:43 +00:00
parent c9957371df a2f8a61c20
commit e081543d39
2 changed files with 42 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
src/pages/Worker/Card/WorkerCalendarFilter.vue
View File

@ -166,50 +166,44 @@ const yearList = ref(generateYears());
}} }}
</QCardSection> </QCardSection>
</div> </div>
<QList dense class="list q-gutter-y-sm q-my-lg"> <div dense class="column q-gutter-y-sm q-px-md">
<QItem> <VnSelect
<QItemSection> :label="t('Year')"
<VnSelect v-model="selectedYear"
:label="t('Year')" :options="yearList"
v-model="selectedYear" dense
:options="yearList" filled
dense use-input
filled :is-clearable="false"
use-input />
:is-clearable="false" <VnSelect
/> :label="t('Contract')"
</QItemSection> v-model="selectedBusinessFk"
<QItemSection> :options="contractList"
<VnSelect option-value="businessFk"
:label="t('Contract')" option-label="businessFk"
v-model="selectedBusinessFk" dense
:options="contractList" filled
option-value="businessFk" use-input
option-label="businessFk" :is-clearable="false"
dense >
filled <template #option="scope">
use-input <QItem v-bind="scope.itemProps">
:is-clearable="false" <QItemSection>
> <QItemLabel># {{ scope.opt?.businessFk }}</QItemLabel>
<template #option="scope"> <QItemLabel caption>
<QItem v-bind="scope.itemProps"> {{ toDateFormat(scope.opt?.started) }} -
<QItemSection> {{
<QItemLabel># {{ scope.opt?.businessFk }}</QItemLabel> scope.opt?.ended
<QItemLabel caption> ? toDateFormat(scope.opt?.ended)
{{ toDateFormat(scope.opt?.started) }} - : 'Indef.'
{{ }}
scope.opt?.ended </QItemLabel>
? toDateFormat(scope.opt?.ended) </QItemSection>
: 'Indef.' </QItem>
}} </template>
</QItemLabel> </VnSelect>
</QItemSection> </div>
</QItem>
</template>
</VnSelect>
</QItemSection>
</QItem>
</QList>
<QList dense class="list q-gutter-y-xs q-my-md"> <QList dense class="list q-gutter-y-xs q-my-md">
<QItem v-for="type in absenceTypeList" :key="type.id"> <QItem v-for="type in absenceTypeList" :key="type.id">
<WorkerEventLabel <WorkerEventLabel

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

@ -20,6 +20,7 @@ const { notify } = useNotify();
const loadingDocuware = ref(true); const loadingDocuware = ref(true);
const tableRef = ref(); const tableRef = ref();
const dialog = ref(); const dialog = ref();
const getAvailablePdaRef = ref();
const route = useRoute(); const route = useRoute();
const { openConfirmationModal } = useVnConfirm(); const { openConfirmationModal } = useVnConfirm();
const routeId = computed(() => route.params.id); const routeId = computed(() => route.params.id);
@ -84,6 +85,7 @@ function reloadData() {
initialData.value.deviceProductionFk = null; initialData.value.deviceProductionFk = null;
initialData.value.simFk = null; initialData.value.simFk = null;
tableRef.value.reload(); tableRef.value.reload();
getAvailablePdaRef.value.fetch();
} }
async function fetchDocuware() { async function fetchDocuware() {
@ -135,6 +137,7 @@ async function deallocatePDA(deviceProductionFk) {
); );
delete tableRef.value.CrudModelRef.formData[index]; delete tableRef.value.CrudModelRef.formData[index];
notify(t('PDA deallocated'), 'positive'); notify(t('PDA deallocated'), 'positive');
await getAvailablePdaRef.value.fetch();
} }
function isSigned(row) { function isSigned(row) {
@ -144,6 +147,7 @@ function isSigned(row) {
<template> <template>
<FetchData <FetchData
ref="getAvailablePdaRef"
url="workers/getAvailablePda" url="workers/getAvailablePda"
@on-fetch="(data) => (deviceProductions = data)" @on-fetch="(data) => (deviceProductions = data)"
auto-load auto-load