README.md

@@ -1,4 +1,4 @@
-# On Field Work
+# marco
 
 A new Flutter project.
 

android/app/build.gradle

@@ -15,7 +15,7 @@ if (keystorePropertiesFile.exists()) {
 
 android {
     // Define the namespace for your Android application
-    namespace = "com.marcoonfieldwork.aiot"
+    namespace = "com.marco.aiot"
     // Set the compile SDK version based on Flutter's configuration
     compileSdk = flutter.compileSdkVersion
     // Set the NDK version based on Flutter's configuration
@@ -37,7 +37,7 @@ android {
     // Default configuration for your application
     defaultConfig {
         // Specify your unique Application ID. This identifies your app on Google Play.
-        applicationId = "com.marcoonfieldwork.aiot"
+        applicationId = "com.marco.aiot"
         // Set minimum and target SDK versions based on Flutter's configuration
         minSdk = 23
         targetSdk = flutter.targetSdkVersion

android/app/google-services.json

@@ -9,7 +9,7 @@
       "client_info": {
         "mobilesdk_app_id": "1:626581282477:android:8d3cf5009ff92ef67ff024",
         "android_client_info": {
-          "package_name": "com.marcoonfieldwork.aiot"
+          "package_name": "com.marco.aiot"
         }
       },
       "oauth_client": [],

android/app/src/main/AndroidManifest.xml

@@ -8,7 +8,7 @@
 <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
 
     <application
-        android:label="On Field Work"
+        android:label="Marco"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher">
         <activity

android/app/src/main/kotlin/com/example/maxdash/MainActivity.kt

@@ -1,4 +1,4 @@
-package com.marcoonfieldwork.aiot
+package com.marco.aiot
 
 import io.flutter.embedding.android.FlutterActivity
 

android/settings.gradle

@@ -19,7 +19,7 @@ pluginManagement {
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
     id "com.android.application" version "8.6.0" apply false
-    id "org.jetbrains.kotlin.android" version "2.2.21" apply false
+    id "org.jetbrains.kotlin.android" version "1.8.22" apply false
     id("com.google.gms.google-services") version "4.4.2" apply false
 }
 

build_release.sh

@@ -14,7 +14,7 @@ YELLOW='\033[1;33m'
 NC='\033[0m' # No Color
 
 # App info
-APP_NAME="On Field Work"
+APP_NAME="Marco"
 BUILD_DIR="build/app/outputs"
 
 echo -e "${CYAN}🚀 Starting Flutter build script for $APP_NAME...${NC}"

ios/Runner.xcodeproj/project.pbxproj

@@ -368,7 +368,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.marcoonfieldwork.aiot;
+				PRODUCT_BUNDLE_IDENTIFIER = com.marco.aiot;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
@@ -384,7 +384,7 @@
 				CURRENT_PROJECT_VERSION = 1;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.marcoonfieldwork.aiot.RunnerTests;
+				PRODUCT_BUNDLE_IDENTIFIER = com.marco.aiot.RunnerTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -401,7 +401,7 @@
 				CURRENT_PROJECT_VERSION = 1;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.marcoonfieldwork.aiot.RunnerTests;
+				PRODUCT_BUNDLE_IDENTIFIER = com.marco.aiot.RunnerTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner";
@@ -416,7 +416,7 @@
 				CURRENT_PROJECT_VERSION = 1;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.marcoonfieldwork.aiot.RunnerTests;
+				PRODUCT_BUNDLE_IDENTIFIER = com.marco.aiot.RunnerTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner";
@@ -547,7 +547,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.marcoonfieldwork.aiot;
+				PRODUCT_BUNDLE_IDENTIFIER = com.marco.aiot;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -569,7 +569,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.marcoonfieldwork.aiot;
+				PRODUCT_BUNDLE_IDENTIFIER = com.marco.aiot;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;

ios/Runner/Info.plist

@@ -5,7 +5,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDisplayName</key>
-	<string>On Field Work</string>
+	<string>Marco</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
@@ -13,7 +13,7 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>on field work</string>
+	<string>marco</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>

lib/app_constant.dart

@@ -8,5 +8,5 @@ class AppConstant {
   static int iOSAppVersion = 1;
   static String version = "1.0.0";
 
-  static String get appName => 'On Field Work';
+  static String get appName => 'Marco';
 }

lib/controller/attendance/attendance_screen_controller.dart

@@ -1,41 +1,37 @@
 import 'dart:io';
-import 'dart:typed_data';
-
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'package:geolocator/geolocator.dart';
 import 'package:image_picker/image_picker.dart';
+import 'package:geolocator/geolocator.dart';
 import 'package:intl/intl.dart';
 
-import 'package:on_field_work/controller/dashboard/dashboard_controller.dart';
+import 'package:marco/helpers/services/app_logger.dart';
-import 'package:on_field_work/controller/project_controller.dart';
+import 'package:marco/helpers/services/api_service.dart';
-import 'package:on_field_work/helpers/services/api_service.dart';
+import 'package:marco/helpers/widgets/my_image_compressor.dart';
-import 'package:on_field_work/helpers/services/app_logger.dart';
+import 'package:marco/helpers/widgets/time_stamp_image_helper.dart';
-import 'package:on_field_work/helpers/widgets/my_image_compressor.dart';
+
-import 'package:on_field_work/helpers/widgets/time_stamp_image_helper.dart';
+import 'package:marco/model/attendance/attendance_model.dart';
-import 'package:on_field_work/model/attendance/attendance_log_model.dart';
+import 'package:marco/model/project_model.dart';
-import 'package:on_field_work/model/attendance/attendance_log_view_model.dart';
+import 'package:marco/model/employees/employee_model.dart';
-import 'package:on_field_work/model/attendance/attendance_model.dart';
+import 'package:marco/model/attendance/attendance_log_model.dart';
-import 'package:on_field_work/model/attendance/organization_per_project_list_model.dart';
+import 'package:marco/model/regularization_log_model.dart';
-import 'package:on_field_work/model/employees/employee_model.dart';
+import 'package:marco/model/attendance/attendance_log_view_model.dart';
-import 'package:on_field_work/model/project_model.dart';
+import 'package:marco/model/attendance/organization_per_project_list_model.dart';
-import 'package:on_field_work/model/regularization_log_model.dart';
+import 'package:marco/controller/project_controller.dart';
 
 class AttendanceController extends GetxController {
   // ------------------ Data Models ------------------
-  final List<AttendanceModel> attendances = <AttendanceModel>[];
+  List<AttendanceModel> attendances = [];
-  final List<ProjectModel> projects = <ProjectModel>[];
+  List<ProjectModel> projects = [];
-  final List<EmployeeModel> employees = <EmployeeModel>[];
+  List<EmployeeModel> employees = [];
-  final List<AttendanceLogModel> attendanceLogs = <AttendanceLogModel>[];
+  List<AttendanceLogModel> attendanceLogs = [];
-  final List<RegularizationLogModel> regularizationLogs =
+  List<RegularizationLogModel> regularizationLogs = [];
-      <RegularizationLogModel>[];
+  List<AttendanceLogViewModel> attendenceLogsView = [];
-  final List<AttendanceLogViewModel> attendenceLogsView =
-      <AttendanceLogViewModel>[];
 
   // ------------------ Organizations ------------------
-  final List<Organization> organizations = <Organization>[];
+  List<Organization> organizations = [];
   Organization? selectedOrganization;
-  final RxBool isLoadingOrganizations = false.obs;
+  final isLoadingOrganizations = false.obs;
 
   // ------------------ States ------------------
   String selectedTab = 'todaysAttendance';
@@ -46,17 +42,16 @@ class AttendanceController extends GetxController {
   final Rx<DateTime> endDateAttendance =
       DateTime.now().subtract(const Duration(days: 1)).obs;
 
-  final RxBool isLoading = true.obs;
+  final isLoading = true.obs;
-  final RxBool isLoadingProjects = true.obs;
+  final isLoadingProjects = true.obs;
-  final RxBool isLoadingEmployees = true.obs;
+  final isLoadingEmployees = true.obs;
-  final RxBool isLoadingAttendanceLogs = true.obs;
+  final isLoadingAttendanceLogs = true.obs;
-  final RxBool isLoadingRegularizationLogs = true.obs;
+  final isLoadingRegularizationLogs = true.obs;
-  final RxBool isLoadingLogView = true.obs;
+  final isLoadingLogView = true.obs;
+  final uploadingStates = <String, RxBool>{}.obs;
+  var showPendingOnly = false.obs;
 
-  final RxMap<String, RxBool> uploadingStates = <String, RxBool>{}.obs;
+  final searchQuery = ''.obs;
-
-  final RxBool showPendingOnly = false.obs;
-  final RxString searchQuery = ''.obs;
 
   @override
   void onInit() {
@@ -69,43 +64,35 @@ class AttendanceController extends GetxController {
   }
 
   void _setDefaultDateRange() {
-    final DateTime today = DateTime.now();
+    final today = DateTime.now();
     startDateAttendance.value = today.subtract(const Duration(days: 7));
     endDateAttendance.value = today.subtract(const Duration(days: 1));
     logSafe(
-      'Default date range set: ${startDateAttendance.value} to ${endDateAttendance.value}',
+        "Default date range set: ${startDateAttendance.value} to ${endDateAttendance.value}");
-    );
   }
 
   // ------------------ Computed Filters ------------------
   List<EmployeeModel> get filteredEmployees {
-    final String query = searchQuery.value.trim().toLowerCase();
+    if (searchQuery.value.isEmpty) return employees;
-    if (query.isEmpty) return employees;
     return employees
-        .where(
+        .where((e) =>
-          (EmployeeModel e) => e.name.toLowerCase().contains(query),
+            e.name.toLowerCase().contains(searchQuery.value.toLowerCase()))
-        )
         .toList();
   }
 
   List<AttendanceLogModel> get filteredLogs {
-    final String query = searchQuery.value.trim().toLowerCase();
+    if (searchQuery.value.isEmpty) return attendanceLogs;
-    if (query.isEmpty) return attendanceLogs;
     return attendanceLogs
-        .where(
+        .where((log) =>
-          (AttendanceLogModel log) => log.name.toLowerCase().contains(query),
+            log.name.toLowerCase().contains(searchQuery.value.toLowerCase()))
-        )
         .toList();
   }
 
   List<RegularizationLogModel> get filteredRegularizationLogs {
-    final String query = searchQuery.value.trim().toLowerCase();
+    if (searchQuery.value.isEmpty) return regularizationLogs;
-    if (query.isEmpty) return regularizationLogs;
     return regularizationLogs
-        .where(
+        .where((log) =>
-          (RegularizationLogModel log) =>
+            log.name.toLowerCase().contains(searchQuery.value.toLowerCase()))
-              log.name.toLowerCase().contains(query),
-        )
         .toList();
   }
 
@@ -113,16 +100,13 @@ class AttendanceController extends GetxController {
   Future<void> refreshDataFromNotification({String? projectId}) async {
     projectId ??= Get.find<ProjectController>().selectedProject?.id;
     if (projectId == null) {
-      logSafe(
+      logSafe("No project selected for attendance refresh from notification",
-        'No project selected for attendance refresh from notification',
+          level: LogLevel.warning);
-        level: LogLevel.warning,
-      );
       return;
     }
     await fetchProjectData(projectId);
     logSafe(
-      'Attendance data refreshed from notification for project $projectId',
+        "Attendance data refreshed from notification for project $projectId");
-    );
   }
 
   Future<void> fetchTodaysAttendance(String? projectId) async {
@@ -130,35 +114,19 @@ class AttendanceController extends GetxController {
 
     isLoadingEmployees.value = true;
 
-    final List<dynamic>? response = await ApiService.getTodaysAttendance(
+    final response = await ApiService.getTodaysAttendance(
       projectId,
       organizationId: selectedOrganization?.id,
     );
     if (response != null) {
-      employees
+      employees = response.map((e) => EmployeeModel.fromJson(e)).toList();
-        ..clear()
+      for (var emp in employees) {
-        ..addAll(
-          response
-              .map<EmployeeModel>(
-                (dynamic e) => EmployeeModel.fromJson(
-                  e as Map<String, dynamic>,
-                ),
-              )
-              .toList(),
-        );
-
-      for (final EmployeeModel emp in employees) {
         uploadingStates[emp.id] = false.obs;
       }
-
+      logSafe("Employees fetched: ${employees.length} for project $projectId");
-      logSafe(
-        'Employees fetched: ${employees.length} for project $projectId',
-      );
     } else {
-      logSafe(
+      logSafe("Failed to fetch employees for project $projectId",
-        'Failed to fetch employees for project $projectId',
+          level: LogLevel.error);
-        level: LogLevel.error,
-      );
     }
 
     isLoadingEmployees.value = false;
@@ -167,22 +135,14 @@ class AttendanceController extends GetxController {
 
   Future<void> fetchOrganizations(String projectId) async {
     isLoadingOrganizations.value = true;
-
-    // Keep original return type inference from your ApiService
     final response = await ApiService.getAssignedOrganizations(projectId);
-
     if (response != null) {
-      organizations
+      organizations = response.data;
-        ..clear()
+      logSafe("Organizations fetched: ${organizations.length}");
-        ..addAll(response.data);
-      logSafe('Organizations fetched: ${organizations.length}');
     } else {
-      logSafe(
+      logSafe("Failed to fetch organizations for project $projectId",
-        'Failed to fetch organizations for project $projectId',
+          level: LogLevel.error);
-        level: LogLevel.error,
-      );
     }
-
     isLoadingOrganizations.value = false;
     update();
   }
@@ -192,43 +152,61 @@ class AttendanceController extends GetxController {
     String id,
     String employeeId,
     String projectId, {
-    String comment = 'Marked via mobile app',
+    String comment = "Marked via mobile app",
     required int action,
     bool imageCapture = true,
     String? markTime,
     String? date,
   }) async {
     try {
-      _setUploading(employeeId, true);
+      uploadingStates[employeeId]?.value = true;
 
-      final XFile? image = await _captureAndPrepareImage(
+      XFile? image;
-        employeeId: employeeId,
+      if (imageCapture) {
-        imageCapture: imageCapture,
+        image = await ImagePicker()
-      );
+            .pickImage(source: ImageSource.camera, imageQuality: 80);
-      if (imageCapture && image == null) {
+        if (image == null) {
-        return false;
+          logSafe("Image capture cancelled.", level: LogLevel.warning);
+          return false;
+        }
+
+        final timestampedFile = await TimestampImageHelper.addTimestamp(
+            imageFile: File(image.path));
+
+        final compressedBytes =
+            await compressImageToUnder100KB(timestampedFile);
+        if (compressedBytes == null) {
+          logSafe("Image compression failed.", level: LogLevel.error);
+          return false;
+        }
+
+        final compressedFile = await saveCompressedImageToFile(compressedBytes);
+        image = XFile(compressedFile.path);
       }
 
-      final Position? position = await _getCurrentPositionSafely();
+      if (!await _handleLocationPermission()) return false;
-      if (position == null) return false;
+      final position = await Geolocator.getCurrentPosition(
+          desiredAccuracy: LocationAccuracy.high);
 
-      final String imageName = imageCapture
+      final imageName = imageCapture
-          ? ApiService.generateImageName(
+          ? ApiService.generateImageName(employeeId, employees.length + 1)
-              employeeId,
+          : "";
-              employees.length + 1,
-            )
-          : '';
 
-      final DateTime effectiveDate =
+      final now = DateTime.now();
-          _resolveEffectiveDateForAction(action, employeeId);
+      DateTime effectiveDate = now;
 
-      final DateTime now = DateTime.now();
+      if (action == 1) {
-      final String formattedMarkTime =
+        final log = attendanceLogs.firstWhereOrNull(
-          markTime ?? DateFormat('hh:mm a').format(now);
+          (log) => log.employeeId == employeeId && log.checkOut == null,
-      final String formattedDate =
+        );
+        if (log?.checkIn != null) effectiveDate = log!.checkIn!;
+      }
+
+      final formattedMarkTime = markTime ?? DateFormat('hh:mm a').format(now);
+      final formattedDate =
           date ?? DateFormat('yyyy-MM-dd').format(effectiveDate);
 
-      final bool result = await ApiService.uploadAttendanceImage(
+      final result = await ApiService.uploadAttendanceImage(
         id,
         employeeId,
         image,
@@ -243,99 +221,15 @@ class AttendanceController extends GetxController {
         date: formattedDate,
       );
 
-      if (result) {
+      logSafe(
-        logSafe(
+          "Attendance uploaded for $employeeId, action: $action, date: $formattedDate");
-          'Attendance uploaded for $employeeId, action: $action, date: $formattedDate',
-        );
-
-        if (Get.isRegistered<DashboardController>()) {
-          final DashboardController dashboardController =
-              Get.find<DashboardController>();
-          await dashboardController.fetchTodaysAttendance(projectId);
-        }
-      }
-
       return result;
     } catch (e, stacktrace) {
-      logSafe(
+      logSafe("Error uploading attendance",
-        'Error uploading attendance',
+          level: LogLevel.error, error: e, stackTrace: stacktrace);
-        level: LogLevel.error,
-        error: e,
-        stackTrace: stacktrace,
-      );
       return false;
     } finally {
-      _setUploading(employeeId, false);
+      uploadingStates[employeeId]?.value = false;
-    }
-  }
-
-  Future<XFile?> _captureAndPrepareImage({
-    required String employeeId,
-    required bool imageCapture,
-  }) async {
-    if (!imageCapture) return null;
-
-    final XFile? rawImage = await ImagePicker().pickImage(
-      source: ImageSource.camera,
-      imageQuality: 80,
-    );
-    if (rawImage == null) {
-      logSafe(
-        'Image capture cancelled.',
-        level: LogLevel.warning,
-      );
-      return null;
-    }
-
-    final File timestampedFile = await TimestampImageHelper.addTimestamp(
-      imageFile: File(rawImage.path),
-    );
-
-    final List<int>? compressedBytes =
-        await compressImageToUnder100KB(timestampedFile);
-    if (compressedBytes == null) {
-      logSafe(
-        'Image compression failed.',
-        level: LogLevel.error,
-      );
-      return null;
-    }
-
-    // FIX: convert List<int> -> Uint8List
-    final Uint8List compressedUint8List = Uint8List.fromList(compressedBytes);
-
-    final File compressedFile =
-        await saveCompressedImageToFile(compressedUint8List);
-    return XFile(compressedFile.path);
-  }
-
-  Future<Position?> _getCurrentPositionSafely() async {
-    final bool permissionGranted = await _handleLocationPermission();
-    if (!permissionGranted) return null;
-
-    return Geolocator.getCurrentPosition(
-      desiredAccuracy: LocationAccuracy.high,
-    );
-  }
-
-  DateTime _resolveEffectiveDateForAction(int action, String employeeId) {
-    final DateTime now = DateTime.now();
-    if (action != 1) return now;
-
-    final AttendanceLogModel? log = attendanceLogs.firstWhereOrNull(
-      (AttendanceLogModel log) =>
-          log.employeeId == employeeId && log.checkOut == null,
-    );
-
-    return log?.checkIn ?? now;
-  }
-
-  void _setUploading(String employeeId, bool value) {
-    final RxBool? state = uploadingStates[employeeId];
-    if (state != null) {
-      state.value = value;
-    } else {
-      uploadingStates[employeeId] = value.obs;
     }
   }
 
@@ -345,19 +239,14 @@ class AttendanceController extends GetxController {
     if (permission == LocationPermission.denied) {
       permission = await Geolocator.requestPermission();
       if (permission == LocationPermission.denied) {
-        logSafe(
+        logSafe('Location permissions are denied', level: LogLevel.warning);
-          'Location permissions are denied',
-          level: LogLevel.warning,
-        );
         return false;
       }
     }
 
     if (permission == LocationPermission.deniedForever) {
-      logSafe(
+      logSafe('Location permissions are permanently denied',
-        'Location permissions are permanently denied',
+          level: LogLevel.error);
-        level: LogLevel.error,
-      );
       return false;
     }
 
@@ -365,40 +254,25 @@ class AttendanceController extends GetxController {
   }
 
   // ------------------ Attendance Logs ------------------
-  Future<void> fetchAttendanceLogs(
+  Future<void> fetchAttendanceLogs(String? projectId,
-    String? projectId, {
+      {DateTime? dateFrom, DateTime? dateTo}) async {
-    DateTime? dateFrom,
-    DateTime? dateTo,
-  }) async {
     if (projectId == null) return;
 
     isLoadingAttendanceLogs.value = true;
 
-    final List<dynamic>? response = await ApiService.getAttendanceLogs(
+    final response = await ApiService.getAttendanceLogs(
       projectId,
       dateFrom: dateFrom,
       dateTo: dateTo,
       organizationId: selectedOrganization?.id,
     );
-
     if (response != null) {
-      attendanceLogs
+      attendanceLogs =
-        ..clear()
+          response.map((e) => AttendanceLogModel.fromJson(e)).toList();
-        ..addAll(
+      logSafe("Attendance logs fetched: ${attendanceLogs.length}");
-          response
-              .map<AttendanceLogModel>(
-                (dynamic e) => AttendanceLogModel.fromJson(
-                  e as Map<String, dynamic>,
-                ),
-              )
-              .toList(),
-        );
-      logSafe('Attendance logs fetched: ${attendanceLogs.length}');
     } else {
-      logSafe(
+      logSafe("Failed to fetch attendance logs for project $projectId",
-        'Failed to fetch attendance logs for project $projectId',
+          level: LogLevel.error);
-        level: LogLevel.error,
-      );
     }
 
     isLoadingAttendanceLogs.value = false;
@@ -406,37 +280,25 @@ class AttendanceController extends GetxController {
   }
 
   Map<String, List<AttendanceLogModel>> groupLogsByCheckInDate() {
-    final Map<String, List<AttendanceLogModel>> groupedLogs =
+    final groupedLogs = <String, List<AttendanceLogModel>>{};
-        <String, List<AttendanceLogModel>>{};
 
-    for (final AttendanceLogModel logItem in attendanceLogs) {
+    for (var logItem in attendanceLogs) {
-      final String checkInDate = logItem.checkIn != null
+      final checkInDate = logItem.checkIn != null
           ? DateFormat('dd MMM yyyy').format(logItem.checkIn!)
           : 'Unknown';
-
+      groupedLogs.putIfAbsent(checkInDate, () => []).add(logItem);
-      groupedLogs.putIfAbsent(
-        checkInDate,
-        () => <AttendanceLogModel>[],
-      )..add(logItem);
     }
 
-    final List<MapEntry<String, List<AttendanceLogModel>>> sortedEntries =
+    final sortedEntries = groupedLogs.entries.toList()
-        groupedLogs.entries.toList()
+      ..sort((a, b) {
-          ..sort(
+        if (a.key == 'Unknown') return 1;
-            (MapEntry<String, List<AttendanceLogModel>> a,
+        if (b.key == 'Unknown') return -1;
-                MapEntry<String, List<AttendanceLogModel>> b) {
+        final dateA = DateFormat('dd MMM yyyy').parse(a.key);
-              if (a.key == 'Unknown') return 1;
+        final dateB = DateFormat('dd MMM yyyy').parse(b.key);
-              if (b.key == 'Unknown') return -1;
+        return dateB.compareTo(dateA);
+      });
 
-              final DateTime dateA = DateFormat('dd MMM yyyy').parse(a.key);
+    return Map<String, List<AttendanceLogModel>>.fromEntries(sortedEntries);
-              final DateTime dateB = DateFormat('dd MMM yyyy').parse(b.key);
-              return dateB.compareTo(dateA);
-            },
-          );
-
-    return Map<String, List<AttendanceLogModel>>.fromEntries(
-      sortedEntries,
-    );
   }
 
   // ------------------ Regularization Logs ------------------
@@ -445,31 +307,17 @@ class AttendanceController extends GetxController {
 
     isLoadingRegularizationLogs.value = true;
 
-    final List<dynamic>? response = await ApiService.getRegularizationLogs(
+    final response = await ApiService.getRegularizationLogs(
       projectId,
       organizationId: selectedOrganization?.id,
     );
-
     if (response != null) {
-      regularizationLogs
+      regularizationLogs =
-        ..clear()
+          response.map((e) => RegularizationLogModel.fromJson(e)).toList();
-        ..addAll(
+      logSafe("Regularization logs fetched: ${regularizationLogs.length}");
-          response
-              .map<RegularizationLogModel>(
-                (dynamic e) => RegularizationLogModel.fromJson(
-                  e as Map<String, dynamic>,
-                ),
-              )
-              .toList(),
-        );
-      logSafe(
-        'Regularization logs fetched: ${regularizationLogs.length}',
-      );
     } else {
-      logSafe(
+      logSafe("Failed to fetch regularization logs for project $projectId",
-        'Failed to fetch regularization logs for project $projectId',
+          level: LogLevel.error);
-        level: LogLevel.error,
-      );
     }
 
     isLoadingRegularizationLogs.value = false;
@@ -482,33 +330,16 @@ class AttendanceController extends GetxController {
 
     isLoadingLogView.value = true;
 
-    final List<dynamic>? response = await ApiService.getAttendanceLogView(id);
+    final response = await ApiService.getAttendanceLogView(id);
-
     if (response != null) {
-      attendenceLogsView
+      attendenceLogsView =
-        ..clear()
+          response.map((e) => AttendanceLogViewModel.fromJson(e)).toList();
-        ..addAll(
+      attendenceLogsView.sort((a, b) => (b.activityTime ?? DateTime(2000))
-          response
+          .compareTo(a.activityTime ?? DateTime(2000)));
-              .map<AttendanceLogViewModel>(
+      logSafe("Attendance log view fetched for ID: $id");
-                (dynamic e) => AttendanceLogViewModel.fromJson(
-                  e as Map<String, dynamic>,
-                ),
-              )
-              .toList(),
-        );
-
-      attendenceLogsView.sort(
-        (AttendanceLogViewModel a, AttendanceLogViewModel b) =>
-            (b.activityTime ?? DateTime(2000))
-                .compareTo(a.activityTime ?? DateTime(2000)),
-      );
-
-      logSafe('Attendance log view fetched for ID: $id');
     } else {
-      logSafe(
+      logSafe("Failed to fetch attendance log view for ID $id",
-        'Failed to fetch attendance log view for ID $id',
+          level: LogLevel.error);
-        level: LogLevel.error,
-      );
     }
 
     isLoadingLogView.value = false;
@@ -544,19 +375,16 @@ class AttendanceController extends GetxController {
     }
 
     logSafe(
-      'Project data fetched for project ID: $projectId, tab: $selectedTab',
+        "Project data fetched for project ID: $projectId, tab: $selectedTab");
-    );
     update();
   }
 
   // ------------------ UI Interaction ------------------
   Future<void> selectDateRangeForAttendance(
-    BuildContext context,
+      BuildContext context, AttendanceController controller) async {
-    AttendanceController controller,
+    final today = DateTime.now();
-  ) async {
-    final DateTime today = DateTime.now();
 
-    final DateTimeRange? picked = await showDateRangePicker(
+    final picked = await showDateRangePicker(
       context: context,
       firstDate: DateTime(2022),
       lastDate: today.subtract(const Duration(days: 1)),
@@ -571,8 +399,7 @@ class AttendanceController extends GetxController {
       endDateAttendance.value = picked.end;
 
       logSafe(
-        'Date range selected: ${startDateAttendance.value} to ${endDateAttendance.value}',
+          "Date range selected: ${startDateAttendance.value} to ${endDateAttendance.value}");
-      );
 
       await controller.fetchAttendanceLogs(
         Get.find<ProjectController>().selectedProject?.id,

lib/controller/auth/forgot_password_controller.dart

@@ -1,12 +1,12 @@
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'package:on_field_work/controller/my_controller.dart';
+import 'package:marco/controller/my_controller.dart';
-import 'package:on_field_work/helpers/services/auth_service.dart';
+import 'package:marco/helpers/services/auth_service.dart';
-import 'package:on_field_work/helpers/widgets/my_form_validator.dart';
+import 'package:marco/helpers/widgets/my_form_validator.dart';
-import 'package:on_field_work/helpers/widgets/my_validators.dart';
+import 'package:marco/helpers/widgets/my_validators.dart';
-import 'package:on_field_work/helpers/widgets/my_snackbar.dart';
+import 'package:marco/helpers/widgets/my_snackbar.dart';
-import 'package:on_field_work/helpers/services/app_logger.dart'; 
+import 'package:marco/helpers/services/app_logger.dart'; 
-import 'package:on_field_work/helpers/services/storage/local_storage.dart';
+import 'package:marco/helpers/services/storage/local_storage.dart';
 
 class ForgotPasswordController extends MyController {
   final MyFormValidator basicValidator = MyFormValidator();

lib/controller/auth/login_controller.dart

@@ -1,12 +1,12 @@
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'package:on_field_work/controller/my_controller.dart';
+import 'package:marco/controller/my_controller.dart';
-import 'package:on_field_work/helpers/services/auth_service.dart';
+import 'package:marco/helpers/services/auth_service.dart';
-import 'package:on_field_work/helpers/widgets/my_form_validator.dart';
+import 'package:marco/helpers/widgets/my_form_validator.dart';
-import 'package:on_field_work/helpers/widgets/my_validators.dart';
+import 'package:marco/helpers/widgets/my_validators.dart';
-import 'package:on_field_work/helpers/services/storage/local_storage.dart';
+import 'package:marco/helpers/services/storage/local_storage.dart';
-import 'package:on_field_work/helpers/widgets/my_snackbar.dart';
+import 'package:marco/helpers/widgets/my_snackbar.dart';
-import 'package:on_field_work/helpers/services/app_logger.dart';
+import 'package:marco/helpers/services/app_logger.dart';
 
 class LoginController extends MyController {
   final MyFormValidator basicValidator = MyFormValidator();

lib/controller/auth/mpin_controller.dart

@@ -1,13 +1,13 @@
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'package:on_field_work/helpers/services/auth_service.dart';
+import 'package:marco/helpers/services/auth_service.dart';
-import 'package:on_field_work/helpers/services/storage/local_storage.dart';
+import 'package:marco/helpers/services/storage/local_storage.dart';
-import 'package:on_field_work/helpers/widgets/my_form_validator.dart';
+import 'package:marco/helpers/widgets/my_form_validator.dart';
-import 'package:on_field_work/helpers/widgets/my_snackbar.dart';
+import 'package:marco/helpers/widgets/my_snackbar.dart';
-import 'package:on_field_work/helpers/services/app_logger.dart';
+import 'package:marco/helpers/services/app_logger.dart';
-import 'package:on_field_work/helpers/services/firebase/firebase_messaging_service.dart';
+import 'package:marco/helpers/services/firebase/firebase_messaging_service.dart';
-import 'package:on_field_work/controller/permission_controller.dart';
+import 'package:marco/controller/permission_controller.dart';
-import 'package:on_field_work/controller/project_controller.dart';
+import 'package:marco/controller/project_controller.dart';
 
 class MPINController extends GetxController {
   final MyFormValidator basicValidator = MyFormValidator();

lib/controller/auth/otp_controller.dart

@@ -1,10 +1,10 @@
 import 'dart:async';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'package:on_field_work/helpers/widgets/my_snackbar.dart';
+import 'package:marco/helpers/widgets/my_snackbar.dart';
-import 'package:on_field_work/helpers/services/auth_service.dart';
+import 'package:marco/helpers/services/auth_service.dart';
-import 'package:on_field_work/helpers/services/storage/local_storage.dart';
+import 'package:marco/helpers/services/storage/local_storage.dart';
-import 'package:on_field_work/helpers/services/app_logger.dart';
+import 'package:marco/helpers/services/app_logger.dart';
 
 class OTPController extends GetxController {
   final formKey = GlobalKey<FormState>();

lib/controller/auth/register_account_controller.dart

@@ -1,10 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'package:on_field_work/controller/my_controller.dart';
+import 'package:marco/controller/my_controller.dart';
-import 'package:on_field_work/helpers/widgets/my_form_validator.dart';
+import 'package:marco/helpers/widgets/my_form_validator.dart';
-import 'package:on_field_work/helpers/widgets/my_validators.dart';
+import 'package:marco/helpers/widgets/my_validators.dart';
-import 'package:on_field_work/helpers/services/auth_service.dart';
+import 'package:marco/helpers/services/auth_service.dart';
-import 'package:on_field_work/helpers/services/app_logger.dart';
+import 'package:marco/helpers/services/app_logger.dart';
 
 class RegisterAccountController extends MyController {
   MyFormValidator basicValidator = MyFormValidator();

lib/controller/auth/reset_password_controller.dart

@@ -1,10 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'package:on_field_work/controller/my_controller.dart';
+import 'package:marco/controller/my_controller.dart';
-import 'package:on_field_work/helpers/services/auth_service.dart';
+import 'package:marco/helpers/services/auth_service.dart';
-import 'package:on_field_work/helpers/widgets/my_form_validator.dart';
+import 'package:marco/helpers/widgets/my_form_validator.dart';
-import 'package:on_field_work/helpers/widgets/my_validators.dart';
+import 'package:marco/helpers/widgets/my_validators.dart';
-import 'package:on_field_work/helpers/services/app_logger.dart';
+import 'package:marco/helpers/services/app_logger.dart';
 
 class ResetPasswordController extends MyController {
   MyFormValidator basicValidator = MyFormValidator();

lib/controller/dashboard/dashboard_controller.dart

@@ -1,207 +1,197 @@
 import 'package:get/get.dart';
-import 'package:on_field_work/helpers/services/app_logger.dart';
+import 'package:marco/helpers/services/app_logger.dart';
-import 'package:on_field_work/helpers/services/api_service.dart';
+import 'package:marco/helpers/services/api_service.dart';
-import 'package:on_field_work/controller/project_controller.dart';
+import 'package:marco/controller/project_controller.dart';
-import 'package:on_field_work/model/dashboard/project_progress_model.dart';
+import 'package:marco/model/dashboard/project_progress_model.dart';
-import 'package:on_field_work/model/dashboard/pending_expenses_model.dart';
+import 'package:marco/model/dashboard/pending_expenses_model.dart';
-import 'package:on_field_work/model/dashboard/expense_type_report_model.dart';
+import 'package:marco/model/dashboard/expense_type_report_model.dart';
-import 'package:on_field_work/model/dashboard/monthly_expence_model.dart';
+import 'package:marco/model/dashboard/monthly_expence_model.dart';
-import 'package:on_field_work/model/expense/expense_type_model.dart';
+import 'package:marco/model/expense/expense_type_model.dart';
-import 'package:on_field_work/model/employees/employee_model.dart';
-import 'package:on_field_work/model/dashboard/collection_overview_model.dart';
-import 'package:on_field_work/model/dashboard/purchase_invoice_model.dart';
 
 class DashboardController extends GetxController {
-  // Dependencies
+  // =========================
-  final ProjectController projectController = Get.put(ProjectController());
+  // Attendance overview
+  // =========================
+  final RxList<Map<String, dynamic>> roleWiseData =
+      <Map<String, dynamic>>[].obs;
+  final RxString attendanceSelectedRange = '15D'.obs;
+  final RxBool attendanceIsChartView = true.obs;
+  final RxBool isAttendanceLoading = false.obs;
 
   // =========================
-  // 1. STATE VARIABLES
+  // Project progress overview
   // =========================
+  final RxList<ChartTaskData> projectChartData = <ChartTaskData>[].obs;
+  final RxString projectSelectedRange = '15D'.obs;
+  final RxBool projectIsChartView = true.obs;
+  final RxBool isProjectLoading = false.obs;
 
-  // Attendance
+  // =========================
-  final roleWiseData = <Map<String, dynamic>>[].obs;
+  // Projects overview
-  final attendanceSelectedRange = '15D'.obs;
+  // =========================
-  final attendanceIsChartView = true.obs;
+  final RxInt totalProjects = 0.obs;
-  final isAttendanceLoading = false.obs;
+  final RxInt ongoingProjects = 0.obs;
+  final RxBool isProjectsLoading = false.obs;
 
-  // Project Progress
+  // =========================
-  final projectChartData = <ChartTaskData>[].obs;
+  // Tasks overview
-  final projectSelectedRange = '15D'.obs;
+  // =========================
-  final projectIsChartView = true.obs;
+  final RxInt totalTasks = 0.obs;
-  final isProjectLoading = false.obs;
+  final RxInt completedTasks = 0.obs;
+  final RxBool isTasksLoading = false.obs;
 
-  // Overview Counts
+  // =========================
-  final totalProjects = 0.obs;
+  // Teams overview
-  final ongoingProjects = 0.obs;
+  // =========================
-  final isProjectsLoading = false.obs;
+  final RxInt totalEmployees = 0.obs;
+  final RxInt inToday = 0.obs;
+  final RxBool isTeamsLoading = false.obs;
 
-  final totalTasks = 0.obs;
+  // Common ranges
-  final completedTasks = 0.obs;
-  final isTasksLoading = false.obs;
-
-  final totalEmployees = 0.obs;
-  final inToday = 0.obs;
-  final isTeamsLoading = false.obs;
-
-  // Expenses & Reports
-  final isPendingExpensesLoading = false.obs;
-  final pendingExpensesData = Rx<PendingExpensesData?>(null);
-
-  final isExpenseTypeReportLoading = false.obs;
-  final expenseTypeReportData = Rx<ExpenseTypeReportData?>(null);
-  final expenseReportStartDate =
-      DateTime.now().subtract(const Duration(days: 15)).obs;
-  final expenseReportEndDate = DateTime.now().obs;
-
-  final isMonthlyExpenseLoading = false.obs;
-  final monthlyExpenseList = <MonthlyExpenseData>[].obs;
-  final selectedMonthlyExpenseDuration =
-      MonthlyExpenseDuration.twelveMonths.obs;
-  final selectedMonthsCount = 12.obs;
-
-  final expenseTypes = <ExpenseTypeModel>[].obs;
-  final selectedExpenseType = Rx<ExpenseTypeModel?>(null);
-
-  // Teams/Employees
-  final isLoadingEmployees = true.obs;
-  final employees = <EmployeeModel>[].obs;
-  final uploadingStates = <String, RxBool>{}.obs;
-
-  // Collection
-  final isCollectionOverviewLoading = true.obs;
-  final collectionOverviewData = Rx<CollectionOverviewData?>(null);
-// =========================
-// Purchase Invoice Overview
-// =========================
-  final isPurchaseInvoiceLoading = true.obs;
-  final purchaseInvoiceOverviewData = Rx<PurchaseInvoiceOverviewData?>(null);
-  // Constants
   final List<String> ranges = ['7D', '15D', '30D'];
-  static const _rangeDaysMap = {
-    '7D': 7,
-    '15D': 15,
-    '30D': 30,
-    '3M': 90,
-    '6M': 180
-  };
 
+  // Inject ProjectController
+  final ProjectController projectController = Get.put(ProjectController());
+// Pending Expenses overview
+// =========================
+  final RxBool isPendingExpensesLoading = false.obs;
+  final Rx<PendingExpensesData?> pendingExpensesData =
+      Rx<PendingExpensesData?>(null);
   // =========================
-  // 2. COMPUTED PROPERTIES
+// Expense Type Report
+// =========================
+  final RxBool isExpenseTypeReportLoading = false.obs;
+  final Rx<ExpenseTypeReportData?> expenseTypeReportData =
+      Rx<ExpenseTypeReportData?>(null);
+  final Rx<DateTime> expenseReportStartDate =
+      DateTime.now().subtract(const Duration(days: 15)).obs;
+  final Rx<DateTime> expenseReportEndDate = DateTime.now().obs;
   // =========================
+  // Monthly Expense Report
+  // =========================
+  final RxBool isMonthlyExpenseLoading = false.obs;
+  final RxList<MonthlyExpenseData> monthlyExpenseList =
+      <MonthlyExpenseData>[].obs;
+  // =========================
+  // Monthly Expense Report Filters
+  // =========================
+  final Rx<MonthlyExpenseDuration> selectedMonthlyExpenseDuration =
+      MonthlyExpenseDuration.twelveMonths.obs;
 
-  int getAttendanceDays() => _rangeDaysMap[attendanceSelectedRange.value] ?? 7;
+  final RxInt selectedMonthsCount = 12.obs;
-  int getProjectDays() => _rangeDaysMap[projectSelectedRange.value] ?? 7;
+  final RxList<ExpenseTypeModel> expenseTypes = <ExpenseTypeModel>[].obs;
+  final Rx<ExpenseTypeModel?> selectedExpenseType = Rx<ExpenseTypeModel?>(null);
 
-  // DSO Calculation Constants
+  void updateSelectedExpenseType(ExpenseTypeModel? type) {
-  static const double _w0_30 = 15.0;
+    selectedExpenseType.value = type;
-  static const double _w30_60 = 45.0;
-  static const double _w60_90 = 75.0;
-  static const double _w90_plus = 105.0;
 
-  double get calculatedDSO {
+    // Debug print to verify
-    final data = collectionOverviewData.value;
+    print('Selected: ${type?.name ?? "All Types"}');
-    if (data == null || data.totalDueAmount == 0) return 0.0;
 
-    final double weightedDue = (data.bucket0To30Amount * _w0_30) +
+    if (type == null) {
-        (data.bucket30To60Amount * _w30_60) +
+      fetchMonthlyExpenses();
-        (data.bucket60To90Amount * _w60_90) +
+    } else {
-        (data.bucket90PlusAmount * _w90_plus);
+      fetchMonthlyExpenses(categoryId: type.id);
-
+    }
-    return weightedDue / data.totalDueAmount;
   }
 
-  // =========================
-  // 3. LIFECYCLE
-  // =========================
-
   @override
   void onInit() {
     super.onInit();
-    logSafe('DashboardController initialized', level: LogLevel.info);
 
-    // Project Selection Listener
+    logSafe(
+      'DashboardController initialized with project ID: ${projectController.selectedProjectId.value}',
+      level: LogLevel.info,
+    );
+
+    fetchAllDashboardData();
+
+    // React to project change
     ever<String>(projectController.selectedProjectId, (id) {
-      if (id.isNotEmpty) {
+      fetchAllDashboardData();
-        fetchAllDashboardData();
-        fetchTodaysAttendance(id);
-      }
     });
-
-    // Expense Report Date Listener
     everAll([expenseReportStartDate, expenseReportEndDate], (_) {
-      if (projectController.selectedProjectId.value.isNotEmpty) {
+      fetchExpenseTypeReport(
-        fetchExpenseTypeReport(
+        startDate: expenseReportStartDate.value,
-          startDate: expenseReportStartDate.value,
+        endDate: expenseReportEndDate.value,
-          endDate: expenseReportEndDate.value,
+      );
-        );
-      }
     });
-
+    // React to range changes
-    // Chart Range Listeners
     ever(attendanceSelectedRange, (_) => fetchRoleWiseAttendance());
     ever(projectSelectedRange, (_) => fetchProjectProgress());
   }
 
   // =========================
-  // 4. USER ACTIONS
+  // Helper Methods
   // =========================
-
+  int _getDaysFromRange(String range) {
-  void updateAttendanceRange(String range) =>
+    switch (range) {
-      attendanceSelectedRange.value = range;
+      case '7D':
-  void updateProjectRange(String range) => projectSelectedRange.value = range;
+        return 7;
-  void toggleAttendanceChartView(bool isChart) =>
+      case '15D':
-      attendanceIsChartView.value = isChart;
+        return 15;
-  void toggleProjectChartView(bool isChart) =>
+      case '30D':
-      projectIsChartView.value = isChart;
+        return 30;
-
+      case '3M':
-  void updateSelectedExpenseType(ExpenseTypeModel? type) {
+        return 90;
-    selectedExpenseType.value = type;
+      case '6M':
-    fetchMonthlyExpenses(categoryId: type?.id);
+        return 180;
-  }
+      default:
-
+        return 7;
-  void updateMonthlyExpenseDuration(MonthlyExpenseDuration duration) {
-    selectedMonthlyExpenseDuration.value = duration;
-
-    // Efficient Map lookup instead of Switch
-    const durationMap = {
-      MonthlyExpenseDuration.oneMonth: 1,
-      MonthlyExpenseDuration.threeMonths: 3,
-      MonthlyExpenseDuration.sixMonths: 6,
-      MonthlyExpenseDuration.twelveMonths: 12,
-      MonthlyExpenseDuration.all: 0,
-    };
-
-    selectedMonthsCount.value = durationMap[duration] ?? 12;
-    fetchMonthlyExpenses();
-  }
-
-  Future<void> refreshDashboard() => fetchAllDashboardData();
-  Future<void> refreshAttendance() => fetchRoleWiseAttendance();
-  Future<void> refreshProjects() => fetchProjectProgress();
-  Future<void> refreshTasks() async {
-    final id = projectController.selectedProjectId.value;
-    if (id.isNotEmpty) await fetchDashboardTasks(projectId: id);
-  }
-
-  // =========================
-  // 5. DATA FETCHING (API)
-  // =========================
-
-  /// Wrapper to reduce try-finally boilerplate for loading states
-  Future<void> _executeApiCall(
-      RxBool loader, Future<void> Function() apiLogic) async {
-    loader.value = true;
-    try {
-      await apiLogic();
-    } finally {
-      loader.value = false;
     }
   }
 
+  int getAttendanceDays() => _getDaysFromRange(attendanceSelectedRange.value);
+  int getProjectDays() => _getDaysFromRange(projectSelectedRange.value);
+
+  void updateAttendanceRange(String range) {
+    attendanceSelectedRange.value = range;
+    logSafe('Attendance range updated to $range', level: LogLevel.debug);
+  }
+
+  void updateProjectRange(String range) {
+    projectSelectedRange.value = range;
+    logSafe('Project range updated to $range', level: LogLevel.debug);
+  }
+
+  void toggleAttendanceChartView(bool isChart) {
+    attendanceIsChartView.value = isChart;
+    logSafe('Attendance chart view toggled to: $isChart',
+        level: LogLevel.debug);
+  }
+
+  void toggleProjectChartView(bool isChart) {
+    projectIsChartView.value = isChart;
+    logSafe('Project chart view toggled to: $isChart', level: LogLevel.debug);
+  }
+
+  // =========================
+  // Manual Refresh Methods
+  // =========================
+  Future<void> refreshDashboard() async {
+    logSafe('Manual dashboard refresh triggered.', level: LogLevel.debug);
+    await fetchAllDashboardData();
+  }
+
+  Future<void> refreshAttendance() async => fetchRoleWiseAttendance();
+  Future<void> refreshTasks() async {
+    final projectId = projectController.selectedProjectId.value;
+    if (projectId.isNotEmpty) await fetchDashboardTasks(projectId: projectId);
+  }
+
+  Future<void> refreshProjects() async => fetchProjectProgress();
+
+  // =========================
+  // Fetch All Dashboard Data
+  // =========================
   Future<void> fetchAllDashboardData() async {
     final String projectId = projectController.selectedProjectId.value;
-    if (projectId.isEmpty) return;
+
+    if (projectId.isEmpty) {
+      logSafe('No project selected. Skipping dashboard API calls.',
+          level: LogLevel.warning);
+      return;
+    }
 
     await Future.wait([
       fetchRoleWiseAttendance(),
@@ -214,150 +204,248 @@ class DashboardController extends GetxController {
         endDate: expenseReportEndDate.value,
       ),
       fetchMonthlyExpenses(),
-      fetchMasterData(),
+      fetchMasterData()
-      fetchCollectionOverview(),
-      fetchPurchaseInvoiceOverview(),
     ]);
   }
 
-  Future<void> fetchCollectionOverview() async {
+  void updateMonthlyExpenseDuration(MonthlyExpenseDuration duration) {
-    final projectId = projectController.selectedProjectId.value;
+    selectedMonthlyExpenseDuration.value = duration;
-    if (projectId.isEmpty) return;
 
-    await _executeApiCall(isCollectionOverviewLoading, () async {
+    // Set months count based on selection
-      final response =
+    switch (duration) {
-          await ApiService.getCollectionOverview(projectId: projectId);
+      case MonthlyExpenseDuration.oneMonth:
-      collectionOverviewData.value =
+        selectedMonthsCount.value = 1;
-          (response?.success == true) ? response!.data : null;
+        break;
-    });
+      case MonthlyExpenseDuration.threeMonths:
-  }
+        selectedMonthsCount.value = 3;
+        break;
+      case MonthlyExpenseDuration.sixMonths:
+        selectedMonthsCount.value = 6;
+        break;
+      case MonthlyExpenseDuration.twelveMonths:
+        selectedMonthsCount.value = 12;
+        break;
+      case MonthlyExpenseDuration.all:
+        selectedMonthsCount.value = 0; // 0 = All months in your API
+        break;
+    }
 
-  Future<void> fetchTodaysAttendance(String projectId) async {
+    // Re-fetch updated data
-    await _executeApiCall(isLoadingEmployees, () async {
+    fetchMonthlyExpenses();
-      final response = await ApiService.getAttendanceForDashboard(projectId);
-      if (response != null) {
-        employees.value = response;
-        for (var emp in employees) {
-          uploadingStates.putIfAbsent(emp.id, () => false.obs);
-        }
-      }
-    });
   }
 
   Future<void> fetchMasterData() async {
     try {
-      final data = await ApiService.getMasterExpenseTypes();
+      final expenseTypesData = await ApiService.getMasterExpenseTypes();
-      if (data is List) {
+      if (expenseTypesData is List) {
         expenseTypes.value =
-            data.map((e) => ExpenseTypeModel.fromJson(e)).toList();
+            expenseTypesData.map((e) => ExpenseTypeModel.fromJson(e)).toList();
       }
-    } catch (_) {}
+    } catch (e) {
+      logSafe('Error fetching master data', level: LogLevel.error, error: e);
+    }
   }
 
   Future<void> fetchMonthlyExpenses({String? categoryId}) async {
-    await _executeApiCall(isMonthlyExpenseLoading, () async {
+    try {
+      isMonthlyExpenseLoading.value = true;
+
+      int months = selectedMonthsCount.value;
+      logSafe(
+        'Fetching Monthly Expense Report for last $months months'
+        '${categoryId != null ? ' (categoryId: $categoryId)' : ''}',
+        level: LogLevel.info,
+      );
+
       final response = await ApiService.getDashboardMonthlyExpensesApi(
         categoryId: categoryId,
-        months: selectedMonthsCount.value,
+        months: months,
       );
-      monthlyExpenseList.value =
-          (response?.success == true) ? response!.data : [];
-    });
-  }
 
-  Future<void> fetchPurchaseInvoiceOverview() async {
+      if (response != null && response.success) {
-    final projectId = projectController.selectedProjectId.value;
+        monthlyExpenseList.value = response.data;
-    if (projectId.isEmpty) return;
+        logSafe('Monthly Expense Report fetched successfully.',
-
+            level: LogLevel.info);
-    await _executeApiCall(isPurchaseInvoiceLoading, () async {
+      } else {
-      final response = await ApiService.getPurchaseInvoiceOverview(
+        monthlyExpenseList.clear();
-        projectId: projectId,
+        logSafe('Failed to fetch Monthly Expense Report.',
-      );
+            level: LogLevel.error);
-      purchaseInvoiceOverviewData.value =
+      }
-          (response?.success == true) ? response!.data : null;
+    } catch (e, st) {
-    });
+      monthlyExpenseList.clear();
+      logSafe('Error fetching Monthly Expense Report',
+          level: LogLevel.error, error: e, stackTrace: st);
+    } finally {
+      isMonthlyExpenseLoading.value = false;
+    }
   }
 
   Future<void> fetchPendingExpenses() async {
-    final id = projectController.selectedProjectId.value;
+    final String projectId = projectController.selectedProjectId.value;
-    if (id.isEmpty) return;
+    if (projectId.isEmpty) return;
 
-    await _executeApiCall(isPendingExpensesLoading, () async {
+    try {
-      final response = await ApiService.getPendingExpensesApi(projectId: id);
+      isPendingExpensesLoading.value = true;
-      pendingExpensesData.value =
+      final response =
-          (response?.success == true) ? response!.data : null;
+          await ApiService.getPendingExpensesApi(projectId: projectId);
-    });
+
+      if (response != null && response.success) {
+        pendingExpensesData.value = response.data;
+        logSafe('Pending expenses fetched successfully.', level: LogLevel.info);
+      } else {
+        pendingExpensesData.value = null;
+        logSafe('Failed to fetch pending expenses.', level: LogLevel.error);
+      }
+    } catch (e, st) {
+      pendingExpensesData.value = null;
+      logSafe('Error fetching pending expenses',
+          level: LogLevel.error, error: e, stackTrace: st);
+    } finally {
+      isPendingExpensesLoading.value = false;
+    }
   }
 
+  // =========================
+  // API Calls
+  // =========================
   Future<void> fetchRoleWiseAttendance() async {
-    final id = projectController.selectedProjectId.value;
+    final String projectId = projectController.selectedProjectId.value;
-    if (id.isEmpty) return;
+    if (projectId.isEmpty) return;
 
-    await _executeApiCall(isAttendanceLoading, () async {
+    try {
-      final response = await ApiService.getDashboardAttendanceOverview(
+      isAttendanceLoading.value = true;
-          id, getAttendanceDays());
+      final List<dynamic>? response =
-      roleWiseData.value =
+          await ApiService.getDashboardAttendanceOverview(
-          response?.map((e) => Map<String, dynamic>.from(e)).toList() ?? [];
+              projectId, getAttendanceDays());
-    });
+
+      if (response != null) {
+        roleWiseData.value =
+            response.map((e) => Map<String, dynamic>.from(e)).toList();
+        logSafe('Attendance overview fetched successfully.',
+            level: LogLevel.info);
+      } else {
+        roleWiseData.clear();
+        logSafe('Failed to fetch attendance overview: response is null.',
+            level: LogLevel.error);
+      }
+    } catch (e, st) {
+      roleWiseData.clear();
+      logSafe('Error fetching attendance overview',
+          level: LogLevel.error, error: e, stackTrace: st);
+    } finally {
+      isAttendanceLoading.value = false;
+    }
   }
 
-  Future<void> fetchExpenseTypeReport(
+  Future<void> fetchExpenseTypeReport({
-      {required DateTime startDate, required DateTime endDate}) async {
+    required DateTime startDate,
-    final id = projectController.selectedProjectId.value;
+    required DateTime endDate,
-    if (id.isEmpty) return;
+  }) async {
+    final String projectId = projectController.selectedProjectId.value;
+    if (projectId.isEmpty) return;
+
+    try {
+      isExpenseTypeReportLoading.value = true;
 
-    await _executeApiCall(isExpenseTypeReportLoading, () async {
       final response = await ApiService.getExpenseTypeReportApi(
-        projectId: id,
+        projectId: projectId,
         startDate: startDate,
         endDate: endDate,
       );
-      expenseTypeReportData.value =
+
-          (response?.success == true) ? response!.data : null;
+      if (response != null && response.success) {
-    });
+        expenseTypeReportData.value = response.data;
+        logSafe('Expense Type Report fetched successfully.',
+            level: LogLevel.info);
+      } else {
+        expenseTypeReportData.value = null;
+        logSafe('Failed to fetch Expense Type Report.', level: LogLevel.error);
+      }
+    } catch (e, st) {
+      expenseTypeReportData.value = null;
+      logSafe('Error fetching Expense Type Report',
+          level: LogLevel.error, error: e, stackTrace: st);
+    } finally {
+      isExpenseTypeReportLoading.value = false;
+    }
   }
 
   Future<void> fetchProjectProgress() async {
-    final id = projectController.selectedProjectId.value;
+    final String projectId = projectController.selectedProjectId.value;
-    if (id.isEmpty) return;
+    if (projectId.isEmpty) return;
 
-    await _executeApiCall(isProjectLoading, () async {
+    try {
+      isProjectLoading.value = true;
       final response = await ApiService.getProjectProgress(
-          projectId: id, days: getProjectDays());
+          projectId: projectId, days: getProjectDays());
-      if (response?.success == true) {
+
-        projectChartData.value = response!.data
+      if (response != null && response.success) {
-            .map((d) => ChartTaskData.fromProjectData(d))
+        projectChartData.value =
-            .toList();
+            response.data.map((d) => ChartTaskData.fromProjectData(d)).toList();
+        logSafe('Project progress data mapped for chart', level: LogLevel.info);
       } else {
         projectChartData.clear();
+        logSafe('Failed to fetch project progress', level: LogLevel.error);
       }
-    });
+    } catch (e, st) {
+      projectChartData.clear();
+      logSafe('Error fetching project progress',
+          level: LogLevel.error, error: e, stackTrace: st);
+    } finally {
+      isProjectLoading.value = false;
+    }
   }
 
   Future<void> fetchDashboardTasks({required String projectId}) async {
-    await _executeApiCall(isTasksLoading, () async {
+    if (projectId.isEmpty) return;
+
+    try {
+      isTasksLoading.value = true;
       final response = await ApiService.getDashboardTasks(projectId: projectId);
-      if (response?.success == true) {
+
-        totalTasks.value = response!.data?.totalTasks ?? 0;
+      if (response != null && response.success) {
+        totalTasks.value = response.data?.totalTasks ?? 0;
         completedTasks.value = response.data?.completedTasks ?? 0;
+        logSafe('Dashboard tasks fetched', level: LogLevel.info);
       } else {
         totalTasks.value = 0;
         completedTasks.value = 0;
+        logSafe('Failed to fetch tasks', level: LogLevel.error);
       }
-    });
+    } catch (e, st) {
+      totalTasks.value = 0;
+      completedTasks.value = 0;
+      logSafe('Error fetching tasks',
+          level: LogLevel.error, error: e, stackTrace: st);
+    } finally {
+      isTasksLoading.value = false;
+    }
   }
 
   Future<void> fetchDashboardTeams({required String projectId}) async {
-    await _executeApiCall(isTeamsLoading, () async {
+    if (projectId.isEmpty) return;
+
+    try {
+      isTeamsLoading.value = true;
       final response = await ApiService.getDashboardTeams(projectId: projectId);
-      if (response?.success == true) {
+
-        totalEmployees.value = response!.data?.totalEmployees ?? 0;
+      if (response != null && response.success) {
+        totalEmployees.value = response.data?.totalEmployees ?? 0;
         inToday.value = response.data?.inToday ?? 0;
+        logSafe('Dashboard teams fetched', level: LogLevel.info);
       } else {
         totalEmployees.value = 0;
         inToday.value = 0;
+        logSafe('Failed to fetch teams', level: LogLevel.error);
       }
-    });
+    } catch (e, st) {
+      totalEmployees.value = 0;
+      inToday.value = 0;
+      logSafe('Error fetching teams',
+          level: LogLevel.error, error: e, stackTrace: st);
+    } finally {
+      isTeamsLoading.value = false;
+    }
   }
 }
 

lib/controller/directory/add_comment_controller.dart

@@ -1,9 +1,9 @@
 import 'package:get/get.dart';
-import 'package:on_field_work/helpers/services/api_service.dart';
+import 'package:marco/helpers/services/api_service.dart';
-import 'package:on_field_work/helpers/services/app_logger.dart';
+import 'package:marco/helpers/services/app_logger.dart';
-import 'package:on_field_work/helpers/widgets/my_snackbar.dart';
+import 'package:marco/helpers/widgets/my_snackbar.dart';
-import 'package:on_field_work/controller/directory/directory_controller.dart';
+import 'package:marco/controller/directory/directory_controller.dart';
-import 'package:on_field_work/controller/directory/notes_controller.dart';
+import 'package:marco/controller/directory/notes_controller.dart';
 
 class AddCommentController extends GetxController {
   final String contactId;

lib/controller/directory/add_contact_controller.dart

@@ -1,7 +1,7 @@
 import 'package:get/get.dart';
-import 'package:on_field_work/helpers/services/api_service.dart';
+import 'package:marco/helpers/services/api_service.dart';
-import 'package:on_field_work/helpers/services/app_logger.dart';
+import 'package:marco/helpers/services/app_logger.dart';
-import 'package:on_field_work/helpers/widgets/my_snackbar.dart';
+import 'package:marco/helpers/widgets/my_snackbar.dart';
 
 class AddContactController extends GetxController {
   final RxList<String> categories = <String>[].obs;

lib/controller/directory/create_bucket_controller.dart

@@ -1,7 +1,7 @@
 import 'package:get/get.dart';
-import 'package:on_field_work/helpers/services/api_service.dart';
+import 'package:marco/helpers/services/api_service.dart';
-import 'package:on_field_work/helpers/services/app_logger.dart';
+import 'package:marco/helpers/services/app_logger.dart';
-import 'package:on_field_work/helpers/widgets/my_snackbar.dart';
+import 'package:marco/helpers/widgets/my_snackbar.dart';
 
 class BucketController extends GetxController {
   RxBool isCreating = false.obs;

lib/controller/directory/directory_controller.dart

@@ -1,10 +1,10 @@
 import 'package:get/get.dart';
-import 'package:on_field_work/helpers/services/api_service.dart';
+import 'package:marco/helpers/services/api_service.dart';
-import 'package:on_field_work/helpers/services/app_logger.dart';
+import 'package:marco/helpers/services/app_logger.dart';
-import 'package:on_field_work/helpers/widgets/my_snackbar.dart';
+import 'package:marco/helpers/widgets/my_snackbar.dart';
-import 'package:on_field_work/model/directory/contact_model.dart';
+import 'package:marco/model/directory/contact_model.dart';
-import 'package:on_field_work/model/directory/contact_bucket_list_model.dart';
+import 'package:marco/model/directory/contact_bucket_list_model.dart';
-import 'package:on_field_work/model/directory/directory_comment_model.dart';
+import 'package:marco/model/directory/directory_comment_model.dart';
 
 class DirectoryController extends GetxController {
   // -------------------- CONTACTS --------------------

lib/controller/directory/manage_bucket_controller.dart

@@ -1,9 +1,9 @@
 import 'package:get/get.dart';
-import 'package:on_field_work/helpers/services/app_logger.dart';
+import 'package:marco/helpers/services/app_logger.dart';
-import 'package:on_field_work/helpers/services/api_service.dart';
+import 'package:marco/helpers/services/api_service.dart';
-import 'package:on_field_work/model/employees/employee_model.dart';
+import 'package:marco/model/employees/employee_model.dart';
-import 'package:on_field_work/helpers/widgets/my_snackbar.dart';
+import 'package:marco/helpers/widgets/my_snackbar.dart';
-import 'package:on_field_work/controller/directory/directory_controller.dart';
+import 'package:marco/controller/directory/directory_controller.dart';
 
 class ManageBucketController extends GetxController {
   RxList<EmployeeModel> allEmployees = <EmployeeModel>[].obs;

lib/controller/directory/notes_controller.dart

@@ -1,8 +1,8 @@
 import 'package:get/get.dart';
-import 'package:on_field_work/helpers/services/api_service.dart';
+import 'package:marco/helpers/services/api_service.dart';
-import 'package:on_field_work/helpers/services/app_logger.dart';
+import 'package:marco/helpers/services/app_logger.dart';
-import 'package:on_field_work/helpers/widgets/my_snackbar.dart';
+import 'package:marco/helpers/widgets/my_snackbar.dart';
-import 'package:on_field_work/model/directory/note_list_response_model.dart';
+import 'package:marco/model/directory/note_list_response_model.dart';
 
 class NotesController extends GetxController {
   RxList<NoteModel> notesList = <NoteModel>[].obs;

lib/controller/document/document_details_controller.dart

@@ -1,7 +1,7 @@
 import 'package:get/get.dart';
-import 'package:on_field_work/helpers/services/api_service.dart';
+import 'package:marco/helpers/services/api_service.dart';
-import 'package:on_field_work/model/document/document_details_model.dart';
+import 'package:marco/model/document/document_details_model.dart';
-import 'package:on_field_work/model/document/document_version_model.dart';
+import 'package:marco/model/document/document_version_model.dart';
 
 class DocumentDetailsController extends GetxController {
   /// Observables

lib/controller/document/document_upload_controller.dart

@@ -1,10 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'package:on_field_work/helpers/services/app_logger.dart';
+import 'package:marco/helpers/services/app_logger.dart';
-import 'package:on_field_work/helpers/services/api_service.dart';
+import 'package:marco/helpers/services/api_service.dart';
-import 'package:on_field_work/model/document/master_document_type_model.dart';
+import 'package:marco/model/document/master_document_type_model.dart';
-import 'package:on_field_work/model/document/master_document_tags.dart';
+import 'package:marco/model/document/master_document_tags.dart';
-import 'package:on_field_work/helpers/widgets/my_snackbar.dart';
+import 'package:marco/helpers/widgets/my_snackbar.dart';
 
 class DocumentUploadController extends GetxController {
   // Observables

lib/controller/document/user_document_controller.dart

@@ -1,9 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'package:on_field_work/helpers/services/api_service.dart';
+import 'package:marco/helpers/services/api_service.dart';
-import 'package:on_field_work/model/document/document_filter_model.dart';
+import 'package:marco/model/document/document_filter_model.dart';
-import 'package:on_field_work/model/document/documents_list_model.dart';
+import 'package:marco/model/document/documents_list_model.dart';
-import 'package:on_field_work/helpers/widgets/my_snackbar.dart';
 
 class DocumentController extends GetxController {
   // ==================== Observables ====================
@@ -39,6 +38,7 @@ class DocumentController extends GetxController {
   final endDate = Rxn<DateTime>();
 
   // ==================== Lifecycle ====================
+
   @override
   void onClose() {
     // Don't dispose searchController here - it's managed by the page
@@ -87,23 +87,13 @@ class DocumentController extends GetxController {
           entityId: entityId,
           reset: true,
         );
-
-        // Show success snackbar
-        showAppSnackbar(
-          title: 'Success',
-          message: isActive ? 'Document deactivated' : 'Document activated',
-          type: SnackbarType.success,
-        );
-
         return true;
       } else {
         errorMessage.value = 'Failed to update document state';
-        _showError('Failed to update document state');
         return false;
       }
     } catch (e) {
       errorMessage.value = 'Error updating document: $e';
-      _showError('Error updating document: $e');
       debugPrint('❌ Error toggling document state: $e');
       return false;
     } finally {
@@ -120,13 +110,17 @@ class DocumentController extends GetxController {
     bool reset = false,
   }) async {
     try {
+      // Reset pagination if needed
       if (reset) {
         pageNumber.value = 1;
         documents.clear();
         hasMore.value = true;
       }
 
+      // Don't fetch if no more data
       if (!hasMore.value && !reset) return;
+
+      // Prevent duplicate requests
       if (isLoading.value) return;
 
       isLoading.value = true;
@@ -142,8 +136,8 @@ class DocumentController extends GetxController {
       );
 
       if (response != null && response.success) {
-        if (response.data?.data.isNotEmpty ?? false) {
+        if (response.data.data.isNotEmpty) {
-          documents.addAll(response.data!.data);
+          documents.addAll(response.data.data);
           pageNumber.value++;
         } else {
           hasMore.value = false;
@@ -153,24 +147,12 @@ class DocumentController extends GetxController {
         errorMessage.value = response?.message ?? 'Failed to fetch documents';
         if (documents.isEmpty) {
           _showError('Failed to load documents');
-        } else {
-          showAppSnackbar(
-            title: 'Warning',
-            message: 'No more documents to load',
-            type: SnackbarType.warning,
-          );
         }
       }
     } catch (e) {
       errorMessage.value = 'Error fetching documents: $e';
       if (documents.isEmpty) {
         _showError('Error loading documents');
-      } else {
-        showAppSnackbar(
-          title: 'Error',
-          message: 'Error fetching additional documents',
-          type: SnackbarType.error,
-        );
       }
       debugPrint('❌ Error fetching documents: $e');
     } finally {
@@ -203,12 +185,17 @@ class DocumentController extends GetxController {
         isVerified.value != null;
   }
 
-  /// Show error message via snackbar
+  /// Show error message
   void _showError(String message) {
-    showAppSnackbar(
+    Get.snackbar(
-      title: 'Error',
+      'Error',
-      message: message,
+      message,
-      type: SnackbarType.error,
+      snackPosition: SnackPosition.BOTTOM,
+      backgroundColor: Colors.red.shade100,
+      colorText: Colors.red.shade900,
+      margin: const EdgeInsets.all(16),
+      borderRadius: 8,
+      duration: const Duration(seconds: 3),
     );
   }
 

lib/controller/dynamicMenu/dynamic_menu_controller.dart

@@ -1,8 +1,8 @@
 import 'dart:async';
 import 'package:get/get.dart';
-import 'package:on_field_work/model/dynamicMenu/dynamic_menu_model.dart';
+import 'package:marco/model/dynamicMenu/dynamic_menu_model.dart';
-import 'package:on_field_work/helpers/services/api_service.dart';
+import 'package:marco/helpers/services/api_service.dart';
-import 'package:on_field_work/helpers/services/app_logger.dart';
+import 'package:marco/helpers/services/app_logger.dart';
 
 class DynamicMenuController extends GetxController {
   // UI reactive states

lib/controller/employee/add_employee_controller.dart

@@ -1,11 +1,11 @@
 import 'package:file_picker/file_picker.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'package:on_field_work/controller/my_controller.dart';
+import 'package:marco/controller/my_controller.dart';
-import 'package:on_field_work/helpers/services/api_service.dart';
+import 'package:marco/helpers/services/api_service.dart';
-import 'package:on_field_work/helpers/services/app_logger.dart';
+import 'package:marco/helpers/services/app_logger.dart';
-import 'package:on_field_work/helpers/widgets/my_form_validator.dart';
+import 'package:marco/helpers/widgets/my_form_validator.dart';
-import 'package:on_field_work/helpers/widgets/my_snackbar.dart';
+import 'package:marco/helpers/widgets/my_snackbar.dart';
 import 'package:flutter_contacts/flutter_contacts.dart';
 import 'package:permission_handler/permission_handler.dart';
 

lib/controller/employee/assign_projects_controller.dart

@@ -1,10 +1,10 @@
 import 'package:flutter/widgets.dart';
 import 'package:get/get.dart';
-import 'package:on_field_work/helpers/services/api_service.dart';
+import 'package:marco/helpers/services/api_service.dart';
-import 'package:on_field_work/helpers/services/app_logger.dart';
+import 'package:marco/helpers/services/app_logger.dart';
-import 'package:on_field_work/model/global_project_model.dart';
+import 'package:marco/model/global_project_model.dart';
-import 'package:on_field_work/model/employees/assigned_projects_model.dart';
+import 'package:marco/model/employees/assigned_projects_model.dart';
-import 'package:on_field_work/controller/project_controller.dart';
+import 'package:marco/controller/project_controller.dart';
 
 class AssignProjectController extends GetxController {
   final String employeeId;

lib/controller/employee/employees_screen_controller.dart

@@ -1,8 +1,8 @@
 import 'package:get/get.dart';
-import 'package:on_field_work/helpers/services/app_logger.dart';
+import 'package:marco/helpers/services/app_logger.dart';
-import 'package:on_field_work/helpers/services/api_service.dart';
+import 'package:marco/helpers/services/api_service.dart';
-import 'package:on_field_work/model/employees/employee_model.dart';
+import 'package:marco/model/employees/employee_model.dart';
-import 'package:on_field_work/model/employees/employee_details_model.dart';
+import 'package:marco/model/employees/employee_details_model.dart';
 
 class EmployeesScreenController extends GetxController {
   /// ✅ Data lists
@@ -21,10 +21,6 @@ class EmployeesScreenController extends GetxController {
   /// ✅ Upload state tracking (if needed later)
   RxMap<String, RxBool> uploadingStates = <String, RxBool>{}.obs;
 
-  RxList<EmployeeModel> selectedEmployeePrimaryManagers = <EmployeeModel>[].obs;
-  RxList<EmployeeModel> selectedEmployeeSecondaryManagers =
-      <EmployeeModel>[].obs;
-
   @override
   void onInit() {
     super.onInit();
@@ -90,52 +86,6 @@ class EmployeesScreenController extends GetxController {
     isLoadingEmployeeDetails.value = false;
   }
 
-  /// Fetch reporting managers for a specific employee from /organization/hierarchy/list/:employeeId
-  Future<void> fetchReportingManagers(String? employeeId) async {
-    if (employeeId == null || employeeId.isEmpty) return;
-
-    try {
-      // ✅ Always clear before new fetch (to avoid mixing old data)
-      selectedEmployeePrimaryManagers.clear();
-      selectedEmployeeSecondaryManagers.clear();
-
-      // Fetch from existing API helper
-      final data = await ApiService.getOrganizationHierarchyList(employeeId);
-
-      if (data == null || data.isEmpty) {
-        update(['employee_screen_controller']);
-        return;
-      }
-
-      for (final item in data) {
-        try {
-          final reportTo = item['reportTo'];
-          if (reportTo == null) continue;
-
-          final emp = EmployeeModel.fromJson(reportTo);
-          final isPrimary = item['isPrimary'] == true;
-
-          if (isPrimary) {
-            if (!selectedEmployeePrimaryManagers.any((e) => e.id == emp.id)) {
-              selectedEmployeePrimaryManagers.add(emp);
-            }
-          } else {
-            if (!selectedEmployeeSecondaryManagers.any((e) => e.id == emp.id)) {
-              selectedEmployeeSecondaryManagers.add(emp);
-            }
-          }
-        } catch (_) {
-          // ignore malformed items
-        }
-      }
-
-      update(['employee_screen_controller']);
-    } catch (e) {
-      logSafe("Error fetching reporting managers for $employeeId",
-          level: LogLevel.error, error: e);
-    }
-  }
-
   /// 🔹 Clear all employee data
   void clearEmployees() {
     employees.clear();

lib/controller/error_pages/coming_soon_controller.dart

@@ -1,7 +1,7 @@
 import 'dart:async';
 
 import 'package:get/get.dart';
-import 'package:on_field_work/controller/my_controller.dart';
+import 'package:marco/controller/my_controller.dart';
 
 class ComingSoonController extends MyController {
   Timer? countdownTimer;

lib/controller/error_pages/error_404_controller.dart

@@ -1,5 +1,5 @@
 import 'package:get/get.dart';
-import 'package:on_field_work/controller/my_controller.dart';
+import 'package:marco/controller/my_controller.dart';
 
 class Error404Controller extends MyController {
   void goToDashboardScreen() {

lib/controller/error_pages/error_500_controller.dart

@@ -1,5 +1,5 @@
 import 'package:get/get.dart';
-import 'package:on_field_work/controller/my_controller.dart';
+import 'package:marco/controller/my_controller.dart';
 
 class Error500Controller extends MyController {
   void goToDashboardScreen() {

lib/controller/expense/add_expense_controller.dart

@@ -1,6 +1,5 @@
 import 'dart:convert';
 import 'dart:io';
-import 'dart:async';
 
 import 'package:file_picker/file_picker.dart';
 import 'package:flutter/material.dart';
@@ -11,14 +10,14 @@ import 'package:intl/intl.dart';
 import 'package:mime/mime.dart';
 import 'package:image_picker/image_picker.dart';
 
-import 'package:on_field_work/controller/expense/expense_screen_controller.dart';
+import 'package:marco/controller/expense/expense_screen_controller.dart';
-import 'package:on_field_work/helpers/services/api_service.dart';
+import 'package:marco/helpers/services/api_service.dart';
-import 'package:on_field_work/helpers/services/app_logger.dart';
+import 'package:marco/helpers/services/app_logger.dart';
-import 'package:on_field_work/helpers/widgets/my_snackbar.dart';
+import 'package:marco/helpers/widgets/my_snackbar.dart';
-import 'package:on_field_work/model/employees/employee_model.dart';
+import 'package:marco/model/employees/employee_model.dart';
-import 'package:on_field_work/model/expense/expense_type_model.dart';
+import 'package:marco/model/expense/expense_type_model.dart';
-import 'package:on_field_work/model/expense/payment_types_model.dart';
+import 'package:marco/model/expense/payment_types_model.dart';
-import 'package:on_field_work/helpers/widgets/time_stamp_image_helper.dart';
+import 'package:marco/helpers/widgets/time_stamp_image_helper.dart';
 
 class AddExpenseController extends GetxController {
   // --- Text Controllers ---
@@ -51,22 +50,10 @@ class AddExpenseController extends GetxController {
   final isEditMode = false.obs;
   final isSearchingEmployees = false.obs;
 
-// --- Paid By (Single + Multi Selection Support) ---
-
-// single selection
-  final selectedPaidBy = Rxn<EmployeeModel>();
-
-
-
-// helper setters
-  void setSelectedPaidBy(EmployeeModel? emp) {
-    selectedPaidBy.value = emp;
-  }
-
   // --- Dropdown Selections & Data ---
   final selectedPaymentMode = Rxn<PaymentModeModel>();
   final selectedExpenseType = Rxn<ExpenseTypeModel>();
-  // final selectedPaidBy = Rxn<EmployeeModel>();
+  final selectedPaidBy = Rxn<EmployeeModel>();
   final selectedProject = ''.obs;
   final selectedTransactionDate = Rxn<DateTime>();
 
@@ -209,7 +196,7 @@ class AddExpenseController extends GetxController {
       'Location: ${locationController.text}',
       'Transaction Date: ${transactionDateController.text}',
       'No. of Persons: ${noOfPersonsController.text}',
-      'Expense Category: ${selectedExpenseType.value?.name}',
+      'Expense Type: ${selectedExpenseType.value?.name}',
       'Payment Mode: ${selectedPaymentMode.value?.name}',
       'Paid By: ${selectedPaidBy.value?.name}',
       'Attachments: ${attachments.length}',
@@ -458,7 +445,7 @@ class AddExpenseController extends GetxController {
       return null;
     }
     if (expenseType == null) {
-      _errorSnackbar("Expense Category not selected");
+      _errorSnackbar("Expense type not selected");
       return null;
     }
     if (paymentMode == null) {
@@ -530,7 +517,7 @@ class AddExpenseController extends GetxController {
     final missing = <String>[];
 
     if (selectedProject.value.isEmpty) missing.add("Project");
-    if (selectedExpenseType.value == null) missing.add("Expense Category");
+    if (selectedExpenseType.value == null) missing.add("Expense Type");
     if (selectedPaymentMode.value == null) missing.add("Payment Mode");
     if (selectedPaidBy.value == null) missing.add("Paid By");
     if (amountController.text.trim().isEmpty) missing.add("Amount");

lib/controller/expense/expense_detail_controller.dart

@@ -1,8 +1,8 @@
 import 'package:get/get.dart';
-import 'package:on_field_work/helpers/services/api_service.dart';
+import 'package:marco/helpers/services/api_service.dart';
-import 'package:on_field_work/helpers/services/app_logger.dart';
+import 'package:marco/helpers/services/app_logger.dart';
-import 'package:on_field_work/model/expense/expense_detail_model.dart';
+import 'package:marco/model/expense/expense_detail_model.dart';
-import 'package:on_field_work/model/employees/employee_model.dart';
+import 'package:marco/model/employees/employee_model.dart';
 import 'package:flutter/material.dart';
 
 class ExpenseDetailController extends GetxController {

lib/controller/expense/expense_screen_controller.dart

@@ -1,13 +1,13 @@
 import 'dart:convert';
 import 'package:get/get.dart';
-import 'package:on_field_work/helpers/services/api_service.dart';
+import 'package:marco/helpers/services/api_service.dart';
-import 'package:on_field_work/helpers/services/app_logger.dart';
+import 'package:marco/helpers/services/app_logger.dart';
-import 'package:on_field_work/model/expense/expense_list_model.dart';
+import 'package:marco/model/expense/expense_list_model.dart';
-import 'package:on_field_work/model/expense/payment_types_model.dart';
+import 'package:marco/model/expense/payment_types_model.dart';
-import 'package:on_field_work/model/expense/expense_type_model.dart';
+import 'package:marco/model/expense/expense_type_model.dart';
-import 'package:on_field_work/model/expense/expense_status_model.dart';
+import 'package:marco/model/expense/expense_status_model.dart';
-import 'package:on_field_work/model/employees/employee_model.dart';
+import 'package:marco/model/employees/employee_model.dart';
-import 'package:on_field_work/helpers/widgets/my_snackbar.dart';
+import 'package:marco/helpers/widgets/my_snackbar.dart';
 import 'package:flutter/material.dart';
 
 class ExpenseController extends GetxController {
@@ -213,7 +213,7 @@ class ExpenseController extends GetxController {
     selectedCreatedByEmployees.clear();
   }
 
-  /// Fetch master data: Expense Categorys, payment modes, and expense status
+  /// Fetch master data: expense types, payment modes, and expense status
   Future<void> fetchMasterData() async {
     try {
       final expenseTypesData = await ApiService.getMasterExpenseTypes();

lib/controller/extra_pages/faqs_controller.dart

@@ -1,5 +1,5 @@
-import 'package:on_field_work/controller/my_controller.dart';
+import 'package:marco/controller/my_controller.dart';
-import 'package:on_field_work/helpers/widgets/my_text_utils.dart';
+import 'package:marco/helpers/widgets/my_text_utils.dart';
 
 class FaqsController extends MyController {
   final List<bool> dataExpansionPanel = [true, false, false, false, false, false];

lib/controller/extra_pages/pricing_controller.dart

@@ -1,4 +1,4 @@
-import 'package:on_field_work/controller/my_controller.dart';
+import 'package:marco/controller/my_controller.dart';
 
 class PricingController extends MyController {
   bool isMonth = false;

lib/controller/finance/add_payment_request_controller.dart

@@ -8,13 +8,12 @@ import 'package:image_picker/image_picker.dart';
 import 'package:mime/mime.dart';
 import 'package:intl/intl.dart';
 
-import 'package:on_field_work/helpers/services/api_service.dart';
+import 'package:marco/helpers/services/api_service.dart';
-import 'package:on_field_work/helpers/services/app_logger.dart';
+import 'package:marco/helpers/services/app_logger.dart';
-import 'package:on_field_work/helpers/widgets/my_snackbar.dart';
+import 'package:marco/helpers/widgets/my_snackbar.dart';
-import 'package:on_field_work/helpers/widgets/time_stamp_image_helper.dart';
+import 'package:marco/helpers/widgets/time_stamp_image_helper.dart';
-import 'package:on_field_work/model/finance/expense_category_model.dart';
+import 'package:marco/model/finance/expense_category_model.dart';
-import 'package:on_field_work/model/finance/currency_list_model.dart';
+import 'package:marco/model/finance/currency_list_model.dart';
-import 'package:on_field_work/model/employees/employee_model.dart';
 
 class AddPaymentRequestController extends GetxController {
   // Loading States
@@ -33,7 +32,7 @@ class AddPaymentRequestController extends GetxController {
   // Selected Values
   final selectedProject = Rx<Map<String, dynamic>?>(null);
   final selectedCategory = Rx<ExpenseCategory?>(null);
-  final selectedPayee = Rx<EmployeeModel?>(null);
+  final selectedPayee = ''.obs;
   final selectedCurrency = Rx<Currency?>(null);
   final isAdvancePayment = false.obs;
   final selectedDueDate = Rx<DateTime?>(null);
@@ -185,7 +184,7 @@ class AddPaymentRequestController extends GetxController {
       selectedProject.value = project;
   void selectCategory(ExpenseCategory category) =>
       selectedCategory.value = category;
-  void selectPayee(EmployeeModel payee) => selectedPayee.value = payee;
+  void selectPayee(String payee) => selectedPayee.value = payee;
   void selectCurrency(Currency currency) => selectedCurrency.value = currency;
 
   void addAttachment(File file) => attachments.add(file);
@@ -269,7 +268,7 @@ class AddPaymentRequestController extends GetxController {
         "amount": double.tryParse(amountController.text.trim()) ?? 0,
         "currencyId": selectedCurrency.value?.id ?? '',
         "description": descriptionController.text.trim(),
-        "payee": selectedPayee.value?.id ?? "",
+        "payee": selectedPayee.value,
         "dueDate": selectedDueDate.value?.toIso8601String(),
         "isAdvancePayment": isAdvancePayment.value,
         "billAttachments": billAttachments.map((a) {
@@ -338,7 +337,7 @@ class AddPaymentRequestController extends GetxController {
         "amount": double.tryParse(amountController.text.trim()) ?? 0,
         "currencyId": selectedCurrency.value?.id ?? '',
         "description": descriptionController.text.trim(),
-        "payee": selectedPayee.value?.id ?? "",
+        "payee": selectedPayee.value,
         "dueDate": selectedDueDate.value?.toIso8601String(),
         "isAdvancePayment": isAdvancePayment.value,
         "billAttachments": billAttachments.map((a) {
@@ -389,7 +388,7 @@ class AddPaymentRequestController extends GetxController {
       return _errorSnackbar("Please select a project");
     if (selectedCategory.value == null)
       return _errorSnackbar("Please select a category");
-    if (selectedPayee.value == null)
+    if (selectedPayee.value.isEmpty)
       return _errorSnackbar("Please select a payee");
     if (selectedCurrency.value == null)
       return _errorSnackbar("Please select currency");
@@ -409,7 +408,7 @@ class AddPaymentRequestController extends GetxController {
     descriptionController.clear();
     selectedProject.value = null;
     selectedCategory.value = null;
-    selectedPayee.value = null;
+    selectedPayee.value = '';
     selectedCurrency.value = null;
     isAdvancePayment.value = false;
     attachments.clear();

lib/controller/finance/advance_payment_controller.dart

@@ -1,9 +1,9 @@
 import 'dart:async';
 import 'package:get/get.dart';
-import 'package:on_field_work/model/finance/advance_payment_model.dart';
+import 'package:marco/model/finance/advance_payment_model.dart';
-import 'package:on_field_work/model/finance/get_employee_model.dart';
+import 'package:marco/model/finance/get_employee_model.dart';
-import 'package:on_field_work/helpers/services/app_logger.dart';
+import 'package:marco/helpers/services/app_logger.dart';
-import 'package:on_field_work/helpers/services/api_service.dart';
+import 'package:marco/helpers/services/api_service.dart';
 
 class AdvancePaymentController extends GetxController {
   /// Advance payments list
@@ -65,17 +65,12 @@ class AdvancePaymentController extends GetxController {
     try {
       employeesLoading.value = true;
 
-      // Build query params
+      final list = await ApiService.getEmployees(query: q);
-      final queryParams = {
-        'allEmployee': 'true',
-        if (q.isNotEmpty) 'q': q, // only include search query if not empty
-      };
-
-      final list = await ApiService.getEmployees(queryParams: queryParams);
       final parsed = Employee.listFromJson(list);
-      logSafe(
+      logSafe("✅ Employees fetched from API: ${parsed.map((e) => e.name).toList()}");
-          "✅ Employees fetched from API: ${parsed.map((e) => e.name).toList()}");
 
+
+      // Save full result and filter locally
       allEmployees = parsed;
       _filterEmployees(q);
     } catch (e, s) {

lib/controller/finance/payment_request_controller.dart

@@ -1,8 +1,8 @@
 import 'package:get/get.dart';
-import 'package:on_field_work/helpers/services/api_service.dart';
+import 'package:marco/helpers/services/api_service.dart';
-import 'package:on_field_work/model/finance/payment_request_list_model.dart';
+import 'package:marco/model/finance/payment_request_list_model.dart';
-import 'package:on_field_work/model/finance/payment_request_filter.dart';
+import 'package:marco/model/finance/payment_request_filter.dart';
-import 'package:on_field_work/helpers/services/app_logger.dart';
+import 'package:marco/helpers/services/app_logger.dart';
 
 class PaymentRequestController extends GetxController {
   // ---------------- Observables ----------------
@@ -32,14 +32,13 @@ class PaymentRequestController extends GetxController {
   Future<void> fetchPaymentRequestFilterOptions() async {
     try {
       final response = await ApiService.getExpensePaymentRequestFilterApi();
-
+      if (response != null) {
-      if (response != null && response.data != null) {
+        projects.assignAll(response.data.projects);
-        projects.assignAll(response.data!.projects ?? []);
+        payees.assignAll(response.data.payees);
-        payees.assignAll(response.data!.payees ?? []);
+        categories.assignAll(response.data.expenseCategory);
-        categories.assignAll(response.data!.expenseCategory ?? []);
+        currencies.assignAll(response.data.currency);
-        currencies.assignAll(response.data!.currency ?? []);
+        statuses.assignAll(response.data.status);
-        statuses.assignAll(response.data!.status ?? []);
+        createdBy.assignAll(response.data.createdBy);
-        createdBy.assignAll(response.data!.createdBy ?? []);
       } else {
         logSafe("Payment request filter API returned null",
             level: LogLevel.warning);
@@ -64,7 +63,7 @@ class PaymentRequestController extends GetxController {
     isLoading.value = false;
   }
 
-  // ---------------- Load More ----------------
+// ---------------- Load More ----------------
   Future<void> loadMorePaymentRequests() async {
     if (isLoading.value || !_hasMoreData) return;
 
@@ -75,7 +74,7 @@ class PaymentRequestController extends GetxController {
     isLoading.value = false;
   }
 
-  // ---------------- Internal API Call ----------------
+// ---------------- Internal API Call ----------------
   Future<void> _fetchPaymentRequestsFromApi() async {
     try {
       final response = await ApiService.getExpensePaymentRequestListApi(
@@ -85,17 +84,17 @@ class PaymentRequestController extends GetxController {
         searchString: searchString.value,
       );
 
-      final data = response?.data;
+      if (response != null && response.data.data.isNotEmpty) {
-      final reqList = data?.data ?? [];
-
-      if (response != null && data != null && reqList.isNotEmpty) {
         if (_pageNumber == 1) {
-          paymentRequests.assignAll(reqList);
+          // First page, replace the list
+          paymentRequests.assignAll(response.data.data);
         } else {
-          paymentRequests.addAll(reqList);
+          // Append next page items at the end
+          paymentRequests.addAll(response.data.data);
         }
 
-        if (reqList.length < _pageSize) {
+        // If returned data is less than page size, no more data
+        if (response.data.data.length < _pageSize) {
           _hasMoreData = false;
         }
       } else {

lib/controller/finance/payment_request_detail_controller.dart

@@ -1,11 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'package:on_field_work/helpers/services/api_service.dart';
+import 'package:marco/helpers/services/api_service.dart';
-import 'package:on_field_work/helpers/widgets/my_snackbar.dart';
+import 'package:marco/helpers/widgets/my_snackbar.dart';
-import 'package:on_field_work/model/employees/employee_model.dart';
+import 'package:marco/model/employees/employee_model.dart';
-import 'package:on_field_work/model/finance/payment_request_details_model.dart';
+import 'package:marco/model/finance/payment_request_details_model.dart';
-import 'package:on_field_work/model/expense/payment_types_model.dart';
+import 'package:marco/model/expense/payment_types_model.dart';
-import 'package:on_field_work/helpers/widgets/time_stamp_image_helper.dart';
+import 'package:marco/helpers/widgets/time_stamp_image_helper.dart';
 import 'package:image_picker/image_picker.dart';
 import 'dart:convert';
 import 'dart:io';
@@ -13,7 +13,6 @@ import 'package:file_picker/file_picker.dart';
 import 'package:geocoding/geocoding.dart';
 import 'package:geolocator/geolocator.dart';
 import 'package:mime/mime.dart';
-import 'package:on_field_work/controller/finance/payment_request_controller.dart';
 
 class PaymentRequestDetailController extends GetxController {
   final Rx<PaymentRequestData?> paymentRequest = Rx<PaymentRequestData?>(null);
@@ -27,8 +26,6 @@ class PaymentRequestDetailController extends GetxController {
   final RxList<EmployeeModel> employeeSearchResults = <EmployeeModel>[].obs;
   final TextEditingController employeeSearchController =
       TextEditingController();
-  PaymentRequestController get paymentRequestController =>
-      Get.find<PaymentRequestController>();
   final RxBool isSearchingEmployees = false.obs;
 
   // Attachments
@@ -281,7 +278,6 @@ class PaymentRequestDetailController extends GetxController {
     String? tdsPercentage,
   }) async {
     isLoading.value = true;
-
     try {
       final success = await ApiService.updateExpensePaymentRequestStatusApi(
         paymentRequestId: _requestId,
@@ -296,14 +292,24 @@ class PaymentRequestDetailController extends GetxController {
       );
 
       if (success) {
-        // Controller refreshes the data but does not show snackbars.
+        showAppSnackbar(
+            title: 'Success',
+            message: 'Payment submitted successfully',
+            type: SnackbarType.success);
         await fetchPaymentRequestDetail();
-        paymentRequestController.fetchPaymentRequests();
+      } else {
+        showAppSnackbar(
+            title: 'Error',
+            message: 'Failed to update status. Please try again.',
+            type: SnackbarType.error);
       }
 
       return success;
     } catch (e) {
-      // Controller returns false on error; UI will show the snackbar.
+      showAppSnackbar(
+          title: 'Error',
+          message: 'Something went wrong: $e',
+          type: SnackbarType.error);
       return false;
     } finally {
       isLoading.value = false;

lib/controller/infra_project/infra_project_screen_controller.dart

@@ -1,48 +0,0 @@
-import 'package:get/get.dart';
-import 'package:on_field_work/helpers/services/api_service.dart';
-import 'package:on_field_work/model/infra_project/infra_project_list.dart';
-
-class InfraProjectController extends GetxController {
-  final projects = <ProjectData>[].obs;
-  final isLoading = false.obs;
-  final searchQuery = ''.obs;
-
-  // Filtered list
-  List<ProjectData> get filteredProjects {
-    final q = searchQuery.value.trim().toLowerCase();
-    if (q.isEmpty) return projects;
-
-    return projects.where((p) {
-      return (p.name?.toLowerCase().contains(q) ?? false) ||
-          (p.shortName?.toLowerCase().contains(q) ?? false) ||
-          (p.projectAddress?.toLowerCase().contains(q) ?? false) ||
-          (p.contactPerson?.toLowerCase().contains(q) ?? false);
-    }).toList();
-  }
-
-  // Fetch Projects
-  Future<void> fetchProjects({int pageNumber = 1, int pageSize = 20}) async {
-    try {
-      isLoading.value = true;
-
-      final response = await ApiService.getInfraProjectsList(
-        pageNumber: pageNumber,
-        pageSize: pageSize,
-      );
-
-      if (response != null && response.data != null) {
-        projects.assignAll(response.data!.data ?? []);
-      } else {
-        projects.clear();
-      }
-    } catch (e) {
-      rethrow;
-    } finally {
-      isLoading.value = false;
-    }
-  }
-
-  void updateSearch(String query) {
-    searchQuery.value = query;
-  }
-}

lib/controller/infra_project/infra_project_screen_details_controller.dart

@@ -1,38 +0,0 @@
-import 'package:get/get.dart';
-import 'package:on_field_work/helpers/services/api_service.dart'; 
-import 'package:on_field_work/model/infra_project/infra_project_details.dart';
-
-class InfraProjectDetailsController extends GetxController {
-  final String projectId;
-
-  InfraProjectDetailsController({required this.projectId});
-
-  var isLoading = true.obs;
-  var projectDetails = Rxn<ProjectData>();
-  var errorMessage = ''.obs;
-
-  @override
-  void onInit() {
-    super.onInit();
-    fetchProjectDetails();
-  }
-
-  Future<void> fetchProjectDetails() async {
-    try {
-      isLoading.value = true;
-      final response = await ApiService.getInfraProjectDetails(projectId: projectId);
-
-      if (response != null && response.success == true && response.data != null) {
-        projectDetails.value = response.data;
-        isLoading.value = false;
-
-      } else {
-        errorMessage.value = response?.message ?? "Failed to load project details";
-      }
-    } catch (e) {
-      errorMessage.value = "Error fetching project details: $e";
-    } finally {
-      isLoading.value = false;
-    }
-  }
-}

lib/controller/layout/auth_layout_2_controller.dart

@@ -1,3 +1,3 @@
-import 'package:on_field_work/controller/my_controller.dart';
+import 'package:marco/controller/my_controller.dart';
 
 class AuthLayout2Controller extends MyController {}

lib/controller/layout/auth_layout_controller.dart

@@ -1,7 +1,7 @@
 import 'dart:async';
 
-import 'package:on_field_work/controller/my_controller.dart';
+import 'package:marco/controller/my_controller.dart';
-import 'package:on_field_work/helpers/widgets/my_text_utils.dart';
+import 'package:marco/helpers/widgets/my_text_utils.dart';
 import 'package:flutter/material.dart';
 
 class AuthLayoutController extends MyController {

lib/controller/layout/layout_controller.dart

@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'package:on_field_work/helpers/services/app_logger.dart';
+import 'package:marco/helpers/services/app_logger.dart';
-import 'package:on_field_work/helpers/services/api_service.dart';
+import 'package:marco/helpers/services/api_service.dart';
-import 'package:on_field_work/helpers/theme/theme_customizer.dart';
+import 'package:marco/helpers/theme/theme_customizer.dart';
-import 'package:on_field_work/model/project_model.dart';
+import 'package:marco/model/project_model.dart';
 
 class LayoutController extends GetxController {
   // Theme Customization
@@ -55,7 +55,7 @@ class LayoutController extends GetxController {
     isLoadingProjects.value = true;
 
     try {
-      final response = await ApiService.getGlobalProjects();
+      final response = await ApiService.getProjects();
 
       if (response != null && response.isNotEmpty) {
         final fetchedProjects = response.map((json) => ProjectModel.fromJson(json)).toList();

lib/controller/my_controller.dart

@@ -1,5 +1,5 @@
 import 'package:get/get_state_manager/get_state_manager.dart';
-import 'package:on_field_work/helpers/theme/theme_customizer.dart';
+import 'package:marco/helpers/theme/theme_customizer.dart';
 
 abstract class MyController extends GetxController {
   @override

lib/controller/permission_controller.dart

@@ -2,11 +2,11 @@ import 'dart:async';
 import 'dart:convert';
 import 'package:get/get.dart';
 import 'package:shared_preferences/shared_preferences.dart';
-import 'package:on_field_work/helpers/services/app_logger.dart';
+import 'package:marco/helpers/services/app_logger.dart';
-import 'package:on_field_work/helpers/services/permission_service.dart';
+import 'package:marco/helpers/services/permission_service.dart';
-import 'package:on_field_work/model/user_permission.dart';
+import 'package:marco/model/user_permission.dart';
-import 'package:on_field_work/model/employees/employee_info.dart';
+import 'package:marco/model/employees/employee_info.dart';
-import 'package:on_field_work/model/projects_model.dart';
+import 'package:marco/model/projects_model.dart';
 
 class PermissionController extends GetxController {
   var permissions = <UserPermission>[].obs;
@@ -15,9 +15,6 @@ class PermissionController extends GetxController {
   Timer? _refreshTimer;
   var isLoading = true.obs;
 
-  /// ← NEW: reactive flag to signal permissions are loaded
-  var permissionsLoaded = false.obs;
-
   @override
   void onInit() {
     super.onInit();
@@ -55,10 +52,6 @@ class PermissionController extends GetxController {
       _updateState(userData);
       await _storeData();
       logSafe("Data loaded and state updated successfully.");
-
-      // ← NEW: mark permissions as loaded
-      permissionsLoaded.value = true;
-
     } catch (e, stacktrace) {
       logSafe("Error loading data from API",
           level: LogLevel.error, error: e, stackTrace: stacktrace);
@@ -110,7 +103,7 @@ class PermissionController extends GetxController {
   }
 
   void _startAutoRefresh() {
-    _refreshTimer = Timer.periodic(const Duration(minutes: 30), (timer) async {
+    _refreshTimer = Timer.periodic(Duration(minutes: 30), (timer) async {
       logSafe("Auto-refresh triggered.");
       final token = await _getAuthToken();
       if (token?.isNotEmpty ?? false) {
@@ -124,6 +117,8 @@ class PermissionController extends GetxController {
 
   bool hasPermission(String permissionId) {
     final hasPerm = permissions.any((p) => p.id == permissionId);
+    // logSafe("Checking permission $permissionId: $hasPerm",
+    //     level: LogLevel.debug);
     return hasPerm;
   }
 

lib/controller/project_controller.dart

@@ -1,8 +1,8 @@
 import 'package:get/get.dart';
-import 'package:on_field_work/helpers/services/app_logger.dart'; 
+import 'package:marco/helpers/services/app_logger.dart'; 
-import 'package:on_field_work/helpers/services/api_service.dart';
+import 'package:marco/helpers/services/api_service.dart';
-import 'package:on_field_work/model/global_project_model.dart';
+import 'package:marco/model/global_project_model.dart';
-import 'package:on_field_work/helpers/services/storage/local_storage.dart';
+import 'package:marco/helpers/services/storage/local_storage.dart';
 
 class ProjectController extends GetxController {
   RxList<GlobalProjectModel> projects = <GlobalProjectModel>[].obs;

lib/controller/service_project/add_service_project_job_controller.dart

@@ -1,110 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:get/get.dart';
-import 'package:on_field_work/helpers/services/api_service.dart';
-import 'package:on_field_work/helpers/widgets/my_snackbar.dart';
-import 'package:on_field_work/controller/service_project/service_project_details_screen_controller.dart';
-import 'package:on_field_work/model/employees/employee_model.dart';
-import 'package:on_field_work/model/service_project/service_project_branches_model.dart';
-
-class AddServiceProjectJobController extends GetxController {
-  // FORM CONTROLLERS
-  final titleCtrl = TextEditingController();
-  final descCtrl = TextEditingController();
-  final tagCtrl = TextEditingController();
-  final searchFocusNode = FocusNode();
-
-  // OBSERVABLES
-  final startDate = Rx<DateTime?>(DateTime.now());
-  final dueDate = Rx<DateTime?>(DateTime.now().add(const Duration(days: 1)));
-
-  final enteredTags = <String>[].obs;
-  final selectedAssignees = <EmployeeModel>[].obs;
-
-  // Branches
-  final branches = <Branch>[].obs;
-  final selectedBranch = Rxn<Branch>();
-  final isBranchLoading = false.obs;
-
-  // Loading
-  final isLoading = false.obs;
-
-  @override
-  void onClose() {
-    titleCtrl.dispose();
-    descCtrl.dispose();
-    tagCtrl.dispose();
-    searchFocusNode.dispose();
-    super.onClose();
-  }
-
-  // FETCH BRANCHES
-  Future<void> fetchBranches(String projectId) async {
-    isBranchLoading.value = true;
-
-    final response = await ApiService.getServiceProjectBranchesFull(
-      projectId: projectId,
-    );
-
-    if (response != null && response.success) {
-      branches.assignAll(response.data?.data ?? []);
-    }
-
-    isBranchLoading.value = false;
-  }
-
-  // CREATE JOB
-  Future<void> createJob(String projectId) async {
-    if (titleCtrl.text.trim().isEmpty || descCtrl.text.trim().isEmpty) {
-      showAppSnackbar(
-        title: "Validation",
-        message: "Title and Description are required",
-        type: SnackbarType.warning,
-      );
-      return;
-    }
-
-    isLoading.value = true;
-
-    final jobId = await ApiService.createServiceProjectJobApi(
-      title: titleCtrl.text.trim(),
-      description: descCtrl.text.trim(),
-      projectId: projectId,
-      branchId: selectedBranch.value?.id,
-      assignees: selectedAssignees // payload mapping
-          .map((e) => {"employeeId": e.id, "isActive": true})
-          .toList(),
-      startDate: startDate.value!,
-      dueDate: dueDate.value!,
-      tags: enteredTags
-          .map((tag) => {"id": null, "name": tag, "isActive": true})
-          .toList(),
-    );
-
-    isLoading.value = false;
-
-    if (jobId != null) {
-      if (Get.isRegistered<ServiceProjectDetailsController>()) {
-        final detailsCtrl = Get.find<ServiceProjectDetailsController>();
-
-        // 🔥 1. Refresh job LIST
-        detailsCtrl.refreshJobsAfterAdd();
-
-        // 🔥 2. Refresh job DETAILS (FULL DATA - including tags and assignees)
-        await detailsCtrl.fetchJobDetail(jobId);
-      }
-
-      Get.back();
-      showAppSnackbar(
-        title: "Success",
-        message: "Job created successfully",
-        type: SnackbarType.success,
-      );
-    } else {
-      showAppSnackbar(
-        title: "Error",
-        message: "Failed to create job",
-        type: SnackbarType.error,
-      );
-    }
-  }
-}

lib/controller/service_project/service_project_allocation_controller.dart

@@ -1,80 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:get/get.dart';
-import 'package:on_field_work/model/service_project/job_allocation_model.dart';
-import 'package:on_field_work/helpers/services/api_service.dart';
-
-class ServiceProjectAllocationController extends GetxController {
-  final projectId = ''.obs;
-
-  // Roles
-  var roles = <TeamRole>[].obs;      
-  var selectedRole = Rxn<TeamRole>();
-
-  // Employees
-  var roleEmployees = <Employee>[].obs; 
-  var selectedEmployees = <Employee>[].obs;
-  final displayController = TextEditingController();
-
-  // Loading
-  var isLoading = false.obs;
-
-  @override
-  void onInit() {
-    super.onInit();
-    ever(selectedEmployees, (_) {
-      displayController.text = selectedEmployees.isEmpty
-          ? ''
-          : selectedEmployees
-              .map((e) => '${e.firstName} ${e.lastName}')
-              .join(', ');
-    });
-  }
-
-  // Fetch all roles
-  Future<void> fetchRoles() async {
-    isLoading.value = true;
-    final result = await ApiService.getTeamRoles(); 
-    if (result != null) {
-      roles.assignAll(result);
-    }
-    isLoading.value = false;
-  }
-
-  // Fetch employees by role
-  Future<void> fetchEmployeesByRole(String roleId) async {
-    isLoading.value = true;
-    final allocations = await ApiService.getServiceProjectAllocationList(
-        projectId: projectId.value);
-
-    if (allocations != null) {
-      roleEmployees.assignAll(
-        allocations
-            .where((a) => a.teamRole.id == roleId)
-            .map((a) => a.employee)
-            .toList(),
-      );
-    }
-    isLoading.value = false;
-  }
-
-  void toggleEmployee(Employee emp) {
-    if (selectedEmployees.contains(emp)) {
-      selectedEmployees.remove(emp);
-    } else {
-      selectedEmployees.add(emp);
-    }
-  }
-
-  Future<bool> submitAllocation() async {
-    final payload = selectedEmployees
-        .map((e) => {
-              "projectId": projectId.value,
-              "employeeId": e.id,
-              "teamRoleId": selectedRole.value?.id,
-              "isActive": true,
-            })
-        .toList();
-
-    return await ApiService.manageServiceProjectAllocation(payload: payload);
-  }
-}

lib/controller/service_project/service_project_details_screen_controller.dart

@@ -1,479 +0,0 @@
-import 'package:get/get.dart';
-import 'package:on_field_work/helpers/services/api_service.dart';
-import 'package:on_field_work/model/service_project/service_projects_details_model.dart';
-import 'package:on_field_work/model/service_project/job_list_model.dart';
-import 'package:on_field_work/model/service_project/service_project_job_detail_model.dart';
-import 'package:geolocator/geolocator.dart';
-import 'package:on_field_work/model/service_project/job_attendance_logs_model.dart';
-import 'package:on_field_work/model/service_project/job_allocation_model.dart';
-import 'package:on_field_work/model/service_project/job_status_response.dart';
-import 'package:on_field_work/model/service_project/job_comments.dart';
-import 'dart:convert';
-import 'dart:io';
-import 'package:mime/mime.dart';
-import 'package:image_picker/image_picker.dart';
-
-class ServiceProjectDetailsController extends GetxController {
-  // -------------------- Observables --------------------
-  var projectId = ''.obs;
-  var projectDetail = Rxn<ProjectDetail>();
-  var jobList = <JobEntity>[].obs;
-  var jobDetail = Rxn<JobDetailsResponse>();
-  var showArchivedJobs = false.obs; // true = archived, false = active
-
-  // Loading states
-  var isLoading = false.obs;
-  var isJobLoading = false.obs;
-  var isJobDetailLoading = false.obs;
-
-  // Error messages
-  var errorMessage = ''.obs;
-  var jobErrorMessage = ''.obs;
-  var jobDetailErrorMessage = ''.obs;
-  final ImagePicker picker = ImagePicker();
-  var isProcessingAttachment = false.obs; 
-
-  // Pagination
-  var pageNumber = 1;
-  final int pageSize = 20;
-  var hasMoreJobs = true.obs;
-
-  var isTagging = false.obs;
-  var attendanceMessage = ''.obs;
-  var attendanceLog = Rxn<JobAttendanceResponse>();
-  var teamList = <ServiceProjectAllocation>[].obs;
-  var isTeamLoading = false.obs;
-  var teamErrorMessage = ''.obs;
-  var filteredJobList = <JobEntity>[].obs;
-// -------------------- Job Status --------------------
-// With this:
-  var jobStatusList = <JobStatus>[].obs;
-  var selectedJobStatus = Rx<JobStatus?>(null);
-  var isJobStatusLoading = false.obs;
-  var jobStatusErrorMessage = ''.obs;
-// -------------------- Job Comments --------------------
-  var jobComments = <CommentItem>[].obs;
-  var isCommentsLoading = false.obs;
-  var commentsErrorMessage = ''.obs;
-  // -------------------- Lifecycle --------------------
-  @override
-  void onInit() {
-    super.onInit();
-    fetchProjectJobs();
-    filteredJobList.value = jobList;
-  }
-
-  // -------------------- Project --------------------
-  void setProjectId(String id) {
-    if (projectId.value == id) return;
-    projectId.value = id;
-
-    // Reset pagination and list
-    pageNumber = 1;
-    hasMoreJobs.value = true;
-    jobList.clear();
-    filteredJobList.clear();
-
-    // Fetch project detail
-    fetchProjectDetail();
-
-    // Always fetch jobs for this project
-    fetchProjectJobs(refresh: true);
-  }
-
-  void updateJobSearch(String searchText) {
-    if (searchText.isEmpty) {
-      filteredJobList.value = jobList;
-    } else {
-      filteredJobList.value = jobList.where((job) {
-        final lowerSearch = searchText.toLowerCase();
-        return job.title.toLowerCase().contains(lowerSearch) ||
-            (job.description.toLowerCase().contains(lowerSearch)) ||
-            (job.tags?.any(
-                    (tag) => tag.name.toLowerCase().contains(lowerSearch)) ??
-                false);
-      }).toList();
-    }
-  }
-
-  Future<void> fetchProjectTeams() async {
-    if (projectId.value.isEmpty) {
-      teamErrorMessage.value = "Invalid project ID";
-      return;
-    }
-
-    isTeamLoading.value = true;
-    teamErrorMessage.value = '';
-
-    try {
-      final result = await ApiService.getServiceProjectAllocationList(
-        projectId: projectId.value,
-        isActive: true,
-      );
-
-      if (result != null) {
-        teamList.value = result;
-      } else {
-        teamErrorMessage.value = "No teams found";
-      }
-    } catch (e) {
-      teamErrorMessage.value = "Error fetching teams: $e";
-    } finally {
-      isTeamLoading.value = false;
-    }
-  }
-
-  Future<void> fetchJobStatus({required String statusId}) async {
-    if (projectId.value.isEmpty) {
-      jobStatusErrorMessage.value = "Invalid project ID";
-      return;
-    }
-
-    isJobStatusLoading.value = true;
-    jobStatusErrorMessage.value = '';
-
-    try {
-      final statuses = await ApiService.getMasterJobStatus(
-        projectId: projectId.value,
-        statusId: statusId,
-      );
-
-      if (statuses != null && statuses.isNotEmpty) {
-        jobStatusList.value = statuses;
-
-        // Keep previously selected if exists, else pick first
-        selectedJobStatus.value = statuses.firstWhere(
-          (status) => status.id == selectedJobStatus.value?.id,
-          orElse: () => statuses.first,
-        );
-
-        print("Job Status List: ${jobStatusList.map((e) => e.name).toList()}");
-      } else {
-        jobStatusErrorMessage.value = "No job statuses found";
-      }
-    } catch (e) {
-      jobStatusErrorMessage.value = "Error fetching job status: $e";
-    } finally {
-      isJobStatusLoading.value = false;
-    }
-  }
-
-  Future<void> fetchProjectDetail() async {
-    if (projectId.value.isEmpty) {
-      errorMessage.value = "Invalid project ID";
-      return;
-    }
-
-    isLoading.value = true;
-    errorMessage.value = '';
-
-    try {
-      final result =
-          await ApiService.getServiceProjectDetailApi(projectId.value);
-
-      if (result != null && result.data != null) {
-        projectDetail.value = result.data!;
-      } else {
-        errorMessage.value =
-            result?.message ?? "Failed to fetch project details";
-      }
-    } catch (e) {
-      errorMessage.value = "Error: $e";
-    } finally {
-      isLoading.value = false;
-    }
-  }
-
-  Future<void> fetchJobAttendanceLog(String attendanceId) async {
-    if (attendanceId.isEmpty) {
-      attendanceMessage.value = "Invalid attendance ID";
-      return;
-    }
-
-    isJobDetailLoading.value = true;
-    attendanceMessage.value = '';
-
-    try {
-      final result =
-          await ApiService.getJobAttendanceLog(attendanceId: attendanceId);
-
-      if (result != null) {
-        attendanceLog.value = result;
-      } else {
-        attendanceMessage.value = "Attendance log not found or empty";
-      }
-    } catch (e) {
-      attendanceMessage.value = "Error fetching attendance log: $e";
-    } finally {
-      isJobDetailLoading.value = false;
-    }
-  }
-
-  // -------------------- Job List (modified to always load) --------------------
-  Future<void> fetchProjectJobs({bool refresh = false}) async {
-    if (projectId.value.isEmpty) return;
-
-    if (refresh) pageNumber = 1;
-    if (!hasMoreJobs.value && !refresh) return;
-
-    isJobLoading.value = true;
-    jobErrorMessage.value = '';
-
-    try {
-      final result = await ApiService.getServiceProjectJobListApi(
-        projectId: projectId.value,
-        pageNumber: pageNumber,
-        pageSize: pageSize,
-        isActive: true,
-        isArchive: showArchivedJobs.value,
-      );
-
-      if (result != null && result.data != null) {
-        final newJobs = result.data?.data ?? [];
-
-        if (refresh || pageNumber == 1) {
-          jobList.value = newJobs;
-        } else {
-          jobList.addAll(newJobs);
-        }
-
-        filteredJobList.value = jobList;
-
-        hasMoreJobs.value = newJobs.length == pageSize;
-        if (hasMoreJobs.value) pageNumber++;
-      } else {
-        jobErrorMessage.value = result?.message ?? "Failed to fetch jobs";
-      }
-    } catch (e) {
-      jobErrorMessage.value = "Error fetching jobs: $e";
-    } finally {
-      isJobLoading.value = false;
-    }
-  }
-
-  Future<void> fetchMoreJobs() async => fetchProjectJobs();
-
-  // -------------------- Manual Refresh --------------------
-  Future<void> refresh() async {
-    pageNumber = 1;
-    hasMoreJobs.value = true;
-
-    await Future.wait([
-      fetchProjectDetail(),
-      fetchProjectJobs(),
-    ]);
-  }
-
-  // -------------------- Job Detail --------------------
-  Future<void> fetchJobDetail(String jobId) async {
-    if (jobId.isEmpty) {
-      jobDetailErrorMessage.value = "Invalid job ID";
-      return;
-    }
-
-    isJobDetailLoading.value = true;
-    jobDetailErrorMessage.value = '';
-
-    try {
-      final result = await ApiService.getServiceProjectJobDetailApi(jobId);
-      if (result != null) {
-        jobDetail.value = result;
-      } else {
-        jobDetailErrorMessage.value = "Failed to fetch job details";
-      }
-    } catch (e) {
-      jobDetailErrorMessage.value = "Error fetching job details: $e";
-    } finally {
-      isJobDetailLoading.value = false;
-    }
-  }
-
-  Future<Position?> _getCurrentLocation() async {
-    try {
-      bool serviceEnabled = await Geolocator.isLocationServiceEnabled();
-      if (!serviceEnabled) {
-        attendanceMessage.value = "Location services are disabled.";
-        return null;
-      }
-
-      LocationPermission permission = await Geolocator.checkPermission();
-      if (permission == LocationPermission.denied) {
-        permission = await Geolocator.requestPermission();
-        if (permission == LocationPermission.denied) {
-          attendanceMessage.value = "Location permission denied";
-          return null;
-        }
-      }
-
-      if (permission == LocationPermission.deniedForever) {
-        attendanceMessage.value =
-            "Location permission permanently denied. Enable it from settings.";
-        return null;
-      }
-
-      return await Geolocator.getCurrentPosition(
-          desiredAccuracy: LocationAccuracy.high);
-    } catch (e) {
-      attendanceMessage.value = "Failed to get location: $e";
-      return null;
-    }
-  }
-
-  Future<void> fetchJobComments({bool refresh = false}) async {
-    if (jobDetail.value?.data?.id == null) {
-      commentsErrorMessage.value = "Invalid job ID";
-      return;
-    }
-
-    if (refresh) pageNumber = 1;
-
-    isCommentsLoading.value = true;
-    commentsErrorMessage.value = '';
-
-    try {
-      final response = await ApiService.getJobCommentList(
-        jobTicketId: jobDetail.value!.data!.id!,
-        pageNumber: pageNumber,
-        pageSize: pageSize,
-      );
-
-      if (response != null && response.data != null) {
-        final newComments = response.data?.data ?? [];
-
-        if (refresh || pageNumber == 1) {
-          jobComments.value = newComments;
-        } else {
-          jobComments.addAll(newComments);
-        }
-
-        hasMoreJobs.value =
-            (response.data?.totalEntities ?? 0) > (pageNumber * pageSize);
-        if (hasMoreJobs.value) pageNumber++;
-      } else {
-        commentsErrorMessage.value =
-            response?.message ?? "Failed to fetch comments";
-      }
-    } catch (e) {
-      commentsErrorMessage.value = "Error fetching comments: $e";
-    } finally {
-      isCommentsLoading.value = false;
-    }
-  }
-
-  Future<bool> addJobComment({
-    required String jobId,
-    required String comment,
-    List<File>? files,
-  }) async {
-    try {
-      List<Map<String, dynamic>> attachments = [];
-
-      if (files != null && files.isNotEmpty) {
-        for (final file in files) {
-          final bytes = await file.readAsBytes();
-          final base64Data = base64Encode(bytes);
-          final mimeType =
-              lookupMimeType(file.path) ?? "application/octet-stream";
-
-          attachments.add({
-            "fileName": file.path.split('/').last,
-            "base64Data": base64Data,
-            "contentType": mimeType,
-            "fileSize": bytes.length,
-            "description": "",
-            "isActive": true,
-          });
-        }
-      }
-
-      final success = await ApiService.addJobComment(
-        jobTicketId: jobId,
-        comment: comment,
-        attachments: attachments,
-      );
-
-      if (success) {
-        await fetchJobDetail(jobId);
-        refresh();
-      }
-
-      return success;
-    } catch (e) {
-      print("Error adding comment: $e");
-      return false;
-    }
-  }
-
-  /// Tag In / Tag Out for a job with proper payload
-  Future<void> updateJobAttendance({
-    required String jobId,
-    required int action,
-    String comment = "Updated via app",
-    File? attachment,
-  }) async {
-    if (jobId.isEmpty) return;
-
-    isTagging.value = true;
-    attendanceMessage.value = '';
-
-    try {
-      final position = await _getCurrentLocation();
-      if (position == null) {
-        isTagging.value = false;
-        return;
-      }
-
-      Map<String, dynamic>? attachmentPayload;
-
-      if (attachment != null) {
-        final bytes = await attachment.readAsBytes();
-        final base64Data = base64Encode(bytes);
-        final mimeType =
-            lookupMimeType(attachment.path) ?? 'application/octet-stream';
-        attachmentPayload = {
-          "documentId": jobId,
-          "fileName": attachment.path.split('/').last,
-          "base64Data": base64Data,
-          "contentType": mimeType,
-          "fileSize": bytes.length,
-          "description": "Attached via app",
-          "isActive": true,
-        };
-      }
-
-      final payload = {
-        "jobTcketId": jobId,
-        "action": action,
-        "latitude": position.latitude.toString(),
-        "longitude": position.longitude.toString(),
-        "comment": comment,
-        "attachment": attachmentPayload,
-      };
-
-      final success = await ApiService.updateServiceProjectJobAttendance(
-        payload: payload,
-      );
-
-      if (success) {
-        attendanceMessage.value =
-            action == 0 ? "Tagged In successfully" : "Tagged Out successfully";
-        await fetchJobDetail(jobId);
-      } else {
-        attendanceMessage.value = "Failed to update attendance";
-      }
-    } catch (e) {
-      attendanceMessage.value = "Error updating attendance: $e";
-    } finally {
-      isTagging.value = false;
-    }
-  }
-
-  // ------------------------------------------------------------
-  // 🔥 AUTO REFRESH JOB LIST AFTER ADDING A JOB
-  // ------------------------------------------------------------
-  Future<void> refreshJobsAfterAdd() async {
-    pageNumber = 1;
-    hasMoreJobs.value = true;
-    await fetchProjectJobs();
-  }
-}

lib/controller/service_project/service_project_screen_controller.dart

@@ -1,59 +0,0 @@
-import 'package:get/get.dart';
-import 'package:on_field_work/helpers/services/api_service.dart';
-import 'package:on_field_work/model/service_project/service_projects_list_model.dart';
-
-class ServiceProjectController extends GetxController {
-  final projects = <ProjectItem>[].obs;
-  final isLoading = false.obs;
-  final searchQuery = ''.obs;
-
-  /// Computed filtered project list
-  List<ProjectItem> get filteredProjects {
-    final query = searchQuery.value.trim().toLowerCase();
-    if (query.isEmpty) return projects;
-
-    return projects.where((p) {
-      final nameMatch = p.name.toLowerCase().contains(query);
-      final shortNameMatch = p.shortName.toLowerCase().contains(query);
-      final addressMatch = p.address.toLowerCase().contains(query);
-      final contactMatch = p.contactName.toLowerCase().contains(query);
-      final clientMatch = p.client != null &&
-          (p.client!.name.toLowerCase().contains(query) ||
-              p.client!.contactPerson.toLowerCase().contains(query));
-
-      return nameMatch ||
-          shortNameMatch ||
-          addressMatch ||
-          contactMatch ||
-          clientMatch;
-    }).toList();
-  }
-
-  /// Fetch projects from API
-  Future<void> fetchProjects({int pageNumber = 1, int pageSize = 20}) async {
-    try {
-      isLoading.value = true;
-
-      final result = await ApiService.getServiceProjectsListApi(
-        pageNumber: pageNumber,
-        pageSize: pageSize,
-      );
-
-      if (result != null && result.data != null) {
-        projects.assignAll(result.data!.data);
-      } else {
-        projects.clear();
-      }
-    } catch (e) {
-      // Optional: log or show error
-      rethrow;
-    } finally {
-      isLoading.value = false;
-    }
-  }
-
-  /// Update search
-  void updateSearch(String query) {
-    searchQuery.value = query;
-  }
-}

lib/controller/task_planning/add_task_controller.dart

@@ -1,9 +1,9 @@
 import 'package:get/get.dart';
-import 'package:on_field_work/helpers/services/app_logger.dart';
+import 'package:marco/helpers/services/app_logger.dart';
-import 'package:on_field_work/helpers/services/api_service.dart';
+import 'package:marco/helpers/services/api_service.dart';
-import 'package:on_field_work/helpers/widgets/my_form_validator.dart';
+import 'package:marco/helpers/widgets/my_form_validator.dart';
-import 'package:on_field_work/helpers/widgets/my_snackbar.dart';
+import 'package:marco/helpers/widgets/my_snackbar.dart';
-import 'package:on_field_work/model/dailyTaskPlanning/master_work_category_model.dart';
+import 'package:marco/model/dailyTaskPlanning/master_work_category_model.dart';
 
 class AddTaskController extends GetxController {
   RxMap<String, RxBool> uploadingStates = <String, RxBool>{}.obs;

lib/controller/task_planning/daily_task_controller.dart

@@ -1,10 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'package:on_field_work/helpers/services/app_logger.dart';
+import 'package:marco/helpers/services/app_logger.dart';
-import 'package:on_field_work/helpers/services/api_service.dart';
+import 'package:marco/helpers/services/api_service.dart';
-import 'package:on_field_work/model/project_model.dart';
+import 'package:marco/model/project_model.dart';
-import 'package:on_field_work/model/dailyTaskPlanning/daily_task_model.dart';
+import 'package:marco/model/dailyTaskPlanning/daily_task_model.dart';
-import 'package:on_field_work/model/dailyTaskPlanning/daily_progress_report_filter_response_model.dart';
+import 'package:marco/model/dailyTaskPlanning/daily_progress_report_filter_response_model.dart';
 
 class DailyTaskController extends GetxController {
   List<ProjectModel> projects = [];

lib/controller/task_planning/daily_task_planning_controller.dart

@@ -1,11 +1,11 @@
 import 'package:get/get.dart';
-import 'package:on_field_work/helpers/services/app_logger.dart';
+import 'package:marco/helpers/services/app_logger.dart';
-import 'package:on_field_work/helpers/services/api_service.dart';
+import 'package:marco/helpers/services/api_service.dart';
-import 'package:on_field_work/helpers/widgets/my_form_validator.dart';
+import 'package:marco/helpers/widgets/my_form_validator.dart';
-import 'package:on_field_work/helpers/widgets/my_snackbar.dart';
+import 'package:marco/helpers/widgets/my_snackbar.dart';
-import 'package:on_field_work/model/project_model.dart';
+import 'package:marco/model/project_model.dart';
-import 'package:on_field_work/model/dailyTaskPlanning/daily_task_planning_model.dart';
+import 'package:marco/model/dailyTaskPlanning/daily_task_planning_model.dart';
-import 'package:on_field_work/model/employees/employee_model.dart';
+import 'package:marco/model/employees/employee_model.dart';
 
 class DailyTaskPlanningController extends GetxController {
   List<ProjectModel> projects = [];

lib/controller/task_planning/report_task_action_controller.dart

@@ -4,16 +4,16 @@ import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:image_picker/image_picker.dart';
-import 'package:on_field_work/helpers/services/app_logger.dart';
+import 'package:marco/helpers/services/app_logger.dart';
 
-import 'package:on_field_work/controller/my_controller.dart';
+import 'package:marco/controller/my_controller.dart';
-import 'package:on_field_work/controller/task_Planning/daily_task_Planning_controller.dart';
+import 'package:marco/controller/task_Planning/daily_task_Planning_controller.dart';
-import 'package:on_field_work/helpers/services/api_service.dart';
+import 'package:marco/helpers/services/api_service.dart';
-import 'package:on_field_work/helpers/widgets/my_form_validator.dart';
+import 'package:marco/helpers/widgets/my_form_validator.dart';
-import 'package:on_field_work/helpers/widgets/my_image_compressor.dart';
+import 'package:marco/helpers/widgets/my_image_compressor.dart';
-import 'package:on_field_work/helpers/widgets/my_snackbar.dart';
+import 'package:marco/helpers/widgets/my_snackbar.dart';
-import 'package:on_field_work/model/dailyTaskPlanning/work_status_model.dart';
+import 'package:marco/model/dailyTaskPlanning/work_status_model.dart';
-import 'package:on_field_work/helpers/widgets/time_stamp_image_helper.dart';
+import 'package:marco/helpers/widgets/time_stamp_image_helper.dart';
 
 enum ApiStatus { idle, loading, success, failure }
 

lib/controller/task_planning/report_task_controller.dart

@@ -1,17 +1,17 @@
 import 'package:file_picker/file_picker.dart';
 import 'package:flutter/material.dart';
-import 'package:on_field_work/controller/my_controller.dart';
+import 'package:marco/controller/my_controller.dart';
-import 'package:on_field_work/helpers/widgets/my_form_validator.dart';
+import 'package:marco/helpers/widgets/my_form_validator.dart';
-import 'package:on_field_work/helpers/services/api_service.dart';
+import 'package:marco/helpers/services/api_service.dart';
 import 'package:get/get.dart';
-import 'package:on_field_work/helpers/services/app_logger.dart';
+import 'package:marco/helpers/services/app_logger.dart';
-import 'package:on_field_work/helpers/widgets/my_snackbar.dart';
+import 'package:marco/helpers/widgets/my_snackbar.dart';
-import 'package:on_field_work/controller/task_Planning/daily_task_Planning_controller.dart';
+import 'package:marco/controller/task_Planning/daily_task_Planning_controller.dart';
 import 'package:image_picker/image_picker.dart';
 import 'dart:io';
 import 'dart:convert';
-import 'package:on_field_work/helpers/widgets/my_image_compressor.dart';
+import 'package:marco/helpers/widgets/my_image_compressor.dart';
-import 'package:on_field_work/helpers/widgets/time_stamp_image_helper.dart';
+import 'package:marco/helpers/widgets/time_stamp_image_helper.dart';
 
 enum ApiStatus { idle, loading, success, failure }
 

lib/controller/tenant/all_organization_controller.dart

@@ -1,7 +1,7 @@
 import 'package:get/get.dart';
-import 'package:on_field_work/helpers/services/app_logger.dart';
+import 'package:marco/helpers/services/app_logger.dart';
-import 'package:on_field_work/helpers/services/api_service.dart';
+import 'package:marco/helpers/services/api_service.dart';
-import 'package:on_field_work/model/all_organization_model.dart';
+import 'package:marco/model/all_organization_model.dart';
 
 class AllOrganizationController extends GetxController {
   RxList<AllOrganization> organizations = <AllOrganization>[].obs;

lib/controller/tenant/organization_selection_controller.dart

@@ -1,7 +1,7 @@
 import 'package:get/get.dart';
-import 'package:on_field_work/helpers/services/app_logger.dart';
+import 'package:marco/helpers/services/app_logger.dart';
-import 'package:on_field_work/helpers/services/api_service.dart';
+import 'package:marco/helpers/services/api_service.dart';
-import 'package:on_field_work/model/attendance/organization_per_project_list_model.dart';
+import 'package:marco/model/attendance/organization_per_project_list_model.dart';
 
 class OrganizationController extends GetxController {
   /// List of organizations assigned to the selected project

lib/controller/tenant/service_controller.dart

@@ -1,7 +1,7 @@
 import 'package:get/get.dart';
-import 'package:on_field_work/helpers/services/api_service.dart';
+import 'package:marco/helpers/services/api_service.dart';
-import 'package:on_field_work/helpers/services/app_logger.dart';
+import 'package:marco/helpers/services/app_logger.dart';
-import 'package:on_field_work/model/tenant/tenant_services_model.dart';
+import 'package:marco/model/tenant/tenant_services_model.dart';
 
 class ServiceController extends GetxController {
   List<Service> services = [];

lib/controller/tenant/tenant_selection_controller.dart

@@ -1,10 +1,10 @@
 import 'package:get/get.dart';
-import 'package:on_field_work/helpers/services/app_logger.dart';
+import 'package:marco/helpers/services/app_logger.dart';
-import 'package:on_field_work/helpers/services/tenant_service.dart';
+import 'package:marco/helpers/services/tenant_service.dart';
-import 'package:on_field_work/model/tenant/tenant_list_model.dart';
+import 'package:marco/model/tenant/tenant_list_model.dart';
-import 'package:on_field_work/helpers/widgets/my_snackbar.dart';
+import 'package:marco/helpers/widgets/my_snackbar.dart';
-import 'package:on_field_work/helpers/services/storage/local_storage.dart';
+import 'package:marco/helpers/services/storage/local_storage.dart';
-import 'package:on_field_work/controller/permission_controller.dart';
+import 'package:marco/controller/permission_controller.dart';
 
 class TenantSelectionController extends GetxController {
   final TenantService _tenantService = TenantService();

lib/controller/tenant/tenant_switch_controller.dart

@@ -1,10 +1,10 @@
 import 'package:get/get.dart';
-import 'package:on_field_work/helpers/services/app_logger.dart';
+import 'package:marco/helpers/services/app_logger.dart';
-import 'package:on_field_work/helpers/services/tenant_service.dart';
+import 'package:marco/helpers/services/tenant_service.dart';
-import 'package:on_field_work/model/tenant/tenant_list_model.dart';
+import 'package:marco/model/tenant/tenant_list_model.dart';
-import 'package:on_field_work/helpers/widgets/my_snackbar.dart';
+import 'package:marco/helpers/widgets/my_snackbar.dart';
-import 'package:on_field_work/helpers/services/storage/local_storage.dart';
+import 'package:marco/helpers/services/storage/local_storage.dart';
-import 'package:on_field_work/controller/permission_controller.dart';
+import 'package:marco/controller/permission_controller.dart';
 
 class TenantSwitchController extends GetxController {
   final TenantService _tenantService = TenantService();

lib/controller/ui/buttons_controller.dart

@@ -1,4 +1,4 @@
-import 'package:on_field_work/controller/my_controller.dart';
+import 'package:marco/controller/my_controller.dart';
 
 class ButtonsController extends MyController {
   List<bool> selected = List.filled(3, false);

lib/controller/ui/carousels_controller.dart

@@ -1,7 +1,7 @@
 import 'dart:async';
 
 import 'package:carousel_slider/carousel_controller.dart';
-import 'package:on_field_work/controller/my_controller.dart';
+import 'package:marco/controller/my_controller.dart';
 import 'package:flutter/material.dart';
 
 class CarouselsController extends MyController {

lib/controller/ui/dialogs_controller.dart

@@ -1,5 +1,5 @@
-import 'package:on_field_work/controller/my_controller.dart';
+import 'package:marco/controller/my_controller.dart';
-import 'package:on_field_work/helpers/widgets/my_text_utils.dart';
+import 'package:marco/helpers/widgets/my_text_utils.dart';
 
 class DialogsController extends MyController {
   List<String> dummyTexts =

lib/controller/ui/loaders_controller.dart

@@ -1,3 +1,3 @@
-import 'package:on_field_work/controller/my_controller.dart';
+import 'package:marco/controller/my_controller.dart';
 
 class LoadersController extends MyController {}

lib/controller/ui/modal_controller.dart

@@ -1,5 +1,5 @@
-import 'package:on_field_work/controller/my_controller.dart';
+import 'package:marco/controller/my_controller.dart';
-import 'package:on_field_work/helpers/widgets/my_text_utils.dart';
+import 'package:marco/helpers/widgets/my_text_utils.dart';
 import 'package:flutter/animation.dart';
 import 'package:flutter/material.dart';
 

lib/controller/ui/notification_controller.dart

@@ -1,10 +1,10 @@
 import 'dart:async';
-import 'package:on_field_work/controller/my_controller.dart';
+import 'package:marco/controller/my_controller.dart';
-import 'package:on_field_work/helpers/extensions/string.dart';
+import 'package:marco/helpers/extensions/string.dart';
-import 'package:on_field_work/helpers/theme/admin_theme.dart';
+import 'package:marco/helpers/theme/admin_theme.dart';
-import 'package:on_field_work/helpers/widgets/my_button.dart';
+import 'package:marco/helpers/widgets/my_button.dart';
-import 'package:on_field_work/helpers/widgets/my_spacing.dart';
+import 'package:marco/helpers/widgets/my_spacing.dart';
-import 'package:on_field_work/helpers/widgets/my_text.dart';
+import 'package:marco/helpers/widgets/my_text.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:flutter_lucide/flutter_lucide.dart';

lib/controller/ui/tabs_controller.dart

@@ -1,5 +1,5 @@
-import 'package:on_field_work/controller/my_controller.dart';
+import 'package:marco/controller/my_controller.dart';
-import 'package:on_field_work/helpers/widgets/my_text_utils.dart';
+import 'package:marco/helpers/widgets/my_text_utils.dart';
 import 'package:flutter/material.dart';
 
 class TabsController extends MyController {

lib/controller/ui/toast_message_controller.dart

@@ -1,4 +1,4 @@
-import 'package:on_field_work/controller/my_controller.dart';
+import 'package:marco/controller/my_controller.dart';
 import 'package:flutter/material.dart';
 
 class ToastMessageController extends MyController {

lib/helpers/extensions/app_localization_delegate.dart

@@ -1,5 +1,5 @@
-import 'package:on_field_work/helpers/services/localizations/language.dart';
+import 'package:marco/helpers/services/localizations/language.dart';
-import 'package:on_field_work/helpers/theme/app_notifier.dart';
+import 'package:marco/helpers/theme/app_notifier.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 

lib/helpers/extensions/string.dart

@@ -1,5 +1,5 @@
 import 'dart:ui';
-import 'package:on_field_work/helpers/services/localizations/translator.dart';
+import 'package:marco/helpers/services/localizations/translator.dart';
 
 extension StringUtil on String {
   Color get toColor {

lib/helpers/services/api_endpoints.dart

@@ -2,9 +2,6 @@ class ApiEndpoints {
   static const String baseUrl = "https://stageapi.marcoaiot.com/api";
   // static const String baseUrl = "https://api.marcoaiot.com/api";
   // static const String baseUrl = "https://devapi.marcoaiot.com/api";
-  // static const String baseUrl = "https://mapi.marcoaiot.com/api";
-//   static const String baseUrl = "https://api.onfieldwork.com/api";
-
 
   static const String getMasterCurrencies = "/Master/currencies/list";
   static const String getMasterExpensesCategories =
@@ -36,10 +33,6 @@ class ApiEndpoints {
       "/Dashboard/expense/monthly";
   static const String getExpenseTypeReport = "/Dashboard/expense/type";
   static const String getPendingExpenses = "/Dashboard/expense/pendings";
-  static const String getCollectionOverview = "/dashboard/collection-overview";
-
-  static const String getPurchaseInvoiceOverview =
-      "/dashboard/purchase-invoice-overview";
 
 ///// Projects Module API Endpoints
   static const String createProject = "/project";
@@ -48,7 +41,6 @@ class ApiEndpoints {
   static const String getProjects = "/project/list";
   static const String getGlobalProjects = "/project/list/basic";
   static const String getTodaysAttendance = "/attendance/project/team";
-  static const String getAttendanceForDashboard = "/dashboard/get/attendance/employee/:projectId";
   static const String getAttendanceLogs = "/attendance/project/log";
   static const String getAttendanceLogView = "/attendance/log/attendance";
   static const String getRegularizationLogs = "/attendance/regularize";
@@ -135,36 +127,4 @@ class ApiEndpoints {
 
   static const String getAssignedServices = "/Project/get/assigned/services";
   static const String getAdvancePayments = '/Expense/get/transactions';
-
-  // Organization Hierarchy endpoints
-  static const String getOrganizationHierarchyList =
-      "/organization/hierarchy/list";
-  static const String manageOrganizationHierarchy =
-      "/organization/hierarchy/manage";
-
-  
-  // Service Project Module API Endpoints
-  static const String getServiceProjectsList = "/serviceproject/list";
-  static const String getServiceProjectDetail = "/serviceproject/details";
-  static const String getServiceProjectJobList = "/serviceproject/job/list";
-  static const String getServiceProjectJobDetail =
-      "/serviceproject/job/details";
-  static const String editServiceProjectJob = "/serviceproject/job/edit";
-  static const String createServiceProjectJob = "/serviceproject/job/create";
-  static const String serviceProjectUpateJobAttendance = "/serviceproject/job/attendance";
-  static const String serviceProjectUpateJobAttendanceLog = "/serviceproject/job/attendance/log";
-  static const String getServiceProjectUpateJobAllocationList = "/serviceproject/get/allocation/list";
-  static const String manageServiceProjectUpateJobAllocation = "/serviceproject/manage/allocation";
-  static const String getTeamRoles = "/master/team-roles/list";
-  static const String getServiceProjectBranches = "/serviceproject/branch/list";
-
-  static const String getMasterJobStatus = "/Master/job-status/list";
-
-  static const String addJobComment = "/ServiceProject/job/add/comment";
-
-  static const String getJobCommentList = "/ServiceProject/job/comment/list";
-
-  // Infra Project Module API Endpoints
-  static const String getInfraProjectsList = "/project/list";
-  static const String getInfraProjectDetail = "/project/details";
 }

lib/helpers/services/app_initializer.dart

@@ -1,13 +1,13 @@
 import 'package:flutter/services.dart';
 import 'package:url_strategy/url_strategy.dart';
 import 'package:firebase_core/firebase_core.dart';
-import 'package:on_field_work/helpers/services/storage/local_storage.dart';
+import 'package:marco/helpers/services/storage/local_storage.dart';
-import 'package:on_field_work/helpers/services/app_logger.dart';
+import 'package:marco/helpers/services/app_logger.dart';
-import 'package:on_field_work/helpers/services/auth_service.dart';
+import 'package:marco/helpers/services/auth_service.dart';
-import 'package:on_field_work/helpers/services/firebase/firebase_messaging_service.dart';
+import 'package:marco/helpers/services/firebase/firebase_messaging_service.dart';
-import 'package:on_field_work/helpers/services/device_info_service.dart';
+import 'package:marco/helpers/services/device_info_service.dart';
-import 'package:on_field_work/helpers/theme/theme_customizer.dart';
+import 'package:marco/helpers/theme/theme_customizer.dart';
-import 'package:on_field_work/helpers/theme/app_theme.dart';
+import 'package:marco/helpers/theme/app_theme.dart';
 
 Future<void> initializeApp() async {
   try {

lib/helpers/services/app_logger.dart

@@ -2,7 +2,7 @@ import 'dart:io';
 import 'package:logger/logger.dart';
 import 'package:intl/intl.dart';
 import 'package:path_provider/path_provider.dart';
-import 'package:on_field_work/helpers/services/api_service.dart';
+import 'package:marco/helpers/services/api_service.dart';
 
 /// Global logger instance
 Logger? _appLogger;

lib/helpers/services/auth_service.dart

@@ -1,8 +1,8 @@
 import 'dart:convert';
 import 'package:http/http.dart' as http;
-import 'package:on_field_work/helpers/services/api_endpoints.dart';
+import 'package:marco/helpers/services/api_endpoints.dart';
-import 'package:on_field_work/helpers/services/storage/local_storage.dart';
+import 'package:marco/helpers/services/storage/local_storage.dart';
-import 'package:on_field_work/helpers/services/app_logger.dart';
+import 'package:marco/helpers/services/app_logger.dart';
 
 class AuthService {
   static const String _baseUrl = ApiEndpoints.baseUrl;

lib/helpers/services/firebase/firebase_messaging_service.dart

@@ -1,10 +1,10 @@
 import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:logger/logger.dart';
 
-import 'package:on_field_work/helpers/services/local_notification_service.dart';
+import 'package:marco/helpers/services/local_notification_service.dart';
-import 'package:on_field_work/helpers/services/storage/local_storage.dart';
+import 'package:marco/helpers/services/storage/local_storage.dart';
-import 'package:on_field_work/helpers/services/auth_service.dart';
+import 'package:marco/helpers/services/auth_service.dart';
-import 'package:on_field_work/helpers/services/notification_action_handler.dart';
+import 'package:marco/helpers/services/notification_action_handler.dart';
 
 /// Firebase Notification Service
 class FirebaseNotificationService {

lib/helpers/services/localizations/language.dart

@@ -1,5 +1,5 @@
-import 'package:on_field_work/helpers/services/storage/local_storage.dart';
+import 'package:marco/helpers/services/storage/local_storage.dart';
-import 'package:on_field_work/helpers/theme/theme_customizer.dart';
+import 'package:marco/helpers/theme/theme_customizer.dart';
 import 'package:flutter/material.dart';
 
 class Language {

lib/helpers/services/localizations/translator.dart

@@ -1,7 +1,7 @@
 import 'dart:convert';
 import 'dart:developer';
 
-import 'package:on_field_work/helpers/services/localizations/language.dart';
+import 'package:marco/helpers/services/localizations/language.dart';
 import 'package:flutter/services.dart';
 import 'package:get/get_utils/src/extensions/string_extensions.dart';
 import 'package:shared_preferences/shared_preferences.dart';

lib/helpers/services/notification_action_handler.dart

@@ -1,17 +1,17 @@
 import 'package:get/get.dart';
 import 'package:logger/logger.dart';
 
-import 'package:on_field_work/controller/attendance/attendance_screen_controller.dart';
+import 'package:marco/controller/attendance/attendance_screen_controller.dart';
-import 'package:on_field_work/controller/task_planning/daily_task_controller.dart';
+import 'package:marco/controller/task_planning/daily_task_controller.dart';
-import 'package:on_field_work/controller/task_Planning/daily_task_Planning_controller.dart';
+import 'package:marco/controller/task_Planning/daily_task_Planning_controller.dart';
-import 'package:on_field_work/controller/expense/expense_screen_controller.dart';
+import 'package:marco/controller/expense/expense_screen_controller.dart';
-import 'package:on_field_work/controller/expense/expense_detail_controller.dart';
+import 'package:marco/controller/expense/expense_detail_controller.dart';
-import 'package:on_field_work/controller/directory/directory_controller.dart';
+import 'package:marco/controller/directory/directory_controller.dart';
-import 'package:on_field_work/controller/directory/notes_controller.dart';
+import 'package:marco/controller/directory/notes_controller.dart';
-import 'package:on_field_work/controller/document/user_document_controller.dart';
+import 'package:marco/controller/document/user_document_controller.dart';
-import 'package:on_field_work/controller/document/document_details_controller.dart';
+import 'package:marco/controller/document/document_details_controller.dart';
-import 'package:on_field_work/controller/dashboard/dashboard_controller.dart';
+import 'package:marco/controller/dashboard/dashboard_controller.dart';
-import 'package:on_field_work/helpers/utils/permission_constants.dart';
+import 'package:marco/helpers/utils/permission_constants.dart';
 
 /// Handles incoming FCM notification actions and updates UI/controllers.
 class NotificationActionHandler {
@@ -414,17 +414,12 @@ class NotificationActionHandler {
     required String notFoundMessage,
     required String successMessage,
   }) {
-    if (!Get.isRegistered<T>()) {
-      _logger.w(notFoundMessage);
-      return;
-    }
-
     try {
       final controller = Get.find<T>();
       onFound(controller);
       _logger.i(successMessage);
     } catch (e) {
-      _logger.w('⚠️ Error updating controller: $e');
+      _logger.w(notFoundMessage);
     }
   }
 }

lib/helpers/services/permission_service.dart

@@ -2,13 +2,13 @@ import 'dart:convert';
 import 'package:get/get.dart';
 import 'package:http/http.dart' as http;
 
-import 'package:on_field_work/helpers/services/app_logger.dart';
+import 'package:marco/helpers/services/app_logger.dart';
-import 'package:on_field_work/model/user_permission.dart';
+import 'package:marco/model/user_permission.dart';
-import 'package:on_field_work/model/employees/employee_info.dart';
+import 'package:marco/model/employees/employee_info.dart';
-import 'package:on_field_work/model/projects_model.dart';
+import 'package:marco/model/projects_model.dart';
-import 'package:on_field_work/helpers/services/storage/local_storage.dart';
+import 'package:marco/helpers/services/storage/local_storage.dart';
-import 'package:on_field_work/helpers/services/auth_service.dart';
+import 'package:marco/helpers/services/auth_service.dart';
-import 'package:on_field_work/helpers/services/api_endpoints.dart';
+import 'package:marco/helpers/services/api_endpoints.dart';
 
 class PermissionService {
   // In-memory cache keyed by user token

lib/helpers/services/storage/local_storage.dart

@@ -2,13 +2,13 @@ import 'dart:convert';
 import 'package:get/get.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
-import 'package:on_field_work/controller/project_controller.dart';
+import 'package:marco/controller/project_controller.dart';
-import 'package:on_field_work/helpers/services/auth_service.dart';
+import 'package:marco/helpers/services/auth_service.dart';
-import 'package:on_field_work/helpers/services/localizations/language.dart';
+import 'package:marco/helpers/services/localizations/language.dart';
-import 'package:on_field_work/helpers/theme/theme_customizer.dart';
+import 'package:marco/helpers/theme/theme_customizer.dart';
-import 'package:on_field_work/model/employees/employee_info.dart';
+import 'package:marco/model/employees/employee_info.dart';
-import 'package:on_field_work/model/user_permission.dart';
+import 'package:marco/model/user_permission.dart';
-import 'package:on_field_work/model/dynamicMenu/dynamic_menu_model.dart';
+import 'package:marco/model/dynamicMenu/dynamic_menu_model.dart';
 
 class LocalStorage {
   static const String _loggedInUserKey = "user";

lib/helpers/services/tenant_service.dart

@@ -1,13 +1,13 @@
 import 'dart:convert';
 import 'package:http/http.dart' as http;
 import 'package:get/get.dart';
-import 'package:on_field_work/controller/project_controller.dart';
+import 'package:marco/controller/project_controller.dart';
 
-import 'package:on_field_work/helpers/services/api_endpoints.dart';
+import 'package:marco/helpers/services/api_endpoints.dart';
-import 'package:on_field_work/helpers/services/storage/local_storage.dart';
+import 'package:marco/helpers/services/storage/local_storage.dart';
-import 'package:on_field_work/helpers/services/app_logger.dart';
+import 'package:marco/helpers/services/app_logger.dart';
-import 'package:on_field_work/helpers/services/auth_service.dart';
+import 'package:marco/helpers/services/auth_service.dart';
-import 'package:on_field_work/model/tenant/tenant_list_model.dart';
+import 'package:marco/model/tenant/tenant_list_model.dart';
 
 /// Abstract interface for tenant service functionality
 abstract class ITenantService {
@@ -63,39 +63,29 @@ class TenantService implements ITenantService {
       {bool hasRetried = false}) async {
     try {
       final headers = await _authorizedHeaders();
+      logSafe("➡️ GET $_baseUrl/auth/get/user/tenants\nHeaders: $headers",
+          level: LogLevel.info);
 
-      final response = await http.get(
+      final response = await http
-        Uri.parse("$_baseUrl/auth/get/user/tenants"),
+          .get(Uri.parse("$_baseUrl/auth/get/user/tenants"), headers: headers);
-        headers: headers,
+      final data = jsonDecode(response.body);
-      );
 
-      // ✅ Handle empty response BEFORE decoding
+      logSafe(
-      if (response.body.isEmpty || response.body.trim().isEmpty) {
+          "⬅️ Response: ${jsonEncode(data)} [Status: ${response.statusCode}]",
-        logSafe("❌ Empty tenant response — auto logout");
+          level: LogLevel.info);
-        await LocalStorage.logout();
-        return null;
-      }
 
-      Map<String, dynamic> data;
-      try {
-        data = jsonDecode(response.body);
-      } catch (e) {
-        logSafe("❌ Invalid JSON in tenant response — auto logout");
-        await LocalStorage.logout();
-        return null;
-      }
-
-      // SUCCESS CASE
       if (response.statusCode == 200 && data['success'] == true) {
-        final list = data['data'];
+        logSafe("✅ Tenants fetched successfully.");
-        if (list is! List) return null;
+        return List<Map<String, dynamic>>.from(data['data']);
-        return List<Map<String, dynamic>>.from(list);
       }
 
-      // TOKEN EXPIRED
       if (response.statusCode == 401 && !hasRetried) {
+        logSafe("⚠️ Unauthorized while fetching tenants. Refreshing token...",
+            level: LogLevel.warning);
         final refreshed = await AuthService.refreshToken();
         if (refreshed) return getTenants(hasRetried: true);
+        logSafe("❌ Token refresh failed while fetching tenants.",
+            level: LogLevel.error);
         return null;
       }
 
@@ -140,7 +130,7 @@ class TenantService implements ITenantService {
         }
 
         // 🔹 Register FCM token after tenant selection
-        final fcmToken = LocalStorage.getFcmToken();
+        final fcmToken =  LocalStorage.getFcmToken();
         if (fcmToken?.isNotEmpty ?? false) {
           final success = await AuthService.registerDeviceToken(fcmToken!);
           logSafe(

lib/helpers/theme/admin_theme.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:on_field_work/helpers/theme/theme_customizer.dart';
+import 'package:marco/helpers/theme/theme_customizer.dart';
 
 enum LeftBarThemeType { light, dark }
 enum ContentThemeType { light, dark }

lib/helpers/theme/app_notifier.dart

@@ -1,8 +1,8 @@
-import 'package:on_field_work/helpers/services/localizations/language.dart';
+import 'package:marco/helpers/services/localizations/language.dart';
-import 'package:on_field_work/helpers/services/storage/local_storage.dart';
+import 'package:marco/helpers/services/storage/local_storage.dart';
-import 'package:on_field_work/helpers/theme/app_theme.dart';
+import 'package:marco/helpers/theme/app_theme.dart';
-import 'package:on_field_work/helpers/theme/theme_customizer.dart';
+import 'package:marco/helpers/theme/theme_customizer.dart';
-import 'package:on_field_work/helpers/widgets/my.dart';
+import 'package:marco/helpers/widgets/my.dart';
 import 'package:flutter/material.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 

lib/helpers/theme/app_theme.dart

@@ -6,13 +6,13 @@
 * */
 import 'dart:io';
 import 'dart:math';
-import 'package:on_field_work/helpers/theme/admin_theme.dart';
+import 'package:marco/helpers/theme/admin_theme.dart';
-import 'package:on_field_work/helpers/theme/theme_customizer.dart';
+import 'package:marco/helpers/theme/theme_customizer.dart';
-import 'package:on_field_work/helpers/widgets/my.dart';
+import 'package:marco/helpers/widgets/my.dart';
-import 'package:on_field_work/helpers/widgets/my_breadcrumb_item.dart';
+import 'package:marco/helpers/widgets/my_breadcrumb_item.dart';
-import 'package:on_field_work/helpers/widgets/my_constant.dart';
+import 'package:marco/helpers/widgets/my_constant.dart';
-import 'package:on_field_work/helpers/widgets/my_screen_media.dart';
+import 'package:marco/helpers/widgets/my_screen_media.dart';
-import 'package:on_field_work/helpers/widgets/my_text_style.dart';
+import 'package:marco/helpers/widgets/my_text_style.dart';
 import 'package:flutter/material.dart';
 import 'package:google_fonts/google_fonts.dart';
 
@@ -230,7 +230,7 @@ class AppStyle {
       containerRadius: AppStyle.containerRadius.medium,
       cardRadius: AppStyle.cardRadius.medium,
       buttonRadius: AppStyle.buttonRadius.medium,
-      defaultBreadCrumbItem: MyBreadcrumbItem(name: 'On Field Work', route: '/client/dashboard'),
+      defaultBreadCrumbItem: MyBreadcrumbItem(name: 'Marco', route: '/client/dashboard'),
     ));
     bool isMobile = true;
     try {

lib/helpers/theme/theme_customizer.dart

@@ -1,12 +1,12 @@
 import 'dart:convert';
 import 'package:flutter/material.dart';
-import 'package:on_field_work/helpers/services/json_decoder.dart';
+import 'package:marco/helpers/services/json_decoder.dart';
-import 'package:on_field_work/helpers/services/localizations/language.dart';
+import 'package:marco/helpers/services/localizations/language.dart';
-import 'package:on_field_work/helpers/services/localizations/translator.dart';
+import 'package:marco/helpers/services/localizations/translator.dart';
-import 'package:on_field_work/helpers/services/navigation_services.dart';
+import 'package:marco/helpers/services/navigation_services.dart';
-import 'package:on_field_work/helpers/theme/admin_theme.dart';
+import 'package:marco/helpers/theme/admin_theme.dart';
-import 'package:on_field_work/helpers/theme/app_notifier.dart';
+import 'package:marco/helpers/theme/app_notifier.dart';
-import 'package:on_field_work/helpers/theme/app_theme.dart';
+import 'package:marco/helpers/theme/app_theme.dart';
 import 'package:provider/provider.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 

lib/helpers/theme/theme_editor_widget.dart

@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'package:on_field_work/helpers/widgets/my_text.dart';
+import 'package:marco/helpers/widgets/my_text.dart';
-import 'package:on_field_work/helpers/widgets/wave_background.dart';
+import 'package:marco/helpers/widgets/wave_background.dart';
-import 'package:on_field_work/helpers/theme/admin_theme.dart';
+import 'package:marco/helpers/theme/admin_theme.dart';
-import 'package:on_field_work/helpers/theme/theme_customizer.dart';
+import 'package:marco/helpers/theme/theme_customizer.dart';
 
 class ThemeOption {
   final String label;
@@ -63,9 +63,6 @@ class ThemeController extends GetxController {
 
     await Future.delayed(const Duration(milliseconds: 600));
     showApplied.value = false;
-
-    // Navigate to dashboard after applying theme
-    Get.offAllNamed('/dashboard');
   }
 }
 

lib/helpers/utils/base_bottom_sheet.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
-import 'package:on_field_work/helpers/widgets/my_spacing.dart';
+import 'package:marco/helpers/widgets/my_spacing.dart';
-import 'package:on_field_work/helpers/widgets/my_text.dart';
+import 'package:marco/helpers/widgets/my_text.dart';
-import 'package:on_field_work/helpers/utils/mixins/ui_mixin.dart';
+import 'package:marco/helpers/utils/mixins/ui_mixin.dart';
 
 class BaseBottomSheet extends StatefulWidget {
   final String title;

lib/helpers/utils/contact_picker_helper.dart

@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_contacts/flutter_contacts.dart';
 import 'package:permission_handler/permission_handler.dart';
-import 'package:on_field_work/helpers/widgets/my_snackbar.dart';
+import 'package:marco/helpers/widgets/my_snackbar.dart';
-import 'package:on_field_work/helpers/services/app_logger.dart';
+import 'package:marco/helpers/services/app_logger.dart';
 
 class ContactPickerHelper {
   static Future<String?> pickIndianPhoneNumber(BuildContext context) async {

lib/helpers/utils/launcher_utils.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/services.dart';
 import 'package:url_launcher/url_launcher.dart';
-import 'package:on_field_work/helpers/widgets/my_snackbar.dart';
+import 'package:marco/helpers/widgets/my_snackbar.dart';
-import 'package:on_field_work/helpers/services/app_logger.dart';
+import 'package:marco/helpers/services/app_logger.dart';
 
 class LauncherUtils {
   /// Launches the phone dialer with the provided phone number

lib/helpers/utils/mixins/ui_mixin.dart

@@ -1,7 +1,7 @@
-import 'package:on_field_work/helpers/theme/admin_theme.dart';
+import 'package:marco/helpers/theme/admin_theme.dart';
-import 'package:on_field_work/helpers/theme/app_theme.dart';
+import 'package:marco/helpers/theme/app_theme.dart';
-import 'package:on_field_work/helpers/widgets/my_dashed_divider.dart';
+import 'package:marco/helpers/widgets/my_dashed_divider.dart';
-import 'package:on_field_work/helpers/widgets/my_navigation_mixin.dart';
+import 'package:marco/helpers/widgets/my_navigation_mixin.dart';
 import 'package:flutter/material.dart';
 
 mixin UIMixin {

lib/helpers/utils/permission_constants.dart

@@ -25,16 +25,14 @@ class Permissions {
 
   // ------------------- Project Infrastructure --------------------------
   /// Permission to manage project infrastructure (e.g., site details)
-  static const String manageProjectInfra =
+  static const String manageProjectInfra = "cf2825ad-453b-46aa-91d9-27c124d63373";
-      "cf2825ad-453b-46aa-91d9-27c124d63373";
 
   /// Permission to view infrastructure-related details
   static const String viewProjectInfra = "8d7cc6e3-9147-41f7-aaa7-fa507e450bd4";
 
   // ------------------- Attendance Management ---------------------------
   /// Permission to regularize (edit/update) attendance records
-  static const String regularizeAttendance =
+  static const String regularizeAttendance = "57802c4a-00aa-4a1f-a048-fd2f70dd44b6";
-      "57802c4a-00aa-4a1f-a048-fd2f70dd44b6";
 
   // ------------------- Task Management ---------------------------------
   /// Permission to create and manage tasks
@@ -92,8 +90,7 @@ class Permissions {
 
   // ------------------- Application Roles -------------------------------
   /// Application role ID for users with full expense management rights
-  static const String expenseManagement =
+  static const String expenseManagement = "a4e25142-449b-4334-a6e5-22f70e4732d7";
-      "a4e25142-449b-4334-a6e5-22f70e4732d7";
 
   // ------------------- Document Entities -------------------------------
   /// Entity ID for project documents
@@ -121,73 +118,3 @@ class Permissions {
   /// Permission to verify documents
   static const String verifyDocument = "13a1f30f-38d1-41bf-8e7a-b75189aab8e0";
 }
-
-/// Contains constants for menu item IDs fetched from the sidebar menu API.
-class MenuItems {
-  /// Dashboard menu
-  static const String dashboard = "29e03eda-03e8-4714-92fa-67ae0dc53202";
-
-  /// Daily Task Planning menu
-  static const String dailyTaskPlanning =
-      "77ac5205-f823-442e-b9e4-2420d658aa02";
-
-  /// Daily Progress Report menu
-  static const String dailyProgressReport =
-      "299e3cf5-d034-4403-b4a1-ea46d2714832";
-
-  /// Employees menu
-  static const String employees = "78f0206d-c6cc-44d0-832a-2031ed203018";
-
-  /// Attendance menu
-  static const String attendance = "2f212030-f36b-456c-8e7c-11f00f9ba42b";
-
-  /// Directory menu
-  static const String directory = "31bc367b-7c58-4604-95eb-da059a384103";
-
-  /// Expense & Reimbursement menu
-  static const String expenseReimbursement =
-      "0f0dc1a7-1aca-4cdb-9d7a-8a769ce40728";
-
-  /// Payment Requests menu
-  static const String paymentRequests = "b350a59f-2372-4f68-8dcf-f7cfc44523ca";
-
-  /// Advance Payment Statements menu
-  static const String advancePaymentStatements =
-      "e0251cc1-e6d9-417a-9c76-489cc4b6c347";
-
-  /// Finance menu
-  static const String finance = "5ac409dd-bbe0-4d56-bcb9-229bd3a6353c";
-
-  /// Documents menu
-  static const String documents = "92d2cc39-9e6a-46b2-ae50-84fbf83c95d3";
-
-  /// Service Projects
-  static const String serviceProjects = "7faddfe7-994b-4712-91c2-32ba44129d9b";
-
-  /// Infrastructure Projects
-  static const String infraProjects = "5fab4b88-c9a0-417b-aca2-130980fdb0cf";
-}
-
-/// Contains all job status IDs used across the application.
-class JobStatus {
-  /// Level 1 - New
-  static const String newStatus = "32d76a02-8f44-4aa0-9b66-c3716c45a918";
-
-  /// Level 2 - Assigned
-  static const String assigned = "cfa1886d-055f-4ded-84c6-42a2a8a14a66";
-
-  /// Level 3 - In Progress
-  static const String inProgress = "5a6873a5-fed7-4745-a52f-8f61bf3bd72d";
-
-  /// Level 4 - Work Done
-  static const String workDone = "aab71020-2fb8-44d9-9430-c9a7e9bf33b0";
-
-  /// Level 5 - Review Done
-  static const String reviewDone = "ed10ab57-dbaa-4ca5-8ecd-56745dcbdbd7";
-
-  /// Level 6 - Closed
-  static const String closed = "3ddeefb5-ae3c-4e10-a922-35e0a452bb69";
-
-  /// Level 7 - On Hold
-  static const String onHold = "75a0c8b8-9c6a-41af-80bf-b35bab722eb2";
-}

lib/helpers/utils/utils.dart

@@ -1,5 +1,5 @@
 import 'package:intl/intl.dart';
-import 'package:on_field_work/helpers/extensions/date_time_extension.dart';
+import 'package:marco/helpers/extensions/date_time_extension.dart';
 
 class Utils {
   static getDateStringFromDateTime(DateTime dateTime,

lib/helpers/widgets/avatar.dart

@@ -1,11 +1,10 @@
 import 'package:flutter/material.dart';
-import 'package:on_field_work/helpers/widgets/my_container.dart';
+import 'package:marco/helpers/widgets/my_container.dart';
-import 'package:on_field_work/helpers/widgets/my_text.dart';
+import 'package:marco/helpers/widgets/my_text.dart';
 
 class Avatar extends StatelessWidget {
   final String firstName;
   final String lastName;
-  final String? imageUrl;
   final double size;
   final Color? backgroundColor; 
   final Color textColor;
@@ -14,7 +13,6 @@ class Avatar extends StatelessWidget {
     super.key,
     required this.firstName,
     required this.lastName,
-    this.imageUrl,
     this.size = 46.0,
     this.backgroundColor,
     this.textColor = Colors.white,
@@ -22,24 +20,9 @@ class Avatar extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    if (imageUrl != null && imageUrl!.isNotEmpty) {
+    String initials = "${firstName.isNotEmpty ? firstName[0] : ''}${lastName.isNotEmpty ? lastName[0] : ''}".toUpperCase();
-      return ClipRRect(
-        borderRadius: BorderRadius.circular(size / 2),
-        child: Image.network(
-          imageUrl!,
-          width: size,
-          height: size,
-          fit: BoxFit.cover,
-        ),
-      );
-    }
 
-    String initials =
+    final Color bgColor = backgroundColor ?? _getFlatColorFromName('$firstName$lastName');
-        "${firstName.isNotEmpty ? firstName[0] : ''}${lastName.isNotEmpty ? lastName[0] : ''}"
-            .toUpperCase();
-
-    final Color bgColor =
-        backgroundColor ?? _getFlatColorFromName('$firstName$lastName');
 
     return MyContainer.rounded(
       height: size,
@@ -49,36 +32,36 @@ class Avatar extends StatelessWidget {
       child: Center(
         child: MyText(
           initials,
-          fontSize: size * 0.45,
+          fontSize: size * 0.45, // 👈 scales with avatar size
           fontWeight: 600,
           color: textColor,
         ),
       ),
     );
   }
-}
 
-// Use fixed flat color palette and pick based on hash
+  // Use fixed flat color palette and pick based on hash
-Color _getFlatColorFromName(String name) {
+  Color _getFlatColorFromName(String name) {
-  final colors = <Color>[
+    final colors = <Color>[
-    Color(0xFFE57373), // Red
+      Color(0xFFE57373), // Red
-    Color(0xFFF06292), // Pink
+      Color(0xFFF06292), // Pink
-    Color(0xFFBA68C8), // Purple
+      Color(0xFFBA68C8), // Purple
-    Color(0xFF9575CD), // Deep Purple
+      Color(0xFF9575CD), // Deep Purple
-    Color(0xFF7986CB), // Indigo
+      Color(0xFF7986CB), // Indigo
-    Color(0xFF64B5F6), // Blue
+      Color(0xFF64B5F6), // Blue
-    Color(0xFF4FC3F7), // Light Blue
+      Color(0xFF4FC3F7), // Light Blue
-    Color(0xFF4DD0E1), // Cyan
+      Color(0xFF4DD0E1), // Cyan
-    Color(0xFF4DB6AC), // Teal
+      Color(0xFF4DB6AC), // Teal
-    Color(0xFF81C784), // Green
+      Color(0xFF81C784), // Green
-    Color(0xFFAED581), // Light Green
+      Color(0xFFAED581), // Light Green
-    Color(0xFFDCE775), // Lime
+      Color(0xFFDCE775), // Lime
-    Color(0xFFFFD54F), // Amber
+      Color(0xFFFFD54F), // Amber
-    Color(0xFFFFB74D), // Orange
+      Color(0xFFFFB74D), // Orange
-    Color(0xFFA1887F), // Brown
+      Color(0xFFA1887F), // Brown
-    Color(0xFF90A4AE), // Blue Grey
+      Color(0xFF90A4AE), // Blue Grey
-  ];
+    ];
 
-  int index = name.hashCode.abs() % colors.length;
+    int index = name.hashCode.abs() % colors.length;
-  return colors[index];
+    return colors[index];
+  }
 }

lib/helpers/widgets/custom_app_bar.dart

@@ -1,230 +1,89 @@
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'package:on_field_work/controller/project_controller.dart';
+import 'package:marco/helpers/widgets/my_text.dart';
-import 'package:on_field_work/helpers/widgets/my_spacing.dart';
+import 'package:marco/controller/project_controller.dart';
-import 'package:on_field_work/helpers/widgets/my_text.dart';
-import 'package:on_field_work/helpers/utils/mixins/ui_mixin.dart';
 
-class CustomAppBar extends StatefulWidget
+class CustomAppBar extends StatelessWidget implements PreferredSizeWidget {
-    with UIMixin
-    implements PreferredSizeWidget {
   final String title;
-  final String? projectName; // If passed, show static text
   final VoidCallback? onBackPressed;
-  final Color? backgroundColor;
 
-  CustomAppBar({
+  const CustomAppBar({
     super.key,
     required this.title,
-    this.projectName,
     this.onBackPressed,
-    this.backgroundColor,
   });
 
   @override
-  Size get preferredSize => const Size.fromHeight(72);
+  Widget build(BuildContext context) {
-
+    return PreferredSize(
-  @override
+      preferredSize: const Size.fromHeight(72),
-  State<CustomAppBar> createState() => _CustomAppBarState();
+      child: Container(
-}
+        decoration: BoxDecoration(
-
+          color: const Color(0xFFF5F5F5),
-class _CustomAppBarState extends State<CustomAppBar> with UIMixin {
+          boxShadow: [
-  final ProjectController projectController = Get.find();
+            BoxShadow(
-  OverlayEntry? _overlayEntry;
+              color: Colors.black.withOpacity(0.15),
-  final LayerLink _layerLink = LayerLink();
+              blurRadius: 0.5, 
-
+              offset: const Offset(0, 0.5),
-  void _toggleDropdown() {
+            )
-    if (_overlayEntry == null) {
+          ],
-      _overlayEntry = _createOverlayEntry();
+        ),
-      Overlay.of(context).insert(_overlayEntry!);
+        child: SafeArea(
-    } else {
+          child: Padding(
-      _overlayEntry?.remove();
+            padding: const EdgeInsets.symmetric(horizontal: 16),
-      _overlayEntry = null;
+            child: Row(
-    }
+              children: [
-  }
+                IconButton(
-
+                  icon: const Icon(Icons.arrow_back_ios_new,
-  OverlayEntry _createOverlayEntry() {
+                      color: Colors.black, size: 20), 
-    final renderBox = context.findRenderObject() as RenderBox;
+                  onPressed: onBackPressed ?? Get.back, 
-    final size = renderBox.size;
+                  splashRadius: 24,
-    final offset = renderBox.localToGlobal(Offset.zero);
+                ),
-
+                const SizedBox(width: 8),
-    return OverlayEntry(
+                Expanded(
-      builder: (context) => GestureDetector(
-        onTap: () {
-          _toggleDropdown(); 
-        },
-        behavior: HitTestBehavior.translucent,
-        child: Stack(
-          children: [
-            Positioned(
-              left: offset.dx + 16, 
-              top: offset.dy + size.height,
-              width: size.width - 32,
-              child: Material(
-                elevation: 4,
-                borderRadius: BorderRadius.circular(5),
-                child: Container(
-                  height: MediaQuery.of(context).size.height * 0.33,
-                  padding: const EdgeInsets.all(8),
-                  decoration: BoxDecoration(
-                    color: Colors.white,
-                    borderRadius: BorderRadius.circular(5),
-                  ),
                   child: Column(
+                    mainAxisAlignment: MainAxisAlignment.center,
+                    crossAxisAlignment: CrossAxisAlignment.start,
                     children: [
-                      TextField(
+                      MyText.titleLarge(
-                        decoration: InputDecoration(
+                        title,
-                          hintText: "Search project...",
+                        fontWeight: 700, 
-                          isDense: true,
+                        color: Colors.black,
-                          prefixIcon: const Icon(Icons.search),
-                          border: OutlineInputBorder(
-                              borderRadius: BorderRadius.circular(5)),
-                        ),
                       ),
-                      Expanded(
+                      const SizedBox(height: 2),
-                        child: ListView.builder(
+                      GetBuilder<ProjectController>(
-                          itemCount: projectController.projects.length,
+                        builder: (projectController) {
-                          itemBuilder: (_, index) {
+                          final projectName =
-                            final project = projectController.projects[index];
+                              projectController.selectedProject?.name ??
-                            return RadioListTile<String>(
+                                  'Select Project';
-                              dense: true,
+                          return Row(
-                              value: project.id,
+                            children: [
-                              groupValue:
+                              const Icon(Icons.work_outline,
-                                  projectController.selectedProjectId.value,
+                                  size: 14, color: Colors.grey), 
-                              onChanged: (v) {
+                              const SizedBox(width: 4),
-                                if (v != null) {
+                              Expanded(
-                                  projectController.updateSelectedProject(v);
+                                child: MyText.bodySmall(
-                                  _toggleDropdown();
+                                  projectName,
-                                }
+                                  fontWeight: 600,
-                              },
+                                  overflow: TextOverflow.ellipsis,
-                              title: Text(project.name),
+                                  color: Colors.grey[700], 
-                            );
+                                ),
-                          },
+                              ),
-                        ),
+                            ],
+                          );
+                        },
                       ),
                     ],
                   ),
                 ),
-              ),
+              ],
             ),
-          ],
+          ),
         ),
       ),
     );
   }
 
   @override
-  Widget build(BuildContext context) {
+  Size get preferredSize => const Size.fromHeight(72);
-    final Color effectiveBackgroundColor =
-        widget.backgroundColor ?? contentTheme.primary;
-    const Color onPrimaryColor = Colors.white;
-
-    final bool showDropdown = widget.projectName == null;
-
-    return AppBar(
-      backgroundColor: effectiveBackgroundColor,
-      elevation: 0,
-      automaticallyImplyLeading: false,
-      titleSpacing: 0,
-      shadowColor: Colors.transparent,
-      leading: Padding(
-        padding: MySpacing.only(left: 16),
-        child: IconButton(
-          icon: const Icon(
-            Icons.arrow_back_ios_new,
-            color: onPrimaryColor,
-            size: 20,
-          ),
-          onPressed: widget.onBackPressed ?? () => Get.back(),
-          padding: EdgeInsets.zero,
-          constraints: const BoxConstraints(),
-        ),
-      ),
-      title: Padding(
-        padding: MySpacing.only(right: 16, left: 8),
-        child: Row(
-          children: [
-            Expanded(
-              child: Column(
-                mainAxisSize: MainAxisSize.min,
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  MyText.titleLarge(
-                    widget.title,
-                    fontWeight: 800,
-                    color: onPrimaryColor,
-                    overflow: TextOverflow.ellipsis,
-                    maxLines: 1,
-                  ),
-                  MySpacing.height(3),
-                  showDropdown
-                      ? CompositedTransformTarget(
-                          link: _layerLink,
-                          child: GestureDetector(
-                            onTap: _toggleDropdown,
-                            child: Row(
-                              children: [
-                                const Icon(Icons.folder_open,
-                                    size: 14, color: onPrimaryColor),
-                                MySpacing.width(4),
-                                Flexible(
-                                  child: Obx(() {
-                                    final projectName = projectController
-                                            .selectedProject?.name ??
-                                        'Select Project';
-                                    return MyText.bodySmall(
-                                      projectName,
-                                      fontWeight: 500,
-                                      color: onPrimaryColor.withOpacity(0.8),
-                                      overflow: TextOverflow.ellipsis,
-                                      maxLines: 1,
-                                    );
-                                  }),
-                                ),
-                                MySpacing.width(2),
-                                const Icon(Icons.keyboard_arrow_down,
-                                    size: 18, color: onPrimaryColor),
-                              ],
-                            ),
-                          ),
-                        )
-                      : Row(
-                          children: [
-                            const Icon(Icons.folder_open,
-                                size: 14, color: onPrimaryColor),
-                            MySpacing.width(4),
-                            Flexible(
-                              child: MyText.bodySmall(
-                                widget.projectName!,
-                                fontWeight: 500,
-                                color: onPrimaryColor.withOpacity(0.8),
-                                overflow: TextOverflow.ellipsis,
-                                maxLines: 1,
-                              ),
-                            ),
-                          ],
-                        ),
-                ],
-              ),
-            ),
-          ],
-        ),
-      ),
-      actions: [
-        Padding(
-          padding: MySpacing.only(right: 16),
-          child: IconButton(
-            icon: const Icon(Icons.home, color: onPrimaryColor, size: 24),
-            onPressed: () => Get.offAllNamed('/dashboard'),
-          ),
-        ),
-      ],
-    );
-  }
-
-  @override
-  void dispose() {
-    _overlayEntry?.remove();
-    super.dispose();
-  }
 }