-
${profileLegend}
@@ -107,13 +100,7 @@ function renderClients() {
clearExpandIfHidden();
renderClientTableBody();
});
- document.getElementById('clientTestFilter').addEventListener('change', (e) => {
- filterTestData = e.target.value;
- page = 0;
- clearExpandIfHidden();
- renderClientTableBody();
- });
-
+ ensureCoachBandGlobalClick();
renderClientTableBody();
}
@@ -126,11 +113,6 @@ function getFilteredClientsList() {
return hay.includes(q);
});
}
- if (filterTestData === 'test') {
- list = list.filter(c => isDevTestClientCode(c.clientCode));
- } else if (filterTestData === 'hide-test') {
- list = list.filter(c => !isDevTestClientCode(c.clientCode));
- }
return list;
}
@@ -167,12 +149,7 @@ function renderClientTableBody() {
body.querySelectorAll('.delete-client-btn').forEach(btn => {
btn.addEventListener('click', () => deleteClient(btn.dataset.code));
});
- body.querySelectorAll('.client-coach-band-select').forEach(select => {
- select.addEventListener('focus', () => {
- select.dataset.prev = select.value;
- });
- select.addEventListener('change', () => onCoachBandChange(select));
- });
+ bindCoachBandPickerEvents(body);
}
const pag = document.getElementById('clientsPagination');
@@ -309,29 +286,47 @@ function bandLabel(band) {
return band.charAt(0).toUpperCase() + band.slice(1);
}
-function coachBandSelectHTML(p, clientCode) {
+function coachBandPickerHTML(p, clientCode) {
const calcBand = p.calculatedBand || p.band;
if (!calcBand || !clientCode || !p.profileID) {
return '';
}
const current = p.coachBand || '';
const coachPending = p.pendingReview !== false && !current;
- const placeholder = coachPending
- ? '
'
- : '';
- const options = COACH_BANDS.map(b => {
- const selected = current === b ? ' selected' : '';
- return `
`;
- }).join('');
+ const triggerBadge = coachPending
+ ? bandBadgeHTML(null, { pending: true })
+ : bandBadgeHTML(current);
+ const showAgree = coachPending || (current && current !== calcBand);
+ const options = COACH_BANDS.map(b => `
+
`).join('');
+ const agreeBtn = showAgree ? `
+
` : '';
return `
-
`;
+ data-coach="${esc(current)}">
+
+
+
Coach category
+
${options}
+ ${agreeBtn}
+
+
`;
}
function profileScoreBlockHTML(p, clientCode = '') {
@@ -346,7 +341,7 @@ function profileScoreBlockHTML(p, clientCode = '') {
const coachPending = p.pendingReview !== false && !p.coachBand;
const coachDiffers = p.coachBand && p.coachBand !== calcBand;
const coachControl = clientCode
- ? coachBandSelectHTML(p, clientCode)
+ ? coachBandPickerHTML(p, clientCode)
: (coachPending ? bandBadgeHTML(null, { pending: true }) : bandBadgeHTML(p.coachBand));
return `
@@ -484,31 +479,130 @@ function patchClientScoringBand(clientCode, profileID, coachBand) {
}
}
-async function onCoachBandChange(select) {
- const clientCode = select.dataset.client;
- const profileID = select.dataset.profile;
- const profileName = select.dataset.profileName || profileID;
- const calculatedBand = select.dataset.calculated;
- const weightedRaw = select.dataset.weighted;
+function resetCoachBandMenuPosition(menu) {
+ if (!menu) return;
+ menu.style.position = '';
+ menu.style.left = '';
+ menu.style.top = '';
+ menu.style.minWidth = '';
+ menu.style.zIndex = '';
+ menu.style.visibility = '';
+}
+
+function positionCoachBandMenu(picker) {
+ const trigger = picker.querySelector('.coach-band-trigger');
+ const menu = picker.querySelector('.coach-band-menu');
+ if (!trigger || !menu) return;
+ menu.hidden = false;
+ menu.style.visibility = 'hidden';
+ const rect = trigger.getBoundingClientRect();
+ const menuWidth = Math.max(rect.width, 184);
+ const left = Math.min(rect.left, window.innerWidth - menuWidth - 8);
+ menu.style.position = 'fixed';
+ menu.style.left = `${Math.max(8, left)}px`;
+ menu.style.minWidth = `${menuWidth}px`;
+ menu.style.zIndex = '10001';
+ const menuHeight = menu.offsetHeight;
+ let top = rect.bottom + 6;
+ if (top + menuHeight > window.innerHeight - 8) {
+ top = rect.top - menuHeight - 6;
+ }
+ menu.style.top = `${Math.max(8, top)}px`;
+ menu.style.visibility = '';
+}
+
+function closeAllCoachBandMenus() {
+ document.querySelectorAll('.coach-band-picker.is-open').forEach(picker => {
+ picker.classList.remove('is-open');
+ const menu = picker.querySelector('.coach-band-menu');
+ const trigger = picker.querySelector('.coach-band-trigger');
+ resetCoachBandMenuPosition(menu);
+ if (menu) menu.hidden = true;
+ if (trigger) trigger.setAttribute('aria-expanded', 'false');
+ });
+}
+
+function toggleCoachBandMenu(picker) {
+ const isOpen = picker.classList.contains('is-open');
+ closeAllCoachBandMenus();
+ if (isOpen) return;
+ picker.classList.add('is-open');
+ const trigger = picker.querySelector('.coach-band-trigger');
+ positionCoachBandMenu(picker);
+ if (trigger) trigger.setAttribute('aria-expanded', 'true');
+}
+
+function openCoachBandConfirmModal({ clientCode, profileName, calculatedBand, coachBand }) {
+ return new Promise(resolve => {
+ const overlay = document.createElement('div');
+ overlay.className = 'modal-overlay coach-band-confirm-modal';
+ overlay.setAttribute('role', 'dialog');
+ overlay.setAttribute('aria-modal', 'true');
+ overlay.innerHTML = `
+
+
Set coach category
+
+ ${esc(profileName)} · ${esc(clientCode)}
+
+
+
+ Calculated
+ ${bandBadgeHTML(calculatedBand, { label: bandLabel(calculatedBand) })}
+
+
→
+
+ Coach
+ ${bandBadgeHTML(coachBand, { label: bandLabel(coachBand) })}
+
+
+
This overrides the coach category for this client and profile.
+
+
+
+
+
`;
+ document.body.appendChild(overlay);
+ document.body.classList.add('modal-open');
+
+ const close = (confirmed) => {
+ overlay.remove();
+ document.body.classList.remove('modal-open');
+ resolve(confirmed);
+ };
+ overlay.querySelector('[data-coach-cancel]').addEventListener('click', () => close(false));
+ overlay.querySelector('[data-coach-confirm]').addEventListener('click', () => close(true));
+ overlay.addEventListener('click', (e) => {
+ if (e.target === overlay) close(false);
+ });
+ overlay.querySelector('.modal-dialog').addEventListener('click', (e) => e.stopPropagation());
+ const onKey = (e) => {
+ if (e.key === 'Escape') close(false);
+ };
+ document.addEventListener('keydown', onKey, { once: true });
+ overlay.querySelector('[data-coach-confirm]').focus();
+ });
+}
+
+async function promptCoachBandSave(picker, coachBand) {
+ const clientCode = picker.dataset.client;
+ const profileID = picker.dataset.profile;
+ const profileName = picker.dataset.profileName || profileID;
+ const calculatedBand = picker.dataset.calculated;
+ const current = picker.dataset.coach || '';
+
+ if (!coachBand || coachBand === current) return;
+
+ const confirmed = await openCoachBandConfirmModal({
+ clientCode,
+ profileName,
+ calculatedBand,
+ coachBand,
+ });
+ if (!confirmed) return;
+
+ const weightedRaw = picker.dataset.weighted;
const weightedTotal = weightedRaw !== '' ? Number(weightedRaw) : null;
- const prev = select.dataset.prev || '';
- const coachBand = select.value;
-
- if (!coachBand) {
- select.value = prev;
- return;
- }
- if (coachBand === prev) {
- return;
- }
-
- const msg = `Set coach category to "${bandLabel(coachBand)}" for ${profileName} (${clientCode})?\n\nCalculated category: ${bandLabel(calculatedBand)}.`;
- if (!confirm(msg)) {
- select.value = prev || '';
- return;
- }
-
- select.disabled = true;
+ picker.classList.add('is-saving');
try {
await apiPut('clients.php', {
clientCode,
@@ -518,17 +612,42 @@ async function onCoachBandChange(select) {
weightedTotal,
});
patchClientScoringBand(clientCode, profileID, coachBand);
- select.dataset.prev = coachBand;
showToast(`Coach category saved for ${profileName}`, 'success');
renderClientTableBody();
} catch (e) {
- select.value = prev || '';
showToast(e.message, 'error');
} finally {
- select.disabled = false;
+ picker.classList.remove('is-saving');
}
}
+function bindCoachBandPickerEvents(root = document) {
+ root.querySelectorAll('.coach-band-trigger').forEach(btn => {
+ btn.addEventListener('click', (e) => {
+ e.stopPropagation();
+ toggleCoachBandMenu(btn.closest('.coach-band-picker'));
+ });
+ });
+ root.querySelectorAll('.coach-band-option').forEach(btn => {
+ btn.addEventListener('click', (e) => {
+ e.stopPropagation();
+ const picker = btn.closest('.coach-band-picker');
+ closeAllCoachBandMenus();
+ promptCoachBandSave(picker, btn.dataset.band);
+ });
+ });
+}
+
+let coachBandGlobalClickBound = false;
+function ensureCoachBandGlobalClick() {
+ if (coachBandGlobalClickBound) return;
+ coachBandGlobalClickBound = true;
+ document.addEventListener('click', () => closeAllCoachBandMenus());
+ document.addEventListener('keydown', (e) => {
+ if (e.key === 'Escape') closeAllCoachBandMenus();
+ });
+}
+
function clientHasResponseData(c) {
return Number(c.hasResponseData) === 1;
}
@@ -548,7 +667,7 @@ function clientRowHTML(c) {
const colCount = scoringProfileCatalog.length > 0 ? 4 : 3;
return `
-
+
|
${expandControl}${esc(c.clientCode)}
|
diff --git a/website/js/pages/results.js b/website/js/pages/results.js
index b7f4983..b972a40 100644
--- a/website/js/pages/results.js
+++ b/website/js/pages/results.js
@@ -1,11 +1,6 @@
import { apiGet } from '../api.js';
import { homeNavButton, showToast } from '../app.js';
-import {
- buildResultColumns,
- isDevTestClientCode,
- resultColumnCellValue,
- testDataRowClassForClient,
-} from '../test-data.js';
+import { buildResultColumns, resultColumnCellValue } from '../test-data.js';
const PAGE_SIZE = 50;
@@ -21,7 +16,6 @@ let filterStatus = '';
let filterDateFrom = '';
let filterDateTo = '';
let filterSearch = '';
-let filterTestData = '';
let filterQuestion = '';
let page = 0;
@@ -35,7 +29,6 @@ export async function resultsPage(params) {
filterDateFrom = '';
filterDateTo = '';
filterSearch = '';
- filterTestData = '';
filterQuestion = '';
page = 0;
@@ -102,11 +95,6 @@ function renderResults() {
-
@@ -114,7 +102,7 @@ function renderResults() {
Export CSV
- Each question has its own column; glass-scale symptoms are separate columns. Hover headers for context. Test rows (DEV-CL-*) are highlighted.
+ Each question has its own column; glass-scale symptoms are separate columns. Hover headers for context.
@@ -162,11 +150,6 @@ function renderResults() {
page = 0;
renderTableRows();
});
- document.getElementById('filterTestData').addEventListener('change', (e) => {
- filterTestData = e.target.value;
- page = 0;
- renderTableRows();
- });
document.getElementById('gotoQuestionBtn').addEventListener('click', () => {
filterQuestion = document.getElementById('filterQuestion').value.trim();
scrollToQuestionColumn(filterQuestion);
@@ -185,7 +168,6 @@ function renderResults() {
filterDateFrom = '';
filterDateTo = '';
filterSearch = '';
- filterTestData = '';
filterQuestion = '';
page = 0;
renderResults();
@@ -304,11 +286,6 @@ function getFilteredClients() {
return hay.includes(q);
});
}
- if (filterTestData === 'test') {
- clients = clients.filter(c => isDevTestClientCode(c.clientCode));
- } else if (filterTestData === 'hide-test') {
- clients = clients.filter(c => !isDevTestClientCode(c.clientCode));
- }
return clients;
}
@@ -404,7 +381,7 @@ function renderTableRows() {
return `
${esc(String(val))} | `;
}).join('');
- return `
+ return `
| ${esc(c.clientCode)} |
${esc(coachDisplayName(c))} |
${esc(supervisorDisplayName(c))} |
diff --git a/website/js/pages/users.js b/website/js/pages/users.js
index ecbe5e8..d35bf27 100644
--- a/website/js/pages/users.js
+++ b/website/js/pages/users.js
@@ -1,7 +1,6 @@
import { apiGet, apiPost, apiPut, apiDelete } from '../api.js';
import { getRole, getUser, pageHeaderHTML, showToast } from '../app.js';
import { openAdminResetPasswordModal } from '../password-modal.js';
-import { isDevTestUsername, testDataRowClassForUser } from '../test-data.js';
// Roles an admin can create; supervisors can only create coaches
const CREATEABLE_ROLES = {
@@ -14,7 +13,6 @@ let supervisorsList = [];
let callerRole = '';
/** @type {Record} */
let filterSearchByRole = { admin: '', supervisor: '', coach: '' };
-let filterTestData = '';
function roleGroupsForCaller() {
return callerRole === 'supervisor'
@@ -112,19 +110,7 @@ function renderUsers() {
const byRole = usersByRoleMap();
const groups = roleGroupsForCaller();
- const testFilterCard = `
-
-
-
-
-
-
+
|
${esc(u.username)}
${isSelf ? 'You' : ''}
diff --git a/website/js/test-data.js b/website/js/test-data.js
index 3e03823..d7a7111 100644
--- a/website/js/test-data.js
+++ b/website/js/test-data.js
@@ -1,21 +1,3 @@
-/** Dev fixture prefixes (import script / dev_fixture.php). */
-export function isDevTestClientCode(code) {
- const c = String(code ?? '').trim();
- return c.toUpperCase().startsWith('DEV-CL-');
-}
-
-export function isDevTestUsername(username) {
- return String(username ?? '').trim().toLowerCase().startsWith('dev_');
-}
-
-export function testDataRowClassForClient(clientCode) {
- return isDevTestClientCode(clientCode) ? ' row-test-data' : '';
-}
-
-export function testDataRowClassForUser(username) {
- return isDevTestUsername(username) ? ' row-test-data' : '';
-}
-
const STABLE_KEY_RE = /^[a-zA-Z][a-zA-Z0-9_]*$/;
/** Local question id from full questionID (hash__q5 → q5). */
|