adding process completion logic
Some checks failed
PHPUnit / test (push) Has been cancelled

This commit is contained in:
2026-07-01 12:07:41 +02:00
parent 9bd9d9653c
commit 339091e13f
10 changed files with 353 additions and 10 deletions

View File

@ -3548,6 +3548,105 @@ select:disabled {
color: var(--primary-text);
font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, monospace;
}
.scoring-profile-complete-bands {
display: flex;
flex-wrap: wrap;
align-items: center;
gap: 8px;
margin-top: 10px;
padding-top: 10px;
border-top: 1px dashed var(--border);
}
.scoring-profile-complete-label {
font-size: .8125rem;
font-weight: 600;
color: var(--text-secondary);
}
.scoring-profile-complete-chips {
display: inline-flex;
flex-wrap: wrap;
gap: 6px;
}
.scoring-process-complete-panel {
margin-top: 4px;
padding: 16px;
border: 1px solid var(--border);
border-radius: var(--radius-lg);
background: linear-gradient(180deg, var(--surface) 0%, var(--surface-muted) 100%);
box-shadow: var(--shadow-inset);
}
.scoring-process-complete-hint {
margin: 0 0 14px;
font-size: .875rem;
line-height: 1.5;
color: var(--text-secondary);
}
.scoring-coach-band-panel .scoring-coach-band-fields {
display: grid;
grid-template-columns: minmax(0, 1fr) minmax(0, 1.2fr);
gap: 16px;
margin-top: 14px;
padding-top: 14px;
border-top: 1px solid var(--border);
}
.scoring-coach-band-panel .scoring-profile-select,
.scoring-coach-band-panel .condition-qn-select {
width: 100%;
max-width: none;
}
.scoring-band-picker {
display: flex;
flex-wrap: wrap;
gap: 10px;
padding: 12px;
background: var(--surface);
border: 1px solid var(--border);
border-radius: var(--radius-lg);
}
.scoring-band-picker-item {
position: relative;
display: inline-flex;
margin: 0;
cursor: pointer;
user-select: none;
}
.scoring-band-picker-item input {
position: absolute;
opacity: 0;
width: 1px;
height: 1px;
margin: 0;
pointer-events: none;
}
.scoring-band-picker-item .band-badge {
cursor: pointer;
opacity: .45;
filter: grayscale(.25);
transition: opacity .15s ease, transform .15s ease, box-shadow .15s ease, filter .15s ease;
}
.scoring-band-picker-item:hover .band-badge {
opacity: .72;
filter: none;
}
.scoring-band-picker-item input:checked + .band-badge {
opacity: 1;
filter: none;
transform: translateY(-1px);
box-shadow: 0 0 0 2px var(--surface), 0 0 0 4px var(--primary);
}
.scoring-band-picker-item input:focus-visible + .band-badge {
outline: 2px solid var(--primary);
outline-offset: 2px;
}
.scoring-band-picker-item input:disabled + .band-badge {
cursor: not-allowed;
opacity: .35;
}
@media (max-width: 720px) {
.scoring-coach-band-panel .scoring-coach-band-fields {
grid-template-columns: 1fr;
}
}
.scoring-profile-member-count {
margin: 12px 0 8px;
font-size: .8rem;

View File

@ -6,10 +6,17 @@ const CONDITION_MODES = [
{ value: 'always', label: 'Always available' },
{ value: 'requires', label: 'Requires other questionnaires completed' },
{ value: 'requires_answer', label: 'Requires completions + answer check' },
{ value: 'requires_coach_band', label: 'Requires coach category (band)' },
{ value: 'any_of', label: 'Any of these rules (OR)' },
{ value: 'custom', label: 'Custom JSON (advanced)' },
];
const SCORING_BANDS = [
{ value: 'green', label: 'Green' },
{ value: 'yellow', label: 'Yellow' },
{ value: 'red', label: 'Red' },
];
const CHOICE_LAYOUT_TYPES = new Set([
'radio_question',
'multi_check_box_question',
@ -156,6 +163,21 @@ export function parseConditionForm(conditionJson, questionnaireId) {
if (obj.alwaysAvailable === true) {
return { mode: 'always', messageKey: '', germanLabel: '', customJson: '' };
}
if (obj.requiresCoachBand && typeof obj.requiresCoachBand === 'object') {
const band = obj.requiresCoachBand;
const allowed = Array.isArray(band.allowed)
? band.allowed.filter(Boolean).map(v => String(v).toLowerCase())
: [];
return {
mode: 'requires_coach_band',
requires: asRequiresList(obj),
coachBandProfileID: (band.profileID || '').trim(),
coachBandAllowed: allowed,
messageKey,
germanLabel: '',
customJson: '',
};
}
if (Array.isArray(obj.anyOf) && obj.anyOf.length) {
return {
mode: 'any_of',
@ -219,6 +241,20 @@ export function buildConditionJson(form, selfQuestionnaireId = '') {
throw new Error('Add at least one rule for "Any of these rules"');
}
obj = { anyOf: rules };
} else if (form.mode === 'requires_coach_band') {
obj = {};
if (form.requires?.length) {
obj.requiresCompleted = [...form.requires];
}
const profileID = (form.coachBandProfileID || '').trim();
const allowed = (form.coachBandAllowed || []).filter(Boolean);
if (!profileID) {
throw new Error('Select a scoring profile for the coach category rule');
}
if (!allowed.length) {
throw new Error('Select at least one allowed coach category (band)');
}
obj.requiresCoachBand = { profileID, allowed: [...allowed] };
} else {
obj = buildRule({
type: form.mode,
@ -251,6 +287,61 @@ export function buildConditionJson(form, selfQuestionnaireId = '') {
return JSON.stringify(obj);
}
function bandCheckboxesHTML(selected, editable) {
const dis = editable ? '' : ' disabled';
const sel = new Set((selected || []).map(b => String(b).toLowerCase()));
return `<div class="scoring-band-picker" id="condCoachBands">
${SCORING_BANDS.map(b => {
const checked = sel.has(b.value) ? ' checked' : '';
return `<label class="scoring-band-picker-item">
<input type="checkbox" value="${b.value}"${checked}${dis}>
<span class="band-badge band-${b.value}">${esc(b.label)}</span>
</label>`;
}).join('')}
</div>`;
}
function scoringProfileSelectHTML(selectedId, scoringProfiles, editable) {
const dis = editable ? '' : ' disabled';
const list = (scoringProfiles || []).filter(p => p.profileID);
if (!list.length) {
return '<p class="data-toolbar-hint">No active scoring profiles. Create one under Questionnaires → Scoring profiles.</p>';
}
const options = ['<option value="">— Select scoring profile —</option>']
.concat(list.map(p => {
const id = p.profileID;
const sel = selectedId === id ? ' selected' : '';
const label = (p.name || '').trim() || 'Unnamed profile';
return `<option value="${esc(id)}"${sel}>${esc(label)}</option>`;
}));
return `<select id="condCoachBandProfile" class="condition-qn-select scoring-profile-select"${dis}>${options.join('')}</select>`;
}
function coachBandRuleHTML(form, allQuestionnaires, scoringProfiles, selfId, editable) {
return `
<div class="scoring-coach-band-panel condition-rule-block">
<label class="form-label">Optional: must also be completed first</label>
${requiresCheckboxes('condRequires', form.requires || [], allQuestionnaires, selfId, editable)}
<div class="scoring-coach-band-fields">
<div class="form-group">
<label class="form-label">Scoring profile</label>
${scoringProfileSelectHTML(form.coachBandProfileID || '', scoringProfiles, editable)}
</div>
<div class="form-group">
<label class="form-label">Allowed coach categories</label>
${bandCheckboxesHTML(form.coachBandAllowed || [], editable)}
<p class="field-hint">Unlocks only after the coach sets one of these categories during score review.</p>
</div>
</div>
</div>`;
}
function readCoachBandAllowed() {
const root = document.getElementById('condCoachBands');
if (!root) return [];
return [...root.querySelectorAll('input[type=checkbox]:checked')].map(cb => cb.value);
}
function requiresCheckboxes(id, selected, allQuestionnaires, selfId, editable) {
const list = (allQuestionnaires || []).filter(q => q.questionnaireID !== selfId);
if (!list.length) {
@ -377,6 +468,7 @@ export function renderConditionEditorHTML(form, {
questionnaireId,
allQuestionnaires,
questionsByQuestionnaire,
scoringProfiles = [],
germanLabel,
editable,
}) {
@ -412,6 +504,10 @@ export function renderConditionEditorHTML(form, {
}, allQuestionnaires, questionsByQuestionnaire, questionnaireId, editable)}
</div>
<div id="conditionPanelRequiresCoachBand" class="condition-mode-panel" style="display:${form.mode === 'requires_coach_band' ? '' : 'none'}">
${coachBandRuleHTML(form, allQuestionnaires, scoringProfiles, questionnaireId, editable)}
</div>
<div id="conditionPanelAnyOf" class="condition-mode-panel" style="display:${form.mode === 'any_of' ? '' : 'none'}">
<p class="data-toolbar-hint" style="margin:0 0 10px">Unlock if any one rule matches.</p>
<div id="conditionAnyOfRules">
@ -502,6 +598,13 @@ export function readConditionFormFromDOM() {
return form;
}
if (mode === 'requires_coach_band') {
form.requires = readRequires('condRequires');
form.coachBandProfileID = document.getElementById('condCoachBandProfile')?.value?.trim() || '';
form.coachBandAllowed = readCoachBandAllowed();
return form;
}
if (mode === 'any_of') {
form.rules = [];
document.querySelectorAll('#conditionAnyOfRules .condition-anyof-rule').forEach((el, i) => {
@ -572,6 +675,7 @@ export function mountConditionEditor(container, {
questionnaireId,
allQuestionnaires,
questionsByQuestionnaire = {},
scoringProfiles = [],
conditionJson,
germanLabel,
editable,
@ -586,6 +690,7 @@ export function mountConditionEditor(container, {
questionnaireId,
allQuestionnaires,
questionsByQuestionnaire,
scoringProfiles,
germanLabel: label,
editable,
}

View File

@ -938,6 +938,13 @@ async function initConditionEditor(condJson) {
if (!mount) return;
mount.innerHTML = '<div class="spinner"></div>';
await loadQuestionsByQuestionnaire();
let scoringProfiles = [];
try {
const data = await apiGet('scoring_profiles.php');
scoringProfiles = (data.profiles || []).filter(p => p.isActive !== 0 && p.isActive !== false);
} catch {
scoringProfiles = [];
}
const qid = questionnaire?.questionnaireID || 'new';
const parsed = parseConditionForm(condJson, qid);
const germanLabel = parsed.messageKey
@ -947,6 +954,7 @@ async function initConditionEditor(condJson) {
questionnaireId: qid,
allQuestionnaires,
questionsByQuestionnaire,
scoringProfiles,
conditionJson: condJson,
germanLabel,
editable: canEdit(),

View File

@ -463,6 +463,54 @@ function bandRangesEditorHTML(bands) {
<div id="spBandPreview" class="scoring-band-labels"></div>`;
}
const SCORING_BAND_OPTIONS = [
{ value: 'green', label: 'Green' },
{ value: 'yellow', label: 'Yellow' },
{ value: 'red', label: 'Red' },
];
function processCompleteBandsSummaryHTML(profile) {
const bands = (profile?.processCompleteBands || [])
.map(b => String(b).toLowerCase())
.filter(Boolean);
if (!bands.length) return '';
const chips = bands.map(b => {
const label = SCORING_BAND_OPTIONS.find(o => o.value === b)?.label || b;
return `<span class="band-badge band-${esc(b)}">${esc(label)}</span>`;
}).join('');
return `
<div class="scoring-profile-complete-bands">
<span class="scoring-profile-complete-label">Process complete when coach sets</span>
<span class="scoring-profile-complete-chips">${chips}</span>
</div>`;
}
function processCompleteBandsEditorHTML(selected, editable) {
const dis = editable ? '' : ' disabled';
const sel = new Set((selected || []).map(b => String(b).toLowerCase()));
return `
<div class="scoring-process-complete-panel">
<h4 class="scoring-modal-section-title">Process complete</h4>
<p class="scoring-process-complete-hint">
When the coach sets one of these categories during score review, the app shows the process-complete dialog for that client.
</p>
<div class="scoring-band-picker" id="spProcessCompleteBands">
${SCORING_BAND_OPTIONS.map(b => {
const checked = sel.has(b.value) ? ' checked' : '';
return `<label class="scoring-band-picker-item">
<input type="checkbox" value="${b.value}"${checked}${dis}>
<span class="band-badge band-${b.value}">${esc(b.label)}</span>
</label>`;
}).join('')}
</div>
</div>`;
}
function readProcessCompleteBandsFromModal(overlay) {
return [...(overlay.querySelectorAll('#spProcessCompleteBands input[type=checkbox]:checked') || [])]
.map(cb => cb.value);
}
function renderScoringProfilesSection(profiles, questionnaires) {
const panel = document.getElementById('scoringProfilesPanel');
if (!panel) return;
@ -542,6 +590,7 @@ function scoringProfileCardHTML(profile, questionnaires) {
</div>
${profile.description ? `<p class="scoring-profile-desc">${esc(profile.description)}</p>` : ''}
<p class="scoring-profile-bands">${bandSummary(profile)}</p>
${processCompleteBandsSummaryHTML(profile)}
</div>
${canEdit() ? `
<div class="scoring-profile-card-actions">
@ -584,6 +633,7 @@ function openScoringProfileModal(profile, questionnaires, allProfiles) {
</label>
</div>
${bandRangesEditorHTML(initialBands)}
${processCompleteBandsEditorHTML(profile?.processCompleteBands || [], canEdit())}
<h4 class="scoring-modal-section-title">Questionnaires</h4>
<p class="data-toolbar-hint" style="margin:0 0 10px">Add questionnaires and set weight. List order is the display order.</p>
<div id="spQnPicker" class="scoring-profile-picker"></div>
@ -724,6 +774,7 @@ function openScoringProfileModal(profile, questionnaires, allProfiles) {
description,
isActive,
...bands,
processCompleteBands: readProcessCompleteBandsFromModal(overlay),
questionnaires: members.map((m, idx) => ({
questionnaireID: m.questionnaireID,
weight: parseFloat(picker.querySelector(`[data-qn="${m.questionnaireID}"] .sp-weight`)?.value) || m.weight || 1,