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

12
app/scodoc/sco_groups.py
View File

@ -560,10 +560,10 @@ 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=str(group["group_id"]), group_id=str(group["group_id"]),
group_name=group["group_name"], group_name=group["group_name"] or "",
) )
x_response.append(x_group) x_response.append(x_group)
for e in get_group_members(group["group_id"]): for e in get_group_members(group["group_id"]):
@ -572,10 +572,10 @@ def XMLgetGroupsInPartition(partition_id): # was XMLgetGroupesTD
Element( Element(
"etud", "etud",
etudid=str(e["etudid"]), etudid=str(e["etudid"]),
civilite=etud["civilite_str"], civilite=etud["civilite_str"] or "",
sexe=etud["civilite_str"], # compat sexe=etud["civilite_str"] or "", # compat
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),
) )
) )