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:
Phaung Phaung
2021-09-10 16:48:20 +06:30
parent 52fe4b4568
commit 0f84fec2f7
12 changed files with 103 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
lib/pages/staff/model/staff_model.dart
View File

@@ -11,8 +11,8 @@ import 'package:logging/logging.dart';
class StaffModel extends BaseModel {
final log = Logger('StaffModel');
StreamSubscription<QuerySnapshot> listener;
StreamSubscription<QuerySnapshot> privilegeListener;
StreamSubscription<QuerySnapshot>? listener;
StreamSubscription<QuerySnapshot>? privilegeListener;
List<User> employees = [];
List<Privilege> privileges = [];
@@ -26,28 +26,28 @@ class StaffModel extends BaseModel {
@override
logout() async {
if (listener != null) listener.cancel();
if (privilegeListener != null) privilegeListener.cancel();
if (listener != null) listener!.cancel();
if (privilegeListener != null) privilegeListener!.cancel();
employees = [];
privileges = [];
}
Future<void> _loadEmployees() async {
if (user == null || !user.hasStaffs()) return;
if (user == null || !user!.hasStaffs()) throw "No Privilege";
try {
if (listener != null) listener.cancel();
if (listener != null) listener!.cancel();
listener = Firestore.instance
listener = FirebaseFirestore.instance
.collection("/$user_collection")
.where("is_employee", isEqualTo: true)
.where("is_sys_admin", isEqualTo: false)
.snapshots()
.listen((QuerySnapshot snapshot) {
employees.clear();
employees = snapshot.documents.map((documentSnapshot) {
employees = snapshot.docs.map((documentSnapshot) {
var user =
User.fromMap(documentSnapshot.data, documentSnapshot.documentID);
User.fromMap(documentSnapshot.data as Map<String,dynamic>, documentSnapshot.id);
return user;
}).toList();
notifyListeners();
@@ -59,14 +59,14 @@ class StaffModel extends BaseModel {
Future<void> _loadPrivileges() async {
try {
privilegeListener = Firestore.instance
privilegeListener = FirebaseFirestore.instance
.collection("/$privilege_collection")
.snapshots()
.listen((QuerySnapshot snapshot) {
privileges.clear();
privileges = snapshot.documents.map((documentSnapshot) {
privileges = snapshot.docs.map((documentSnapshot) {
var privilege = Privilege.fromMap(
documentSnapshot.data, documentSnapshot.documentID);
documentSnapshot.data as Map<String,dynamic>, documentSnapshot.id);
return privilege;
}).toList();
notifyListeners();
@@ -82,27 +82,27 @@ class StaffModel extends BaseModel {
token: await getToken());
}
Future<User> findUser(String phoneNumber) {
Future<User?> findUser(String phoneNumber) {
return Services.instance.userService.findUser(phoneNumber);
}
Future<List<User>> getPickupEmployees() async {
if (user == null || !user.hasShipment()) return [];
if (user == null || !user!.hasShipment()) return [];
return _getUsers(privilege_shipment);
}
Future<List<User>> _getUsers(String privilege) async {
List<User> users = [];
try {
var snaps = await Firestore.instance
var snaps = await FirebaseFirestore.instance
.collection("/$user_collection")
.where("is_employee", isEqualTo: true)
.where("is_sys_admin", isEqualTo: false)
.where("privileges", arrayContains: privilege)
.getDocuments(source: Source.server);
users = snaps.documents.map((documentSnapshot) {
.get(const GetOptions(source: Source.server));
users = snaps.docs.map((documentSnapshot) {
var user =
User.fromMap(documentSnapshot.data, documentSnapshot.documentID);
User.fromMap(documentSnapshot.data as Map<String,dynamic>, documentSnapshot.id);
return user;
}).toList();
} catch (e) {