From 5ee86ddc9200d5e19504bb3cff6fd9826025ffda Mon Sep 17 00:00:00 2001 From: misha Date: Fri, 3 Oct 2025 15:40:05 +0300 Subject: [PATCH] feat(diary): fixed wrong cpfc loading after changing a portion --- ...otlin-compiler-10039299475187077818.salive | 0 .../presentation/pages/diary_screen.dart | 4 +- .../widgets/add_product_modal.dart | 34 +++--- ...ssary_moderation_request_modal_widget.dart | 115 +++++------------- .../diary/repositories/diary_repository.dart | 2 +- 5 files changed, 53 insertions(+), 102 deletions(-) delete mode 100644 android/.kotlin/sessions/kotlin-compiler-10039299475187077818.salive diff --git a/android/.kotlin/sessions/kotlin-compiler-10039299475187077818.salive b/android/.kotlin/sessions/kotlin-compiler-10039299475187077818.salive deleted file mode 100644 index e69de29b..00000000 diff --git a/lib/features/diary/presentation/pages/diary_screen.dart b/lib/features/diary/presentation/pages/diary_screen.dart index 6b636857..ae6f9e10 100644 --- a/lib/features/diary/presentation/pages/diary_screen.dart +++ b/lib/features/diary/presentation/pages/diary_screen.dart @@ -62,7 +62,9 @@ class DiaryScreenContent extends StatelessWidget { log(state.diary.id.toString()); } if (state is DiaryStateError) { - return Scaffold(body: DataErrorWidget(onReload: () => context.read().fetchDiaryV2(needLoading: false, diaryId: diaryId))); + return Scaffold( + body: DataErrorWidget(onReload: () => context.read().fetchDiaryV2(needLoading: false, diaryId: diaryId)), + ); } return Scaffold( diff --git a/lib/features/diary/presentation/widgets/add_product_modal.dart b/lib/features/diary/presentation/widgets/add_product_modal.dart index 9b6c2536..4b0a3806 100644 --- a/lib/features/diary/presentation/widgets/add_product_modal.dart +++ b/lib/features/diary/presentation/widgets/add_product_modal.dart @@ -25,26 +25,30 @@ class _AddProductModalState extends State { final quantityController = TextEditingController(); GlossaryModel? selectedGlossary; List glossariesList = []; - + late final String? _previousProductName; @override void initState() { super.initState(); if (widget.portion != null) { + _previousProductName = widget.portion!.productName; productNameController.text = widget.portion!.productName; quantityController.text = '${widget.portion!.quantity}'; - selectedGlossary = GlossaryModel( - id: widget.portion!.id, - name: widget.portion!.productName, - grInPortion: widget.portion!.portion == 'gr' ? 0 : 1, - energyOn100Gr: 0, - proteinsOn100Gr: 0, - fatsOn100Gr: 0, - carbohydratesOn100Gr: 0, - energyOnPortion: 0, - proteinsOnPortion: 0, - fatsOnPortion: 0, - carbohydratesOnPortion: 0, - ); + final productNutritionalValueId = widget.portion?.productNutritionalValueId; + if (productNutritionalValueId != null) { + selectedGlossary = GlossaryModel( + id: productNutritionalValueId, + name: widget.portion!.productName, + grInPortion: widget.portion!.portion == 'gr' ? 0 : 1, + energyOn100Gr: 0, + proteinsOn100Gr: 0, + fatsOn100Gr: 0, + carbohydratesOn100Gr: 0, + energyOnPortion: 0, + proteinsOnPortion: 0, + fatsOnPortion: 0, + carbohydratesOnPortion: 0, + ); + } } } @@ -191,7 +195,7 @@ class _AddProductModalState extends State { ); } Navigator.of(context).pop(); - if (selectedGlossary == null) { + if (selectedGlossary == null && _previousProductName != productNameController.text) { showModalBottomSheet( isScrollControlled: true, useRootNavigator: true, diff --git a/lib/features/diary/presentation/widgets/glossary_moderation_request_modal_widget.dart b/lib/features/diary/presentation/widgets/glossary_moderation_request_modal_widget.dart index 69b316a7..c9359cd9 100644 --- a/lib/features/diary/presentation/widgets/glossary_moderation_request_modal_widget.dart +++ b/lib/features/diary/presentation/widgets/glossary_moderation_request_modal_widget.dart @@ -9,11 +9,7 @@ class GlossaryModerationRequestModalWidget extends StatefulWidget { final DiaryCubit diaryCubit; final String productName; - const GlossaryModerationRequestModalWidget({ - super.key, - required this.productName, - required this.diaryCubit, - }); + const GlossaryModerationRequestModalWidget({super.key, required this.productName, required this.diaryCubit}); @override State createState() => _GlossaryModerationRequestModalWidgetState(); @@ -55,21 +51,13 @@ class _GlossaryModerationRequestModalWidgetState extends State data = ProductInMeal(productName: productName, portion: portion, quantity: quantity).toJson(); - data['product_nutritional_value_id'] = productNutritionalValueId; + if (productNutritionalValueId != null) data['product_nutritional_value_id'] = productNutritionalValueId; data['state'] = portionState.name; return await diaryService.updateProductInMeal(diary: diaryId, typeNo: mealId, portionModel: portionId, productInMeal: data); }