Skip to content
Snippets Groups Projects
Commit bda1697b authored by Myriam Delaruelle's avatar Myriam Delaruelle
Browse files

Fix opacité tableau, hauteur, bug filtre qui se mettait à pas d'activités à cause du cache

parent 0823ede7
No related branches found
No related tags found
No related merge requests found
......@@ -558,23 +558,24 @@ define(['jquery', 'core/ajax', 'core/templates', 'core/str'],
if(localStorage.activities){
var checkedActivities=JSON.parse(localStorage.activities);
var activities=$("input[type='checkbox'].justone");
if(activities.length===checkedActivities.length){
$(".selectall").prop("checked", true);
$("input[type='checkbox'].justone").prop("checked", true);
}
else{
$(".selectall").prop("checked", false);
for(var i=0; i<activities.length; i++){
if(checkedActivities.includes(activities[i].value)){
activities[i].checked=true;
}
else{
activities[i].checked=false;
}
}
if($("input[type='checkbox'].justone[value="+checkedActivities[0]+"]").length > 0){
if(activities.length===checkedActivities.length ){
$(".selectall").prop("checked", true);
$("input[type='checkbox'].justone").prop("checked", true);
}
else{
$(".selectall").prop("checked", false);
for(var i=0; i<activities.length; i++){
if(checkedActivities.includes(activities[i].value)){
activities[i].checked=true;
}
else{
activities[i].checked=false;
}
}
}
}
}
displayTotalActivitiesFilter();
......
......@@ -818,7 +818,7 @@ th.th-rotate > div > span {
}
.stud_perc {
min-width: 45px;
min-width: 42px;
display: inline-block;
text-align: right;
}
......@@ -981,10 +981,10 @@ tbody th{
position: relative;
overflow: auto;
white-space: nowrap;
max-height: 600px;
max-height: 85vh;
border:1px solid lightgrey;
border-radius: 5px;
padding: 0 10px 10px 10px;
padding: 0 10px 10px 0px;
}
.first-column-iena, .second-column-iena, .actions-column-iena, .third-column-iena{
......@@ -999,6 +999,13 @@ th.first-column-iena, th.second-column-iena, th.actions-column-iena, th.third-co
top: 0;
}
#table-body td.row-header{
z-index: 10;
}
#table-body th.col-header{
z-index: 11;
}
#partial-table{
margin-bottom: 20px;
}
......
......@@ -6,10 +6,10 @@
<tr id="modules">
<th id="first-column-head" class="first-column-iena"> <input type="checkbox" id="iena-select-all" ></th>
<th class="second-column-iena">%</th>
<th class="actions-column-iena">Actions</th>
<th class="third-column-iena">Etudiants</th>
<th id="first-column-head " class="first-column-iena col-header"> <input type="checkbox" id="iena-select-all" ></th>
<th class="second-column-iena col-header">%</th>
<th class="actions-column-iena col-header">Actions</th>
<th class="third-column-iena col-header">Etudiants</th>
{{#modules}}
{{#visible}}
<th class="th-rotate" data-fullname="{{name}}" data-section="{{section}}">
......@@ -27,17 +27,17 @@
{{#students}}
{{#visible}}
<tr data-userid="{{id}}" data-percent={{percentage}}>
<td class="first-column-iena">
<td class="first-column-iena row-header">
<input type="checkbox" class="checkstudent" name="checkstudent" value="{{id}}">
</td>
<td class="second-column-iena">
<td class="second-column-iena row-header">
<span class="stud_perc">{{percentage}} %</span>
</td>
<td class="actions-column-iena">
<td class="actions-column-iena row-header">
<a href="{{report_link}}" target="_blank"><i class="icon fa fa-graduation-cap fa-fw"></i></a>
<a href="{{message_link}}" target="_blank"><i class="icon fa fa-envelope fa-fw"></i></a>
</td>
<td class="third-column-iena">
<td class="third-column-iena row-header">
{{firstname}} {{lastname}}
</td>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment