ynerant/plateforme-tfjm2
1
0
Fork 0
mirror of https://gitlab.com/animath/si/plateforme.git synced 2025-05-01 17:31:33 +00:00
Code Issues Releases Wiki Activity

Compare commits

base: ynerant:0499885fc8031852f75f0276e2cab87520c34d5d
Branches Tags
ynerant:dev
ynerant:main
ynerant:docs
..
compare: ynerant:56aad288f444faba7e8ad8417d4d1e042f2f6b62
Branches Tags
ynerant:dev
ynerant:main
ynerant:docs

No commits in common. "0499885fc8031852f75f0276e2cab87520c34d5d" and "56aad288f444faba7e8ad8417d4d1e042f2f6b62" have entirely different histories.
0499885fc8 ... 56aad288f4

4 changed files with 13 additions and 13 deletions
Show Stats Expand all files Collapse all files

4
participation/models.py
View File

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

16
tfjm/settings.py
View File

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

4
tfjm/static/tfjm/js/main.js
View File

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

2
tfjm/templates/base.html
View File

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