update pages for carton

lib/pages/fcs_shipment/fcs_shipment_info.dart

@@ -21,27 +21,27 @@ import 'fcs_shipment_editor.dart';
 
 class FcsShipmentInfo extends StatefulWidget {
   final FcsShipment fcsShipment;
-  FcsShipmentInfo({required this.fcsShipment});
+  const FcsShipmentInfo({super.key, required this.fcsShipment});
 
   @override
   _FcsShipmentInfoState createState() => _FcsShipmentInfoState();
 }
 
 class _FcsShipmentInfoState extends State<FcsShipmentInfo> {
-  var dateFormatter = new DateFormat('dd MMM yyyy');
+  var dateFormatter = DateFormat('dd MMM yyyy');
   final NumberFormat numberFormatter = NumberFormat("#,###");
 
   late 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();
+  TextEditingController shipmentNumberController = TextEditingController();
+  TextEditingController cutoffDateController = TextEditingController();
+  TextEditingController arrivalDateController = TextEditingController();
+  TextEditingController departureDateControler = TextEditingController();
+  TextEditingController shipmentTypeControler = TextEditingController();
+  TextEditingController consigneeController = TextEditingController();
+  TextEditingController portController = TextEditingController();
+  TextEditingController destinationController = TextEditingController();
+  TextEditingController statusController = TextEditingController();
 
   @override
   void initState() {
@@ -51,21 +51,24 @@ class _FcsShipmentInfoState extends State<FcsShipmentInfo> {
   }
 
   _load() {
-    _shipmentNumberController.text = _fcsShipment.shipmentNumber ?? "";
-    if (_fcsShipment.cutoffDate != null)
-      _cutoffDateController.text =
+    shipmentNumberController.text = _fcsShipment.shipmentNumber ?? "";
+    if (_fcsShipment.cutoffDate != null) {
+      cutoffDateController.text =
           dateFormatter.format(_fcsShipment.cutoffDate!);
-    if (_fcsShipment.etaDate != null)
-      _arrivalDateController.text = dateFormatter.format(_fcsShipment.etaDate!);
-    if (_fcsShipment.departureDate != null)
-      _departureDateControler.text =
+    }
+    if (_fcsShipment.etaDate != null) {
+      arrivalDateController.text = dateFormatter.format(_fcsShipment.etaDate!);
+    }
+    if (_fcsShipment.departureDate != null) {
+      departureDateControler.text =
           dateFormatter.format(_fcsShipment.departureDate!);
+    }
 
-    _shipmentTypeControler.text = _fcsShipment.shipmentTypeName ?? "";
-    _consigneeController.text = _fcsShipment.consigneeName ?? '';
-    _portController.text = _fcsShipment.loadingPortName ?? '';
-    _destinationController.text = _fcsShipment.destinationPortName ?? '';
-    _statusController.text = _fcsShipment.status ?? "";
+    shipmentTypeControler.text = _fcsShipment.shipmentTypeName ?? "";
+    consigneeController.text = _fcsShipment.consigneeName ?? '';
+    portController.text = _fcsShipment.loadingPortName ?? '';
+    destinationController.text = _fcsShipment.destinationPortName ?? '';
+    statusController.text = _fcsShipment.status ?? "";
   }
 
   @override
@@ -76,12 +79,12 @@ class _FcsShipmentInfoState extends State<FcsShipmentInfo> {
   @override
   Widget build(BuildContext context) {
     final cutoffDateDBox = DisplayText(
-      text: _cutoffDateController.text,
+      text: cutoffDateController.text,
       labelTextKey: "FCSshipment.cutoff_date",
       iconData: Icons.date_range,
     );
     final etaBox = DisplayText(
-      text: _arrivalDateController.text,
+      text: arrivalDateController.text,
       labelTextKey: "FCSshipment.ETA",
       iconData: Icons.date_range,
     );
@@ -99,31 +102,31 @@ class _FcsShipmentInfoState extends State<FcsShipmentInfo> {
     );
 
     final shipTypeBox = DisplayText(
-      text: _shipmentTypeControler.text,
+      text: shipmentTypeControler.text,
       labelTextKey: "FCSshipment.shipment_type",
       iconData: Ionicons.ios_airplane,
     );
 
     final consigneeBox = DisplayText(
-      text: _consigneeController.text,
+      text: consigneeController.text,
       labelTextKey: "FCSshipment.consignee",
       iconData: Icons.work,
     );
 
     final portBox = DisplayText(
-      text: _portController.text,
+      text: portController.text,
       labelTextKey: "FCSshipment.port_of_loading",
       iconData: FontAwesomeIcons.ship,
     );
 
     final destinationBox = DisplayText(
-      text: _destinationController.text,
+      text: destinationController.text,
       labelTextKey: "FCSshipment.final_destination",
       iconData: MaterialCommunityIcons.location_enter,
     );
 
     final statusBox = DisplayText(
-      text: _statusController.text,
+      text: statusController.text,
       labelTextKey: "FCSshipment.status",
       iconData: Feather.clock,
     );
@@ -185,8 +188,15 @@ class _FcsShipmentInfoState extends State<FcsShipmentInfo> {
       inAsyncCall: _isLoading,
       child: Scaffold(
         appBar: LocalAppBar(
-          titleWidget: Text(_shipmentNumberController.text,
-              style: TextStyle(fontSize: 20, color: primaryColor)),
+          titleWidget: Column(
+            children: [
+              LocalText(context, "FCSshipment.form.title",
+                  fontSize: 20, color: primaryColor),
+              Text(shipmentNumberController.text,
+                  style: TextStyle(fontSize: 15, color: Colors.black))
+            ],
+          ),
+        
           backgroundColor: Colors.white,
           labelColor: primaryColor,
           arrowColor: primaryColor,