feat: Linking balsa to ZSP

Odyssey-Of-The-Mind-Poland · Mar 28, 2024 · df3c034 · df3c034
1 parent c364110
commit df3c034
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 6 deletions.
diff --git a/odyseja-ui/src/lib/types.ts b/odyseja-ui/src/lib/types.ts
@@ -144,6 +144,7 @@ export type PunctationCells = {
     dt: string,
     style: string,
     penalty: string,
+    balsa: string;
 }
 
 export type SakRequest = {

diff --git a/odyseja-ui/src/routes/panel/gad/+page.svelte b/odyseja-ui/src/routes/panel/gad/+page.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
     import {getGadStatus, runGad, stopGadRun} from "./gadService";
-    import {type Progress, type GadRequest, Status, type PunctationCells} from "$lib/types.js";
+    import {type GadRequest, type Progress, type PunctationCells, Status} from "$lib/types.js";
     import {onDestroy, onMount} from "svelte";
     import {ProgressBar} from "@skeletonlabs/skeleton";
 
@@ -23,7 +23,12 @@
     });
 
     function updateProblemPunctuationCells(index, field, value) {
-        let cell = data.problemPunctuationCells[index] || {dt: '', style: '', penalty: ''} as PunctationCells;
+        let cell = data.problemPunctuationCells[index] || {
+            dt: '',
+            style: '',
+            penalty: '',
+            balsa: ''
+        } as PunctationCells;
         cell[field] = value;
         data.problemPunctuationCells[index] = cell;
     }
@@ -65,6 +70,12 @@
                value="{data.problemPunctuationCells[i]?.penalty ?? ''}"
                on:input={(e) => updateProblemPunctuationCells(i, 'penalty', e.target.value)}
                placeholder="Komórka Punktów karnych"/>
+        {#if i === 4}
+            <input class="input flex-grow flex-1" type="text"
+                   value="{data.problemPunctuationCells[i]?.balsa ?? ''}"
+                   on:input={(e) => updateProblemPunctuationCells(i, 'balsa', e.target.value)}
+                   placeholder="Balsa"/>
+        {/if}
     </div>
 {/each}
 

diff --git a/src/main/kotlin/odyseja/odysejapka/gad/GadRunner.kt b/src/main/kotlin/odyseja/odysejapka/gad/GadRunner.kt
@@ -50,9 +50,10 @@ internal class GadRunner(
             val values = listOf(
                 getZspValue(file.id, cells.dt),
                 getZspValue(file.id, cells.style),
-                getZspValue(file.id, cells.penalty)
+                getZspValue(file.id, cells.penalty),
+                getBalsaValue(file.id, cells.balsa)
             )
-            sheetsAdapter.writeZsp("I${team.zspRow}:K${team.zspRow}", values, sheetTitle)
+            sheetsAdapter.writeZsp("K${team.zspRow}:N${team.zspRow}", values, sheetTitle)
             println("Created: ${file.name}")
         }
     }
@@ -61,6 +62,13 @@ internal class GadRunner(
         return "=importrange(\"https://docs.google.com/spreadsheets/d/$sheetId\";\"Arkusz Ocen Surowych!$cell\")"
     }
 
+    private fun getBalsaValue(sheetId: String, cell: String?): String {
+        if (cell.isNullOrBlank()) {
+            return ""
+        }
+        return "=importrange(\"https://docs.google.com/spreadsheets/d/$sheetId\";\"Arkusz Ocen Cząstkowych!$cell\")"
+    }
+
     private fun templateCell(sheetId: String, cell: String, value: String) {
         val cellValue = sheetsAdapter.getCellValue(cell, sheetId)
         sheetsAdapter.writeCell(cell, cellValue.replace("XXX", value), sheetId)

diff --git a/src/main/kotlin/odyseja/odysejapka/gad/PunctationCells.kt b/src/main/kotlin/odyseja/odysejapka/gad/PunctationCells.kt
@@ -1 +1 @@
-data class PunctationCells(val dt: String, val style: String, val penalty: String)
+data class PunctationCells(val dt: String, val style: String, val penalty: String, val balsa: String?)
diff --git a/src/main/kotlin/odyseja/odysejapka/sak/SakRunner.kt b/src/main/kotlin/odyseja/odysejapka/sak/SakRunner.kt
@@ -60,7 +60,7 @@ internal class SakRunner(
         sheetsAdapter.writeValue(
             zspId,
             team.zspSheet!!,
-            "M${team.zspRow}",
+            "O${team.zspRow}",
             getZspValue(sheetId, sheetName, "${pointsCell.first}${pointsCell.second}")
         )
         processedTeamsCount.incrementAndGet()