ryan/chore
1
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects 5 Releases Wiki Activity

fix: improve date comparison for chore completion status
Some checks failed
Chore App Build, Test, and Push Docker Images / build-and-push (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Ryan Kegel
2026-04-29 14:17:40 -04:00
parent 6bf10fda2f
commit a2b464af7b
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
frontend/src/components/child/ChildView.vue
View File

@@ -224,9 +224,13 @@ const triggerTask = async (task: ChildTask) => {
function isChoreCompletedToday(item: ChildTask): boolean { function isChoreCompletedToday(item: ChildTask): boolean {
if (item.pending_status !== 'approved' || !item.approved_at) return false if (item.pending_status !== 'approved' || !item.approved_at) return false
const approvedDate = item.approved_at.substring(0, 10) const approvedDate = new Date(item.approved_at)
const today = new Date().toISOString().slice(0, 10) const today = new Date()
return approvedDate === today return (
approvedDate.getFullYear() === today.getFullYear() &&
approvedDate.getMonth() === today.getMonth() &&
approvedDate.getDate() === today.getDate()
)
} }
async function doConfirmChore() { async function doConfirmChore() {

9
frontend/src/components/child/ParentView.vue
View File

@@ -300,8 +300,13 @@ function handleChoreConfirmation(event: Event) {
function isChoreCompletedToday(item: ChildTask): boolean { function isChoreCompletedToday(item: ChildTask): boolean {
if (item.pending_status !== 'approved' || !item.approved_at) return false if (item.pending_status !== 'approved' || !item.approved_at) return false
const today = new Date().toISOString().slice(0, 10) const approvedDate = new Date(item.approved_at)
if (item.approved_at.slice(0, 10) !== today) return false const today = new Date()
const sameDay =
approvedDate.getFullYear() === today.getFullYear() &&
approvedDate.getMonth() === today.getMonth() &&
approvedDate.getDate() === today.getDate()
if (!sameDay) return false
// If the task has a schedule and today is not a scheduled day, don't show as completed // If the task has a schedule and today is not a scheduled day, don't show as completed
if (item.schedule && !isScheduledToday(item.schedule, new Date())) return false if (item.schedule && !isScheduledToday(item.schedule, new Date())) return false
return true return true