diff --git a/e2e-sadaqah-tree.cjs b/e2e-sadaqah-tree.cjs new file mode 100644 index 0000000..ed9f9da --- /dev/null +++ b/e2e-sadaqah-tree.cjs @@ -0,0 +1,103 @@ +// Verifies the stickiness round: the Sadaqah tracker (log, streak, family +// privacy boundary), the Family Tree memorial-giving link, and the tree +// completeness hints feeding the Coverage Dashboard's recommendations engine. +const { chromium } = require('playwright'); +const { signInFreshFamily } = require('./e2e-auth-helper.cjs'); +const BASE = 'https://moslem04.falahos.my/'; +const results = []; +const consoleErrors = []; +function record(name, pass, detail = '') { results.push({ name, pass, detail }); console.log(`${pass ? 'PASS' : 'FAIL'} ${name}${detail ? ' — ' + detail : ''}`); } + +async function main() { + const browser = await chromium.launch(); + const page = await browser.newPage({ viewport: { width: 390, height: 844 } }); + page.on('console', m => { if (m.type() === 'error') consoleErrors.push(m.text()); }); + page.on('pageerror', e => consoleErrors.push(e.message)); + + await signInFreshFamily(page, BASE, 'e2e-sadaqah'); + + // ── Sadaqah tracker ── + await page.locator('nav button[aria-label="Sadaqah"]').click(); + await page.waitForTimeout(600); + + const zeroStreak = await page.locator('.streak-number').textContent(); + record('Sadaqah: starts at 0 streak', zeroStreak.trim() === '0', zeroStreak); + const notYetVisible = await page.locator('.streak-today', { hasText: 'Not yet logged today' }).isVisible().catch(() => false); + record('Sadaqah: shows "not yet logged today" before any entry', notYetVisible); + + await page.locator('.field:has-text("Cause") input').fill('Local mosque fund'); + await page.locator('.field:has-text("Amount") input').fill('20'); + await page.locator('button.btn-primary', { hasText: "Log today's sadaqah" }).click(); + await page.waitForTimeout(1200); + + const streakAfter = await page.locator('.streak-number').textContent(); + record('Sadaqah: logging today brings streak to 1', streakAfter.trim() === '1', streakAfter); + const givenToday = await page.locator('.streak-card.done').isVisible().catch(() => false); + record('Sadaqah: streak card shows "given today" state', givenToday); + + const historyRowVisible = await page.locator('.history-row', { hasText: 'Local mosque fund' }).isVisible().catch(() => false); + record('Sadaqah: entry appears in own history with amount', historyRowVisible); + + // ── Family Tree: add a deceased person, verify memorial link + dedication ── + await page.locator('nav button[aria-label="Tree"]').click(); + await page.waitForTimeout(600); + await page.locator('.form-card .field:has-text("Full name") input').fill('Grandfather Yusuf'); + await page.locator('.form-card .field:has-text("Death date") input').fill('2010-05-01'); + await page.locator('.form-card button.btn-primary', { hasText: 'Add person' }).click(); + await page.locator('.person-card', { hasText: 'Grandfather Yusuf' }).waitFor({ state: 'visible', timeout: 10000 }); + + await page.locator('.person-summary', { hasText: 'Grandfather Yusuf' }).click(); + await page.waitForTimeout(400); + const memorialButtonVisible = await page.locator('.person-card', { hasText: 'Grandfather Yusuf' }).locator('button', { hasText: 'Give sadaqah in memory of' }).isVisible().catch(() => false); + record('Tree: deceased person shows a "give sadaqah in memory" link', memorialButtonVisible); + + await page.locator('.person-card', { hasText: 'Grandfather Yusuf' }).locator('button', { hasText: 'Give sadaqah in memory of' }).click(); + await page.waitForTimeout(800); + const jumpedToSadaqah = await page.locator('nav button.tab.active[aria-label="Sadaqah"]').isVisible().catch(() => false); + record('Tree: memorial link navigates to the Sadaqah tab', jumpedToSadaqah); + + // Log a dedication and confirm the memorial count appears back on the Tree + await page.locator('.field:has-text("In memory of") select').selectOption({ label: 'Grandfather Yusuf' }); + await page.locator('.field:has-text("Cause") input').fill('In his memory'); + await page.locator('button.btn-primary', { hasText: "Log today's sadaqah" }).click(); + await page.waitForTimeout(1200); + + await page.locator('nav button[aria-label="Tree"]').click(); + await page.waitForTimeout(600); + await page.locator('.person-summary', { hasText: 'Grandfather Yusuf' }).click(); + await page.waitForTimeout(600); + const memorialCountVisible = await page.locator('.memorial-count', { hasText: 'sadaqah given in their memory' }).isVisible().catch(() => false); + record('Tree: memorial sadaqah count appears on the person card', memorialCountVisible); + + // ── Coverage Dashboard: tree completeness hints ── + // Add a second, incomplete person (no birth date, no photo, no relationship) to trigger hints. + await page.locator('.form-card .field:has-text("Full name") input').fill('Cousin Zaid'); + await page.locator('.form-card button.btn-primary', { hasText: 'Add person' }).click(); + await page.waitForTimeout(1000); + + await page.locator('nav button[aria-label="Coverage"]').click(); + await page.waitForTimeout(800); + const birthDateHint = await page.locator('.rec-row', { hasText: 'missing a birth date' }).isVisible().catch(() => false); + record('Coverage: recommendations flag people missing a birth date', birthDateHint); + const orphanHint = await page.locator('.rec-row', { hasText: 'no relationships linked' }).isVisible().catch(() => false); + record('Coverage: recommendations flag people with no relationships linked', orphanHint); + + // ── Isolation: a different family sees none of this ── + const isolationPage = await browser.newPage({ viewport: { width: 390, height: 844 } }); + await signInFreshFamily(isolationPage, BASE, 'e2e-sadaqah-isolation'); + await isolationPage.locator('nav button[aria-label="Sadaqah"]').click(); + await isolationPage.waitForTimeout(600); + const isolatedStreak = await isolationPage.locator('.streak-number').textContent(); + record('Isolation: a different family starts with a 0 streak, unaffected by the above', isolatedStreak.trim() === '0', isolatedStreak); + await isolationPage.close(); + + record('No uncaught JS console errors during full session', consoleErrors.length === 0, consoleErrors.join(' || ')); + + await browser.close(); + const passCount = results.filter(r => r.pass).length; + const failCount = results.length - passCount; + console.log(`\n${passCount} passed, ${failCount} failed, ${results.length} total`); + if (failCount > 0) results.filter(r => !r.pass).forEach(r => console.log(` - ${r.name}: ${r.detail}`)); + process.exit(failCount > 0 ? 1 : 0); +} +main().catch(e => { console.error('SCRIPT ERROR:', e); process.exit(2); }); diff --git a/src/App.svelte b/src/App.svelte index 86a5463..acc5062 100644 --- a/src/App.svelte +++ b/src/App.svelte @@ -13,6 +13,7 @@ import InfoPanel from './lib/InfoPanel.svelte'; import { session, authLoading, signOut } from './lib/auth.js'; import { activeFamilyId, listMyFamilies } from './lib/family.js'; + import { requestedTab } from './lib/nav.js'; import AuthScreen from './lib/AuthScreen.svelte'; import FamilySwitcher from './lib/FamilySwitcher.svelte'; import FamilyManagement from './lib/FamilyManagement.svelte'; @@ -21,6 +22,7 @@ import InsurancePolicies from './lib/InsurancePolicies.svelte'; import ZakatCalculator from './lib/ZakatCalculator.svelte'; import JurisdictionSetting from './lib/JurisdictionSetting.svelte'; + import SadaqahTracker from './lib/SadaqahTracker.svelte'; let currentLang = $state('en'); lang.subscribe(v => currentLang = v); @@ -44,9 +46,15 @@ } }); - const tabs = ['Coverage', 'Faraid', 'Assets', 'Insurance', 'Zakat', 'Wassiyah', 'Hibah', 'Family Waqf', 'Nominate', 'Trigger', 'Mutawalli', 'Tree', 'Claims (H2)', 'Family', 'Settings']; - const icons = ['🎯', '📊', '📁', '🛡️', '🌙', '📜', '🎁', '⛲', '📇', '⚡', '🕋', '🌳', '🔗', '👥', '⚙️']; + const tabs = ['Coverage', 'Faraid', 'Assets', 'Insurance', 'Zakat', 'Sadaqah', 'Wassiyah', 'Hibah', 'Family Waqf', 'Nominate', 'Trigger', 'Mutawalli', 'Tree', 'Claims (H2)', 'Family', 'Settings']; + const icons = ['🎯', '📊', '📁', '🛡️', '🌙', '🤲', '📜', '🎁', '⛲', '📇', '⚡', '🕋', '🌳', '🔗', '👥', '⚙️']; let activeTab = $state(0); + requestedTab.subscribe(name => { + if (!name) return; + const idx = tabs.indexOf(name); + if (idx >= 0) activeTab = idx; + requestedTab.set(null); + }); function handleKeydown(e) { if (e.key === 'ArrowRight') activeTab = (activeTab + 1) % tabs.length; @@ -104,16 +112,17 @@ {:else if activeTab === 2} {:else if activeTab === 3} {:else if activeTab === 4} - {:else if activeTab === 5} - {:else if activeTab === 6} - {:else if activeTab === 7} - {:else if activeTab === 8} - {:else if activeTab === 9} - {:else if activeTab === 10} - {:else if activeTab === 11} - {:else if activeTab === 12} - {:else if activeTab === 13} - {:else if activeTab === 14} + {:else if activeTab === 5} + {:else if activeTab === 6} + {:else if activeTab === 7} + {:else if activeTab === 8} + {:else if activeTab === 9} + {:else if activeTab === 10} + {:else if activeTab === 11} + {:else if activeTab === 12} + {:else if activeTab === 13} + {:else if activeTab === 14} + {:else if activeTab === 15}

Settings

diff --git a/src/lib/CoverageDashboard.svelte b/src/lib/CoverageDashboard.svelte index 9374983..6a99bec 100644 --- a/src/lib/CoverageDashboard.svelte +++ b/src/lib/CoverageDashboard.svelte @@ -10,7 +10,7 @@ import { listAssets, listHibahGifts, listNominations, listAllWaqfForFamily, listWassiyahBequests, listInsurancePolicies, listLiabilities, getZakatRecord, - getMemberTrigger, listMemberAttestors + getMemberTrigger, listMemberAttestors, listPeople, listRelationships } from './db.js'; import Disclaimer from './Disclaimer.svelte'; import InfoPanel from './InfoPanel.svelte'; @@ -25,10 +25,11 @@ async function refresh() { if (!familyId || !memberId) return; - const [assets, gifts, nominations, waqfDesignations, wassiyah, insurance, liabilities, zakat, members, trigger] = await Promise.all([ + const [assets, gifts, nominations, waqfDesignations, wassiyah, insurance, liabilities, zakat, members, trigger, people, relationships] = await Promise.all([ listAssets(familyId), listHibahGifts(familyId), listNominations(familyId), listAllWaqfForFamily(familyId), listWassiyahBequests(familyId, memberId), listInsurancePolicies(familyId, memberId), listLiabilities(familyId), - getZakatRecord(familyId, memberId), listFamilyMembers(familyId), getMemberTrigger(memberId, familyId) + getZakatRecord(familyId, memberId), listFamilyMembers(familyId), getMemberTrigger(memberId, familyId), + listPeople(familyId), listRelationships(familyId) ]); const waqfCorpusIds = waqfDesignations.map(w => w.corpus_asset_id).filter(Boolean); coverage = computeCoverage({ assets, gifts, nominations, waqfCorpusIds }); @@ -36,6 +37,7 @@ const attestors = trigger ? await listMemberAttestors(memberId, familyId) : []; const myWaqf = waqfDesignations.find(w => w.author_id === memberId); const hasCashOrGold = assets.some(a => a.type === 'Cash / Bank' || a.type === 'Jewelry / valuables'); + const linkedPersonIds = new Set(relationships.flatMap(r => [r.personAId, r.personBId])); recommendations = buildRecommendations({ exposedTotal: coverage.exposedTotal, @@ -49,7 +51,10 @@ unlinkedLiabilityCount: liabilities.filter(l => !l.linkedAssetId).length, confirmedAttestorCount: attestors.filter(a => a.confirmed).length, hasAgent: members.some(m => m.role === 'agent' && m.status === 'active'), - waqfConfigured: !!myWaqf + waqfConfigured: !!myWaqf, + missingBirthDateCount: people.filter(p => !p.birthDate).length, + missingPhotoCount: people.filter(p => !p.photoPath).length, + orphanPersonCount: people.filter(p => !linkedPersonIds.has(p.id)).length }); } diff --git a/src/lib/FamilyTree.svelte b/src/lib/FamilyTree.svelte index 2197001..dc2514e 100644 --- a/src/lib/FamilyTree.svelte +++ b/src/lib/FamilyTree.svelte @@ -9,8 +9,9 @@ import { listPeople, addPerson, updatePerson, removePerson, uploadPersonPhoto, removePersonPhoto, getPersonPhotoUrl, - listRelationships, addRelationship, removeRelationship + listRelationships, addRelationship, removeRelationship, getMemorialSadaqahCount } from './db.js'; + import { requestedTab } from './nav.js'; import InfoPanel from './InfoPanel.svelte'; import Disclaimer from './Disclaimer.svelte'; @@ -20,6 +21,7 @@ let people = $state([]); let relationships = $state([]); let photoUrls = $state({}); // personId -> signed url + let memorialCounts = $state({}); // personId -> count let error = $state(''); let form = $state({ fullName: '', gender: '', birthDate: '', deathDate: '', notes: '' }); @@ -39,6 +41,14 @@ people.filter(p => p.photoPath).map(async p => [p.id, await getPersonPhotoUrl(p.photoPath)]) ); photoUrls = Object.fromEntries(entries); + const memorialEntries = await Promise.all( + people.filter(p => p.deathDate).map(async p => [p.id, await getMemorialSadaqahCount(p.id)]) + ); + memorialCounts = Object.fromEntries(memorialEntries); + } + + function giveInMemory() { + requestedTab.set('Sadaqah'); } onMount(refresh); @@ -239,6 +249,14 @@ {#if expandedId === p.id}
{#if p.notes}

{p.notes}

{/if} + {#if p.deathDate} +
+ {#if memorialCounts[p.id] > 0} + {memorialCounts[p.id]} sadaqah given in their memory + {/if} + +
+ {/if}