add mix carton

lib/pages/carton/carton_editor.dart

@@ -63,6 +63,8 @@ class _CartonEditorState extends State<CartonEditor> {
   double shipmentWeight = 0;
   FcsShipment _fcsShipment;
   List<FcsShipment> _fcsShipments;
+  Carton _mixCarton;
+  List<Carton> _mixCartons;
 
   @override
   void initState() {
@@ -85,6 +87,7 @@ class _CartonEditorState extends State<CartonEditor> {
       _selectedCartonType = _carton.cartonType;
       _isNew = false;
       _user = User(fcsID: _carton.fcsID, name: _carton.userName);
+      _loadPackages();
     } else {
       _carton = Carton(cargoTypes: [], packages: [], cartons: []);
       _lengthController.text = "12";
@@ -93,6 +96,7 @@ class _CartonEditorState extends State<CartonEditor> {
       _isNew = true;
       _selectedCartonType = carton_from_packages;
       _loadFcsShipments();
+      _loadMixCartons();
     }
   }
 
@@ -108,25 +112,46 @@ class _CartonEditorState extends State<CartonEditor> {
     });
   }
 
+  _loadMixCartons() async {
+    if (_fcsShipment == null) return;
+    CartonModel cartonModel = Provider.of<CartonModel>(context, listen: false);
+    var mixCartons =
+        await cartonModel.getMixCartonsByFcsShipment(_fcsShipment.id);
+    setState(() {
+      _mixCartons = mixCartons;
+    });
+  }
+
   _loadPackages() async {
     if (_user == null) return;
     PackageModel packageModel =
         Provider.of<PackageModel>(context, listen: false);
-    List<Package> packages = await packageModel.getPackages(_user.id);
-    String prevCompare;
-    packages.forEach((p) {
-      String compare = (p.deliveryAddress?.fullName ?? "") +
-          (p.deliveryAddress?.phoneNumber ?? "");
-      if (prevCompare != null && compare == prevCompare) {
-        p.isChecked = true;
-      } else {
-        p.isChecked = false;
-      }
-      if (prevCompare == null) {
-        p.isChecked = true;
-        prevCompare = compare;
-      }
-    });
+    List<Package> packages = await packageModel.getPackages(
+        _user.id, [package_processed_status, package_packed_status]);
+    if (_isNew) {
+      String prevCompare;
+      packages.forEach((p) {
+        String compare = (p.deliveryAddress?.fullName ?? "") +
+            (p.deliveryAddress?.phoneNumber ?? "");
+        if (prevCompare != null && compare == prevCompare) {
+          p.isChecked = true;
+        } else {
+          p.isChecked = false;
+        }
+        if (prevCompare == null) {
+          p.isChecked = true;
+          prevCompare = compare;
+        }
+      });
+    } else {
+      packages.forEach((p) {
+        if (_carton.packages.contains(p)) {
+          p.isChecked = _carton.packages.firstWhere((cp) => cp == p).isChecked;
+        } else {
+          p.isChecked = false;
+        }
+      });
+    }
 
     setState(() {
       _carton.packages = packages;
@@ -176,12 +201,17 @@ class _CartonEditorState extends State<CartonEditor> {
   Widget build(BuildContext context) {
     var boxModel = Provider.of<CartonModel>(context);
     bool isMixBox = _selectedCartonType == carton_mix_box;
+    bool isSmallBag = _selectedCartonType == carton_small_bag;
     final shipmentBox = DisplayText(
       text: _carton.fcsShipmentNumber,
       labelTextKey: "box.fcs_shipment_num",
       iconData: Ionicons.ios_airplane,
     );
-
+    final mixCartonNumberBox = DisplayText(
+      text: _carton.mixCartonNumber,
+      labelTextKey: "box.mix.carton",
+      iconData: MaterialCommunityIcons.package,
+    );
     var fcsShipmentsBox = LocalDropdown<FcsShipment>(
       callback: (v) {
         setState(() {
@@ -190,6 +220,9 @@ class _CartonEditorState extends State<CartonEditor> {
         if (_selectedCartonType == carton_mix_box) {
           _loadCartons();
         }
+        if (_selectedCartonType == carton_small_bag) {
+          _loadMixCartons();
+        }
       },
       labelKey: "shipment.pack.fcs.shipment",
       iconData: Ionicons.ios_airplane,
@@ -198,6 +231,19 @@ class _CartonEditorState extends State<CartonEditor> {
       values: _fcsShipments,
     );
 
+    var mixCartonsBox = LocalDropdown<Carton>(
+      callback: (v) {
+        setState(() {
+          _mixCarton = v;
+        });
+      },
+      labelKey: "box.mix.carton",
+      iconData: MaterialCommunityIcons.package,
+      display: (u) => u.cartonNumber,
+      selectedValue: _mixCarton,
+      values: _mixCartons,
+    );
+
     final fcsIDBox = Row(
       children: <Widget>[
         Expanded(
@@ -338,16 +384,19 @@ class _CartonEditorState extends State<CartonEditor> {
               cartonTypeBox,
               LocalTitle(textKey: "box.shipment_info"),
               _isNew ? fcsShipmentsBox : shipmentBox,
+              isSmallBag
+                  ? _isNew ? mixCartonsBox : mixCartonNumberBox
+                  : Container(),
               ...(isMixBox
                   ? [
-                      CartonMixTable(
-                        cartons: _carton.cartons,
-                        onSelect: (c, check) {
-                          setState(() {
-                            c.isChecked = check;
-                          });
-                        },
-                      )
+                      // CartonMixTable(
+                      //   cartons: _carton.cartons,
+                      //   onSelect: (c, check) {
+                      //     setState(() {
+                      //       c.isChecked = check;
+                      //     });
+                      //   },
+                      // )
                     ]
                   : [
                       fcsIDBox,
@@ -368,9 +417,11 @@ class _CartonEditorState extends State<CartonEditor> {
                       ),
                       cargoTableTitleBox,
                       cargoTableBox,
-                      LocalTitle(textKey: "box.dimension"),
-                      dimBox,
-                      shipmentWeightBox,
+                      isSmallBag
+                          ? Container()
+                          : LocalTitle(textKey: "box.dimension"),
+                      isSmallBag ? Container() : dimBox,
+                      isSmallBag ? Container() : shipmentWeightBox,
                       LocalTitle(textKey: "box.delivery_address"),
                       DefaultDeliveryAddress(
                         deliveryAddress: _deliveryAddress,
@@ -413,7 +464,9 @@ class _CartonEditorState extends State<CartonEditor> {
   }
 
   _save() async {
-    if (_user == null) {
+    bool isFromShipment = _selectedCartonType == carton_from_shipments;
+    bool isSmallBag = _selectedCartonType == carton_small_bag;
+    if (_user == null && (isFromShipment || isSmallBag)) {
       showMsgDialog(context, "Error", "Please select customer");
       return;
     }
@@ -421,35 +474,40 @@ class _CartonEditorState extends State<CartonEditor> {
       showMsgDialog(context, "Error", "Please select FCS shipment");
       return;
     }
-    if ((_carton.cargoTypes?.length ?? 0) == 0) {
+    if ((_carton.cargoTypes?.length ?? 0) == 0 &&
+        (isFromShipment || isSmallBag)) {
       showMsgDialog(context, "Error", "Expect at least one cargo type");
       return;
     }
     double l = double.parse(_lengthController.text, (s) => 0);
     double w = double.parse(_widthController.text, (s) => 0);
     double h = double.parse(_heightController.text, (s) => 0);
-    if (l <= 0 || w <= 0 || h <= 0) {
+    if ((l <= 0 || w <= 0 || h <= 0) && isFromShipment) {
       showMsgDialog(context, "Error", "Invalid dimension");
       return;
     }
-    if (_deliveryAddress == null) {
+    if (_deliveryAddress == null && (isFromShipment || isSmallBag)) {
       showMsgDialog(context, "Error", "Invalid delivery address");
       return;
     }
+    if (isSmallBag && _mixCarton == null) {
+      showMsgDialog(context, "Error", "Invalid mix carton");
+      return;
+    }
 
     Carton carton = Carton();
     carton.id = _carton.id;
     carton.cartonType = _selectedCartonType;
     carton.fcsShipmentID = _isNew ? _fcsShipment.id : _carton.fcsShipmentID;
-    carton.userID = _user.id;
+    carton.userID = _user?.id;
     carton.cargoTypes = _carton.cargoTypes;
     carton.packages = _carton.packages.where((e) => e.isChecked).toList();
-
+    carton.mixCartonID = _mixCarton?.id;
     carton.length = l;
     carton.width = w;
     carton.height = h;
     carton.deliveryAddress = _deliveryAddress;
-
+    carton.cartons = _carton.cartons.where((c) => c.isChecked).toList();
     setState(() {
       _isLoading = true;
     });