Merge
This commit is contained in:
parent
015aeba0c2
commit
90dba7b399
1 changed files with 2 additions and 2 deletions
|
@ -24,14 +24,14 @@ func scheduleNextDueDate(chore *chModel.Chore, completedDate time.Time) (*time.T
|
||||||
return nil, nil
|
return nil, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
if chore.NextDueDate != nil && !chore.IsRolling {
|
if chore.NextDueDate != nil {
|
||||||
// no due date set, use the current date
|
// no due date set, use the current date
|
||||||
baseDate = chore.NextDueDate.UTC()
|
baseDate = chore.NextDueDate.UTC()
|
||||||
} else {
|
} else {
|
||||||
baseDate = completedDate.UTC()
|
baseDate = completedDate.UTC()
|
||||||
}
|
}
|
||||||
|
|
||||||
if !chore.IsRolling && (chore.FrequencyType == "day_of_the_month" || chore.FrequencyType == "days_of_the_week" || chore.FrequencyType == "interval") {
|
if chore.FrequencyType == "day_of_the_month" || chore.FrequencyType == "days_of_the_week" || chore.FrequencyType == "interval" {
|
||||||
// time in frequency metadata stored as RFC3339 format like `2024-07-07T13:27:00-04:00`
|
// time in frequency metadata stored as RFC3339 format like `2024-07-07T13:27:00-04:00`
|
||||||
// parse it to time.Time:
|
// parse it to time.Time:
|
||||||
t, err := time.Parse(time.RFC3339, frequencyMetadata.Time)
|
t, err := time.Parse(time.RFC3339, frequencyMetadata.Time)
|
||||||
|
|
Loading…
Add table
Reference in a new issue