completed refactor of how completed steps are tracked, no longer by just substeps
This commit is contained in:
parent
319251c87e
commit
3026bc0bfa
4 changed files with 111 additions and 43 deletions
|
@ -1,5 +1,6 @@
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:hive/hive.dart';
|
import 'package:hive/hive.dart';
|
||||||
|
import 'package:pizzaplanner/pages/PizzaEventPage.dart';
|
||||||
import 'package:pizzaplanner/util.dart';
|
import 'package:pizzaplanner/util.dart';
|
||||||
|
|
||||||
import 'package:pizzaplanner/entities/PizzaRecipe/Ingredient.dart';
|
import 'package:pizzaplanner/entities/PizzaRecipe/Ingredient.dart';
|
||||||
|
@ -60,6 +61,12 @@ class PizzaRecipe extends HiveObject {
|
||||||
return stepCount;
|
return stepCount;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Widget getPizzaEventRecipeWidget(PizzaEventPageState pizzaEventPage) {
|
||||||
|
return ListView(
|
||||||
|
children: this.recipeSteps.map((recipeStep) => recipeStep.buildPizzaEventRecipeStepWidget(pizzaEventPage)).toList()
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
static Future<PizzaRecipe> fromYaml(yamlPath) async{
|
static Future<PizzaRecipe> fromYaml(yamlPath) async{
|
||||||
String yamlString = await loadAsset(yamlPath);
|
String yamlString = await loadAsset(yamlPath);
|
||||||
var yaml = loadYaml(yamlString);
|
var yaml = loadYaml(yamlString);
|
||||||
|
|
|
@ -1,5 +1,8 @@
|
||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:fluttericon/font_awesome5_icons.dart';
|
||||||
import 'package:hive/hive.dart';
|
import 'package:hive/hive.dart';
|
||||||
import 'package:pizzaplanner/entities/PizzaRecipe/RecipeSubStep.dart';
|
import 'package:pizzaplanner/entities/PizzaRecipe/RecipeSubStep.dart';
|
||||||
|
import 'package:pizzaplanner/pages/PizzaEventPage.dart';
|
||||||
|
|
||||||
part 'RecipeStep.g.dart';
|
part 'RecipeStep.g.dart';
|
||||||
|
|
||||||
|
@ -29,12 +32,83 @@ class RecipeStep extends HiveObject {
|
||||||
@HiveField(7)
|
@HiveField(7)
|
||||||
List<RecipeSubStep> subSteps;
|
List<RecipeSubStep> subSteps;
|
||||||
|
|
||||||
bool get completed => subSteps.every((subStep) => subStep.completed);
|
@HiveField(8)
|
||||||
|
DateTime? completedOn;
|
||||||
|
|
||||||
|
bool get completed => _completed();
|
||||||
|
|
||||||
RecipeStep(this.name, this.description, this.waitDescription, this.waitUnit, this.waitMin, this.waitMax, this.subSteps) {
|
RecipeStep(this.name, this.description, this.waitDescription, this.waitUnit, this.waitMin, this.waitMax, this.subSteps) {
|
||||||
waitValue = waitMin;
|
waitValue = waitMin;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool _completed(){
|
||||||
|
return subSteps.length > 0 ?
|
||||||
|
subSteps.every((subStep) => subStep.completed) :
|
||||||
|
completedOn != null;
|
||||||
|
}
|
||||||
|
|
||||||
|
Widget buildPizzaEventRecipeStepWidget(PizzaEventPageState pizzaEventPage){
|
||||||
|
return this.subSteps.length > 0 ?
|
||||||
|
buildPizzaEventRecipeStepWidgetWithSubSteps(pizzaEventPage) :
|
||||||
|
buildPizzaEventRecipeStepWidgetWithoutSubSteps(pizzaEventPage);
|
||||||
|
}
|
||||||
|
|
||||||
|
Widget buildPizzaEventRecipeStepWidgetWithSubSteps(PizzaEventPageState pizzaEventPage) {
|
||||||
|
int recipeSubStepsCompleted = this.subSteps.where((subStep) => subStep.completed).length;
|
||||||
|
int recipeSubSteps = this.subSteps.length;
|
||||||
|
return ExpansionTile(
|
||||||
|
title: Row(
|
||||||
|
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||||
|
children: <Widget>[
|
||||||
|
Icon(FontAwesome5.sitemap),
|
||||||
|
Text(this.name),
|
||||||
|
Text("$recipeSubStepsCompleted/$recipeSubSteps")
|
||||||
|
],
|
||||||
|
),
|
||||||
|
children: <Widget>[
|
||||||
|
Text(this.description),
|
||||||
|
|
||||||
|
] + subSteps.map((subStep) => subStep.buildPizzaEventSubStepWidget(pizzaEventPage)).toList()
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
Widget buildPizzaEventRecipeStepWidgetWithoutSubSteps(PizzaEventPageState pizzaEventPage) {
|
||||||
|
return ExpansionTile(
|
||||||
|
title: Row(
|
||||||
|
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||||
|
children: <Widget>[
|
||||||
|
Icon(FontAwesome5.sitemap),
|
||||||
|
Text(this.name),
|
||||||
|
Text("${this.completedOn == null ? 0 : 1}/1")
|
||||||
|
],
|
||||||
|
),
|
||||||
|
children: <Widget>[
|
||||||
|
Text(this.description),
|
||||||
|
Row(
|
||||||
|
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||||
|
children: [
|
||||||
|
Text(this.name),
|
||||||
|
Checkbox(
|
||||||
|
value: this.completedOn != null,
|
||||||
|
onChanged: (bool? newValue) async {
|
||||||
|
if (newValue == null){
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (newValue){
|
||||||
|
this.completedOn = DateTime.now();
|
||||||
|
} else {
|
||||||
|
this.completedOn = null;
|
||||||
|
}
|
||||||
|
await pizzaEventPage.widget.pizzaEvent.save();
|
||||||
|
pizzaEventPage.triggerSetState();
|
||||||
|
},
|
||||||
|
)
|
||||||
|
],
|
||||||
|
)
|
||||||
|
]
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
int convertToSeconds(int value){
|
int convertToSeconds(int value){
|
||||||
switch (waitUnit){
|
switch (waitUnit){
|
||||||
case "minutes": {
|
case "minutes": {
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
|
|
||||||
|
import 'package:flutter/material.dart';
|
||||||
import 'package:hive/hive.dart';
|
import 'package:hive/hive.dart';
|
||||||
|
import 'package:pizzaplanner/pages/PizzaEventPage.dart';
|
||||||
|
|
||||||
part 'RecipeSubStep.g.dart';
|
part 'RecipeSubStep.g.dart';
|
||||||
|
|
||||||
|
@ -17,4 +19,28 @@ class RecipeSubStep extends HiveObject {
|
||||||
bool get completed => completedOn != null;
|
bool get completed => completedOn != null;
|
||||||
|
|
||||||
RecipeSubStep(this.name, this.description);
|
RecipeSubStep(this.name, this.description);
|
||||||
|
|
||||||
|
Widget buildPizzaEventSubStepWidget(PizzaEventPageState pizzaEventPage) {
|
||||||
|
return Row(
|
||||||
|
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||||
|
children: [
|
||||||
|
Text(this.name),
|
||||||
|
Checkbox(
|
||||||
|
value: this.completed,
|
||||||
|
onChanged: (bool? newValue) async {
|
||||||
|
if (newValue == null){
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (newValue){
|
||||||
|
this.completedOn = DateTime.now();
|
||||||
|
} else {
|
||||||
|
this.completedOn = null;
|
||||||
|
}
|
||||||
|
await pizzaEventPage.widget.pizzaEvent.save();
|
||||||
|
pizzaEventPage.triggerSetState();
|
||||||
|
},
|
||||||
|
)
|
||||||
|
],
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
|
@ -21,49 +21,10 @@ class PizzaEventPageState extends State<PizzaEventPage> {
|
||||||
resizeToAvoidBottomInset: false,
|
resizeToAvoidBottomInset: false,
|
||||||
body: Container(
|
body: Container(
|
||||||
padding: EdgeInsets.all(10),
|
padding: EdgeInsets.all(10),
|
||||||
child: ListView(
|
child: this.widget.pizzaEvent.recipe.getPizzaEventRecipeWidget(this)
|
||||||
children: this.widget.pizzaEvent.recipe.recipeSteps.map((recipeStep) {
|
|
||||||
int recipeSubStepsCompleted = recipeStep.subSteps.where((subStep) => subStep.completed).length;
|
|
||||||
int recipeSubSteps = recipeStep.subSteps.length != 0 ? recipeStep.subSteps.length : 1;
|
|
||||||
return ExpansionTile(
|
|
||||||
title: Row(
|
|
||||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
|
||||||
children: <Widget>[
|
|
||||||
Icon(FontAwesome5.sitemap),
|
|
||||||
Text(recipeStep.name),
|
|
||||||
Text("$recipeSubStepsCompleted/$recipeSubSteps")
|
|
||||||
],
|
|
||||||
),
|
|
||||||
children: <Widget>[
|
|
||||||
Text(recipeStep.description),
|
|
||||||
|
|
||||||
] + recipeStep.subSteps.map((subStep) {
|
|
||||||
return Row(
|
|
||||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
|
||||||
children: [
|
|
||||||
Text(subStep.name),
|
|
||||||
Checkbox(
|
|
||||||
value: subStep.completed,
|
|
||||||
onChanged: (bool? newValue) async {
|
|
||||||
if (newValue == null){
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (newValue){
|
|
||||||
subStep.completedOn = DateTime.now();
|
|
||||||
} else {
|
|
||||||
subStep.completedOn = null;
|
|
||||||
}
|
|
||||||
await this.widget.pizzaEvent.save();
|
|
||||||
setState(() {});
|
|
||||||
},
|
|
||||||
)
|
|
||||||
],
|
|
||||||
);
|
|
||||||
}).toList(),
|
|
||||||
);
|
|
||||||
}).toList(),
|
|
||||||
)
|
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
triggerSetState() => setState(() {});
|
||||||
}
|
}
|
Loading…
Add table
Reference in a new issue