Compare commits

...

3 Commits

4 changed files with 15 additions and 17 deletions

View File

@ -524,7 +524,7 @@ def _ue_mod_bulletin(context, etudid, formsemestre_id, ue_id, modimpls, nt, vers
if val == "NP": if val == "NP":
e["note_txt"] = "nd" e["note_txt"] = "nd"
e["note_html"] = '<span class="note_nd">nd</span>' e["note_html"] = '<span class="note_nd">nd</span>'
e["coef_txt"] = "" e["coef_txt"] = fmt_coef(e["coefficient"])
else: else:
# (-0.15) s'affiche "bonus de 0.15" # (-0.15) s'affiche "bonus de 0.15"
if is_malus: if is_malus:

View File

@ -43,8 +43,9 @@ def index_html(context, REQUEST=None, showcodes=0, showsemtable=0):
H = [] H = []
# News: # News:
rssicon = icontag("rssscodoc_img", title="Flux RSS", border="0") # 2020-12-30: abandonne l'icon rss
H.append(sco_news.scolar_news_summary_html(context, rssicon=rssicon)) # rssicon = icontag("rssscodoc_img", title="Flux RSS", border="0")
H.append(sco_news.scolar_news_summary_html(context)) # , rssicon=rssicon))
# Avertissement de mise à jour: # Avertissement de mise à jour:
H.append(sco_up_to_date.html_up_to_date_box(context)) H.append(sco_up_to_date.html_up_to_date_box(context))
@ -169,8 +170,7 @@ Chercher étape courante: <input name="etape_apo" type="text" size="8"></input>
def _sem_table(context, sems): def _sem_table(context, sems):
"""Affiche liste des semestres, utilisée pour semestres en cours """Affiche liste des semestres, utilisée pour semestres en cours"""
"""
tmpl = """<tr class="%(trclass)s">%(tmpcode)s tmpl = """<tr class="%(trclass)s">%(tmpcode)s
<td class="semicon">%(lockimg)s <a href="Notes/formsemestre_status?formsemestre_id=%(formsemestre_id)s#groupes">%(groupicon)s</a></td> <td class="semicon">%(lockimg)s <a href="Notes/formsemestre_status?formsemestre_id=%(formsemestre_id)s#groupes">%(groupicon)s</a></td>
<td class="datesem">%(mois_debut)s</td><td class="datesem"><a title="%(session_id)s">-</a> %(mois_fin)s</td> <td class="datesem">%(mois_debut)s</td><td class="datesem"><a title="%(session_id)s">-</a> %(mois_fin)s</td>
@ -202,8 +202,7 @@ def _sem_table(context, sems):
def _sem_table_gt(context, sems, showcodes=False): def _sem_table_gt(context, sems, showcodes=False):
"""Nouvelle version de la table des semestres """Nouvelle version de la table des semestres"""
"""
_style_sems(context, sems) _style_sems(context, sems)
columns_ids = ( columns_ids = (
"lockimg", "lockimg",
@ -241,8 +240,7 @@ def _sem_table_gt(context, sems, showcodes=False):
def _style_sems(context, sems): def _style_sems(context, sems):
"""ajoute quelques attributs de présentation pour la table """ajoute quelques attributs de présentation pour la table"""
"""
for sem in sems: for sem in sems:
sem["_groupicon_target"] = ( sem["_groupicon_target"] = (
"Notes/formsemestre_status?formsemestre_id=%(formsemestre_id)s" % sem "Notes/formsemestre_status?formsemestre_id=%(formsemestre_id)s" % sem

View File

@ -39,7 +39,7 @@ from email.Header import Header
from email import Encoders from email import Encoders
from notesdb import * from notesdb import * # pylint: disable=unused-wildcard-import
from notes_log import log from notes_log import log
import scolars import scolars
from sco_utils import SCO_ENCODING, SCO_ANNONCES_WEBSITE from sco_utils import SCO_ENCODING, SCO_ANNONCES_WEBSITE
@ -129,7 +129,6 @@ def scolar_news_summary(context, n=5):
news = news[:n] news = news[:n]
# mimic EditableTable.list output formatting: # mimic EditableTable.list output formatting:
for n in news: for n in news:
d = n["date"]
n["date822"] = n["date"].strftime("%a, %d %b %Y %H:%M:%S %z") n["date822"] = n["date"].strftime("%a, %d %b %Y %H:%M:%S %z")
# heure # heure
n["hm"] = n["date"].strftime("%Hh%M") n["hm"] = n["date"].strftime("%Hh%M")
@ -196,7 +195,7 @@ def scolar_news_summary_html(context, n=5, rssicon=None):
if not news: if not news:
return "" return ""
H = ['<div class="news"><span class="newstitle">Dernières opérations'] H = ['<div class="news"><span class="newstitle">Dernières opérations']
if rssicon: if rssicon: # 2020-12-30 plus utilisé
H.append('<a href="rssnews">' + rssicon + "</a>") H.append('<a href="rssnews">' + rssicon + "</a>")
H.append('</span><ul class="newslist">') H.append('</span><ul class="newslist">')
@ -252,8 +251,7 @@ def scolar_news_summary_rss(context, title, sco_url, n=5):
def _send_news_by_mail(context, n): def _send_news_by_mail(context, n):
"""Notify by email """Notify by email"""
"""
infos = _get_formsemestre_infos_from_news(context, n) infos = _get_formsemestre_infos_from_news(context, n)
formsemestre_id = infos.get("formsemestre_id", None) formsemestre_id = infos.get("formsemestre_id", None)
prefs = context.get_preferences(formsemestre_id=formsemestre_id) prefs = context.get_preferences(formsemestre_id=formsemestre_id)
@ -265,8 +263,10 @@ def _send_news_by_mail(context, n):
# #
txt = n["text"] txt = n["text"]
if infos: if infos:
txt += "\n\nSemestre %(titremois)s\n\n" % infos["sem"]
txt += ( txt += (
'\n\nSemestre <a href="Notes/formsemestre_status?formsemestre_id=%(formsemestre_id)s">%(descr_sem)s</a>)' """<a href="Notes/formsemestre_status?formsemestre_id=%(formsemestre_id)s">%(descr_sem)s</a>
"""
% infos % infos
) )
txt += "\n\nEffectué par: %(nomcomplet)s\n" % n["user_info"] txt += "\n\nEffectué par: %(nomcomplet)s\n" % n["user_info"]

View File

@ -21,10 +21,10 @@ G.verbose = False
# --- Création d'étudiants # --- Création d'étudiants
etuds = [G.create_etud(code_nip=None) for _ in range(10)] etuds = [G.create_etud(code_nip=None) for _ in range(10)]
# --- Mise en place formation 4 semestre # --- Mise en place formation 4 semestres
f, ue_list, mod_list = G.setup_formation(nb_semestre=4) f, ue_list, mod_list = G.setup_formation(nb_semestre=4)
# --- Crée les 4 semestre et affecte des notes aléatoires # --- Crée les 4 semestres et affecte des notes aléatoires
sems, evals = [], [] sems, evals = [], []
for semestre_id, date_debut, date_fin in [ for semestre_id, date_debut, date_fin in [
(1, "01/09/2019", "15/01/2020"), (1, "01/09/2019", "15/01/2020"),