Fix: édition validations antérieures lorsqu'il y a des validations sans semestres

This commit is contained in:
Emmanuel Viennet 2023-07-04 08:23:09 +02:00 committed by iziram
parent e39260ab81
commit 6c591a62fd
4 changed files with 8 additions and 5 deletions

View File

@ -355,7 +355,7 @@ class DecisionsProposeesAnnee(DecisionsProposees):
# Reste à attribuer ADM, ADJ, PASD, PAS1NCI, RED, NAR
plural = self.nb_validables > 1
explanation += f"""{self.nb_validables} niveau{"x" if plural else ""} validable{
"s" if plural else ""} sur {self.nb_competences}"""
"s" if plural else ""} de droit sur {self.nb_competences}"""
if self.admis:
self.codes = [sco_codes.ADM] + self.codes
# elif not self.jury_annuel:

View File

@ -31,6 +31,7 @@ import time
import flask
from flask import url_for, flash, g, request
from flask_login import current_user
import sqlalchemy as sa
from app.models.etudiants import Identite
@ -66,7 +67,7 @@ from app.scodoc.sco_cursus_dut import etud_est_inscrit_ue
from app.scodoc import sco_photos
from app.scodoc import sco_preferences
from app.scodoc import sco_pv_dict
from app.scodoc.sco_permissions import Permission
# ------------------------------------------------------------------------------------
def formsemestre_validation_etud_form(
@ -1288,7 +1289,9 @@ def _get_etud_ue_cap_html(etud: Identite, formsemestre: FormSemestre) -> str:
if validation.semestre_id is not None:
origine += f" (<b>S{validation.semestre_id}</b>)"
H.append(f"""<li>{validation.html()}""")
if validation.formsemestre.can_edit_jury():
if (validation.formsemestre and validation.formsemestre.can_edit_jury()) or (
current_user and current_user.has_permission(Permission.ScoEtudInscrit)
):
H.append(
f"""
<form class="inline-form">

View File

@ -378,7 +378,7 @@ class SemSet(dict):
def html_diagnostic(self):
"""Affichage de la partie Effectifs et Liste des étudiants
(actif seulement si un portail est configuré)
(actif seulement si un portail est configuré) XXX pourquoi ??
"""
if sco_portal_apogee.has_portal():
return self.bilan.html_diagnostic()

View File

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