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 -6
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2c93c35aa7 - Show all commits

3
app/scodoc/sco_formation_recap.py
View File

@ -28,13 +28,14 @@
"""Table recap formation (avec champs éditables) """Table recap formation (avec champs éditables)
""" """
import io import io
from zipfile import ZipFile, BadZipfile from zipfile import ZipFile
from flask import Response from flask import Response
from flask import send_file, url_for from flask import send_file, url_for
from flask import g, request from flask import g, request
from flask_login import current_user from flask_login import current_user
from app import db
from app.models import Formation, FormSemestre, Matiere, Module, UniteEns from app.models import Formation, FormSemestre, Matiere, Module, UniteEns
from app.scodoc.gen_tables import GenTable from app.scodoc.gen_tables import GenTable

8
app/scodoc/sco_groups.py
View File

@ -587,7 +587,7 @@ def XMLgetGroupsInPartition(partition_id): # was XMLgetGroupesTD
x_group = Element( x_group = Element(
"group", "group",
partition_id=str(partition_id), partition_id=str(partition_id),
partition_name=partition["partition_name"], partition_name=partition["partition_name"] or "",
groups_editable=str(int(partition["groups_editable"])), groups_editable=str(int(partition["groups_editable"])),
group_id="_none_", group_id="_none_",
group_name="", group_name="",
@ -599,9 +599,9 @@ def XMLgetGroupsInPartition(partition_id): # was XMLgetGroupesTD
Element( Element(
"etud", "etud",
etudid=str(etud["etudid"]), etudid=str(etud["etudid"]),
sexe=etud["civilite_str"], sexe=etud["civilite_str"] or "",
nom=sco_etud.format_nom(etud["nom"]), nom=sco_etud.format_nom(etud["nom"] or ""),
prenom=sco_etud.format_prenom(etud["prenom"]), prenom=sco_etud.format_prenom(etud["prenom"] or ""),
origin=_comp_etud_origin(etud, formsemestre), origin=_comp_etud_origin(etud, formsemestre),
) )
) )

2
sco_version.py
View File

@ -1,7 +1,7 @@
# -*- mode: python -*- # -*- mode: python -*-
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
SCOVERSION = "9.5.2" SCOVERSION = "9.5.3"
SCONAME = "ScoDoc" SCONAME = "ScoDoc"