add packages, receiving & processing

lib/pages/processing/processing_editor.dart

@@ -1,13 +1,16 @@
 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';
@@ -31,6 +34,7 @@ class _ProcessingEditorState extends State<ProcessingEditor> {
   TextEditingController _descCtl = new TextEditingController();
 
   Package _package;
+  User _user;
   bool _isLoading = false;
 
   @override
@@ -41,6 +45,10 @@ class _ProcessingEditorState extends State<ProcessingEditor> {
     _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");
@@ -50,21 +58,39 @@ class _ProcessingEditorState extends State<ProcessingEditor> {
 
   @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 statusBox = DisplayText(
-      text: _package.currentStatus,
-      labelTextKey: "processing.status",
-      iconData: AntDesign.exclamationcircleo,
-    );
-    final customerNameBox = DisplayText(
-      text: _package.userName,
-      labelTextKey: "processing.name",
-      iconData: Icons.perm_identity,
-    );
     final completeProcessingBtn = fcsButton(
       context,
       getLocalString(context, 'processing.edit.complete.btn'),
@@ -101,44 +127,19 @@ class _ProcessingEditorState extends State<ProcessingEditor> {
             fontSize: 20,
             color: primaryColor,
           ),
-          actions: [
-            IconButton(
-              icon: Icon(Icons.delete, color: primaryColor),
-              onPressed: _delete,
-            )
-          ],
         ),
         body: Padding(
           padding: const EdgeInsets.all(8.0),
           child: ListView(
             children: [
               trackingIdBox,
-              customerNameBox,
-              statusBox,
-              Divider(),
-              Center(
-                child: Padding(
-                  padding: const EdgeInsets.all(8.0),
-                  child: LocalText(
-                    context,
-                    "processing.edit.sub_title",
-                    color: primaryColor,
-                    fontSize: 16,
-                    fontWeight: FontWeight.w700,
-                  ),
-                ),
-              ),
-              Padding(
-                padding: const EdgeInsets.only(left: 18.0, right: 10),
-                child: Column(
-                  children: [
-                    marketDropdown(),
-                    descBox,
-                    remarkBox,
-                    img,
-                  ],
-                ),
-              ),
+              fcsIDBox,
+              namebox,
+              phoneNumberBox,
+              marketDropdown(),
+              descBox,
+              remarkBox,
+              img,
               completeProcessingBtn,
               SizedBox(
                 height: 20,
@@ -159,51 +160,54 @@ class _ProcessingEditorState extends State<ProcessingEditor> {
       markets.insert(0, selectedMarket);
     }
 
-    return Row(
-      children: [
-        Padding(
-          padding: const EdgeInsets.only(right: 18.0),
-          child: LocalText(
-            context,
-            "processing.market",
-            color: primaryColor,
-            fontSize: 16,
-          ),
-        ),
-        Container(
-          width: 150,
-          child: DropdownButton<String>(
-            value: selectedMarket,
-            style: TextStyle(color: Colors.black, fontSize: 14),
-            underline: Container(
-              height: 1,
-              color: Colors.grey,
+    return Padding(
+      padding: const EdgeInsets.only(left: 8.0),
+      child: Row(
+        children: [
+          Padding(
+            padding: const EdgeInsets.only(right: 18.0),
+            child: LocalText(
+              context,
+              "processing.market",
+              color: primaryColor,
+              fontSize: 16,
             ),
-            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(),
           ),
-        ),
-      ],
+          Container(
+            width: 150,
+            child: DropdownButton<String>(
+              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(),
+            ),
+          ),
+        ],
+      ),
     );
   }
 
@@ -219,16 +223,21 @@ class _ProcessingEditorState extends State<ProcessingEditor> {
       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.completeProcessing(_package,
+      await packageModel.updateProcessing(_package,
           multiImgController.getAddedFile, multiImgController.getDeletedUrl);
       Navigator.pop(context);
     } catch (e) {
@@ -239,26 +248,4 @@ class _ProcessingEditorState extends State<ProcessingEditor> {
       });
     }
   }
-
-  _delete() {
-    showConfirmDialog(context, "processing.delete.confirm", _deletePackage);
-  }
-
-  _deletePackage() async {
-    setState(() {
-      _isLoading = true;
-    });
-    PackageModel packageModel =
-        Provider.of<PackageModel>(context, listen: false);
-    try {
-      await packageModel.deletePackage(_package);
-      Navigator.pop<bool>(context, true);
-    } catch (e) {
-      showMsgDialog(context, "Error", e.toString());
-    } finally {
-      setState(() {
-        _isLoading = false;
-      });
-    }
-  }
 }

lib/pages/processing/processing_info.dart

@@ -1,6 +1,7 @@
 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/main/util.dart';
 import 'package:fcs/pages/package/model/package_model.dart';
 import 'package:fcs/pages/widgets/bottom_up_page_route.dart';
 import 'package:fcs/pages/widgets/display_text.dart';
@@ -8,6 +9,7 @@ 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:fcs/pages/widgets/status_tree.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_icons/flutter_icons.dart';
 import 'package:intl/intl.dart';
@@ -53,8 +55,6 @@ class _ProcessingInfoState extends State<ProcessingInfo> {
 
   @override
   Widget build(BuildContext context) {
-    bool isCustomer = Provider.of<MainModel>(context).isCustomer();
-
     final trackingIdBox = DisplayText(
       text: _package.trackingID,
       labelTextKey: "processing.tracking.id",
@@ -65,11 +65,6 @@ class _ProcessingInfoState extends State<ProcessingInfo> {
       labelTextKey: "processing.name",
       iconData: Icons.perm_identity,
     );
-    final statusBox = DisplayText(
-      text: _package.currentStatus,
-      labelTextKey: "processing.status",
-      iconData: AntDesign.exclamationcircleo,
-    );
     final marketBox = DisplayText(
       text: _package.market ?? "-",
       labelTextKey: "processing.market",
@@ -109,12 +104,14 @@ class _ProcessingInfoState extends State<ProcessingInfo> {
             color: primaryColor,
           ),
           actions: <Widget>[
-            isCustomer
-                ? Container()
-                : IconButton(
-                    icon: Icon(Icons.edit, color: primaryColor),
-                    onPressed: _gotoEditor,
-                  )
+            IconButton(
+              icon: Icon(Icons.delete, color: primaryColor),
+              onPressed: _delete,
+            ),
+            IconButton(
+              icon: Icon(Icons.edit, color: primaryColor),
+              onPressed: _gotoEditor,
+            ),
           ],
         ),
         body: Card(
@@ -127,27 +124,12 @@ class _ProcessingInfoState extends State<ProcessingInfo> {
                   trackingIdBox,
                   customerNameBox,
                   marketBox,
-                  statusBox,
                   _package.photoUrls.length == 0 ? Container() : img,
                   descBox,
                   remarkBox,
-                  ExpansionTile(
-                    initiallyExpanded: true,
-                    title: Text(
-                      'Status',
-                      style: TextStyle(
-                          color: primaryColor, fontWeight: FontWeight.bold),
-                    ),
-                    children: <Widget>[
-                      Container(
-                        padding: EdgeInsets.only(left: 20),
-                        height: 400,
-                        child: Timeline(
-                            children: _models(),
-                            position: TimelinePosition.Left),
-                      ),
-                    ],
-                  ),
+                  StatusTree(
+                      shipmentHistory: _package.shipmentHistory,
+                      currentStatus: _package.currentStatus),
                   SizedBox(
                     height: 20,
                   )
@@ -160,36 +142,26 @@ class _ProcessingInfoState extends State<ProcessingInfo> {
     );
   }
 
-  List<TimelineModel> _models() {
-    if (_package.shipmentHistory == null) return [];
-    return _package.shipmentHistory
-        .map((e) => TimelineModel(
-            Padding(
-              padding: const EdgeInsets.all(18.0),
-              child: Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: <Widget>[
-                  Text(e.status,
-                      style: TextStyle(
-                          color: e.done ? primaryColor : Colors.grey,
-                          fontSize: 16,
-                          fontWeight: FontWeight.bold)),
-                  Text(dateFormat.format(e.date)),
-                ],
-              ),
-            ),
-            iconBackground: e.done ? primaryColor : Colors.grey,
-            icon: Icon(
-              e.status == "shipped"
-                  ? Ionicons.ios_airplane
-                  : e.status == "delivered"
-                      ? MaterialCommunityIcons.truck_fast
-                      : e.status == "processed"
-                          ? MaterialIcons.check
-                          : Octicons.package,
-              color: Colors.white,
-            )))
-        .toList();
+  _delete() {
+    showConfirmDialog(context, "processing.delete.confirm", _deletePackage);
+  }
+
+  _deletePackage() async {
+    setState(() {
+      _isLoading = true;
+    });
+    PackageModel packageModel =
+        Provider.of<PackageModel>(context, listen: false);
+    try {
+      await packageModel.deleteProcessing(_package);
+      Navigator.pop<bool>(context, true);
+    } catch (e) {
+      showMsgDialog(context, "Error", e.toString());
+    } finally {
+      setState(() {
+        _isLoading = false;
+      });
+    }
   }
 
   _gotoEditor() async {

lib/pages/processing/processing_list.dart

@@ -1,10 +1,8 @@
 import 'package:fcs/domain/entities/package.dart';
 import 'package:fcs/helpers/theme.dart';
-import 'package:fcs/localization/app_translations.dart';
 import 'package:fcs/pages/main/model/main_model.dart';
 import 'package:fcs/pages/package/model/package_model.dart';
 import 'package:fcs/pages/package/package_info.dart';
-import 'package:fcs/pages/package/package_new.dart';
 import 'package:fcs/pages/package_search/package_serach.dart';
 import 'package:fcs/pages/widgets/bottom_up_page_route.dart';
 import 'package:fcs/pages/widgets/local_text.dart';
@@ -13,6 +11,7 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 
+import 'processing_info.dart';
 import 'processing_list_row.dart';
 
 class ProcessingList extends StatefulWidget {
@@ -91,7 +90,7 @@ class _ProcessingListState extends State<ProcessingList> {
     if (_package == null) return;
     Navigator.push(
       context,
-      BottomUpPageRoute(PackageInfo(package: _package)),
+      BottomUpPageRoute(ProcessingInfo(package: _package)),
     );
   }
 }