lib/helpers/utils/base_bottom_sheet.dart

@@ -11,6 +11,7 @@ class BaseBottomSheet extends StatelessWidget {
   final String submitText;
   final Color submitColor;
   final IconData submitIcon;
+  final bool showButtons; 
 
   const BaseBottomSheet({
     super.key,
@@ -22,6 +23,7 @@ class BaseBottomSheet extends StatelessWidget {
     this.submitText = 'Submit',
     this.submitColor = Colors.indigo,
     this.submitIcon = Icons.check_circle_outline,
+    this.showButtons = true, 
   });
 
   @override
@@ -32,8 +34,7 @@ class BaseBottomSheet extends StatelessWidget {
     return SingleChildScrollView(
       padding: mediaQuery.viewInsets,
       child: Padding(
-        padding: const EdgeInsets.only(
+        padding: const EdgeInsets.only(top: 60),
-            top: 60),
         child: Container(
           decoration: BoxDecoration(
             color: theme.cardColor,
@@ -65,6 +66,7 @@ class BaseBottomSheet extends StatelessWidget {
                 MySpacing.height(12),
                 child,
                 MySpacing.height(24),
+                if (showButtons) 
                   Row(
                     children: [
                       Expanded(
@@ -81,8 +83,7 @@ class BaseBottomSheet extends StatelessWidget {
                             shape: RoundedRectangleBorder(
                               borderRadius: BorderRadius.circular(12),
                             ),
-                          padding: const EdgeInsets.symmetric(
+                            padding: const EdgeInsets.symmetric(vertical: 8),
-                              vertical: 8), 
                           ),
                         ),
                       ),
@@ -101,8 +102,7 @@ class BaseBottomSheet extends StatelessWidget {
                             shape: RoundedRectangleBorder(
                               borderRadius: BorderRadius.circular(12),
                             ),
-                          padding: const EdgeInsets.symmetric(
+                            padding: const EdgeInsets.symmetric(vertical: 8),
-                              vertical: 8), 
                           ),
                         ),
                       ),

lib/model/attendance/attendence_action_button.dart

@@ -5,16 +5,17 @@ import 'package:marco/helpers/widgets/my_snackbar.dart';
 import 'package:marco/controller/dashboard/attendance_screen_controller.dart';
 import 'package:marco/helpers/utils/attendance_actions.dart';
 import 'package:marco/controller/project_controller.dart';
+import 'package:marco/helpers/utils/base_bottom_sheet.dart';
 
 class AttendanceActionButton extends StatefulWidget {
   final dynamic employee;
   final AttendanceController attendanceController;
 
   const AttendanceActionButton({
-    Key? key,
+    super.key,
     required this.employee,
     required this.attendanceController,
-  }) : super(key: key);
+  });
 
   @override
   State<AttendanceActionButton> createState() => _AttendanceActionButtonState();
@@ -24,35 +25,39 @@ Future<String?> _showCommentBottomSheet(
     BuildContext context, String actionText) async {
   final TextEditingController commentController = TextEditingController();
   String? errorText;
-  Get.find<ProjectController>().selectedProject?.id;
+
   return showModalBottomSheet<String>(
     context: context,
     isScrollControlled: true,
-    backgroundColor: Colors.white,
+    backgroundColor: Colors.transparent,
     shape: const RoundedRectangleBorder(
       borderRadius: BorderRadius.vertical(top: Radius.circular(16)),
     ),
     builder: (context) {
       return StatefulBuilder(
         builder: (context, setModalState) {
+          void submit() {
+            final comment = commentController.text.trim();
+            if (comment.isEmpty) {
+              setModalState(() => errorText = 'Comment cannot be empty.');
+              return;
+            }
+            Navigator.of(context).pop(comment);
+          }
+
           return Padding(
             padding: EdgeInsets.only(
-              left: 16,
+              bottom: MediaQuery.of(context).viewInsets.bottom,
-              right: 16,
-              top: 24,
-              bottom: MediaQuery.of(context).viewInsets.bottom + 24,
             ),
+            child: BaseBottomSheet(
+              title: 'Add Comment for ${capitalizeFirstLetter(actionText)}',
+              onCancel: () => Navigator.of(context).pop(),
+              onSubmit: submit,
+              isSubmitting: false,
+              submitText: 'Submit',
               child: Column(
                 mainAxisSize: MainAxisSize.min,
                 children: [
-                Text(
-                  'Add Comment for ${capitalizeFirstLetter(actionText)}',
-                  style: const TextStyle(
-                    fontWeight: FontWeight.bold,
-                    fontSize: 16,
-                  ),
-                ),
-                const SizedBox(height: 16),
                   TextField(
                     controller: commentController,
                     maxLines: 4,
@@ -71,34 +76,8 @@ Future<String?> _showCommentBottomSheet(
                       }
                     },
                   ),
-                const SizedBox(height: 16),
-                Row(
-                  children: [
-                    Expanded(
-                      child: OutlinedButton(
-                        onPressed: () => Navigator.of(context).pop(),
-                        child: const Text('Cancel'),
-                      ),
-                    ),
-                    const SizedBox(width: 12),
-                    Expanded(
-                      child: ElevatedButton(
-                        onPressed: () {
-                          final comment = commentController.text.trim();
-                          if (comment.isEmpty) {
-                            setModalState(() {
-                              errorText = 'Comment cannot be empty.';
-                            });
-                            return;
-                          }
-                          Navigator.of(context).pop(comment);
-                        },
-                        child: const Text('Submit'),
-                      ),
-                    ),
                 ],
               ),
-              ],
             ),
           );
         },
@@ -119,13 +98,15 @@ class _AttendanceActionButtonState extends State<AttendanceActionButton> {
   void initState() {
     super.initState();
     uniqueLogKey = AttendanceButtonHelper.getUniqueKey(
-        widget.employee.employeeId, widget.employee.id);
+      widget.employee.employeeId,
+      widget.employee.id,
+    );
 
     WidgetsBinding.instance.addPostFrameCallback((_) {
-      if (!widget.attendanceController.uploadingStates
+      widget.attendanceController.uploadingStates.putIfAbsent(
-          .containsKey(uniqueLogKey)) {
+        uniqueLogKey,
-        widget.attendanceController.uploadingStates[uniqueLogKey] = false.obs;
+        () => false.obs,
-      }
+      );
     });
   }
 
@@ -167,6 +148,7 @@ class _AttendanceActionButtonState extends State<AttendanceActionButton> {
 
       return selectedDateTime;
     }
+
     return null;
   }
 
@@ -228,7 +210,6 @@ class _AttendanceActionButtonState extends State<AttendanceActionButton> {
 
     DateTime? selectedTime;
 
-    // ✅ New condition: Yesterday Check-In + CheckOut action
     final isYesterdayCheckIn = widget.employee.checkIn != null &&
         DateUtils.isSameDay(
           widget.employee.checkIn,
@@ -257,15 +238,16 @@ class _AttendanceActionButtonState extends State<AttendanceActionButton> {
     }
 
     bool success = false;
+
     if (actionText == ButtonActions.requestRegularize) {
       final regularizeTime = selectedTime ??
           await showTimePickerForRegularization(
             context: context,
             checkInTime: widget.employee.checkIn!,
           );
+
       if (regularizeTime != null) {
-        final formattedSelectedTime =
+        final formattedTime = DateFormat("hh:mm a").format(regularizeTime);
-            DateFormat("hh:mm a").format(regularizeTime);
         success = await widget.attendanceController.captureAndUploadAttendance(
           widget.employee.id,
           widget.employee.employeeId,
@@ -273,12 +255,11 @@ class _AttendanceActionButtonState extends State<AttendanceActionButton> {
           comment: userComment,
           action: updatedAction,
           imageCapture: imageCapture,
-          markTime: formattedSelectedTime,
+          markTime: formattedTime,
         );
       }
     } else if (selectedTime != null) {
-      // ✅ If selectedTime was picked in the new condition
+      final formattedTime = DateFormat("hh:mm a").format(selectedTime);
-      final formattedSelectedTime = DateFormat("hh:mm a").format(selectedTime);
       success = await widget.attendanceController.captureAndUploadAttendance(
         widget.employee.id,
         widget.employee.employeeId,
@@ -286,7 +267,7 @@ class _AttendanceActionButtonState extends State<AttendanceActionButton> {
         comment: userComment,
         action: updatedAction,
         imageCapture: imageCapture,
-        markTime: formattedSelectedTime,
+        markTime: formattedTime,
       );
     } else {
       success = await widget.attendanceController.captureAndUploadAttendance(
@@ -312,8 +293,7 @@ class _AttendanceActionButtonState extends State<AttendanceActionButton> {
     if (success) {
       widget.attendanceController.fetchEmployeesByProject(selectedProjectId);
       widget.attendanceController.fetchAttendanceLogs(selectedProjectId);
-      await widget.attendanceController
+      await widget.attendanceController.fetchRegularizationLogs(selectedProjectId);
-          .fetchRegularizationLogs(selectedProjectId);
       await widget.attendanceController.fetchProjectData(selectedProjectId);
       widget.attendanceController.update();
     }
@@ -327,12 +307,19 @@ class _AttendanceActionButtonState extends State<AttendanceActionButton> {
               false;
 
       final isYesterday = AttendanceButtonHelper.isLogFromYesterday(
-          widget.employee.checkIn, widget.employee.checkOut);
+        widget.employee.checkIn,
+        widget.employee.checkOut,
+      );
+
       final isTodayApproved = AttendanceButtonHelper.isTodayApproved(
-          widget.employee.activity, widget.employee.checkIn);
+        widget.employee.activity,
-      final isApprovedButNotToday =
+        widget.employee.checkIn,
-          AttendanceButtonHelper.isApprovedButNotToday(
+      );
-              widget.employee.activity, isTodayApproved);
+
+      final isApprovedButNotToday = AttendanceButtonHelper.isApprovedButNotToday(
+        widget.employee.activity,
+        isTodayApproved,
+      );
 
       final isButtonDisabled = AttendanceButtonHelper.isButtonDisabled(
         isUploading: isUploading,
@@ -359,8 +346,7 @@ class _AttendanceActionButtonState extends State<AttendanceActionButton> {
         isButtonDisabled: isButtonDisabled,
         buttonText: buttonText,
         buttonColor: buttonColor,
-        onPressed:
+        onPressed: isButtonDisabled ? null : () => _handleButtonPressed(context),
-            isButtonDisabled ? null : () => _handleButtonPressed(context),
       );
     });
   }
@@ -374,20 +360,20 @@ class AttendanceActionButtonUI extends StatelessWidget {
   final VoidCallback? onPressed;
 
   const AttendanceActionButtonUI({
-    Key? key,
+    super.key,
     required this.isUploading,
     required this.isButtonDisabled,
     required this.buttonText,
     required this.buttonColor,
     required this.onPressed,
-  }) : super(key: key);
+  });
 
   @override
   Widget build(BuildContext context) {
     return SizedBox(
       height: 30,
       child: ElevatedButton(
-        onPressed: isButtonDisabled ? null : onPressed,
+        onPressed: onPressed,
         style: ElevatedButton.styleFrom(
           backgroundColor: buttonColor,
           padding: const EdgeInsets.symmetric(vertical: 4, horizontal: 12),

lib/model/attendance/attendence_filter_sheet.dart

@@ -4,6 +4,7 @@ import 'package:marco/controller/dashboard/attendance_screen_controller.dart';
 import 'package:intl/intl.dart';
 import 'package:marco/helpers/widgets/my_text.dart';
 import 'package:marco/helpers/utils/permission_constants.dart';
+import 'package:marco/helpers/utils/base_bottom_sheet.dart';
 
 class AttendanceFilterBottomSheet extends StatefulWidget {
   final AttendanceController controller;
@@ -62,20 +63,20 @@ class _AttendanceFilterBottomSheetState
 
     List<Widget> widgets = [
       Padding(
-        padding: const EdgeInsets.fromLTRB(16, 12, 16, 4),
+        padding: const EdgeInsets.only(bottom: 4),
         child: Align(
           alignment: Alignment.centerLeft,
-          child: MyText.titleSmall(
+          child: MyText.titleSmall("View", fontWeight: 600),
-            "View",
-            fontWeight: 600,
-          ),
         ),
       ),
       ...filteredViewOptions.map((item) {
         return RadioListTile<String>(
           dense: true,
-          contentPadding: const EdgeInsets.symmetric(horizontal: 12),
+          contentPadding: EdgeInsets.zero,
-          title: Text(item['label']!),
+          title: MyText.bodyMedium(
+            item['label']!,
+            fontWeight: 500,
+          ),
           value: item['value']!,
           groupValue: tempSelectedTab,
           onChanged: (value) => setState(() => tempSelectedTab = value!),
@@ -87,18 +88,13 @@ class _AttendanceFilterBottomSheetState
       widgets.addAll([
         const Divider(),
         Padding(
-          padding: const EdgeInsets.fromLTRB(16, 12, 16, 4),
+          padding: const EdgeInsets.only(top: 12, bottom: 4),
           child: Align(
             alignment: Alignment.centerLeft,
-            child: MyText.titleSmall(
+            child: MyText.titleSmall("Date Range", fontWeight: 600),
-              "Date Range",
-              fontWeight: 600,
           ),
         ),
-        ),
+        InkWell(
-        Padding(
-          padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
-          child: InkWell(
           borderRadius: BorderRadius.circular(10),
           onTap: () => widget.controller.selectDateRangeForAttendance(
             context,
@@ -110,21 +106,16 @@ class _AttendanceFilterBottomSheetState
               border: Border.all(color: Colors.grey.shade400),
               borderRadius: BorderRadius.circular(10),
             ),
-              padding:
+            padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 14),
-                  const EdgeInsets.symmetric(horizontal: 16, vertical: 14),
             child: Row(
               children: [
-                  Icon(Icons.date_range, color: Colors.black87),
+                const Icon(Icons.date_range, color: Colors.black87),
                 const SizedBox(width: 12),
                 Expanded(
-                    child: Text(
+                  child: MyText.bodyMedium(
                     getLabelText(),
-                      style: const TextStyle(
+                    fontWeight: 500,
-                        fontSize: 16,
                     color: Colors.black87,
-                        fontWeight: FontWeight.w500,
-                      ),
-                      overflow: TextOverflow.ellipsis,
                   ),
                 ),
                 const Icon(Icons.arrow_drop_down, color: Colors.black87),
@@ -132,7 +123,6 @@ class _AttendanceFilterBottomSheetState
             ),
           ),
         ),
-        ),
       ]);
     }
 
@@ -141,49 +131,20 @@ class _AttendanceFilterBottomSheetState
 
   @override
   Widget build(BuildContext context) {
-    return Padding(
+    return ClipRRect(
-      padding: EdgeInsets.only(bottom: MediaQuery.of(context).viewInsets.bottom),
+      borderRadius: const BorderRadius.vertical(top: Radius.circular(24)),
-      child: SingleChildScrollView(
+      child: BaseBottomSheet(
-        child: Column(
+        title: "Attendance Filter",
-          mainAxisSize: MainAxisSize.min,
+        onCancel: () => Navigator.pop(context),
-          children: [
+        onSubmit: () => Navigator.pop(context, {
-            Padding(
-              padding: const EdgeInsets.only(top: 12, bottom: 8),
-              child: Center(
-                child: Container(
-                  width: 40,
-                  height: 4,
-                  decoration: BoxDecoration(
-                    color: Colors.grey[400],
-                    borderRadius: BorderRadius.circular(4),
-                  ),
-                ),
-              ),
-            ),
-            ...buildMainFilters(),
-            const Divider(),
-            Padding(
-              padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
-              child: SizedBox(
-                width: double.infinity,
-                child: ElevatedButton(
-                  style: ElevatedButton.styleFrom(
-                    backgroundColor: const Color.fromARGB(255, 95, 132, 255),
-                    padding: const EdgeInsets.symmetric(vertical: 12),
-                    shape: RoundedRectangleBorder(
-                      borderRadius: BorderRadius.circular(8),
-                    ),
-                  ),
-                  child: const Text('Apply Filter'),
-                  onPressed: () {
-                    Navigator.pop(context, {
           'selectedTab': tempSelectedTab,
-                    });
+        }),
-                  },
+        submitText: "Apply Filter",
-                ),
+        submitIcon: Icons.filter_alt_outlined,
-              ),
+        submitColor: const Color.fromARGB(255, 95, 132, 255),
-            ),
+        child: Column(
-          ],
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: buildMainFilters(),
         ),
       ),
     );

lib/model/attendance/log_details_view.dart

@@ -2,11 +2,11 @@ import 'package:flutter/material.dart';
 import 'package:url_launcher/url_launcher.dart';
 import 'package:marco/helpers/widgets/my_text.dart';
 import 'package:marco/helpers/utils/attendance_actions.dart';
+import 'package:marco/helpers/utils/base_bottom_sheet.dart';
 
 class AttendanceLogViewButton extends StatelessWidget {
   final dynamic employee;
-  final dynamic attendanceController; // Use correct types as needed
+  final dynamic attendanceController;
-
   const AttendanceLogViewButton({
     Key? key,
     required this.employee,
@@ -50,41 +50,21 @@ class AttendanceLogViewButton extends StatelessWidget {
 
   void _showLogsBottomSheet(BuildContext context) async {
     await attendanceController.fetchLogsView(employee.id.toString());
+
     showModalBottomSheet(
       context: context,
       isScrollControlled: true,
       shape: const RoundedRectangleBorder(
         borderRadius: BorderRadius.vertical(top: Radius.circular(16)),
       ),
-      backgroundColor: Theme.of(context).cardColor,
+      backgroundColor: Colors.transparent,
-      builder: (context) => Padding(
+      builder: (context) => BaseBottomSheet(
-        padding: EdgeInsets.only(
+        title: "Attendance Log",
-          left: 16,
+        onCancel: () => Navigator.pop(context),
-          right: 16,
+        onSubmit: () => Navigator.pop(context),
-          top: 16,
+        showButtons: false,
-          bottom: MediaQuery.of(context).viewInsets.bottom + 16,
+        child: attendanceController.attendenceLogsView.isEmpty
-        ),
+            ? Padding(
-        child: SingleChildScrollView(
-          child: Column(
-            mainAxisSize: MainAxisSize.min,
-            children: [
-              // Header
-              Row(
-                mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                children: [
-                  MyText.titleMedium(
-                    "Attendance Log",
-                    fontWeight: 700,
-                  ),
-                  IconButton(
-                    icon: const Icon(Icons.close),
-                    onPressed: () => Navigator.pop(context),
-                  ),
-                ],
-              ),
-              const SizedBox(height: 12),
-              if (attendanceController.attendenceLogsView.isEmpty)
-                Padding(
                 padding: const EdgeInsets.symmetric(vertical: 24.0),
                 child: Column(
                   children: const [
@@ -94,8 +74,7 @@ class AttendanceLogViewButton extends StatelessWidget {
                   ],
                 ),
               )
-              else
+            : ListView.separated(
-                ListView.separated(
                 shrinkWrap: true,
                 physics: const NeverScrollableScrollPhysics(),
                 itemCount: attendanceController.attendenceLogsView.length,
@@ -155,13 +134,11 @@ class AttendanceLogViewButton extends StatelessWidget {
                                           log.longitude != null)
                                         GestureDetector(
                                           onTap: () {
-                                              final lat = double.tryParse(log
+                                            final lat = double.tryParse(
-                                                      .latitude
+                                                    log.latitude.toString()) ??
-                                                      .toString()) ??
                                                 0.0;
-                                              final lon = double.tryParse(log
+                                            final lon = double.tryParse(
-                                                      .longitude
+                                                    log.longitude.toString()) ??
-                                                      .toString()) ??
                                                 0.0;
                                             if (lat >= -90 &&
                                                 lat <= 90 &&
@@ -214,8 +191,7 @@ class AttendanceLogViewButton extends StatelessWidget {
                                     height: 60,
                                     width: 60,
                                     fit: BoxFit.cover,
-                                      errorBuilder:
+                                    errorBuilder: (context, error, stackTrace) {
-                                          (context, error, stackTrace) {
                                       return const Icon(Icons.broken_image,
                                           size: 20, color: Colors.grey);
                                     },
@@ -231,9 +207,6 @@ class AttendanceLogViewButton extends StatelessWidget {
                     ),
                   );
                 },
-                )
-            ],
-          ),
               ),
       ),
     );

lib/view/dashboard/Attendence/attendance_screen.dart

@@ -157,7 +157,8 @@ class _AttendanceScreenState extends State<AttendanceScreen> with UIMixin {
                                 Map<String, dynamic>>(
                               context: context,
                               isScrollControlled: true,
-                              backgroundColor: Colors.white,
+
+                              backgroundColor: Colors.transparent,
                               shape: const RoundedRectangleBorder(
                                 borderRadius: BorderRadius.vertical(
                                     top: Radius.circular(12)),