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

update pickup

Browse Source
This commit is contained in:
tzw
2021-10-09 17:08:28 +06:30
parent 46da87dc0e
commit 50901992d7
21 changed files with 597 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
lib/pages/pickup/pickup_list_row.dart
View File

@@ -1,4 +1,4 @@
import 'package:fcs/domain/entities/package.dart';
import 'package:fcs/domain/entities/pickup.dart';
import 'package:fcs/helpers/theme.dart';
import 'package:fcs/pages/main/util.dart';
import 'package:fcs/pages/pickup/pickup_info.dart';
@@ -7,29 +7,28 @@ import 'package:flutter/material.dart';
import 'package:flutter_vector_icons/flutter_vector_icons.dart';
import 'package:intl/intl.dart';
typedef CallbackPackageSelect(Package package);
typedef CallbackPickupSelect(Pickup pickup);
class PickupListRow extends StatelessWidget {
final Package? package;
final CallbackPackageSelect? callbackPackageSelect;
final Pickup? pickup;
final CallbackPickupSelect? callbackPickupSelect;
final double dotSize = 15.0;
final DateFormat dateFormat = new DateFormat("dd MMM yyyy");
PickupListRow({Key? key, this.package, this.callbackPackageSelect})
PickupListRow({Key? key, this.pickup, this.callbackPickupSelect})
: super(key: key);
@override
Widget build(BuildContext context) {
return InkWell(
onTap: () {
if (callbackPackageSelect != null) {
callbackPackageSelect!(package!);
if (callbackPickupSelect != null) {
callbackPickupSelect!(pickup!);
return;
}
Navigator.push(
context,
CupertinoPageRoute(
builder: (context) => PickupInfo(package: package)),
CupertinoPageRoute(builder: (context) => PickupInfo(pickup: pickup!)),
);
},
child: Container(
@@ -56,19 +55,21 @@ class PickupListRow extends StatelessWidget {
Padding(
padding: const EdgeInsets.only(left: 8.0),
child: new Text(
package!.id == null ? '' : package!.trackingID!,
pickup?.pickupNumber ?? '',
style: new TextStyle(
fontSize: 15.0, color: Colors.black),
),
),
Padding(
padding: const EdgeInsets.only(left: 8.0),
padding: const EdgeInsets.only(left: 10.0, top: 10),
child: new Text(
package!.market == null ? '' : package!.market!,
pickup!.pickupDate != null
? dateFormat.format(pickup!.pickupDate!)
: "",
style: new TextStyle(
fontSize: 15.0, color: Colors.black),
fontSize: 15.0, color: Colors.grey),
),
),
)
],
),
),
@@ -78,19 +79,7 @@ class PickupListRow extends StatelessWidget {
),
Column(
children: <Widget>[
Padding(
padding: const EdgeInsets.all(3.0),
child: getStatus(package!.status ?? ""),
),
Padding(
padding: const EdgeInsets.all(0),
child: new Text(
package!.currentStatusDate != null
? dateFormat.format(package!.currentStatusDate!)
: '',
style: new TextStyle(fontSize: 15.0, color: Colors.grey),
),
),
getStatus(pickup!.status ?? ""),
],
)
],