From 468555046bccc7188fbfd5737180a69fc3df4ce3 Mon Sep 17 00:00:00 2001
From: haroon amjad <amjad.haroon@hmg.local>
Date: Sun, 20 Nov 2022 15:20:37 +0300
Subject: [PATCH] updates

---
 lib/ui/login/login_screen.dart          |  1 +
 lib/widgets/mark_attendance_widget.dart | 60 ++++++++++++++++++-------
 2 files changed, 45 insertions(+), 16 deletions(-)

diff --git a/lib/ui/login/login_screen.dart b/lib/ui/login/login_screen.dart
index 20fa8bc..68f0c41 100644
--- a/lib/ui/login/login_screen.dart
+++ b/lib/ui/login/login_screen.dart
@@ -128,6 +128,7 @@ class _LoginScreenState extends State<LoginScreen> {
         Navigator.pushNamed(context, AppRoutes.verifyLogin,
             arguments: "$firebaseToken");
       }
+      Utils.saveStringFromPrefs(SharedPrefsConsts.password, password.text);
     } catch (ex) {
       Utils.hideLoading(context);
       Utils.handleException(ex, context, (msg) {
diff --git a/lib/widgets/mark_attendance_widget.dart b/lib/widgets/mark_attendance_widget.dart
index c41b89c..a6b6cfc 100644
--- a/lib/widgets/mark_attendance_widget.dart
+++ b/lib/widgets/mark_attendance_widget.dart
@@ -14,6 +14,7 @@ import 'package:mohem_flutter_app/generated/locale_keys.g.dart';
 import 'package:mohem_flutter_app/models/generic_response_model.dart';
 import 'package:mohem_flutter_app/provider/dashboard_provider_model.dart';
 import 'package:mohem_flutter_app/ui/dialogs/success_dialog.dart';
+import 'package:mohem_flutter_app/widgets/dialogs/confirm_dialog.dart';
 import 'package:mohem_flutter_app/widgets/dialogs/dialogs.dart';
 import 'package:mohem_flutter_app/widgets/location/Location.dart';
 import 'package:mohem_flutter_app/widgets/nfc/nfc_reader_sheet.dart';
@@ -144,14 +145,28 @@ class _MarkAttendanceWidgetState extends State<MarkAttendanceWidget> {
         Utils.showLoading(context);
         try {
           GenericResponseModel? g = await DashboardApiClient().markAttendance(pointType: 2, nfcValue: nfcId, isGpsRequired: isNfcLocationEnabled, lat: lat, long: lng);
-          bool status = await model.fetchAttendanceTracking(context);
-          Utils.hideLoading(context);
-          showMDialog(
-            context,
-            backgroundColor: Colors.transparent,
-            isDismissable: false,
-            child: SuccessDialog(widget.isFromDashboard),
-          );
+          if(g?.messageStatus != 1) {
+            Utils.hideLoading(context);
+            showDialog(
+              context: context,
+              builder: (cxt) => ConfirmDialog(
+                message: g?.errorEndUserMessage ?? "Unexpected error occurred",
+                onTap: () {
+                  Navigator.pop(context);
+                },
+              ),
+            );
+          } else {
+            bool status = await model.fetchAttendanceTracking(context);
+            Utils.hideLoading(context);
+            showMDialog(
+              context,
+              backgroundColor: Colors.transparent,
+              isDismissable: false,
+              child: SuccessDialog(widget.isFromDashboard),
+            );
+          }
+
         } catch (ex) {
           print(ex);
           Utils.hideLoading(context);
@@ -166,14 +181,27 @@ class _MarkAttendanceWidgetState extends State<MarkAttendanceWidget> {
         Utils.showLoading(context);
         try {
           GenericResponseModel? g = await DashboardApiClient().markAttendance(pointType: 2, nfcValue: nfcId ?? "", isGpsRequired: isNfcLocationEnabled, lat: lat, long: lng);
-          bool status = await model.fetchAttendanceTracking(context);
-          Utils.hideLoading(context);
-          showMDialog(
-            context,
-            backgroundColor: Colors.transparent,
-            isDismissable: false,
-            child: SuccessDialog(widget.isFromDashboard),
-          );
+          if(g?.messageStatus != 1) {
+            Utils.hideLoading(context);
+            showDialog(
+              context: context,
+              builder: (cxt) => ConfirmDialog(
+                message: g?.errorEndUserMessage ?? "Unexpected error occurred",
+                onTap: () {
+                  Navigator.pop(context);
+                },
+              ),
+            );
+          } else {
+            bool status = await model.fetchAttendanceTracking(context);
+            Utils.hideLoading(context);
+            showMDialog(
+              context,
+              backgroundColor: Colors.transparent,
+              isDismissable: false,
+              child: SuccessDialog(widget.isFromDashboard),
+            );
+          }
         } catch (ex) {
           print(ex);
           Utils.hideLoading(context);