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

3
app/but/jury_but_view.py
View File

@ -110,17 +110,20 @@ def show_etud(deca: DecisionsProposeesAnnee, read_only: bool = True) -> str:
) )
ue_impair, ue_pair = rcue.ue_1, rcue.ue_2 ue_impair, ue_pair = rcue.ue_1, rcue.ue_2
# Les UEs à afficher : on regarde si read only et si dispense (non ré-inscription à l'UE) # Les UEs à afficher : on regarde si read only et si dispense (non ré-inscription à l'UE)
# tuples (UniteEns, read_only, dispense)
ues_ro_dispense = [ ues_ro_dispense = [
( (
ue_impair, ue_impair,
rcue.ue_cur_impair is None, rcue.ue_cur_impair is None,
deca.res_impair deca.res_impair
and ue_impair
and (deca.etud.id, ue_impair.id) in deca.res_impair.dispense_ues, and (deca.etud.id, ue_impair.id) in deca.res_impair.dispense_ues,
), ),
( (
ue_pair, ue_pair,
rcue.ue_cur_pair is None, rcue.ue_cur_pair is None,
deca.res_pair deca.res_pair
and ue_pair
and (deca.etud.id, ue_pair.id) in deca.res_pair.dispense_ues, and (deca.etud.id, ue_pair.id) in deca.res_pair.dispense_ues,
), ),
] ]

2
sco_version.py
View File

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