Merge pull request #5 from Arzte/fix-requireds

Fix Or Requireds not showing
ltouroumov · Jul 1, 2024 · 4ee875c · 4ee875c
2 parents fe38393 + f2dc3f4
commit 4ee875c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/components/viewer/ViewProjectObj.vue b/components/viewer/ViewProjectObj.vue
@@ -181,6 +181,7 @@ const decrement = () => {
 
     .obj-text {
       text-align: center;
+      margin-top: 1rem;
     }
   }
 }

diff --git a/components/viewer/ViewRequirement.vue b/components/viewer/ViewRequirement.vue
@@ -5,7 +5,16 @@
     :class="{ disabled: !isEnabled }"
   >
     <span v-if="req.beforeText">{{ req.beforeText }}</span>
-    <span>{{ getObject(req.reqId)?.title ?? '???' }}</span>
+    <div v-if="req.type === 'id'">
+      <span>{{ getObject(req.reqId)?.title ?? '???' }}</span>
+    </div>
+    <div v-else-if="req.type === 'or'">
+      <span v-for="(orReq, idx) in req.orRequired" :key="idx">
+        <span v-if="idx > 0">, or</span>
+        {{ getObject(orReq.req)?.title ?? '???' }}
+      </span>
+    </div>
+    <div v-else>Unknown Condition</div>
     <span v-if="req.afterText">{{ req.afterText }}</span>
   </div>
 </template>