Sync from monorepo: 2025-01-12 19:34:14 - # Korfbal

## Update
- fixed buttons on player selector screen
- Fixed caching for docker container builds
- Moved countdownTimer so lookup should be fixed

apps/game_tracker/models/player_group.py

@@ -50,7 +50,7 @@ def save(self, *args, **kwargs):
 
         if self.starting_type.name != "Reserve":
             reserve_player_group = self.match_data.player_groups.get(
-                starting_type__name="Reserve"
+                starting_type__name="Reserve", team=self.team
             )
             for player in new_players:
                 if player in reserve_player_group.players.all():

configs/webpack/webpack.config.js

@@ -13,7 +13,7 @@ module.exports = {
     output: {
         path: path.resolve(__dirname, 'static_workfile/webpack_bundles'),
         filename: '[name].bundle.js',
-        publicPath: '/static_workfile/webpack_bundles/',
+        publicPath: '../../static_workfile/webpack_bundles/',
         clean: true,
     },
     module: {

docker-compose.yml

@@ -26,6 +26,7 @@ services:
     kwt-redis:
         image: redis:latest
         container_name: kwt-redis
+        restart: unless-stopped
         networks:
             - kwt-net
 
@@ -52,7 +53,6 @@ services:
             - kwt-minio
         environment:
             - .env
-        restart: unless-stopped
         networks:
             - kwt-net
 
@@ -62,7 +62,6 @@ services:
         command: python manage.py migrate
         env_file:
             - .env
-        restart: unless-stopped
         networks:
             - kwt-net
 

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "KWT"
-version = "1.2.4"
+version = "1.2.5"
 
 [tool.black]
 line-length = 88

static_workfile/js/features/clubs/clubDetail.js

@@ -8,7 +8,7 @@ window.addEventListener('DOMContentLoaded', () => {
     const regex = /([a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12})/;
     const url = window.location.href;
 
-    const user_id = document.getElementById('user_id').innerText;
+    const user_id = document.getElementById('user_id').innerText.trim();
     const matches = regex.exec(url);
 
     const infoContainer = document.getElementById('info-container');

static_workfile/js/features/matches/matchDetail.js

@@ -5,16 +5,16 @@ import {
     updateStatistics,
     updateEvents,
 } from '../../components/carousel/index.js';
+import { CountdownTimer } from '../../components/countdown_timer/index.js';
 import { initializeSocket, requestInitialData } from '../../utils/websockets/index.js';
 import { cleanDomCarousel } from '../../utils/dom/';
-import { CountdownTimer } from './common/index.js';
 
 window.addEventListener('DOMContentLoaded', () => {
     const carousel = document.querySelector('.carousel');
     const buttons = document.querySelectorAll('.button');
     const regex = /([a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12})/;
     const url = window.location.href;
-    const user_id = document.getElementById('user_id').innerText;
+    const user_id = document.getElementById('user_id').innerText.trim();
     const matches = regex.exec(url);
 
     let match_id;

static_workfile/js/features/matches/matchTracker.js

@@ -1,4 +1,3 @@
-import { CountdownTimer } from './common/index.js';
 import { truncateMiddle } from '../../utils';
 import {
     createEventTypeDiv,
@@ -7,6 +6,7 @@ import {
     getFormattedTime,
 } from '../../utils/events';
 import { resetSwipe, setupSwipeDelete, deleteButtonSetup } from '../../components/swipe_delete';
+import { CountdownTimer } from '../../components/countdown_timer/index.js';
 import { updatePlayerGroups } from '../../components/carousel';
 import { initializeSocket, onMessageReceived } from '../../utils/websockets/index.js';
 import { scoringButtonSetup, shotButtonReg } from '../../components/scoring_button/index.js';

static_workfile/js/features/matches/playersSelector.js

@@ -205,23 +205,26 @@ class PlayerGroupManager {
     }
 
     mapGroupIdsToTypeIds() {
-        // Map group IDs to type IDs
         this.typeIds.forEach((typeId) => {
+            // We expect an element in the DOM with id == this typeId
             const groupElement = document.getElementById(typeId);
             if (groupElement) {
-                this.groupIdToTypeId[groupElement.innerText] = typeId;
+                this.groupIdToTypeId[groupElement.innerText.trim()] = typeId;
             }
         });
+
+        console.log("groupIdToTypeId: ", this.groupIdToTypeId);
     }
 
     mapTypeIdsToGroupIds() {
-        // Map type IDs to group IDs
         this.typeIds.forEach((typeId) => {
             const groupElement = document.getElementById(typeId);
             if (groupElement) {
-                this.typeIdToGroupId[typeId] = groupElement.innerText;
+                this.typeIdToGroupId[typeId] = groupElement.innerText.trim();
             }
         });
+
+        console.log("typeIdToGroupId: ", this.typeIdToGroupId);
     }
 
     getPlayersGroupsData() {

static_workfile/js/features/teams/teamDetail.js

@@ -14,7 +14,7 @@ window.addEventListener('DOMContentLoaded', () => {
     const regex = /([a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12})/;
     const url = window.location.href;
 
-    const user_id = document.getElementById('user_id').innerText;
+    const user_id = document.getElementById('user_id').innerText.trim();
     const matches = regex.exec(url);
 
     const infoContainer = document.getElementById('info-container');