Fix problem names for 2025

participation/models.py

@@ -1414,8 +1414,8 @@ class Pool(models.Model):
 
             if has_observer:
                 merge_cells.append(f"{getcol(9 + i * passage_width)}2:{getcol(10 + i * passage_width)}2")
-            merge_cells.append(f"{getcol(9 + i * passage_width)}{max_row + 3}"
-                               f":{getcol(10 + i * passage_width)}{max_row + 3}")
+                merge_cells.append(f"{getcol(9 + i * passage_width)}{max_row + 3}"
+                                   f":{getcol(10 + i * passage_width)}{max_row + 3}")
         merge_cells.append(f"A{max_row + 1}:B{max_row + 1}")
         merge_cells.append(f"A{max_row + 2}:B{max_row + 2}")
         merge_cells.append(f"A{max_row + 3}:B{max_row + 3}")

tfjm/settings.py

@@ -389,14 +389,14 @@ if TFJM_APP == "TFJM":
     )
 
     PROBLEMS = [
-        "Triominos",
-        "Rassemblements mathématiques",
-        "Tournoi de ping-pong",
-        "Dépollution de la Seine",
-        "Électron libre",
-        "Pièces truquées",
-        "Drôles de cookies",
-        "Création d'un jeu",
+        "Une bonne humeur contagieuse",
+        "Drôles de toboggans",
+        "Plats à tarte gradués",
+        "Transformation de papillons",
+        "Gerrymandering",
+        "Le cauchemar de la ligne 20-25",
+        "Taxes routières",
+        "Points colorés sur un cercle",
     ]
 elif TFJM_APP == "ETEAM":
     PREFERRED_LANGUAGE_CODE = 'en'

tfjm/static/tfjm/js/main.js

@@ -1,9 +1,9 @@
-function initModal(target, url, content_id = 'form-content') {
+function initModal(target, url, content_id = 'form-content', always_refetch = false) {
     document.querySelectorAll('[data-bs-target="#' + target + 'Modal"]')
       .forEach(elem => elem.addEventListener('click', () => {
         let modalBody = document.querySelector("#" + target + "Modal div.modal-body")
 
-        if (!modalBody.innerHTML.trim()) {
+        if (!modalBody.innerHTML.trim() || always_refetch) {
             if (url instanceof Function) url = url()
 
             fetch(url, {headers: {'CONTENT-ONLY': '1'}})

tfjm/templates/base.html

@@ -106,7 +106,7 @@
         {% if user.is_authenticated and user.registration.is_admin %}
             initModal("search",
                 () => "{% url "haystack_search" %}?q=" + encodeURI(document.getElementById("search-term").value),
-                "search-results")
+                "search-results", true)
         {% endif %}
 
         {% if not user.is_authenticated %}