update navigation from noti list

ios/Flutter/.last_build_id

@@ -1 +1 @@
-dab672e712362fdbbfa98386624f95d6
+440505e9ea1eee7043d2cbfeb318f6bc

lib/main.dart

@@ -83,13 +83,9 @@ _showAlertCheckCropCode(
       print("ok");
       if (Get.isDialogOpen) Get.back();
       Get.to(PlotDetailScreen(
-        cropId: value.tbCropDTO.id,
-        cropType: value.tbCropDTO.type,
-        initialIndex: 1,
-        code: value.tbCropDTO.code,
-        areaM2: value.tbCropDTO.areaM2,
-        suppliesName: value.tbCropDTO.suppliesName,
-      ));
+          cropId: value.tbCropDTO.id,
+          cropType: value.tbCropDTO.type,
+          initialIndex: 0));
     }).catchError((onError) {
       Utils.showDialog(
           title: "Không tìm thấy lô",

lib/presentation/screens/notification/sc_notification.dart

@@ -289,9 +289,10 @@ class ItemInfinityWidget extends StatelessWidget {
                 Navigator.push(
                     context,
                     MaterialPageRoute(
-                        builder: (BuildContext context) => PlotParameterScreen(
+                        builder: (BuildContext context) => PlotDetailScreen(
+                              cropType: item.type,
                               cropId: item.tbCropId,
-                              isShowAppbar: true,
+                              initialIndex: 0,
                             ))).then((value) {
                   if (item.isRead == 0) {
                     _updateReadNotification(
@@ -308,10 +309,10 @@ class ItemInfinityWidget extends StatelessWidget {
                 Navigator.push(
                     context,
                     MaterialPageRoute(
-                        builder: (BuildContext context) =>
-                            PlotInformationScreen(
+                        builder: (BuildContext context) => PlotDetailScreen(
+                              cropType: item.type,
                               cropId: item.tbCropId,
-                              isShowAppbar: true,
+                              initialIndex: 1,
                             ))).then((value) {
                   if (item.isRead == 0) {
                     _updateReadNotification(

lib/presentation/screens/plot/sc_plot.dart

@@ -342,13 +342,7 @@ class ItemInfinityWidget extends StatelessWidget {
               context,
               MaterialPageRoute(
                   builder: (BuildContext context) => PlotDetailScreen(
-                        cropId: item.id,
-                        initialIndex: 0,
-                        cropType: item.type,
-                        code: item.code,
-                        areaM2: item.areaM2,
-                        suppliesName: item.suppliesName,
-                      )));
+                      cropId: item.id, initialIndex: 0, cropType: item.type)));
         });
   }
 }

lib/presentation/screens/plot_detail/bloc/plot_detail_bloc.dart

@@ -75,6 +75,27 @@ class PlotDetailBloc extends Bloc<PlotDetailEvent, PlotDetailState> {
         yield PlotDetailFailure(errorString: errorString);
       }
     }
+    if (event is CheckInfo) {
+      try {
+        yield PlotDetailLoading();
+        var response;
+        if (event.cropId != null) {
+          response = await repository.getPlotDetail(event.cropId,
+              page: 0, size: pageSize);
+        } else {
+          response = await repository.getPlotDetailByCode(event.cropCode,
+              page: 0, size: pageSize);
+        }
+        CropPlot cropPlot = response as CropPlot;
+        yield PlotDetailSuccess(
+            ownerItem: cropPlot,
+            page: 0,
+            hasReachedMax:
+                response.activities.length < pageSize ? true : false);
+      } catch (e) {
+        yield PlotDetailFailure(errorString: AppException.handleError(e));
+      }
+    }
     if (event is OnRefresh) {
       try {
         yield PlotDetailLoading();

lib/presentation/screens/plot_detail/bloc/plot_detail_event.dart

@@ -7,6 +7,12 @@ abstract class PlotDetailEvent {
   List<Object> get props => [];
 }
 
+class CheckInfo extends PlotDetailEvent {
+  final int cropId;
+  final String cropCode;
+  CheckInfo({this.cropId, this.cropCode});
+}
+
 class DataFetched extends PlotDetailEvent {
   final int cropId;
   final String cropCode;

lib/presentation/screens/plot_detail/sc_plot_detail.dart

@@ -1,91 +1,117 @@
+import 'package:farm_tpf/custom_model/CropPlot.dart';
+import 'package:farm_tpf/data/repository/repository.dart';
 import 'package:farm_tpf/presentation/custom_widgets/app_bar_widget.dart';
+import 'package:farm_tpf/presentation/custom_widgets/widget_loading.dart';
+import 'package:farm_tpf/presentation/screens/plot_detail/bloc/plot_detail_bloc.dart';
 import 'package:farm_tpf/presentation/screens/plot_detail/widget_tab.dart';
 import 'package:farm_tpf/utils/const_assets.dart';
 import 'package:farm_tpf/utils/formatter.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
 
 class PlotDetailScreen extends StatefulWidget {
   int cropId;
   String cropCode;
   int cropType;
   int initialIndex;
-  String code;
-  num areaM2;
-  String suppliesName;
-  PlotDetailScreen(
-      {this.cropId,
-      this.initialIndex = 0,
-      this.cropCode,
-      @required this.cropType,
-      @required this.code,
-      @required this.areaM2,
-      @required this.suppliesName});
+  PlotDetailScreen({
+    this.cropId,
+    this.initialIndex = 0,
+    this.cropCode,
+    @required this.cropType,
+  });
   @override
   _PlotDetailScreenState createState() => _PlotDetailScreenState();
 }
 
 class _PlotDetailScreenState extends State<PlotDetailScreen> {
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      appBar: AppBarWidget(),
-      body: Column(
-        children: [
-          Container(
-            padding: EdgeInsets.all(8),
-            width: double.infinity,
-            color: Colors.white,
-            child: Row(
-              children: [
-                SizedBox(
-                  width: 12,
-                ),
-                Expanded(
-                  child: Container(
-                    height: 75,
-                    child: Column(
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      mainAxisSize: MainAxisSize.min,
-                      children: [
-                        Text('${widget.suppliesName ?? ''}',
-                            style: TextStyle(
-                                fontWeight: FontWeight.bold, fontSize: 18)),
-                        Expanded(
-                          child: SizedBox(),
-                        ),
-                        Row(
-                          children: [
-                            Text('Mã lô: ${widget.code ?? ''}',
-                                style: TextStyle(color: Colors.grey)),
-                            SizedBox(
-                              width: 16,
-                            ),
-                            Text(
-                                'Diện tích: ${widget.areaM2.formatNumtoStringDecimal() ?? '0'} m\u00B2',
-                                style: TextStyle(color: Colors.grey))
-                          ],
-                        )
-                      ],
-                    ),
+  Widget content({String suppliesName, String code, num areaM2}) {
+    return Column(
+      children: [
+        Container(
+          padding: EdgeInsets.all(8),
+          width: double.infinity,
+          color: Colors.white,
+          child: Row(
+            children: [
+              SizedBox(
+                width: 12,
+              ),
+              Expanded(
+                child: Container(
+                  height: 75,
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    mainAxisSize: MainAxisSize.min,
+                    children: [
+                      Text('${suppliesName ?? ''}',
+                          style: TextStyle(
+                              fontWeight: FontWeight.bold, fontSize: 18)),
+                      Expanded(
+                        child: SizedBox(),
+                      ),
+                      Row(
+                        children: [
+                          Text('Mã lô: ${code ?? ''}',
+                              style: TextStyle(color: Colors.grey)),
+                          SizedBox(
+                            width: 16,
+                          ),
+                          Text(
+                              'Diện tích: ${areaM2.formatNumtoStringDecimal() ?? '0'} m\u00B2',
+                              style: TextStyle(color: Colors.grey))
+                        ],
+                      )
+                    ],
                   ),
                 ),
-                Image.asset(
-                  AppAssets.tempImage,
-                  width: 75,
-                  height: 75,
-                )
-              ],
-            ),
+              ),
+              Image.asset(
+                AppAssets.tempImage,
+                width: 75,
+                height: 75,
+              )
+            ],
           ),
-          Expanded(
-              child: HomeTabbarWidget(
-            cropType: widget.cropType,
-            cropId: widget.cropId,
-            cropCode: widget.cropCode,
-            initialIndex: widget.initialIndex,
-          ))
-        ],
-      ),
+        ),
+        Expanded(
+            child: HomeTabbarWidget(
+          cropType: widget.cropType,
+          cropId: widget.cropId,
+          cropCode: widget.cropCode,
+          initialIndex: widget.initialIndex,
+        ))
+      ],
     );
   }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+        appBar: AppBarWidget(),
+        body: BlocProvider(
+          create: (context) => PlotDetailBloc(repository: Repository())
+            ..add(CheckInfo(cropId: widget.cropId, cropCode: widget.cropCode)),
+          child: BlocConsumer<PlotDetailBloc, PlotDetailState>(
+              listener: (context, state) {
+            if (state is PlotDetailLoading) {
+              LoadingDialog.showLoadingDialog(context);
+            } else if (state is PlotDetailFailure) {
+              LoadingDialog.hideLoadingDialog(context);
+            } else {
+              LoadingDialog.hideLoadingDialog(context);
+            }
+          }, builder: (context, state) {
+            if (state is PlotDetailSuccess) {
+              var cropPlot = state.ownerItem as CropPlot;
+              return content(
+                  suppliesName: cropPlot.tbCropDTO.suppliesName,
+                  code: cropPlot.tbCropDTO.code,
+                  areaM2: cropPlot.tbCropDTO.areaM2);
+            } else {
+              return content(suppliesName: '', code: '', areaM2: 0);
+            }
+          }),
+        ));
+  }
 }

lib/presentation/screens/plot_detail/widget_tab.dart

@@ -30,6 +30,7 @@ class _HomeTabbarWidgetState extends State<HomeTabbarWidget>
     super.initState();
     homeTabSelected.init();
     tabbarController = TabController(vsync: this, length: 4);
+    tabbarController.animateTo(widget.initialIndex);
     tabbarController.addListener(() {
       homeTabSelected.changeTab(tabbarController.index);
     });