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

update carton

Browse Source
This commit is contained in:
Thinzar Win
2021-01-12 16:59:52 +06:30
parent 9dee2c55f3
commit fddcc91515
11 changed files with 91 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
lib/pages/carton/model/carton_model.dart
View File

@@ -34,32 +34,32 @@ class CartonModel extends BaseModel {
status: "Delivered", date: DateTime(2020, 6, 15), done: false)
];
List<Carton> get completed {
return boxes.where((e) => e.status == "Delivered").toList()
..sort((e1, e2) {
return e2.packageNumber.compareTo(e1.packageNumber);
});
}
// List<Carton> get completed {
// return boxes.where((e) => e.status == "Delivered").toList()
// ..sort((e1, e2) {
// return e2.packageNumber.compareTo(e1.packageNumber);
// });
// }
List<Carton> get processed {
return boxes.where((e) => e.status == "Packed").toList()
..sort((e1, e2) {
return e2.packageNumber.compareTo(e1.packageNumber);
});
}
// List<Carton> get processed {
// return boxes.where((e) => e.status == "Packed").toList()
// ..sort((e1, e2) {
// return e2.packageNumber.compareTo(e1.packageNumber);
// });
// }
List<Carton> get upcoming {
return boxes
.where((e) =>
e.status == "Packed" ||
// e.status == "Received" ||
e.status == "Shipped" ||
e.status == "Arrived")
.toList()
..sort((e1, e2) {
return e2.packageNumber.compareTo(e1.packageNumber);
});
}
// List<Carton> get upcoming {
// return boxes
// .where((e) =>
// e.status == "Packed" ||
// // e.status == "Received" ||
// e.status == "Shipped" ||
// e.status == "Arrived")
// .toList()
// ..sort((e1, e2) {
// return e2.packageNumber.compareTo(e1.packageNumber);
// });
// }
List<String> cartonTypes = [
carton_from_packages,
@@ -153,10 +153,10 @@ class CartonModel extends BaseModel {
try {
Query listenerQuery = Firestore.instance
.collection("$path")
.where("carton_type",
whereIn: [carton_from_packages, carton_from_cartons])
.where("status", isEqualTo: carton_packed_status)
.orderBy(orderName, descending: true);
.where("carton_type", whereIn: [
carton_from_packages,
carton_from_cartons
]).where("status", isEqualTo: carton_packed_status);
Query pageQuery = Firestore.instance
.collection("$path")