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

null safety

Browse Source
This commit is contained in:
phyothandar
2021-09-10 16:48:21 +06:30
parent 03c5fc5016
commit bb4f4ad7c2
40 changed files with 393 additions and 352 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
lib/pages/shipment/model/shipment_model.dart
View File

@@ -11,7 +11,7 @@ import 'package:logging/logging.dart';
class ShipmentModel extends BaseModel {
final log = Logger('ShipmentModel');
StreamSubscription<QuerySnapshot> listener;
StreamSubscription<QuerySnapshot>? listener;
List<Shipment> get shipments => _menuSelectedIndex == 1
? _shipments
@@ -19,7 +19,7 @@ class ShipmentModel extends BaseModel {
List<Shipment> _shipments = [];
Paginator _delivered;
late Paginator _delivered;
bool isLoading = false;
int _menuSelectedIndex = 1;
@@ -28,7 +28,7 @@ class ShipmentModel extends BaseModel {
notifyListeners();
}
get menuSelectedIndex => _menuSelectedIndex;
int get menuSelectedIndex => _menuSelectedIndex;
initData(bool forCustomer, {bool myPickup = false}) {
logout();
@@ -43,11 +43,11 @@ class ShipmentModel extends BaseModel {
@override
logout() async {
if (_delivered != null) _delivered.close();
if (listener != null) await listener.cancel();
if (listener != null) await listener!.cancel();
_shipments = [];
}
Future<void> loadMore({bool isCustomer}) async {
Future<void> loadMore({bool? isCustomer}) async {
if (menuSelectedIndex == 1)
return; // when delivered menu is not selected return
if (_delivered.ended) return;
@@ -59,7 +59,7 @@ class ShipmentModel extends BaseModel {
});
}
Future<void> refresh({bool isCustomer}) async {
Future<void> refresh({bool? isCustomer}) async {
if (menuSelectedIndex == 1)
return; // when delivered menu is not selected return
await _delivered.refresh(onFinished: () {
@@ -70,16 +70,16 @@ class ShipmentModel extends BaseModel {
Paginator _getDelivered(bool isCustomer) {
if (!isCustomer) {
if (user == null ||
!((user.hasPackages() ||
user.hasReceiving() ||
user.hasProcessing()))) throw "No privilege";
!((user!.hasPackages() ||
user!.hasReceiving() ||
user!.hasProcessing()))) throw "No privilege";
}
var pageQuery = Firestore.instance
var pageQuery = FirebaseFirestore.instance
.collection("/$shipments_collection")
.where("is_delivered", isEqualTo: true)
.where("is_deleted", isEqualTo: false);
if (isCustomer) {
pageQuery = pageQuery.where("user_id", isEqualTo: user.id);
pageQuery = pageQuery.where("user_id", isEqualTo: user!.id);
}
pageQuery = pageQuery.orderBy("status_date", descending: true);
var paginator = new Paginator(pageQuery, rowPerLoad: 20, toObj: (data, id) {
@@ -90,30 +90,31 @@ class ShipmentModel extends BaseModel {
Future<void> _loadShipments(bool forCustomer, bool myPickup) async {
if (user == null) return;
if (!forCustomer && !user.hasShipment()) return;
if (listener != null) listener.cancel();
if (!forCustomer && !user!.hasShipment()) return;
if (listener != null) listener!.cancel();
_shipments = [];
try {
var q = Firestore.instance
var q = FirebaseFirestore.instance
.collection("$shipments_collection")
.where("is_delivered", isEqualTo: false)
.where("is_canceled", isEqualTo: false)
.where("is_deleted", isEqualTo: false);
if (forCustomer) {
q = q.where("user_id", isEqualTo: user.id);
q = q.where("user_id", isEqualTo: user!.id);
}
if (myPickup) {
q = q.where("pickup_user_id", isEqualTo: user.id);
q = q.where("pickup_user_id", isEqualTo: user!.id);
}
q = q.orderBy("created_at", descending: true);
listener = q.snapshots().listen((QuerySnapshot snapshot) {
_shipments.clear();
_shipments = snapshot.documents.map((documentSnapshot) {
_shipments = snapshot.docs.map((documentSnapshot) {
var s = Shipment.fromMap(
documentSnapshot.data, documentSnapshot.documentID);
documentSnapshot.data as Map<String, dynamic>,
documentSnapshot.id);
return s;
}).toList();
notifyListeners();
@@ -130,18 +131,17 @@ class ShipmentModel extends BaseModel {
shipment_courier_dropoff
];
Shipment getActiveShipment(String shipmentID) {
return _shipments?.firstWhere((e) => e.id == shipmentID,
orElse: () => null);
Shipment? getActiveShipment(String shipmentID) {
return _shipments.firstWhere((e) => e.id == shipmentID);
}
Future<Shipment> getShipment(String shipmentID) async {
Future<Shipment?> getShipment(String shipmentID) async {
String path = "/$shipments_collection";
try {
var ref = Firestore.instance.collection("$path").document(shipmentID);
var snap = await ref.get(source: Source.server);
var ref = FirebaseFirestore.instance.collection("$path").doc(shipmentID);
var snap = await ref.get(const GetOptions(source: Source.server));
if (snap.exists) {
var s = Shipment.fromMap(snap.data, snap.documentID);
var s = Shipment.fromMap(snap.data as Map<String, dynamic>, snap.id);
return s;
}
} catch (e) {
@@ -150,20 +150,20 @@ class ShipmentModel extends BaseModel {
return null;
}
Future<List<Shipment>> getShipmentWithHandlingFee(
Future<List<Shipment?>?> getShipmentWithHandlingFee(
String fcsShipmentID, String userID) async {
String path = "/$shipments_collection";
try {
var q = Firestore.instance
var q = FirebaseFirestore.instance
.collection("$path")
.where("user_id", isEqualTo: userID)
.where("is_deleted", isEqualTo: false)
.where("handling_fee", isGreaterThan: 0)
.where("fcs_shipment_id", isEqualTo: fcsShipmentID);
var snaps = await q.getDocuments(source: Source.server);
List<Shipment> shipments = snaps.documents.map((snap) {
var snaps = await q.get(const GetOptions(source: Source.server));
List<Shipment?> shipments = snaps.docs.map((snap) {
if (snap.exists) {
var s = Shipment.fromMap(snap.data, snap.documentID);
var s = Shipment.fromMap(snap.data as Map<String, dynamic>, snap.id);
return s;
}
}).toList();