Merge pull request #7 from Arzte/selectable

Prevent Non-Selectable objects from being selected
ltouroumov · Jul 2, 2024 · 7178f09 · 7178f09
2 parents 31ba1c1 + b06d59d
commit 7178f09
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/components/viewer/ViewProjectObj.vue b/components/viewer/ViewProjectObj.vue
@@ -2,7 +2,11 @@
   <div :class="objClass">
     <div
       class="project-obj"
-      :class="{ selected: isSelected, disabled: !isEnabled }"
+      :class="{
+        selected: isSelected,
+        disabled: !isEnabled,
+        notSelectable: obj.isNotSelectable || row.isInfoRow,
+      }"
       @click="toggle"
     >
       <div class="project-obj-content">
@@ -105,7 +109,12 @@ const maxSelectedAmount = computed(() =>
 );
 
 const toggle = () => {
-  if (isEnabled.value && !obj.isSelectableMultiple) {
+  if (
+    isEnabled.value &&
+    !obj.isSelectableMultiple &&
+    !obj.isNotSelectable &&
+    !row.isInfoRow
+  ) {
     if (obj.activateOtherChoice) {
       R.split(',', obj.activateThisChoice).forEach((id) => {
         store.setSelected(id, !isSelected.value);
@@ -156,6 +165,11 @@ const decrement = () => {
     background-color: gray;
   }
 
+  &.notSelectable {
+    border: none;
+    border-radius: none;
+  }
+
   .obj-image {
     width: 100%;
     aspect-ratio: 5/3;

diff --git a/components/viewer/ViewProjectRow.vue b/components/viewer/ViewProjectRow.vue
@@ -61,6 +61,7 @@ const isVisible = computed(() => condition(selectedIds.value));
 
     .row-text {
       padding: 5px;
+      text-align: center;
     }
   }
 }

diff --git a/composables/project.ts b/composables/project.ts
@@ -47,6 +47,7 @@ export type ProjectObj = HasId &
     activateThisChoice: string;
 
     isSelectableMultiple: boolean;
+    isNotSelectable: boolean;
     numMultipleTimesMinus: string;
     numMultipleTimesPluss: string;
   };
@@ -62,6 +63,7 @@ export type ProjectRow = HasId &
 
     resultGroupId: string;
     allowedChoices: number;
+    isInfoRow: boolean;
 
     objects: ProjectObj[];
   };