Hasan/eatvio_app
1
0
Fork 0
forked from eatvio/eatvio_app
Code Pull Requests Activity

feat(diary): Diary ID is passed on calendar click, new layouts for calendar, fixed nutrition chart

Browse Source
This commit is contained in:
maxxkim
2024-08-02 18:08:28 +03:00
parent f3d099fe0c
commit 5d13358fbc
5 changed files with 230 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
lib/features/diary/presentation/bloc/diary_bloc.dart
View File

@@ -16,7 +16,8 @@ part 'diary_event.dart';
class DiaryBloc extends Bloc<DiaryEvent, DiaryState> {
final DiaryRepository diaryRepository;
DiaryBloc({required this.diaryRepository}) : super(const DiaryState.loading()) {
DiaryBloc({required this.diaryRepository})
: super(const DiaryState.loading()) {
on<LoadDiary>(loadDiary);
on<ChangeSatiety>(_changeSatiety); // пользователь нажимает на шкалу сытости
on<ChangeMood>(_changeMood); // пользователь нажимает на шкалу настроения
@@ -53,18 +54,33 @@ class DiaryBloc extends Bloc<DiaryEvent, DiaryState> {
final DiaryModel diary = await diaryRepository.getDiary(diaryID ?? 45);
final Meal currentMeal = diary.meals[0];
List<SelectionPopupModel> portionList = [SelectionPopupModel(title: "gr"), SelectionPopupModel(title: "pcs")];
List<SelectionPopupModel> portionList = [
SelectionPopupModel(title: "gr"),
SelectionPopupModel(title: "pcs")
];
final Map<String, dynamic> chartData = await diaryRepository.getChartData(diaryID ?? 45);
final Map<String, dynamic> dailyNutritionIntake = chartData['dailyNutritionIntake']!;
final Map<String, dynamic> dailyNutritionRecommendations = chartData['dailyNutritionRecommendation']!;
final double ccal = dailyNutritionIntake['energy']! / dailyNutritionRecommendations['energy']! * 50;
final double proteins = dailyNutritionIntake['proteins']! / dailyNutritionRecommendations['proteins']! * 50;
final double fats = dailyNutritionIntake['fats']! / dailyNutritionRecommendations['fats']! * 50;
final double carbs = dailyNutritionIntake['carbohydrates']! / dailyNutritionRecommendations['carbohydrates']! * 50;
final Map<String, dynamic> chartData =
await diaryRepository.getChartData(diaryID ?? 45);
print(chartData);
final Map<String, dynamic> dailyNutritionIntake =
chartData['dailyNutritionIntake']!;
final Map<String, dynamic> dailyNutritionRecommendations =
chartData['dailyNutritionRecommendation']!;
final double ccal = dailyNutritionIntake['energy']! /
dailyNutritionRecommendations['energy']! *
100;
final double proteins = dailyNutritionIntake['proteins']! /
dailyNutritionRecommendations['proteins']! *
100;
final double fats = dailyNutritionIntake['fats']! /
dailyNutritionRecommendations['fats']! *
100;
final double carbs = dailyNutritionIntake['carbohydrates']! /
dailyNutritionRecommendations['carbohydrates']! *
100;
Color getColor(double value) {
if (value >= 99.1) {
if (value >= 49.1) {
return Colors.red;
} else {
return Colors.blue;
@@ -86,7 +102,6 @@ class DiaryBloc extends Bloc<DiaryEvent, DiaryState> {
SelectionPopupModel(title: "Прием пищи 5", id: 5),
SelectionPopupModel(title: "Прием пищи 6", id: 6),
];
emit(DiaryState.loaded(
diary: diary,
currentMeal: currentMeal,
@@ -163,9 +178,11 @@ class DiaryBloc extends Bloc<DiaryEvent, DiaryState> {
) async {
if (state is DiaryStateLoaded) {
var currentState = state as DiaryStateLoaded;
var updatedState = currentState.copyWith(wakeupController: event.selectedTime);
var updatedState =
currentState.copyWith(wakeupController: event.selectedTime);
final DateFormat formatter = DateFormat('HH:mm');
final String wakeupString = formatter.format(DateTime(2022, 1, 1, event.selectedTime.hour, event.selectedTime.minute));
final String wakeupString = formatter.format(DateTime(
2022, 1, 1, event.selectedTime.hour, event.selectedTime.minute));
await diaryRepository.changeWakeup(
currentState.diary.id,
wakeupString,
@@ -180,9 +197,11 @@ class DiaryBloc extends Bloc<DiaryEvent, DiaryState> {
) async {
if (state is DiaryStateLoaded) {
var currentState = state as DiaryStateLoaded;
var updatedState = currentState.copyWith(retireController: event.selectedTime);
var updatedState =
currentState.copyWith(retireController: event.selectedTime);
final DateFormat formatter = DateFormat('HH:mm');
final String retireString = formatter.format(DateTime(2022, 1, 1, event.selectedTime.hour, event.selectedTime.minute));
final String retireString = formatter.format(DateTime(
2022, 1, 1, event.selectedTime.hour, event.selectedTime.minute));
await diaryRepository.changeRetire(
currentState.diary.id,
retireString,
@@ -208,7 +227,8 @@ class DiaryBloc extends Bloc<DiaryEvent, DiaryState> {
) async {
if (state is DiaryStateLoaded) {
final currentState = state as DiaryStateLoaded;
final Meal meal = currentState.diary.meals.firstWhere((meal) => meal.type == event.value.id);
final Meal meal = currentState.diary.meals
.firstWhere((meal) => meal.type == event.value.id);
DiaryStateLoaded updatedState = currentState.copyWith(
currentMeal: meal,
portions: meal.portions,
@@ -227,10 +247,12 @@ class DiaryBloc extends Bloc<DiaryEvent, DiaryState> {
if (state is DiaryStateLoaded) {
var currentState = state as DiaryStateLoaded;
final Map<String, List<Product>> productNutritionalValues = await diaryRepository.inputProduct(event.input);
final Map<String, List<Product>> productNutritionalValues =
await diaryRepository.inputProduct(event.input);
var updatedState = currentState.copyWith(
product_nameController: TextEditingController(text: event.input),
autocompleteList: productNutritionalValues['product_nutritional_value'] ?? [],
autocompleteList:
productNutritionalValues['product_nutritional_value'] ?? [],
);
if (event.input.length > 3) {
updatedState = updatedState.copyWith(moderationExpanded: true);

24
lib/features/diary/presentation/pages/diary_screen.dart
View File

@@ -23,7 +23,13 @@ import 'package:syncfusion_flutter_charts/charts.dart';
// ignore: must_be_immutable
class DiaryScreen extends StatelessWidget {
DiaryScreen({Key? key}) : super(key: key);
final String? diaryID;
const DiaryScreen({
this.diaryID,
super.key,
});
Widget build(BuildContext context) {
return BlocBuilder<DiaryBloc, DiaryState>(
builder: (context, state) {
@@ -141,7 +147,6 @@ class DiaryScreen extends StatelessWidget {
alignment: Alignment.centerRight,
widthFactor: 0.5,
child: SfCircularChart(
legend: Legend(isVisible: false),
series: <CircularSeries>[
RadialBarSeries<NutritionData, String>(
dataSource: state.chartData,
@@ -153,30 +158,29 @@ class DiaryScreen extends StatelessWidget {
),
),
)),
SizedBox(height: 16.0),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text('Калории'),
Text('Белки'),
Text('Жиры'),
Text('Углеводы'),
Text('Жиры'),
Text('Белки'),
Text('Калории'),
],
),
Column(
crossAxisAlignment: CrossAxisAlignment.end,
children: [
Text(
'${state.chartData![0].nutrition.toStringAsFixed(1)}'), // Калории
'${state.chartData![3].nutrition.toStringAsFixed(0)}%'), // Калории
Text(
'${state.chartData![1].nutrition.toStringAsFixed(1)}'), // Белки
'${state.chartData![2].nutrition.toStringAsFixed(0)}%'), // Белки
Text(
'${state.chartData![2].nutrition.toStringAsFixed(1)}'), // Жиры
'${state.chartData![1].nutrition.toStringAsFixed(0)}%'), // Жиры
Text(
'${state.chartData![3].nutrition.toStringAsFixed(1)}'), // Углеводы
'${state.chartData![0].nutrition.toStringAsFixed(0)}% '), // Углеводы
],
),
],