Merge branch 'Fatima' into 'master'

Fatima

See merge request mirza.shafique/mohem_flutter_app!84

lib/ui/attendance/monthly_attendance_screen.dart

@@ -416,6 +416,9 @@ class _MonthlyAttendanceScreenState extends State<MonthlyAttendanceScreen> {
     } else if (value!.indexOf('%') == 0 || value!.indexOf('%') == "") {
       percentage = 0;
     }
+    if (details.date!.month == formattedDate.month && details.date!.year == formattedDate.year) {
+      int val = details.date!.day;
+      getDayHoursTypeDetailsList?[val - 1].aTTENDEDFLAG == 'Y' ?
       showModalBottomSheet(
         context: context,
         shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(25)),
@@ -443,7 +446,8 @@ class _MonthlyAttendanceScreenState extends State<MonthlyAttendanceScreen> {
                     child: ListView.builder(
                       controller: controller,
                       itemCount: 1,
-                    itemBuilder: (_, i) => Container(
+                      itemBuilder: (_, i) =>
+                          Container(
                             decoration: const BoxDecoration(
                               borderRadius: BorderRadius.vertical(
                                 top: Radius.circular(25.0),
@@ -618,7 +622,8 @@ class _MonthlyAttendanceScreenState extends State<MonthlyAttendanceScreen> {
             },
           );
         },
-    );
+      ):null;
+    }
   }
 
   List<Meeting> _getDataSource() {

lib/ui/my_team/view_attendance.dart

@@ -424,6 +424,9 @@ class _ViewAttendanceState extends State<ViewAttendance> {
     } else if (value!.indexOf('%') == 0 || value!.indexOf('%') == "") {
       percentage = 0;
     }
+    if (details.date!.month == formattedDate.month && details.date!.year == formattedDate.year) {
+      int val = details.date!.day;
+      getDayHoursTypeDetailsList?[val - 1].aTTENDEDFLAG == 'Y' ?
       showModalBottomSheet(
         context: context,
         shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(25)),
@@ -451,7 +454,8 @@ class _ViewAttendanceState extends State<ViewAttendance> {
                     child: ListView.builder(
                       controller: controller,
                       itemCount: 1,
-                    itemBuilder: (_, i) => Container(
+                      itemBuilder: (_, i) =>
+                          Container(
                             decoration: const BoxDecoration(
                               borderRadius: BorderRadius.vertical(
                                 top: Radius.circular(25.0),
@@ -626,7 +630,8 @@ class _ViewAttendanceState extends State<ViewAttendance> {
             },
           );
         },
-    );
+      ):null;
+    }
   }
   List<Meeting> _getDataSource() {
     List<Meeting> meetings = <Meeting>[];