iziram/ScoDoc
1
0
Fork 0
forked from ScoDoc/ScoDoc
Code Issues 12 Pull Requests Projects 1 Releases Wiki Activity

Styles table recap

Browse Source
This commit is contained in:
Emmanuel Viennet 2023-02-04 14:22:24 +01:00 committed by iziram
parent 705fcc31cd
commit b8f5cf712f
5 changed files with 668 additions and 383 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/but/jury_but_recap.py
View File

@ -37,7 +37,11 @@ from app.tables.recap import RowRecap, TableRecap
class TableJury(TableRecap): class TableJury(TableRecap):
pass """Cette table recap reprend les colonnes du tableau recap, sauf les évaluations,
et ajoute:
- les RCUEs
- le lien de saisie ou modif de la décision de jury
"""
class RowJury(RowRecap): class RowJury(RowRecap):

709
app/static/css/gt_table.css
View File

@ -17,195 +17,348 @@ table.dataTable {
*/ */
/* /*
* Body styles * Body styles
*/ } */
table.dataTable thead th, }
table.dataTable tfoot th {
font-weight: bold; } table.dataTable thead th,
table.dataTable thead th, table.dataTable tfoot th {
table.dataTable thead td { font-weight: bold;
}
table.dataTable thead th,
table.dataTable thead td {
padding: 10px 18px; padding: 10px 18px;
border-bottom: 1px solid #111111; } border-bottom: 1px solid #111111;
table.dataTable thead th:active, }
table.dataTable thead td:active {
outline: none; } table.dataTable thead th:active,
table.dataTable tfoot th, table.dataTable thead td:active {
table.dataTable tfoot td { outline: none;
}
table.dataTable tfoot th,
table.dataTable tfoot td {
padding: 10px 18px 6px 18px; padding: 10px 18px 6px 18px;
border-top: 1px solid #111111; } border-top: 1px solid #111111;
table.dataTable thead .sorting, }
table.dataTable thead .sorting_asc,
table.dataTable thead .sorting_desc, table.dataTable thead .sorting,
table.dataTable thead .sorting_asc_disabled, table.dataTable thead .sorting_asc,
table.dataTable thead .sorting_desc_disabled { table.dataTable thead .sorting_desc,
table.dataTable thead .sorting_asc_disabled,
table.dataTable thead .sorting_desc_disabled {
cursor: pointer; cursor: pointer;
*cursor: hand; *cursor: hand;
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: center right; } background-position: center right;
table.dataTable thead .sorting { }
background-image: url("../images/sort_both.png"); }
table.dataTable thead .sorting_asc { table.dataTable thead .sorting {
background-image: url("../images/sort_asc.png"); } background-image: url("../images/sort_both.png");
table.dataTable thead .sorting_desc { }
background-image: url("../images/sort_desc.png"); }
table.dataTable thead .sorting_asc_disabled { table.dataTable thead .sorting_asc {
background-image: url("../images/sort_asc_disabled.png"); } background-image: url("../images/sort_asc.png");
table.dataTable thead .sorting_desc_disabled { }
background-image: url("../images/sort_desc_disabled.png"); }
table.dataTable tbody tr { table.dataTable thead .sorting_desc {
background-color: white; } background-image: url("../images/sort_desc.png");
table.dataTable tbody tr.selected { }
background-color: #b0bed9; }
table.dataTable tbody th, table.dataTable thead .sorting_asc_disabled {
table.dataTable tbody td { background-image: url("../images/sort_asc_disabled.png");
padding: 8px 10px; } }
table.dataTable.row-border tbody th, table.dataTable.row-border tbody td, table.dataTable.display tbody th, table.dataTable.display tbody td {
border-top: 1px solid #dddddd; } table.dataTable thead .sorting_desc_disabled {
table.dataTable.row-border tbody tr:first-child th, background-image: url("../images/sort_desc_disabled.png");
table.dataTable.row-border tbody tr:first-child td, table.dataTable.display tbody tr:first-child th, }
table.dataTable.display tbody tr:first-child td {
border-top: none; } table.dataTable tbody tr {
table.dataTable.cell-border tbody th, table.dataTable.cell-border tbody td { background-color: white;
}
table.dataTable tbody tr.selected {
background-color: #b0bed9;
}
table.dataTable tbody th,
table.dataTable tbody td {
padding: 8px 10px;
}
table.dataTable.row-border tbody th,
table.dataTable.row-border tbody td,
table.dataTable.display tbody th,
table.dataTable.display tbody td {
border-top: 1px solid #dddddd; border-top: 1px solid #dddddd;
border-right: 1px solid #dddddd; } }
table.dataTable.cell-border tbody tr th:first-child,
table.dataTable.cell-border tbody tr td:first-child { table.dataTable.row-border tbody tr:first-child th,
border-left: 1px solid #dddddd; } table.dataTable.row-border tbody tr:first-child td,
table.dataTable.cell-border tbody tr:first-child th, table.dataTable.display tbody tr:first-child th,
table.dataTable.cell-border tbody tr:first-child td { table.dataTable.display tbody tr:first-child td {
border-top: none; } border-top: none;
table.dataTable.stripe tbody tr.odd, table.dataTable.display tbody tr.odd { }
table.dataTable.cell-border tbody th,
table.dataTable.cell-border tbody td {
border-top: 1px solid #dddddd;
border-right: 1px solid #dddddd;
}
table.dataTable.cell-border tbody tr th:first-child,
table.dataTable.cell-border tbody tr td:first-child {
border-left: 1px solid #dddddd;
}
table.dataTable.cell-border tbody tr:first-child th,
table.dataTable.cell-border tbody tr:first-child td {
border-top: none;
}
table.dataTable.stripe tbody tr.odd,
table.dataTable.display tbody tr.odd {
background-color: #f9f9f9; background-color: #f9f9f9;
} }
table.dataTable.stripe tbody tr.odd.selected, table.dataTable.display tbody tr.odd.selected {
background-color: #abb9d3; } table.dataTable.stripe tbody tr.odd.selected,
table.dataTable.hover tbody tr:hover, table.dataTable.display tbody tr:hover { table.dataTable.display tbody tr.odd.selected {
background-color: whitesmoke; } background-color: #abb9d3;
table.dataTable.hover tbody tr:hover.selected, table.dataTable.display tbody tr:hover.selected { }
background-color: #a9b7d1; }
table.dataTable.order-column tbody tr > .sorting_1, table.dataTable.hover tbody tr:hover,
table.dataTable.order-column tbody tr > .sorting_2, table.dataTable.display tbody tr:hover {
table.dataTable.order-column tbody tr > .sorting_3, table.dataTable.display tbody tr > .sorting_1, background-color: whitesmoke;
table.dataTable.display tbody tr > .sorting_2, }
table.dataTable.display tbody tr > .sorting_3 {
table.dataTable.hover tbody tr:hover.selected,
table.dataTable.display tbody tr:hover.selected {
background-color: #a9b7d1;
}
table.dataTable.order-column tbody tr>.sorting_1,
table.dataTable.order-column tbody tr>.sorting_2,
table.dataTable.order-column tbody tr>.sorting_3,
table.dataTable.display tbody tr>.sorting_1,
table.dataTable.display tbody tr>.sorting_2,
table.dataTable.display tbody tr>.sorting_3 {
background-color: #f9f9f9; background-color: #f9f9f9;
} }
table.dataTable.order-column tbody tr.selected > .sorting_1,
table.dataTable.order-column tbody tr.selected > .sorting_2, table.dataTable.order-column tbody tr.selected>.sorting_1,
table.dataTable.order-column tbody tr.selected > .sorting_3, table.dataTable.display tbody tr.selected > .sorting_1, table.dataTable.order-column tbody tr.selected>.sorting_2,
table.dataTable.display tbody tr.selected > .sorting_2, table.dataTable.order-column tbody tr.selected>.sorting_3,
table.dataTable.display tbody tr.selected > .sorting_3 { table.dataTable.display tbody tr.selected>.sorting_1,
background-color: #acbad4; } table.dataTable.display tbody tr.selected>.sorting_2,
table.dataTable.display tbody tr.odd > .sorting_1, table.dataTable.order-column.stripe tbody tr.odd > .sorting_1 { table.dataTable.display tbody tr.selected>.sorting_3 {
background-color: #f1f1f1; } background-color: #acbad4;
table.dataTable.display tbody tr.odd > .sorting_2, table.dataTable.order-column.stripe tbody tr.odd > .sorting_2 { }
background-color: #f3f3f3; }
table.dataTable.display tbody tr.odd > .sorting_3, table.dataTable.order-column.stripe tbody tr.odd > .sorting_3 { table.dataTable.display tbody tr.odd>.sorting_1,
background-color: whitesmoke; } table.dataTable.order-column.stripe tbody tr.odd>.sorting_1 {
table.dataTable.display tbody tr.odd.selected > .sorting_1, table.dataTable.order-column.stripe tbody tr.odd.selected > .sorting_1 { background-color: #f1f1f1;
background-color: #a6b3cd; } }
table.dataTable.display tbody tr.odd.selected > .sorting_2, table.dataTable.order-column.stripe tbody tr.odd.selected > .sorting_2 {
background-color: #a7b5ce; } table.dataTable.display tbody tr.odd>.sorting_2,
table.dataTable.display tbody tr.odd.selected > .sorting_3, table.dataTable.order-column.stripe tbody tr.odd.selected > .sorting_3 { table.dataTable.order-column.stripe tbody tr.odd>.sorting_2 {
background-color: #a9b6d0; } background-color: #f3f3f3;
table.dataTable.display tbody tr.even > .sorting_1, table.dataTable.order-column.stripe tbody tr.even > .sorting_1 { }
table.dataTable.display tbody tr.odd>.sorting_3,
table.dataTable.order-column.stripe tbody tr.odd>.sorting_3 {
background-color: whitesmoke;
}
table.dataTable.display tbody tr.odd.selected>.sorting_1,
table.dataTable.order-column.stripe tbody tr.odd.selected>.sorting_1 {
background-color: #a6b3cd;
}
table.dataTable.display tbody tr.odd.selected>.sorting_2,
table.dataTable.order-column.stripe tbody tr.odd.selected>.sorting_2 {
background-color: #a7b5ce;
}
table.dataTable.display tbody tr.odd.selected>.sorting_3,
table.dataTable.order-column.stripe tbody tr.odd.selected>.sorting_3 {
background-color: #a9b6d0;
}
table.dataTable.display tbody tr.even>.sorting_1,
table.dataTable.order-column.stripe tbody tr.even>.sorting_1 {
background-color: #f9f9f9; background-color: #f9f9f9;
} }
table.dataTable.display tbody tr.even > .sorting_2, table.dataTable.order-column.stripe tbody tr.even > .sorting_2 {
background-color: #fbfbfb; } table.dataTable.display tbody tr.even>.sorting_2,
table.dataTable.display tbody tr.even > .sorting_3, table.dataTable.order-column.stripe tbody tr.even > .sorting_3 { table.dataTable.order-column.stripe tbody tr.even>.sorting_2 {
background-color: #fdfdfd; } background-color: #fbfbfb;
table.dataTable.display tbody tr.even.selected > .sorting_1, table.dataTable.order-column.stripe tbody tr.even.selected > .sorting_1 { }
background-color: #acbad4; }
table.dataTable.display tbody tr.even.selected > .sorting_2, table.dataTable.order-column.stripe tbody tr.even.selected > .sorting_2 { table.dataTable.display tbody tr.even>.sorting_3,
background-color: #adbbd6; } table.dataTable.order-column.stripe tbody tr.even>.sorting_3 {
table.dataTable.display tbody tr.even.selected > .sorting_3, table.dataTable.order-column.stripe tbody tr.even.selected > .sorting_3 { background-color: #fdfdfd;
background-color: #afbdd8; } }
table.dataTable.display tbody tr:hover > .sorting_1, table.dataTable.order-column.hover tbody tr:hover > .sorting_1 {
background-color: #eaeaea; } table.dataTable.display tbody tr.even.selected>.sorting_1,
table.dataTable.display tbody tr:hover > .sorting_2, table.dataTable.order-column.hover tbody tr:hover > .sorting_2 { table.dataTable.order-column.stripe tbody tr.even.selected>.sorting_1 {
background-color: #ebebeb; } background-color: #acbad4;
table.dataTable.display tbody tr:hover > .sorting_3, table.dataTable.order-column.hover tbody tr:hover > .sorting_3 { }
background-color: #eeeeee; }
table.dataTable.display tbody tr:hover.selected > .sorting_1, table.dataTable.order-column.hover tbody tr:hover.selected > .sorting_1 { table.dataTable.display tbody tr.even.selected>.sorting_2,
background-color: #a1aec7; } table.dataTable.order-column.stripe tbody tr.even.selected>.sorting_2 {
table.dataTable.display tbody tr:hover.selected > .sorting_2, table.dataTable.order-column.hover tbody tr:hover.selected > .sorting_2 { background-color: #adbbd6;
background-color: #a2afc8; } }
table.dataTable.display tbody tr:hover.selected > .sorting_3, table.dataTable.order-column.hover tbody tr:hover.selected > .sorting_3 {
background-color: #a4b2cb; } table.dataTable.display tbody tr.even.selected>.sorting_3,
table.dataTable.no-footer { table.dataTable.order-column.stripe tbody tr.even.selected>.sorting_3 {
border-bottom: 1px solid #111111; } background-color: #afbdd8;
table.dataTable.nowrap th, table.dataTable.nowrap td { }
white-space: nowrap; }
table.dataTable.compact thead th, table.dataTable.display tbody tr:hover>.sorting_1,
table.dataTable.compact thead td { table.dataTable.order-column.hover tbody tr:hover>.sorting_1 {
padding: 4px 17px 4px 4px; } background-color: #eaeaea;
table.dataTable.compact tfoot th, }
table.dataTable.compact tfoot td {
padding: 4px; } table.dataTable.display tbody tr:hover>.sorting_2,
table.dataTable.compact tbody th, table.dataTable.order-column.hover tbody tr:hover>.sorting_2 {
table.dataTable.compact tbody td { background-color: #ebebeb;
padding: 4px; } }
table.dataTable th.dt-left,
table.dataTable td.dt-left { table.dataTable.display tbody tr:hover>.sorting_3,
text-align: left; } table.dataTable.order-column.hover tbody tr:hover>.sorting_3 {
table.dataTable th.dt-center, background-color: #eeeeee;
table.dataTable td.dt-center, }
table.dataTable td.dataTables_empty {
text-align: center; } table.dataTable.display tbody tr:hover.selected>.sorting_1,
table.dataTable th.dt-right, table.dataTable.order-column.hover tbody tr:hover.selected>.sorting_1 {
table.dataTable td.dt-right { background-color: #a1aec7;
text-align: right; } }
table.dataTable th.dt-justify,
table.dataTable td.dt-justify { table.dataTable.display tbody tr:hover.selected>.sorting_2,
text-align: justify; } table.dataTable.order-column.hover tbody tr:hover.selected>.sorting_2 {
table.dataTable th.dt-nowrap, background-color: #a2afc8;
table.dataTable td.dt-nowrap { }
white-space: nowrap; }
table.dataTable thead th.dt-head-left, table.dataTable.display tbody tr:hover.selected>.sorting_3,
table.dataTable thead td.dt-head-left, table.dataTable.order-column.hover tbody tr:hover.selected>.sorting_3 {
table.dataTable tfoot th.dt-head-left, background-color: #a4b2cb;
table.dataTable tfoot td.dt-head-left { }
text-align: left; }
table.dataTable thead th.dt-head-center, table.dataTable.no-footer {
table.dataTable thead td.dt-head-center, border-bottom: 1px solid #111111;
table.dataTable tfoot th.dt-head-center, }
table.dataTable tfoot td.dt-head-center {
text-align: center; } table.dataTable.nowrap th,
table.dataTable thead th.dt-head-right, table.dataTable.nowrap td {
table.dataTable thead td.dt-head-right, white-space: nowrap;
table.dataTable tfoot th.dt-head-right, }
table.dataTable tfoot td.dt-head-right {
text-align: right; } table.dataTable.compact thead th,
table.dataTable thead th.dt-head-justify, table.dataTable.compact thead td {
table.dataTable thead td.dt-head-justify, padding: 4px 17px 4px 4px;
table.dataTable tfoot th.dt-head-justify, }
table.dataTable tfoot td.dt-head-justify {
text-align: justify; } table.dataTable.compact tfoot th,
table.dataTable thead th.dt-head-nowrap, table.dataTable.compact tfoot td {
table.dataTable thead td.dt-head-nowrap, padding: 4px;
table.dataTable tfoot th.dt-head-nowrap, }
table.dataTable tfoot td.dt-head-nowrap {
white-space: nowrap; } table.dataTable.compact tbody th,
table.dataTable tbody th.dt-body-left, table.dataTable.compact tbody td {
table.dataTable tbody td.dt-body-left { padding: 4px;
text-align: left; } }
table.dataTable tbody th.dt-body-center,
table.dataTable tbody td.dt-body-center { table.dataTable th.dt-left,
text-align: center; } table.dataTable td.dt-left {
table.dataTable tbody th.dt-body-right, text-align: left;
table.dataTable tbody td.dt-body-right { }
text-align: right; }
table.dataTable tbody th.dt-body-justify, table.dataTable th.dt-center,
table.dataTable tbody td.dt-body-justify { table.dataTable td.dt-center,
text-align: justify; } table.dataTable td.dataTables_empty {
table.dataTable tbody th.dt-body-nowrap, text-align: center;
table.dataTable tbody td.dt-body-nowrap { }
white-space: nowrap; }
table.dataTable th.dt-right,
table.dataTable td.dt-right {
text-align: right;
}
table.dataTable th.dt-justify,
table.dataTable td.dt-justify {
text-align: justify;
}
table.dataTable th.dt-nowrap,
table.dataTable td.dt-nowrap {
white-space: nowrap;
}
table.dataTable thead th.dt-head-left,
table.dataTable thead td.dt-head-left,
table.dataTable tfoot th.dt-head-left,
table.dataTable tfoot td.dt-head-left {
text-align: left;
}
table.dataTable thead th.dt-head-center,
table.dataTable thead td.dt-head-center,
table.dataTable tfoot th.dt-head-center,
table.dataTable tfoot td.dt-head-center {
text-align: center;
}
table.dataTable thead th.dt-head-right,
table.dataTable thead td.dt-head-right,
table.dataTable tfoot th.dt-head-right,
table.dataTable tfoot td.dt-head-right {
text-align: right;
}
table.dataTable thead th.dt-head-justify,
table.dataTable thead td.dt-head-justify,
table.dataTable tfoot th.dt-head-justify,
table.dataTable tfoot td.dt-head-justify {
text-align: justify;
}
table.dataTable thead th.dt-head-nowrap,
table.dataTable thead td.dt-head-nowrap,
table.dataTable tfoot th.dt-head-nowrap,
table.dataTable tfoot td.dt-head-nowrap {
white-space: nowrap;
}
table.dataTable tbody th.dt-body-left,
table.dataTable tbody td.dt-body-left {
text-align: left;
}
table.dataTable tbody th.dt-body-center,
table.dataTable tbody td.dt-body-center {
text-align: center;
}
table.dataTable tbody th.dt-body-right,
table.dataTable tbody td.dt-body-right {
text-align: right;
}
table.dataTable tbody th.dt-body-justify,
table.dataTable tbody td.dt-body-justify {
text-align: justify;
}
table.dataTable tbody th.dt-body-nowrap,
table.dataTable tbody td.dt-body-nowrap {
white-space: nowrap;
}
table.dataTable, table.dataTable,
table.dataTable th, table.dataTable th,
table.dataTable td { table.dataTable td {
box-sizing: content-box; } box-sizing: content-box;
}
/* /*
* Control feature layout * Control feature layout
@ -214,23 +367,35 @@ table.dataTable td {
position: relative; position: relative;
clear: both; clear: both;
*zoom: 1; *zoom: 1;
zoom: 1; } zoom: 1;
.dataTables_wrapper .dataTables_length { }
float: left; }
.dataTables_wrapper .dataTables_filter { .dataTables_wrapper .dataTables_length {
float: right;
text-align: right; }
.dataTables_wrapper .dataTables_filter input {
margin-left: 0.5em; }
.dataTables_wrapper .dataTables_info {
clear: both;
float: left; float: left;
padding-top: 0.755em; } }
.dataTables_wrapper .dataTables_paginate {
.dataTables_wrapper .dataTables_filter {
float: right; float: right;
text-align: right; text-align: right;
padding-top: 0.25em; } }
.dataTables_wrapper .dataTables_paginate .paginate_button {
.dataTables_wrapper .dataTables_filter input {
margin-left: 0.5em;
}
.dataTables_wrapper .dataTables_info {
clear: both;
float: left;
padding-top: 0.755em;
}
.dataTables_wrapper .dataTables_paginate {
float: right;
text-align: right;
padding-top: 0.25em;
}
.dataTables_wrapper .dataTables_paginate .paginate_button {
box-sizing: border-box; box-sizing: border-box;
display: inline-block; display: inline-block;
min-width: 1.5em; min-width: 1.5em;
@ -242,8 +407,11 @@ table.dataTable td {
*cursor: hand; *cursor: hand;
color: #333333 !important; color: #333333 !important;
border: 1px solid transparent; border: 1px solid transparent;
border-radius: 2px; } border-radius: 2px;
.dataTables_wrapper .dataTables_paginate .paginate_button.current, .dataTables_wrapper .dataTables_paginate .paginate_button.current:hover { }
.dataTables_wrapper .dataTables_paginate .paginate_button.current,
.dataTables_wrapper .dataTables_paginate .paginate_button.current:hover {
color: #333333 !important; color: #333333 !important;
border: 1px solid #979797; border: 1px solid #979797;
background-color: white; background-color: white;
@ -258,14 +426,20 @@ table.dataTable td {
background: -o-linear-gradient(top, white 0%, gainsboro 100%); background: -o-linear-gradient(top, white 0%, gainsboro 100%);
/* Opera 11.10+ */ /* Opera 11.10+ */
background: linear-gradient(to bottom, white 0%, gainsboro 100%); background: linear-gradient(to bottom, white 0%, gainsboro 100%);
/* W3C */ } /* W3C */
.dataTables_wrapper .dataTables_paginate .paginate_button.disabled, .dataTables_wrapper .dataTables_paginate .paginate_button.disabled:hover, .dataTables_wrapper .dataTables_paginate .paginate_button.disabled:active { }
.dataTables_wrapper .dataTables_paginate .paginate_button.disabled,
.dataTables_wrapper .dataTables_paginate .paginate_button.disabled:hover,
.dataTables_wrapper .dataTables_paginate .paginate_button.disabled:active {
cursor: default; cursor: default;
color: #666 !important; color: #666 !important;
border: 1px solid transparent; border: 1px solid transparent;
background: transparent; background: transparent;
box-shadow: none; } box-shadow: none;
.dataTables_wrapper .dataTables_paginate .paginate_button:hover { }
.dataTables_wrapper .dataTables_paginate .paginate_button:hover {
color: white !important; color: white !important;
border: 1px solid #111111; border: 1px solid #111111;
background-color: #585858; background-color: #585858;
@ -280,8 +454,10 @@ table.dataTable td {
background: -o-linear-gradient(top, #585858 0%, #111111 100%); background: -o-linear-gradient(top, #585858 0%, #111111 100%);
/* Opera 11.10+ */ /* Opera 11.10+ */
background: linear-gradient(to bottom, #585858 0%, #111111 100%); background: linear-gradient(to bottom, #585858 0%, #111111 100%);
/* W3C */ } /* W3C */
.dataTables_wrapper .dataTables_paginate .paginate_button:active { }
.dataTables_wrapper .dataTables_paginate .paginate_button:active {
outline: none; outline: none;
background-color: #2b2b2b; background-color: #2b2b2b;
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #2b2b2b), color-stop(100%, #0c0c0c)); background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #2b2b2b), color-stop(100%, #0c0c0c));
@ -296,10 +472,14 @@ table.dataTable td {
/* Opera 11.10+ */ /* Opera 11.10+ */
background: linear-gradient(to bottom, #2b2b2b 0%, #0c0c0c 100%); background: linear-gradient(to bottom, #2b2b2b 0%, #0c0c0c 100%);
/* W3C */ /* W3C */
box-shadow: inset 0 0 3px #111; } box-shadow: inset 0 0 3px #111;
.dataTables_wrapper .dataTables_paginate .ellipsis { }
padding: 0 1em; }
.dataTables_wrapper .dataTables_processing { .dataTables_wrapper .dataTables_paginate .ellipsis {
padding: 0 1em;
}
.dataTables_wrapper .dataTables_processing {
position: absolute; position: absolute;
top: 50%; top: 50%;
left: 50%; left: 50%;
@ -316,53 +496,85 @@ table.dataTable td {
background: -moz-linear-gradient(left, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0.9) 25%, rgba(255, 255, 255, 0.9) 75%, rgba(255, 255, 255, 0) 100%); background: -moz-linear-gradient(left, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0.9) 25%, rgba(255, 255, 255, 0.9) 75%, rgba(255, 255, 255, 0) 100%);
background: -ms-linear-gradient(left, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0.9) 25%, rgba(255, 255, 255, 0.9) 75%, rgba(255, 255, 255, 0) 100%); background: -ms-linear-gradient(left, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0.9) 25%, rgba(255, 255, 255, 0.9) 75%, rgba(255, 255, 255, 0) 100%);
background: -o-linear-gradient(left, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0.9) 25%, rgba(255, 255, 255, 0.9) 75%, rgba(255, 255, 255, 0) 100%); background: -o-linear-gradient(left, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0.9) 25%, rgba(255, 255, 255, 0.9) 75%, rgba(255, 255, 255, 0) 100%);
background: linear-gradient(to right, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0.9) 25%, rgba(255, 255, 255, 0.9) 75%, rgba(255, 255, 255, 0) 100%); } background: linear-gradient(to right, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0.9) 25%, rgba(255, 255, 255, 0.9) 75%, rgba(255, 255, 255, 0) 100%);
.dataTables_wrapper .dataTables_length, }
.dataTables_wrapper .dataTables_filter,
.dataTables_wrapper .dataTables_info, .dataTables_wrapper .dataTables_length,
.dataTables_wrapper .dataTables_processing, .dataTables_wrapper .dataTables_filter,
.dataTables_wrapper .dataTables_paginate { .dataTables_wrapper .dataTables_info,
color: #333333; } .dataTables_wrapper .dataTables_processing,
.dataTables_wrapper .dataTables_scroll { .dataTables_wrapper .dataTables_paginate {
clear: both; } color: #333333;
.dataTables_wrapper .dataTables_scroll div.dataTables_scrollBody { }
.dataTables_wrapper .dataTables_scroll {
clear: both;
}
.dataTables_wrapper .dataTables_scroll div.dataTables_scrollBody {
*margin-top: -1px; *margin-top: -1px;
-webkit-overflow-scrolling: touch; } -webkit-overflow-scrolling: touch;
.dataTables_wrapper .dataTables_scroll div.dataTables_scrollBody > table > thead > tr > th, .dataTables_wrapper .dataTables_scroll div.dataTables_scrollBody > table > thead > tr > td, .dataTables_wrapper .dataTables_scroll div.dataTables_scrollBody > table > tbody > tr > th, .dataTables_wrapper .dataTables_scroll div.dataTables_scrollBody > table > tbody > tr > td { }
vertical-align: middle; }
.dataTables_wrapper .dataTables_scroll div.dataTables_scrollBody > table > thead > tr > th > div.dataTables_sizing, .dataTables_wrapper .dataTables_scroll div.dataTables_scrollBody>table>thead>tr>th,
.dataTables_wrapper .dataTables_scroll div.dataTables_scrollBody > table > thead > tr > td > div.dataTables_sizing, .dataTables_wrapper .dataTables_scroll div.dataTables_scrollBody > table > tbody > tr > th > div.dataTables_sizing, .dataTables_wrapper .dataTables_scroll div.dataTables_scrollBody>table>thead>tr>td,
.dataTables_wrapper .dataTables_scroll div.dataTables_scrollBody > table > tbody > tr > td > div.dataTables_sizing { .dataTables_wrapper .dataTables_scroll div.dataTables_scrollBody>table>tbody>tr>th,
.dataTables_wrapper .dataTables_scroll div.dataTables_scrollBody>table>tbody>tr>td {
vertical-align: middle;
}
.dataTables_wrapper .dataTables_scroll div.dataTables_scrollBody>table>thead>tr>th>div.dataTables_sizing,
.dataTables_wrapper .dataTables_scroll div.dataTables_scrollBody>table>thead>tr>td>div.dataTables_sizing,
.dataTables_wrapper .dataTables_scroll div.dataTables_scrollBody>table>tbody>tr>th>div.dataTables_sizing,
.dataTables_wrapper .dataTables_scroll div.dataTables_scrollBody>table>tbody>tr>td>div.dataTables_sizing {
height: 0; height: 0;
overflow: hidden; overflow: hidden;
margin: 0 !important; margin: 0 !important;
padding: 0 !important; } padding: 0 !important;
.dataTables_wrapper.no-footer .dataTables_scrollBody { }
border-bottom: 1px solid #111111; }
.dataTables_wrapper.no-footer div.dataTables_scrollHead > table, .dataTables_wrapper.no-footer .dataTables_scrollBody {
.dataTables_wrapper.no-footer div.dataTables_scrollBody > table { border-bottom: 1px solid #111111;
border-bottom: none; } }
.dataTables_wrapper:after {
.dataTables_wrapper.no-footer div.dataTables_scrollHead>table,
.dataTables_wrapper.no-footer div.dataTables_scrollBody>table {
border-bottom: none;
}
.dataTables_wrapper:after {
visibility: hidden; visibility: hidden;
display: block; display: block;
content: ""; content: "";
clear: both; clear: both;
height: 0; } height: 0;
}
@media screen and (max-width: 767px) { @media screen and (max-width: 767px) {
.dataTables_wrapper .dataTables_info, .dataTables_wrapper .dataTables_info,
.dataTables_wrapper .dataTables_paginate { .dataTables_wrapper .dataTables_paginate {
float: none; float: none;
text-align: center; } text-align: center;
}
.dataTables_wrapper .dataTables_paginate { .dataTables_wrapper .dataTables_paginate {
margin-top: 0.5em; } } margin-top: 0.5em;
}
}
@media screen and (max-width: 640px) { @media screen and (max-width: 640px) {
.dataTables_wrapper .dataTables_length, .dataTables_wrapper .dataTables_length,
.dataTables_wrapper .dataTables_filter { .dataTables_wrapper .dataTables_filter {
float: none; float: none;
text-align: center; } text-align: center;
}
.dataTables_wrapper .dataTables_filter { .dataTables_wrapper .dataTables_filter {
margin-top: 0.5em; } } margin-top: 0.5em;
}
}
/* ------ Ajouts spécifiques pour ScoDoc: /* ------ Ajouts spécifiques pour ScoDoc:
@ -371,42 +583,58 @@ table.dataTable td {
table.gt_table td { table.gt_table td {
text-align: right; text-align: right;
} }
table.gt_table tbody th { table.gt_table tbody th {
font-weight: normal; font-weight: normal;
text-align: left; text-align: left;
} }
table.table_leftalign tr td { table.table_leftalign tr td {
text-align: left; text-align: left;
} }
/* Ligne(s) de titre */ /* Ligne(s) de titre */
table.dataTable thead tr th { table.dataTable thead tr th {
background-color: rgb(90%,90%,90%); background-color: rgb(90%, 90%, 90%);
} }
table.dataTable thead tr td { table.dataTable thead tr td {
background-color: rgb(95%,95%,95%); background-color: rgb(95%, 95%, 95%);
border-top: none; border-top: none;
border-bottom: none; border-bottom: none;
border-right: 1px solid #dddddd; border-right: 1px solid #dddddd;
} }
table.dataTable thead tr td:first-child { table.dataTable thead tr td:first-child {
border-left: 1px solid #dddddd; border-left: 1px solid #dddddd;
} }
/* Lignes impaires des tableaux "stripe" */ /* Lignes impaires des tableaux "stripe" */
table.dataTable.stripe tbody tr.odd td, table.dataTable.stripe tbody tr.odd td.sorting_1, table.dataTable.order-column.stripe tbody tr.odd td.sorting_1 { table.dataTable.stripe tbody tr.odd td,
background-color: rgb(90%,95%,90%); table.dataTable.stripe tbody tr.odd td.sorting_1,
table.dataTable.order-column.stripe tbody tr.odd td.sorting_1 {
background-color: rgb(90%, 95%, 90%);
} }
table.dataTable.stripe.hover tbody tr.odd:hover td, table.dataTable.stripe.hover tbody tr.odd:hover td.sorting_1, table.dataTable.order-column.stripe.hover tbody tr.odd:hover td.sorting_1 { table.dataTable.stripe.hover tbody tr.odd:hover td,
background-color: rgb(80%,85%,80%);; table.dataTable.stripe.hover tbody tr.odd:hover td.sorting_1,
table.dataTable.order-column.stripe.hover tbody tr.odd:hover td.sorting_1 {
background-color: rgb(80%, 85%, 80%);
;
} }
/* Lignes paires */ /* Lignes paires */
table.dataTable.stripe tbody tr.even td, table.dataTable.stripe tbody tr.even td.sorting_1, table.dataTable.order-column.stripe tbody tr.even td.sorting_1 { table.dataTable.stripe tbody tr.even td,
background-color: rgb(95%,95%,95%); table.dataTable.stripe tbody tr.even td.sorting_1,
table.dataTable.order-column.stripe tbody tr.even td.sorting_1 {
background-color: rgb(95%, 95%, 95%);
} }
table.dataTable.stripe.hover tbody tr.even:hover td, table.dataTable.stripe.hover tbody tr.even:hover td.sorting_1, table.dataTable.order-column.stripe.hover tbody tr.even:hover td.sorting_1 {
background-color: rgb(85%,85%,85%);; table.dataTable.stripe.hover tbody tr.even:hover td,
table.dataTable.stripe.hover tbody tr.even:hover td.sorting_1,
table.dataTable.order-column.stripe.hover tbody tr.even:hover td.sorting_1 {
background-color: rgb(85%, 85%, 85%);
;
} }
/* Reglage largeur de la table */ /* Reglage largeur de la table */
@ -414,4 +642,3 @@ table.dataTable.gt_table {
width: auto; width: auto;
padding-right: 5px; padding-right: 5px;
} }

18
app/static/css/scodoc.css
View File

@ -4133,6 +4133,17 @@ table.table_recap td.col_ues_validables {
font-style: normal !important; font-style: normal !important;
} }
table.table_recap td.col_res,
table.table_recap th.col_res {
border-right: 1px dashed green;
border-left: 1px dashed green;
}
table.table_recap td.partition,
table.table_recap th.partition {
border-right: 1px solid rgb(221, 221, 221);
border-left: 1px solid rgb(221, 221, 221);
}
.green-arrow-up { .green-arrow-up {
display: inline-block; display: inline-block;
@ -4228,18 +4239,17 @@ table.table_recap tr.descr_evaluation {
vertical-align: top; vertical-align: top;
} }
table.table_recap tr.apo { table.table_recap tr.apo td:not(.identite_court) {
font-size: 75%; font-size: 75%;
font-family: monospace; font-family: monospace;
} }
table.table_recap tr.apo td { table.table_recap tr.apo td {
border: 1px solid gray; background-color: #f5fdf6;
background-color: #d8f5fe;
} }
table.table_recap tr.type_col { table.table_recap tr.type_col {
font-size: 50%; font-size: 40%;
font-family: monospace; font-family: monospace;
} }

86
app/tables/recap.py
View File

@ -110,18 +110,18 @@ class TableRecap(tb.Table):
for col_id in self.column_ids: for col_id in self.column_ids:
cell: tb.Cell = row_moy.cells.get(col_id) cell: tb.Cell = row_moy.cells.get(col_id)
if cell and "col_empty" in cell.classes: if cell and "col_empty" in cell.classes:
self.column_classes[col_id].append("col_empty") self.column_classes[col_id].add("col_empty")
def add_type_row(self): def add_type_row(self):
"""Ligne avec la classe de chaque colonne recap.""" """Ligne avec la classe de chaque colonne recap."""
# récupère le type à partir des classes css (hack...) # récupère le type à partir du groupe (enlève le préfixe "col_" si présent)
row_type = tb.BottomRow( row_type = tb.BottomRow(
self, self,
"type_col", "type_col",
left_title="Type col.", left_title="Type col.",
left_title_col_ids=["prenom", "nom_short"], left_title_col_ids=["prenom", "nom_short"],
category="bottom_infos", category="bottom_infos",
classes=["bottom_info"], classes=["bottom_info", "type_col"],
) )
for col_id in self.column_ids: for col_id in self.column_ids:
group_name = self.column_group.get(col_id, "") group_name = self.column_group.get(col_id, "")
@ -180,7 +180,7 @@ class TableRecap(tb.Table):
left_title="Code Apogée", left_title="Code Apogée",
left_title_col_ids=["prenom", "nom_short"], left_title_col_ids=["prenom", "nom_short"],
category="bottom_infos", category="bottom_infos",
classes=["bottom_info"], classes=["bottom_info", "apo"],
) )
# --- ECTS # --- ECTS
@ -188,25 +188,58 @@ class TableRecap(tb.Table):
for ue in ues: for ue in ues:
col_id = f"moy_ue_{ue.id}" col_id = f"moy_ue_{ue.id}"
row_ects.add_cell(col_id, None, ue.ects) row_ects.add_cell(col_id, None, ue.ects)
# ajoute cell UE vides sur ligne coef pour borders verticales
# XXX TODO classes dans table sur colonne ajoutées à tous les TD
row_coef.add_cell(col_id, None, "")
row_ects.add_cell( row_ects.add_cell(
"moy_gen", "moy_gen",
None, None,
sum([ue.ects or 0 for ue in ues if ue.type != UE_SPORT]), sum([ue.ects or 0 for ue in ues if ue.type != UE_SPORT]),
) )
# --- MIN, MAX, MOY, APO # --- MIN, MAX, MOY, APO
row_min.add_cell("moy_gen", None, self.fmt_note(res.etud_moy_gen.min())) row_min.add_cell(
row_max.add_cell("moy_gen", None, self.fmt_note(res.etud_moy_gen.max())) "moy_gen",
row_moy.add_cell("moy_gen", None, self.fmt_note(res.etud_moy_gen.mean())) None,
self.fmt_note(res.etud_moy_gen.min()),
# classes=["col_moy_gen"],
)
row_max.add_cell(
"moy_gen",
None,
self.fmt_note(res.etud_moy_gen.max()),
classes=["col_moy_gen"],
)
row_moy.add_cell(
"moy_gen",
None,
self.fmt_note(res.etud_moy_gen.mean()),
# classes=["col_moy_gen"],
)
for ue in ues: for ue in ues:
col_id = f"moy_ue_{ue.id}" col_id = f"moy_ue_{ue.id}"
row_min.add_cell(col_id, None, self.fmt_note(res.etud_moy_ue[ue.id].min())) row_min.add_cell(
row_max.add_cell(col_id, None, self.fmt_note(res.etud_moy_ue[ue.id].max())) col_id,
row_moy.add_cell(col_id, None, self.fmt_note(res.etud_moy_ue[ue.id].mean())) None,
row_apo.add_cell(col_id, None, ue.code_apogee or "") self.fmt_note(res.etud_moy_ue[ue.id].min()),
classes=["col_ue", "col_moy_ue"],
)
row_max.add_cell(
col_id,
None,
self.fmt_note(res.etud_moy_ue[ue.id].max()),
classes=["col_ue", "col_moy_ue"],
)
row_moy.add_cell(
col_id,
None,
self.fmt_note(res.etud_moy_ue[ue.id].mean()),
classes=["col_ue", "col_moy_ue"],
)
row_apo.add_cell(
col_id,
None,
ue.code_apogee or "",
classes=["col_ue", "col_moy_ue"],
)
for modimpl in res.formsemestre.modimpls_sorted: for modimpl in res.formsemestre.modimpls_sorted:
if (modimpl.id, ue.id) in self.modimpl_ue_ids: if (modimpl.id, ue.id) in self.modimpl_ue_ids:
@ -260,13 +293,12 @@ class TableRecap(tb.Table):
group = None # group (dict) de l'étudiant dans cette partition group = None # group (dict) de l'étudiant dans cette partition
# dans NotesTableCompat, à revoir # dans NotesTableCompat, à revoir
etud_etat = self.res.get_etud_etat(row.id) # row.id == etudid etud_etat = self.res.get_etud_etat(row.id) # row.id == etudid
tr_classes = []
if etud_etat == scu.DEMISSION: if etud_etat == scu.DEMISSION:
gr_name = "Dém." gr_name = "Dém."
tr_classes.append("dem") row.add_class("dem")
elif etud_etat == DEF: elif etud_etat == DEF:
gr_name = "Déf." gr_name = "Déf."
tr_classes.append("def") row.add_class("def")
else: else:
group = partition_etud_groups.get(etudid) group = partition_etud_groups.get(etudid)
gr_name = group["group_name"] if group else "" gr_name = group["group_name"] if group else ""
@ -519,7 +551,7 @@ class RowRecap(tb.Row):
"moy_gen", "moy_gen",
"Moy", "Moy",
table.fmt_note(moy_gen), table.fmt_note(moy_gen),
"col_moy_gen", group="col_moy_gen",
classes=[note_class], classes=[note_class],
) )
# Ajoute bulle sur titre du pied de table: # Ajoute bulle sur titre du pied de table:
@ -553,7 +585,7 @@ class RowRecap(tb.Row):
val_fmt_html, val_fmt_html,
raw_content=val_fmt, raw_content=val_fmt,
group=f"col_ue_{ue.id}", group=f"col_ue_{ue.id}",
classes=["col_ue_bonus"], column_classes={"col_ue_bonus"},
) )
# Les moyennes des modules (ou ressources et SAÉs) dans cette UE # Les moyennes des modules (ou ressources et SAÉs) dans cette UE
self.add_ue_modimpls_cols(ue, ue_status["is_capitalized"]) self.add_ue_modimpls_cols(ue, ue_status["is_capitalized"])
@ -566,17 +598,18 @@ class RowRecap(tb.Row):
ue_valid_txt_html += " " + scu.EMO_WARNING ue_valid_txt_html += " " + scu.EMO_WARNING
# place juste avant moy. gen. # place juste avant moy. gen.
table.insert_group("col_ues_validables", before="col_moy_gen") table.insert_group("col_ues_validables", before="col_moy_gen")
classes = ["col_ue"] cell_class = ""
if self.nb_ues_warning: if self.nb_ues_warning:
classes.append("moy_ue_warning") cell_class = "moy_ue_warning"
elif self.nb_ues_validables < len(ues_sans_bonus): elif self.nb_ues_validables < len(ues_sans_bonus):
classes.append("moy_inf") cell_class = "moy_inf"
self.add_cell( self.add_cell(
"ues_validables", "ues_validables",
"UEs", "UEs",
ue_valid_txt_html, ue_valid_txt_html,
group="col_ues_validables", group="col_ues_validables",
classes=classes, classes=[cell_class],
column_classes={"col_ue"},
raw_content=ue_valid_txt, raw_content=ue_valid_txt,
data={"order": self.nb_ues_validables}, # tri data={"order": self.nb_ues_validables}, # tri
) )
@ -627,7 +660,8 @@ class RowRecap(tb.Row):
ue.acronyme, ue.acronyme,
table.fmt_note(val), table.fmt_note(val),
group=f"col_ue_{ue.id}", group=f"col_ue_{ue.id}",
classes=["col_ue", "col_moy_ue", note_class], classes=[note_class],
column_classes={"col_ue", "col_moy_ue"},
) )
table.foot_title_row.cells[col_id].target_attrs[ table.foot_title_row.cells[col_id].target_attrs[
"title" "title"
@ -678,10 +712,10 @@ class RowRecap(tb.Row):
val_fmt_html, val_fmt_html,
raw_content=val_fmt, raw_content=val_fmt,
group=f"col_ue_{ue.id}_modules", group=f"col_ue_{ue.id}_modules",
classes=[ column_classes={
f"col_{modimpl.module.type_abbrv()}", f"col_{modimpl.module.type_abbrv()}",
f"mod_ue_{ue.id}", f"mod_ue_{ue.id}",
], },
) )
if modimpl.module.module_type == scu.ModuleType.MALUS: if modimpl.module.module_type == scu.ModuleType.MALUS:
# positionne la colonne à droite de l'UE # positionne la colonne à droite de l'UE

16
app/tables/table_builder.py
View File

@ -26,9 +26,9 @@ class Element:
self.data = data or {} self.data = data or {}
"data-xxx" "data-xxx"
def html(self, extra_classes: list[str] = None) -> str: def html(self, extra_classes: set[str] = None) -> str:
"html for element" "html for element"
classes = [cls for cls in (self.classes + (extra_classes or [])) if cls] classes = [cls for cls in (self.classes + (list(extra_classes or []))) if cls]
attrs_str = f"""class="{' '.join(classes)}" """ if classes else "" attrs_str = f"""class="{' '.join(classes)}" """ if classes else ""
# Autres attributs: # Autres attributs:
attrs_str += " " + " ".join([f'{k}="{v}"' for (k, v) in self.attrs.items()]) attrs_str += " " + " ".join([f'{k}="{v}"' for (k, v) in self.attrs.items()])
@ -40,6 +40,11 @@ class Element:
"Le contenu de l'élément, en html." "Le contenu de l'élément, en html."
return str(self.content or "") return str(self.content or "")
def add_class(self, klass: str):
"Add a class, do nothing if already there"
if klass not in self.classes:
self.classes.append(klass)
class Table(Element): class Table(Element):
"""Construction d'une table de résultats """Construction d'une table de résultats
@ -81,7 +86,7 @@ class Table(Element):
self.foot = [] self.foot = []
self.column_group = {} self.column_group = {}
"the group of the column: { col_id : group }" "the group of the column: { col_id : group }"
self.column_classes: defaultdict[str, list[str]] = defaultdict(lambda: []) self.column_classes: defaultdict[str, set[str]] = defaultdict(set)
"classe ajoutée à toutes les cellules de la colonne: { col_id : class }" "classe ajoutée à toutes les cellules de la colonne: { col_id : class }"
self.selected_row_id = selected_row_id self.selected_row_id = selected_row_id
"l'id de la ligne sélectionnée" "l'id de la ligne sélectionnée"
@ -275,6 +280,7 @@ class Row(Element):
raw_content=None, raw_content=None,
target_attrs: dict = None, target_attrs: dict = None,
target: str = None, target: str = None,
column_classes: set[str] = None,
) -> "Cell": ) -> "Cell":
"""Create cell and add it to the row. """Create cell and add it to the row.
group: groupe de colonnes group: groupe de colonnes
@ -285,6 +291,10 @@ class Row(Element):
classes = [group or ""] + (classes or []) classes = [group or ""] + (classes or [])
else: else:
classes = classes.copy() classes = classes.copy()
if group:
self.table.column_classes[col_id].add(group)
if column_classes:
self.table.column_classes[col_id].update(column_classes)
cell = Cell( cell = Cell(
content, content,
classes, classes,