|
@@ -8,7 +8,8 @@ extension AddCarbs {
|
|
|
@StateObject var state = StateModel()
|
|
@StateObject var state = StateModel()
|
|
|
@State var dish: String = ""
|
|
@State var dish: String = ""
|
|
|
@State var isPromtPresented = false
|
|
@State var isPromtPresented = false
|
|
|
- @State var saved = false
|
|
|
|
|
|
|
+ @State var noteSaved = false
|
|
|
|
|
+ @State var mealSaved = false
|
|
|
@State private var showAlert = false
|
|
@State private var showAlert = false
|
|
|
@FocusState private var isFocused: Bool
|
|
@FocusState private var isFocused: Bool
|
|
|
|
|
|
|
@@ -117,9 +118,12 @@ extension AddCarbs {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
Section {
|
|
Section {
|
|
|
- Button { state.add() }
|
|
|
|
|
|
|
+ Button {
|
|
|
|
|
+ mealSaved = true
|
|
|
|
|
+ state.add()
|
|
|
|
|
+ }
|
|
|
label: { Text("Save and continue").font(.title3) }
|
|
label: { Text("Save and continue").font(.title3) }
|
|
|
- .disabled(state.carbs <= 0 && state.fat <= 0 && state.protein <= 0)
|
|
|
|
|
|
|
+ .disabled(mealSaved || state.carbs <= 0 && state.fat <= 0 && state.protein <= 0)
|
|
|
.frame(maxWidth: .infinity, alignment: .center)
|
|
.frame(maxWidth: .infinity, alignment: .center)
|
|
|
} footer: { Text(state.waitersNotepad().description) }
|
|
} footer: { Text(state.waitersNotepad().description) }
|
|
|
|
|
|
|
@@ -138,8 +142,8 @@ extension AddCarbs {
|
|
|
Section {
|
|
Section {
|
|
|
TextField("Name Of Dish", text: $dish)
|
|
TextField("Name Of Dish", text: $dish)
|
|
|
Button {
|
|
Button {
|
|
|
- saved = true
|
|
|
|
|
- if dish != "", saved {
|
|
|
|
|
|
|
+ noteSaved = true
|
|
|
|
|
+ if dish != "", noteSaved {
|
|
|
let preset = Presets(context: moc)
|
|
let preset = Presets(context: moc)
|
|
|
preset.dish = dish
|
|
preset.dish = dish
|
|
|
preset.fat = state.fat as NSDecimalNumber
|
|
preset.fat = state.fat as NSDecimalNumber
|
|
@@ -147,14 +151,14 @@ extension AddCarbs {
|
|
|
preset.carbs = state.carbs as NSDecimalNumber
|
|
preset.carbs = state.carbs as NSDecimalNumber
|
|
|
try? moc.save()
|
|
try? moc.save()
|
|
|
state.addNewPresetToWaitersNotepad(dish)
|
|
state.addNewPresetToWaitersNotepad(dish)
|
|
|
- saved = false
|
|
|
|
|
|
|
+ noteSaved = false
|
|
|
isPromtPresented = false
|
|
isPromtPresented = false
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
label: { Text("Save") }
|
|
label: { Text("Save") }
|
|
|
Button {
|
|
Button {
|
|
|
dish = ""
|
|
dish = ""
|
|
|
- saved = false
|
|
|
|
|
|
|
+ noteSaved = false
|
|
|
isPromtPresented = false }
|
|
isPromtPresented = false }
|
|
|
label: { Text("Cancel") }
|
|
label: { Text("Cancel") }
|
|
|
} header: { Text("Enter Meal Preset Name") }
|
|
} header: { Text("Enter Meal Preset Name") }
|