Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding new visualization option for student progress #89

Merged
merged 1 commit into from
Aug 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 76 additions & 0 deletions backend/app/dashboard/static/dashboard-progress.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,12 @@ function createHandsontable(data, columns_list) {
function updateHandsontable(data, columns_list) {
data = filterStudentsInClass(data);

ret = generateMatrix(data, columns_list)
zvals = ret[1]
data_h[0]['x'] = columns_list.slice(1);
data_h[0]['z'] = zvals;
Plotly.redraw('chart');

let dataSchema = getDataSchema(columns_list);
hot.updateSettings({
data: data,
Expand Down Expand Up @@ -142,6 +148,29 @@ function generateTagView() {
});
}

function generateMatrix(tableData, columns){
nulls = new Array(columns.length-1).fill(null)
zvals = []
usernames = []
tableData.forEach(row => {
studentvals = [...nulls]
Object.entries(row).forEach((val) => {
if (val[0] == "Name") {
usernames.push(val[1])
}
else{
idx = columns.indexOf(val[0])-1
if (idx >= 0){
studentvals[idx] = val[1]
}
}
});
zvals.push(studentvals)
});
console.log(usernames)
return [usernames.reverse(), zvals.reverse()]
}

var tags = new Set();
var table;
var columns;
Expand Down Expand Up @@ -180,4 +209,51 @@ document.addEventListener("DOMContentLoaded", function () {
tableData = structuredClone(data);

createHandsontable(tableData, columns);

ret = generateMatrix(tableData, columns)
usernames = ret[0]
zvals = ret[1]
data_h = [
{
x: columns.slice(1),
y: usernames,
z: zvals,
type: 'heatmap',
hovertemplate : 'Exercício: %{x}<br> Aluno: %{y}<br> Nota: %{z}<extra></extra>',
colorscale:[[0.0, "red"], [0.1, "red"],
[0.1, "orange"], [1, "orange"],
[1, "green"], [1.00, "green"]],
showscale:false,
xgap:0.5,
ygap:0.5,
}
];

var layout = {
margin: {
t: 50,
r: 50,
b: 0,
l: 150
},
xaxis: {showticklabels: false, ticks: "", side:"top"},
showlegend: false,
height: usernames.length * 20,
autosize: true
};

Plotly.newPlot('chart', data_h, layout);
});

function toggleVisibility() {
var table = document.getElementById("table");
var chart = document.getElementById("chart");
if (table.style.display === "none") {
table.style.display = "";
chart.style.display = "none";
} else {
table.style.display = "none";
chart.style.display = "";
document.querySelector('[data-title="Autoscale"]').click()
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/handsontable/dist/handsontable.full.min.js"></script>
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/handsontable/dist/handsontable.full.min.css" />

<script type="text/javascript" src='https://cdn.plot.ly/plotly-2.24.1.min.js'></script>

<script src="{% static '/dashboard-progress.js' %}"></script>
<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-4bw+/aepP/YC94hEpVNVgiZdgIC5+VKNBQNGCHeKRQN+PtmoHDEXuppvnDJzQIu9" crossorigin="anonymous">

Expand Down Expand Up @@ -40,13 +42,16 @@ <h1>Class Progress</h1>
{% endfor %}
</datalist>
</div>
<button onclick="toggleVisibility()" class="btn btn-secondary">Alternar visualização</button>
</div>
{% endif %}

<div id="tags-list">
</div>

<div id="table" data-columns="{{ columns | safe }}" data-data="{{ data | safe }}" data-tags="{{ tags | safe }}" data-classes="{{ course_classes | safe }}"></div>

<div id='chart' style="display: none;" data-columns="{{ columns | safe }}" data-data="{{ data | safe }}" data-tags="{{ tags | safe }}"><!-- Plotly chart will be drawn inside this DIV --></div>
</main>
</body>
</html>
10 changes: 8 additions & 2 deletions backend/app/dashboard/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,16 @@ def students_progress(request, course_name):
"Name": answer['author__username']})
data[answer['author__username']][answer['exercise__slug']
] = round(answer['max_points'], 1)
columns_with_list = [*["Name"], *list(columns)]
sorted_columns = sorted(list(columns))
columns_with_list = [*["Name"], *sorted_columns]

data_list = sorted(list(data.values()), key=lambda d: d['Name'].lower())
for d in data_list:
print(d["Name"])

return render(request, 'dashboard/instructor-progress.html',
{
'data': list(data.values()),
'data': data_list,
'columns': columns_with_list,
'tags': tag_obj,
'course_classes': course_classes_list,
Expand Down
Loading