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

5
app/scodoc/sco_evaluation_edit.py
View File

@ -351,14 +351,15 @@ def evaluation_create_form(
else: else:
date_debut = None date_debut = None
args.pop("jour", None) args.pop("jour", None)
if args.get("heure_debut"): if date_debut and args.get("heure_debut"):
try: try:
heure_debut = heure_to_time(args["heure_debut"]) heure_debut = heure_to_time(args["heure_debut"])
except ValueError as exc: except ValueError as exc:
raise ScoValueError("Heure début invalide") from exc raise ScoValueError("Heure début invalide") from exc
args["date_debut"] = datetime.datetime.combine(date_debut, heure_debut) args["date_debut"] = datetime.datetime.combine(date_debut, heure_debut)
args.pop("heure_debut", None) args.pop("heure_debut", None)
if args.get("heure_fin"): # note: ce formulaire ne permet de créer que des évaluation avec debut et fin sur le même jour.
if date_debut and args.get("heure_fin"):
try: try:
heure_fin = heure_to_time(args["heure_fin"]) heure_fin = heure_to_time(args["heure_fin"])
except ValueError as exc: except ValueError as exc:

2
sco_version.py
View File

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