Merge branch 'develop' into sharing

This commit is contained in:
Trey t
2022-02-10 11:54:42 -06:00
11 changed files with 101 additions and 29 deletions

View File

@@ -86,8 +86,8 @@ class ContentModeViewModel: ObservableObject {
getGroupedData()
}
public func add(mood: Mood, forDate date: Date) {
PersistenceController.shared.add(mood: mood, forDate: date)
public func add(mood: Mood, forDate date: Date, entryType: EntryType) {
PersistenceController.shared.add(mood: mood, forDate: date, entryType: entryType)
getGroupedData()
}
@@ -108,7 +108,7 @@ class ContentModeViewModel: ObservableObject {
fatalError("Unresolved error \(nsError), \(nsError.userInfo)")
}
PersistenceController.shared.add(mood: mood, forDate: forDate)
PersistenceController.shared.add(mood: mood, forDate: forDate, entryType: .listView)
do {
try PersistenceController.shared.viewContext.save()
@@ -135,7 +135,7 @@ class ContentModeViewModel: ObservableObject {
entriesToDelete.forEach({ entry in
let entryDate = entry.forDate!
PersistenceController.shared.viewContext.delete(entry)
self.add(mood: .missing, forDate: entryDate)
self.add(mood: .missing, forDate: entryDate, entryType: .listView)
})
}

View File

@@ -7,6 +7,11 @@
import Foundation
enum EntryType: Int {
case notification
case header
case listView
}
extension MoodEntry {
var moodString: String {