From 118130fbcc65a7c1ffbb79585ca09da25d45ac04 Mon Sep 17 00:00:00 2001
From: maxxkim <maxxkim@ya.ru>
Date: Mon, 18 Mar 2024 17:38:48 +0300
Subject: [PATCH] feat(diary): New way of portion send

---
 .../bloc/diary_edit_bloc.dart                 | 11 +++++--
 .../diary_edit_screen/diary_edit_screen.dart  | 32 ++++++++++---------
 2 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/lib/presentation/diary/diary_edit_screen/bloc/diary_edit_bloc.dart b/lib/presentation/diary/diary_edit_screen/bloc/diary_edit_bloc.dart
index 7f627529..8ad6b1bd 100644
--- a/lib/presentation/diary/diary_edit_screen/bloc/diary_edit_bloc.dart
+++ b/lib/presentation/diary/diary_edit_screen/bloc/diary_edit_bloc.dart
@@ -527,10 +527,15 @@ class DiaryEditBloc extends Bloc<DiaryEditEvent, DiaryEditState> {
     TimeOfDay? retire,
     String? comment,
   ) async {
+    final formatter = DateFormat('HH:mm');
+    final wakeupString =
+        formatter.format(DateTime(2022, 1, 1, wakeup!.hour, wakeup.minute));
+    final retireString =
+        formatter.format(DateTime(2022, 1, 1, retire!.hour, retire.minute));
     final Map<String, dynamic> credentials = {
-      'wakeup': wakeup,
-      'retire': retire,
-      'comment': comment,
+      'wakeup': wakeupString,
+      'retire': retireString,
+      'comment': comment ?? " ",
     };
     String url = dotenv.env['SERVER_ROOT']! + '/diary/$diaryID/finishDay';
     var response = await http.post(Uri.parse(url),
diff --git a/lib/presentation/diary/diary_edit_screen/diary_edit_screen.dart b/lib/presentation/diary/diary_edit_screen/diary_edit_screen.dart
index 21ab9325..6b5892bd 100644
--- a/lib/presentation/diary/diary_edit_screen/diary_edit_screen.dart
+++ b/lib/presentation/diary/diary_edit_screen/diary_edit_screen.dart
@@ -482,15 +482,15 @@ class DiaryEditScreen extends StatelessWidget {
         mainAxisSize: MainAxisSize.min,
         children: [
           Padding(
-            padding: EdgeInsets.only(
-              left: 7.h,
-              top: 5.v,
-            ),
-            child: Text(
-              portion['product_name'],
-              style: CustomTextStyles.titleMedium16,
-            ),
-          ),
+              padding: EdgeInsets.only(
+                left: 7.h,
+                top: 5.v,
+              ),
+              child: Text(
+                portion['product_name']
+                    .substring(0, 8), // Обрезаем название до 8 символов
+                style: CustomTextStyles.titleMedium16,
+              )),
           Padding(
             padding: EdgeInsets.only(
               left: 20.h,
@@ -901,13 +901,14 @@ class DiaryEditScreen extends StatelessWidget {
       decoration: BoxDecoration(
         color: Colors.transparent,
       ),
-      onPressed: () => onFinishDayPressed(context),
+      onPressed: onFinishDayPressed(context),
       // Установите прозрачный фон
     );
   }
 
-  Function onFinishDayPressed(BuildContext context) {
+  Function() onFinishDayPressed(BuildContext context) {
     return () {
+      print("sad");
       showDialog(
         context: context,
         builder: (BuildContext dialogContext) {
@@ -917,11 +918,11 @@ class DiaryEditScreen extends StatelessWidget {
             actions: <Widget>[
               TextButton(
                 child: Text("Отмена"),
-                onPressed: () => closeDialog(dialogContext),
+                onPressed: closeDialog(dialogContext),
               ),
               TextButton(
                 child: Text("Подтвердить"),
-                onPressed: () => sendFinishDayData(dialogContext, context),
+                onPressed: sendFinishDayData(dialogContext, context),
               ),
             ],
           );
@@ -930,14 +931,15 @@ class DiaryEditScreen extends StatelessWidget {
     };
   }
 
-  Function sendFinishDayData(BuildContext dialogContext, BuildContext context) {
+  Function() sendFinishDayData(
+      BuildContext dialogContext, BuildContext context) {
     return () {
       closeDialog(dialogContext);
       context.read<DiaryEditBloc>().add(FinishDay());
     };
   }
 
-  Function closeDialog(BuildContext dialogContext) {
+  Function() closeDialog(BuildContext dialogContext) {
     return () {
       Navigator.of(dialogContext).pop();
     };