Selection Limit

ltouroumov · Sep 3, 2023 · 95994fe · 95994fe
1 parent 4dbfa8e
commit 95994fe
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 4 deletions.
diff --git a/components/viewer/ViewScoreStatus.vue b/components/viewer/ViewScoreStatus.vue
@@ -6,7 +6,7 @@
       class="d-flex flex-row gap-2"
     >
       <span v-if="score.beforeText">{{ score.beforeText }}</span>
-      <span>{{ value }}</span>
+      <span>{{ -value }}</span>
       <span v-if="score.afterText">{{ score.afterText }}</span>
     </span>
   </div>

diff --git a/composables/project.ts b/composables/project.ts
@@ -55,6 +55,7 @@ export type ProjectRow = HasId &
     objectWidth: string;
 
     resultGroupId: string;
+    allowedChoices: number;
 
     objects: ProjectObj[];
   };

diff --git a/composables/store/project.ts b/composables/store/project.ts
@@ -79,7 +79,26 @@ export const useProjectStore = defineStore('project', () => {
 
   const setSelected = (id: string, isSelected: boolean) => {
     if (isSelected) {
-      selected.value = R.append(id, selected.value);
+      const rowId = getObjectRow.value(id);
+      const row = getRow.value(rowId);
+      if (row.allowedChoices > 0) {
+        const selectedRowObjects = R.intersection(
+          selected.value,
+          R.map(R.prop('id'), row.objects),
+        );
+
+        if (selectedRowObjects.length >= row.allowedChoices) {
+          const toDeselect = selectedRowObjects[0];
+          selected.value = R.pipe(
+            R.without([toDeselect]),
+            R.append(id),
+          )(selected.value);
+        } else {
+          selected.value = R.append(id, selected.value);
+        }
+      } else {
+        selected.value = R.append(id, selected.value);
+      }
     } else {
       selected.value = R.without([id], selected.value);
     }
@@ -106,7 +125,7 @@ export const useProjectStore = defineStore('project', () => {
           }),
           R.map(({ id, value }: Score): [string, number] => [
             id,
-            -Number.parseInt(value),
+            Number.parseInt(value),
           ]),
         )(scores);
       }),
@@ -115,6 +134,7 @@ export const useProjectStore = defineStore('project', () => {
         0,
         ([id, _]) => id,
       ),
+      R.mergeWith(R.add, startingSums),
     )(_selected);
   });
 

diff --git a/pages/index.vue b/pages/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-if="isLoaded" id="container">
+  <div v-if="!isLoaded" id="container">
     <div id="dialog">
       <LoadProject />
     </div>

diff --git a/pages/viewer.vue b/pages/viewer.vue
@@ -22,6 +22,14 @@
             Worm V6 (Lt's Fork)
           </a>
         </li>
+        <li class="list-group-item">
+          <a
+            href="https://raw.githubusercontent.com/ltouroumov/worm-cyoa-v6-fork/master/xenon.json"
+            @click.prevent="loadRemoteFile"
+          >
+            Xenon (WIP)
+          </a>
+        </li>
       </ul>
 
       <div