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

fix

Browse Source
This commit is contained in:
phyothandar
2021-09-13 08:45:45 +06:30
parent fe799ad820
commit a102369daf
2 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lib/pages/fcs_shipment/model/fcs_shipment_model.dart
View File

@@ -15,9 +15,9 @@ class FcsShipmentModel extends BaseModel {
List<FcsShipment> _fcsShipments = [];
List<FcsShipment> get fcsShipments => _selectedIndex == 1
? _fcsShipments
: List<FcsShipment>.from(_shipped.values);
: List<FcsShipment>.from(_shipped!.values);
late Paginator _shipped;
Paginator? _shipped;
bool isLoading = false;
int _selectedIndex = 1;
set selectedIndex(int index) {
@@ -37,9 +37,9 @@ class FcsShipmentModel extends BaseModel {
_selectedIndex = 1;
_loadFcsShipments();
if (_shipped != null) _shipped.close();
if (_shipped != null) _shipped!.close();
_shipped = _getShipped();
_shipped.load();
_shipped!.load();
}
Future<void> _loadFcsShipments() async {
@@ -58,7 +58,8 @@ class FcsShipmentModel extends BaseModel {
_fcsShipments.clear();
_fcsShipments = snapshot.docs.map((documentSnapshot) {
var s = FcsShipment.fromMap(
documentSnapshot.data() as Map<String,dynamic>, documentSnapshot.id);
documentSnapshot.data() as Map<String, dynamic>,
documentSnapshot.id);
return s;
}).toList();
notifyListeners();
@@ -83,10 +84,10 @@ class FcsShipmentModel extends BaseModel {
}
Future<void> loadMore() async {
if (_shipped.ended || _selectedIndex == 1) return;
if (_shipped!.ended || _selectedIndex == 1) return;
isLoading = true;
notifyListeners();
await _shipped.load(onFinished: () {
await _shipped!.load(onFinished: () {
isLoading = false;
notifyListeners();
});
@@ -94,7 +95,7 @@ class FcsShipmentModel extends BaseModel {
Future<void> refresh() async {
if (_selectedIndex == 1) return;
await _shipped.refresh(onFinished: () {
await _shipped!.refresh(onFinished: () {
notifyListeners();
});
}
@@ -108,7 +109,7 @@ class FcsShipmentModel extends BaseModel {
.get(const GetOptions(source: Source.server));
fcsShipments = snaps.docs.map((documentSnapshot) {
var fcs = FcsShipment.fromMap(
documentSnapshot.data as Map<String,dynamic>, documentSnapshot.id);
documentSnapshot.data as Map<String, dynamic>, documentSnapshot.id);
return fcs;
}).toList();
} catch (e) {
@@ -123,7 +124,7 @@ class FcsShipmentModel extends BaseModel {
.collection("/$fcs_shipment_collection")
.doc(id)
.get(const GetOptions(source: Source.server));
var fcs = FcsShipment.fromMap(snap.data as Map<String,dynamic>, snap.id);
var fcs = FcsShipment.fromMap(snap.data as Map<String, dynamic>, snap.id);
return fcs;
} catch (e) {
@@ -141,7 +142,7 @@ class FcsShipmentModel extends BaseModel {
.get(const GetOptions(source: Source.server));
fcsShipments = snaps.docs.map((documentSnapshot) {
var fcs = FcsShipment.fromMap(
documentSnapshot.data as Map<String,dynamic>, documentSnapshot.id);
documentSnapshot.data as Map<String, dynamic>, documentSnapshot.id);
return fcs;
}).toList();
} catch (e) {
@@ -157,7 +158,7 @@ class FcsShipmentModel extends BaseModel {
@override
logout() async {
if (listener != null) await listener!.cancel();
if (_shipped != null) _shipped.close();
if (_shipped != null) _shipped!.close();
_fcsShipments = [];
}

2
lib/pages/package/package_info.dart
View File

@@ -56,7 +56,7 @@ class _PackageInfoState extends State<PackageInfo> {
PackageModel packageModel =
Provider.of<PackageModel>(context, listen: false);
Package? package =
await packageModel.getPackageByTrackingID(pkg!.trackingID!);
await packageModel.getPackageByTrackingID(pkg.trackingID!);
setState(() {
_package = package;
multiImgController.setImageUrls = package!.photoUrls;