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:
sainw
2021-01-07 18:15:39 +06:30
parent 045d27945b
commit 016ebed384
16 changed files with 295 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lib/pages/processing/package_editor.dart
View File

@@ -114,7 +114,15 @@ class _PackageEditorState extends State<PackageEditor> {
centerTitle: true,
leading: new IconButton(
icon: new Icon(CupertinoIcons.back, color: primaryColor, size: 30),
onPressed: () => Navigator.of(context).pop(),
onPressed: () {
if (isDataChanged()) {
showConfirmDialog(context, "back.button_confirm", () {
Navigator.of(context).pop();
});
} else {
Navigator.of(context).pop();
}
},
),
shadowColor: Colors.transparent,
backgroundColor: Colors.white,
@@ -267,7 +275,8 @@ class _PackageEditorState extends State<PackageEditor> {
PackageModel packageModel =
Provider.of<PackageModel>(context, listen: false);
try {
Package package=await packageModel.getPackageByTrackingID(_trackingIDCtl.text);
Package package =
await packageModel.getPackageByTrackingID(_trackingIDCtl.text);
package.trackingID = _trackingIDCtl.text;
package.market = selectedMarket;
package.desc = _descCtl.text;
@@ -275,8 +284,8 @@ class _PackageEditorState extends State<PackageEditor> {
package.photoFiles = _isNew
? multiImgController.getAddedFile
: multiImgController.getUpdatedFile;
package.fcsID=widget.consignee.fcsID;
package.senderFCSID=widget.sender?.fcsID;
package.fcsID = widget.consignee.fcsID;
package.senderFCSID = widget.sender?.fcsID;
await packageModel.updateProcessing(package,
multiImgController.getAddedFile, multiImgController.getDeletedUrl);
@@ -290,4 +299,12 @@ class _PackageEditorState extends State<PackageEditor> {
});
}
}
isDataChanged() {
return _trackingIDCtl.text != "" ||
selectedMarket != null ||
_descCtl.text != "" ||
_remarkCtl.text != "" ||
multiImgController.getAddedFile.isNotEmpty;
}
}

23
lib/pages/processing/processing_edit_editor.dart
View File

@@ -267,10 +267,23 @@ class _ProcessingEditEditorState extends State<ProcessingEditEditor> {
}
isDataChanged() {
return _user.fcsID != "" ||
selectedMarket != "" ||
_descCtl.text != "" ||
_remarkCtl.text != "" ||
multiImgController.getAddedFile.isNotEmpty;
if (isNew) {
return _user.fcsID != "" ||
selectedMarket != null ||
_descCtl.text != "" ||
_remarkCtl.text != "" ||
multiImgController.getAddedFile.isNotEmpty;
} else {
var _package = Package(
trackingID: widget.package.trackingID,
fcsID: _user.fcsID,
market: selectedMarket,
desc: _descCtl.text,
remark: _remarkCtl.text,
photoUrls: widget.package.photoUrls);
return widget.package.isChangedForEditProcessing(_package) ||
multiImgController.getAddedFile.isNotEmpty ||
multiImgController.getDeletedUrl.isNotEmpty;
}
}
}