`;
+
+function chevBtn(key) {
+ const rot = collapsed[key] ? 'rotate(-90deg)' : 'rotate(0deg)';
+ return `
`;
+}
+
+function toggleCollapse(key) { collapsed[key] = !collapsed[key]; renderDash(); }
+
+function toggleEditMode(blockId) {
+ editModeBlock = (editModeBlock === blockId) ? null : blockId;
+ renderDash();
+}
+
+function planDisplayName(plan) {
+ const major = S.blocks.find(b => b.planId === plan.id && b.role === 'major');
+ const minors = S.blocks.filter(b => b.planId === plan.id && b.role === 'minor');
+ const blockCr = (blk) => S.courses.filter(c => c.blockId === blk.id).reduce((s,c) => s + (+c.credits||0), 0);
+ const parts = [];
+ if (major) parts.push(`${esc(major.name)} ${blockCr(major)} cr.`);
+ minors.forEach(m => parts.push(`${esc(m.name)} ${blockCr(m)} cr.`));
+ return parts.length ? parts.join(' · ') : esc(plan.name);
+}
+
+function moveCourse(id, dir) {
+ const c = S.courses.find(x => x.id === id);
+ if (!c) return;
+ const sibs = S.courses.map((x,i) => ({x,i})).filter(({x}) => x.blockId === (c.blockId||'') && (x.subBlockId||'') === (c.subBlockId||''));
+ const pos = sibs.findIndex(({x}) => x.id === id);
+ const swap = dir === 'up' ? pos - 1 : pos + 1;
+ if (swap < 0 || swap >= sibs.length) return;
+ [S.courses[sibs[pos].i], S.courses[sibs[swap].i]] = [S.courses[sibs[swap].i], S.courses[sibs[pos].i]];
+ save(); renderDash();
+}
+
+function moveSubBlock(id, dir) {
+ const sb = S.subBlocks.find(x => x.id === id);
+ if (!sb) return;
+ const sibs = S.subBlocks.map((x,i) => ({x,i})).filter(({x}) => x.blockId === sb.blockId);
+ const pos = sibs.findIndex(({x}) => x.id === id);
+ const swap = dir === 'up' ? pos - 1 : pos + 1;
+ if (swap < 0 || swap >= sibs.length) return;
+ [S.subBlocks[sibs[pos].i], S.subBlocks[sibs[swap].i]] = [S.subBlocks[sibs[swap].i], S.subBlocks[sibs[pos].i]];
+ save(); renderDash();
+}
+
+function moveBlock(id, dir) {
+ const b = S.blocks.find(x => x.id === id);
+ if (!b) return;
+ const sibs = S.blocks.map((x,i) => ({x,i})).filter(({x}) => x.planId === b.planId && x.role === b.role);
+ const pos = sibs.findIndex(({x}) => x.id === id);
+ const swap = dir === 'up' ? pos - 1 : pos + 1;
+ if (swap < 0 || swap >= sibs.length) return;
+ [S.blocks[sibs[pos].i], S.blocks[sibs[swap].i]] = [S.blocks[sibs[swap].i], S.blocks[sibs[pos].i]];
+ save(); renderDash();
+}
function roleGroupSection(planId, label, role, blocks, allPlanCourses, planColor) {
const headerColor = role === 'major'
@@ -811,15 +886,20 @@ function roleGroupSection(planId, label, role, blocks, allPlanCourses, planColor
: (blocks.length ? blockEffectiveColor(blocks[0]) : MINOR_PALETTE[role === 'optional' ? 4 : 0]);
const addLabel = role === 'major' ? 'Major' : role === 'minor' ? 'Minor' : 'Optional';
const canAdd = role !== 'major' || !blocks.length;
+ const colKey = `role_${planId}_${role}`;
+ const isCollapsed = collapsed[colKey];
let html = `
-
-
${label}
+
+ ${chevBtn(colKey)}
+ ${label}
${canAdd ? `+ ${addLabel} ` : ''}
`;
- if (blocks.length) {
- blocks.forEach(blk => { html += planBlockSection(planId, blk, '', allPlanCourses); });
- } else {
- html += `
No ${label.toLowerCase()} defined yet.
`;
+ if (!isCollapsed) {
+ if (blocks.length) {
+ blocks.forEach((blk, i) => { html += planBlockSection(planId, blk, allPlanCourses, blocks.length, i); });
+ } else {
+ html += `
No ${label.toLowerCase()} defined yet.
`;
+ }
}
html += `
`;
return html;
@@ -830,11 +910,11 @@ function dashPlans() {
let html = '';
S.studyPlans.forEach(plan => {
- const pc = S.courses.filter(c => c.planId === plan.id);
- const totCr = pc.reduce((s, c) => s + (+c.credits || 0), 0);
- const passCr = pc.filter(c => status(c) === 'pass').reduce((s, c) => s + (+c.credits || 0), 0);
- const minCr = plan.cycle === 'bachelor' ? settings.minCreditsBachelor
- : plan.cycle === 'master' ? settings.minCreditsMaster : null;
+ const pc = S.courses.filter(c => c.planId === plan.id);
+ const totCr = pc.reduce((s, c) => s + (+c.credits || 0), 0);
+ const passCr = pc.filter(c => isPass(status(c))).reduce((s, c) => s + (+c.credits || 0), 0);
+ const minCr = plan.cycle === 'bachelor' ? settings.minCreditsBachelor
+ : plan.cycle === 'master' ? settings.minCreditsMaster : null;
const creditOk = minCr === null || totCr >= minCr;
const majors = S.blocks.filter(b => b.planId === plan.id && b.role === 'major');
@@ -842,11 +922,15 @@ function dashPlans() {
const optionals = S.blocks.filter(b => b.planId === plan.id && b.role === 'optional');
const others = S.blocks.filter(b => b.planId === plan.id && !b.role);
- const pClr = planBaseColor(plan);
+ const pClr = planBaseColor(plan);
+ const colKey = `plan_${plan.id}`;
+ const isCollapsed = collapsed[colKey];
+
html += `
`;
+ html += `
`;
});
const up = S.courses.filter(c => !c.planId);
@@ -895,60 +969,85 @@ function dashPlans() {
return html;
}
-function planBlockSection(planId, blk, roleLabel, allPlanCourses) {
- const bc = allPlanCourses.filter(c => c.blockId === blk.id);
- const bm = blockMean(blk.id);
- const bCr = bc.reduce((s, c) => s + (+c.credits || 0), 0);
- const bClr = blockEffectiveColor(blk);
- const sbs = S.subBlocks.filter(sb => sb.blockId === blk.id);
- const freeC = bc.filter(c => !c.subBlockId);
- const roleTxt = roleLabel
- ? `
${roleLabel} `
- : '';
+function planBlockSection(planId, blk, allPlanCourses, sibCount, sibIdx) {
+ const bc = allPlanCourses.filter(c => c.blockId === blk.id);
+ const bm = blockMean(blk.id);
+ const bCr = bc.reduce((s, c) => s + (+c.credits || 0), 0);
+ const bClr = blockEffectiveColor(blk);
+ const sbs = S.subBlocks.filter(sb => sb.blockId === blk.id);
+ const freeC = bc.filter(c => !c.subBlockId);
+ const colKey = `block_${blk.id}`;
+ const isCollapsed = collapsed[colKey];
+ const inEdit = editModeBlock === blk.id;
+ const failedCourses = bc.filter(c => c.passFail === 'failed').length;
+ const blockFailed = failedCourses > 1;
+ const blockIsPassed = blockPassedStatus(blk.id);
+
let html = `
- `;
+ html += `
`;
return html;
}
-function planSubBlockSection(planId, blockId, sb, courses, parentColor) {
- const sbCr = courses.reduce((s, c) => s + (+c.credits || 0), 0);
- const sbClr = subBlockEffectiveColor(sb);
- return `
-
-
${esc(sb.name)}
-
- ${sbCr} cr.
- ✎
- ×
-
-
- ${courses.length ? coursesMgmtList(courses, false, sbClr) : '
No courses yet
'}
-
+ Course
-
`;
+function planSubBlockSection(planId, blockId, sb, courses, parentColor, inEdit, sibCount, sibIdx) {
+ const sbCr = courses.reduce((s, c) => s + (+c.credits || 0), 0);
+ const sbClr = subBlockEffectiveColor(sb);
+ const colKey = `sb_${sb.id}`;
+ const isCollapsed = collapsed[colKey];
+
+ let html = `
+
+ ${chevBtn(colKey)}
+ ${esc(sb.name)}
+ ${sb.passed
+ ? `✓ Validé `
+ : `Check `}
+ ${sbCr} cr.
+ ${inEdit && sibCount > 1 ? `↑ ↓ ` : ''}
+ ${inEdit ? `✎ × ` : ''}
+
`;
+
+ if (!isCollapsed) {
+ html += courses.length
+ ? coursesMgmtList(courses, false, sbClr, inEdit)
+ : `
No courses yet
`;
+ if (inEdit) {
+ html += `
+ Course `;
+ }
+ }
+ html += `
`;
+ return html;
}
const CAL_SVG = `
`;
@@ -960,7 +1059,7 @@ function dashSemesters() {
S.semesters.forEach(sem => {
const sc = S.courses.filter(c => c.semesterId === sem.id);
const totCr = sc.reduce((s, c) => s + (+c.credits || 0), 0);
- const passCr = sc.filter(c => status(c) === 'pass').reduce((s, c) => s + (+c.credits || 0), 0);
+ const passCr = sc.filter(c => isPass(status(c))).reduce((s, c) => s + (+c.credits || 0), 0);
const graded = sc.filter(c => !c.passFail && c.grade != null && c.grade !== '');
const sumW = graded.reduce((s, c) => s + +c.grade * (+c.credits || 0), 0);
const sumC = graded.reduce((s, c) => s + (+c.credits || 0), 0);
@@ -989,9 +1088,9 @@ function dashSemesters() {
return html;
}
-function coursesMgmtList(courses, showPlan, inheritColor) {
+function coursesMgmtList(courses, showPlan, inheritColor, reorderable) {
if (!courses.length) return '
No courses yet
';
- return courses.map(c => {
+ return courses.map((c, idx) => {
const st = status(c);
const meta = [
c.credits ? c.credits + ' cr.' : null,
@@ -1013,7 +1112,11 @@ function coursesMgmtList(courses, showPlan, inheritColor) {