diff --git a/classroom/assets/js/scripts/displayPanel.js b/classroom/assets/js/scripts/displayPanel.js
index 3c4ae2d6..331784c3 100644
--- a/classroom/assets/js/scripts/displayPanel.js
+++ b/classroom/assets/js/scripts/displayPanel.js
@@ -27,7 +27,10 @@ DisplayPanel.prototype.classroom_dashboard_profil_panel_teacher = function () {
})
getIntelFromClasses();
- const correctionsCount = getRemainingCorrections(Main.getClassroomManager()._myClasses.flatMap(c => c.students));
+ // pendingCorrections is pre-computed server-side in the lightweight get_by_user response
+ const correctionsCount = Main.getClassroomManager()._myClasses.reduce(
+ (sum, c) => sum + (c.pendingCorrections ?? getRemainingCorrections(c.students ?? [])), 0
+ );
const correctionsElement = $('.tocorrect-activities');
correctionsElement.html(correctionsCount);
@@ -468,7 +471,16 @@ function updateUIWithStudents(link) {
updateClassroomLinkUI(ClassroomSettings.classroom);
updateClassroomLockUI(classroomData.classroom.isBlocked);
- displayStudentsInClassroom(classroomData.students, link);
+
+ if (classroomData.students && classroomData.students.length > 0) {
+ // Already loaded (cached from a previous click)
+ displayStudentsInClassroom(classroomData.students, link);
+ } else {
+ // Lazy-load: first click on this classroom
+ Main.getClassroomManager().getClassroomStudents(classroomData.classroom.id).then(students => {
+ displayStudentsInClassroom(students, link);
+ });
+ }
}
DisplayPanel.prototype.classroom_dashboard_new_activity_panel3 = function (ref) {
diff --git a/classroom/assets/js/scripts/manageClassroom.js b/classroom/assets/js/scripts/manageClassroom.js
index 50b723ed..f9c0a0b1 100644
--- a/classroom/assets/js/scripts/manageClassroom.js
+++ b/classroom/assets/js/scripts/manageClassroom.js
@@ -1080,7 +1080,8 @@ function displayStudentsInClassroom(students, link=false) {
// get the current classroom index of activities
let arrayIndexesActivities = listIndexesActivities(students);
- students.forEach(element => {
+ const studentRows = [];
+ students.forEach((element, elementIdx) => {
// reorder the current student activities to fit to the classroom index of activities
let arrayActivities = reorderActivities([...element.activities, ...element.courses], arrayIndexesActivities);
let pseudo = element.user.pseudo;
@@ -1370,10 +1371,22 @@ function displayStudentsInClassroom(students, link=false) {
}
// end of the current table row
html += '';
- $('#body-table-teach').append(html).localize();
- $('[data-bs-toggle="tooltip"]').tooltip()
+ studentRows.push(html);
});
-
+
+ // Preload unique letter images (max 26 requests); browser cache serves subsequent rows
+ new Set(students.map(s => getFirstLetterOfPseudo(s.user.pseudo))).forEach(letter => {
+ const _img = new Image();
+ _img.src = `${_PATH}assets/media/alphabet/${letter}.png`;
+ });
+
+ // Render all students directly into the table
+ const tbody = document.getElementById('body-table-teach');
+ const tmpTbody = document.createElement('tbody');
+ tmpTbody.innerHTML = studentRows.join('');
+ Array.from(tmpTbody.children).forEach(el => tbody.appendChild(el));
+ $(tbody).find('[data-bs-toggle="tooltip"]').tooltip();
+ $(tbody).localize();
appendAddStudentButton();
// get classroom settings from localstorage
let settings = getClassroomDisplaySettings(link);
@@ -1418,18 +1431,19 @@ function displayStudentsInClassroom(students, link=false) {
// add four empty divs for monochrome styling
$('#body-table-teach .bilan-cell').html(`
`);
- $('#classroom-panel-table-container table .dropdown').on('show.bs.dropdown', (event) => {
- let classroomTable = event.target.closest('table');
- classroomTable.classList.add('dropdowns-opened');
- $(classroomTable).find('tr').addClass('non-dropdown');
- event.target.closest('tr').classList.remove('non-dropdown');
- });
-
- $('#classroom-panel-table-container table .dropdown').on('hidden.bs.dropdown', (event) => {
- let classroomTable = event.target.closest('table');
- classroomTable.classList.remove('dropdowns-opened');
- $(classroomTable).find('tr').removeClass('non-dropdown');
- });
+ // Delegated event binding so lazy-loaded rows also receive these handlers
+ $('#classroom-panel-table-container table').off('show.bs.dropdown.lazyrows hidden.bs.dropdown.lazyrows')
+ .on('show.bs.dropdown.lazyrows', '.dropdown', (event) => {
+ let classroomTable = event.target.closest('table');
+ classroomTable.classList.add('dropdowns-opened');
+ $(classroomTable).find('tr').addClass('non-dropdown');
+ event.target.closest('tr').classList.remove('non-dropdown');
+ })
+ .on('hidden.bs.dropdown.lazyrows', '.dropdown', (event) => {
+ let classroomTable = event.target.closest('table');
+ classroomTable.classList.remove('dropdowns-opened');
+ $(classroomTable).find('tr').removeClass('non-dropdown');
+ });
// Plugin hook: post-render callback (no-op without plugin)
if (typeof window.onDashboardRendered === 'function') {
@@ -1994,27 +2008,20 @@ class DashboardAutoRefresh {
refresh() {
if($_GET('panel') == 'classroom-table-panel-teacher' && $_GET('option')){
this.isRefreshing = true;
- let previousClassroomState, newClassroomState;
- if (getClassroomInListByLink($_GET('option'))[0]) {
- previousClassroomState = {
- data: JSON.stringify(getClassroomInListByLink($_GET('option'))[0].students),
- link: $_GET('option')
- };
- }
- Main.getClassroomManager().getClasses(Main.getClassroomManager()).then(() => {
- if ($_GET('option') == previousClassroomState.link) {
- if (getClassroomInListByLink($_GET('option'))[0]) {
- newClassroomState = JSON.stringify(getClassroomInListByLink($_GET('option'))[0].students);
- }
- // Only refresh the classroom if it has changed
- if (previousClassroomState.data != newClassroomState){
- if (getClassroomInListByLink($_GET('option'))[0]) {
- let students = getClassroomInListByLink($_GET('option'))[0].students;
+ const link = $_GET('option');
+ const entry = getClassroomInListByLink(link)?.[0];
+ if (entry) {
+ const previousStudentsJson = JSON.stringify(entry.students);
+ Main.getClassroomManager().getClassroomStudents(entry.classroom.id).then((students) => {
+ if ($_GET('option') == link) {
+ const newStudentsJson = JSON.stringify(students);
+ // Only refresh the classroom display if data has changed
+ if (previousStudentsJson != newStudentsJson) {
displayStudentsInClassroom(students);
}
}
- }
- });
+ });
+ }
setTimeout(() => { this.refresh() }, this.refreshInterval);
} else {
this.isRefreshing = false;
diff --git a/classroom/assets/js/scripts/teacherActivities.js b/classroom/assets/js/scripts/teacherActivities.js
index 2c6e0a51..5105d48d 100644
--- a/classroom/assets/js/scripts/teacherActivities.js
+++ b/classroom/assets/js/scripts/teacherActivities.js
@@ -380,13 +380,18 @@ function listStudentsToAttribute(ref = null) {
if (classes.length == 0) {
$('#attribute-activity-to-students-close').after(NO_CLASS)
$('#attribute-activity-to-students-close').hide()
-
} else {
- classes.forEach(element => {
- $('#list-student-attribute-modal').append(classeList(element, ref))
+ const pending = classes
+ .filter(c => c.students.length === 0)
+ .map(c => Main.getClassroomManager().getClassroomStudents(c.classroom.id));
+
+ Promise.all(pending).then(() => {
+ classes.forEach(element => {
+ $('#list-student-attribute-modal').append(classeList(element, ref))
+ });
+ $('.no-classes').remove()
+ $('#attribute-activity-to-students-close').show()
});
- $('.no-classes').remove()
- $('#attribute-activity-to-students-close').show()
}
}
diff --git a/composer.json b/composer.json
index 38f83c1b..3e17f1da 100644
--- a/composer.json
+++ b/composer.json
@@ -12,9 +12,9 @@
},
"require-dev": {
"phpunit/phpunit": "8.0.0",
- "vittascience/vtuser": "1.3.5",
+ "vittascience/vtuser": "1.3.6",
"vittascience/vtinterfaces": "1.5.8",
- "vittascience/vtclassroom": "1.4.3",
+ "vittascience/vtclassroom": "dev-arz-optimisation",
"vittascience/vtlearn": "1.4.6",
"vittascience/vutils": "1.3.1",
"symfony/var-dumper": "^5.3"