Skip to content

Commit

Permalink
Merge pull request #2693 from expertiza/bugfix/view_all_scores_button
Browse files Browse the repository at this point in the history 
Fixing bug where show all scores on the view scores report would not work
  • Loading branch information
@ameyagv
ameyagv committed Nov 16, 2023
2 parents 590329e + 039b644 commit a59318a
Show file tree
Hide file tree
Showing 2 changed files with 106 additions and 80 deletions.
184 changes: 105 additions & 79 deletions app/assets/javascripts/grading.js
View file
Original file line number Diff line number Diff line change
@@ -1,83 +1,109 @@
function toggleAll(numteams){
var maintag = document.getElementById('teamAll');
hidden = maintag.innerHTML == 'Show all teams';
if (hidden) {maintag.innerHTML = 'Hide all teams';}
else {maintag.innerHTML = 'Show all teams';}
toggleTeams(numteams,hidden);
function toggleAll(numteams) {
var maintag = document.getElementById('teamAll');
visible = maintag.innerHTML == 'Show all teams';
if (visible) {
maintag.innerHTML = 'Hide all teams';
} else {
maintag.innerHTML = 'Show all teams';
}
toggleTeams(numteams, visible);
}

function collapseObj(obj, atag){
obj.style.display = 'none';
atag.innerHTML = '<img src="/assets/expand.png">';

files = document.getElementById(obj.id+'_files');
if (files) {
files.style.display = 'none';
files_tag = document.getElementById(obj.id+'_filesLink');
if (files_tag){files_tag.innerHTML = 'show submission';}
}
reviews = document.getElementById(obj.id+'_reviews');
if (reviews) {
reviews.style.display = 'none';
reviews_tag = document.getElementById(obj.id+'_reviewsLink');
if (reviews_tag){reviews_tag.innerHTML = 'show reviews';}
}
mreviews = document.getElementById(obj.id+'_mreviews');
if (mreviews) {
mreviews.style.display = 'none';
mreviews_tag = document.getElementById(obj.id+'_mreviewsLink');
if(mreviews_tag){mreviews_tag.innerHTML = 'show metareviews';}
}
previews = document.getElementById(obj.id+'_previews');
if (previews) {
previews.style.display = 'none';
previews_tag = document.getElementById(obj.id+'_previewsLink');
if(previews_tag){previews_tag.innerHTML = 'show teammate reviews';}
}
}

function toggleTeams(numteams,hidden){
for (var i = 0; i < numteams; i++){
elementId = 'team'+i;
var atag = document.getElementById(elementId+'Link');
var sublistsize = 1;
while (document.getElementById(elementId+"_"+sublistsize) != null){
var obj = document.getElementById(elementId+"_"+sublistsize);
if (hidden) {
obj.style.display = '';
atag.innerHTML = '<img src="/assets/collapse.png">';}
else {
collapseObj(obj, atag);
}
sublistsize += 1;
}
}
}

function toggleTeam(elementId){
var sublistsize = 1;
var obj = document.getElementById(elementId+"_"+sublistsize);
var atag = document.getElementById(elementId+'Link');
var header = document.getElementById(elementId+'_header');

while (obj != null){

function collapseObj(obj, atag, header) {
obj.style.display = 'none';
atag.innerHTML = '<img src="/assets/expand.png">';
header.style.backgroundColor = 'white';
header.style.color = "#000000";
var bExpand = obj.style.display.length == 0;
if (bExpand) {
collapseObj(obj, atag);
}
else {
obj.style.display = '';
//E1877: changes made to adjust width of expandables
var offsets = obj.getBoundingClientRect();
obj.style.width="calc(100vw - 103px)";
atag.innerHTML = '<img src="/assets/collapse.png">';
header.style.backgroundColor = '#a90201';
header.style.color = "#ffffff";
}
sublistsize += 1;
var obj = document.getElementById(elementId+"_"+sublistsize);
}
}

files = document.getElementById(obj.id + '_files');
if (files) {
files.style.display = 'none';
files_tag = document.getElementById(obj.id + '_filesLink');
if (files_tag) {
files_tag.innerHTML = 'show submission';
}
}
reviews = document.getElementById(obj.id + '_reviews');
if (reviews) {
reviews.style.display = 'none';
reviews_tag = document.getElementById(obj.id + '_reviewsLink');
if (reviews_tag) {
reviews_tag.innerHTML = 'show reviews';
}
}
mreviews = document.getElementById(obj.id + '_mreviews');
if (mreviews) {
mreviews.style.display = 'none';
mreviews_tag = document.getElementById(obj.id + '_mreviewsLink');
if (mreviews_tag) {
mreviews_tag.innerHTML = 'show metareviews';
}
}
previews = document.getElementById(obj.id + '_previews');
if (previews) {
previews.style.display = 'none';
previews_tag = document.getElementById(obj.id + '_previewsLink');
if (previews_tag) {
previews_tag.innerHTML = 'show teammate reviews';
}
}
}

function toggleTeams(numteams, visible) {
for (var i = 0; i < numteams; i++) {
var sublistsize = 1;
var elementId = 'team' + i;
var obj = document.getElementById(elementId + '_' + sublistsize);
var atag = document.getElementById(elementId + 'Link');
var header = document.getElementById(elementId + '_header');
if (atag) {
while (obj != null) {
var bExpand = obj.style.display.length == 0;
if (bExpand) {
if (!visible)
collapseObj(obj, atag, header);
} else {
if (visible) {
obj.style.display = '';
//E1877: changes made to adjust width of expandables
var offsets = obj.getBoundingClientRect();
obj.style.width = 'calc(100vw - 103px)';
atag.innerHTML = '<img src="/assets/collapse.png">';
header.style.backgroundColor = '#a90201';
header.style.color = "#ffffff";
}
}
sublistsize += 1;
var obj = document.getElementById(elementId + "_" + sublistsize);
}
}
}
}

function toggleTeam(elementId) {
var sublistsize = 1;
var obj = document.getElementById(elementId + '_' + sublistsize);
var atag = document.getElementById(elementId + 'Link');
var header = document.getElementById(elementId + '_header');
if (atag) {
while (obj != null) {

header.style.backgroundColor = 'white';
header.style.color = "#000000";
var bExpand = obj.style.display.length == 0;
if (bExpand) {
collapseObj(obj, atag);
} else {
obj.style.display = '';
//E1877: changes made to adjust width of expandables
var offsets = obj.getBoundingClientRect();
obj.style.width = 'calc(100vw - 103px)';
atag.innerHTML = '<img src="/assets/collapse.png">';
header.style.backgroundColor = '#a90201';
header.style.color = "#ffffff";
}
sublistsize += 1;
var obj = document.getElementById(elementId + '_' + sublistsize);
}
}
}
2 changes: 1 addition & 1 deletion app/views/grades/view.html.erb
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<h1>Summary report for <%= @assignment.name %></h1>
<BR/>
<% if @scores[:teams] %>
<a href="#" onClick="toggleAll(<%= @scores[:teams].length %>);return false;" id="teamAll" name="teamAll">Show all teams</a>
<a href="#" onClick="toggleAll(<%= @original_length %>);return false;" id="teamAll" name="teamAll">Show all teams</a>
<BR/><BR/>
<% end %>
<!-- If there are 1-member teams, the Teammate Review column should not appear in the score report.
Expand Down

0 comments on commit a59318a

Please sign in to comment.