jmplace/ScoDoc-Lille
1
0
Fork 0
forked from ScoDoc/ScoDoc
Code Issues Pull Requests Projects Releases Wiki Activity

Fix: billets d'absences (POST)

Browse Source
This commit is contained in:
Emmanuel Viennet 2021-09-24 01:07:00 +02:00
parent 92c401f17c
commit 6d1ffb122b
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/scodoc/sco_abs.py
View File

@ -626,7 +626,6 @@ def add_absence(
jour, jour,
matin, matin,
estjust, estjust,
REQUEST,
description=None, description=None,
moduleimpl_id=None, moduleimpl_id=None,
): ):

14
app/views/absences.py
View File

@ -1282,7 +1282,7 @@ def listeBillets(REQUEST=None):
) )
@bp.route("/deleteBilletAbsence") @bp.route("/deleteBilletAbsence", methods=["POST", "GET"])
@scodoc @scodoc
@permission_required(Permission.ScoAbsChange) @permission_required(Permission.ScoAbsChange)
@scodoc7func @scodoc7func
@ -1308,7 +1308,7 @@ def deleteBilletAbsence(billet_id, REQUEST=None, dialog_confirmed=False):
return flask.redirect("listeBillets?head_message=Billet%20supprimé") return flask.redirect("listeBillets?head_message=Billet%20supprimé")
def _ProcessBilletAbsence(billet, estjust, description, REQUEST): def _ProcessBilletAbsence(billet, estjust, description):
"""Traite un billet: ajoute absence(s) et éventuellement justificatifs, """Traite un billet: ajoute absence(s) et éventuellement justificatifs,
et change l'état du billet à 1. et change l'état du billet à 1.
NB: actuellement, les heures ne sont utilisées que pour déterminer si matin et/ou après-midi. NB: actuellement, les heures ne sont utilisées que pour déterminer si matin et/ou après-midi.
@ -1330,7 +1330,6 @@ def _ProcessBilletAbsence(billet, estjust, description, REQUEST):
dates[0], dates[0],
0, 0,
estjust, estjust,
REQUEST,
description=description, description=description,
) )
n += 1 n += 1
@ -1342,7 +1341,6 @@ def _ProcessBilletAbsence(billet, estjust, description, REQUEST):
dates[-1], dates[-1],
1, 1,
estjust, estjust,
REQUEST,
description=description, description=description,
) )
n += 1 n += 1
@ -1354,7 +1352,6 @@ def _ProcessBilletAbsence(billet, estjust, description, REQUEST):
jour, jour,
0, 0,
estjust, estjust,
REQUEST,
description=description, description=description,
) )
sco_abs.add_absence( sco_abs.add_absence(
@ -1362,7 +1359,6 @@ def _ProcessBilletAbsence(billet, estjust, description, REQUEST):
jour, jour,
1, 1,
estjust, estjust,
REQUEST,
description=description, description=description,
) )
n += 2 n += 2
@ -1373,7 +1369,7 @@ def _ProcessBilletAbsence(billet, estjust, description, REQUEST):
return n return n
@bp.route("/ProcessBilletAbsenceForm") @bp.route("/ProcessBilletAbsenceForm", methods=["POST", "GET"])
@scodoc @scodoc
@permission_required(Permission.ScoAbsChange) @permission_required(Permission.ScoAbsChange)
@scodoc7func @scodoc7func
@ -1440,9 +1436,7 @@ def ProcessBilletAbsenceForm(billet_id, REQUEST=None):
elif tf[0] == -1: elif tf[0] == -1:
return flask.redirect(scu.ScoURL()) return flask.redirect(scu.ScoURL())
else: else:
n = _ProcessBilletAbsence( n = _ProcessBilletAbsence(billet, tf[2]["estjust"], tf[2]["description"])
billet, tf[2]["estjust"], tf[2]["description"], REQUEST
)
if tf[2]["estjust"]: if tf[2]["estjust"]:
j = "justifiées" j = "justifiées"
else: else: