This commit is contained in:
phyothandar
2021-09-14 11:03:03 +06:30
parent 442449e1dd
commit 74b013a86d
8 changed files with 224 additions and 139 deletions

View File

@@ -64,18 +64,17 @@ class _PickupEditorState extends State<PickupEditor> {
Container(
width: 150,
child: DisplayText(
text: '',
labelTextKey: "pickup.time",
iconData: Icons.timer,
text: '9:00 AM',
labelTextKey: "pickup.from_time",
iconData: MaterialCommunityIcons.clock_start,
),
),
Container(
width: 150,
child: DisplayText(
text: '',
labelTextKey: "pickup.time",
iconData: Icons.timer,
),
text: '12:00 AM',
labelTextKey: "pickup.to_time",
iconData: MaterialCommunityIcons.clock_end),
)
],
);
@@ -94,18 +93,25 @@ class _PickupEditorState extends State<PickupEditor> {
final completeProcessingBtn = fcsButton(
context,
getLocalString(context, 'pickup.edit.complete.btn'),
callack: _completeProcessing,
callack: _confirmComplete,
);
final descBox = DisplayText(
text: _package!.desc ?? "",
labelTextKey: 'processing.desc',
iconData: MaterialCommunityIcons.message_text_outline,
final staffNameBox = DisplayText(
text: _package != null ? _package!.userName : "",
labelTextKey: "pickup.staff.name",
iconData: Icons.perm_identity,
);
final remarkBox = InputText(
labelTextKey: 'pickup.remark',
iconData: Entypo.new_message,
controller: _remarkCtl);
final statusBox = DisplayText(
text: _package != null ? _package!.status : "",
labelTextKey: "pickup.status",
iconData: Icons.av_timer,
);
final img = MultiImageFile(
enabled: true,
controller: multiImgController,
@@ -144,7 +150,8 @@ class _PickupEditorState extends State<PickupEditor> {
pickupNumberBox,
pickupDateBox,
timeBox,
descBox,
staffNameBox,
statusBox,
remarkBox,
img,
_package!.status == 'packed'
@@ -236,7 +243,7 @@ class _PickupEditorState extends State<PickupEditor> {
);
}
_completeProcessing() async {
_completePickup() async {
if (_user!.fcsID == null || _user!.fcsID == "") {
showMsgDialog(context, "Error", "Expected FCS-ID");
return;
@@ -247,12 +254,12 @@ class _PickupEditorState extends State<PickupEditor> {
PackageModel packageModel =
Provider.of<PackageModel>(context, listen: false);
try {
_package!.fcsID = _user!.fcsID;
_package!.desc = _descCtl.text;
_package!.remark = _remarkCtl.text;
_package!.market = selectedMarket!;
await packageModel.updateProcessing(_package!,
multiImgController.getAddedFile, multiImgController.getDeletedUrl);
// _package!.fcsID = _user!.fcsID;
// _package!.desc = _descCtl.text;
// _package!.remark = _remarkCtl.text;
// _package!.market = selectedMarket!;
// await packageModel.updateProcessing(_package!,
// multiImgController.getAddedFile, multiImgController.getDeletedUrl);
Navigator.pop(context);
} catch (e) {
showMsgDialog(context, "Error", e.toString());
@@ -263,6 +270,12 @@ class _PickupEditorState extends State<PickupEditor> {
}
}
_confirmComplete() {
showConfirmDialog(context, "pickup.confirm.complete", () {
_completePickup();
});
}
isDataChanged() {
if (isNew) {
return _user!.fcsID != "" ||