diff --git a/resources/teacherTools/researcher.jsp b/resources/teacherTools/researcher.jsp
index 660b7980..71fef27f 100644
--- a/resources/teacherTools/researcher.jsp
+++ b/resources/teacherTools/researcher.jsp
@@ -2747,20 +2747,32 @@ function showTable4b() {
var filter = "";
+ var type = "";
+ var sort = "";
const rb4bContent = document.querySelectorAll('input[name="optRadio4bContent"]');
for (const rb4bc of rb4bContent) {
if (rb4bc.checked) {
- filter = rb4bc.value;
+ type = rb4bc.value;
break;
}
}
-
+
+ const rb4bSort = document.querySelectorAll('input[name="optRadio4bSort"]');
+ for (const rb4bs of rb4bSort) {
+ if (rb4bs.checked) {
+ sort = rb4bs.value;
+ break;
+ }
+ }
+
+ filter = type + "~" + sort;
+
var jsonData_4b = null;
var cols_4b = [];
var tbl_4b = document.getElementById("table4b");
-
+ document.getElementById("table4b").innerHTML = "";
$('#table4b-loader').show();
$.ajax({
@@ -6323,6 +6335,12 @@ function updateAllCohortSlices() {
+
+
+
+
+
+
">
diff --git a/resources/teacherTools/researcherClassReportCard.jsp b/resources/teacherTools/researcherClassReportCard.jsp
index 7612bf16..ea021f9b 100644
--- a/resources/teacherTools/researcherClassReportCard.jsp
+++ b/resources/teacherTools/researcherClassReportCard.jsp
@@ -3574,7 +3574,7 @@ var completeDataChart;
layout = {
width:(maxWidth),
- height:300,
+ height:500,
xaxis: {
type: 'category',
title: '<%= rb.getString("problems")%>',
@@ -3620,7 +3620,7 @@ var completeDataChart;
layout2 = {
width:(maxWidth),
- height:600,
+ height:660,
xaxis: {
type: 'category',
title: '<%= rb.getString("problems")%>',
@@ -3628,7 +3628,7 @@ var completeDataChart;
yaxis: {
title: '<%= rb.getString("mastery")%>',
dtick: 0.2,
- range: [0, 9]
+ range: [0, 10]
},
legend: {
x: 0,
@@ -3942,7 +3942,7 @@ var completeDataChart;
x: problems,
y: difficulty,
name: '<%= rb.getString("difficulty")%>',
- yaxis: 'y3',
+ yaxis: 'y',
type: 'scatter',
mode: 'lines+markers',
marker: {
@@ -3959,7 +3959,7 @@ var completeDataChart;
x: problems,
y: mastery,
name: '<%= rb.getString("mastery")%>',
- yaxis: 'y4',
+ yaxis: 'y',
type: 'scatter',
mode: 'lines+markers',
marker: {
@@ -3979,7 +3979,7 @@ var completeDataChart;
x: problems,
y: achievementValues,
name: 'Achievement',
- yaxis: 'y4',
+ yaxis: 'y',
type: 'scatter',
mode: 'markers',
marker:{
@@ -4020,62 +4020,39 @@ var completeDataChart;
var data = [];
- if (document.getElementById("trackHints").checked == true) {
+ if (document.getElementById("trackHintsNine").checked == true) {
data.push(traceHints);
}
- if (document.getElementById("trackAttempts").checked == true) {
+ if (document.getElementById("trackAttemptsNine").checked == true) {
data.push(traceAttempts);
}
- if (document.getElementById("trackVideos").checked == true) {
+ if (document.getElementById("trackVideosNine").checked == true) {
data.push(traceVideos);
}
- if (document.getElementById("trackDifficulty").checked == true) {
+ if (document.getElementById("trackDifficultyNine").checked == true) {
data.push(traceDifficulty);
}
- if (document.getElementById("trackMastery").checked == true) {
+ if (document.getElementById("trackMasteryNine").checked == true) {
data.push(traceMastery);
}
-// if (document.getElementById("trackAchievement").checked == true) {
+ if (document.getElementById("trackAchievementNine").checked == true) {
data.push(traceAchievement);
-// }
+ }
data.push(traceProblems);
// var data = [traceHints, traceAttempts, traceVideos, traceProblems];
layout = {
width:(maxWidth),
- height:500,
+ height:800,
xaxis: {
type: 'category',
title: '<%= rb.getString("problems")%>',
},
yaxis: {
- title: '<%= rb.getString("minutes")%>',
- dtick: .5,
+ title: '<%= rb.getString("difficulty")%> / <%= rb.getString("mastery")%>',
+ dtick: .25,
range: [0, maxYaxis]
},
- yaxis3: {
- title: '<%= rb.getString("difficulty")%>',
- titlefont: {color: '#ff6600'},
- tickfont: {color: '#ff6600'},
- dtick: 0.1,
- range: [0, 10],
- anchor: 'x',
- overlaying: 'y',
- side: 'right'
-
- },
- yaxis4: {
- title: '<%= rb.getString("mastery")%>',
- titlefont: {color: '#009933'},
- tickfont: {color: '#009933'},
- dtick: 0.1,
- range: [0, 10],
- anchor: 'free',
- overlaying: 'y',
- side: 'right',
- position: 0.95,
- showline: false
- },
legend: {
x: 0,
@@ -4096,7 +4073,7 @@ var completeDataChart;
};
- var myPlot = document.getElementById('studentProblemAchievementReportNine');
+ var myPlot = document.getElementById('');
Plotly.newPlot('studentProblemAchievementReportNine', data, layout);
@@ -4880,13 +4857,16 @@ var completeDataChart;
-
+
@@ -5559,7 +5537,105 @@ var completeDataChart;
+
@@ -5772,6 +5848,9 @@ var completeDataChart;
">
">
">
+ ">
+ ">
+