From 11ebbe75f59ec4f1b92afd3164257896f6d05e25 Mon Sep 17 00:00:00 2001 From: brusnitsyn Date: Wed, 8 Jul 2026 17:02:37 +0900 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?= =?UTF-8?q?=D0=A4=D0=98=D0=9E=20=D0=B8=20=D1=83=D0=B1=D1=80=D0=B0=D0=BB=20?= =?UTF-8?q?=D0=BE=D0=B3=D1=80=D0=B0=D0=BD=D0=B8=D1=87=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20=D0=BD=D0=B0=20=D0=BF=D0=BE=D0=BA=D0=B0=D0=B7=D0=B0?= =?UTF-8?q?=D1=82=D0=B5=D0=BB=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Services/Analytics/DataSets/NurseJournalDataSet.php | 1 + resources/js/Pages/Analytics/Builder.vue | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Services/Analytics/DataSets/NurseJournalDataSet.php b/app/Services/Analytics/DataSets/NurseJournalDataSet.php index c42e7d8..bf0c1a6 100644 --- a/app/Services/Analytics/DataSets/NurseJournalDataSet.php +++ b/app/Services/Analytics/DataSets/NurseJournalDataSet.php @@ -65,6 +65,7 @@ class NurseJournalDataSet extends AbstractDataSet ->mapWithKeys(fn ($d) => [$d->department_id => $d->name_full ?? $d->name_short]) ->all(), ), + new Dimension('full_name', 'ФИО', 'string', 'p.full_name') ]; } diff --git a/resources/js/Pages/Analytics/Builder.vue b/resources/js/Pages/Analytics/Builder.vue index 3bc1748..6c24441 100644 --- a/resources/js/Pages/Analytics/Builder.vue +++ b/resources/js/Pages/Analytics/Builder.vue @@ -62,7 +62,7 @@ const dateModel = ref(props.date?.length ? [...props.date] : null) const currentDataset = computed(() => props.datasets.find((d) => d.key === config.dataset) ?? null) const departmentOptions = computed(() => props.departments.map((d) => ({ label: d.name, value: d.id }))) const isFixed = computed(() => !!currentDataset.value?.fixed) -const canGenerate = computed(() => !!config.dataset && (isFixed.value || config.measures.length > 0)) +const canGenerate = computed(() => !!config.dataset || (isFixed.value || config.measures.length > 0)) const metricOptions = computed(() => { const ds = currentDataset.value