up

Author: sambitraze

lib/services/mailService.dart

@@ -17,3 +17,4 @@ class MailService extends AuthService {
     }
   }
 }
+ 

lib/views/Admin/Attendance/SoloAttendance.dart

@@ -6,6 +6,7 @@ import 'package:propview/config.dart';
 import 'package:propview/models/Attendance.dart';
 import 'package:propview/models/User.dart';
 import 'package:propview/services/attendanceService.dart';
+import 'package:propview/services/authService.dart';
 import 'package:propview/services/mailService.dart';
 import 'package:propview/services/userService.dart';
 import 'package:propview/utils/progressBar.dart';
@@ -53,8 +54,9 @@ class _SoloAttendanceState extends State<SoloAttendance> {
     setState(() {
       loading = true;
     });
-    await getLocation();
-    user = await UserService.getUser();
+    await getLocation();    
+    var auth = await AuthService.getSavedAuth();
+    user = await UserService.getUserById(auth['id']);
     if (user.parentId != "") {
       var parentIdList = user.parentId.split(",");
       print(parentIdList.length);

lib/views/Employee/Attendance/SoloAttendanceScreen.dart

@@ -7,6 +7,7 @@ import 'package:propview/config.dart';
 import 'package:propview/models/Attendance.dart';
 import 'package:propview/models/User.dart';
 import 'package:propview/services/attendanceService.dart';
+import 'package:propview/services/authService.dart';
 import 'package:propview/services/mailService.dart';
 import 'package:propview/services/userService.dart';
 import 'package:propview/utils/progressBar.dart';
@@ -52,7 +53,8 @@ class _SoloAttendanceState extends State<SoloAttendance> {
       loading = true;
     });
     await getLocation();
-    user = await UserService.getUser();    
+    var auth = await AuthService.getSavedAuth();
+    user = await UserService.getUserById(auth['id']);  
     if (user.parentId != "") {
       var parentIdList = user.parentId.split(",");
       print(parentIdList.length);

lib/views/Employee/landingPage.dart

@@ -5,11 +5,9 @@ import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_local_notifications/flutter_local_notifications.dart';
 import 'package:google_nav_bar/google_nav_bar.dart';
-import 'package:in_app_update/in_app_update.dart';
 import 'package:propview/config.dart';
 import 'package:propview/services/baseService.dart';
 import 'package:propview/utils/progressBar.dart';
-import 'package:propview/utils/snackBar.dart';
 import 'package:propview/utils/udpatepop.dart';
 import 'package:propview/views/Employee/Attendance/AttendanceHome.dart';
 import 'package:propview/views/Employee/Home/HomeScreen.dart';

lib/views/Manager/Attendance/SoloAttendance.dart

@@ -6,6 +6,7 @@ import 'package:propview/config.dart';
 import 'package:propview/models/Attendance.dart';
 import 'package:propview/models/User.dart';
 import 'package:propview/services/attendanceService.dart';
+import 'package:propview/services/authService.dart';
 import 'package:propview/services/mailService.dart';
 import 'package:propview/services/userService.dart';
 import 'package:propview/utils/progressBar.dart';
@@ -53,7 +54,8 @@ class _SoloAttendanceState extends State<SoloAttendance> {
       loading = true;
     });
     await getLocation();
-    user = await UserService.getUser();
+    var auth = await AuthService.getSavedAuth();
+    user = await UserService.getUserById(auth['id']);
     if (user.parentId != "") {
       var parentIdList = user.parentId.split(",");
       print((parentIdList));

lib/views/Manager/landingPage.dart

@@ -5,11 +5,9 @@ import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_local_notifications/flutter_local_notifications.dart';
 import 'package:google_nav_bar/google_nav_bar.dart';
-import 'package:in_app_update/in_app_update.dart';
 import 'package:propview/config.dart';
 import 'package:propview/services/baseService.dart';
 import 'package:propview/utils/progressBar.dart';
-import 'package:propview/utils/snackBar.dart';
 import 'package:propview/utils/udpatepop.dart';
 import 'package:propview/views/Manager/Attendance/AttendanceHome.dart';
 import 'package:propview/views/Manager/Home/HomeScreen.dart';