-
-
-
- 100%
-
-
-
80
-
90
-
100
+
+
+
+
@@ -615,6 +604,8 @@
let data = {};
let selectedDate = todayStr();
let lastKnownToday = todayStr();
+ let logMode = 'post';
+ let timerInterval = null;
const inPlugin = window.parent !== window;
// ── storage ──
@@ -638,7 +629,9 @@
function boot(initial) {
data = initial || loadLocal();
+ recoverPreSessions();
renderAll();
+ if (anyActivePreSessions()) ensureTimerLoop();
}
function uid() {
@@ -699,6 +692,11 @@
}
function sessionPct(s) {
+ if (isPreActive(s)) {
+ const total = s.dur * 60;
+ const elapsed = total - getPreRemaining(s);
+ return total > 0 ? Math.min(100, (elapsed / total) * 100) : 0;
+ }
if (s.pct != null) return Number(s.pct) || 100;
if (s.status === 'incomplete') return 80;
return 100;
@@ -708,8 +706,97 @@
return s.dur * sessionPct(s) / 100;
}
+ function getPreRemaining(s) {
+ if (s.mode !== 'pre' || !s.startedAt) return null;
+ const elapsed = (Date.now() - s.startedAt) / 1000;
+ return Math.max(0, s.dur * 60 - elapsed);
+ }
+
+ function isPreActive(s) {
+ return s.mode === 'pre' && s.startedAt && getPreRemaining(s) > 0;
+ }
+
+ function anyActivePreSessions() {
+ for (const dateStr in data) {
+ if (dateStr === META_MEDITATION) continue;
+ for (const s of daySessions(dateStr)) {
+ if (isPreActive(s)) return true;
+ }
+ }
+ return false;
+ }
+
+ function recoverPreSessions() {
+ let changed = false;
+ for (const dateStr in data) {
+ if (dateStr === META_MEDITATION) continue;
+ for (const s of daySessions(dateStr)) {
+ if (s.mode === 'pre' && s.startedAt && getPreRemaining(s) <= 0) {
+ delete s.mode;
+ delete s.startedAt;
+ s.pct = 100;
+ changed = true;
+ }
+ }
+ }
+ if (changed) saveData();
+ }
+
+ function fmtCountdown(totalSec) {
+ const m = Math.floor(totalSec / 60);
+ const s = Math.floor(totalSec % 60);
+ return `${m}:${String(s).padStart(2, '0')}`;
+ }
+
+ function updateTimerDisplays() {
+ document.querySelectorAll('.session-card[data-session-id]').forEach(card => {
+ const session = daySessions(selectedDate).find(s => s.id === card.dataset.sessionId);
+ if (!session || !isPreActive(session)) return;
+
+ const rem = getPreRemaining(session);
+ const durEl = card.querySelector('.session-dur');
+ const fill = card.querySelector('.session-fill');
+ if (durEl) durEl.textContent = fmtCountdown(rem);
+ if (fill) fill.style.width = sessionPct(session) + '%';
+ });
+ }
+
+ function tickTimers() {
+ let completed = false;
+
+ for (const dateStr in data) {
+ if (dateStr === META_MEDITATION) continue;
+ for (const s of daySessions(dateStr)) {
+ if (s.mode === 'pre' && s.startedAt && getPreRemaining(s) <= 0) {
+ delete s.mode;
+ delete s.startedAt;
+ s.pct = 100;
+ completed = true;
+ }
+ }
+ }
+
+ if (completed) {
+ saveData();
+ renderAll();
+ return;
+ }
+
+ if (anyActivePreSessions()) updateTimerDisplays();
+ }
+
+ function ensureTimerLoop() {
+ if (timerInterval) return;
+ timerInterval = setInterval(tickTimers, 1000);
+ }
+
+ function heatmapDur(s) {
+ if (s.mode === 'pre') return s.dur;
+ return effectiveDur(s);
+ }
+
function dayMinutes(dateStr) {
- return daySessions(dateStr).reduce((sum, s) => sum + effectiveDur(s), 0);
+ return daySessions(dateStr).reduce((sum, s) => sum + heatmapDur(s), 0);
}
function maxMinutesInRange(dates) {
@@ -895,7 +982,7 @@
function renderDayDetail() {
document.getElementById('selected-date-label').textContent = fmtDisplayDate(selectedDate);
const sessions = daySessions(selectedDate);
- const total = Math.round(sessions.reduce((s, x) => s + effectiveDur(x), 0));
+ const total = Math.round(sessions.reduce((s, x) => s + heatmapDur(x), 0));
document.getElementById('day-total').textContent =
total > 0 ? `${total} min` : '';
@@ -911,10 +998,12 @@
sessions.forEach(session => {
const name = session.label || 'session';
+ const active = isPreActive(session);
const pct = Math.min(100, Math.max(0, sessionPct(session)));
const card = document.createElement('div');
- card.className = 'session-card';
+ card.className = 'session-card' + (active ? ' timing' : '');
+ card.dataset.sessionId = session.id;
const track = document.createElement('div');
track.className = 'session-track';
@@ -944,7 +1033,9 @@
const dur = document.createElement('div');
dur.className = 'session-dur';
- dur.textContent = session.dur + ' min';
+ dur.textContent = active
+ ? fmtCountdown(getPreRemaining(session))
+ : session.dur + ' min';
const del = document.createElement('button');
del.className = 'session-delete';
@@ -971,13 +1062,35 @@
// ── add session ──
- function addSession(label, dur, pct, dateStr) {
+ function setLogMode(mode) {
+ logMode = mode === 'pre' ? 'pre' : 'post';
+ document.querySelectorAll('.mode-btn').forEach(btn => {
+ btn.classList.toggle('active', btn.dataset.mode === logMode);
+ });
+ }
+
+ function addSession(label, dur, mode, dateStr) {
const target = dateStr || getLogDate();
if (!Array.isArray(data[target])) data[target] = [];
- data[target].push({ id: uid(), label, dur: Number(dur), pct: Number(pct) });
+
+ const session = {
+ id: uid(),
+ label,
+ dur: Number(dur)
+ };
+
+ if (mode === 'pre') {
+ session.mode = 'pre';
+ session.startedAt = Date.now();
+ } else {
+ session.pct = 100;
+ }
+
+ data[target].push(session);
selectedDate = target;
saveData();
renderAll();
+ if (mode === 'pre') ensureTimerLoop();
}
// ── modals ──
@@ -988,18 +1101,15 @@
refreshCalendar();
document.getElementById('session-label').value = '';
document.getElementById('session-dur').value = '25';
- document.getElementById('session-pct').value = '100';
- document.getElementById('session-pct-val').textContent = '100%';
+ setLogMode('post');
setDateInputBounds();
syncDateInput(todayStr());
addModal.classList.add('active');
document.getElementById('session-label').focus();
});
- document.getElementById('session-pct').addEventListener('input', () => {
- document.getElementById('session-pct-val').textContent =
- document.getElementById('session-pct').value + '%';
- });
+ document.getElementById('mode-post').addEventListener('click', () => setLogMode('post'));
+ document.getElementById('mode-pre').addEventListener('click', () => setLogMode('pre'));
document.getElementById('session-date').addEventListener('change', () => {
const d = getLogDate();
@@ -1013,9 +1123,8 @@
document.getElementById('log-it-btn').addEventListener('click', () => {
const label = document.getElementById('session-label').value.trim();
const dur = document.getElementById('session-dur').value;
- const pct = document.getElementById('session-pct').value;
if (!dur || dur < 1) return;
- addSession(label, dur, pct, getLogDate());
+ addSession(label, dur, logMode, getLogDate());
addModal.classList.remove('active');
});
diff --git a/versions.json b/versions.json
index 589a43a..2bf3fda 100644
--- a/versions.json
+++ b/versions.json
@@ -9,5 +9,6 @@
"1.0.7": "1.0.0",
"1.0.8": "1.0.0",
"1.0.9": "1.0.0",
- "1.0.10": "1.0.0"
+ "1.0.10": "1.0.0",
+ "1.1.0": "1.0.0"
}