cleo/ScoDoc-PE
1
0
Fork 0
Code Issues 4 Pull Requests Packages Projects Releases Wiki Activity

cosmetic

Browse Source
This commit is contained in:
Emmanuel Viennet 2022-01-03 12:31:20 +01:00
parent e0be0f8fee
commit b6a3bd2388
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/comp/res_sem.py
View File

@ -230,7 +230,7 @@ class NotesTableCompat(ResultatsSemestre):
def get_etud_ue_status(self, etudid: int, ue_id: int): def get_etud_ue_status(self, etudid: int, ue_id: int):
return { return {
"cur_moy_ue": self.results.etud_moy_ue[ue_id][etudid], "cur_moy_ue": self.etud_moy_ue[ue_id][etudid],
"is_capitalized": False, # XXX TODO "is_capitalized": False, # XXX TODO
} }
@ -242,9 +242,9 @@ class NotesTableCompat(ResultatsSemestre):
def get_evals_in_mod(self, moduleimpl_id: int) -> list[dict]: def get_evals_in_mod(self, moduleimpl_id: int) -> list[dict]:
"liste des évaluations valides dans un module" "liste des évaluations valides dans un module"
mi = ModuleImpl.query.get(moduleimpl_id) modimpl = ModuleImpl.query.get(moduleimpl_id)
evals_results = [] evals_results = []
for e in mi.evaluations: for e in modimpl.evaluations:
d = e.to_dict() d = e.to_dict()
d["heure_debut"] = e.heure_debut # datetime.time d["heure_debut"] = e.heure_debut # datetime.time
d["heure_fin"] = e.heure_fin d["heure_fin"] = e.heure_fin

3
scodoc.py
View File

@ -29,7 +29,6 @@ from app.models import ModuleImpl, ModuleImplInscription
from app.models import Identite from app.models import Identite
from app.models import departements from app.models import departements
from app.models.evaluations import Evaluation from app.models.evaluations import Evaluation
from app.scodoc.sco_etud import identite_create
from app.scodoc.sco_permissions import Permission from app.scodoc.sco_permissions import Permission
from app.views import notes, scolar from app.views import notes, scolar
import tools import tools
@ -248,6 +247,7 @@ def edit_role(rolename, addpermissionname=None, removepermissionname=None): # e
db.session.add(role) db.session.add(role)
db.session.commit() db.session.commit()
@app.cli.command() @app.cli.command()
@click.argument("rolename") @click.argument("rolename")
def delete_role(rolename): def delete_role(rolename):
@ -259,6 +259,7 @@ def delete_role(rolename):
db.session.delete(role) db.session.delete(role)
db.session.commit() db.session.commit()
@app.cli.command() @app.cli.command()
@click.argument("username") @click.argument("username")
@click.option("-d", "--dept", "dept_acronym") @click.option("-d", "--dept", "dept_acronym")

2
tools/debian/postinst
View File

@ -64,7 +64,7 @@ fi
# ------------ LIEN VERS .env # ------------ LIEN VERS .env
# Pour conserver le .env entre les mises à jour, on le génère dans # Pour conserver le .env entre les mises à jour, on le génère dans
# /opt/scodoc-data/;env et on le lie: # /opt/scodoc-data/.env et on le lie:
if [ ! -e "$SCODOC_DIR/.env" ] && [ ! -L "$SCODOC_DIR/.env" ] if [ ! -e "$SCODOC_DIR/.env" ] && [ ! -L "$SCODOC_DIR/.env" ]
then then
ln -s "$SCODOC_VAR_DIR/.env" "$SCODOC_DIR" ln -s "$SCODOC_VAR_DIR/.env" "$SCODOC_DIR"