From d69ada0db4d58ea2a9fbab0efd1eef5ae970846e Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Tue, 23 Feb 2021 14:53:47 +0200
Subject: [PATCH] Slot quantity is now a computed value, added property viewer
 for slots

---
 .../engine/computeEndStepProperty.js          |  1 +
 .../computation/engine/evaluateCalculation.js |  3 ++
 .../denormalise/recomputeSlotFullness.js      |  8 +++--
 app/imports/api/properties/Slots.js           |  6 ++--
 app/imports/ui/creature/slots/Slots.vue       |  6 ++--
 app/imports/ui/properties/forms/SlotForm.vue  |  2 --
 .../ui/properties/viewers/SlotViewer.vue      | 36 +++++++++++++++++++
 .../viewers/shared/PropertyField.vue          | 10 +++---
 .../viewers/shared/propertyViewerIndex.js     |  2 ++
 9 files changed, 59 insertions(+), 15 deletions(-)
 create mode 100644 app/imports/ui/properties/viewers/SlotViewer.vue

diff --git a/app/imports/api/creature/computation/engine/computeEndStepProperty.js b/app/imports/api/creature/computation/engine/computeEndStepProperty.js
index 931b3d16..e6f1a705 100644
--- a/app/imports/api/creature/computation/engine/computeEndStepProperty.js
+++ b/app/imports/api/creature/computation/engine/computeEndStepProperty.js
@@ -23,6 +23,7 @@ export default function computeEndStepProperty(prop, memo){
       computePropertyField(prop, memo, 'maxPrepared');
       break;
     case 'propertySlot':
+      computePropertyField(prop, memo, 'quantityExpected');
       computePropertyField(prop, memo, 'slotCondition');
       break;
     case 'roll':
diff --git a/app/imports/api/creature/computation/engine/evaluateCalculation.js b/app/imports/api/creature/computation/engine/evaluateCalculation.js
index bf071622..02028063 100644
--- a/app/imports/api/creature/computation/engine/evaluateCalculation.js
+++ b/app/imports/api/creature/computation/engine/evaluateCalculation.js
@@ -21,6 +21,9 @@ export default function evaluateCalculation({
     context,
     dependencies,
   };
+  if (typeof string !== 'string'){
+    string = string.toString();
+  }
   // Parse the string
   let calc;
   try {
diff --git a/app/imports/api/creature/denormalise/recomputeSlotFullness.js b/app/imports/api/creature/denormalise/recomputeSlotFullness.js
index 2b4e60ba..a99731c7 100644
--- a/app/imports/api/creature/denormalise/recomputeSlotFullness.js
+++ b/app/imports/api/creature/denormalise/recomputeSlotFullness.js
@@ -23,10 +23,14 @@ export default function recomputeSlotFullness(ancestorId){
       }
     });
     let spaceLeft;
-    if (slot.quantityExpected === 0){
+    let expected = slot.quantityExpectedResult;
+    if (typeof expected !== 'number'){
+      expected = 1;
+    }
+    if (expected === 0){
       spaceLeft = null;
     } else {
-      spaceLeft = slot.quantityExpected - totalFilled;
+      spaceLeft = expected - totalFilled;
     }
     if (slot.totalFilled !== totalFilled || slot.spaceLeft !== spaceLeft){
       CreatureProperties.update(slot._id, {
diff --git a/app/imports/api/properties/Slots.js b/app/imports/api/properties/Slots.js
index b07db858..872d6171 100644
--- a/app/imports/api/properties/Slots.js
+++ b/app/imports/api/properties/Slots.js
@@ -22,9 +22,9 @@ let SlotSchema = new SimpleSchema({
 		type: String,
 	},
   quantityExpected: {
-    type: SimpleSchema.Integer,
-    defaultValue: 1,
-    min: 0,
+    type: String,
+    optional: true,
+    defaultValue: '1',
   },
   ignored: {
     type: Boolean,
diff --git a/app/imports/ui/creature/slots/Slots.vue b/app/imports/ui/creature/slots/Slots.vue
index 569888cd..834c6261 100644
--- a/app/imports/ui/creature/slots/Slots.vue
+++ b/app/imports/ui/creature/slots/Slots.vue
@@ -8,8 +8,8 @@
       <h3 class="layout row align-center">
         {{ slot.name }}
         <v-spacer />
-        <span v-if="slot.quantityExpected > 1">
-          {{ slot.totalFilled }} / {{ slot.quantityExpected }}
+        <span v-if="slot.quantityExpectedResult > 1">
+          {{ slot.totalFilled }} / {{ slot.quantityExpectedResult }}
         </span>
       </h3>
       <v-list v-if="slot.children.length">
@@ -38,7 +38,7 @@
         </v-list-tile>
       </v-list>
       <v-btn
-        v-if="!slot.quantityExpected || slot.spaceLeft"
+        v-if="!slot.quantityExpectedResult || slot.spaceLeft"
         icon
         :data-id="`slot-add-button-${slot._id}`"
         class="slot-add-button"
diff --git a/app/imports/ui/properties/forms/SlotForm.vue b/app/imports/ui/properties/forms/SlotForm.vue
index fd564382..a1a11c3e 100644
--- a/app/imports/ui/properties/forms/SlotForm.vue
+++ b/app/imports/ui/properties/forms/SlotForm.vue
@@ -28,8 +28,6 @@
     />
     <text-field
       label="Quantity"
-      type="number"
-      min="0"
       hint="How many matching properties must be used to fill this slot, 0 is unlimited"
       :value="model.quantityExpected"
       :error-messages="errors.quantityExpected"
diff --git a/app/imports/ui/properties/viewers/SlotViewer.vue b/app/imports/ui/properties/viewers/SlotViewer.vue
new file mode 100644
index 00000000..35ed032d
--- /dev/null
+++ b/app/imports/ui/properties/viewers/SlotViewer.vue
@@ -0,0 +1,36 @@
+<template lang="html">
+  <div class="buff-viewer">
+    <property-name :value="model.name" />
+    <property-field
+      name="Type"
+      :value="model.slotType"
+    />
+    <property-field
+      name="Quantity"
+      :value="'quantityExpectedResult' in model ? model.quantityExpectedResult : model.quantityExpected"
+    />
+    <property-field
+      name="Condition"
+      :value="'slotConditionResult' in model ? model.slotConditionResult : model.slotCondition"
+    />
+    <template v-if="model.tags.length">
+      <div class="caption">
+        Tags
+      </div>
+      <property-tags :tags="model.tags" />
+    </template>
+    <property-description
+      :string="model.description"
+      :calculations="model.descriptionCalculations"
+      :inactive="model.inactive"
+    />
+  </div>
+</template>
+
+<script>
+	import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js'
+
+	export default {
+		mixins: [propertyViewerMixin],
+	}
+</script>
diff --git a/app/imports/ui/properties/viewers/shared/PropertyField.vue b/app/imports/ui/properties/viewers/shared/PropertyField.vue
index fa7b6dd9..ab21be4c 100644
--- a/app/imports/ui/properties/viewers/shared/PropertyField.vue
+++ b/app/imports/ui/properties/viewers/shared/PropertyField.vue
@@ -1,11 +1,11 @@
 <template lang="html">
   <div v-if="value !== undefined || $slots.default">
-  	<div class="caption">
-  		{{name}}
-  	</div>
+    <div class="caption">
+      {{ name }}
+    </div>
     <p class="ml-2 subheading">
       <slot>
-        {{value}}
+        {{ value }}
       </slot>
     </p>
   </div>
@@ -15,7 +15,7 @@
 export default {
 	props: {
 		name: String,
-		value: [String, Number],
+		value: [String, Number, Boolean],
 	}
 }
 </script>
diff --git a/app/imports/ui/properties/viewers/shared/propertyViewerIndex.js b/app/imports/ui/properties/viewers/shared/propertyViewerIndex.js
index 8fe203c8..119d2faa 100644
--- a/app/imports/ui/properties/viewers/shared/propertyViewerIndex.js
+++ b/app/imports/ui/properties/viewers/shared/propertyViewerIndex.js
@@ -17,6 +17,7 @@ import ProficiencyViewer from '/imports/ui/properties/viewers/ProficiencyViewer.
 import RollViewer from '/imports/ui/properties/viewers/RollViewer.vue';
 import SkillViewer from '/imports/ui/properties/viewers/SkillViewer.vue';
 import SavingThrowViewer from '/imports/ui/properties/viewers/SavingThrowViewer.vue';
+import SlotViewer from '/imports/ui/properties/viewers/SlotViewer.vue';
 import SpellListViewer from '/imports/ui/properties/viewers/SpellListViewer.vue';
 import SpellViewer from '/imports/ui/properties/viewers/SpellViewer.vue';
 
@@ -39,6 +40,7 @@ export default {
   proficiency: ProficiencyViewer,
   roll: RollViewer,
   savingThrow: SavingThrowViewer,
+  propertySlot: SlotViewer,
   skill: SkillViewer,
   spellList: SpellListViewer,
   spell: SpellViewer,