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 +7 -4
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9fbfa3861d - Show all commits

11
app/api/assiduites.py
View File

@ -11,7 +11,7 @@ from flask import g, request
from flask_json import as_json from flask_json import as_json
from flask_login import current_user, login_required from flask_login import current_user, login_required
from app import db, log from app import db, log, set_sco_dept
import app.scodoc.sco_assiduites as scass import app.scodoc.sco_assiduites as scass
import app.scodoc.sco_utils as scu import app.scodoc.sco_utils as scu
from app.api import api_bp as bp from app.api import api_bp as bp
@ -474,13 +474,14 @@ def assiduite_create(etudid: int = None, nip=None, ine=None):
""" """
etud: Identite = tools.get_etud(etudid, nip, ine) etud: Identite = tools.get_etud(etudid, nip, ine)
if etud is None: if etud is None:
return json_error( return json_error(
404, 404,
message="étudiant inconnu", message="étudiant inconnu",
) )
if not hasattr(g, "scodoc_dept_id") and etud.dept_id is not None:
# route sans département
set_sco_dept(etud.departement.acronym)
create_list: list[object] = request.get_json(force=True) create_list: list[object] = request.get_json(force=True)
if not isinstance(create_list, list): if not isinstance(create_list, list):
@ -533,7 +534,6 @@ def assiduites_create():
""" """
create_list: list[object] = request.get_json(force=True) create_list: list[object] = request.get_json(force=True)
if not isinstance(create_list, list): if not isinstance(create_list, list):
return json_error(404, "Le contenu envoyé n'est pas une liste") return json_error(404, "Le contenu envoyé n'est pas une liste")
@ -544,6 +544,9 @@ def assiduites_create():
if etud is None: if etud is None:
errors.append({"indice": i, "message": "Cet étudiant n'existe pas."}) errors.append({"indice": i, "message": "Cet étudiant n'existe pas."})
continue continue
if not hasattr(g, "scodoc_dept_id") and etud.dept_id is not None:
# route sans département
set_sco_dept(etud.departement.acronym)
code, obj = _create_singular(data, etud) code, obj = _create_singular(data, etud)
if code == 404: if code == 404: