Merge pull request 'Update opolka/master' (#1 ) from ScoDoc/ScoDoc:master into master

Reviewed-on: https://scodoc.org/git/opolka/ScoDoc/pulls/1
Fix temporaire: jury BUT: propose toujours le code année RED en mode manuel
2023-06-29 15:44:15 +02:00 · 2023-06-27 18:33:56 +02:00 · 2023-06-27 18:29:52 +02:00 · 2023-06-27 18:28:40 +02:00
3 changed files with 3 additions and 5 deletions
--- a/app/but/jury_but.py
+++ b/app/but/jury_but.py
@ -200,6 +200,7 @@ class DecisionsProposeesAnnee(DecisionsProposees):
    # Codes toujours proposés sauf si include_communs est faux:
    codes_communs = [
        sco_codes.RAT,
+        sco_codes.RED,  # TODO temporaire 9.4.93: propose toujours RED
        sco_codes.ABAN,
        sco_codes.ABL,
        sco_codes.ATJ,
--- a/app/but/jury_edit_manual.py
+++ b/app/but/jury_edit_manual.py
@ -9,12 +9,9 @@
 Non spécifique au BUT.
 """

-from flask import flash, render_template
-from flask import g, request
+from flask import render_template
 import sqlalchemy as sa

-from app import db
-
 from app.models import (
    ApcValidationAnnee,
    ApcValidationRCUE,
--- a/app/templates/jury/jury_delete_manual.j2
+++ b/app/templates/jury/jury_delete_manual.j2
@ -43,7 +43,7 @@ pages de saisie de jury habituelles).
        {% for v in ue_vals %}
            <li>{{v.html(detail=True)|safe}}
                <form class="inline-form">
-                    <button data-v_id="{{v.id}}" data-type="validation_ue" data-etudid="{{etud.id"}}
+                    <button data-v_id="{{v.id}}" data-type="validation_ue" data-etudid="{{etud.id}}"
                    >effacer</button>
                </form>
            </li>
Author	SHA1	Message	Date
Alexis Opolka	c48930d7e9	Merge pull request 'Update opolka/master' (#1 ) from ScoDoc/ScoDoc:master into master Reviewed-on: https://scodoc.org/git/opolka/ScoDoc/pulls/1	2023-06-29 15:44:15 +02:00
Emmanuel Viennet	e190756b98	Fix temporaire: jury BUT: propose toujours le code année RED en mode manuel	2023-06-27 18:33:56 +02:00
Emmanuel Viennet	37845750a6	Merge branch 'jury_but' of https://scodoc.org/git/viennet/ScoDoc	2023-06-27 18:29:52 +02:00
Emmanuel Viennet	70049da38f	Fix: typo validation manuelle	2023-06-27 18:28:40 +02:00