Merge branch 'master' of https://git.mokkon.com/sainw/fcs

2020-10-15 19:41:41 +06:30
parent 9d59e59e4d ff12b2c24b
commit bcbcfd71ee
32 changed files with 1461 additions and 634 deletions
--- a/lib/pages/fcs_shipment/fcs_shipment_editor.dart
+++ b/lib/pages/fcs_shipment/fcs_shipment_editor.dart
@@ -100,7 +100,6 @@ class _FcsShipmentEditorState extends State<FcsShipmentEditor> {
            color: primaryColor,
            fontSize: 18,
          ),
-          actions: _isNew ? [] : [menuPopWidget(context)],
        ),
        body: Padding(
          padding: const EdgeInsets.all(10.0),
@@ -175,59 +174,6 @@ class _FcsShipmentEditorState extends State<FcsShipmentEditor> {
    );
  }

-  Widget menuPopWidget(BuildContext context) {
-    return PopupMenuButton<PopupMenu>(
-        elevation: 3.2,
-        icon: Icon(Icons.more_vert, color: primaryColor),
-        tooltip: 'This is tooltip',
-        onSelected: (choice) {
-          if (choice.id == 1) {
-            Navigator.pop(context);
-          } else if (choice.id == 2) {
-            Navigator.pop(context);
-          } else if (choice.id == 3) {
-            Navigator.pop(context);
-          } else if (choice.id == 4) {
-            Navigator.pop(context);
-          }
-        },
-        itemBuilder: (BuildContext context) {
-          List<PopupMenu> menuPopup = <PopupMenu>[
-            PopupMenu(
-              id: 3,
-              status: "FCSshipment.commercial_invoice",
-            ),
-            PopupMenu(id: 2, status: "FCSshipment.packing_list"),
-            PopupMenu(
-              id: 5,
-              status: "FCSshipment.dms",
-            ),
-            PopupMenu(
-              id: 4,
-              status: "FCSshipment.cargo_manifest",
-            ),
-          ];
-
-          return menuPopup.map((PopupMenu choice) {
-            return PopupMenuItem<PopupMenu>(
-              value: choice,
-              child: Row(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: <Widget>[
-                  Container(
-                      padding: EdgeInsets.only(left: 15),
-                      child: LocalText(
-                        context,
-                        choice.status,
-                        color: primaryColor,
-                      )),
-                ],
-              ),
-            );
-          }).toList();
-        });
-  }
-
  FcsShipment _getPayload() {
    FcsShipment fcsShipment = FcsShipment();
    fcsShipment.id = _shipment.id;
--- a/lib/pages/fcs_shipment/fcs_shipment_info.dart
+++ b/lib/pages/fcs_shipment/fcs_shipment_info.dart
@@ -0,0 +1,206 @@
+import 'package:fcs/domain/entities/fcs_shipment.dart';
+import 'package:fcs/helpers/theme.dart';
+import 'package:fcs/pages/widgets/display_text.dart';
+import 'package:fcs/pages/widgets/local_text.dart';
+import 'package:fcs/pages/widgets/popupmenu.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:font_awesome_flutter/font_awesome_flutter.dart';
+import 'package:intl/intl.dart';
+
+import 'fcs_shipment_editor.dart';
+
+class FcsShipmentInfo extends StatefulWidget {
+  final FcsShipment fcsShipment;
+  FcsShipmentInfo({this.fcsShipment});
+
+  @override
+  _FcsShipmentInfoState createState() => _FcsShipmentInfoState();
+}
+
+class _FcsShipmentInfoState extends State<FcsShipmentInfo> {
+  var dateFormatter = new DateFormat('dd MMM yyyy');
+  FcsShipment _fcsShipment;
+  bool _isLoading = false;
+  TextEditingController _shipmentNumberController = new TextEditingController();
+  TextEditingController _cutoffDateController = new TextEditingController();
+  TextEditingController _arrivalDateController = new TextEditingController();
+  TextEditingController _departureDateControler = new TextEditingController();
+  TextEditingController _shipmentTypeControler = new TextEditingController();
+  TextEditingController _consigneeController = new TextEditingController();
+  TextEditingController _portController = new TextEditingController();
+  TextEditingController _destinationController = new TextEditingController();
+  TextEditingController _statusController = new TextEditingController();
+
+  @override
+  void initState() {
+    super.initState();
+    _fcsShipment = widget.fcsShipment;
+    _shipmentNumberController.text = _fcsShipment.shipmentNumber;
+    _cutoffDateController.text = dateFormatter.format(_fcsShipment.cutoffDate);
+    _arrivalDateController.text =
+        dateFormatter.format(_fcsShipment.arrivalDate);
+    _departureDateControler.text =
+        dateFormatter.format(_fcsShipment.departureDate);
+    _shipmentTypeControler.text = _fcsShipment.shipType;
+    _consigneeController.text = _fcsShipment.consignee;
+    _portController.text = _fcsShipment.port;
+    _destinationController.text = _fcsShipment.destination;
+    _statusController.text = _fcsShipment.status;
+  }
+
+  @override
+  void dispose() {
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final shipmentNumberBox = DisplayText(
+      text: _shipmentNumberController.text,
+      labelTextKey: "FCSshipment.number",
+      iconData: Ionicons.ios_airplane,
+    );
+    final cutoffDateDBox = DisplayText(
+      text: _cutoffDateController.text,
+      labelTextKey: "FCSshipment.cutoff_date",
+      iconData: Icons.date_range,
+    );
+    final etaBox = DisplayText(
+      text: _arrivalDateController.text,
+      labelTextKey: "FCSshipment.ETA",
+      iconData: Icons.date_range,
+    );
+
+    final departureDateBox = DisplayText(
+      text: _departureDateControler.text,
+      labelTextKey: "FCSshipment.departure_date",
+      iconData: Icons.date_range,
+    );
+
+    final shipTypeBox = DisplayText(
+      text: _shipmentTypeControler.text,
+      labelTextKey: "FCSshipment.shipment_type",
+      iconData: Ionicons.ios_airplane,
+    );
+
+    final consigneeBox = DisplayText(
+      text: _consigneeController.text,
+      labelTextKey: "FCSshipment.consignee",
+      iconData: Icons.work,
+    );
+
+    final portBox = DisplayText(
+      text: _portController.text,
+      labelTextKey: "FCSshipment.port_of_loading",
+      iconData: FontAwesomeIcons.ship,
+    );
+
+    final destinationBox = DisplayText(
+      text: _destinationController.text,
+      labelTextKey: "FCSshipment.final_destination",
+      iconData: MaterialCommunityIcons.location_enter,
+    );
+
+    final statusBox = DisplayText(
+      text: _statusController.text,
+      labelTextKey: "FCSshipment.status",
+      iconData: Icons.av_timer,
+    );
+
+    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,
+            "FCSshipment.form.title",
+            fontSize: 20,
+            color: primaryColor,
+          ),
+          actions: [
+            IconButton(
+              icon: Icon(Icons.edit, color: primaryColor),
+              onPressed: _edit,
+            ),
+            menuPopWidget(context)
+          ],
+        ),
+        body: Card(
+          child: Column(
+            children: <Widget>[
+              Expanded(
+                  child: Padding(
+                padding: const EdgeInsets.all(10.0),
+                child: ListView(children: <Widget>[
+                  shipmentNumberBox,
+                  cutoffDateDBox,
+                  etaBox,
+                  departureDateBox,
+                  shipTypeBox,
+                  consigneeBox,
+                  portBox,
+                  destinationBox,
+                  statusBox,
+                  SizedBox(
+                    height: 20,
+                  )
+                ]),
+              )),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+
+  _edit() async {
+    await Navigator.push(
+      context,
+      CupertinoPageRoute(
+          builder: (context) => FcsShipmentEditor(shipment: _fcsShipment)),
+    );
+  }
+
+  Widget menuPopWidget(BuildContext context) {
+    return PopupMenuButton<PopupMenu>(
+        elevation: 3.2,
+        icon: Icon(Icons.more_vert, color: primaryColor),
+        tooltip: 'This is tooltip',
+        onSelected: (choice) {
+          print(choice.id);
+          if (choice.id == 1) {
+          } else if (choice.id == 2) {
+          } else if (choice.id == 3) {
+          } else if (choice.id == 4) {}
+        },
+        itemBuilder: (BuildContext context) {
+          return menuPopup.map((PopupMenu choice) {
+            return PopupMenuItem<PopupMenu>(
+              value: choice,
+              child: Row(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: <Widget>[
+                  Container(
+                      padding: EdgeInsets.only(left: 15),
+                      child: LocalText(
+                        context,
+                        choice.status,
+                        color: primaryColor,
+                      )),
+                ],
+              ),
+            );
+          }).toList();
+        });
+  }
+}
--- a/lib/pages/fcs_shipment/fcs_shipment_list.dart
+++ b/lib/pages/fcs_shipment/fcs_shipment_list.dart
@@ -1,4 +1,3 @@
-import 'package:fcs/helpers/paginator.dart';
 import 'package:fcs/helpers/theme.dart';
 import 'package:fcs/pages/fcs_shipment/model/fcs_shipment_model.dart';
 import 'package:fcs/pages/widgets/local_popup_menu_button.dart';
--- a/lib/pages/fcs_shipment/fcs_shipment_list_row.dart
+++ b/lib/pages/fcs_shipment/fcs_shipment_list_row.dart
@@ -1,13 +1,11 @@
 import 'package:fcs/domain/entities/fcs_shipment.dart';
 import 'package:fcs/helpers/theme.dart';
 import 'package:fcs/pages/main/util.dart';
-import 'package:fcs/pages/widgets/bottom_up_page_route.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_icons/flutter_icons.dart';
 import 'package:intl/intl.dart';
-
-import 'fcs_shipment_editor.dart';
+import 'fcs_shipment_info.dart';

 class FcsShipmentListRow extends StatelessWidget {
  final FcsShipment shipment;
@@ -21,7 +19,7 @@ class FcsShipmentListRow extends StatelessWidget {
      child: InkWell(
        onTap: () {
          Navigator.of(context).push(CupertinoPageRoute(
-              builder: (context) => FcsShipmentEditor(shipment: shipment)));
+              builder: (context) => FcsShipmentInfo(fcsShipment: shipment)));
        },
        child: Row(
          children: <Widget>[