fix bug #7797, #7886

ios/Flutter/.last_build_id

-5729eb498eaeb9c64784fcfc80bbb33b
+440505e9ea1eee7043d2cbfeb318f6bc

ios/Runner.xcodeproj/project.pbxproj

 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 0.11.0;
+				MARKETING_VERSION = 0.12.0;
 				PRODUCT_BUNDLE_IDENTIFIER = vn.azteam.tpfarm;
 				PRODUCT_NAME = Runner;
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 0.11.0;
+				MARKETING_VERSION = 0.12.0;
 				PRODUCT_BUNDLE_IDENTIFIER = vn.azteam.tpfarm;
 				PRODUCT_NAME = Runner;
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 0.11.0;
+				MARKETING_VERSION = 0.12.0;
 				PRODUCT_BUNDLE_IDENTIFIER = vn.azteam.tpfarm;
 				PRODUCT_NAME = Runner;
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";

lib/presentation/custom_widgets/widget_text_form_field.dart

   final TextEditingController textController;
   final void Function(String) onSaved;
   final void Function(String) validator;
+  final void Function(String) onChanged;
   final String hintValue;
   WidgetTextFormFieldNumber(
       {@required this.textController,
       this.onSaved,
       @required this.hintValue,
-      this.validator});
+      this.validator,
+      this.onChanged});
   @override
   Widget build(BuildContext context) {
     return TextFormField(
           },
       controller: textController,
       onSaved: onSaved,
+      onChanged: onChanged,
     );
   }
 }

lib/presentation/custom_widgets/widget_utils.dart

       textCancel: textCancel,
       confirmTextColor: Colors.white,
       onConfirm: onConfirm,
-      onCancel: () {
-        Get.back();
-      },
     );
   }
 

lib/presentation/screens/actions/controller/ChangeFieldInForm.dart

+import 'package:get/get.dart';
+
+class ChangeFieldFormSupply extends GetxController {
+  bool isChanged;
+  void init() {
+    isChanged = false;
+    update();
+  }
+
+  void change(bool changed) {
+    isChanged = changed;
+    update();
+  }
+}

lib/presentation/screens/actions/dung/sc_edit_action_dung.dart

 import 'package:farm_tpf/presentation/custom_widgets/widget_text_form_field.dart';
 import 'package:farm_tpf/presentation/custom_widgets/widget_utils.dart';
 import 'package:farm_tpf/presentation/screens/actions/bloc/action_detail_bloc.dart';
+import 'package:farm_tpf/presentation/screens/actions/controller/ChangeFieldInForm.dart';
 import 'package:farm_tpf/presentation/screens/actions/controller/ChangeSupplyUsing.dart';
 import 'package:farm_tpf/presentation/screens/actions/dung/widget_dung_supply.dart';
 import 'package:farm_tpf/presentation/screens/actions/state_management_helper/change_file_controller.dart';
           if (!currentFocus.hasPrimaryFocus) {
             currentFocus.unfocus();
           }
-          if (Get.find<ChangeSupply>().selectedSupplyId > 0) {
+          if (Get.find<ChangeFieldFormSupply>().isChanged) {
             Utils.showDialogConfirmSupply(onConfirm: () {
               Get.back();
               _validateInputs();

lib/presentation/screens/actions/dung/widget_dung_supply.dart

 import 'package:farm_tpf/custom_model/Supply.dart';
 import 'package:farm_tpf/presentation/custom_widgets/widget_text_form_field.dart';
 import 'package:farm_tpf/presentation/screens/actions/controller/ChangeDevice.dart';
+import 'package:farm_tpf/presentation/screens/actions/controller/ChangeFieldInForm.dart';
 import 'package:farm_tpf/presentation/screens/actions/controller/ChangeFormButton.dart';
 import 'package:farm_tpf/presentation/screens/actions/controller/ChangeSupplyUsing.dart';
 import 'package:farm_tpf/presentation/screens/actions/controller/ChangeUnit.dart';
   final changeUnit = Get.put(ChangeUnit());
   final changeButton = Get.put(ChangeButtonInForm());
   final changeSelectedDevice = Get.put(ChangeDevice());
+  final changeFormField = Get.put(ChangeFieldFormSupply());
 
   @override
   void initState() {
     changeSupplyUsing.init(widget.currentItems);
     changeUnit.initValue();
     changeButton.resetValue();
+    changeFormField.init();
   }
 
   Widget _buildListSupply() {
                 var result = value as Supply;
                 changeSelectedSupply.change(result);
                 changeUnit.updateListByUnitName(result.unit);
+                changeFormField.change(true);
               }
             });
           },
               if (value != null) {
                 var result = value as Device;
                 changeSelectedDevice.change(result);
+                changeFormField.change(true);
               }
             });
           },
 
   _quantityField() {
     return WidgetTextFormFieldNumber(
-        hintValue: "Tổng lượng sử dụng *", textController: _quantityController);
+      hintValue: "Tổng lượng sử dụng *",
+      textController: _quantityController,
+      onChanged: (value) {
+        if (!Validators.stringNotNullOrEmpty(value) &&
+            !Validators.stringNotNullOrEmpty(_howToUseController.text) &&
+            !Validators.stringNotNullOrEmpty(_dosageController.text) &&
+            Get.find<ChangeSupply>().selectedSupplyId <= 0 &&
+            changeSelectedDevice.selectedDeviceId <= 0) {
+          changeFormField.change(false);
+        } else {
+          changeFormField.change(true);
+        }
+      },
+    );
   }
 
   _buttonInForm() {
               controller: _dosageController,
               decoration: InputDecoration(labelText: "Liều lượng sử dụng"),
               onSaved: (newValue) {},
+              onChanged: (value) {
+                if (!Validators.stringNotNullOrEmpty(
+                        _quantityController.text) &&
+                    !Validators.stringNotNullOrEmpty(
+                        _howToUseController.text) &&
+                    !Validators.stringNotNullOrEmpty(value) &&
+                    Get.find<ChangeSupply>().selectedSupplyId <= 0 &&
+                    changeSelectedDevice.selectedDeviceId <= 0) {
+                  changeFormField.change(false);
+                } else {
+                  changeFormField.change(true);
+                }
+              },
             ),
             Row(
                 mainAxisSize: MainAxisSize.min,
               controller: _howToUseController,
               decoration: InputDecoration(labelText: "Phương pháp sử dụng"),
               onSaved: (newValue) {},
+              onChanged: (value) {
+                if (!Validators.stringNotNullOrEmpty(
+                        _quantityController.text) &&
+                    !Validators.stringNotNullOrEmpty(value) &&
+                    !Validators.stringNotNullOrEmpty(_dosageController.text) &&
+                    Get.find<ChangeSupply>().selectedSupplyId <= 0 &&
+                    changeSelectedDevice.selectedDeviceId <= 0) {
+                  changeFormField.change(false);
+                } else {
+                  changeFormField.change(true);
+                }
+              },
             ),
             _buttonInForm()
           ],

lib/presentation/screens/actions/harvest_process/sc_edit_action_harvest_process.dart

 import 'package:farm_tpf/presentation/custom_widgets/widget_text_form_field.dart';
 import 'package:farm_tpf/presentation/custom_widgets/widget_utils.dart';
 import 'package:farm_tpf/presentation/screens/actions/bloc/action_detail_bloc.dart';
+import 'package:farm_tpf/presentation/screens/actions/controller/ChangeFieldInForm.dart';
 import 'package:farm_tpf/presentation/screens/actions/controller/ChangeSupplyUsing.dart';
 import 'package:farm_tpf/presentation/screens/actions/harvest_process/widget_harvest_process_supply.dart';
 import 'package:farm_tpf/presentation/screens/actions/state_management_helper/change_file_controller.dart';
           if (!currentFocus.hasPrimaryFocus) {
             currentFocus.unfocus();
           }
-          if (Get.find<ChangeSupply>().selectedSupplyId > 0) {
+          if (Get.find<ChangeFieldFormSupply>().isChanged) {
             Utils.showDialogConfirmSupply(onConfirm: () {
               Get.back();
               _validateInputs();

lib/presentation/screens/actions/harvest_process/widget_harvest_process_supply.dart

 import 'package:farm_tpf/custom_model/Supply.dart';
 import 'package:farm_tpf/presentation/custom_widgets/widget_text_form_field.dart';
 import 'package:farm_tpf/presentation/screens/actions/controller/ChangeDevice.dart';
+import 'package:farm_tpf/presentation/screens/actions/controller/ChangeFieldInForm.dart';
 import 'package:farm_tpf/presentation/screens/actions/controller/ChangeFormButton.dart';
 import 'package:farm_tpf/presentation/screens/actions/controller/ChangeSupplyUsing.dart';
 import 'package:farm_tpf/presentation/screens/actions/controller/ChangeUnit.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:farm_tpf/utils/formatter.dart';
-import 'package:intl/intl.dart';
-import 'package:pattern_formatter/pattern_formatter.dart';
 
 import '../util_action.dart';
 
   final changeUnit = Get.put(ChangeUnit());
   final changeButton = Get.put(ChangeButtonInForm());
   final changeSelectedDevice = Get.put(ChangeDevice());
+  final changeFormField = Get.put(ChangeFieldFormSupply());
 
   @override
   void initState() {
     changeSupplyUsing.init(widget.currentItems);
     changeUnit.initValue();
     changeButton.resetValue();
+    changeFormField.init();
   }
 
   Widget _buildListSupply() {
                 var result = value as Supply;
                 changeSelectedSupply.change(result);
                 changeUnit.updateListByUnitName(result.unit);
+                changeFormField.change(true);
               }
             });
           },
               if (value != null) {
                 var result = value as Device;
                 changeSelectedDevice.change(result);
+                changeFormField.change(true);
               }
             });
           },
 
   _quantityField() {
     return WidgetTextFormFieldNumber(
-        hintValue: "Tổng lượng sử dụng *", textController: _quantityController);
+      hintValue: "Tổng lượng sử dụng *",
+      textController: _quantityController,
+      onChanged: (value) {
+        if (!Validators.stringNotNullOrEmpty(value) &&
+            !Validators.stringNotNullOrEmpty(_howToUseController.text) &&
+            !Validators.stringNotNullOrEmpty(_dosageController.text) &&
+            Get.find<ChangeSupply>().selectedSupplyId <= 0 &&
+            changeSelectedDevice.selectedDeviceId <= 0) {
+          changeFormField.change(false);
+        } else {
+          changeFormField.change(true);
+        }
+      },
+    );
   }
 
   _buttonInForm() {
               controller: _dosageController,
               decoration: InputDecoration(labelText: "Liều lượng sử dụng"),
               onSaved: (newValue) {},
+              onChanged: (value) {
+                if (!Validators.stringNotNullOrEmpty(
+                        _quantityController.text) &&
+                    !Validators.stringNotNullOrEmpty(
+                        _howToUseController.text) &&
+                    !Validators.stringNotNullOrEmpty(value) &&
+                    Get.find<ChangeSupply>().selectedSupplyId <= 0 &&
+                    changeSelectedDevice.selectedDeviceId <= 0) {
+                  changeFormField.change(false);
+                } else {
+                  changeFormField.change(true);
+                }
+              },
             ),
             Row(
                 mainAxisSize: MainAxisSize.min,
               controller: _howToUseController,
               decoration: InputDecoration(labelText: "Phương pháp sử dụng"),
               onSaved: (newValue) {},
+              onChanged: (value) {
+                if (!Validators.stringNotNullOrEmpty(
+                        _quantityController.text) &&
+                    !Validators.stringNotNullOrEmpty(value) &&
+                    !Validators.stringNotNullOrEmpty(_dosageController.text) &&
+                    Get.find<ChangeSupply>().selectedSupplyId <= 0 &&
+                    changeSelectedDevice.selectedDeviceId <= 0) {
+                  changeFormField.change(false);
+                } else {
+                  changeFormField.change(true);
+                }
+              },
             ),
             _buttonInForm()
           ],

lib/presentation/screens/actions/nursery/sc_edit_action_nursery.dart

           if (!currentFocus.hasPrimaryFocus) {
             currentFocus.unfocus();
           }
-          _validateInputs();
+          if (!Validators.stringNotNullOrEmpty(_workerNameController.text) &&
+              !Validators.stringNotNullOrEmpty(_trayNumberController.text)) {
+            _validateInputs();
+          } else {
+            Utils.showDialog(
+                title: "Tên công nhân hoặc khây trồng đang cập nhật",
+                message: "Bạn có muốn cập nhật?",
+                textConfirm: "Tiếp tục",
+                textCancel: "Xem lại",
+                onConfirm: () {
+                  Get.back();
+                  _validateInputs();
+                });
+          }
         },
       );
       return <Widget>[iconButton];

lib/presentation/screens/actions/plant/sc_edit_action_plant.dart

 import 'package:farm_tpf/presentation/custom_widgets/widget_text_form_field.dart';
 import 'package:farm_tpf/presentation/custom_widgets/widget_utils.dart';
 import 'package:farm_tpf/presentation/screens/actions/bloc/action_detail_bloc.dart';
+import 'package:farm_tpf/presentation/screens/actions/controller/ChangeFieldInForm.dart';
 import 'package:farm_tpf/presentation/screens/actions/controller/ChangeSupplyUsing.dart';
 import 'package:farm_tpf/presentation/screens/actions/plant/widget_plant_supply.dart';
 import 'package:farm_tpf/presentation/screens/actions/state_management_helper/change_file_controller.dart';
           if (!currentFocus.hasPrimaryFocus) {
             currentFocus.unfocus();
           }
-          if (Get.find<ChangeSupply>().selectedSupplyId > 0) {
+          if (Get.find<ChangeFieldFormSupply>().isChanged) {
             Utils.showDialogConfirmSupply(onConfirm: () {
               Get.back();
               _validateInputs();

lib/presentation/screens/actions/plant/widget_plant_supply.dart

 import 'package:farm_tpf/custom_model/SuppliesUsing.dart';
 import 'package:farm_tpf/custom_model/Supply.dart';
 import 'package:farm_tpf/presentation/custom_widgets/widget_text_form_field.dart';
+import 'package:farm_tpf/presentation/screens/actions/controller/ChangeFieldInForm.dart';
 import 'package:farm_tpf/presentation/screens/actions/controller/ChangeFormButton.dart';
 import 'package:farm_tpf/presentation/screens/actions/controller/ChangeSupplyUsing.dart';
 import 'package:farm_tpf/presentation/screens/actions/controller/ChangeUnit.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:farm_tpf/utils/formatter.dart';
-import 'package:intl/intl.dart';
-import 'package:pattern_formatter/pattern_formatter.dart';
 
 class WidgetPlantSupply extends StatefulWidget {
   final List<SuppliesUsing> currentItems;
   final changeSupplyUsing = Get.put(ChangeSupplyUsing());
   final changeUnit = Get.put(ChangeUnit());
   final changeButton = Get.put(ChangeButtonInForm());
+  final changeFormField = Get.put(ChangeFieldFormSupply());
 
   @override
   void initState() {
     changeSupplyUsing.init(widget.currentItems);
     changeUnit.initValue();
     changeButton.resetValue();
+    changeFormField.init();
   }
 
   Widget _buildListSupply() {
                 var result = value as Supply;
                 changeSelectedSupply.change(result);
                 changeUnit.updateListByUnitName(result.unit);
+                changeFormField.change(true);
               }
             });
           },
 
   _quantityField() {
     return WidgetTextFormFieldNumber(
-        hintValue: "Tổng lượng sử dụng", textController: _quantityController);
+      hintValue: "Tổng lượng sử dụng",
+      textController: _quantityController,
+      onChanged: (value) {
+        if (!Validators.stringNotNullOrEmpty(value) &&
+            !Validators.stringNotNullOrEmpty(_dosageController.text) &&
+            Get.find<ChangeSupply>().selectedSupplyId <= 0) {
+          changeFormField.change(false);
+        } else {
+          changeFormField.change(true);
+        }
+      },
+    );
   }
 
   _buttonInForm() {
               controller: _dosageController,
               decoration: InputDecoration(labelText: "Liều lượng"),
               onSaved: (newValue) {},
+              onChanged: (value) {
+                if (!Validators.stringNotNullOrEmpty(
+                        _quantityController.text) &&
+                    !Validators.stringNotNullOrEmpty(value) &&
+                    Get.find<ChangeSupply>().selectedSupplyId <= 0) {
+                  changeFormField.change(false);
+                } else {
+                  changeFormField.change(true);
+                }
+              },
             ),
             Row(
                 mainAxisSize: MainAxisSize.min,

lib/presentation/screens/actions/spraying/sc_edit_action_spraying.dart

 import 'package:farm_tpf/presentation/custom_widgets/widget_text_form_field.dart';
 import 'package:farm_tpf/presentation/custom_widgets/widget_utils.dart';
 import 'package:farm_tpf/presentation/screens/actions/bloc/action_detail_bloc.dart';
+import 'package:farm_tpf/presentation/screens/actions/controller/ChangeFieldInForm.dart';
 import 'package:farm_tpf/presentation/screens/actions/controller/ChangeSupplyUsing.dart';
 import 'package:farm_tpf/presentation/screens/actions/spraying/widget_spraying_supply.dart';
 import 'package:farm_tpf/presentation/screens/actions/state_management_helper/change_file_controller.dart';
           if (!currentFocus.hasPrimaryFocus) {
             currentFocus.unfocus();
           }
-          if (Get.find<ChangeSupply>().selectedSupplyId > 0) {
+          if (Get.find<ChangeFieldFormSupply>().isChanged) {
             Utils.showDialogConfirmSupply(onConfirm: () {
               Get.back();
               _validateInputs();

lib/presentation/screens/actions/spraying/widget_spraying_supply.dart

 import 'package:farm_tpf/custom_model/Supply.dart';
 import 'package:farm_tpf/presentation/custom_widgets/widget_text_form_field.dart';
 import 'package:farm_tpf/presentation/screens/actions/controller/ChangeDevice.dart';
+import 'package:farm_tpf/presentation/screens/actions/controller/ChangeFieldInForm.dart';
 import 'package:farm_tpf/presentation/screens/actions/controller/ChangeFormButton.dart';
 import 'package:farm_tpf/presentation/screens/actions/controller/ChangeSupplyUsing.dart';
 import 'package:farm_tpf/presentation/screens/actions/controller/ChangeUnit.dart';
 import 'package:get/get.dart';
 
 import 'package:farm_tpf/utils/formatter.dart';
-import 'package:intl/intl.dart';
-import 'package:pattern_formatter/pattern_formatter.dart';
 
 import '../util_action.dart';
 
   final changeUnit = Get.put(ChangeUnit());
   final changeButton = Get.put(ChangeButtonInForm());
   final changeSelectedDevice = Get.put(ChangeDevice());
+  final changeFormField = Get.put(ChangeFieldFormSupply());
 
   @override
   void initState() {
     changeSupplyUsing.init(widget.currentItems);
     changeUnit.initValue();
     changeButton.resetValue();
+    changeFormField.init();
   }
 
   Widget _buildListSupply() {
                 var result = value as Supply;
                 changeSelectedSupply.change(result);
                 changeUnit.updateListByUnitName(result.unit);
+                changeFormField.change(true);
               }
             });
           },
               if (value != null) {
                 var result = value as Device;
                 changeSelectedDevice.change(result);
+                changeFormField.change(true);
               }
             });
           },
 
   _quantityField() {
     return WidgetTextFormFieldNumber(
-        hintValue: "Tổng lượng sử dụng *", textController: _quantityController);
+      hintValue: "Tổng lượng sử dụng *",
+      textController: _quantityController,
+      onChanged: (value) {
+        if (!Validators.stringNotNullOrEmpty(value) &&
+            !Validators.stringNotNullOrEmpty(_howToUseController.text) &&
+            !Validators.stringNotNullOrEmpty(_dosageController.text) &&
+            Get.find<ChangeSupply>().selectedSupplyId <= 0 &&
+            changeSelectedDevice.selectedDeviceId <= 0) {
+          changeFormField.change(false);
+        } else {
+          changeFormField.change(true);
+        }
+      },
+    );
   }
 
   _buttonInForm() {
               controller: _dosageController,
               decoration: InputDecoration(labelText: "Liều lượng sử dụng"),
               onSaved: (newValue) {},
+              onChanged: (value) {
+                if (!Validators.stringNotNullOrEmpty(
+                        _quantityController.text) &&
+                    !Validators.stringNotNullOrEmpty(
+                        _howToUseController.text) &&
+                    !Validators.stringNotNullOrEmpty(value) &&
+                    Get.find<ChangeSupply>().selectedSupplyId <= 0 &&
+                    changeSelectedDevice.selectedDeviceId <= 0) {
+                  changeFormField.change(false);
+                } else {
+                  changeFormField.change(true);
+                }
+              },
             ),
             Row(
                 mainAxisSize: MainAxisSize.min,
               controller: _howToUseController,
               decoration: InputDecoration(labelText: "Phương pháp sử dụng"),
               onSaved: (newValue) {},
+              onChanged: (value) {
+                if (!Validators.stringNotNullOrEmpty(
+                        _quantityController.text) &&
+                    !Validators.stringNotNullOrEmpty(value) &&
+                    !Validators.stringNotNullOrEmpty(_dosageController.text) &&
+                    Get.find<ChangeSupply>().selectedSupplyId <= 0 &&
+                    changeSelectedDevice.selectedDeviceId <= 0) {
+                  changeFormField.change(false);
+                } else {
+                  changeFormField.change(true);
+                }
+              },
             ),
             _buttonInForm()
           ],

lib/presentation/screens/plot_detail/sc_plot_information.dart

       _timeEndGrowController.text = _crop.endDate.format_DDMMYY_HHmm();
       _descriptionController.text =
           _crop.description == null ? "" : _crop.description.toString();
-      var technicians = _crop.tbDetailUsers.map((e) => e.fullName).join(",");
+      var technicians = _crop.tbDetailUsers.map((e) => e.fullName).join(", ");
       _mainTechnicianController.text = technicians;
     }, (err) {});
   }

pubspec.yaml

 description: A new Flutter project.
 
 publish_to: 'none'
-version: 0.11.0+1
+version: 0.12.0+1
 
 environment:
   sdk: ">=2.7.0 <3.0.0"