From f7fb18cf0aaec68a7edb6a9abb86cd498f47f611 Mon Sep 17 00:00:00 2001 From: carlossa Date: Tue, 10 Sep 2024 15:02:21 +0200 Subject: [PATCH] refs #6553 workerBusiness --- src/components/CrudModel.vue | 2 +- src/components/VnTable/VnTable.vue | 1 + src/pages/Worker/Card/WorkerBusiness.vue | 50 +++++++++++++++--------- src/pages/Worker/Card/WorkerSummary.vue | 2 +- 4 files changed, 35 insertions(+), 20 deletions(-) diff --git a/src/components/CrudModel.vue b/src/components/CrudModel.vue index 33c831e3f..df4af5875 100644 --- a/src/components/CrudModel.vue +++ b/src/components/CrudModel.vue @@ -182,7 +182,7 @@ async function saveChanges(data) { hasChanges.value = false; isLoading.value = false; - emit('saveChanges', data); + emit('saveChanges', changes); quasar.notify({ type: 'positive', message: t('globals.dataSaved'), diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue index 5876dd39b..76e1d7821 100644 --- a/src/components/VnTable/VnTable.vue +++ b/src/components/VnTable/VnTable.vue @@ -258,6 +258,7 @@ function stopEventPropagation(event) { function reload(params) { selected.value = []; CrudModelRef.value.reload(params); + emit('saveChanges', params); } function columnName(col) { diff --git a/src/pages/Worker/Card/WorkerBusiness.vue b/src/pages/Worker/Card/WorkerBusiness.vue index 1f03f1ed3..2c1800043 100644 --- a/src/pages/Worker/Card/WorkerBusiness.vue +++ b/src/pages/Worker/Card/WorkerBusiness.vue @@ -4,28 +4,42 @@ import { useI18n } from 'vue-i18n'; import { useRoute } from 'vue-router'; import VnTable from 'components/VnTable/VnTable.vue'; import { toDate } from 'src/filters'; -import VnInputDate from 'src/components/common/VnInputDate.vue'; +import { useQuasar } from 'quasar'; +import axios from 'axios'; const { t } = useI18n(); const route = useRoute(); const tableRef = ref(); const entityId = computed(() => route.params.id); +const quasar = useQuasar(); async function reactivateWorker(data) { - console.log('value: ', data); - // if (business === null) return; - // quasar - // .dialog({ - // message: t('Do you want to reactivate the user?'), - // ok: { - // push: true, - // color: 'primary', - // }, - // cancel: true, - // }) - // .onOk(async () => { - // business.isDisable = false; - // }); + console.log('value: ', data.updates[0].data.ended); + console.log('data: ', entityId.value); + // const filter = { + // where: { id: entityId.value }, + // }; + // console.log('filter: ', filter); + const { worker } = await axios.get(`Workers`, { + params: { + filter: JSON.stringify({ id: entityId.value }), + }, + }); + console.log('worker', worker); + if (!data.updates[0].data.ended) { + quasar + .dialog({ + message: t('Do you want to reactivate the user?'), + ok: { + push: true, + color: 'primary', + }, + cancel: true, + }) + .onOk(async () => { + worker.isDisable = false; + }); + } } const columns = computed(() => [ { @@ -218,12 +232,12 @@ const columns = computed(() => [ card-class="grid-two q-gutter-x-md" :is-editable="true" :use-model="true" - @on-data-saved="tableRef.reactivateWorker()" + @save-changes="(data) => reactivateWorker(data)" > - diff --git a/src/pages/Worker/Card/WorkerSummary.vue b/src/pages/Worker/Card/WorkerSummary.vue index 839b1b26c..066dd4b33 100644 --- a/src/pages/Worker/Card/WorkerSummary.vue +++ b/src/pages/Worker/Card/WorkerSummary.vue @@ -225,7 +225,7 @@ const filter = {