fix issue

assets/langs/ar-SA.json

@@ -306,6 +306,11 @@
   "requestType":"نوع الطلب",
   "employeeDigitalID":"هويةالموظف الرقمية",
   "businessCard": "بطاقة العمل",
+  "checkOut":"وقت الخروج",
+  "regular":"منتظم",
+  "mark" : "علامة",
+  "selectMethodOfAttendance":"اختر طريقة تسجيل الحضور",
+  "comeNearHMGWifi": "HMG wifi من فضلك اقترب من",
   "profile": {
     "reset_password": {
       "label": "Reset Password",

assets/langs/en-US.json

@@ -306,6 +306,11 @@
   "wantToReject": "Are you sure want to reject?",
   "employeeDigitalID":"Employee Digital ID",
   "businessCard": "Business Card",
+  "checkOut":"Check Out",
+  "regular":"Regular",
+  "mark" : "Mark",
+  "selectMethodOfAttendance":"Select the method to mark the attendance",
+  "comeNearHMGWifi": "Please come near to HMG wifi",
   "profile": {
     "reset_password": {
       "label": "Reset Password",

lib/generated/codegen_loader.g.dart

@@ -322,6 +322,11 @@ class CodegenLoader extends AssetLoader{
   "requestType": "نوع الطلب",
   "employeeDigitalID": "هويةالموظف الرقمية",
   "businessCard": "بطاقة العمل",
+  "checkOut": "وقت الخروج",
+  "regular": "منتظم",
+  "mark": "علامة",
+  "selectMethodOfAttendance": "اختر طريقة تسجيل الحضور",
+  "comeNearHMGWifi": "HMG wifi من فضلك اقترب من",
   "profile": {
     "reset_password": {
       "label": "Reset Password",
@@ -661,6 +666,11 @@ static const Map<String,dynamic> en_US = {
   "wantToReject": "Are you sure want to reject?",
   "employeeDigitalID": "Employee Digital ID",
   "businessCard": "Business Card",
+  "checkOut": "Check Out",
+  "regular": "Regular",
+  "mark": "Mark",
+  "selectMethodOfAttendance": "Select the method to mark the attendance",
+  "comeNearHMGWifi": "Please come near to HMG wifi",
   "profile": {
     "reset_password": {
       "label": "Reset Password",

lib/generated/locale_keys.g.dart

@@ -307,6 +307,11 @@ abstract class  LocaleKeys {
   static const requestType = 'requestType';
   static const employeeDigitalID = 'employeeDigitalID';
   static const businessCard = 'businessCard';
+  static const checkOut = 'checkOut';
+  static const regular = 'regular';
+  static const mark = 'mark';
+  static const selectMethodOfAttendance = 'selectMethodOfAttendance';
+  static const comeNearHMGWifi = 'comeNearHMGWifi';
   static const profile_reset_password_label = 'profile.reset_password.label';
   static const profile_reset_password_username = 'profile.reset_password.username';
   static const profile_reset_password_password = 'profile.reset_password.password';

lib/ui/attendance/monthly_attendance.dart

@@ -139,13 +139,13 @@ class _MonthlyAttendanceState extends State<MonthlyAttendance> {
               Row(
                 mainAxisAlignment: MainAxisAlignment.start,
                 children: [
-                  optionUI(LocaleKeys.scheduleDays.tr(), "${getTimeCardSummaryList?.sCHEDULEDAYS}"),
+                  optionUI(LocaleKeys.scheduleDays.tr(), "${getTimeCardSummaryList?.sCHEDULEDAYS != null ? getTimeCardSummaryList!.sCHEDULEDAYS : 0}"),
                   6.width,
-                  optionUI(LocaleKeys.offDays.tr(), "${getTimeCardSummaryList?.oFFDAYS}"),
+                  optionUI(LocaleKeys.offDays.tr(), "${getTimeCardSummaryList?.oFFDAYS != null ? getTimeCardSummaryList!.oFFDAYS : 0}"),
                   6.width,
-                  optionUI(LocaleKeys.nonAnalyzed.tr(), "${getTimeCardSummaryList?.uNAUTHORIZEDLEAVE}"),
+                  optionUI(LocaleKeys.nonAnalyzed.tr(), "${getTimeCardSummaryList?.uNAUTHORIZEDLEAVE != null ? getTimeCardSummaryList!.uNAUTHORIZEDLEAVE : 0}"),
                   6.width,
-                  optionUI(LocaleKeys.shortageHour.tr(), "${getTimeCardSummaryList?.sHORTAGEHRS}"),
+                  optionUI(LocaleKeys.shortageHour.tr(), "${getTimeCardSummaryList?.sHORTAGEHRS != null ? getTimeCardSummaryList!.sHORTAGEHRS : 0}"),
                 ],
               ).paddingOnly(left: 21, right: 21),
               35.height,
@@ -319,6 +319,9 @@ class _MonthlyAttendanceState extends State<MonthlyAttendance> {
         if (details.date.month == formattedDate.month && details.date.year == formattedDate.year) {
           int val = details.date.day;
           //check day is off
+          if(getDayHoursTypeDetailsList.isNotEmpty)
+
+            {
               if (getDayHoursTypeDetailsList?[val - 1].aTTENDEDFLAG == 'N' && getDayHoursTypeDetailsList?[val - 1].dAYTYPE == 'OFF') {
                 return Container(
                   margin: const EdgeInsets.all(4),
@@ -394,6 +397,9 @@ class _MonthlyAttendanceState extends State<MonthlyAttendance> {
                   ),
                 );
               }
+
+
+            }
           return Container(
             margin: const EdgeInsets.all(4),
             decoration: BoxDecoration(

lib/ui/landing/today_attendance_screen.dart

@@ -134,7 +134,7 @@ class _TodayAttendanceScreenState extends State<TodayAttendanceScreen> {
                                           textStyle: TextStyle(color: Colors.white, fontSize: 32, letterSpacing: -1.92, fontWeight: FontWeight.bold, height: 1),
                                         ),
                                         19.height,
-                                        "Shift Time".tr().toText12(color: MyColors.greyACColor),
+                                        LocaleKeys.shiftTime.tr().tr().toText12(color: MyColors.greyACColor),
                                         (model.attendanceTracking!.pShtName ?? "00:00:00").toString().toText22(color: Colors.white, isBold: true),
                                       ],
                                     ),
@@ -162,14 +162,14 @@ class _TodayAttendanceScreenState extends State<TodayAttendanceScreen> {
                                   children: [
                                     Row(
                                       children: [
-                                        commonStatusView("Check In", (model.attendanceTracking!.pSwipeIn) ?? "- - : - -"),
+                                        commonStatusView(LocaleKeys.checkIn.tr(), (model.attendanceTracking!.pSwipeIn) ?? "- - : - -"),
                                         commonStatusView("Check Out", (model.attendanceTracking!.pSwipeOut) ?? "- - : - -")
                                       ],
                                     ),
                                     21.height,
                                     Row(
                                       children: [
-                                        commonStatusView("Late In", (model.attendanceTracking!.pLateInHours) ?? "- - : - -"),
+                                        commonStatusView(LocaleKeys.lateIn.tr(), (model.attendanceTracking!.pLateInHours) ?? "- - : - -"),
                                         commonStatusView("Regular", (model.attendanceTracking!.pScheduledHours) ?? "- - : - -")
                                       ],
                                     ),
@@ -185,9 +185,9 @@ class _TodayAttendanceScreenState extends State<TodayAttendanceScreen> {
                                   crossAxisAlignment: CrossAxisAlignment.start,
                                   mainAxisSize: MainAxisSize.min,
                                   children: [
-                                    "Mark".tr().toText12(),
+                                    LocaleKeys.mark.tr().tr().toText12(),
-                                    "Attendance".tr().toText24(),
+                                    LocaleKeys.attendance.tr().tr().toText24(),
-                                    "Select the method to mark the attendance".tr().toText12(color: Color(0xff535353)),
+                                    LocaleKeys.selectMethodOfAttendance.tr().tr().toText12(color: Color(0xff535353)),
                                     24.height,
                                     GridView(
                                       physics: const NeverScrollableScrollPhysics(),
@@ -312,7 +312,7 @@ class _TodayAttendanceScreenState extends State<TodayAttendanceScreen> {
         });
       }
     } else {
-      Utils.confirmDialog(context, "Please come near to HMG wifi");
+      Utils.confirmDialog(context, LocaleKeys.comeNearHMGWifi.tr());
     }
   }