helios/rooms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Flag prefer-not violations in solver room results

Browse Source
This commit is contained in:
Ian Gulliver
2026-02-15 21:47:05 -08:00
parent b2b9a255f4
commit 806b6cc61c
1 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
static/trip.js
View File

@@ -28,6 +28,8 @@ document.getElementById('pn-multiple').addEventListener('change', async () => {
if (val >= 1) await api('PATCH', '/api/trips/' + tripID, { prefer_not_multiple: val }); if (val >= 1) await api('PATCH', '/api/trips/' + tripID, { prefer_not_multiple: val });
}); });
let lastOveralls = {};
async function loadStudents() { async function loadStudents() {
const [students, constraints] = await Promise.all([ const [students, constraints] = await Promise.all([
api('GET', '/api/trips/' + tripID + '/students'), api('GET', '/api/trips/' + tripID + '/students'),
@@ -85,6 +87,7 @@ async function loadStudents() {
if (eff) allOveralls[s.id][peerId] = eff; if (eff) allOveralls[s.id][peerId] = eff;
} }
} }
lastOveralls = allOveralls;
const mismatchList = []; const mismatchList = [];
for (const s of students) { for (const s of students) {
@@ -522,10 +525,23 @@ document.getElementById('solve-btn').addEventListener('click', async () => {
card.appendChild(label); card.appendChild(label);
const tags = document.createElement('div'); const tags = document.createElement('div');
tags.className = 'tags'; tags.className = 'tags';
const roomIDs = result.rooms[i].map(m => m.id);
const violations = [];
for (const a of result.rooms[i]) {
for (const b of result.rooms[i]) {
if (a.id === b.id) continue;
const eff = lastOveralls[a.id]?.[b.id];
if (eff && eff.kind === 'prefer_not') {
violations.push({ from: a.name, to: b.name });
}
}
}
for (const member of result.rooms[i]) { for (const member of result.rooms[i]) {
const tag = document.createElement('wa-tag'); const tag = document.createElement('wa-tag');
tag.size = 'small'; tag.size = 'small';
tag.style.cursor = 'pointer'; tag.style.cursor = 'pointer';
const hasViolation = violations.some(v => v.from === member.name || v.to === member.name);
if (hasViolation) tag.variant = 'warning';
tag.textContent = member.name; tag.textContent = member.name;
tag.addEventListener('click', () => { tag.addEventListener('click', () => {
const card = document.querySelector('[data-student-id="' + member.id + '"]'); const card = document.querySelector('[data-student-id="' + member.id + '"]');
@@ -536,7 +552,16 @@ document.getElementById('solve-btn').addEventListener('click', async () => {
}); });
tags.appendChild(tag); tags.appendChild(tag);
} }
if (violations.length > 0) {
const warn = document.createElement('div');
warn.style.fontSize = '0.75rem';
warn.style.color = 'var(--wa-color-warning-50)';
warn.textContent = violations.map(v => v.from + ' \u2192 ' + v.to).join(', ');
card.appendChild(tags); card.appendChild(tags);
card.appendChild(warn);
} else {
card.appendChild(tags);
}
container.appendChild(card); container.appendChild(card);
} }
const scoreDiv = document.createElement('div'); const scoreDiv = document.createElement('div');