Skip to content

Commit

Permalink
devide by zero fix, added avg labels in graph, fixed scaling problem
Browse files Browse the repository at this point in the history
  • Loading branch information
@TimoBoer
TimoBoer committed Aug 3, 2023
1 parent bf07b2a commit 2a10188
Showing 1 changed file with 46 additions and 19 deletions.
65 changes: 46 additions & 19 deletions modules/xerte/parent_templates/Nottingham/models_html5/adaptiveContent.html
View file
Expand Up @@ -615,7 +615,6 @@
secondHandler
) {
var url;
debugger
var q = {}
if (type != "grouping" && type != "opinionclasses") {
url = getUrl(xerteurl, xertelo, xertelabel, opinionClass);
Expand Down Expand Up @@ -1781,7 +1780,6 @@
"-graph'></div></div>"
);
} else {
debugger;
div.append(
"<div class='graph'><svg id='" +
escapeUrl(url, type, interactionIndex) +
Expand Down Expand Up @@ -1833,7 +1831,7 @@
}

Object.keys(labels).forEach(function(key){ labels[key] = labels[key]/statements.length*100 });
debugger

let bardata = {
labels: Object.keys(labels),
datasets: [
Expand Down Expand Up @@ -1872,6 +1870,9 @@
text: xAxisLabelBarAnswers,
beginAtZero: true,
},
ticks: {
autoSkip: false,
}
}
},
plugins: {
Expand Down Expand Up @@ -1936,6 +1937,8 @@
let ownScoreLabelBarMarks =
interaction.getAttribute("ownScoreLabelBarMarks");
let groupUserLabel = interaction.getAttribute("groupUserLabel");
let groupScore = interaction.getAttribute("groupScore");
let userScore = interaction.getAttribute("userScore");
if (xAxisLabelBarMarks == undefined)
xAxisLabelBarMarks = "Score Range [%]";
if (yAxisLabelBarMarks == undefined)
Expand All @@ -1946,38 +1949,44 @@
avgScoreLabelBarMarks = "Average in this group";
if (ownScoreLabelBarMarks == undefined)
ownScoreLabelBarMarks = "Your score";

if (groupUserLabel == undefined)
groupUserLabel = "participants in group";
if (groupScore == undefined){
groupScore = "avg score";
}
if (userScore == undefined){
userScore = "User score";
}

let ctx = escapeUrl(url, type, interactionIndex) + "-graph";

//create labels
let labels = [];
if (followBlock) {
if (followBlock == "true") {
for (let i = 0; i < barNameValue.length; i++) {
labels.push(barNameValue[i].replace(",", "-"))
labels.push([barNameValue[i].replace(",", "-")])
}
} else {
for (let i = 0; i < 100; i = i + Math.ceil(100 / nrbars)) {
let temp = ""
labels.push(temp + i + "-" + (i + Math.ceil(100 / nrbars)))
labels.push([temp + i + "-" + (i + Math.ceil(100 / nrbars))])
}
}
for (let i = 0; i < barName.length; i++) {
labels[i] = barName[i];
labels[i] = [barName[i]];
}

//calculate to what group the answers belong
let barSizeData = new Array(barRange.length).fill(0);
let groupAvg = new Array(barRange.length).fill(0);
let tempTotal = 0;
let ownUserScore = [];
let barBorderColor = barColors.slice();
let barScoreColor = new Array(barRange.length);
let barOwnScore = barSizeData.slice();


if (followBlock) {
if (followBlock == "true") {
for (let i = 0; i < statements.length; i++) {
//check what bar contains 100 (might not be the last)
if (statements[i].result.score.raw == 100) {
Expand All @@ -1990,6 +1999,7 @@
barBorderColor[k] = "#484848";
barScoreColor[k] = "#000000";
barOwnScore[k] = [score - 1, score];
ownUserScore = [k, score];
}
}
}
Expand All @@ -2003,6 +2013,7 @@
barBorderColor[j] = "#484848";
barScoreColor[j] = "#000000";
barOwnScore[j] = [score - 1, score];
ownUserScore = [j, score];
}
}
}
Expand All @@ -2022,20 +2033,32 @@
barBorderColor[ind] = "#484848";
barScoreColor[ind] = "#000000";
barOwnScore[ind] = [score - 1, score];
ownUserScore = [ind, score];
}
}
}

//add block avg to labels
debugger;
if (graphShowAvg == "true") {
for (let i = 0; i < labels.length; i++) {
labels[i].push(groupScore + ": " + (groupAvg[i]/ Math.max(barSizeData[i], 1)).toFixed(2))
if (i == ownUserScore[0]) {
labels[i].push(userScore + ": " + ownUserScore[1])
}
}
}

//add # users per group
if (interaction.getAttribute("showNrOfParticipants") == "true") {
for (let i = 0; i < labels.length; i++) {
labels[i] = [labels[i], barSizeData[i] + " " + groupUserLabel];
labels[i].push(barSizeData[i] + " " + groupUserLabel);
}
}
//convert to percentage and avg
for (let i = 0; i < barSizeData.length; i++) {
if (barSizeData[i] !== 0) {
groupAvg[i] = [groupAvg[i] / barSizeData[i] - 1, groupAvg[i] / barSizeData[i]];
groupAvg[i] = [groupAvg[i] / barSizeData[i] - 1, groupAvg[i] / Math.max(barSizeData[i], 1)];
} else {
groupAvg[i] = [0, 0];
}
Expand All @@ -2046,10 +2069,11 @@
}
}


//scale to fit in bar
if (graphFitInfoInBar == "true") {
for (let i = 0; i < barSizeData.length; i++) {
if (followBlock) {
if (followBlock == "true") {
//use plus one to prevent out of bounds
groupAvg[i][0] = ((groupAvg[i][1] - barRange[i][0]) / (barRange[i][1] - barRange[i][0])) * barSizeData[i];
groupAvg[i][1] = groupAvg[i][0] + 1;
Expand Down Expand Up @@ -2153,6 +2177,9 @@
text: xAxisLabelBarMarks
},
stacked: true,
ticks: {
autoSkip: false,
}
}
},
plugins: {
Expand Down Expand Up @@ -2225,7 +2252,7 @@
let ctx = escapeUrl(url, type, interactionIndex) + "-graph";
//create labels
let labels = [];
if (followBlock) {
if (followBlock == "true") {
for (let i = 0; i < barNameValue.length; i++) {
labels.push([barNameValue[i].replace(",", "-")])
}
Expand Down Expand Up @@ -2390,6 +2417,9 @@
},
x: {
stacked: (ownScore != groupAvg[ownScoreIndex] || ownScore == 0),
ticks: {
autoSkip: false,
}
}
},
plugins: {
Expand Down Expand Up @@ -3028,7 +3058,6 @@
) {
// remove loader
$("#interaction_load_" + interactionIndex).remove();
debugger;
var answerLabelText = interaction.getAttribute("answerText");
if (answerLabelText == undefined) {
answerLabelText = "Your answer is {0}";
Expand Down Expand Up @@ -3317,7 +3346,6 @@
// x.result.score.raw;
// return x;
// });
debugger;

let ctx = escapeUrl(url, type, interactionIndex) + "-graph";

Expand All @@ -3330,7 +3358,6 @@
labels[statements[i].result.score.raw] += 1;
}
}
debugger
Object.keys(labels).forEach(function(key){ labels[key] = labels[key]/statements.length*100 });

let bardata = {
Expand Down Expand Up @@ -3567,7 +3594,7 @@
return 0;
})

debugger

let bardata = {
datasets: [
{
Expand All @@ -3581,7 +3608,7 @@
],
};
let ctx = escapeUrl(url, type, interactionIndex) + "-graph";
debugger

new Chart(ctx, {
data: bardata,
options: {
Expand Down Expand Up @@ -3668,7 +3695,7 @@
) {
// remove loader
$("#interaction_load_" + interactionIndex).remove();
debugger

var scoreLabelText = interaction.getAttribute("scoreText");
if (scoreLabelText == null) {
scoreLabelText = "Your score is {0}";
Expand Down

0 comments on commit 2a10188

Please sign in to comment.