Ingen åpne oppgaver igjen — alt er planlagt eller filtrert bort.
';
+
+ // Høyre: kapasitet + ordnet liste.
+ const remaining = planned.filter(t => t.status !== 'done');
+ const hours = remaining.reduce((s, t) => s + (t.estHours || 0), 0);
+ const doneCount = planned.length - remaining.length;
+ const cap = $('plan-capacity');
+ cap.innerHTML = planned.length
+ ? `${planned.length} oppg. · Tomt. Legg til oppgaver fra venstre med +, eller dra dem hit. Dra for å sortere.
';
+
+ bindPlanDnD();
+}
+
+function renderAvailRow(t) {
+ const dl = formatDeadline(t.deadline);
+ return `
+
@@ -133,6 +134,26 @@
+
+
+
+
Tilgjengelige oppgaver
+ klikk + for å planlegge
+
+
+
+
+
+
+
+
Kommentar
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/netops-todo-node/public/style.css b/netops-todo-node/public/style.css
index 69bb776..f0012c5 100644
--- a/netops-todo-node/public/style.css
+++ b/netops-todo-node/public/style.css
@@ -315,6 +315,66 @@ tbody tr.status-done .task-title { text-decoration: line-through; }
.comment-input-row input { flex: 1; }
.no-comments { color: var(--text-faint); font-size: 12px; font-style: italic; }
+/* ---------- Status-kommentar i tråd ---------- */
+.comment.comment-status { border-left: 3px solid var(--accent); }
+.comment-kind { font-family: var(--mono); font-size: 10px; font-weight: 600; padding: 1px 6px;
+ border-radius: 4px; text-transform: uppercase; letter-spacing: 0.4px; }
+.comment-kind.status-done { background: rgba(74,222,128,0.12); color: var(--ok); }
+.comment-kind.status-blocked { background: rgba(255,83,112,0.15); color: var(--err); }
+.comment-kind.status-progress { background: rgba(255,159,67,0.15); color: var(--warn); }
+.comment-kind.status-todo { background: rgba(127,184,255,0.12); color: #7fb8ff; }
+.status-note-field input { border-color: var(--accent); }
+
+/* ---------- Dagsplan ---------- */
+.planner { display: grid; grid-template-columns: 1fr 1fr; gap: var(--gap); align-items: start; }
+.plan-col { background: var(--bg-soft); border: 1px solid var(--border); border-radius: var(--radius);
+ display: flex; flex-direction: column; min-height: 300px; }
+.plan-col.plan-today { border-color: var(--border-strong); }
+.plan-col-head { display: flex; justify-content: space-between; align-items: center;
+ padding: 14px 16px 10px; gap: 10px; flex-wrap: wrap; }
+.plan-col-head h3 { font-size: 13px; font-weight: 600; text-transform: uppercase; letter-spacing: 0.6px;
+ display: flex; align-items: center; gap: 8px; }
+.plan-col-head .col-meta { font-family: var(--mono); font-size: 12px; color: var(--text-dim); }
+.plan-col-head .col-meta.over-capacity { color: var(--warn); font-weight: 600; }
+.plan-col-head .col-meta b { color: var(--text); }
+.plan-col-hint { font-size: 11px; color: var(--text-faint); font-family: var(--mono); }
+.plan-date-row { display: flex; align-items: center; gap: 10px; }
+.plan-date-row input { padding: 5px 8px; font-size: 12px; }
+.plan-col-body { display: flex; flex-direction: column; gap: 8px; padding: 4px 12px 14px; flex: 1; }
+.plan-empty { color: var(--text-faint); font-size: 13px; font-style: italic; padding: 20px 4px; text-align: center; }
+
+/* Tilgjengelig-rad (venstre kolonne) */
+.avail-row { display: flex; align-items: center; gap: 10px; background: var(--card);
+ border: 1px solid var(--border); border-radius: 6px; padding: 8px 10px; cursor: grab; }
+.avail-row:hover { border-color: var(--border-strong); }
+.avail-row.dragging { opacity: 0.4; }
+.avail-main { flex: 1; min-width: 0; }
+.avail-title { font-size: 13px; font-weight: 500; cursor: pointer; }
+.avail-title:hover { color: var(--accent); }
+.avail-meta { display: flex; gap: 8px; align-items: center; margin-top: 3px;
+ font-size: 11px; font-family: var(--mono); color: var(--text-faint); flex-wrap: wrap; }
+.avail-add { flex-shrink: 0; background: var(--accent-soft); color: var(--accent);
+ border: 1px solid rgba(79,195,247,0.3); border-radius: 5px; width: 30px; height: 30px;
+ font-size: 18px; line-height: 1; padding: 0; justify-content: center; }
+.avail-add:hover { background: var(--accent); color: #06151f; }
+
+/* Plan-item (høyre kolonne) */
+.plan-item { display: flex; align-items: center; gap: 10px; background: var(--card);
+ border: 1px solid var(--border); border-radius: 6px; padding: 8px 10px; cursor: grab;
+ transition: border-color 0.15s, box-shadow 0.15s; }
+.plan-item:hover { border-color: var(--border-strong); }
+.plan-item.dragging { opacity: 0.4; box-shadow: 0 6px 16px rgba(0,0,0,0.35); }
+.plan-item.done-item { opacity: 0.6; }
+.plan-item.done-item .plan-item-title { text-decoration: line-through; color: var(--text-faint); }
+.plan-handle { color: var(--text-faint); font-size: 14px; cursor: grab; user-select: none; flex-shrink: 0; }
+.plan-num { font-family: var(--mono); font-size: 12px; color: var(--text-faint); width: 18px; text-align: right; flex-shrink: 0; }
+.plan-item-main { flex: 1; min-width: 0; }
+.plan-item-title { font-size: 13px; font-weight: 500; cursor: pointer; }
+.plan-item-title:hover { color: var(--accent); }
+.plan-item-meta { display: flex; gap: 8px; align-items: center; margin-top: 3px;
+ font-size: 11px; font-family: var(--mono); color: var(--text-faint); flex-wrap: wrap; }
+.plan-item-actions { display: flex; gap: 2px; flex-shrink: 0; }
+
/* ---------- Toast ---------- */
.toast-stack { position: fixed; bottom: 20px; right: 20px; z-index: 200;
display: flex; flex-direction: column; gap: 8px; align-items: flex-end; }
@@ -345,6 +405,7 @@ footer .kbd { display: inline-block; padding: 0 5px; border: 1px solid var(--bor
@media (max-width: 1250px) { .board { grid-template-columns: repeat(2, 1fr); } }
@media (max-width: 1100px) { .chart-row { grid-template-columns: 1fr 1fr; } }
+@media (max-width: 820px) { .planner { grid-template-columns: 1fr; } }
@media (max-width: 720px) {
.chart-row { grid-template-columns: 1fr; }
.board { grid-template-columns: 1fr; }
diff --git a/netops-todo-node/server.js b/netops-todo-node/server.js
index 7739a52..c76d421 100644
--- a/netops-todo-node/server.js
+++ b/netops-todo-node/server.js
@@ -93,6 +93,15 @@ function createServer({ dataDir = path.join(__dirname, 'data') } = {}) {
}
}
+ // Send kun til samme brukers tilkoblinger (dagsplan er privat, men skal synke
+ // mellom f.eks. desktop og laptop hos samme bruker).
+ function sendToUser(user, obj) {
+ const msg = JSON.stringify(obj);
+ for (const [ws, meta] of clients) {
+ if (meta.user === user && ws.readyState === ws.OPEN) ws.send(msg);
+ }
+ }
+
function onlineUsers() {
const set = new Set();
for (const meta of clients.values()) set.add(meta.user);
@@ -154,10 +163,14 @@ function createServer({ dataDir = path.join(__dirname, 'data') } = {}) {
heartbeat.unref();
// ---------- REST API ----------
+ const todayStr = () => new Date().toISOString().slice(0, 10);
+ const validDate = d => typeof d === 'string' && /^\d{4}-\d{2}-\d{2}$/.test(d);
+
app.get('/healthz', (req, res) => res.json({ ok: true, tasks: store.tasks.length }));
app.get('/api/state', (req, res) => {
store.rememberUser(req.user);
+ const today = todayStr();
res.json({
user: req.user,
canSetName: COOKIE_AUTH_ENABLED,
@@ -165,9 +178,22 @@ function createServer({ dataDir = path.join(__dirname, 'data') } = {}) {
activity: store.activity,
known_users: [...store.knownUsers].sort(),
online: onlineUsers(),
+ plan: { date: today, items: store.getPlan(req.user, today) },
});
});
+ app.get('/api/plan', (req, res) => {
+ const date = validDate(req.query.date) ? req.query.date : todayStr();
+ res.json({ date, items: store.getPlan(req.user, date) });
+ });
+
+ app.put('/api/plan', (req, res) => {
+ const date = validDate(req.body && req.body.date) ? req.body.date : todayStr();
+ const items = store.setPlan(req.user, date, req.body && req.body.items);
+ sendToUser(req.user, { type: 'plan', date, items });
+ res.json({ date, items });
+ });
+
app.post('/api/login', (req, res) => {
if (!COOKIE_AUTH_ENABLED) return res.status(403).json({ error: 'Navnevalg er deaktivert — auth styres av proxy' });
const raw = req.body && req.body.name;
@@ -188,7 +214,10 @@ function createServer({ dataDir = path.join(__dirname, 'data') } = {}) {
});
app.put('/api/tasks/:id', (req, res) => {
- const { task, activity } = store.update(req.params.id, req.body, req.user);
+ // Valgfri `comment` følger med ved statusbytte; normalizeTask ignorerer
+ // ukjente felter, så den blir ikke en del av selve oppgaven.
+ const comment = req.body && typeof req.body.comment === 'string' ? req.body.comment : '';
+ const { task, activity } = store.update(req.params.id, req.body, req.user, { comment });
broadcast({ type: 'task', op: 'update', task, by: req.user, activity });
res.json({ task });
});
diff --git a/netops-todo-node/test/api.test.js b/netops-todo-node/test/api.test.js
index f890e01..4f949ef 100644
--- a/netops-todo-node/test/api.test.js
+++ b/netops-todo-node/test/api.test.js
@@ -189,6 +189,105 @@ test('replace erstatter alt og persisterer til disk', async () => {
assert.equal(onDisk[0].title, 'Eneste oppgave');
});
+test('update med comment legger til status-kommentar og aktivitets-detalj', async () => {
+ let res = await req('POST', '/api/tasks', { title: 'Kommentar-ved-status' });
+ const { task } = await res.json();
+
+ res = await req('PUT', `/api/tasks/${task.id}`, { v: task.v, status: 'done', comment: 'Verifisert i lab, rullet ut' });
+ assert.equal(res.status, 200);
+ const { task: done } = await res.json();
+ assert.equal(done.status, 'done');
+ assert.equal(done.comments.length, 1);
+ assert.equal(done.comments[0].kind, 'status');
+ assert.equal(done.comments[0].status, 'done');
+ assert.equal(done.comments[0].text, 'Verifisert i lab, rullet ut');
+
+ // Aktivitetsloggen skal nevne kommentaren
+ res = await req('GET', '/api/state');
+ const { activity } = await res.json();
+ const entry = activity.find(a => a.taskId === task.id && a.action === 'done');
+ assert.ok(entry.detail.some(d => d.includes('Verifisert i lab')));
+});
+
+test('update uten comment legger ikke til kommentar', async () => {
+ let res = await req('POST', '/api/tasks', { title: 'Ingen-kommentar' });
+ const { task } = await res.json();
+ res = await req('PUT', `/api/tasks/${task.id}`, { v: task.v, status: 'progress' });
+ const { task: upd } = await res.json();
+ assert.equal(upd.comments.length, 0);
+});
+
+test('dagsplan: tom som standard, sett ordnet liste, hent tilbake', async () => {
+ // Lag to oppgaver å planlegge
+ const a = (await (await req('POST', '/api/tasks', { title: 'Plan A' })).json()).task;
+ const b = (await (await req('POST', '/api/tasks', { title: 'Plan B' })).json()).task;
+
+ let res = await req('GET', '/api/plan?date=2026-06-15');
+ assert.equal(res.status, 200);
+ assert.deepEqual((await res.json()).items, []);
+
+ res = await req('PUT', '/api/plan', { date: '2026-06-15', items: [b.id, a.id] });
+ assert.equal(res.status, 200);
+ assert.deepEqual((await res.json()).items, [b.id, a.id]); // rekkefølge bevart
+
+ res = await req('GET', '/api/plan?date=2026-06-15');
+ assert.deepEqual((await res.json()).items, [b.id, a.id]);
+});
+
+test('dagsplan: er per bruker', async () => {
+ const a = (await (await req('POST', '/api/tasks', { title: 'Privat plan' })).json()).task;
+ await req('PUT', '/api/plan', { date: '2026-06-16', items: [a.id] }, { 'X-Remote-User': 'jon' });
+
+ // Annen bruker ser sin egen (tomme) plan
+ const res = await req('GET', '/api/plan?date=2026-06-16', null, { 'X-Remote-User': 'kari' });
+ assert.deepEqual((await res.json()).items, []);
+});
+
+test('dagsplan: ugyldige/dupliserte/ukjente ider filtreres bort', async () => {
+ const a = (await (await req('POST', '/api/tasks', { title: 'Gyldig plan-task' })).json()).task;
+ const res = await req('PUT', '/api/plan', {
+ date: '2026-06-17', items: [a.id, a.id, 't_finnesikke', 12345, null],
+ });
+ assert.deepEqual((await res.json()).items, [a.id]); // dedupet + kun eksisterende
+});
+
+test('dagsplan: sletting av oppgave fjerner den fra planen', async () => {
+ const a = (await (await req('POST', '/api/tasks', { title: 'Skal slettes fra plan' })).json()).task;
+ await req('PUT', '/api/plan', { date: '2026-06-18', items: [a.id] });
+ await req('DELETE', `/api/tasks/${a.id}`);
+ const res = await req('GET', '/api/plan?date=2026-06-18');
+ assert.deepEqual((await res.json()).items, []);
+});
+
+test('dagsplan: ugyldig dato faller tilbake til i dag', async () => {
+ const res = await req('GET', '/api/plan?date=tull');
+ const data = await res.json();
+ assert.match(data.date, /^\d{4}-\d{2}-\d{2}$/);
+});
+
+test('websocket: dagsplan-endring pushes kun til samme bruker', async () => {
+ const wsUrl = baseUrl.replace('http', 'ws') + '/ws';
+ const mk = user => new Promise((resolve, reject) => {
+ const c = new WebSocket(wsUrl, { headers: { 'X-Remote-User': user } });
+ c.msgs = [];
+ c.on('message', raw => c.msgs.push(JSON.parse(raw)));
+ c.on('open', () => resolve(c));
+ c.on('error', reject);
+ });
+ const jon = await mk('testuser'); // samme bruker som req() bruker
+ const kari = await mk('kari');
+ await new Promise(r => setTimeout(r, 150));
+
+ const a = (await (await req('POST', '/api/tasks', { title: 'WS-plan' })).json()).task;
+ await req('PUT', '/api/plan', { date: '2026-06-19', items: [a.id] });
+ await new Promise(r => setTimeout(r, 150));
+
+ assert.ok(jon.msgs.some(m => m.type === 'plan' && m.items.includes(a.id)), 'jon fikk plan-push');
+ assert.ok(!kari.msgs.some(m => m.type === 'plan'), 'kari skal ikke få plan-push');
+
+ jon.close(); kari.close();
+});
+
test('cookie-auth: login setter cookie, ugyldig navn avvises', async () => {
let res = await fetch(baseUrl + '/api/login', {
method: 'POST', headers: { 'Content-Type': 'application/json' },