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

add packages, receiving & processing

Browse Source
This commit is contained in:
Sai Naw Wun
2020-10-12 03:34:05 +06:30
parent 32e6be2abd
commit b13dc69161
36 changed files with 1110 additions and 668 deletions
Download Patch File Download Diff File Expand all files Collapse all files

207
lib/pages/package/model/package_model.dart
View File

@@ -1,6 +1,8 @@
import 'dart:async';
import 'dart:io';
import 'package:fcs/data/services/services.dart';
import 'package:fcs/domain/vo/message.dart';
import 'package:fcs/helpers/pagination.dart';
import 'package:path/path.dart' as Path;
import 'package:cloud_firestore/cloud_firestore.dart';
@@ -15,37 +17,97 @@ class PackageModel extends BaseModel {
final log = Logger('PackageModel');
StreamSubscription<QuerySnapshot> listener;
StreamSubscription<QuerySnapshot> customerPackageListener;
Pagination pagination;
List<Package> packages = [];
List<Package> customerPackages = [];
List<Package> deliveredPackages = [];
bool endOfDeliveredPackages = false;
bool isLoading = false;
@override
void privilegeChanged() {
super.privilegeChanged();
_loadPackages();
_loadCustomerPackages();
}
@override
logout() async {
if (listener != null) await listener.cancel();
if (customerPackageListener != null) await customerPackageListener.cancel();
if (pagination != null) pagination.close();
packages = [];
customerPackages = [];
deliveredPackages = [];
}
Future<void> initDeliveredPackages() {
if (pagination != null) pagination.close();
deliveredPackages = [];
endOfDeliveredPackages = false;
isLoading = false;
var pageQuery = Firestore.instance
.collection("/$packages_collection")
// .collection(
// "/users/8OTfsbVvsUOn1SLxy1OrKk7Y_yNKkVoGalPcIlcHnAY/messages")
// .orderBy("date", descending: true);
.where("is_delivered", isEqualTo: true)
.where("is_deleted", isEqualTo: false);
if (user.isCustomer()) {
pageQuery = pageQuery.where("user_id", isEqualTo: user.id);
}
pageQuery = pageQuery.orderBy("current_status_date", descending: true);
pagination = new Pagination(pageQuery, rowPerLoad: 20);
pagination.stream.listen((doc) {
if (doc == null) {
endOfDeliveredPackages = true;
} else {
deliveredPackages.add(Package.fromMap(doc.data, doc.documentID));
// var m = Message.fromMap(doc.data, doc.documentID);
// deliveredPackages.add(Package(
// id: m.id,
// status: package_delivered_status,
// currentStatus: package_delivered_status,
// currentStatusDate: m.date,
// trackingID: (count++).toString(),
// market: m.message));
}
});
return null;
}
Future<bool> loadMoreDeliveredPackages() {
if (pagination != null && !isLoading && !endOfDeliveredPackages) {
isLoading = true;
notifyListeners();
pagination.load().then((value) {
isLoading = false;
notifyListeners();
});
}
return null;
}
Future<void> _loadPackages() async {
if (user == null) return;
String path = "";
if (user.isCustomer()) {
path = "/$user_collection/${user.id}/$packages_collection";
} else {
path = "/$packages_collection";
}
if (user == null ||
!user.hasPackages() ||
!user.hasReceiving() ||
!user.hasProcessing()) return;
String path = "/$packages_collection";
if (listener != null) listener.cancel();
packages = [];
try {
listener = Firestore.instance
var q = Firestore.instance
.collection("$path")
.where("is_delivered", isEqualTo: false)
.snapshots()
.listen((QuerySnapshot snapshot) {
.where("is_deleted", isEqualTo: false);
listener = q.snapshots().listen((QuerySnapshot snapshot) {
packages.clear();
packages = snapshot.documents.map((documentSnapshot) {
var package = Package.fromMap(
@@ -59,14 +121,36 @@ class PackageModel extends BaseModel {
}
}
Future<void> _loadCustomerPackages() async {
if (user == null) return;
String path = "/$packages_collection";
if (customerPackageListener != null) customerPackageListener.cancel();
customerPackages = [];
try {
var q = Firestore.instance
.collection("$path")
.where("is_delivered", isEqualTo: false)
.where("is_deleted", isEqualTo: false)
.where("user_id", isEqualTo: user.id);
customerPackageListener = q.snapshots().listen((QuerySnapshot snapshot) {
customerPackages.clear();
customerPackages = snapshot.documents.map((documentSnapshot) {
var package = Package.fromMap(
documentSnapshot.data, documentSnapshot.documentID);
return package;
}).toList();
notifyListeners();
});
} catch (e) {
log.warning("Error!! $e");
}
}
Future<Package> getPackage(String id) async {
if (user == null) return null;
String path = "";
if (user.isCustomer()) {
path = "/$user_collection/${user.id}/$packages_collection";
} else {
path = "/$packages_collection";
}
String path = "/$packages_collection";
try {
DocumentSnapshot snap =
await Firestore.instance.collection("$path").document(id).get();
@@ -80,6 +164,42 @@ class PackageModel extends BaseModel {
return null;
}
Future<Package> lookupPackage(String trackingID) async {
if (user == null) return null;
String path = "/$packages_collection";
try {
var qsnap = await Firestore.instance
.collection("$path")
.where("tracking_id", isEqualTo: trackingID)
.where("has_user_id", isEqualTo: false)
.getDocuments(source: Source.server);
if (qsnap.documents.length > 0) {
var snap = qsnap.documents[0];
if (snap.exists) {
var package = Package.fromMap(snap.data, snap.documentID);
return package;
}
}
qsnap = await Firestore.instance
.collection("$path")
.where("tracking_id", isEqualTo: trackingID)
.where("user_id", isEqualTo: user.id)
.getDocuments(source: Source.server);
if (qsnap.documents.length > 0) {
var snap = qsnap.documents[0];
if (snap.exists) {
var package = Package.fromMap(snap.data, snap.documentID);
return package;
}
}
} catch (e) {
log.warning("Error!! $e");
}
return null;
}
Future<List<User>> searchUser(String term) {
return Services.instance.userService.searchUser(term);
}
@@ -93,8 +213,8 @@ class PackageModel extends BaseModel {
.createPackages(packages, user.fcsID);
}
Future<void> createPackage(User user, Package package, List<File> files,
List<String> deletedUrls) async {
Future<void> createReceiving(
User user, Package package, List<File> files) async {
if (user != null) {
package.fcsID = user.fcsID;
}
@@ -106,28 +226,61 @@ class PackageModel extends BaseModel {
String url = await uploadStorage(path, f);
package.photoUrls.add(url);
}
package.photoUrls.removeWhere((e) => deletedUrls.contains(e));
}
return Services.instance.packageService.createPackage(package);
return Services.instance.packageService.createReceiving(package);
}
Future<void> completeProcessing(
Package package, List<File> files, List<String> deletedUrls) async {
Future<void> updateReceiving(User user, Package package, List<File> files,
List<String> deletedUrls) async {
if (user != null) {
package.fcsID = user.fcsID;
}
if (deletedUrls != null) {
for (String url in deletedUrls) {
package.photoUrls.remove(url);
}
await deleteStorageFromUrls(deletedUrls);
}
if (files != null) {
if (files.length > 5) throw Exception("Exceed number of file upload");
package.photoUrls = package.photoUrls == null ? [] : package.photoUrls;
for (File f in files) {
String path = Path.join(pkg_files_path, package.userID, package.id);
String path = Path.join(pkg_files_path);
String url = await uploadStorage(path, f);
package.photoUrls.add(url);
}
}
await Services.instance.packageService.updateReceiving(package);
}
Future<void> deleteReceiving(Package package) {
return Services.instance.packageService.deleteReceiving(package);
}
Future<void> updateProcessing(
Package package, List<File> files, List<String> deletedUrls) async {
if (deletedUrls != null) {
for (String url in deletedUrls) {
package.photoUrls.remove(url);
}
await deleteStorageFromUrls(deletedUrls);
}
if (files != null) {
if (files.length > 5) throw Exception("Exceed number of file upload");
package.photoUrls = package.photoUrls == null ? [] : package.photoUrls;
for (File f in files) {
String path = Path.join(pkg_files_path);
String url = await uploadStorage(path, f);
package.photoUrls.add(url);
}
package.photoUrls.removeWhere((e) => deletedUrls.contains(e));
}
await request("/package", "PUT",
payload: package.toJson(), token: await getToken());
await Services.instance.packageService.updateProcessing(package);
}
Future<void> deletePackage(Package package) {
return Services.instance.packageService.deletePackage(package);
Future<void> deleteProcessing(Package package) {
return Services.instance.packageService.deleteProcessing(package);
}
}

6
lib/pages/package/package_editor.dart
View File

@@ -228,8 +228,8 @@ class _PackageEditorPageState extends State<PackageEditorPage> {
_package.desc = _descCtl.text;
_package.remark = _remarkCtl.text;
_package.market = selectedMarket;
await packageModel.completeProcessing(_package,
multiImgController.getAddedFile, multiImgController.getDeletedUrl);
// await packageModel.completeProcessing(_package,
// multiImgController.getAddedFile, multiImgController.getDeletedUrl);
Navigator.pop(context);
} catch (e) {
showMsgDialog(context, "Error", e.toString());
@@ -251,7 +251,7 @@ class _PackageEditorPageState extends State<PackageEditorPage> {
PackageModel packageModel =
Provider.of<PackageModel>(context, listen: false);
try {
await packageModel.deletePackage(_package);
// await packageModel.deletePackage(_package);
Navigator.pop<bool>(context, true);
} catch (e) {
showMsgDialog(context, "Error", e.toString());

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

@@ -1,28 +1,24 @@
import 'package:fcs/domain/entities/package.dart';
import 'package:fcs/helpers/theme.dart';
import 'package:fcs/pages/main/model/main_model.dart';
import 'package:fcs/pages/package/package_editor.dart';
import 'package:fcs/pages/main/util.dart';
import 'package:fcs/pages/widgets/bottom_up_page_route.dart';
import 'package:fcs/pages/widgets/display_text.dart';
import 'package:fcs/pages/widgets/local_text.dart';
import 'package:fcs/pages/widgets/multi_img_controller.dart';
import 'package:fcs/pages/widgets/multi_img_file.dart';
import 'package:fcs/pages/widgets/progress.dart';
import 'package:fcs/pages/widgets/status_tree.dart';
import 'package:flutter/material.dart';
import 'package:flutter_icons/flutter_icons.dart';
import 'package:intl/intl.dart';
import 'package:provider/provider.dart';
import 'package:timeline_list/timeline.dart';
import 'package:timeline_list/timeline_model.dart';
import 'model/package_model.dart';
final DateFormat dateFormat = DateFormat("d MMM yyyy");
class PackageInfo extends StatefulWidget {
final isSearchResult;
final Package package;
PackageInfo({this.package});
PackageInfo({this.package, this.isSearchResult = false});
@override
_PackageInfoState createState() => _PackageInfoState();
@@ -54,8 +50,6 @@ class _PackageInfoState extends State<PackageInfo> {
@override
Widget build(BuildContext context) {
bool isCustomer = Provider.of<MainModel>(context).isCustomer();
final trackingIdBox = DisplayText(
text: _package.trackingID,
labelTextKey: "package.tracking.id",
@@ -109,14 +103,6 @@ class _PackageInfoState extends State<PackageInfo> {
fontSize: 20,
color: primaryColor,
),
actions: <Widget>[
isCustomer
? Container()
: IconButton(
icon: Icon(Icons.edit, color: primaryColor),
onPressed: _gotoEditor,
)
],
),
body: Card(
child: Column(
@@ -126,29 +112,15 @@ class _PackageInfoState extends State<PackageInfo> {
padding: const EdgeInsets.all(10.0),
child: ListView(children: <Widget>[
trackingIdBox,
customerNameBox,
marketBox,
widget.isSearchResult ? Container() : customerNameBox,
widget.isSearchResult ? Container() : marketBox,
statusBox,
_package.photoUrls.length == 0 ? Container() : img,
descBox,
widget.isSearchResult ? Container() : descBox,
remarkBox,
ExpansionTile(
initiallyExpanded: true,
title: Text(
'Status',
style: TextStyle(
color: primaryColor, fontWeight: FontWeight.bold),
),
children: <Widget>[
Container(
padding: EdgeInsets.only(left: 20),
height: 400,
child: Timeline(
children: _models(),
position: TimelinePosition.Left),
),
],
),
StatusTree(
shipmentHistory: _package.shipmentHistory,
currentStatus: _package.currentStatus),
SizedBox(
height: 20,
)
@@ -194,20 +166,4 @@ class _PackageInfoState extends State<PackageInfo> {
)))
.toList();
}
_gotoEditor() async {
bool deleted = await Navigator.push<bool>(
context,
BottomUpPageRoute(PackageEditorPage(
package: widget.package,
)));
if (deleted ?? false) {
Navigator.pop(context);
} else {
PackageModel packageModel =
Provider.of<PackageModel>(context, listen: false);
Package p = await packageModel.getPackage(_package.id);
initPackage(p);
}
}
}

109
lib/pages/package/package_list.dart
View File

@@ -1,14 +1,12 @@
import 'package:fcs/domain/entities/package.dart';
import 'package:fcs/helpers/theme.dart';
import 'package:fcs/localization/app_translations.dart';
import 'package:fcs/pages/main/model/main_model.dart';
import 'package:fcs/pages/package/model/package_model.dart';
import 'package:fcs/pages/package/package_info.dart';
import 'package:fcs/pages/package/package_list_row.dart';
import 'package:fcs/pages/package/package_new.dart';
import 'package:fcs/pages/package_search/package_serach.dart';
import 'package:fcs/pages/user_search/user_serach.dart';
import 'package:fcs/pages/widgets/bottom_up_page_route.dart';
import 'package:fcs/pages/widgets/local_popup_menu_button.dart';
import 'package:fcs/pages/widgets/local_popupmenu.dart';
import 'package:fcs/pages/widgets/local_text.dart';
import 'package:fcs/pages/widgets/progress.dart';
import 'package:flutter/cupertino.dart';
@@ -16,16 +14,29 @@ import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
class PackageList extends StatefulWidget {
final bool onlyFcs;
const PackageList({Key key, this.onlyFcs = false}) : super(key: key);
@override
_PackageListState createState() => _PackageListState();
}
class _PackageListState extends State<PackageList> {
bool _isLoading = false;
bool _showDelivered = false;
var _controller = ScrollController();
@override
void initState() {
super.initState();
Provider.of<PackageModel>(context, listen: false).initDeliveredPackages();
_controller.addListener(() {
if (_showDelivered &&
_controller.position.pixels == _controller.position.maxScrollExtent) {
Provider.of<PackageModel>(context, listen: false)
.loadMoreDeliveredPackages();
}
});
}
@override
@@ -36,7 +47,20 @@ class _PackageListState extends State<PackageList> {
@override
Widget build(BuildContext context) {
var packageModel = Provider.of<PackageModel>(context);
bool isCustomer = context.select((MainModel m) => m.isCustomer());
bool onlyFcs = widget.onlyFcs;
var packages = _showDelivered
? packageModel.deliveredPackages
: onlyFcs ? packageModel.packages : packageModel.customerPackages;
final popupMenu = LocalPopupMenuButton(
popmenus: [
LocalPopupMenu(
id: 1, textKey: "package.popupmenu.active", selected: true),
LocalPopupMenu(id: 2, textKey: "package.popupmenu.delivered")
],
popupMenuCallback: (p) => this.setState(() {
_showDelivered = p.id == 2;
}),
);
return LocalProgress(
inAsyncCall: _isLoading,
@@ -55,9 +79,8 @@ class _PackageListState extends State<PackageList> {
color: Colors.white,
),
actions: <Widget>[
isCustomer
? Container()
: IconButton(
onlyFcs
? IconButton(
icon: Icon(
Icons.search,
color: Colors.white,
@@ -65,41 +88,45 @@ class _PackageListState extends State<PackageList> {
iconSize: 30,
onPressed: () => searchPackage(context,
callbackPackageSelect: _searchCallback),
),
)
: Container(),
popupMenu
],
),
floatingActionButton: isCustomer
? Container()
: FloatingActionButton.extended(
onPressed: () {
_newPackage();
},
icon: Icon(Icons.add),
label: Text(
AppTranslations.of(context).text("package.create.title")),
backgroundColor: primaryColor,
),
body: new ListView.separated(
separatorBuilder: (context, index) => Divider(
color: Colors.black,
),
scrollDirection: Axis.vertical,
padding: EdgeInsets.only(top: 15),
shrinkWrap: true,
itemCount: packageModel.packages.length,
itemBuilder: (BuildContext context, int index) {
return PackageListRow(
key: ValueKey(packageModel.packages[index].id),
package: packageModel.packages[index],
);
})),
);
}
_newPackage() {
Navigator.push(
context,
BottomUpPageRoute(PackageNew()),
body: Column(
children: [
Expanded(
child: ListView.separated(
controller: _controller,
separatorBuilder: (context, index) => Divider(
color: Colors.black,
),
scrollDirection: Axis.vertical,
padding: EdgeInsets.only(top: 15),
shrinkWrap: true,
itemCount: packages.length,
itemBuilder: (BuildContext context, int index) {
return PackageListRow(
key: ValueKey(packages[index].id),
package: packages[index],
);
}),
),
packageModel.isLoading
? Container(
padding: EdgeInsets.all(8),
color: primaryColor,
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Text("Loading...",
style: TextStyle(color: Colors.white)),
],
),
)
: Container(),
],
)),
);
}