wger-project/flutter
1
0
Fork 0
mirror of https://github.com/wger-project/flutter.git synced 2026-02-18 00:17:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #377 from DeveloperMalay/secondery_graph

Browse Source 
creating a secondary graph for energy value
This commit is contained in:
Roland Geider
2023-04-22 12:33:12 +02:00
committed by GitHub
parent 858641db4a b431d4f100
commit 5035140d75
2 changed files with 218 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

269
lib/widgets/nutrition/charts.dart
View File

@@ -175,6 +175,207 @@ class NutritionalPlanHatchBarChartWidget extends StatelessWidget {
return Container();
}
return Column(
children: [
Container(
padding: const EdgeInsets.all(15),
height: 220,
child: charts.BarChart(
[
charts.Series<NutritionData, String>(
id: 'Planned',
domainFn: (nutritionEntry, index) => nutritionEntry.name,
measureFn: (nutritionEntry, index) => nutritionEntry.value,
data: [
NutritionData(
AppLocalizations.of(context).energy, _nutritionalPlan.nutritionalValues.energy),
],
),
charts.Series<NutritionData, String>(
id: 'Logged',
domainFn: (nutritionEntry, index) => nutritionEntry.name,
measureFn: (nutritionEntry, index) => nutritionEntry.value,
fillPatternFn: (nutritionEntry, index) => charts.FillPatternType.forwardHatch,
data: [
NutritionData(AppLocalizations.of(context).energy, loggedNutritionalValues.energy),
],
),
charts.Series<NutritionData, String>(
id: 'Avg',
domainFn: (nutritionEntry, index) => nutritionEntry.name,
measureFn: (nutritionEntry, index) => nutritionEntry.value,
data: [
NutritionData(AppLocalizations.of(context).energy, sevenDayAvg.energy),
],
),
],
animate: true,
domainAxis: const charts.OrdinalAxisSpec(
///labelRotation was added to rotate text of X Axis. Without that,
///titles would overlap each other
renderSpec: charts.SmallTickRendererSpec(labelRotation: 60),
),
barGroupingType: charts.BarGroupingType.grouped,
defaultRenderer: charts.BarRendererConfig(
groupingType: charts.BarGroupingType.grouped, strokeWidthPx: 0.0, maxBarWidthPx: 8),
primaryMeasureAxis: const charts.NumericAxisSpec(
tickProviderSpec: charts.BasicNumericTickProviderSpec(desiredTickCount: 5),
),
),
),
Container( padding: const EdgeInsets.all(15),
height: 300,
child: charts.BarChart(
[
charts.Series<NutritionData, String>(
id: 'Planned',
domainFn: (nutritionEntry, index) => nutritionEntry.name,
measureFn: (nutritionEntry, index) => nutritionEntry.value,
data: [
// NutritionData(
// AppLocalizations.of(context).energy,
// _nutritionalPlan.nutritionalValues.energy,
// ),
NutritionData(
AppLocalizations.of(context).protein,
_nutritionalPlan.nutritionalValues.protein,
),
NutritionData(
AppLocalizations.of(context).carbohydrates,
_nutritionalPlan.nutritionalValues.carbohydrates,
),
NutritionData(
AppLocalizations.of(context).sugars,
_nutritionalPlan.nutritionalValues.carbohydratesSugar,
),
NutritionData(
AppLocalizations.of(context).fat,
_nutritionalPlan.nutritionalValues.fat,
),
NutritionData(
AppLocalizations.of(context).saturatedFat,
_nutritionalPlan.nutritionalValues.fatSaturated,
),
NutritionData(
AppLocalizations.of(context).fibres,
_nutritionalPlan.nutritionalValues.fibres,
),
NutritionData(
AppLocalizations.of(context).sodium,
_nutritionalPlan.nutritionalValues.sodium,
),
],
),
charts.Series<NutritionData, String>(
id: 'Logged',
domainFn: (nutritionEntry, index) => nutritionEntry.name,
measureFn: (nutritionEntry, index) => nutritionEntry.value,
fillPatternFn: (nutritionEntry, index) => charts.FillPatternType.forwardHatch,
data: [
// NutritionData(
// AppLocalizations.of(context).energy,
// loggedNutritionalValues.energy
// ),
NutritionData(
AppLocalizations.of(context).protein, loggedNutritionalValues.protein),
NutritionData(AppLocalizations.of(context).carbohydrates,
loggedNutritionalValues.carbohydrates),
NutritionData(AppLocalizations.of(context).sugars,
loggedNutritionalValues.carbohydratesSugar),
NutritionData(AppLocalizations.of(context).fat, loggedNutritionalValues.fat),
NutritionData(AppLocalizations.of(context).saturatedFat,
loggedNutritionalValues.fatSaturated),
NutritionData(AppLocalizations.of(context).fibres, loggedNutritionalValues.fibres),
NutritionData(AppLocalizations.of(context).sodium, loggedNutritionalValues.sodium),
],
),
charts.Series<NutritionData, String>(
id: 'Avg',
domainFn: (nutritionEntry, index) => nutritionEntry.name,
measureFn: (nutritionEntry, index) => nutritionEntry.value,
data: [
// NutritionData(AppLocalizations.of(context).energy, sevenDayAvg.energy),
NutritionData(AppLocalizations.of(context).protein, sevenDayAvg.protein),
NutritionData(
AppLocalizations.of(context).carbohydrates, sevenDayAvg.carbohydrates),
NutritionData(AppLocalizations.of(context).sugars, sevenDayAvg.carbohydratesSugar),
NutritionData(AppLocalizations.of(context).fat, sevenDayAvg.fat),
NutritionData(AppLocalizations.of(context).saturatedFat, sevenDayAvg.fatSaturated),
NutritionData(AppLocalizations.of(context).fibres, sevenDayAvg.fibres),
NutritionData(AppLocalizations.of(context).sodium, sevenDayAvg.sodium),
],
),
],
animate: true,
domainAxis: const charts.OrdinalAxisSpec(
///labelRotation was added to rotate text of X Axis. Without that,
///titles would overlap each other
renderSpec: charts.SmallTickRendererSpec(labelRotation: 60),
),
barGroupingType: charts.BarGroupingType.grouped,
primaryMeasureAxis: const charts.NumericAxisSpec(
tickProviderSpec: charts.BasicNumericTickProviderSpec(
desiredTickCount: 5,
),
),
),
),
],
);
}
}
//creating a seperate chart for energy as the energy value and other nutrient's value is not compatable to show in one graph
class EnergyChart extends StatelessWidget {
const EnergyChart({Key? key, required this.nutritionalPlan}) : super(key: key);
final NutritionalPlan nutritionalPlan;
NutritionalValues nutritionalValuesFromPlanLogsSevenDayAvg() {
NutritionalValues sevenDaysAvg = NutritionalValues();
int count = 0;
final now = DateTime.now();
final today = DateTime(now.year, now.month, now.day);
nutritionalPlan.logEntriesValues.forEach((key, value) {
if (key.difference(today).inDays >= -7) {
sevenDaysAvg += value;
count++;
}
});
if (count != 0) {
sevenDaysAvg.energy = sevenDaysAvg.energy / count;
sevenDaysAvg.protein = sevenDaysAvg.protein / count;
sevenDaysAvg.carbohydrates = sevenDaysAvg.carbohydrates / count;
sevenDaysAvg.carbohydratesSugar = sevenDaysAvg.carbohydratesSugar / count;
sevenDaysAvg.fat = sevenDaysAvg.fat / count;
sevenDaysAvg.fatSaturated = sevenDaysAvg.fatSaturated / count;
sevenDaysAvg.fibres = sevenDaysAvg.fibres / count;
sevenDaysAvg.sodium = sevenDaysAvg.sodium / count;
}
return sevenDaysAvg;
}
NutritionalValues nutritionalValuesFromPlanLogsToday() {
final now = DateTime.now();
final today = DateTime(now.year, now.month, now.day);
return nutritionalPlan.logEntriesValues[nutritionalPlan.logEntriesValues.keys
.firstWhereOrNull((d) => d.difference(today).inDays == 0)] ??
NutritionalValues();
}
@override
Widget build(BuildContext context) {
final NutritionalValues loggedNutritionalValues = nutritionalValuesFromPlanLogsToday();
final NutritionalValues sevenDayAvg = nutritionalValuesFromPlanLogsSevenDayAvg();
if (nutritionalPlan.nutritionalValues.energy == 0) {
return Container();
}
return charts.BarChart(
[
charts.Series<NutritionData, String>(
@@ -182,39 +383,9 @@ class NutritionalPlanHatchBarChartWidget extends StatelessWidget {
domainFn: (nutritionEntry, index) => nutritionEntry.name,
measureFn: (nutritionEntry, index) => nutritionEntry.value,
data: [
/*
NutritionData(
AppLocalizations.of(context).energy,
_nutritionalPlan.nutritionalValues.energy,
),
*/
NutritionData(
AppLocalizations.of(context).protein,
_nutritionalPlan.nutritionalValues.protein,
),
NutritionData(
AppLocalizations.of(context).carbohydrates,
_nutritionalPlan.nutritionalValues.carbohydrates,
),
NutritionData(
AppLocalizations.of(context).sugars,
_nutritionalPlan.nutritionalValues.carbohydratesSugar,
),
NutritionData(
AppLocalizations.of(context).fat,
_nutritionalPlan.nutritionalValues.fat,
),
NutritionData(
AppLocalizations.of(context).saturatedFat,
_nutritionalPlan.nutritionalValues.fatSaturated,
),
NutritionData(
AppLocalizations.of(context).fibres,
_nutritionalPlan.nutritionalValues.fibres,
),
NutritionData(
AppLocalizations.of(context).sodium,
_nutritionalPlan.nutritionalValues.sodium,
nutritionalPlan.nutritionalValues.energy,
),
],
),
@@ -224,22 +395,7 @@ class NutritionalPlanHatchBarChartWidget extends StatelessWidget {
measureFn: (nutritionEntry, index) => nutritionEntry.value,
fillPatternFn: (nutritionEntry, index) => charts.FillPatternType.forwardHatch,
data: [
/*
NutritionData(
AppLocalizations.of(context).energy,
loggedNutritionalValues.energy
),
*/
NutritionData(AppLocalizations.of(context).protein, loggedNutritionalValues.protein),
NutritionData(
AppLocalizations.of(context).carbohydrates, loggedNutritionalValues.carbohydrates),
NutritionData(
AppLocalizations.of(context).sugars, loggedNutritionalValues.carbohydratesSugar),
NutritionData(AppLocalizations.of(context).fat, loggedNutritionalValues.fat),
NutritionData(
AppLocalizations.of(context).saturatedFat, loggedNutritionalValues.fatSaturated),
NutritionData(AppLocalizations.of(context).fibres, loggedNutritionalValues.fibres),
NutritionData(AppLocalizations.of(context).sodium, loggedNutritionalValues.sodium),
NutritionData(AppLocalizations.of(context).energy, loggedNutritionalValues.energy),
],
),
charts.Series<NutritionData, String>(
@@ -247,19 +403,7 @@ class NutritionalPlanHatchBarChartWidget extends StatelessWidget {
domainFn: (nutritionEntry, index) => nutritionEntry.name,
measureFn: (nutritionEntry, index) => nutritionEntry.value,
data: [
/*
NutritionData(
AppLocalizations.of(context).energy,
sevenDayAvg.energy
),
*/
NutritionData(AppLocalizations.of(context).protein, sevenDayAvg.protein),
NutritionData(AppLocalizations.of(context).carbohydrates, sevenDayAvg.carbohydrates),
NutritionData(AppLocalizations.of(context).sugars, sevenDayAvg.carbohydratesSugar),
NutritionData(AppLocalizations.of(context).fat, sevenDayAvg.fat),
NutritionData(AppLocalizations.of(context).saturatedFat, sevenDayAvg.fatSaturated),
NutritionData(AppLocalizations.of(context).fibres, sevenDayAvg.fibres),
NutritionData(AppLocalizations.of(context).sodium, sevenDayAvg.sodium),
NutritionData(AppLocalizations.of(context).energy, sevenDayAvg.energy),
],
),
],
@@ -270,6 +414,11 @@ class NutritionalPlanHatchBarChartWidget extends StatelessWidget {
renderSpec: charts.SmallTickRendererSpec(labelRotation: 60),
),
barGroupingType: charts.BarGroupingType.grouped,
defaultRenderer: charts.BarRendererConfig(
groupingType: charts.BarGroupingType.grouped, strokeWidthPx: 0.0, maxBarWidthPx: 8),
primaryMeasureAxis: const charts.NumericAxisSpec(
tickProviderSpec: charts.BasicNumericTickProviderSpec(desiredTickCount: 5),
),
);
}
}

16
lib/widgets/nutrition/nutritional_plan_detail.dart
View File

@@ -70,7 +70,7 @@ class NutritionalPlanDetailWidget extends StatelessWidget {
Container(
padding: const EdgeInsets.all(15),
height: 220,
child: NutritionalPlanPieChartWidget(nutritionalValues),
child: NutritionalPlanPieChartWidget(nutritionalValues), // chart
),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 10),
@@ -210,11 +210,13 @@ class NutritionalPlanDetailWidget extends StatelessWidget {
textAlign: TextAlign.center,
style: Theme.of(context).textTheme.headline6,
),
Container(
padding: const EdgeInsets.all(15),
height: 300,
child: NutritionalPlanHatchBarChartWidget(_nutritionalPlan),
),
NutritionalPlanHatchBarChartWidget(_nutritionalPlan),
// Container(
// padding: const EdgeInsets.all(15),
// height: 300,
// child: NutritionalPlanHatchBarChartWidget(_nutritionalPlan), // chart
// ),
const Padding(padding: EdgeInsets.all(8.0)),
Text(
AppLocalizations.of(context).nutritionalDiary,
@@ -224,7 +226,7 @@ class NutritionalPlanDetailWidget extends StatelessWidget {
Container(
padding: const EdgeInsets.all(15),
height: 220,
child: NutritionalDiaryChartWidget(nutritionalPlan: _nutritionalPlan),
child: NutritionalDiaryChartWidget(nutritionalPlan: _nutritionalPlan), // chart
),
SizedBox(
height: 200,