broodjeaap/pizzaplanner
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

removed 'Ingredient' entity, and removed 'method' from yaml shema

Browse source
This commit is contained in:
broodjeaap89 2021-07-13 20:50:44 +02:00
parent 592c6f8b7e
commit bdd09a9a3a
6 changed files with 75 additions and 101 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
assets/recipes/many_step_pizza.yaml
View file

@ -3,20 +3,18 @@ recipe:
description: >
A Neapolitan Style pizza with a multi day cold rise
ingredients:
method: ratio
items:
- name: flour
unit: g
value: 0.595
- name: water
unit: ml
value: 0.386
- name: salt
unit: g
value: 0.0178
- name: yeast
unit: g
value: 0.0012
- name: flour
unit: g
value: 0.595
- name: water
unit: ml
value: 0.386
- name: salt
unit: g
value: 0.0178
- name: yeast
unit: g
value: 0.0012
steps:
- name: Make the dough
wait:

26
assets/recipes/neapolitan_cold.yaml
View file

@ -3,20 +3,18 @@ recipe:
description: >
A Neapolitan Style pizza with a multi day cold rise
ingredients:
method: ratio
items:
- name: flour
unit: g
value: 0.595
- name: water
unit: ml
value: 0.386
- name: salt
unit: g
value: 0.0178
- name: yeast
unit: g
value: 0.0012
- name: flour
unit: g
value: 0.595
- name: water
unit: ml
value: 0.386
- name: salt
unit: g
value: 0.0178
- name: yeast
unit: g
value: 0.0012
steps:
- name: Make the dough
wait:

26
assets/recipes/neapolitan_quick.yaml
View file

@ -3,20 +3,18 @@ recipe:
description: >
A Neapolitan Style pizza prepared in a day
ingredients:
method: ratio
items:
- name: flour
unit: g
value: 0.595
- name: water
unit: ml
value: 0.386
- name: salt
unit: g
value: 0.0178
- name: yeast
unit: g
value: 0.0012
- name: flour
unit: g
value: 0.595
- name: water
unit: ml
value: 0.386
- name: salt
unit: g
value: 0.0178
- name: yeast
unit: g
value: 0.0012
steps:
- name: Make the dough
wait:

26
assets/recipes/new_york.yaml
View file

@ -3,20 +3,18 @@ recipe:
description: >
A Neapolitan Style pizza prepared in a day
ingredients:
method: ratio
items:
- name: flour
unit: g
value: 0.545
- name: water
unit: ml
value: 0.436
- name: salt
unit: g
value: 0.0178
- name: yeast
unit: g
value: 0.0012
- name: flour
unit: g
value: 0.545
- name: water
unit: ml
value: 0.436
- name: salt
unit: g
value: 0.0178
- name: yeast
unit: g
value: 0.0012
steps:
- name: Make the dough
wait:

33
lib/entities/PizzaRecipe/Ingredients.dart
View file

@ -1,33 +0,0 @@
import 'package:flutter/material.dart';
import 'package:pizzaplanner/entities/PizzaRecipe/Ingredient.dart';
class Ingredients {
final Map<String, Ingredient> ingredients;
final String method;
Ingredients(this.ingredients, this.method);
Table getIngredientsTable(int pizzaCount, int doughBallSize) {
return Table(
border: TableBorder.all(),
columnWidths: const <int, TableColumnWidth>{
0: FlexColumnWidth(2),
1: FlexColumnWidth(1),
2: FlexColumnWidth(2),
},
children: <TableRow>[
TableRow(
children: <TableCell>[
TableCell(child: Center(child: Text("Ingredient"))),
TableCell(child: Center(child: Text("Per Ball"))),
TableCell(child: Center(child: Text("Total"))),
]
)
] +
ingredients.values.map((ingredient) =>
ingredient.getIngredientTableRow(pizzaCount, doughBallSize))
.toList()
);
}
}

39
lib/entities/PizzaRecipe/PizzaRecipe.dart
View file

@ -11,14 +11,34 @@ import 'package:yaml/yaml.dart';
class PizzaRecipe {
final String name;
final String description;
final Ingredients ingredients;
final List<Ingredient> ingredients;
final List<RecipeStep> recipeSteps;
PizzaRecipe(this.name, this.description, this.ingredients, this.recipeSteps);
Widget getIngredientsTable(int pizzaCount, int doughBallSize){
return ingredients.getIngredientsTable(pizzaCount, doughBallSize);
Table getIngredientsTable(int pizzaCount, int doughBallSize) {
return Table(
border: TableBorder.all(),
columnWidths: const <int, TableColumnWidth>{
0: FlexColumnWidth(2),
1: FlexColumnWidth(1),
2: FlexColumnWidth(2),
},
children: <TableRow>[
TableRow(
children: <TableCell>[
TableCell(child: Center(child: Text("Ingredient"))),
TableCell(child: Center(child: Text("Per Ball"))),
TableCell(child: Center(child: Text("Total"))),
]
)
] +
ingredients.map((ingredient) =>
ingredient.getIngredientTableRow(pizzaCount, doughBallSize))
.toList()
);
}
static Future<PizzaRecipe> fromYaml(yamlPath) async{
@ -29,14 +49,9 @@ class PizzaRecipe {
String name = recipe["name"];
String description = recipe["description"];
YamlMap ingredientsBlock = recipe["ingredients"];
String ingredientMethod = ingredientsBlock["method"];
YamlList ingredients = ingredientsBlock["items"];
YamlList ingredients = recipe["ingredients"];;
var newIngredients = Map<String, Ingredient>.fromIterable(ingredients,
key: (ingredient) => ingredient["name"],
value: (ingredient) => Ingredient(ingredient["name"], ingredient["unit"], ingredient["value"])
);
List<Ingredient> newIngredients = ingredients.map((ingredient) => Ingredient(ingredient["name"], ingredient["unit"], ingredient["value"])).toList();
YamlList steps = recipe["steps"];
var newRecipeSteps = List.generate(steps.length, (i) {
@ -77,7 +92,7 @@ class PizzaRecipe {
return PizzaRecipe(
name,
description,
Ingredients(newIngredients, ingredientMethod),
newIngredients,
newRecipeSteps
);
}
@ -91,7 +106,7 @@ class PizzaRecipe {
}
String toString() {
return "PizzaRecipe(${this.name}, ${this.ingredients.ingredients.length}, ${this.recipeSteps.length})";
return "PizzaRecipe(${this.name}, ${this.ingredients.length}, ${this.recipeSteps.length})";
}
Table getStepTimeTable(DateTime startTime) {