Updated forms and some UI for new data structure

2021-09-28 14:25:11 +02:00
parent b471d0c5cf
commit cb10b53a10
52 changed files with 304 additions and 301 deletions
--- a/app/imports/ui/properties/treeNodeViews/EffectTreeNode.vue
+++ b/app/imports/ui/properties/treeNodeViews/EffectTreeNode.vue
@@ -37,7 +37,8 @@ export default {
  mixins: [treeNodeViewMixin],
  computed: {
    resolvedValue(){
-      return this.model.result !== undefined ? this.model.result : this.model.calculation;
+      return (this.model.amount && this.model.amount.value) !== undefined ?
+        this.model.amount.value : this.model.amount && this.model.amount.calculation;
    },
    effectIcon(){
      let value = this.resolvedValue;