diff --git a/api/export.php b/api/export.php index c576bf1..1d0e8fd 100644 --- a/api/export.php +++ b/api/export.php @@ -56,9 +56,13 @@ foreach ($questionIDs as $qid) { $sql = " SELECT cl.clientCode, cl.coachID, + co.username AS coachUsername, + sv.username AS supervisorUsername, cq.status, cq.sumPoints, cq.startedAt, cq.completedAt FROM client cl INNER JOIN completed_questionnaire cq ON cq.clientCode = cl.clientCode AND cq.questionnaireID = :qnid + LEFT JOIN coach co ON co.coachID = cl.coachID + LEFT JOIN supervisor sv ON sv.supervisorID = co.supervisorID WHERE $rbacClause ORDER BY cl.clientCode "; @@ -79,7 +83,8 @@ $rows = []; foreach ($clients as $c) { $row = [ 'clientCode' => $c['clientCode'], - 'coachID' => $c['coachID'], + 'coach' => $c['coachUsername'] ?? $c['coachID'], + 'supervisor' => $c['supervisorUsername'] ?? '', 'status' => $c['status'], 'sumPoints' => $c['sumPoints'], 'startedAt' => $c['startedAt'] ? date('Y-m-d H:i', (int)$c['startedAt']) : '', @@ -131,7 +136,7 @@ if (!empty($rows)) { fputcsv($out, array_values($row)); } } else { - $header = ['clientCode', 'coachID', 'status', 'sumPoints', 'startedAt', 'completedAt']; + $header = ['clientCode', 'coach', 'supervisor', 'status', 'sumPoints', 'startedAt', 'completedAt']; foreach ($questions as $q) $header[] = $q['defaultText']; fputcsv($out, $header); } diff --git a/api/results.php b/api/results.php index f93a4c9..fd49a90 100644 --- a/api/results.php +++ b/api/results.php @@ -73,9 +73,13 @@ if ($clientCode) { // Only clients that have a completed_questionnaire entry for this questionnaire $sql = " SELECT cl.clientCode, cl.coachID, + co.username AS coachUsername, + sv.username AS supervisorUsername, cq.status, cq.startedAt, cq.completedAt, cq.sumPoints, cq.assignedByCoach FROM client cl INNER JOIN completed_questionnaire cq ON cq.clientCode = cl.clientCode AND cq.questionnaireID = :qnid + LEFT JOIN coach co ON co.coachID = cl.coachID + LEFT JOIN supervisor sv ON sv.supervisorID = co.supervisorID WHERE $rbacClause "; $params = array_merge([':qnid' => $qnID], $rbacParams); diff --git a/handlers/export.php b/handlers/export.php index 7f37a6c..f4df063 100644 --- a/handlers/export.php +++ b/handlers/export.php @@ -39,9 +39,13 @@ foreach ($questionIDs as $qid) { $sql = " SELECT cl.clientCode, cl.coachID, + co.username AS coachUsername, + sv.username AS supervisorUsername, cq.status, cq.sumPoints, cq.startedAt, cq.completedAt FROM client cl INNER JOIN completed_questionnaire cq ON cq.clientCode = cl.clientCode AND cq.questionnaireID = :qnid + LEFT JOIN coach co ON co.coachID = cl.coachID + LEFT JOIN supervisor sv ON sv.supervisorID = co.supervisorID WHERE $rbacClause ORDER BY cl.clientCode "; @@ -61,7 +65,8 @@ $rows = []; foreach ($clients as $c) { $row = [ 'clientCode' => $c['clientCode'], - 'coachID' => $c['coachID'], + 'coach' => $c['coachUsername'] ?? $c['coachID'], + 'supervisor' => $c['supervisorUsername'] ?? '', 'status' => $c['status'], 'sumPoints' => $c['sumPoints'], 'startedAt' => $c['startedAt'] ? date('Y-m-d H:i', (int)$c['startedAt']) : '', diff --git a/handlers/results.php b/handlers/results.php index e416c83..ecee836 100644 --- a/handlers/results.php +++ b/handlers/results.php @@ -49,9 +49,13 @@ unset($q); $sql = " SELECT cl.clientCode, cl.coachID, + co.username AS coachUsername, + sv.username AS supervisorUsername, cq.status, cq.startedAt, cq.completedAt, cq.sumPoints, cq.assignedByCoach FROM client cl INNER JOIN completed_questionnaire cq ON cq.clientCode = cl.clientCode AND cq.questionnaireID = :qnid + LEFT JOIN coach co ON co.coachID = cl.coachID + LEFT JOIN supervisor sv ON sv.supervisorID = co.supervisorID WHERE $rbacClause "; $params = array_merge([':qnid' => $qnID], $rbacParams); diff --git a/lib/repositories/ResultRepo.php b/lib/repositories/ResultRepo.php index c2d87b7..7d32100 100644 --- a/lib/repositories/ResultRepo.php +++ b/lib/repositories/ResultRepo.php @@ -53,10 +53,14 @@ class ResultRepo $sql = " SELECT cl.clientCode, cl.coachID, + co.username AS coachUsername, + sv.username AS supervisorUsername, cq.status, cq.startedAt, cq.completedAt, cq.sumPoints, cq.assignedByCoach FROM client cl INNER JOIN completed_questionnaire cq ON cq.clientCode = cl.clientCode AND cq.questionnaireID = :qnid + LEFT JOIN coach co ON co.coachID = cl.coachID + LEFT JOIN supervisor sv ON sv.supervisorID = co.supervisorID WHERE $rbacClause "; $params = array_merge([':qnid' => $questionnaireID], $rbacParams); diff --git a/website/js/pages/results.js b/website/js/pages/results.js index e2e8410..145cb49 100644 --- a/website/js/pages/results.js +++ b/website/js/pages/results.js @@ -7,14 +7,20 @@ let allClients = []; let questionsDef = []; let questionnaireMeta = null; let filterCoach = ''; +let filterSupervisor = ''; let filterStatus = ''; +let filterDateFrom = ''; +let filterDateTo = ''; export async function resultsPage(params) { const app = document.getElementById('app'); sortCol = null; sortDir = 'asc'; filterCoach = ''; + filterSupervisor = ''; filterStatus = ''; + filterDateFrom = ''; + filterDateTo = ''; app.innerHTML = `
@@ -44,21 +50,35 @@ function renderResults() { const container = document.getElementById('resultsContent'); // Collect unique coaches and statuses for filters - const coaches = [...new Set(allClients.map(c => c.coachID))].sort(); + const coachOptions = getCoachFilterOptions(); + const supervisorOptions = getSupervisorFilterOptions(); const statuses = [...new Set(allClients.map(c => c.status))].filter(Boolean).sort(); container.innerHTML = `
+ + + + Export CSV
@@ -73,6 +93,10 @@ function renderResults() {
`; + document.getElementById('filterSupervisor').addEventListener('change', (e) => { + filterSupervisor = e.target.value; + renderTableRows(); + }); document.getElementById('filterCoach').addEventListener('change', (e) => { filterCoach = e.target.value; renderTableRows(); @@ -81,6 +105,22 @@ function renderResults() { filterStatus = e.target.value; renderTableRows(); }); + document.getElementById('filterDateFrom').addEventListener('change', (e) => { + filterDateFrom = e.target.value; + renderTableRows(); + }); + document.getElementById('filterDateTo').addEventListener('change', (e) => { + filterDateTo = e.target.value; + renderTableRows(); + }); + document.getElementById('clearFiltersBtn').addEventListener('click', () => { + filterCoach = ''; + filterSupervisor = ''; + filterStatus = ''; + filterDateFrom = ''; + filterDateTo = ''; + renderResults(); + }); document.getElementById('exportCsvLink').addEventListener('click', (e) => { e.preventDefault(); exportCSV(); @@ -94,7 +134,8 @@ function renderTableHead() { const head = document.getElementById('resultsHead'); const fixedCols = [ { key: 'clientCode', label: 'Client' }, - { key: 'coachID', label: 'Coach' }, + { key: 'coachUsername', label: 'Coach' }, + { key: 'supervisorUsername', label: 'Supervisor' }, { key: 'status', label: 'Status' }, { key: 'sumPoints', label: 'Score' }, { key: 'completedAt', label: 'Completed' }, @@ -123,13 +164,58 @@ function renderTableHead() { }); } +function getCoachFilterOptions() { + const map = new Map(); + allClients.forEach(c => { + if (!c.coachID || map.has(c.coachID)) return; + map.set(c.coachID, c.coachUsername || c.coachID); + }); + return [...map.entries()].sort((a, b) => a[1].localeCompare(b[1])); +} + +function getSupervisorFilterOptions() { + return [...new Set(allClients.map(c => c.supervisorUsername).filter(Boolean))].sort((a, b) => + a.localeCompare(b) + ); +} + +function coachDisplayName(c) { + return c.coachUsername || c.coachID || '—'; +} + +function supervisorDisplayName(c) { + return c.supervisorUsername || '—'; +} + function getFilteredClients() { let clients = allClients; + if (filterSupervisor) clients = clients.filter(c => c.supervisorUsername === filterSupervisor); if (filterCoach) clients = clients.filter(c => c.coachID === filterCoach); if (filterStatus) clients = clients.filter(c => c.status === filterStatus); + if (filterDateFrom || filterDateTo) { + const fromTs = filterDateFrom ? dateInputToUnixStart(filterDateFrom) : null; + const toTs = filterDateTo ? dateInputToUnixEnd(filterDateTo) : null; + clients = clients.filter(c => { + const ts = c.completedAt; + if (!ts) return false; + if (fromTs !== null && ts < fromTs) return false; + if (toTs !== null && ts > toTs) return false; + return true; + }); + } return clients; } +function dateInputToUnixStart(yyyyMmDd) { + const [y, m, d] = yyyyMmDd.split('-').map(Number); + return Math.floor(new Date(y, m - 1, d).getTime() / 1000); +} + +function dateInputToUnixEnd(yyyyMmDd) { + const [y, m, d] = yyyyMmDd.split('-').map(Number); + return Math.floor(new Date(y, m - 1, d, 23, 59, 59, 999).getTime() / 1000); +} + function renderTableRows() { const body = document.getElementById('resultsBody'); let clients = getFilteredClients(); @@ -181,7 +267,8 @@ function renderTableRows() { return ` ${esc(c.clientCode)} - ${esc(c.coachID)} + ${esc(coachDisplayName(c))} + ${esc(supervisorDisplayName(c))} ${statusBadge} ${c.sumPoints !== null ? c.sumPoints : '—'} ${completedDate} @@ -192,7 +279,8 @@ function renderTableRows() { function getCellValue(client, key) { if (key === 'clientCode') return client.clientCode; - if (key === 'coachID') return client.coachID; + if (key === 'coachUsername') return coachDisplayName(client); + if (key === 'supervisorUsername') return supervisorDisplayName(client); if (key === 'status') return client.status; if (key === 'sumPoints') return client.sumPoints; if (key === 'completedAt') return client.completedAt; @@ -216,12 +304,12 @@ function exportCSV() { }); }); - const headers = ['clientCode', 'coachID', 'status', 'sumPoints', 'completedAt', + const headers = ['clientCode', 'coach', 'supervisor', 'status', 'sumPoints', 'completedAt', ...questionsDef.map(q => q.defaultText)]; const rows = clients.map(c => { const base = [ - c.clientCode, c.coachID, c.status, c.sumPoints ?? '', + c.clientCode, coachDisplayName(c), c.supervisorUsername || '', c.status, c.sumPoints ?? '', c.completedAt ? new Date(c.completedAt * 1000).toISOString() : '' ]; const answerCols = questionsDef.map(q => { diff --git a/website/js/pages/users.js b/website/js/pages/users.js index 08848b0..1a5e18a 100644 --- a/website/js/pages/users.js +++ b/website/js/pages/users.js @@ -19,6 +19,7 @@ export async function usersPage() {

Users

+
@@ -34,6 +35,7 @@ export async function usersPage() { hideCreateForm(); } }); + document.getElementById('downloadUsersBtn').addEventListener('click', downloadUsersCSV); await loadUsers(); } @@ -45,6 +47,8 @@ async function loadUsers() { supervisorsList = data.supervisors || []; callerRole = data.callerRole || callerRole; renderUsers(); + const dlBtn = document.getElementById('downloadUsersBtn'); + if (dlBtn) dlBtn.disabled = !usersList.length; } catch (e) { showToast(e.message, 'error'); document.getElementById('usersContent').innerHTML = @@ -319,6 +323,45 @@ function showError(el, msg) { el.style.display = ''; } +function downloadUsersCSV() { + if (!usersList.length) { + showToast('No users to export', 'error'); + return; + } + + const headers = ['username', 'role', 'location', 'supervisor', 'mustChangePassword', 'createdAt', 'userID']; + const rows = usersList.map(u => [ + u.username, + u.role, + u.role === 'coach' ? '' : (u.location || ''), + u.role === 'coach' ? (u.supervisorUsername || u.supervisorID || '') : '', + u.mustChangePassword == 1 ? 'yes' : 'no', + u.createdAt ? new Date(parseInt(u.createdAt, 10) * 1000).toISOString() : '', + u.userID, + ]); + + let csv = '\uFEFF'; + csv += headers.map(csvEsc).join(',') + '\n'; + rows.forEach(r => { csv += r.map(csvEsc).join(',') + '\n'; }); + + const blob = new Blob([csv], { type: 'text/csv;charset=utf-8' }); + const url = URL.createObjectURL(blob); + const a = document.createElement('a'); + a.href = url; + a.download = `users_${new Date().toISOString().slice(0, 10)}.csv`; + a.click(); + URL.revokeObjectURL(url); + showToast('Users exported', 'success'); +} + +function csvEsc(val) { + const s = String(val ?? ''); + if (s.includes(',') || s.includes('"') || s.includes('\n')) { + return '"' + s.replace(/"/g, '""') + '"'; + } + return s; +} + function esc(s) { const d = document.createElement('div'); d.textContent = s ?? '';