From 61db08a19b8bf85bbab145c8d176197caa9773cf Mon Sep 17 00:00:00 2001 From: Stefan Zermatten Date: Thu, 24 Aug 2023 10:24:06 +0200 Subject: [PATCH] Long attribute consumed values fixed, string values disable action --- .../computeComputation/computeByType/computeAction.js | 2 +- .../properties/components/actions/AttributeConsumedView.vue | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/imports/api/engine/computation/computeComputation/computeByType/computeAction.js b/app/imports/api/engine/computation/computeComputation/computeByType/computeAction.js index 663922a5..646bd97c 100644 --- a/app/imports/api/engine/computation/computeComputation/computeByType/computeAction.js +++ b/app/imports/api/engine/computation/computeComputation/computeByType/computeAction.js @@ -16,7 +16,7 @@ export default function computeAction(computation, node) { }); prop.resources.attributesConsumed.forEach(attConsumed => { if (!attConsumed.variableName) return; - if (attConsumed.available < attConsumed.quantity?.value) { + if (!(attConsumed.available >= attConsumed.quantity?.value)) { prop.insufficientResources = true; } }); diff --git a/app/imports/client/ui/properties/components/actions/AttributeConsumedView.vue b/app/imports/client/ui/properties/components/actions/AttributeConsumedView.vue index 26571332..ba83a46c 100644 --- a/app/imports/client/ui/properties/components/actions/AttributeConsumedView.vue +++ b/app/imports/client/ui/properties/components/actions/AttributeConsumedView.vue @@ -4,12 +4,13 @@ :class="insufficient && 'error--text'" >
{{ model.quantity && model.quantity.value }}
{{ model.statName || model.variableName }}