From 821a26e6813852d405aa534115f77b4c1592f63d Mon Sep 17 00:00:00 2001 From: mohamad Date: Fri, 23 May 2025 21:01:37 +0200 Subject: [PATCH] feat: Add Recurrence Pattern and Update Expense Schema - Introduced a new `RecurrencePattern` model to manage recurrence details for expenses, allowing for daily, weekly, monthly, and yearly patterns. - Updated the `Expense` model to include fields for recurrence management, such as `is_recurring`, `recurrence_pattern_id`, and `next_occurrence`. - Modified the database schema to reflect these changes, including alterations to existing columns and the removal of obsolete fields. - Enhanced the expense creation logic to accommodate recurring expenses and updated related CRUD operations accordingly. - Implemented necessary migrations to ensure database integrity and support for the new features. --- fe/package-lock.json | 9 ++++++++- fe/src/pages/ChoresPage.vue | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/fe/package-lock.json b/fe/package-lock.json index 8f39760..24d4659 100644 --- a/fe/package-lock.json +++ b/fe/package-lock.json @@ -4405,6 +4405,13 @@ "dev": true, "license": "MIT" }, + "node_modules/@types/date-fns": { + "version": "2.5.3", + "resolved": "https://registry.npmjs.org/@types/date-fns/-/date-fns-2.5.3.tgz", + "integrity": "sha512-4KVPD3g5RjSgZtdOjvI/TDFkLNUHhdoWxmierdQbDeEg17Rov0hbBYtIzNaQA67ORpteOhvR9YEMTb6xeDCang==", + "dev": true, + "license": "MIT" + }, "node_modules/@types/aria-query": { "version": "5.0.4", "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-5.0.4.tgz", @@ -13859,4 +13866,4 @@ } } } -} +} \ No newline at end of file diff --git a/fe/src/pages/ChoresPage.vue b/fe/src/pages/ChoresPage.vue index c4603db..27114e4 100644 --- a/fe/src/pages/ChoresPage.vue +++ b/fe/src/pages/ChoresPage.vue @@ -304,8 +304,8 @@ import { choreService } from '../services/choreService' // Assuming choreService import { useNotificationStore } from '../stores/notifications' import type { Chore as OriginalChore, ChoreCreate as OriginalChoreCreate, ChoreUpdate, ChoreFrequency } from '../types/chore' // Assuming these types exist import { useRoute } from 'vue-router' -import { groupService } from '../services/groupService' // Assuming groupService exists import { useStorage } from '@vueuse/core' +import { groupService } from '@/services/groupService' // Extend Chore type to include completion status interface Chore extends OriginalChore {