AOKB/onboard
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Добавил ФИО и убрал ограничение на показатели

Browse Source
This commit is contained in:
brusnitsyn
2026-07-08 17:02:37 +09:00
parent 8db7f19dda
commit 11ebbe75f5
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Services/Analytics/DataSets/NurseJournalDataSet.php
View File

@@ -65,6 +65,7 @@ class NurseJournalDataSet extends AbstractDataSet
->mapWithKeys(fn ($d) => [$d->department_id => $d->name_full ?? $d->name_short]) ->mapWithKeys(fn ($d) => [$d->department_id => $d->name_full ?? $d->name_short])
->all(), ->all(),
), ),
new Dimension('full_name', 'ФИО', 'string', 'p.full_name')
]; ];
} }

2
resources/js/Pages/Analytics/Builder.vue
View File

@@ -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 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 departmentOptions = computed(() => props.departments.map((d) => ({ label: d.name, value: d.id })))
const isFixed = computed(() => !!currentDataset.value?.fixed) 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 metricOptions = computed(() => {
const ds = currentDataset.value const ds = currentDataset.value