- {dx < 0 &&
Done ✓
}
- {dx > 0 &&
⏰ Snooze +7d
}
+ {dx < 0 &&
Complete ✓
}
+ {dx > 0 &&
⏰ Snooze
}
-
- {r.title}
- {r.status !== 'open' && {r.status}}
-
+
{r.title}
- {r.investor_name ? {r.investor_name} · : null}
- {formatDueShort(r.due_date)}
- {r.assignee_name ? · {r.assignee_name} : null}
+ {r.investor_name ? {r.investor_name} : null}
+
{r.details ?
{r.details}
: null}
@@ -4929,27 +5008,31 @@
);
};
- // Mobile Reminders: an urgency-grouped tickler over /api/reminders. Reuses the desktop
- // endpoints + snooze semantics (snooze = keep status open, push due_date +7d, since the
- // 'snoozed' status has no wake mechanism — see DesktopRemindersPage). Investor linkage is
- // grid-only (the create field is a free-text label; PATCH can't change it), matching desktop.
+ // Mobile Reminders: an urgency-bucketed tickler over /api/reminders. Snooze keeps status
+ // 'open' and just pushes due_date (the 'snoozed' status has no wake mechanism — see
+ // DesktopRemindersPage); the snooze preset sheet offers +1/+3/+7/+14d. Create links a real
+ // investor via the canonical grid picker (source_row_id → server-resolved investor_id);
+ // PATCH still can't reassign the investor, so the edit sheet shows it read-only.
const MobileReminders = ({ token, user, onShowToast }) => {
const [items, setItems] = useState([]);
const [loading, setLoading] = useState(true);
const [error, setError] = useState('');
- const [statusFilter, setStatusFilter] = useState('active'); // 'active' | 'done' | 'all'
+ const [completedOpen, setCompletedOpen] = useState(false);
const [users, setUsers] = useState([]);
const [editing, setEditing] = useState(null); // null | reminder | { create:true }
- const [form, setForm] = useState({ title: '', due_date: '', details: '', investor_name: '', assignee_id: '', status: 'open' });
+ const [form, setForm] = useState({ title: '', due_date: '', details: '', investor_name: '', investor_source_row_id: '', assignee_id: '', status: 'open' });
const [busy, setBusy] = useState(false);
+ const [snoozing, setSnoozing] = useState(null); // reminder being snoozed → preset sheet
+ const [investorPicker, setInvestorPicker] = useState(false);
+ const [investorQuery, setInvestorQuery] = useState('');
+ const [investors, setInvestors] = useState(null); // null = not loaded yet; [] = loaded/empty
+ // Load every reminder (no status param → all statuses) and split client-side: active
+ // (open/snoozed) into the four urgency buckets, terminal (done/cancelled) into Completed.
const load = useCallback(async (silent) => {
if (!silent) setLoading(true);
try {
- const params = new URLSearchParams();
- if (statusFilter === 'active') params.set('status', 'active');
- else if (statusFilter === 'done') params.set('status', 'done');
- const res = await api(`/api/reminders?${params.toString()}`, {}, token);
+ const res = await api('/api/reminders', {}, token);
setItems(Array.isArray(res?.data) ? res.data : []);
setError('');
} catch (err) {
@@ -4957,7 +5040,7 @@
} finally {
if (!silent) setLoading(false);
}
- }, [token, statusFilter]);
+ }, [token]);
useEffect(() => { load(); }, [load]);
useEffect(() => {
@@ -4969,42 +5052,76 @@
return () => { cancelled = true; };
}, [token]);
+ const active = useMemo(() => items.filter((r) => r.status === 'open' || r.status === 'snoozed'), [items]);
+ const completed = useMemo(() => items.filter((r) => r.status === 'done' || r.status === 'cancelled'), [items]);
const groups = useMemo(() => {
const out = {};
REMINDER_BUCKETS.forEach((b) => { out[b.key] = []; });
- items.forEach((r) => { const k = reminderBucket(r); (out[k] || out.later).push(r); });
+ active.forEach((r) => { const k = reminderBucket(r); (out[k] || out.later).push(r); });
return out;
- }, [items]);
+ }, [active]);
+ const { summary, summaryColor } = useMemo(() => {
+ if (active.length === 0) return { summary: 'All clear', summaryColor: 'var(--money)' };
+ const overdue = active.filter((r) => { const d = reminderDueDelta(r.due_date); return d != null && d < 0; }).length;
+ const today = active.filter((r) => reminderDueDelta(r.due_date) === 0).length;
+ return {
+ summary: `${overdue} overdue · ${today} today · ${active.length} open`,
+ summaryColor: overdue ? 'var(--danger-soft)' : 'var(--text-subtle)',
+ };
+ }, [active]);
- const markDone = async (r) => {
- setItems((xs) => xs.filter((x) => x.id !== r.id)); // optimistic: drop from the active list
+ // Optimistically move the row to its new status (so it leaves the active list / lands in
+ // Completed immediately), then PATCH and reconcile with a silent reload.
+ const setStatus = async (r, patch, toastMsg) => {
+ setItems((xs) => xs.map((x) => (x.id === r.id ? { ...x, ...patch } : x)));
try {
- await api(`/api/reminders/${r.id}`, { method: 'PATCH', body: JSON.stringify({ status: 'done' }) }, token);
- onShowToast('Marked done', 'success');
+ await api(`/api/reminders/${r.id}`, { method: 'PATCH', body: JSON.stringify(patch) }, token);
+ onShowToast(toastMsg, 'success');
await load(true);
} catch (err) { onShowToast(getErrorMessage(err, 'Update failed'), 'error'); await load(true); }
};
- const snooze = async (r) => {
- const d = new Date(Date.now() + 7 * 864e5).toISOString().slice(0, 10);
+ const markDone = (r) => setStatus(r, { status: 'done' }, 'Marked done');
+ const reopen = (r) => setStatus(r, { status: 'open' }, 'Reopened');
+ const snooze = (r) => setSnoozing(r); // swipe-right → preset sheet (dc :286)
+ const snoozeTo = (r, iso) => { setSnoozing(null); setStatus(r, { status: 'open', due_date: iso }, 'Snoozed to ' + reminderMonthDay(iso)); };
+
+ // Investor picker (add flow): list the canonical grid investors (row id = source_row_id,
+ // resolved server-side to a real investor_id on create). Loaded once, lazily, on first open.
+ const ensureInvestors = useCallback(async () => {
+ if (investors) return;
try {
- await api(`/api/reminders/${r.id}`, { method: 'PATCH', body: JSON.stringify({ status: 'open', due_date: d }) }, token);
- onShowToast('Snoozed 7 days', 'success');
- await load(true);
- } catch (err) { onShowToast(getErrorMessage(err, 'Update failed'), 'error'); await load(true); }
+ const res = await api('/api/fundraising/state', {}, token);
+ const grid = (res && res.data && res.data.grid) || {};
+ const list = (Array.isArray(grid.rows) ? grid.rows : [])
+ .filter((row) => row && row.id && String(row.investor_name || '').trim())
+ .map((row) => ({ id: row.id, name: String(row.investor_name).trim() }))
+ .sort((a, b) => a.name.localeCompare(b.name));
+ setInvestors(list);
+ } catch (_) { setInvestors([]); }
+ }, [investors, token]);
+ const openInvestorPicker = () => { setInvestorQuery(''); setInvestorPicker(true); ensureInvestors(); };
+ const pickInvestor = (inv) => {
+ setForm((f) => ({ ...f, investor_source_row_id: inv ? inv.id : '', investor_name: inv ? inv.name : '' }));
+ setInvestorPicker(false);
};
+ const filteredInvestors = useMemo(() => {
+ const q = investorQuery.trim().toLowerCase();
+ const list = investors || [];
+ return q ? list.filter((i) => i.name.toLowerCase().includes(q)) : list;
+ }, [investors, investorQuery]);
const openCreate = () => {
- setForm({ title: '', due_date: '', details: '', investor_name: '', assignee_id: '', status: 'open' });
+ setForm({ title: '', due_date: '', details: '', investor_name: '', investor_source_row_id: '', assignee_id: '', status: 'open' });
setEditing({ create: true });
};
const openEdit = (r) => {
setForm({
title: r.title || '', due_date: (r.due_date || '').slice(0, 10), details: r.details || '',
- investor_name: r.investor_name || '', assignee_id: r.assignee_id || '', status: r.status || 'open',
+ investor_name: r.investor_name || '', investor_source_row_id: '', assignee_id: r.assignee_id || '', status: r.status || 'open',
});
setEditing(r);
};
- const closeSheet = () => setEditing(null);
+ const closeSheet = () => { setEditing(null); setInvestorPicker(false); }; // also drop a stacked picker
const submit = async () => {
const title = (form.title || '').trim();
@@ -5012,9 +5129,11 @@
setBusy(true);
try {
if (editing && editing.create) {
+ // source_row_id (a grid row id) → backend resolves it to the canonical
+ // investor_id + name; blank = a team task (no investor linkage).
await api('/api/reminders', { method: 'POST', body: JSON.stringify({
title, due_date: form.due_date || '', details: form.details || '',
- investor_name: form.investor_name || '', assignee_id: form.assignee_id || '',
+ source_row_id: form.investor_source_row_id || '', assignee_id: form.assignee_id || '',
}) }, token);
onShowToast('Reminder created', 'success');
} else {
@@ -5044,42 +5163,63 @@
const isCreate = !!(editing && editing.create);
+ const activeBuckets = REMINDER_BUCKETS.filter((b) => groups[b.key].length);
+
return (
-
-
-
- {[['active', 'Active'], ['done', 'Done'], ['all', 'All']].map(([k, label]) => (
-
- ))}
-
-
+
+
+ Reminders
+ {summary}
+
{loading ? (
) : error ? (
{error}
- ) : items.length === 0 ? (
-
{statusFilter === 'done' ? 'No completed reminders' : 'No reminders — tap “+ New” to add one.'}
) : (
- REMINDER_BUCKETS.filter((b) => groups[b.key].length).map((b) => (
-
-
- {b.label}
{groups[b.key].length}
+ <>
+ {activeBuckets.length === 0 && (
+
{completed.length ? 'Inbox zero — no open reminders.' : 'No reminders — tap + to add one.'}
+ )}
+ {activeBuckets.map((b) => (
+
+
+
+ {b.label}{groups[b.key].length}
+
+ {groups[b.key].map((r) => (
+
openEdit(r)}
+ onDone={() => markDone(r)}
+ onSnooze={() => snooze(r)}
+ />
+ ))}
- {groups[b.key].map((r) => (
-
openEdit(r)}
- onDone={() => markDone(r)}
- onSnooze={() => snooze(r)}
- />
- ))}
-
- ))
+ ))}
+ {completed.length > 0 && (
+
+
+ {completedOpen && completed.map((r) => (
+
+
+
+
+ ))}
+
+ )}
+
)}
@@ -5094,7 +5234,12 @@
{isCreate ? (
- setForm((f) => ({ ...f, investor_name: e.target.value }))} placeholder="Name label, or blank for a team task" />
+
) : (form.investor_name ? (
Investor{form.investor_name}
@@ -5126,6 +5271,46 @@
{!isCreate && }
+
+ {/* Investor picker — stacked over the add sheet (dc add-flow :416-428). Selecting
+ sets a canonical grid row id; "team task" clears it. */}
+
setInvestorPicker(false)} title="Choose investor" stacked>
+ setInvestorQuery(e.target.value)} placeholder="Search investor…" autoFocus />
+
+
+ {investors == null ? (
+
Loading investors…
+ ) : filteredInvestors.length ? filteredInvestors.map((i) => (
+
+ )) : (
+
No matches.
+ )}
+
+
+ {/* Snooze preset sheet — opened on swipe-right (dc snooze sheet :404-414). */}
+
setSnoozing(null)} title="Snooze reminder">
+ {snoozing && (
+ <>
+ {snoozing.investor_name && For {snoozing.investor_name}
}
+
+
+ {reminderSnoozePresets().map(([label, iso]) => (
+
+ ))}
+
+
+ )}
+
);
};