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

update processing,customer and staff

Browse Source
This commit is contained in:
tzw
2021-10-11 17:09:47 +06:30
parent bfa6b8c2ed
commit 8df11b70a0
22 changed files with 158 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -65,8 +65,8 @@ class _PackageEditorState extends State<PackageEditor> {
}
setState(() {
selectedMarket = _package!.market ?? "";
_descCtl.text = _package!.desc!;
_remarkCtl.text = _package!.remark!;
_descCtl.text = _package!.desc ?? "";
_remarkCtl.text = _package!.remark ?? "";
multiImgController.setImageUrls = _package!.photoUrls;
});
}
@@ -180,7 +180,7 @@ class _PackageEditorState extends State<PackageEditor> {
List<String?> markets = _markets.map((e) => e.name).toList();
markets.insert(0, MANAGE_MARKET);
if (!markets.contains(selectedMarket)) {
markets.insert(0, selectedMarket!);
markets.insert(0, selectedMarket);
}
return Row(
@@ -254,13 +254,13 @@ class _PackageEditorState extends State<PackageEditor> {
PackageModel packageModel =
Provider.of<PackageModel>(context, listen: false);
try {
_package!.market = selectedMarket!;
_package!.market = selectedMarket ?? "";
_package!.desc = _descCtl.text;
_package!.remark = _remarkCtl.text;
_package!.photoFiles = multiImgController.getUpdatedFile;
_package!.fcsID = widget.consignee!.fcsID;
_package!.fcsID = widget.consignee?.fcsID;
_package!.senderFCSID =
widget.sender!.fcsID != null ? widget.sender!.fcsID : "";
widget.sender?.fcsID != null ? widget.sender?.fcsID : "";
await packageModel.updateProcessing(_package!,
multiImgController.getAddedFile, multiImgController.getDeletedUrl);
@@ -276,9 +276,10 @@ class _PackageEditorState extends State<PackageEditor> {
}
isDataChanged() {
return selectedMarket != null ||
return _package?.trackingID != null ||
_descCtl.text != "" ||
_remarkCtl.text != "" ||
multiImgController.getAddedFile.isNotEmpty;
multiImgController.getAddedFile.isNotEmpty ||
selectedMarket != null && selectedMarket != "";
}
}

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

@@ -34,7 +34,8 @@ class _ProcessingEditEditorState extends State<ProcessingEditEditor> {
TextEditingController _descCtl = new TextEditingController();
Package? _package;
User? _user;
User? _consignee;
User? _sender;
bool _isLoading = false;
@override
@@ -45,10 +46,15 @@ class _ProcessingEditEditorState extends State<ProcessingEditEditor> {
_descCtl.text = _package!.desc ?? "";
_remarkCtl.text = _package!.remark ?? "";
multiImgController.setImageUrls = _package!.photoUrls;
_user = User(
_consignee = User(
fcsID: _package!.fcsID ?? "",
name: _package!.userName ?? "",
phoneNumber: _package!.phoneNumber ?? "");
_sender = User(
fcsID: _package!.senderFCSID ?? "",
name: _package!.senderName ?? "",
phoneNumber: _package!.senderPhoneNumber ?? "");
}
final DateFormat dateFormat = DateFormat("d MMM yyyy");
@@ -62,7 +68,7 @@ class _ProcessingEditEditorState extends State<ProcessingEditEditor> {
children: <Widget>[
Expanded(
child: DisplayText(
text: _user!.fcsID,
text: _consignee!.fcsID,
labelTextKey: "processing.fcs.id",
icon: FcsIDIcon(),
)),
@@ -70,18 +76,18 @@ class _ProcessingEditEditorState extends State<ProcessingEditEditor> {
icon: Icon(Icons.search, color: primaryColor),
onPressed: () => searchUser(context, onUserSelect: (u) {
setState(() {
this._user = u;
this._consignee = u;
});
})),
],
);
final namebox = DisplayText(
text: _user!.name,
labelTextKey: "processing.name",
text: _consignee!.name,
labelTextKey: "processing.consignee.name",
iconData: Icons.person,
);
final phoneNumberBox = DisplayText(
text: _user!.phoneNumber,
text: _consignee!.phoneNumber,
labelTextKey: "processing.phone",
iconData: Icons.phone,
);
@@ -110,6 +116,59 @@ class _ProcessingEditEditorState extends State<ProcessingEditEditor> {
controller: multiImgController,
title: "Receipt File",
);
final consigneeBox = Container(
child: Column(
children: [
fcsIDBox,
phoneNumberBox,
namebox,
],
),
);
var shipperIDBox = Row(
children: <Widget>[
Expanded(
child: DisplayText(
text: _sender != null ? _sender!.fcsID : "",
labelTextKey: "processing.fcs.id",
icon: FcsIDIcon(),
)),
IconButton(
icon: Icon(Icons.search, color: primaryColor),
onPressed: () => searchUser(context, onUserSelect: (u) {
setState(() {
this._sender = u;
});
}, popPage: true)),
],
);
final shipperPhoneNumberBox = DisplayText(
text: _sender != null ? _sender!.phoneNumber : "",
labelTextKey: "processing.phone",
maxLines: 2,
iconData: Icons.phone,
);
final shipperNamebox = DisplayText(
text: _sender != null ? _sender!.name : "",
labelTextKey: "processing.shipper.name",
maxLines: 2,
iconData: Icons.person,
);
final shipperBox = Container(
child: Column(
children: [
shipperIDBox,
shipperPhoneNumberBox,
shipperNamebox,
],
),
);
return LocalProgress(
inAsyncCall: _isLoading,
child: Scaffold(
@@ -141,9 +200,12 @@ class _ProcessingEditEditorState extends State<ProcessingEditEditor> {
child: ListView(
children: [
trackingIdBox,
fcsIDBox,
namebox,
phoneNumberBox,
Row(
children: [
Flexible(child: consigneeBox),
Flexible(child: shipperBox)
],
),
marketDropdown(),
descBox,
remarkBox,
@@ -165,11 +227,11 @@ class _ProcessingEditEditorState extends State<ProcessingEditEditor> {
List<String?> markets = _markets.map((e) => e.name).toList();
markets.insert(0, MANAGE_MARKET);
if (!markets.contains(selectedMarket)) {
markets.insert(0, selectedMarket!);
markets.insert(0, selectedMarket);
}
return Padding(
padding: const EdgeInsets.only(left: 5.0, right: 0),
padding: const EdgeInsets.only(left: 5.0, right: 0, top: 10),
child: Row(
children: [
Padding(
@@ -236,7 +298,7 @@ class _ProcessingEditEditorState extends State<ProcessingEditEditor> {
}
_completeProcessing() async {
if (_user!.fcsID == null || _user!.fcsID == "") {
if (_consignee!.fcsID == null || _consignee!.fcsID == "") {
showMsgDialog(context, "Error", "Expected FCS-ID");
return;
}
@@ -246,10 +308,11 @@ class _ProcessingEditEditorState extends State<ProcessingEditEditor> {
PackageModel packageModel =
Provider.of<PackageModel>(context, listen: false);
try {
_package!.fcsID = _user!.fcsID;
_package!.fcsID = _consignee!.fcsID;
_package!.senderFCSID = _sender!.fcsID;
_package!.desc = _descCtl.text;
_package!.remark = _remarkCtl.text;
_package!.market = selectedMarket!;
_package!.market = selectedMarket ?? "";
await packageModel.updateProcessing(_package!,
multiImgController.getAddedFile, multiImgController.getDeletedUrl);
Navigator.pop(context);
@@ -264,17 +327,17 @@ class _ProcessingEditEditorState extends State<ProcessingEditEditor> {
isDataChanged() {
if (isNew) {
return _user!.fcsID != "" ||
return _consignee!.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,
fcsID: _consignee!.fcsID,
senderFCSID: _sender!.fcsID,
market: selectedMarket,
desc: _descCtl.text ,
remark: _remarkCtl.text,
photoUrls: widget.package!.photoUrls);
return widget.package!.isChangedForEditProcessing(_package) ||

7
lib/pages/processing/processing_editor.dart
View File

@@ -160,7 +160,8 @@ class _ProcesingEditorState extends State<ProcesingEditor> {
consignee: this.consignee,
)),
);
_addPackage(_package!);
_addPackage(_package);
// _savePackage(_package);
}),
],
@@ -244,14 +245,14 @@ class _ProcesingEditorState extends State<ProcesingEditor> {
}).toList();
}
_addPackage(Package package) {
_addPackage(Package? package) {
if (package == null) return;
this.packages.add(package);
setState(() {});
}
_savePackage(Package package) {
_savePackage(Package? package) {
if (package == null) return;
setState(() {});
}

5
lib/pages/processing/processing_info.dart
View File

@@ -215,15 +215,14 @@ class _ProcessingInfoState extends State<ProcessingInfo> {
bool? deleted = await Navigator.push<bool>(
context,
CupertinoPageRoute(
builder: (context) => ProcessingEditEditor(
package: widget.package,
)));
builder: (context) => ProcessingEditEditor(package: _package)));
if (deleted ?? false) {
Navigator.pop(context);
} else {
PackageModel packageModel =
Provider.of<PackageModel>(context, listen: false);
Package? p = await packageModel.getPackage(_package!.id!);
if(p == null)return;
initPackage(p);
}
}