sainw/fcs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update carton

Browse Source
This commit is contained in:
Thinzar Win
2021-01-12 16:59:52 +06:30
parent 9dee2c55f3
commit fddcc91515
11 changed files with 91 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/pages/carton/cargo_type_addtion.dart
View File

@@ -84,7 +84,7 @@ class _CargoTypeAdditionState extends State<CargoTypeAddition> {
final saveBtn = fcsButton(
context,
getLocalString(context, 'box.cargo.save.btn'),
getLocalString(context, 'box.cargo.select.btn'),
callack: () {
List<CargoType> _cargos =
this.cargos.where((c) => c.isChecked).toList();

73
lib/pages/carton/carton_editor.dart
View File

@@ -74,7 +74,7 @@ class _CartonEditorState extends State<CartonEditor> {
//for carton from cargos
User consignee;
User sender;
List<Carton> _cartonsForCargos = [];
List<Carton> _cartonsFromCartons = [];
@override
void initState() {
@@ -95,17 +95,17 @@ class _CartonEditorState extends State<CartonEditor> {
_heightController.text = _carton.height.toString();
_lengthController.text = _carton.length.toString();
_selectedCartonType = _carton.cartonType;
_cargoTypes = List.from(_carton.cargoTypes);
_cargoTypes = _carton.cargoTypes.map((e) => e.clone()).toList();
_isNew = false;
_user = User(
id: _carton.userID, fcsID: _carton.fcsID, name: _carton.userName);
consignee = User(
id: _carton.receiverID,
fcsID: _carton.receiverFCSID,
name: _carton.receiverName);
id: _carton.userID, fcsID: _carton.fcsID, name: _carton.userName);
sender = User(
id: _carton.senderID,
fcsID: _carton.senderID,
fcsID: _carton.senderFCSID,
name: _carton.senderName);
_selectedMixBoxType = _carton.mixBoxType ?? "";
this._mixCartons =
@@ -251,7 +251,7 @@ class _CartonEditorState extends State<CartonEditor> {
));
final fcsIDBox = Container(
padding: EdgeInsets.only(top: 10),
padding: EdgeInsets.only(top: 15),
child: Row(
children: <Widget>[
Expanded(
@@ -389,6 +389,7 @@ class _CartonEditorState extends State<CartonEditor> {
color: primaryColor,
),
onPressed: () async {
boxModel.selectedIndexFilter = 1;
searchCarton(context, callbackCartonSelect: (c) {
_addMixCarton(c);
});
@@ -451,7 +452,7 @@ class _CartonEditorState extends State<CartonEditor> {
);
final createMixCarton = LocalButton(
textKey: _isNew ? "box.mix_carton_btn" : "btn.save",
textKey: _isNew ? "box.mix_carton_btn" : "box.mix_carton.update.btn",
callBack: _creatMixCarton,
);
@@ -529,17 +530,9 @@ class _CartonEditorState extends State<CartonEditor> {
appBar: AppBar(
centerTitle: true,
leading: new IconButton(
icon: new Icon(CupertinoIcons.back, color: primaryColor, size: 30),
onPressed: () {
if (isDataChanged()) {
showConfirmDialog(context, "back.button_confirm", () {
Navigator.of(context).pop();
});
} else {
Navigator.of(context).pop();
}
},
),
icon:
new Icon(CupertinoIcons.back, color: primaryColor, size: 30),
onPressed: () => Navigator.of(context).pop()),
shadowColor: Colors.transparent,
backgroundColor: Colors.white,
title: LocalText(
@@ -610,7 +603,7 @@ class _CartonEditorState extends State<CartonEditor> {
context,
isFromPackages
? this._cartons
: this._cartonsForCargos))
: this._cartonsFromCartons))
: Container(),
_isNew ? Container() : cargoTableTitleBox,
_isNew ? Container() : cargoTableBox,
@@ -635,14 +628,9 @@ class _CartonEditorState extends State<CartonEditor> {
builder: (context) =>
DeliveryAddressSelection(
deliveryAddress: _deliveryAddress,
user: isFromPackages
? User(
id: _carton.userID,
name: _carton.userName)
: User(
id: _carton.receiverID,
name: _carton
.receiverName))),
user: User(
id: _carton.userID,
name: _carton.userName))),
);
if (d == null) return;
setState(() {
@@ -845,9 +833,9 @@ class _CartonEditorState extends State<CartonEditor> {
}
if (isFromCartons) {
carton.receiverID = consignee?.id;
carton.receiverFCSID = consignee?.fcsID;
carton.receiverName = consignee?.name;
carton.userID = consignee?.id;
carton.fcsID = consignee?.fcsID;
carton.userName = consignee?.name;
carton.senderID = sender?.id;
carton.senderFCSID = sender?.fcsID;
carton.senderName = sender?.name;
@@ -877,7 +865,7 @@ class _CartonEditorState extends State<CartonEditor> {
}
if (isFromCartons) {
_cartonsForCargos.add(_carton);
_cartonsFromCartons.add(_carton);
}
setState(() {});
@@ -938,19 +926,19 @@ class _CartonEditorState extends State<CartonEditor> {
_save() async {
bool isFromPackages = _selectedCartonType == carton_from_packages;
bool isFromCargos = _selectedCartonType == carton_from_cartons;
if ((_cargoTypes?.length ?? 0) == 0 && (isFromPackages || isFromCargos)) {
bool isFromCartons = _selectedCartonType == carton_from_cartons;
if ((_cargoTypes?.length ?? 0) == 0 && (isFromPackages || isFromCartons)) {
showMsgDialog(context, "Error", "Expect at least one cargo type");
return;
}
double l = double.parse(_lengthController.text, (s) => 0);
double w = double.parse(_widthController.text, (s) => 0);
double h = double.parse(_heightController.text, (s) => 0);
if ((l <= 0 || w <= 0 || h <= 0) && (isFromPackages || isFromCargos)) {
if ((l <= 0 || w <= 0 || h <= 0) && (isFromPackages || isFromCartons)) {
showMsgDialog(context, "Error", "Invalid dimension");
return;
}
if (_deliveryAddress == null && (isFromPackages || isFromCargos)) {
if (_deliveryAddress == null && (isFromPackages || isFromCartons)) {
showMsgDialog(context, "Error", "Invalid delivery address");
return;
}
@@ -963,8 +951,8 @@ class _CartonEditorState extends State<CartonEditor> {
carton.userID = _user?.id;
carton.packages = _carton.packages.where((e) => e.isChecked).toList();
}
if (isFromCargos) {
carton.receiverID = consignee?.id;
if (isFromCartons) {
carton.userID = consignee?.id;
carton.senderID = sender?.id;
}
@@ -990,13 +978,4 @@ class _CartonEditorState extends State<CartonEditor> {
});
}
}
isDataChanged() {
if (_isNew) {
return false;
// return _fcsShipment != null || _user != null;
} else {
return false;
}
}
}

6
lib/pages/carton/carton_info.dart
View File

@@ -63,8 +63,6 @@ class _CartonInfoState extends State<CartonInfo> {
void initState() {
super.initState();
_box = widget.box;
// _box.cartonType = carton_from_cargos;
// _box.cartonType = carton_mix_box;
//for shipment weight
volumetricRatio = Provider.of<ShipmentRateModel>(context, listen: false)
.rate
@@ -188,13 +186,13 @@ class _CartonInfoState extends State<CartonInfo> {
);
final consigneefcsIDBox = DisplayText(
text: _box.receiverFCSID != null ? _box.receiverFCSID : "",
text: _box.fcsID != null ? _box.fcsID : "",
labelTextKey: "processing.fcs.id",
icon: FcsIDIcon(),
);
final consigneeNameBox = DisplayText(
text: _box.receiverName != null ? _box.receiverName : "",
text: _box.userName != null ? _box.userName : "",
labelTextKey: "processing.consignee.name",
maxLines: 2,
iconData: Icons.person,

56
lib/pages/carton/model/carton_model.dart
View File

@@ -34,32 +34,32 @@ class CartonModel extends BaseModel {
status: "Delivered", date: DateTime(2020, 6, 15), done: false)
];
List<Carton> get completed {
return boxes.where((e) => e.status == "Delivered").toList()
..sort((e1, e2) {
return e2.packageNumber.compareTo(e1.packageNumber);
});
}
// List<Carton> get completed {
// return boxes.where((e) => e.status == "Delivered").toList()
// ..sort((e1, e2) {
// return e2.packageNumber.compareTo(e1.packageNumber);
// });
// }
List<Carton> get processed {
return boxes.where((e) => e.status == "Packed").toList()
..sort((e1, e2) {
return e2.packageNumber.compareTo(e1.packageNumber);
});
}
// List<Carton> get processed {
// return boxes.where((e) => e.status == "Packed").toList()
// ..sort((e1, e2) {
// return e2.packageNumber.compareTo(e1.packageNumber);
// });
// }
List<Carton> get upcoming {
return boxes
.where((e) =>
e.status == "Packed" ||
// e.status == "Received" ||
e.status == "Shipped" ||
e.status == "Arrived")
.toList()
..sort((e1, e2) {
return e2.packageNumber.compareTo(e1.packageNumber);
});
}
// List<Carton> get upcoming {
// return boxes
// .where((e) =>
// e.status == "Packed" ||
// // e.status == "Received" ||
// e.status == "Shipped" ||
// e.status == "Arrived")
// .toList()
// ..sort((e1, e2) {
// return e2.packageNumber.compareTo(e1.packageNumber);
// });
// }
List<String> cartonTypes = [
carton_from_packages,
@@ -153,10 +153,10 @@ class CartonModel extends BaseModel {
try {
Query listenerQuery = Firestore.instance
.collection("$path")
.where("carton_type",
whereIn: [carton_from_packages, carton_from_cartons])
.where("status", isEqualTo: carton_packed_status)
.orderBy(orderName, descending: true);
.where("carton_type", whereIn: [
carton_from_packages,
carton_from_cartons
]).where("status", isEqualTo: carton_packed_status);
Query pageQuery = Firestore.instance
.collection("$path")

28
lib/pages/carton/package_carton_editor.dart
View File

@@ -67,7 +67,7 @@ class _PackageCartonEditorState extends State<PackageCartonEditor> {
_widthCtl.text = "0";
_heightCtl.text = "0";
} else {
_cargoTypes = List.from(widget.carton.cargoTypes);
_cargoTypes = widget.carton.cargoTypes.map((e) => e.clone()).toList();
_lengthCtl.text = _carton.length.toString();
_widthCtl.text = _carton.width.toString();
_heightCtl.text = _carton.height.toString();
@@ -158,12 +158,11 @@ class _PackageCartonEditorState extends State<PackageCartonEditor> {
appBar: AppBar(
centerTitle: true,
leading: new IconButton(
icon: new Icon(
CupertinoIcons.back,
color: primaryColor,
),
onPressed: () => Navigator.of(context).pop(),
),
icon: new Icon(
CupertinoIcons.back,
color: primaryColor,
),
onPressed: () => Navigator.of(context).pop()),
shadowColor: Colors.transparent,
backgroundColor: Colors.white,
title: LocalText(
@@ -192,13 +191,8 @@ class _PackageCartonEditorState extends State<PackageCartonEditor> {
CupertinoPageRoute(
builder: (context) => DeliveryAddressSelection(
deliveryAddress: _deliveryAddress,
user: isFromPackages
? User(
id: _carton.userID,
name: _carton.userName)
: User(
id: _carton.receiverID,
name: _carton.receiverName),
user: User(
id: _carton.userID, name: _carton.userName),
)),
);
if (d == null) return;
@@ -334,9 +328,9 @@ class _PackageCartonEditorState extends State<PackageCartonEditor> {
}
if (isFromCartons) {
carton.receiverID = _carton.receiverID;
carton.receiverFCSID = _carton.receiverFCSID;
carton.receiverName = _carton.receiverName;
carton.userID = _carton.userID;
carton.fcsID = _carton.fcsID;
carton.userName = _carton.userName;
carton.senderID = _carton.senderID;
carton.senderFCSID = _carton.senderFCSID;
carton.senderName = _carton.senderName;