From c3d0fbaf06a9346edbc79fc5e94fd6db36b09ba9 Mon Sep 17 00:00:00 2001 From: Mo Tarbin Date: Mon, 24 Mar 2025 01:27:31 -0400 Subject: [PATCH] Refactor frequency handling in ChoreEdit and RepeatSection; add points display in ChoreCard --- src/views/ChoreEdit/ChoreEdit.jsx | 6 ------ src/views/ChoreEdit/RepeatSection.jsx | 13 ++++++------- src/views/Chores/ChoreCard.jsx | 16 ++++++++++++++++ src/views/Chores/MyChores.jsx | 1 - 4 files changed, 22 insertions(+), 14 deletions(-) diff --git a/src/views/ChoreEdit/ChoreEdit.jsx b/src/views/ChoreEdit/ChoreEdit.jsx index 8b93b44..76d65d9 100644 --- a/src/views/ChoreEdit/ChoreEdit.jsx +++ b/src/views/ChoreEdit/ChoreEdit.jsx @@ -528,12 +528,6 @@ const ChoreEdit = () => { onFrequencyTypeUpdate={setFrequencyType} frequencyMetadata={frequencyMetadata} onFrequencyMetadataUpdate={setFrequencyMetadata} - onFrequencyTimeUpdate={t => { - setFrequencyMetadata({ - ...frequencyMetadata, - time: t, - }) - }} frequencyError={errors?.frequency} allUserThings={allUserThings} onTriggerUpdate={thingUpdate => { diff --git a/src/views/ChoreEdit/RepeatSection.jsx b/src/views/ChoreEdit/RepeatSection.jsx index f8cfb72..4b08626 100644 --- a/src/views/ChoreEdit/RepeatSection.jsx +++ b/src/views/ChoreEdit/RepeatSection.jsx @@ -68,7 +68,6 @@ const RepeatOnSections = ({ onFrequencyTypeUpdate, frequencyMetadata, onFrequencyMetadataUpdate, - onFrequencyTimeUpdate, things, }) => { const [months, setMonths] = useState({}) @@ -88,12 +87,13 @@ const RepeatOnSections = ({ : '18:00' } onChange={e => { - // create new today date with selected time with Timezone: - onFrequencyTimeUpdate( - moment( + onFrequencyMetadataUpdate({ + ...frequencyMetadata, + timezone: Intl.DateTimeFormat().resolvedOptions().timeZone, + time: moment( moment(new Date()).format('YYYY-MM-DD') + 'T' + e.target.value, ).format(), - ) + }) }} /> @@ -331,7 +331,6 @@ const RepeatSection = ({ onFrequencyTypeUpdate, frequencyMetadata, onFrequencyMetadataUpdate, - onFrequencyTimeUpdate, frequencyError, allUserThings, onTriggerUpdate, @@ -398,6 +397,7 @@ const RepeatSection = ({ 'T' + '18:00', ).format(), + timezone: moment.tz.guess(), }) return @@ -520,7 +520,6 @@ const RepeatSection = ({ onFrequencyTypeUpdate={onFrequencyTypeUpdate} frequencyMetadata={frequencyMetadata || {}} onFrequencyMetadataUpdate={onFrequencyMetadataUpdate} - onFrequencyTimeUpdate={onFrequencyTimeUpdate} things={allUserThings} /> diff --git a/src/views/Chores/ChoreCard.jsx b/src/views/Chores/ChoreCard.jsx index 32d54c5..d269cd0 100644 --- a/src/views/Chores/ChoreCard.jsx +++ b/src/views/Chores/ChoreCard.jsx @@ -19,6 +19,7 @@ import { Report, SwitchAccessShortcut, TimesOneMobiledata, + Toll, Unarchive, Update, ViewCarousel, @@ -527,6 +528,21 @@ const ChoreCard = ({ P{chore.priority} )} + {/* show points chip if there is points assigned */} + {chore.points > 0 && ( + } + > + {chore.points} + + )} {chore.labelsV2?.map((l, index) => { return (
{ if (section.content.length === 0) return null return (