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

Fix: bug display selected students on export apo

Browse Source
This commit is contained in:
IDK 2021-02-05 19:06:42 +01:00
parent 6d17f030e2
commit de7d66e8e8
2 changed files with 32 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sco_etape_bilan.py
View File

@ -90,6 +90,7 @@ l'inscrition de semestres décalés (S1 en septembre, ...).
Le filtrage s'effctue sur la date et non plus sur la parité du semestre (1-3/2-4). Le filtrage s'effctue sur la date et non plus sur la parité du semestre (1-3/2-4).
""" """
import json
from sco_portal_apogee import get_inscrits_etape from sco_portal_apogee import get_inscrits_etape
from notes_log import log from notes_log import log
@ -540,7 +541,7 @@ class EtapeBilan:
ind_col, ind_col,
comptage, comptage,
"", "",
self.titres[ind_col].replace("<br/>", " / "), json.dumps(self.titres[ind_col].replace("<br/>", " / "))[1:-1],
) )
elif ind_col == COL_CUMUL: elif ind_col == COL_CUMUL:
javascript = "doFiltrage(%s, %s, '.%s', '*', '%s', '%s', '%s');" % ( javascript = "doFiltrage(%s, %s, '.%s', '*', '%s', '%s', '%s');" % (
@ -548,7 +549,7 @@ class EtapeBilan:
self.all_cols_str, self.all_cols_str,
ind_row, ind_row,
" (%d étudiants)" % count, " (%d étudiants)" % count,
self.titres[ind_row], json.dumps(self.titres[ind_row])[1:-1],
"", "",
) )
else: else:
@ -558,10 +559,10 @@ class EtapeBilan:
ind_row, ind_row,
ind_col, ind_col,
comptage, comptage,
self.titres[ind_row], json.dumps(self.titres[ind_row])[1:-1],
self.titres[ind_col].replace("<br/>", " / "), json.dumps(self.titres[ind_col].replace("<br/>", " / "))[1:-1],
) )
return "<a href='#synthese' onclick=\"%s\">%d</a>" % (javascript, count) return '<a href="#synthese" onclick="%s">%d</a>' % (javascript, count)
def _diagtable(self): def _diagtable(self):
H = [] H = []

16
static/js/apo_semset_maq_status.js
View File

@ -1,6 +1,6 @@
$(function() { $(function () {
$( "div#export_help" ).accordion( { $("div#export_help").accordion({
heightStyle: "content", heightStyle: "content",
collapsible: true, collapsible: true,
active: false, active: false,
@ -21,8 +21,8 @@ function display(r, c, row, col) {
function show_tag(all_rows, all_cols, tag) { function show_tag(all_rows, all_cols, tag) {
// Filtrer tous les étudiants // Filtrer tous les étudiants
all_rows.split(',').forEach(function(r) { all_rows.split(',').forEach(function (r) {
all_cols.split(',').forEach(function(c) { all_cols.split(',').forEach(function (c) {
etudiants = r + c.substring(1); etudiants = r + c.substring(1);
$(etudiants).css("display", "none"); $(etudiants).css("display", "none");
}) })
@ -58,12 +58,12 @@ function show_filtres(effectifs, filtre_row, filtre_col) {
function doFiltrage(all_rows, all_cols, row, col, effectifs, filtre_row, filtre_col) { function doFiltrage(all_rows, all_cols, row, col, effectifs, filtre_row, filtre_col) {
show_filtres(effectifs, filtre_row, filtre_col) show_filtres(effectifs, filtre_row, filtre_col)
all_rows.split(',').forEach(function(r) { all_rows.split(',').forEach(function (r) {
all_cols.split(',').forEach(function(c) { all_cols.split(',').forEach(function (c) {
etudiants = r + c.substring(1); etudiants = r + c.substring(1);
$(etudiants).css("display", display(r, c, row, col)); $(etudiants).css("display", display(r, c, row, col));
}) });
}) });
$('.repartition td').css("background-color", ""); $('.repartition td').css("background-color", "");
$('.repartition th').css("background-color", ""); $('.repartition th').css("background-color", "");