update cargo type form from rate, update carton info and form
This commit is contained in:
tzw
@@ -1,4 +1,6 @@
|
||||
import 'package:fcs/domain/entities/fcs_shipment.dart';
|
||||
import 'package:fcs/domain/entities/shipment_consignee.dart';
|
||||
import 'package:fcs/domain/entities/shipment_port.dart';
|
||||
import 'package:fcs/helpers/theme.dart';
|
||||
import 'package:fcs/localization/app_translations.dart';
|
||||
import 'package:fcs/pages/fcs_shipment/model/fcs_shipment_model.dart';
|
||||
@@ -30,16 +32,16 @@ class _FcsShipmentEditorState extends State<FcsShipmentEditor> {
|
||||
var dateFormatter = new DateFormat('dd MMM yyyy');
|
||||
TextEditingController _shipmentNumberController = new TextEditingController();
|
||||
TextEditingController _cutoffDateController = new TextEditingController();
|
||||
TextEditingController _arrivalDateController = new TextEditingController();
|
||||
TextEditingController _departureDateControler = new TextEditingController();
|
||||
TextEditingController _consigneeController = new TextEditingController();
|
||||
TextEditingController _portController = new TextEditingController();
|
||||
TextEditingController _destinationController = new TextEditingController();
|
||||
TextEditingController _etaDateController = new TextEditingController();
|
||||
|
||||
TextEditingController _statusController = new TextEditingController();
|
||||
|
||||
FcsShipment _shipment = new FcsShipment();
|
||||
bool _isLoading = false;
|
||||
ShipmentType? _currentShipmentType;
|
||||
ShipmentConsignee? _currentConsignee;
|
||||
ShipmentPort? _currentLoadingPort;
|
||||
ShipmentPort? _currentDestination;
|
||||
bool _isNew = false;
|
||||
|
||||
@override
|
||||
@@ -53,24 +55,38 @@ class _FcsShipmentEditorState extends State<FcsShipmentEditor> {
|
||||
if (_shipment.cutoffDate != null)
|
||||
_cutoffDateController.text =
|
||||
dateFormatter.format(_shipment.cutoffDate!);
|
||||
if (_shipment.arrivalDate != null)
|
||||
_arrivalDateController.text =
|
||||
dateFormatter.format(_shipment.arrivalDate!);
|
||||
if (_shipment.departureDate != null)
|
||||
_departureDateControler.text =
|
||||
dateFormatter.format(_shipment.departureDate!);
|
||||
_statusController.text = _shipment.status ?? "";
|
||||
_consigneeController.text = _shipment.consignee ?? "";
|
||||
_portController.text = _shipment.port ?? "";
|
||||
_destinationController.text = _shipment.destination ?? "";
|
||||
if (_shipment.etaDate != null)
|
||||
_etaDateController.text = dateFormatter.format(_shipment.etaDate!);
|
||||
|
||||
List<ShipmentType> list = model.shipmentTypes
|
||||
_statusController.text = _shipment.status ?? "";
|
||||
|
||||
List<ShipmentType> shipmentTypes = model.shipmentTypes
|
||||
.where((e) => e.id == _shipment.shipmentTypeId)
|
||||
.toList();
|
||||
_currentShipmentType =
|
||||
shipmentTypes.isNotEmpty ? shipmentTypes.first : null;
|
||||
|
||||
_currentShipmentType = list.isNotEmpty ? list.first : null;
|
||||
List<ShipmentConsignee> shipmentConsingees = model.shipmentConsingees
|
||||
.where((e) => e.id == _shipment.consigneeId)
|
||||
.toList();
|
||||
_currentConsignee =
|
||||
shipmentConsingees.isNotEmpty ? shipmentConsingees.first : null;
|
||||
|
||||
List<ShipmentPort> loadingPorts = model.shipmentPorts
|
||||
.where((e) => e.id == _shipment.loadingPortId)
|
||||
.toList();
|
||||
_currentLoadingPort = loadingPorts.isNotEmpty ? loadingPorts.first : null;
|
||||
|
||||
List<ShipmentPort> loadingDestination = model.shipmentPorts
|
||||
.where((e) => e.id == _shipment.destinationPortId)
|
||||
.toList();
|
||||
_currentDestination =
|
||||
loadingDestination.isNotEmpty ? loadingDestination.first : null;
|
||||
} else {
|
||||
_currentShipmentType = model.shipmentTypes[0];
|
||||
_currentShipmentType = model.shipmentTypes.first;
|
||||
_currentConsignee = model.shipmentConsingees.first;
|
||||
_currentLoadingPort = model.shipmentPorts.first;
|
||||
_currentDestination = model.shipmentPorts.first;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -82,8 +98,111 @@ class _FcsShipmentEditorState extends State<FcsShipmentEditor> {
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
var languageModel = Provider.of<LanguageModel>(context);
|
||||
List<ShipmentType> shipmentTypes =
|
||||
context.watch<FcsShipmentModel>().shipmentTypes;
|
||||
var shipmentModel = context.watch<FcsShipmentModel>();
|
||||
List<ShipmentType> shipmentTypes = shipmentModel.shipmentTypes;
|
||||
List<ShipmentConsignee> shipmentConsingees =
|
||||
shipmentModel.shipmentConsingees;
|
||||
List<ShipmentPort> shipmentPorts = shipmentModel.shipmentPorts;
|
||||
|
||||
final shipmentTypeBox = DropdownButtonFormField(
|
||||
value: _currentShipmentType == "" ? null : _currentShipmentType,
|
||||
decoration: InputDecoration(
|
||||
contentPadding: EdgeInsets.zero,
|
||||
enabledBorder:
|
||||
UnderlineInputBorder(borderSide: BorderSide(color: primaryColor)),
|
||||
focusedBorder:
|
||||
UnderlineInputBorder(borderSide: BorderSide(color: primaryColor)),
|
||||
fillColor: Colors.white,
|
||||
labelStyle: languageModel.isEng
|
||||
? newLabelStyle(color: Colors.black54, fontSize: 20)
|
||||
: newLabelStyleMM(color: Colors.black54, fontSize: 20),
|
||||
labelText:
|
||||
AppTranslations.of(context)!.text('FCSshipment.shipment_type'),
|
||||
icon: Icon(Ionicons.ios_airplane, color: primaryColor)),
|
||||
items: shipmentTypes
|
||||
.map((e) => DropdownMenuItem(child: Text(e.name), value: e))
|
||||
.toList(),
|
||||
onChanged: (selected) => {
|
||||
setState(() {
|
||||
_currentShipmentType = selected;
|
||||
})
|
||||
},
|
||||
);
|
||||
|
||||
final consigneeBox = DropdownButtonFormField(
|
||||
value: _currentConsignee == "" ? null : _currentConsignee,
|
||||
decoration: InputDecoration(
|
||||
contentPadding: EdgeInsets.zero,
|
||||
enabledBorder:
|
||||
UnderlineInputBorder(borderSide: BorderSide(color: primaryColor)),
|
||||
focusedBorder:
|
||||
UnderlineInputBorder(borderSide: BorderSide(color: primaryColor)),
|
||||
fillColor: Colors.white,
|
||||
labelStyle: languageModel.isEng
|
||||
? newLabelStyle(color: Colors.black54, fontSize: 20)
|
||||
: newLabelStyleMM(color: Colors.black54, fontSize: 20),
|
||||
labelText: AppTranslations.of(context)!.text('FCSshipment.consignee'),
|
||||
icon: Icon(Icons.work, color: primaryColor)),
|
||||
items: shipmentConsingees
|
||||
.map((e) => DropdownMenuItem(child: Text(e.name), value: e))
|
||||
.toList(),
|
||||
onChanged: (selected) => {
|
||||
setState(() {
|
||||
_currentConsignee = selected;
|
||||
})
|
||||
},
|
||||
);
|
||||
|
||||
final loadingPortBox = DropdownButtonFormField(
|
||||
value: _currentLoadingPort == "" ? null : _currentLoadingPort,
|
||||
decoration: InputDecoration(
|
||||
contentPadding: EdgeInsets.zero,
|
||||
enabledBorder:
|
||||
UnderlineInputBorder(borderSide: BorderSide(color: primaryColor)),
|
||||
focusedBorder:
|
||||
UnderlineInputBorder(borderSide: BorderSide(color: primaryColor)),
|
||||
fillColor: Colors.white,
|
||||
labelStyle: languageModel.isEng
|
||||
? newLabelStyle(color: Colors.black54, fontSize: 20)
|
||||
: newLabelStyleMM(color: Colors.black54, fontSize: 20),
|
||||
labelText:
|
||||
AppTranslations.of(context)!.text('FCSshipment.port_of_loading'),
|
||||
icon: Icon(FontAwesomeIcons.ship, color: primaryColor)),
|
||||
items: shipmentPorts
|
||||
.map((e) => DropdownMenuItem(child: Text(e.name), value: e))
|
||||
.toList(),
|
||||
onChanged: (selected) => {
|
||||
setState(() {
|
||||
_currentLoadingPort = selected;
|
||||
})
|
||||
},
|
||||
);
|
||||
|
||||
final destinationBox = DropdownButtonFormField(
|
||||
value: _currentDestination == "" ? null : _currentDestination,
|
||||
decoration: InputDecoration(
|
||||
contentPadding: EdgeInsets.zero,
|
||||
enabledBorder:
|
||||
UnderlineInputBorder(borderSide: BorderSide(color: primaryColor)),
|
||||
focusedBorder:
|
||||
UnderlineInputBorder(borderSide: BorderSide(color: primaryColor)),
|
||||
fillColor: Colors.white,
|
||||
labelStyle: languageModel.isEng
|
||||
? newLabelStyle(color: Colors.black54, fontSize: 20)
|
||||
: newLabelStyleMM(color: Colors.black54, fontSize: 20),
|
||||
labelText: AppTranslations.of(context)!
|
||||
.text('FCSshipment.final_destination'),
|
||||
icon:
|
||||
Icon(MaterialCommunityIcons.location_enter, color: primaryColor)),
|
||||
items: shipmentPorts
|
||||
.map((e) => DropdownMenuItem(child: Text(e.name), value: e))
|
||||
.toList(),
|
||||
onChanged: (selected) => {
|
||||
setState(() {
|
||||
_currentDestination = selected;
|
||||
})
|
||||
},
|
||||
);
|
||||
|
||||
final createBtn = Padding(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 30),
|
||||
@@ -150,7 +269,7 @@ class _FcsShipmentEditorState extends State<FcsShipmentEditor> {
|
||||
InputDate(
|
||||
labelTextKey: "FCSshipment.ETA",
|
||||
iconData: Icons.date_range,
|
||||
controller: _arrivalDateController,
|
||||
controller: _etaDateController,
|
||||
autovalidateMode: AutovalidateMode.onUserInteraction,
|
||||
validator: (value) {
|
||||
if (value!.isEmpty) {
|
||||
@@ -160,47 +279,14 @@ class _FcsShipmentEditorState extends State<FcsShipmentEditor> {
|
||||
},
|
||||
),
|
||||
const SizedBox(height: 20),
|
||||
DropdownButtonFormField(
|
||||
value:
|
||||
_currentShipmentType == "" ? null : _currentShipmentType,
|
||||
decoration: InputDecoration(
|
||||
contentPadding: EdgeInsets.zero,
|
||||
enabledBorder: UnderlineInputBorder(
|
||||
borderSide: BorderSide(color: primaryColor)),
|
||||
focusedBorder: UnderlineInputBorder(
|
||||
borderSide: BorderSide(color: primaryColor)),
|
||||
fillColor: Colors.white,
|
||||
labelStyle: languageModel.isEng
|
||||
? newLabelStyle(color: Colors.black54, fontSize: 20)
|
||||
: newLabelStyleMM(
|
||||
color: Colors.black54, fontSize: 20),
|
||||
labelText: AppTranslations.of(context)!
|
||||
.text('FCSshipment.shipment_type'),
|
||||
icon: Icon(Ionicons.ios_airplane, color: primaryColor)),
|
||||
items: shipmentTypes
|
||||
.map((e) =>
|
||||
DropdownMenuItem(child: Text(e.name), value: e))
|
||||
.toList(),
|
||||
onChanged: (selected) => {
|
||||
setState(() {
|
||||
_currentShipmentType = selected;
|
||||
})
|
||||
},
|
||||
),
|
||||
const SizedBox(height: 5),
|
||||
InputText(
|
||||
labelTextKey: 'FCSshipment.consignee',
|
||||
iconData: Icons.work,
|
||||
controller: _consigneeController),
|
||||
InputText(
|
||||
labelTextKey: 'FCSshipment.port_of_loading',
|
||||
iconData: FontAwesomeIcons.ship,
|
||||
controller: _portController),
|
||||
InputText(
|
||||
labelTextKey: 'FCSshipment.final_destination',
|
||||
iconData: MaterialCommunityIcons.location_enter,
|
||||
controller: _destinationController),
|
||||
SizedBox(height: 20),
|
||||
shipmentTypeBox,
|
||||
const SizedBox(height: 25),
|
||||
consigneeBox,
|
||||
const SizedBox(height: 25),
|
||||
loadingPortBox,
|
||||
const SizedBox(height: 25),
|
||||
destinationBox,
|
||||
SizedBox(height: 30),
|
||||
_isNew ? createBtn : updateBtn,
|
||||
SizedBox(height: 15)
|
||||
]),
|
||||
@@ -214,16 +300,15 @@ class _FcsShipmentEditorState extends State<FcsShipmentEditor> {
|
||||
fcsShipment.id = _shipment.id;
|
||||
fcsShipment.shipmentNumber = _shipmentNumberController.text;
|
||||
fcsShipment.shipmentTypeId = _currentShipmentType?.id ?? "";
|
||||
fcsShipment.consignee = _consigneeController.text;
|
||||
fcsShipment.port = _portController.text;
|
||||
fcsShipment.destination = _destinationController.text;
|
||||
fcsShipment.consigneeId = _currentConsignee?.id ?? "";
|
||||
fcsShipment.loadingPortId = _currentLoadingPort?.id ?? "";
|
||||
fcsShipment.destinationPortId = _currentDestination?.id ?? "";
|
||||
|
||||
var cutoffDate = _cutoffDateController.text;
|
||||
var arrivalDate = _arrivalDateController.text;
|
||||
var etaDate = _etaDateController.text;
|
||||
fcsShipment.cutoffDate =
|
||||
(cutoffDate == "" ? null : dateFormatter.parse(cutoffDate))!;
|
||||
fcsShipment.arrivalDate =
|
||||
(arrivalDate == "" ? null : dateFormatter.parse(arrivalDate))!;
|
||||
fcsShipment.etaDate = (etaDate == "" ? null : dateFormatter.parse(etaDate));
|
||||
return fcsShipment;
|
||||
}
|
||||
|
||||
@@ -271,11 +356,11 @@ class _FcsShipmentEditorState extends State<FcsShipmentEditor> {
|
||||
var shipmentModel = Provider.of<FcsShipmentModel>(context, listen: false);
|
||||
return _shipmentNumberController.text != "" ||
|
||||
_cutoffDateController.text != "" ||
|
||||
_arrivalDateController.text != "" ||
|
||||
_consigneeController.text != "" ||
|
||||
_portController.text != "" ||
|
||||
_destinationController.text != "" ||
|
||||
_currentShipmentType != shipmentModel.shipmentTypes[0];
|
||||
_etaDateController.text != "" ||
|
||||
_currentConsignee != shipmentModel.shipmentConsingees.first ||
|
||||
_currentShipmentType != shipmentModel.shipmentTypes.first ||
|
||||
_currentLoadingPort != shipmentModel.shipmentPorts.first ||
|
||||
_currentDestination != shipmentModel.shipmentPorts.first;
|
||||
} else {
|
||||
FcsShipment fcsShipment = _getPayload();
|
||||
return widget.shipment!.isChangedForEdit(fcsShipment);
|
||||
|
||||
Reference in New Issue
Block a user