opolka/ScoDoc
1
0
Fork 0
forked from ScoDoc/ScoDoc
Code Issues Pull Requests Activity

Update opolka/ScoDoc from ScoDoc/ScoDoc #2

Merged
opolka merged 1272 commits from ScoDoc/ScoDoc:master into master 2024-05-27 09:11:04 +02:00
Conversation 0 Commits 1272 Files Changed 656 +17 -16
4 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 574fae2170 - Show all commits

21
app/scodoc/sco_preferences.py
View File

@ -631,16 +631,16 @@ class BasePreferences:
"category": "assi", "category": "assi",
}, },
), ),
( # (
"forcer_present", # "forcer_present",
{ # {
"initvalue": 0, # "initvalue": 0,
"title": "Forcer l'appel des présents", # "title": "Forcer l'appel des présents",
"input_type": "boolcheckbox", # "input_type": "boolcheckbox",
"labels": ["non", "oui"], # "labels": ["non", "oui"],
"category": "assi", # "category": "assi",
}, # },
), # ),
( (
"periode_defaut", "periode_defaut",
{ {
@ -656,6 +656,7 @@ class BasePreferences:
( (
"assi_etat_defaut", "assi_etat_defaut",
{ {
"explanation": "⚠ non fonctionnel, travaux en cours !",
"initvalue": "aucun", "initvalue": "aucun",
"input_type": "menu", "input_type": "menu",
"labels": ["aucun", "present", "retard", "absent"], "labels": ["aucun", "present", "retard", "absent"],

6
app/templates/assiduites/widgets/differee.j2
View File

@ -273,7 +273,7 @@
</style> </style>
<script> <script>
const etatDef = "{{etat_def}}"; const assi_etat_defaut = "{{assi_etat_defaut}}";
window.forceModule = "{{ forcer_module }}" window.forceModule = "{{ forcer_module }}"
window.forceModule = window.forceModule == "True" ? true : false window.forceModule = window.forceModule == "True" ? true : false
@ -375,8 +375,8 @@
rows[i].appendChild(td); rows[i].appendChild(td);
if (etatDef != "" && etatDef != "aucun") { if (assi_etat_defaut != "" && assi_etat_defaut != "aucun") {
const inp = td.querySelector(`[value='${etatDef}']`).checked = true; const inp = td.querySelector(`[value='${assi_etat_defaut}']`).checked = true;
} }
} }
} }

4
app/views/assiduites.py
View File

@ -1317,7 +1317,7 @@ def _differee(
dept_id=g.scodoc_dept_id, dept_id=g.scodoc_dept_id,
) )
etat_def = sco_preferences.get_preference( assi_etat_defaut = sco_preferences.get_preference(
"assi_etat_defaut", "assi_etat_defaut",
formsemestre_id=formsemestre_id, formsemestre_id=formsemestre_id,
dept_id=g.scodoc_dept_id, dept_id=g.scodoc_dept_id,
@ -1326,7 +1326,7 @@ def _differee(
return render_template( return render_template(
"assiduites/widgets/differee.j2", "assiduites/widgets/differee.j2",
etudiants=etudiants, etudiants=etudiants,
etat_def=etat_def, assi_etat_defaut=assi_etat_defaut,
forcer_module=forcer_module, forcer_module=forcer_module,
moduleimpl_select=moduleimpl_select, moduleimpl_select=moduleimpl_select,
date=date, date=date,

2
requirements-3.11.txt
View File

@ -107,7 +107,7 @@ urllib3==2.0.6
visitor==0.1.3 visitor==0.1.3
weasyprint==60.1 weasyprint==60.1
webencodings==0.5.1 webencodings==0.5.1
Werkzeug==3.0.0 Werkzeug==2.3.7
wrapt==1.15.0 wrapt==1.15.0
WTForms==3.0.1 WTForms==3.0.1
xmltodict==0.13.0 xmltodict==0.13.0