From 92a588bfcca2aee11224e0501f02f27d27930e9d Mon Sep 17 00:00:00 2001 From: Stefan Zermatten Date: Thu, 3 Mar 2022 16:19:54 +0200 Subject: [PATCH] Added slotFillerCondition field to class levels, same as in slot filler --- app/imports/api/properties/ClassLevels.js | 6 ++++++ app/imports/ui/properties/forms/ClassLevelForm.vue | 12 ++++++++++++ app/imports/ui/properties/forms/SlotFillerForm.vue | 5 ----- .../ui/properties/viewers/ClassLevelViewer.vue | 6 ++++++ .../ui/properties/viewers/SlotFillerViewer.vue | 2 +- 5 files changed, 25 insertions(+), 6 deletions(-) diff --git a/app/imports/api/properties/ClassLevels.js b/app/imports/api/properties/ClassLevels.js index 3d97ab21..f0600917 100644 --- a/app/imports/api/properties/ClassLevels.js +++ b/app/imports/api/properties/ClassLevels.js @@ -26,6 +26,12 @@ const ClassLevelSchema = createPropertySchema({ defaultValue: 1, max: STORAGE_LIMITS.levelMax, }, + // Filters out of UI if condition isn't met, but isn't otherwise enforced + slotFillerCondition: { + type: String, + optional: true, + max: STORAGE_LIMITS.calculation, + }, }); const ComputedOnlyClassLevelSchema = createPropertySchema({ diff --git a/app/imports/ui/properties/forms/ClassLevelForm.vue b/app/imports/ui/properties/forms/ClassLevelForm.vue index 8a2615be..e34fe57f 100644 --- a/app/imports/ui/properties/forms/ClassLevelForm.vue +++ b/app/imports/ui/properties/forms/ClassLevelForm.vue @@ -27,6 +27,15 @@ @change="change('variableName', ...arguments)" /> + diff --git a/app/imports/ui/properties/forms/SlotFillerForm.vue b/app/imports/ui/properties/forms/SlotFillerForm.vue index 532ecb94..d0f84567 100644 --- a/app/imports/ui/properties/forms/SlotFillerForm.vue +++ b/app/imports/ui/properties/forms/SlotFillerForm.vue @@ -15,7 +15,6 @@ :error-messages="errors.name" @change="change('name', ...arguments)" /> - import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js'; import PROPERTIES from '/imports/constants/PROPERTIES.js'; - import CalculationErrorList from '/imports/ui/properties/forms/shared/CalculationErrorList.vue'; export default { - components: { - CalculationErrorList, - }, mixins: [propertyFormMixin], inject: { context: { default: {} } diff --git a/app/imports/ui/properties/viewers/ClassLevelViewer.vue b/app/imports/ui/properties/viewers/ClassLevelViewer.vue index 27dca3ca..e475d5fd 100644 --- a/app/imports/ui/properties/viewers/ClassLevelViewer.vue +++ b/app/imports/ui/properties/viewers/ClassLevelViewer.vue @@ -15,6 +15,12 @@ mono :value="model.variableName" /> +