fixes

icpc · Dec 9, 2023 · 1cbd387 · 1cbd387
1 parent d8431c1
commit 1cbd387
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/src/frontend/admin/src/components/SniperLocator.js b/src/frontend/admin/src/components/SniperLocator.js
@@ -144,12 +144,19 @@ const SniperViewManager = ({ service }) => {
         }
     }, [selectedInstance]);
 
+    const [selectedTeamName, selectedTeamCdsId] = useMemo(() => {
+        if (selectedTeamId === undefined) {
+            return ["", null];
+        }
+        const team = teams.find(team => team.id === selectedTeamId);
+        return [team?.name ?? "", team?.contestSystemId];
+    }, [teams, selectedTeamId]);
+
     const onMove = useCallback(() => {
         const settings = {
             sniperId: sniper,
-            teamId: selectedTeamId,
+            teamId: selectedTeamCdsId,
         };
-        console.log(settings);
         service.moveWithSettings(settings);
         setSelectedInstance(undefined);
         setSelectedTeamId(undefined);
@@ -158,7 +165,7 @@ const SniperViewManager = ({ service }) => {
     const onShow = useCallback(() => {
         const settings = {
             sniperId: sniper,
-            teamId: selectedTeamId,
+            teamId: selectedTeamCdsId,
         };
         service.showWithSettings(settings);
         setSelectedInstance(undefined);
@@ -169,13 +176,6 @@ const SniperViewManager = ({ service }) => {
         service.hide();
     }, [service]);
 
-    const selectedTeamName = useMemo(() => {
-        if (selectedTeamId === undefined) {
-            return "";
-        }
-        return teams.find(team => team.id === selectedTeamId).name;
-    }, [teams, selectedTeamId]);
-
     return (
         <Box>
             <Box sx={{ mb: 1 }} display="flex" flexWrap="wrap" justifyContent="space-between" alignItems="center">

diff --git a/src/sniper-locator-controller/src/main/kotlin/org/icpclive/sniper/Util.kt b/src/sniper-locator-controller/src/main/kotlin/org/icpclive/sniper/Util.kt
@@ -74,7 +74,7 @@ object Util {
     }
 
      fun loadLocatorPoints(sniperNumber: Int): List<LocatorPoint> {
-        val scanner = Scanner(Config.configDirectory.resolve("/coordinates-$sniperNumber.txt"))
+        val scanner = Scanner(Config.configDirectory.resolve("coordinates-$sniperNumber.txt").toFile())
         val n = scanner.nextInt()
 
         val allPoints = mutableListOf<LocatorPoint>()