formatting and snackbar

This commit is contained in:
2025-11-26 23:19:29 -05:00
parent 290bed8198
commit c7faed0597

View File

@@ -45,16 +45,16 @@ def builder(page):
def create_ingredient_row(self, ingredient, details):
row = []
row.append(ft.TextField(label="Ingredient", value=ingredient, on_change=self.update_ingredient))
row.append(ft.TextField(label="Quantity", value=details['quantity'], on_change=self.update_quantity))
row.append(ft.TextField(label="Units (optional)", value=details['units'], on_change=self.update_units))
row.append(ft.TextField(label="Ingredient", value=ingredient, on_change=self.update_ingredient, width=300))
row.append(ft.TextField(label="Quantity", value=details['quantity'], on_change=self.update_quantity, width=200))
row.append(ft.TextField(label="Units (optional)", value=details['units'], on_change=self.update_units, width=200))
return row
def create_new_ingredient_row(self):
row = []
row.append(ft.TextField(label="Ingredient", value=""))
row.append(ft.TextField(label="Quantity", value=""))
row.append(ft.TextField(label="Units (optional)", value=""))
row.append(ft.TextField(label="Ingredient", value="", width=300))
row.append(ft.TextField(label="Quantity", value="", width=200))
row.append(ft.TextField(label="Units (optional)", value="", width=200))
return row
def update_ingredients(self, name):
@@ -78,26 +78,32 @@ def builder(page):
def show_new_meal(self):
self.new_meal = {}
selector_body.controls = [
ft.TextField(label="Meal", value="", autofocus=True),
ft.TextField(label="Meal", value="", autofocus=True, width=720),
ft.ListView(controls=[ft.Row(self.create_new_ingredient_row(),
alignment=ft.MainAxisAlignment.SPACE_EVENLY,
width=300,
height=100,
alignment=ft.MainAxisAlignment.START,
)],
expand=True,
spacing=5,
padding=5,
auto_scroll=False,
),
ft.ElevatedButton(text="Add Ingredient", on_click=lambda e: self.append_new_ingredient_row(selector_body)),
ft.ElevatedButton(text="Add Meal", on_click=lambda e: self.add_new_meal(selector_body)),
ft.ElevatedButton(text="Back", on_click=lambda e: self.show_meal_selection(selector_body, page))
ft.Row(controls=[
ft.ElevatedButton(text="Add Ingredient", on_click=lambda e: self.append_new_ingredient_row(selector_body)),
ft.ElevatedButton(text="Add Meal", on_click=lambda e: self.add_new_meal(selector_body)),
ft.ElevatedButton(text="Back", on_click=lambda e: self.show_meal_selection(selector_body, page))
]
)
]
page.title = "Add New Meal"
page.update()
def append_new_ingredient_row(self, selector_body):
# Don't add a new row if the last one is blank
if selector_body.controls[1].controls[-1].controls[0].value == "" or \
selector_body.controls[1].controls[-1].controls[1].value == "":
page.open(ft.SnackBar(ft.Text("Please fill in the current ingredient before adding a new one.")))
return
selector_body.controls[1].controls.append(ft.Row(self.create_new_ingredient_row(),
alignment=ft.MainAxisAlignment.SPACE_EVENLY,
width=300,
@@ -108,6 +114,12 @@ def builder(page):
def add_new_meal(self, selector_body):
meal = selector_body.controls[0].value
ing, qua, uni = [], [], []
if meal == "" or \
selector_body.controls[1].controls.controls[0].value == "" or \
selector_body.controls[1].controls.controls[1].value == "":
page.open(ft.SnackBar(ft.Text("Please fill out the meal information.")))
return
for row in selector_body.controls[1].controls:
#skip blank row
@@ -127,6 +139,10 @@ def builder(page):
def show_meal_details(self, selector_body, page):
expanded_meal = []
if (selector_body.controls[0].controls[0].value == None):
page.open(ft.SnackBar(ft.Text("Please select a meal to update.")))
return
meal_name = selector_body.controls[0].controls[0].value
@@ -134,8 +150,6 @@ def builder(page):
expanded_meal.append(
ft.Row(self.create_ingredient_row(details[0], details[1]),
alignment=ft.MainAxisAlignment.SPACE_EVENLY,
width=300,
height=100,
)
)
@@ -144,13 +158,16 @@ def builder(page):
ft.ListView(
controls=expanded_meal,
expand=True,
spacing=5,
padding=5,
spacing=10,
padding=10,
auto_scroll=False,
),
ft.ElevatedButton(text="Update Meal", on_click=lambda e: self.update_ingredients(selector_body.controls[0].value)),
ft.ElevatedButton(text="Back", on_click=lambda e: self.show_meal_selection(selector_body, page)),
]
ft.Row(controls=[
ft.ElevatedButton(text="Save Changes", on_click=lambda e: self.update_ingredients(selector_body.controls[0].value)),
ft.ElevatedButton(text="Back", on_click=lambda e: self.show_meal_selection(selector_body, page)),
]
)
]
if page.title == "Create and Edit Meals!":
page.title = f"Editing {meal_name}"
page.update()
@@ -164,14 +181,18 @@ def builder(page):
self.get_meal_radios_group(),
],
expand=True,
spacing=5,
padding=5,
spacing=10,
padding=10,
auto_scroll=False,
),
ft.ElevatedButton(text="Update Meal",
ft.Row(
controls=[
ft.ElevatedButton(text="Update Meal",
on_click=lambda e: self.show_meal_details(selector_body, page)),
ft.ElevatedButton(text="Add Meal", on_click=lambda e: self.show_new_meal())
]
ft.ElevatedButton(text="Add Meal", on_click=lambda e: self.show_new_meal())
]
)
]
if page.title != "Create and Edit Meals!":
page.title = f"Create and Edit Meals!"
@@ -186,7 +207,7 @@ def builder(page):
selector_body = ft.Column(
controls = [],
height = 500,
height = 700,
expand = False,
)