Skip to content

Commit 6d5383d

Browse files
authored
Merge pull request #1153 from ashlynthemitm/fix/peer-ab-chat-clean
Updated the verbal discussion to show who students are in a group with
2 parents 3efce80 + b2dfc2f commit 6d5383d

File tree

1 file changed

+32
-6
lines changed
  • components/rsptx/templates/staticAssets/js

1 file changed

+32
-6
lines changed

components/rsptx/templates/staticAssets/js/peer.js

Lines changed: 32 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -338,16 +338,42 @@ function connect(event) {
338338
groupList = mess.group;
339339
}
340340
messarea = document.getElementById("imessage");
341-
messarea.innerHTML = `<h3>Time to talk to your group</h3>
342-
<ul>`;
343-
for (const peer of groupList) {
344-
messarea.innerHTML += `<li>${peer}</li>`;
341+
// Prefer previously-selected partners saved in localStorage.peerList
342+
let peerListCsv = localStorage.getItem("peerList");
343+
let displayPeers = [];
344+
if (peerListCsv) {
345+
let sids = peerListCsv.split(",").map(s => s.trim()).filter(Boolean);
346+
let sel = document.getElementById("assignment_group");
347+
for (let sid of sids) {
348+
let name = sid;
349+
if (sel) {
350+
let opt = sel.querySelector(`option[value="${sid}"]`);
351+
if (opt) name = opt.textContent || opt.innerText || sid;
352+
}
353+
displayPeers.push(name);
354+
}
345355
}
346-
messarea.innerHTML += `</ul>`;
356+
357+
if (displayPeers.length > 0) {
358+
messarea.innerHTML = `<h3>Current Verbal Discussion Group</h3><p>Please have a verbal discussion with your selected partners:</p><ul>`;
359+
for (const p of displayPeers) {
360+
messarea.innerHTML += `<li>${p}</li>`;
361+
}
362+
messarea.innerHTML += `</ul>`;
363+
} else {
364+
// fallback to server-provided group list
365+
messarea.innerHTML = `<h3>Current Verbal Discussion Group</h3><p>Please have a verbal discussion with the following group:</p><ul>`;
366+
for (const peer of groupList) {
367+
messarea.innerHTML += `<li>${peer}</li>`;
368+
}
369+
messarea.innerHTML += `</ul>`;
370+
}
371+
347372
let facechat = document.getElementById("group_select_panel");
348373
if (facechat) {
349374
facechat.style.display = "block";
350375
}
376+
break; // incase default
351377
default:
352378
console.log("unknown control message");
353379
}
@@ -470,7 +496,7 @@ async function sendMessage(event) {
470496
await publishMessage(mess);
471497

472498
let message = renderMessage({
473-
from: user,
499+
from: user,
474500
text: messageText,
475501
direction: "outgoing"
476502
});

0 commit comments

Comments
 (0)