add FCS UI

lib/pages/processing/model/processing_model.dart

@@ -0,0 +1,37 @@
+import 'dart:async';
+import 'dart:io';
+
+import 'package:cloud_firestore/cloud_firestore.dart';
+import 'package:fcs/domain/entities/package.dart';
+import 'package:fcs/domain/entities/processing.dart';
+import 'package:fcs/pages/main/model/base_model.dart';
+import 'package:logging/logging.dart';
+
+class ProcessingModel extends BaseModel {
+  List<Processing> processings = [];
+  final log = Logger('ProcessingModel');
+
+  StreamSubscription<QuerySnapshot> listener;
+
+  void initUser(user) {
+    super.initUser(user);
+  }
+
+  @override
+  logout() async {
+    if (listener != null) await listener.cancel();
+
+    processings = [];
+  }
+
+  Future<void> createProcessing(Processing carton) {}
+
+  Future<void> updateProcessing(Processing carton) {}
+
+  Future<void> createPackage(Package package, List<File> files) {}
+
+  Future<void> updatePackage(
+      Package package, List<File> files, List<String> deletedUrls) {}
+
+  Future<void> deletePackage(String id) {}
+}

lib/pages/processing/package_editor.dart

@@ -0,0 +1,290 @@
+import 'package:fcs/domain/entities/market.dart';
+import 'package:fcs/domain/entities/package.dart';
+import 'package:fcs/helpers/theme.dart';
+import 'package:fcs/pages/market/market_editor.dart';
+import 'package:fcs/pages/market/model/market_model.dart';
+import 'package:fcs/pages/package/model/package_model.dart';
+import 'package:fcs/pages/package/tracking_id_page.dart';
+import 'package:fcs/pages/main/util.dart';
+import 'package:fcs/pages/widgets/barcode_scanner.dart';
+import 'package:fcs/pages/widgets/input_text.dart';
+import 'package:fcs/pages/widgets/local_text.dart';
+import 'package:fcs/pages/widgets/multi_img_controller.dart';
+import 'package:fcs/pages/widgets/multi_img_file.dart';
+import 'package:fcs/pages/widgets/progress.dart';
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_icons/flutter_icons.dart';
+import 'package:permission_handler/permission_handler.dart';
+import 'package:provider/provider.dart';
+
+import 'model/processing_model.dart';
+
+class PackageEditor extends StatefulWidget {
+  final Package package;
+  PackageEditor({this.package});
+
+  @override
+  _PackageEditorState createState() => _PackageEditorState();
+}
+
+class _PackageEditorState extends State<PackageEditor> {
+  TextEditingController _remarkCtl = new TextEditingController();
+  TextEditingController _descCtl = new TextEditingController();
+  TextEditingController _trackingIDCtl = new TextEditingController();
+
+  bool _isLoading = false;
+  bool _isNew;
+  MultiImgController multiImgController = MultiImgController();
+  Package _package;
+
+  @override
+  void initState() {
+    super.initState();
+    if (widget.package != null) {
+      _isNew = false;
+      _package = widget.package;
+      _trackingIDCtl.text = _package.trackingID;
+      multiImgController.setImageUrls = _package.photoUrls;
+      selectedMarket = _package.market ?? "";
+      _descCtl.text = _package.desc;
+      _remarkCtl.text = _package.remark;
+    } else {
+      _isNew = true;
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final trackingIDBox = Container(
+        child: Row(
+      crossAxisAlignment: CrossAxisAlignment.end,
+      children: <Widget>[
+        Expanded(
+            child: InputText(
+          iconData: MaterialCommunityIcons.barcode_scan,
+          labelTextKey: "processing.tracking.id",
+          controller: _trackingIDCtl,
+        )),
+        InkWell(
+          onTap: _scan,
+          child: Padding(
+            padding: const EdgeInsets.all(8.0),
+            child: Column(
+              children: [
+                Icon(
+                  MaterialCommunityIcons.barcode_scan,
+                  color: primaryColor,
+                ),
+                Text("Scan")
+              ],
+            ),
+          ),
+        ),
+      ],
+    ));
+
+    final descBox = InputText(
+        labelTextKey: 'processing.desc',
+        iconData: MaterialCommunityIcons.message_text_outline,
+        controller: _descCtl);
+
+    final remarkBox = InputText(
+        labelTextKey: 'processing.remark',
+        iconData: Entypo.new_message,
+        controller: _remarkCtl);
+
+    final img = MultiImageFile(
+      enabled: true,
+      controller: multiImgController,
+      title: "Receipt File",
+    );
+
+    final selectBtn = fcsButton(
+      context,
+      getLocalString(context, 'processing.package.select.btn'),
+      callack: _selectPackage,
+    );
+    return LocalProgress(
+      inAsyncCall: _isLoading,
+      child: Scaffold(
+        appBar: AppBar(
+          centerTitle: true,
+          leading: new IconButton(
+            icon: new Icon(CupertinoIcons.back, color: primaryColor, size: 30),
+            onPressed: () => Navigator.of(context).pop(),
+          ),
+          shadowColor: Colors.transparent,
+          backgroundColor: Colors.white,
+          title: widget.package == null
+              ? LocalText(
+                  context,
+                  "processing.package.create",
+                  fontSize: 20,
+                  color: primaryColor,
+                )
+              : LocalText(
+                  context,
+                  "processing.package.update",
+                  fontSize: 20,
+                  color: primaryColor,
+                ),
+        ),
+        body: Padding(
+          padding: const EdgeInsets.all(8.0),
+          child: ListView(
+            children: [
+              trackingIDBox,
+              SizedBox(
+                height: 10,
+              ),
+              img,
+              Divider(),
+              SizedBox(
+                height: 15,
+              ),
+              marketDropdown(),
+              descBox,
+              remarkBox,
+              SizedBox(
+                height: 20,
+              ),
+              selectBtn,
+              SizedBox(
+                height: 20,
+              )
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+
+  String selectedMarket;
+  Widget marketDropdown() {
+    List<Market> _markets = Provider.of<MarketModel>(context).markets;
+    List<String> markets = _markets.map((e) => e.name).toList();
+    markets.insert(0, MANAGE_MARKET);
+    if (!markets.contains(selectedMarket)) {
+      markets.insert(0, selectedMarket);
+    }
+
+    return Row(
+      children: [
+        Padding(
+          padding: const EdgeInsets.only(left: 0, right: 10),
+          child: Icon(Icons.store, color: primaryColor),
+        ),
+        Expanded(
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Padding(
+                padding: const EdgeInsets.only(right: 18.0),
+                child: LocalText(
+                  context,
+                  "processing.market",
+                  color: Colors.black54,
+                  fontSize: 16,
+                ),
+              ),
+              DropdownButton<String>(
+                isDense: true,
+                value: selectedMarket,
+                style: TextStyle(color: Colors.black, fontSize: 14),
+                underline: Container(
+                  height: 1,
+                  color: Colors.grey,
+                ),
+                onChanged: (String newValue) {
+                  setState(() {
+                    if (newValue == MANAGE_MARKET) {
+                      selectedMarket = null;
+                      _manageMarket();
+                      return;
+                    }
+                    selectedMarket = newValue;
+                  });
+                },
+                isExpanded: true,
+                items: markets.map<DropdownMenuItem<String>>((String value) {
+                  return DropdownMenuItem<String>(
+                    value: value,
+                    child: Text(value ?? "",
+                        overflow: TextOverflow.ellipsis,
+                        style: TextStyle(
+                            color: value == MANAGE_MARKET
+                                ? secondaryColor
+                                : primaryColor)),
+                  );
+                }).toList(),
+              ),
+            ],
+          ),
+        ),
+      ],
+    );
+  }
+
+  _manageMarket() {
+    Navigator.push<Package>(
+      context,
+      CupertinoPageRoute(builder: (context) => MarketEditor()),
+    );
+  }
+
+  _scan() async {
+    PermissionStatus permission =
+        await PermissionHandler().checkPermissionStatus(PermissionGroup.camera);
+    if (permission != PermissionStatus.granted) {
+      Map<PermissionGroup, PermissionStatus> permissions =
+          await PermissionHandler()
+              .requestPermissions([PermissionGroup.camera]);
+      if (permissions[PermissionGroup.camera] != PermissionStatus.granted) {
+        showMsgDialog(context, "Error", "Camera permission is not granted");
+        return null;
+      }
+    }
+
+    try {
+      String barcode = await scanBarcode();
+      if (barcode != null) {
+        setState(() {
+          _trackingIDCtl.text = barcode;
+        });
+      }
+    } catch (e) {
+      print('error: $e');
+    }
+  }
+
+  _selectPackage() async {
+    Package package = Package();
+    package.id = _package.id;
+    package.trackingID = _package.trackingID;
+    package.market = selectedMarket;
+    package.desc = _descCtl.text;
+    package.remark = _remarkCtl.text;
+    setState(() {
+      _isLoading = true;
+    });
+    ProcessingModel processingModel =
+        Provider.of<ProcessingModel>(context, listen: false);
+    try {
+      if (_isNew) {
+        await processingModel.createPackage(
+            package, multiImgController.getAddedFile);
+      } else {
+        await processingModel.updatePackage(package,
+            multiImgController.getAddedFile, multiImgController.getDeletedUrl);
+      }
+      Navigator.pop(context, true);
+    } catch (e) {
+      showMsgDialog(context, "Error", e.toString());
+    } finally {
+      setState(() {
+        _isLoading = false;
+      });
+    }
+  }
+}

lib/pages/processing/processing_editor.dart

@@ -1,69 +1,72 @@
-import 'package:fcs/domain/entities/market.dart';
+import 'dart:io';
+
 import 'package:fcs/domain/entities/package.dart';
+import 'package:fcs/domain/entities/processing.dart';
 import 'package:fcs/domain/entities/user.dart';
 import 'package:fcs/helpers/theme.dart';
-import 'package:fcs/pages/market/market_editor.dart';
-import 'package:fcs/pages/market/model/market_model.dart';
-import 'package:fcs/pages/package/model/package_model.dart';
-import 'package:fcs/pages/package/tracking_id_page.dart';
+import 'package:fcs/pages/carton/carton_package_table.dart';
 import 'package:fcs/pages/main/util.dart';
+import 'package:fcs/pages/package/model/package_model.dart';
 import 'package:fcs/pages/user_search/user_serach.dart';
-import 'package:fcs/pages/widgets/bottom_up_page_route.dart';
 import 'package:fcs/pages/widgets/display_text.dart';
 import 'package:fcs/pages/widgets/fcs_id_icon.dart';
-import 'package:fcs/pages/widgets/input_text.dart';
 import 'package:fcs/pages/widgets/local_text.dart';
-import 'package:fcs/pages/widgets/multi_img_controller.dart';
-import 'package:fcs/pages/widgets/multi_img_file.dart';
 import 'package:fcs/pages/widgets/progress.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_icons/flutter_icons.dart';
-import 'package:intl/intl.dart';
 import 'package:provider/provider.dart';
 
-class ProcessingEditor extends StatefulWidget {
-  final Package package;
-  ProcessingEditor({this.package});
+import 'model/processing_model.dart';
+import 'package_editor.dart';
 
+class ProcesingEditor extends StatefulWidget {
+  final Processing processing;
+  const ProcesingEditor({this.processing});
   @override
-  _ProcessingEditorState createState() => _ProcessingEditorState();
+  _ProcesingEditorState createState() => _ProcesingEditorState();
 }
 
-class _ProcessingEditorState extends State<ProcessingEditor> {
-  TextEditingController _remarkCtl = new TextEditingController();
-  TextEditingController _descCtl = new TextEditingController();
-
-  Package _package;
-  User _user;
+class _ProcesingEditorState extends State<ProcesingEditor> {
+  Processing processing = Processing();
   bool _isLoading = false;
+  bool _isNew;
+  User user;
+  User shipper;
+  List<Package> packages = [];
 
   @override
   void initState() {
     super.initState();
-    _package = widget.package;
-    selectedMarket = _package.market ?? "";
-    _descCtl.text = _package.desc;
-    _remarkCtl.text = _package.remark;
-    multiImgController.setImageUrls = _package.photoUrls;
-    _user = User(
-        fcsID: _package.fcsID ?? "",
-        name: _package.userName ?? "",
-        phoneNumber: _package.phoneNumber ?? "");
+    _isNew = widget.processing == null;
+    if (!_isNew) {
+      processing = widget.processing;
+      user = User(
+          fcsID: processing.userID,
+          name: processing.userName,
+          phoneNumber: processing.userPhoneNumber);
+      shipper = User(
+          fcsID: processing.fcsID,
+          name: processing.shipperName,
+          phoneNumber: processing.shipperPhoneNumber);
+      packages = processing.packages;
+    } else {
+      packages = [
+        Package(trackingID: "REC 4", market: "New Market"),
+        Package(trackingID: "REC 3", market: "Macy"),
+        Package(trackingID: "REC 2", market: "New Market"),
+        Package(trackingID: "REC 1", market: "New Market")
+      ];
+    }
   }
 
-  final DateFormat dateFormat = DateFormat("d MMM yyyy");
-
-  bool isNew = false;
-  MultiImgController multiImgController = MultiImgController();
-
   @override
   Widget build(BuildContext context) {
     var fcsIDBox = Row(
       children: <Widget>[
         Expanded(
             child: DisplayText(
-          text: _user.fcsID,
+          text: user != null ? user.fcsID : "",
           labelTextKey: "processing.fcs.id",
           icon: FcsIDIcon(),
         )),
@@ -71,184 +74,261 @@ class _ProcessingEditorState extends State<ProcessingEditor> {
             icon: Icon(Icons.search, color: primaryColor),
             onPressed: () => searchUser(context, callbackUserSelect: (u) {
                   setState(() {
-                    this._user = u;
+                    this.user = u;
                   });
                 })),
       ],
     );
-    final namebox = DisplayText(
-      text: _user.name,
-      labelTextKey: "processing.name",
-      iconData: Icons.person,
-    );
+
     final phoneNumberBox = DisplayText(
-      text: _user.phoneNumber,
+      text: user != null ? user.phoneNumber : "",
       labelTextKey: "processing.phone",
+      maxLines: 2,
       iconData: Icons.phone,
     );
 
-    final trackingIdBox = DisplayText(
-      text: _package.trackingID,
-      labelTextKey: "processing.tracking.id",
-      iconData: MaterialCommunityIcons.barcode_scan,
+    final namebox = DisplayText(
+      text: user != null ? user.name : "",
+      labelTextKey: "processing.consignee.name",
+      maxLines: 2,
+      iconData: Icons.person,
     );
-    final completeProcessingBtn = fcsButton(
-      context,
-      getLocalString(context, 'processing.edit.complete.btn'),
-      callack: _completeProcessing,
-    );
-    final descBox = InputText(
-        labelTextKey: 'processing.desc',
-        iconData: MaterialCommunityIcons.message_text_outline,
-        controller: _descCtl);
-    final remarkBox = InputText(
-        labelTextKey: 'processing.remark',
-        iconData: Entypo.new_message,
-        controller: _remarkCtl);
 
-    final img = MultiImageFile(
-      enabled: true,
-      controller: multiImgController,
-      title: "Receipt File",
-    );
-    return LocalProgress(
-      inAsyncCall: _isLoading,
-      child: Scaffold(
-        appBar: AppBar(
-          centerTitle: true,
-          leading: new IconButton(
-            icon: new Icon(CupertinoIcons.back, color: primaryColor, size: 30),
-            onPressed: () => Navigator.of(context).pop(),
-          ),
-          shadowColor: Colors.transparent,
-          backgroundColor: Colors.white,
-          title: LocalText(
-            context,
-            "processing.edit.title",
-            fontSize: 20,
-            color: primaryColor,
-          ),
-        ),
-        body: Padding(
-          padding: const EdgeInsets.all(8.0),
-          child: ListView(
-            children: [
-              trackingIdBox,
-              fcsIDBox,
-              namebox,
-              phoneNumberBox,
-              marketDropdown(),
-              descBox,
-              remarkBox,
-              img,
-              completeProcessingBtn,
-              SizedBox(
-                height: 20,
-              )
-            ],
-          ),
-        ),
+    final consigneeBox = Container(
+      child: Column(
+        children: [
+          fcsIDBox,
+          phoneNumberBox,
+          namebox,
+        ],
       ),
     );
-  }
 
-  String selectedMarket;
-  Widget marketDropdown() {
-    List<Market> _markets = Provider.of<MarketModel>(context).markets;
-    List<String> markets = _markets.map((e) => e.name).toList();
-    markets.insert(0, MANAGE_MARKET);
-    if (!markets.contains(selectedMarket)) {
-      markets.insert(0, selectedMarket);
-    }
+    var shipperIDBox = Row(
+      children: <Widget>[
+        Expanded(
+            child: DisplayText(
+          text: shipper != null ? shipper.fcsID : "",
+          labelTextKey: "processing.fcs.id",
+          icon: FcsIDIcon(),
+        )),
+        IconButton(
+            icon: Icon(Icons.search, color: primaryColor),
+            onPressed: () => searchUser(context, callbackUserSelect: (u) {
+                  setState(() {
+                    this.shipper = u;
+                  });
+                })),
+      ],
+    );
 
-    return Padding(
-      padding: const EdgeInsets.only(left: 5.0, right: 0),
-      child: Row(
+    final shipperPhoneNumberBox = DisplayText(
+      text: shipper != null ? shipper.phoneNumber : "",
+      labelTextKey: "processing.phone",
+      maxLines: 2,
+      iconData: Icons.phone,
+    );
+
+    final shipperNamebox = DisplayText(
+      text: shipper != null ? shipper.name : "",
+      labelTextKey: "processing.shipper.name",
+      maxLines: 2,
+      iconData: Icons.person,
+    );
+
+    final shipperBox = Container(
+      child: Column(
         children: [
-          Padding(
-            padding: const EdgeInsets.only(left: 0, right: 10),
-            child: Icon(Icons.store, color: primaryColor),
+          shipperIDBox,
+          shipperPhoneNumberBox,
+          shipperNamebox,
+        ],
+      ),
+    );
+
+    final packageTitleBox = Container(
+      child: Row(
+        mainAxisAlignment: MainAxisAlignment.end,
+        children: [
+          Text("Packages (${packages.length})"),
+          IconButton(
+              icon: Icon(
+                Icons.add_circle,
+                color: primaryColor,
+              ),
+              onPressed: () async {
+                Navigator.push(
+                  context,
+                  CupertinoPageRoute(builder: (context) => PackageEditor()),
+                );
+              }),
+        ],
+      ),
+    );
+
+    final createButton = fcsButton(
+      context,
+      getLocalString(context, 'processing.edit.complete.btn'),
+      callack: _save,
+    );
+
+    final updateButton = fcsButton(
+      context,
+      getLocalString(context, 'processing.edit.complete.btn'),
+      callack: _save,
+    );
+
+    return LocalProgress(
+        inAsyncCall: _isLoading,
+        child: Scaffold(
+          appBar: AppBar(
+            centerTitle: true,
+            leading: new IconButton(
+              icon:
+                  new Icon(CupertinoIcons.back, color: primaryColor, size: 30),
+              onPressed: () => Navigator.of(context).pop(),
+            ),
+            shadowColor: Colors.transparent,
+            backgroundColor: Colors.white,
+            title: LocalText(
+              context,
+              _isNew ? "processing.create" : "processing.update",
+              fontSize: 20,
+              color: primaryColor,
+            ),
           ),
-          Expanded(
-            child: Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                Padding(
-                  padding: const EdgeInsets.only(right: 18.0),
-                  child: LocalText(
-                    context,
-                    "processing.market",
-                    color: Colors.black54,
-                    fontSize: 16,
-                  ),
+          body: Padding(
+            padding: const EdgeInsets.only(left: 12.0, right: 12),
+            child: ListView(
+              children: <Widget>[
+                SizedBox(
+                  height: 10,
                 ),
-                DropdownButton<String>(
-                  isDense: true,
-                  value: selectedMarket,
-                  style: TextStyle(color: Colors.black, fontSize: 14),
-                  underline: Container(
-                    height: 1,
-                    color: Colors.grey,
-                  ),
-                  onChanged: (String newValue) {
-                    setState(() {
-                      if (newValue == MANAGE_MARKET) {
-                        selectedMarket = null;
-                        _manageMarket();
-                        return;
-                      }
-                      selectedMarket = newValue;
-                    });
-                  },
-                  isExpanded: true,
-                  items: markets.map<DropdownMenuItem<String>>((String value) {
-                    return DropdownMenuItem<String>(
-                      value: value,
-                      child: Text(value ?? "",
-                          overflow: TextOverflow.ellipsis,
-                          style: TextStyle(
-                              color: value == MANAGE_MARKET
-                                  ? secondaryColor
-                                  : primaryColor)),
-                    );
-                  }).toList(),
+                Row(
+                  children: [
+                    Flexible(child: consigneeBox),
+                    Flexible(child: shipperBox)
+                  ],
+                ),
+                Divider(),
+                packageTitleBox,
+                Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: _getPackages(context, packages),
+                ),
+                SizedBox(
+                  height: 20,
+                ),
+                _isNew ? createButton : updateButton,
+                SizedBox(
+                  height: 10,
                 ),
               ],
             ),
           ),
-        ],
-      ),
-    );
+        ));
   }
 
-  _manageMarket() {
-    Navigator.push<Package>(
-      context,
-      CupertinoPageRoute(builder: (context) => MarketEditor()),
-    );
+  List<Widget> _getPackages(BuildContext context, List<Package> packages) {
+    return packages.map((p) {
+      return Container(
+        decoration: BoxDecoration(
+          border: Border(
+            bottom: BorderSide(color: Colors.grey[300]),
+          ),
+        ),
+        child: InkWell(
+          onTap: () {
+            Navigator.of(context).push(CupertinoPageRoute(
+                builder: (context) => PackageEditor(package: p)));
+          },
+          child: Row(
+            children: <Widget>[
+              Expanded(
+                child: new Padding(
+                  padding: const EdgeInsets.symmetric(vertical: 5.0),
+                  child: new Row(
+                    children: <Widget>[
+                      new Padding(
+                        padding: new EdgeInsets.symmetric(
+                            horizontal: 30.0 - 15.0 / 2),
+                        child: Stack(
+                          alignment: AlignmentDirectional.bottomEnd,
+                          children: [
+                            Icon(
+                              Octicons.package,
+                              color: primaryColor,
+                              size: 30,
+                            ),
+                          ],
+                        ),
+                      ),
+                      new Expanded(
+                        child: new Column(
+                          crossAxisAlignment: CrossAxisAlignment.start,
+                          children: <Widget>[
+                            new Text(
+                              p.trackingID,
+                              style: new TextStyle(fontSize: 15.0),
+                            ),
+                          ],
+                        ),
+                      ),
+                      IconButton(
+                        icon: Icon(Icons.remove, color: primaryColor),
+                        onPressed: () => _remove(p),
+                      )
+                    ],
+                  ),
+                ),
+              ),
+            ],
+          ),
+        ),
+      );
+    }).toList();
   }
 
-  _completeProcessing() async {
-    if (_descCtl.text == "") {
-      showMsgDialog(context, "Error", "Expected some description");
-      return;
-    }
-    if (_user.fcsID == null || _user.fcsID == "") {
-      showMsgDialog(context, "Error", "Expected FCS-ID");
+  _remove(Package package) {
+    if (package == null) {
+      showMsgDialog(context, "Esrror", "Invalid package!");
       return;
     }
+    showConfirmDialog(context, "processing.package.delete_confirm",
+        () => _removePackage(package));
+  }
+
+  _removePackage(Package package) async {
     setState(() {
       _isLoading = true;
     });
-    PackageModel packageModel =
-        Provider.of<PackageModel>(context, listen: false);
+    ProcessingModel processingModel =
+        Provider.of<ProcessingModel>(context, listen: false);
     try {
-      _package.fcsID = _user.fcsID;
-      _package.desc = _descCtl.text;
-      _package.remark = _remarkCtl.text;
-      _package.market = selectedMarket;
-      await packageModel.updateProcessing(_package,
-          multiImgController.getAddedFile, multiImgController.getDeletedUrl);
+      await processingModel.deletePackage(package.id);
+    } catch (e) {
+      showMsgDialog(context, "Error", e.toString());
+    } finally {
+      setState(() {
+        _isLoading = false;
+      });
+    }
+  }
+
+  _save() async {
+    setState(() {
+      _isLoading = true;
+    });
+
+    ProcessingModel processingModel =
+        Provider.of<ProcessingModel>(context, listen: false);
+    try {
+      if (_isNew) {
+        await processingModel.createProcessing(processing);
+      } else {
+        processing.id = widget.processing.id;
+        await processingModel.updateProcessing(processing);
+      }
       Navigator.pop(context);
     } catch (e) {
       showMsgDialog(context, "Error", e.toString());

lib/pages/processing/processing_editor_old.dart

@@ -0,0 +1,261 @@
+import 'package:fcs/domain/entities/market.dart';
+import 'package:fcs/domain/entities/package.dart';
+import 'package:fcs/domain/entities/user.dart';
+import 'package:fcs/helpers/theme.dart';
+import 'package:fcs/pages/market/market_editor.dart';
+import 'package:fcs/pages/market/model/market_model.dart';
+import 'package:fcs/pages/package/model/package_model.dart';
+import 'package:fcs/pages/package/tracking_id_page.dart';
+import 'package:fcs/pages/main/util.dart';
+import 'package:fcs/pages/user_search/user_serach.dart';
+import 'package:fcs/pages/widgets/bottom_up_page_route.dart';
+import 'package:fcs/pages/widgets/display_text.dart';
+import 'package:fcs/pages/widgets/fcs_id_icon.dart';
+import 'package:fcs/pages/widgets/input_text.dart';
+import 'package:fcs/pages/widgets/local_text.dart';
+import 'package:fcs/pages/widgets/multi_img_controller.dart';
+import 'package:fcs/pages/widgets/multi_img_file.dart';
+import 'package:fcs/pages/widgets/progress.dart';
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_icons/flutter_icons.dart';
+import 'package:intl/intl.dart';
+import 'package:provider/provider.dart';
+
+class ProcessingEditor extends StatefulWidget {
+  final Package package;
+  ProcessingEditor({this.package});
+
+  @override
+  _ProcessingEditorState createState() => _ProcessingEditorState();
+}
+
+class _ProcessingEditorState extends State<ProcessingEditor> {
+  TextEditingController _remarkCtl = new TextEditingController();
+  TextEditingController _descCtl = new TextEditingController();
+
+  Package _package;
+  User _user;
+  bool _isLoading = false;
+
+  @override
+  void initState() {
+    super.initState();
+    _package = widget.package;
+    selectedMarket = _package.market ?? "";
+    _descCtl.text = _package.desc;
+    _remarkCtl.text = _package.remark;
+    multiImgController.setImageUrls = _package.photoUrls;
+    _user = User(
+        fcsID: _package.fcsID ?? "",
+        name: _package.userName ?? "",
+        phoneNumber: _package.phoneNumber ?? "");
+  }
+
+  final DateFormat dateFormat = DateFormat("d MMM yyyy");
+
+  bool isNew = false;
+  MultiImgController multiImgController = MultiImgController();
+
+  @override
+  Widget build(BuildContext context) {
+    var fcsIDBox = Row(
+      children: <Widget>[
+        Expanded(
+            child: DisplayText(
+          text: _user.fcsID,
+          labelTextKey: "processing.fcs.id",
+          icon: FcsIDIcon(),
+        )),
+        IconButton(
+            icon: Icon(Icons.search, color: primaryColor),
+            onPressed: () => searchUser(context, callbackUserSelect: (u) {
+                  setState(() {
+                    this._user = u;
+                  });
+                })),
+      ],
+    );
+    final namebox = DisplayText(
+      text: _user.name,
+      labelTextKey: "processing.name",
+      iconData: Icons.person,
+    );
+    final phoneNumberBox = DisplayText(
+      text: _user.phoneNumber,
+      labelTextKey: "processing.phone",
+      iconData: Icons.phone,
+    );
+
+    final trackingIdBox = DisplayText(
+      text: _package.trackingID,
+      labelTextKey: "processing.tracking.id",
+      iconData: MaterialCommunityIcons.barcode_scan,
+    );
+    final completeProcessingBtn = fcsButton(
+      context,
+      getLocalString(context, 'processing.edit.complete.btn'),
+      callack: _completeProcessing,
+    );
+    final descBox = InputText(
+        labelTextKey: 'processing.desc',
+        iconData: MaterialCommunityIcons.message_text_outline,
+        controller: _descCtl);
+    final remarkBox = InputText(
+        labelTextKey: 'processing.remark',
+        iconData: Entypo.new_message,
+        controller: _remarkCtl);
+
+    final img = MultiImageFile(
+      enabled: true,
+      controller: multiImgController,
+      title: "Receipt File",
+    );
+    return LocalProgress(
+      inAsyncCall: _isLoading,
+      child: Scaffold(
+        appBar: AppBar(
+          centerTitle: true,
+          leading: new IconButton(
+            icon: new Icon(CupertinoIcons.back, color: primaryColor, size: 30),
+            onPressed: () => Navigator.of(context).pop(),
+          ),
+          shadowColor: Colors.transparent,
+          backgroundColor: Colors.white,
+          title: LocalText(
+            context,
+            "processing.edit.title",
+            fontSize: 20,
+            color: primaryColor,
+          ),
+        ),
+        body: Padding(
+          padding: const EdgeInsets.all(8.0),
+          child: ListView(
+            children: [
+              trackingIdBox,
+              fcsIDBox,
+              namebox,
+              phoneNumberBox,
+              marketDropdown(),
+              descBox,
+              remarkBox,
+              img,
+              completeProcessingBtn,
+              SizedBox(
+                height: 20,
+              )
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+
+  String selectedMarket;
+  Widget marketDropdown() {
+    List<Market> _markets = Provider.of<MarketModel>(context).markets;
+    List<String> markets = _markets.map((e) => e.name).toList();
+    markets.insert(0, MANAGE_MARKET);
+    if (!markets.contains(selectedMarket)) {
+      markets.insert(0, selectedMarket);
+    }
+
+    return Padding(
+      padding: const EdgeInsets.only(left: 5.0, right: 0),
+      child: Row(
+        children: [
+          Padding(
+            padding: const EdgeInsets.only(left: 0, right: 10),
+            child: Icon(Icons.store, color: primaryColor),
+          ),
+          Expanded(
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Padding(
+                  padding: const EdgeInsets.only(right: 18.0),
+                  child: LocalText(
+                    context,
+                    "processing.market",
+                    color: Colors.black54,
+                    fontSize: 16,
+                  ),
+                ),
+                DropdownButton<String>(
+                  isDense: true,
+                  value: selectedMarket,
+                  style: TextStyle(color: Colors.black, fontSize: 14),
+                  underline: Container(
+                    height: 1,
+                    color: Colors.grey,
+                  ),
+                  onChanged: (String newValue) {
+                    setState(() {
+                      if (newValue == MANAGE_MARKET) {
+                        selectedMarket = null;
+                        _manageMarket();
+                        return;
+                      }
+                      selectedMarket = newValue;
+                    });
+                  },
+                  isExpanded: true,
+                  items: markets.map<DropdownMenuItem<String>>((String value) {
+                    return DropdownMenuItem<String>(
+                      value: value,
+                      child: Text(value ?? "",
+                          overflow: TextOverflow.ellipsis,
+                          style: TextStyle(
+                              color: value == MANAGE_MARKET
+                                  ? secondaryColor
+                                  : primaryColor)),
+                    );
+                  }).toList(),
+                ),
+              ],
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  _manageMarket() {
+    Navigator.push<Package>(
+      context,
+      CupertinoPageRoute(builder: (context) => MarketEditor()),
+    );
+  }
+
+  _completeProcessing() async {
+    if (_descCtl.text == "") {
+      showMsgDialog(context, "Error", "Expected some description");
+      return;
+    }
+    if (_user.fcsID == null || _user.fcsID == "") {
+      showMsgDialog(context, "Error", "Expected FCS-ID");
+      return;
+    }
+    setState(() {
+      _isLoading = true;
+    });
+    PackageModel packageModel =
+        Provider.of<PackageModel>(context, listen: false);
+    try {
+      _package.fcsID = _user.fcsID;
+      _package.desc = _descCtl.text;
+      _package.remark = _remarkCtl.text;
+      _package.market = selectedMarket;
+      await packageModel.updateProcessing(_package,
+          multiImgController.getAddedFile, multiImgController.getDeletedUrl);
+      Navigator.pop(context);
+    } catch (e) {
+      showMsgDialog(context, "Error", e.toString());
+    } finally {
+      setState(() {
+        _isLoading = false;
+      });
+    }
+  }
+}

lib/pages/processing/processing_info.dart

@@ -16,7 +16,7 @@ import 'package:flutter_icons/flutter_icons.dart';
 import 'package:intl/intl.dart';
 import 'package:provider/provider.dart';
 
-import 'processing_editor.dart';
+import 'processing_editor_old.dart';
 
 final DateFormat dateFormat = DateFormat("d MMM yyyy");
 

lib/pages/processing/processing_list.dart

@@ -1,6 +1,5 @@
 import 'package:fcs/domain/entities/package.dart';
 import 'package:fcs/helpers/theme.dart';
-import 'package:fcs/pages/main/model/main_model.dart';
 import 'package:fcs/pages/package/model/package_model.dart';
 import 'package:fcs/pages/package_search/package_serach.dart';
 import 'package:fcs/pages/widgets/local_text.dart';
@@ -10,6 +9,7 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 
+import 'processing_editor.dart';
 import 'processing_info.dart';
 import 'processing_list_row.dart';
 
@@ -64,6 +64,14 @@ class _ProcessingListState extends State<ProcessingList> {
               ),
             ],
           ),
+          floatingActionButton: FloatingActionButton.extended(
+            onPressed: () {
+              _newProcessing();
+            },
+            icon: Icon(Icons.add),
+            label: LocalText(context, "processing.new", color: Colors.white),
+            backgroundColor: primaryColor,
+          ),
           body: PaginatorListView<Package>(
             paginatorListener: packages,
             rowBuilder: (p) => ProcessingListRow(
@@ -85,4 +93,11 @@ class _ProcessingListState extends State<ProcessingList> {
           builder: (context) => ProcessingInfo(package: _package)),
     );
   }
+
+  _newProcessing() {
+    Navigator.push(
+      context,
+      CupertinoPageRoute(builder: (context) => ProcesingEditor()),
+    );
+  }
 }