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

add delivery

Browse Source
This commit is contained in:
Sai Naw Wun
2020-10-21 05:40:58 +06:30
parent 9aefc585ec
commit b367478f52
14 changed files with 189 additions and 745 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/pages/fcs_shipment/fcs_shipment_list.dart
View File

@@ -44,7 +44,7 @@ class _FcsShipmentListState extends State<FcsShipmentList> {
selected: shipmentModel.selectedIndex == 1),
LocalPopupMenu(
id: 2,
textKey: "FCSshipment.popupmenu.delivered",
textKey: "FCSshipment.popupmenu.shipped",
selected: shipmentModel.selectedIndex == 2)
],
popupMenuCallback: (p) => this.setState(() {

26
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(_delivered.values);
: List<FcsShipment>.from(_shipped.values);
Paginator _delivered;
Paginator _shipped;
bool isLoading = false;
int _selectedIndex = 1;
set selectedIndex(int index) {
@@ -32,16 +32,16 @@ class FcsShipmentModel extends BaseModel {
super.privilegeChanged();
_loadFcsShipments();
if (_delivered != null) _delivered.close();
_delivered = _getDelivered();
if (_shipped != null) _shipped.close();
_shipped = _getShipped();
}
initData() {
_selectedIndex = 1;
_loadFcsShipments();
if (_delivered != null) _delivered.close();
_delivered = _getDelivered();
if (_shipped != null) _shipped.close();
_shipped = _getShipped();
}
Future<void> _loadFcsShipments() async {
@@ -53,6 +53,7 @@ class FcsShipmentModel extends BaseModel {
listener = Firestore.instance
.collection("$path")
.orderBy("shipment_number", descending: true)
.where("status", isEqualTo: fcs_shipment_confirmed_status)
.snapshots()
.listen((QuerySnapshot snapshot) {
_fcsShipments.clear();
@@ -68,12 +69,12 @@ class FcsShipmentModel extends BaseModel {
}
}
Paginator _getDelivered() {
Paginator _getShipped() {
if (user == null || !user.hasFcsShipments()) return null;
var pageQuery = Firestore.instance
.collection("/$fcs_shipment_collection")
.where("is_delivered", isEqualTo: true)
.where("status", isEqualTo: fcs_shipment_shipped_status)
.where("is_deleted", isEqualTo: false)
.orderBy("status_date", descending: true);
var paginator = new Paginator(pageQuery, rowPerLoad: 20, toObj: (data, id) {
@@ -83,17 +84,18 @@ class FcsShipmentModel extends BaseModel {
}
Future<void> loadMore() async {
if (_delivered.ended) return;
if (_shipped.ended && _selectedIndex == 1) return;
isLoading = true;
notifyListeners();
await _delivered.load(onFinished: () {
await _shipped.load(onFinished: () {
isLoading = false;
notifyListeners();
});
}
Future<void> refresh() async {
await _delivered.refresh(onFinished: () {
if (_selectedIndex == 1) return;
await _shipped.refresh(onFinished: () {
notifyListeners();
});
}
@@ -138,7 +140,7 @@ class FcsShipmentModel extends BaseModel {
@override
logout() async {
if (listener != null) await listener.cancel();
if (_delivered != null) _delivered.close();
if (_shipped != null) _shipped.close();
_fcsShipments = [];
}