amy/donetick-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'dev'

Browse source
This commit is contained in:
Mo Tarbin 2024-07-18 18:06:38 -04:00
commit dff0ae504a
1 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/views/ChoreEdit/RepeatSection.jsx
View file

@ -116,6 +116,7 @@ const RepeatOnSections = ({
onClick={() => { onClick={() => {
setIntervalUnit(item) setIntervalUnit(item)
onFrequencyMetadataUpdate({ onFrequencyMetadataUpdate({
...frequencyMetadata,
unit: item, unit: item,
}) })
}} }}
@ -167,6 +168,7 @@ const RepeatOnSections = ({
} }
onFrequencyMetadataUpdate({ onFrequencyMetadataUpdate({
...frequencyMetadata,
days: newDaysOfTheWeek.sort(), days: newDaysOfTheWeek.sort(),
}) })
}} }}
@ -247,6 +249,7 @@ const RepeatOnSections = ({
} }
onFrequencyMetadataUpdate({ onFrequencyMetadataUpdate({
...frequencyMetadata,
months: newMonthsOfTheYear.sort(), months: newMonthsOfTheYear.sort(),
}) })
console.log('newMonthsOfTheYear', newMonthsOfTheYear) console.log('newMonthsOfTheYear', newMonthsOfTheYear)
@ -363,7 +366,15 @@ const RepeatSection = ({
onFrequencyUpdate(1) onFrequencyUpdate(1)
onFrequencyMetadataUpdate({ onFrequencyMetadataUpdate({
unit: 'days', unit: 'days',
time: frequencyMetadata?.time
? frequencyMetadata?.time
: moment(
moment(new Date()).format('YYYY-MM-DD') +
'T' +
'18:00',
).format(),
}) })
return return
} }
onFrequencyTypeUpdate(item) onFrequencyTypeUpdate(item)
@ -419,11 +430,20 @@ const RepeatSection = ({
} }
onFrequencyTypeUpdate(item) onFrequencyTypeUpdate(item)
if (item === 'days_of_the_week') { if (item === 'days_of_the_week') {
onFrequencyMetadataUpdate({ days: [] }) onFrequencyMetadataUpdate({
...frequencyMetadata,
days: [],
})
} else if (item === 'day_of_the_month') { } else if (item === 'day_of_the_month') {
onFrequencyMetadataUpdate({ months: [] }) onFrequencyMetadataUpdate({
...frequencyMetadata,
months: [],
})
} else if (item === 'interval') { } else if (item === 'interval') {
onFrequencyMetadataUpdate({ unit: 'days' }) onFrequencyMetadataUpdate({
...frequencyMetadata,
unit: 'days',
})
} }
// setRepeatOn(item) // setRepeatOn(item)
}} }}