Nom avant prenom sur formulaire saisie notes + deco+ + linted css.

This commit is contained in:
Emmanuel Viennet 2021-02-13 22:06:03 +01:00
parent 91bb62587a
commit 54771c8303
3 changed files with 45 additions and 92 deletions

View File

@ -1127,7 +1127,13 @@ def _form_saisie_notes(context, E, M, group_ids, destination="", REQUEST=None):
for group_info in e["groups"]:
etud_classes.append(group_info["group_id"])
label = '<span class="%s">' % classdem + e["nomprenom"] + "</span>"
label = (
'<span class="%s">' % classdem
+ e["civilite_str"]
+ " "
+ scolars.format_nomprenom(e, reverse=True)
+ "</span>"
)
# Historique des saisies de notes:
if not disabled:

View File

@ -129,17 +129,18 @@ def force_uppercase(s):
return s
def format_nomprenom(etud):
"""Formatte civilité/nom/prenom pour affichages: "M. Pierre Dupont" """
l = []
for x in [
format_civilite(etud["civilite"]),
format_prenom(etud["prenom"]),
etud.get("nom_disp", "") or etud.get("nom_usuel", "") or etud["nom"],
]:
if x:
l.append(x)
return " ".join(l)
def format_nomprenom(etud, reverse=False):
"""Formatte civilité/nom/prenom pour affichages: "M. Pierre Dupont"
Si reverse, "Dupont Pierre", sans civilité.
"""
nom = etud.get("nom_disp", "") or etud.get("nom_usuel", "") or etud["nom"]
prenom = format_prenom(etud["prenom"])
civilite = format_civilite(etud["civilite"])
if reverse:
fs = [nom, prenom]
else:
fs = [civilite, prenom, nom]
return " ".join([x for x in fs if x])
def format_prenom(s):

View File

@ -332,8 +332,7 @@ h2.listesems {
margin-bottom: 0px;
}
table.semlist tr.gt_firstrow th {
}
/* table.semlist tr.gt_firstrow th {} */
table.semlist tr td {
border: none;
@ -690,8 +689,7 @@ a.stdlink:hover {
text-decoration: underline;
}
a.link_accessible {
}
/* a.link_accessible {} */
a.link_unauthorized, a.link_unauthorized:visited {
color: rgb(75,75,75);
}
@ -712,8 +710,8 @@ span.spanlink:hover {
margin-bottom: 3px;
-ms-word-break: break-all;
word-break: break-all;
// non std for webkit:
work-break: break-word;
/* non std for webkit: */
word-break: break-word;
-webkit-hyphens: auto;
-moz-hyphens: auto;
hyphens: auto;
@ -913,9 +911,10 @@ span.eval_title {
font-weight: bold;
font-size: 14pt;
}
#saisie_notes span.eval_title {
/* border-bottom: 1px solid rgb(100,100,100); */
/* #saisie_notes span.eval_title {
border-bottom: 1px solid rgb(100,100,100);
}
*/
span.jurylink {
margin-left: 1.5em;
@ -1012,9 +1011,6 @@ h2.formsemestre, .gtrcontent h2 {
border-width: 0;
border-collapse: collapse;
}
.formsemestre_page_title table.semtitle {
/* width: 100%; */
}
.formsemestre_page_title {
width: 100%;
@ -1058,6 +1054,9 @@ h2.formsemestre, .gtrcontent h2 {
#formnotes .tf-ro-field.formnote_bareme {
font-weight: bold;
}
#formnotes td.tf-fieldlabel {
border-bottom: 1px dotted #fdcaca;
}
/*
.formsemestre_menubar {
border-top: 3px solid #67A7E3;
@ -1105,8 +1104,6 @@ h2.formsemestre, .gtrcontent h2 {
width : 200px;
}
.sco_dropdown_menu {
}
.sco_dropdown_menu > li {
width : auto; /* 120px !important; */
font-size: 12px;
@ -1133,10 +1130,6 @@ span.inscr_addremove_menu {
font-weight: bold;
padding-right: 1px;
}
.formsemestre_page_title span.lock {
}
div.formsemestre_status {
-moz-border-radius: 8px;
-khtml-border-radius: 8px;
@ -1227,10 +1220,6 @@ ul.ue_inscr_list li.etud {
border-spacing: 1px;
}
#grouplists td {
}
/* Modules */
div.moduleimpl_tableaubord {
padding: 7px;
@ -1264,20 +1253,10 @@ th.moduleimpl_evaluations a:hover {
text-decoration: underline;
}
tr.moduleimpl_evaluation_row {
}
td.moduleimpl_evaluation_row {
}
tr.mievr {
background-color:#eeeeee;
}
tr.mievr_spaced {
/* margin-top: 20px; */
}
tr.mievr_rattr {
background-color:#dddddd;
}
@ -1575,8 +1554,6 @@ tr.recap_row_min, tr.recap_row_max {
font-weight: normal;
font-style: italic;
}
tr.recap_row_coef {
}
tr.recap_row_moy {
font-weight: bold;
}
@ -1809,9 +1786,6 @@ div.bulletin_menubar {
text-decoration: underline;
}
div.bull_appreciations {
}
.bull_appreciations p {
margin: 0;
font-style: italic;
@ -1867,9 +1841,6 @@ input.note_saved {
color: green;
}
input.note {
}
span.history {
font-style: italic;
}
@ -2016,9 +1987,6 @@ td.fvs_val_inf {
color: red;
}
td.fvs_chk {
}
td.fvs_tit {
font-weight: bold;
text-align: left;
@ -2274,8 +2242,6 @@ table.recap_hide_details tr.sem_courant td.ue_acro span, table.recap_hide_detail
padding-bottom: 5px;
}
td.rcp_moy {
}
td.sem_ects_tit {
text-align: right;
}
@ -2308,9 +2274,6 @@ td.ue_cmp {
color: green;
}
td.ue {
}
td.ue_capitalized {
text-decoration: underline;
}
@ -2354,9 +2317,6 @@ div.pas_sembox {
font-family: arial,verdana,sans-serif;
}
div.pas_empty_sems {
}
span.sp_etape {
display: inline-block;
width: 4em;
@ -2365,10 +2325,6 @@ span.sp_etape {
color: black;
}
.inscrit {
/* font-weight: bold; */
}
.inscrailleurs {
font-weight: bold;
color: red !important;
@ -2534,9 +2490,6 @@ td.calday {
vertical-align: top;
}
div.cal_evaluations table.monthcalendar td.calcol {
}
div.cal_evaluations table.monthcalendar td.calcell {
padding-left: 0.6em;
width: 6em;
@ -2585,13 +2538,13 @@ div.update_warning_sub {
padding-left: 8ex;
}
/* Titres des tabs: */
/*
Titres des tabs:
.nav-tabs li a {
/* font-variant: small-caps; */
/*font-size: 13pt;*/
font-variant: small-caps;
font-size: 13pt;
}
/*
#group-tabs {
clear: both;
}
@ -2758,10 +2711,6 @@ div.apo_csv_list {
div.apo_compare_csv_form_but {
margin-top: 10px;
margin-bottom: 10px;
}
div.apo_compare_csv_form_submit {
}
div.apo_compare_csv_form_submit input {
margin-top: 2ex;
@ -2892,12 +2841,9 @@ div#formsemestre_ext_edit_ue_validations {
form.tf_ext_edit_ue_validations table {
border-collapse: collapse;
width: 97%;
margin-left: 1em;ext
margin-left: 1em;
margin-right: 1em;
}
form.tf_ext_edit_ue_validations table, form.tf_ext_edit_ue_validations table th, form.tf_ext_edit_ue_validations table td {
/* border: 1px solid black; */
}
form.tf_ext_edit_ue_validations table th, form.tf_ext_edit_ue_validations table td {
border-bottom: 1px solid rgb(168, 168, 168);
}