yann/ScoDoc
1
0
Fork 0
forked from ScoDoc/ScoDoc
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://scodoc.org/git/ScoDoc/ScoDoc into api

Browse Source
This commit is contained in:
leonard_montalbano 2022-02-24 14:10:53 +01:00
commit 35be7ebb4c
2 changed files with 31 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/scodoc/sco_bulletins.py
View File

@ -1013,11 +1013,16 @@ def mail_bulletin(formsemestre_id, I, pdfdata, filename, recipient_addr):
intro_mail = sco_preferences.get_preference("bul_intro_mail", formsemestre_id) intro_mail = sco_preferences.get_preference("bul_intro_mail", formsemestre_id)
if intro_mail: if intro_mail:
hea = intro_mail % { try:
"nomprenom": etud["nomprenom"], hea = intro_mail % {
"dept": dept, "nomprenom": etud["nomprenom"],
"webmaster": webmaster, "dept": dept,
} "webmaster": webmaster,
}
except KeyError as e:
raise ScoValueError(
"format 'Message d'accompagnement' (bul_intro_mail) invalide, revoir les réglages dans les préférences"
)
else: else:
hea = "" hea = ""

38
app/scodoc/sco_synchro_etuds.py
View File

@ -854,23 +854,27 @@ def formsemestre_import_etud_admission(
apo_emailperso = etud.get("mailperso", "") apo_emailperso = etud.get("mailperso", "")
if info["emailperso"] and not apo_emailperso: if info["emailperso"] and not apo_emailperso:
apo_emailperso = info["emailperso"] apo_emailperso = info["emailperso"]
if ( if import_email:
import_email if not "mail" in etud:
and info["email"] != etud["mail"] raise ScoValueError(
or info["emailperso"] != apo_emailperso "la réponse portail n'a pas le champs requis 'mail'"
): )
sco_etud.adresse_edit( if (
cnx, info["email"] != etud["mail"]
args={ or info["emailperso"] != apo_emailperso
"etudid": etudid, ):
"adresse_id": info["adresse_id"], sco_etud.adresse_edit(
"email": etud["mail"], cnx,
"emailperso": apo_emailperso, args={
}, "etudid": etudid,
) "adresse_id": info["adresse_id"],
# notifie seulement les changements d'adresse mail institutionnelle "email": etud["mail"],
if info["email"] != etud["mail"]: "emailperso": apo_emailperso,
changed_mails.append((info, etud["mail"])) },
)
# notifie seulement les changements d'adresse mail institutionnelle
if info["email"] != etud["mail"]:
changed_mails.append((info, etud["mail"]))
else: else:
unknowns.append(code_nip) unknowns.append(code_nip)
sco_cache.invalidate_formsemestre(formsemestre_id=sem["formsemestre_id"]) sco_cache.invalidate_formsemestre(formsemestre_id=sem["formsemestre_id"])