Merge pull request 'Collection_Purchase_Widget' (#87) from Collection_Purchase_Widget into main

Reviewed-on: #87

README.md

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

android/app/src/main/AndroidManifest.xml

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

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 "1.8.22" apply false
+    id "org.jetbrains.kotlin.android" version "2.2.21" 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="Marco"
+APP_NAME="On Field Work"
 BUILD_DIR="build/app/outputs"
 
 echo -e "${CYAN}🚀 Starting Flutter build script for $APP_NAME...${NC}"

ios/Runner/Info.plist

@@ -5,7 +5,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDisplayName</key>
-	<string>Marco</string>
+	<string>On Field Work</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>marco</string>
+	<string>on field work</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 => 'Marco';
+  static String get appName => 'On Field Work';
 }

lib/controller/attendance/attendance_screen_controller.dart

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

lib/controller/dashboard/dashboard_controller.dart

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

lib/controller/document/user_document_controller.dart

@@ -1,8 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'package:marco/helpers/services/api_service.dart';
-import 'package:marco/model/document/document_filter_model.dart';
-import 'package:marco/model/document/documents_list_model.dart';
+import 'package:on_field_work/helpers/services/api_service.dart';
+import 'package:on_field_work/model/document/document_filter_model.dart';
+import 'package:on_field_work/model/document/documents_list_model.dart';
+import 'package:on_field_work/helpers/widgets/my_snackbar.dart';
 
 class DocumentController extends GetxController {
   // ==================== Observables ====================
@@ -38,7 +39,6 @@ class DocumentController extends GetxController {
   final endDate = Rxn<DateTime>();
 
   // ==================== Lifecycle ====================
-
   @override
   void onClose() {
     // Don't dispose searchController here - it's managed by the page
@@ -87,13 +87,23 @@ 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 {
@@ -110,17 +120,13 @@ 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;
@@ -136,8 +142,8 @@ class DocumentController extends GetxController {
       );
 
       if (response != null && response.success) {
-        if (response.data.data.isNotEmpty) {
-          documents.addAll(response.data.data);
+        if (response.data?.data.isNotEmpty ?? false) {
+          documents.addAll(response.data!.data);
           pageNumber.value++;
         } else {
           hasMore.value = false;
@@ -147,12 +153,24 @@ 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 {
@@ -185,17 +203,12 @@ class DocumentController extends GetxController {
         isVerified.value != null;
   }
 
-  /// Show error message
+  /// Show error message via snackbar
   void _showError(String message) {
-    Get.snackbar(
-      'Error',
-      message,
-      snackPosition: SnackPosition.BOTTOM,
-      backgroundColor: Colors.red.shade100,
-      colorText: Colors.red.shade900,
-      margin: const EdgeInsets.all(16),
-      borderRadius: 8,
-      duration: const Duration(seconds: 3),
+    showAppSnackbar(
+      title: 'Error',
+      message: message,
+      type: SnackbarType.error,
     );
   }
 

lib/controller/dynamicMenu/dynamic_menu_controller.dart

@@ -1,8 +1,8 @@
 import 'dart:async';
 import 'package:get/get.dart';
-import 'package:marco/model/dynamicMenu/dynamic_menu_model.dart';
-import 'package:marco/helpers/services/api_service.dart';
-import 'package:marco/helpers/services/app_logger.dart';
+import 'package:on_field_work/model/dynamicMenu/dynamic_menu_model.dart';
+import 'package:on_field_work/helpers/services/api_service.dart';
+import 'package:on_field_work/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:marco/controller/my_controller.dart';
-import 'package:marco/helpers/services/api_service.dart';
-import 'package:marco/helpers/services/app_logger.dart';
-import 'package:marco/helpers/widgets/my_form_validator.dart';
-import 'package:marco/helpers/widgets/my_snackbar.dart';
+import 'package:on_field_work/controller/my_controller.dart';
+import 'package:on_field_work/helpers/services/api_service.dart';
+import 'package:on_field_work/helpers/services/app_logger.dart';
+import 'package:on_field_work/helpers/widgets/my_form_validator.dart';
+import 'package:on_field_work/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:marco/helpers/services/api_service.dart';
-import 'package:marco/helpers/services/app_logger.dart';
-import 'package:marco/model/global_project_model.dart';
-import 'package:marco/model/employees/assigned_projects_model.dart';
-import 'package:marco/controller/project_controller.dart';
+import 'package:on_field_work/helpers/services/api_service.dart';
+import 'package:on_field_work/helpers/services/app_logger.dart';
+import 'package:on_field_work/model/global_project_model.dart';
+import 'package:on_field_work/model/employees/assigned_projects_model.dart';
+import 'package:on_field_work/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:marco/helpers/services/app_logger.dart';
-import 'package:marco/helpers/services/api_service.dart';
-import 'package:marco/model/employees/employee_model.dart';
-import 'package:marco/model/employees/employee_details_model.dart';
+import 'package:on_field_work/helpers/services/app_logger.dart';
+import 'package:on_field_work/helpers/services/api_service.dart';
+import 'package:on_field_work/model/employees/employee_model.dart';
+import 'package:on_field_work/model/employees/employee_details_model.dart';
 
 class EmployeesScreenController extends GetxController {
   /// ✅ Data lists

lib/controller/error_pages/coming_soon_controller.dart

@@ -1,7 +1,7 @@
 import 'dart:async';
 
 import 'package:get/get.dart';
-import 'package:marco/controller/my_controller.dart';
+import 'package:on_field_work/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:marco/controller/my_controller.dart';
+import 'package:on_field_work/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:marco/controller/my_controller.dart';
+import 'package:on_field_work/controller/my_controller.dart';
 
 class Error500Controller extends MyController {
   void goToDashboardScreen() {

lib/controller/expense/add_expense_controller.dart

@@ -1,5 +1,6 @@
 import 'dart:convert';
 import 'dart:io';
+import 'dart:async';
 
 import 'package:file_picker/file_picker.dart';
 import 'package:flutter/material.dart';
@@ -10,14 +11,14 @@ import 'package:intl/intl.dart';
 import 'package:mime/mime.dart';
 import 'package:image_picker/image_picker.dart';
 
-import 'package:marco/controller/expense/expense_screen_controller.dart';
-import 'package:marco/helpers/services/api_service.dart';
-import 'package:marco/helpers/services/app_logger.dart';
-import 'package:marco/helpers/widgets/my_snackbar.dart';
-import 'package:marco/model/employees/employee_model.dart';
-import 'package:marco/model/expense/expense_type_model.dart';
-import 'package:marco/model/expense/payment_types_model.dart';
-import 'package:marco/helpers/widgets/time_stamp_image_helper.dart';
+import 'package:on_field_work/controller/expense/expense_screen_controller.dart';
+import 'package:on_field_work/helpers/services/api_service.dart';
+import 'package:on_field_work/helpers/services/app_logger.dart';
+import 'package:on_field_work/helpers/widgets/my_snackbar.dart';
+import 'package:on_field_work/model/employees/employee_model.dart';
+import 'package:on_field_work/model/expense/expense_type_model.dart';
+import 'package:on_field_work/model/expense/payment_types_model.dart';
+import 'package:on_field_work/helpers/widgets/time_stamp_image_helper.dart';
 
 class AddExpenseController extends GetxController {
   // --- Text Controllers ---
@@ -50,10 +51,22 @@ 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>();
 
@@ -196,7 +209,7 @@ class AddExpenseController extends GetxController {
       'Location: ${locationController.text}',
       'Transaction Date: ${transactionDateController.text}',
       'No. of Persons: ${noOfPersonsController.text}',
-      'Expense Type: ${selectedExpenseType.value?.name}',
+      'Expense Category: ${selectedExpenseType.value?.name}',
       'Payment Mode: ${selectedPaymentMode.value?.name}',
       'Paid By: ${selectedPaidBy.value?.name}',
       'Attachments: ${attachments.length}',
@@ -445,7 +458,7 @@ class AddExpenseController extends GetxController {
       return null;
     }
     if (expenseType == null) {
-      _errorSnackbar("Expense type not selected");
+      _errorSnackbar("Expense Category not selected");
       return null;
     }
     if (paymentMode == null) {
@@ -517,7 +530,7 @@ class AddExpenseController extends GetxController {
     final missing = <String>[];
 
     if (selectedProject.value.isEmpty) missing.add("Project");
-    if (selectedExpenseType.value == null) missing.add("Expense Type");
+    if (selectedExpenseType.value == null) missing.add("Expense Category");
     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:marco/helpers/services/api_service.dart';
-import 'package:marco/helpers/services/app_logger.dart';
-import 'package:marco/model/expense/expense_detail_model.dart';
-import 'package:marco/model/employees/employee_model.dart';
+import 'package:on_field_work/helpers/services/api_service.dart';
+import 'package:on_field_work/helpers/services/app_logger.dart';
+import 'package:on_field_work/model/expense/expense_detail_model.dart';
+import 'package:on_field_work/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:marco/helpers/services/api_service.dart';
-import 'package:marco/helpers/services/app_logger.dart';
-import 'package:marco/model/expense/expense_list_model.dart';
-import 'package:marco/model/expense/payment_types_model.dart';
-import 'package:marco/model/expense/expense_type_model.dart';
-import 'package:marco/model/expense/expense_status_model.dart';
-import 'package:marco/model/employees/employee_model.dart';
-import 'package:marco/helpers/widgets/my_snackbar.dart';
+import 'package:on_field_work/helpers/services/api_service.dart';
+import 'package:on_field_work/helpers/services/app_logger.dart';
+import 'package:on_field_work/model/expense/expense_list_model.dart';
+import 'package:on_field_work/model/expense/payment_types_model.dart';
+import 'package:on_field_work/model/expense/expense_type_model.dart';
+import 'package:on_field_work/model/expense/expense_status_model.dart';
+import 'package:on_field_work/model/employees/employee_model.dart';
+import 'package:on_field_work/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 types, payment modes, and expense status
+  /// Fetch master data: Expense Categorys, 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:marco/controller/my_controller.dart';
-import 'package:marco/helpers/widgets/my_text_utils.dart';
+import 'package:on_field_work/controller/my_controller.dart';
+import 'package:on_field_work/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:marco/controller/my_controller.dart';
+import 'package:on_field_work/controller/my_controller.dart';
 
 class PricingController extends MyController {
   bool isMonth = false;

lib/controller/finance/add_payment_request_controller.dart

@@ -8,12 +8,13 @@ import 'package:image_picker/image_picker.dart';
 import 'package:mime/mime.dart';
 import 'package:intl/intl.dart';
 
-import 'package:marco/helpers/services/api_service.dart';
-import 'package:marco/helpers/services/app_logger.dart';
-import 'package:marco/helpers/widgets/my_snackbar.dart';
-import 'package:marco/helpers/widgets/time_stamp_image_helper.dart';
-import 'package:marco/model/finance/expense_category_model.dart';
-import 'package:marco/model/finance/currency_list_model.dart';
+import 'package:on_field_work/helpers/services/api_service.dart';
+import 'package:on_field_work/helpers/services/app_logger.dart';
+import 'package:on_field_work/helpers/widgets/my_snackbar.dart';
+import 'package:on_field_work/helpers/widgets/time_stamp_image_helper.dart';
+import 'package:on_field_work/model/finance/expense_category_model.dart';
+import 'package:on_field_work/model/finance/currency_list_model.dart';
+import 'package:on_field_work/model/employees/employee_model.dart';
 
 class AddPaymentRequestController extends GetxController {
   // Loading States
@@ -32,7 +33,7 @@ class AddPaymentRequestController extends GetxController {
   // Selected Values
   final selectedProject = Rx<Map<String, dynamic>?>(null);
   final selectedCategory = Rx<ExpenseCategory?>(null);
-  final selectedPayee = ''.obs;
+  final selectedPayee = Rx<EmployeeModel?>(null);
   final selectedCurrency = Rx<Currency?>(null);
   final isAdvancePayment = false.obs;
   final selectedDueDate = Rx<DateTime?>(null);
@@ -161,7 +162,7 @@ class AddPaymentRequestController extends GetxController {
     try {
       final pickedFile = await _picker.pickImage(source: ImageSource.camera);
       if (pickedFile != null) {
-        isProcessingAttachment.value = true; 
+        isProcessingAttachment.value = true;
         File imageFile = File(pickedFile.path);
 
         // Add timestamp to the captured image
@@ -184,7 +185,7 @@ class AddPaymentRequestController extends GetxController {
       selectedProject.value = project;
   void selectCategory(ExpenseCategory category) =>
       selectedCategory.value = category;
-  void selectPayee(String payee) => selectedPayee.value = payee;
+  void selectPayee(EmployeeModel payee) => selectedPayee.value = payee;
   void selectCurrency(Currency currency) => selectedCurrency.value = currency;
 
   void addAttachment(File file) => attachments.add(file);
@@ -268,7 +269,7 @@ class AddPaymentRequestController extends GetxController {
         "amount": double.tryParse(amountController.text.trim()) ?? 0,
         "currencyId": selectedCurrency.value?.id ?? '',
         "description": descriptionController.text.trim(),
-        "payee": selectedPayee.value,
+        "payee": selectedPayee.value?.id ?? "",
         "dueDate": selectedDueDate.value?.toIso8601String(),
         "isAdvancePayment": isAdvancePayment.value,
         "billAttachments": billAttachments.map((a) {
@@ -337,7 +338,7 @@ class AddPaymentRequestController extends GetxController {
         "amount": double.tryParse(amountController.text.trim()) ?? 0,
         "currencyId": selectedCurrency.value?.id ?? '',
         "description": descriptionController.text.trim(),
-        "payee": selectedPayee.value,
+        "payee": selectedPayee.value?.id ?? "",
         "dueDate": selectedDueDate.value?.toIso8601String(),
         "isAdvancePayment": isAdvancePayment.value,
         "billAttachments": billAttachments.map((a) {
@@ -388,7 +389,7 @@ class AddPaymentRequestController extends GetxController {
       return _errorSnackbar("Please select a project");
     if (selectedCategory.value == null)
       return _errorSnackbar("Please select a category");
-    if (selectedPayee.value.isEmpty)
+    if (selectedPayee.value == null)
       return _errorSnackbar("Please select a payee");
     if (selectedCurrency.value == null)
       return _errorSnackbar("Please select currency");
@@ -408,7 +409,7 @@ class AddPaymentRequestController extends GetxController {
     descriptionController.clear();
     selectedProject.value = null;
     selectedCategory.value = null;
-    selectedPayee.value = '';
+    selectedPayee.value = null;
     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:marco/model/finance/advance_payment_model.dart';
-import 'package:marco/model/finance/get_employee_model.dart';
-import 'package:marco/helpers/services/app_logger.dart';
-import 'package:marco/helpers/services/api_service.dart';
+import 'package:on_field_work/model/finance/advance_payment_model.dart';
+import 'package:on_field_work/model/finance/get_employee_model.dart';
+import 'package:on_field_work/helpers/services/app_logger.dart';
+import 'package:on_field_work/helpers/services/api_service.dart';
 
 class AdvancePaymentController extends GetxController {
   /// Advance payments list

lib/controller/finance/payment_request_controller.dart

@@ -1,8 +1,8 @@
 import 'package:get/get.dart';
-import 'package:marco/helpers/services/api_service.dart';
-import 'package:marco/model/finance/payment_request_list_model.dart';
-import 'package:marco/model/finance/payment_request_filter.dart';
-import 'package:marco/helpers/services/app_logger.dart';
+import 'package:on_field_work/helpers/services/api_service.dart';
+import 'package:on_field_work/model/finance/payment_request_list_model.dart';
+import 'package:on_field_work/model/finance/payment_request_filter.dart';
+import 'package:on_field_work/helpers/services/app_logger.dart';
 
 class PaymentRequestController extends GetxController {
   // ---------------- Observables ----------------
@@ -32,13 +32,14 @@ class PaymentRequestController extends GetxController {
   Future<void> fetchPaymentRequestFilterOptions() async {
     try {
       final response = await ApiService.getExpensePaymentRequestFilterApi();
-      if (response != null) {
-        projects.assignAll(response.data.projects);
-        payees.assignAll(response.data.payees);
-        categories.assignAll(response.data.expenseCategory);
-        currencies.assignAll(response.data.currency);
-        statuses.assignAll(response.data.status);
-        createdBy.assignAll(response.data.createdBy);
+
+      if (response != null && response.data != null) {
+        projects.assignAll(response.data!.projects ?? []);
+        payees.assignAll(response.data!.payees ?? []);
+        categories.assignAll(response.data!.expenseCategory ?? []);
+        currencies.assignAll(response.data!.currency ?? []);
+        statuses.assignAll(response.data!.status ?? []);
+        createdBy.assignAll(response.data!.createdBy ?? []);
       } else {
         logSafe("Payment request filter API returned null",
             level: LogLevel.warning);
@@ -63,7 +64,7 @@ class PaymentRequestController extends GetxController {
     isLoading.value = false;
   }
 
-// ---------------- Load More ----------------
+  // ---------------- Load More ----------------
   Future<void> loadMorePaymentRequests() async {
     if (isLoading.value || !_hasMoreData) return;
 
@@ -74,7 +75,7 @@ class PaymentRequestController extends GetxController {
     isLoading.value = false;
   }
 
-// ---------------- Internal API Call ----------------
+  // ---------------- Internal API Call ----------------
   Future<void> _fetchPaymentRequestsFromApi() async {
     try {
       final response = await ApiService.getExpensePaymentRequestListApi(
@@ -84,17 +85,17 @@ class PaymentRequestController extends GetxController {
         searchString: searchString.value,
       );
 
-      if (response != null && response.data.data.isNotEmpty) {
+      final data = response?.data;
+      final reqList = data?.data ?? [];
+
+      if (response != null && data != null && reqList.isNotEmpty) {
         if (_pageNumber == 1) {
-          // First page, replace the list
-          paymentRequests.assignAll(response.data.data);
+          paymentRequests.assignAll(reqList);
         } else {
-          // Append next page items at the end
-          paymentRequests.addAll(response.data.data);
+          paymentRequests.addAll(reqList);
         }
 
-        // If returned data is less than page size, no more data
-        if (response.data.data.length < _pageSize) {
+        if (reqList.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:marco/helpers/services/api_service.dart';
-import 'package:marco/helpers/widgets/my_snackbar.dart';
-import 'package:marco/model/employees/employee_model.dart';
-import 'package:marco/model/finance/payment_request_details_model.dart';
-import 'package:marco/model/expense/payment_types_model.dart';
-import 'package:marco/helpers/widgets/time_stamp_image_helper.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/model/employees/employee_model.dart';
+import 'package:on_field_work/model/finance/payment_request_details_model.dart';
+import 'package:on_field_work/model/expense/payment_types_model.dart';
+import 'package:on_field_work/helpers/widgets/time_stamp_image_helper.dart';
 import 'package:image_picker/image_picker.dart';
 import 'dart:convert';
 import 'dart:io';
@@ -13,6 +13,7 @@ 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);
@@ -26,6 +27,8 @@ 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
@@ -278,6 +281,7 @@ class PaymentRequestDetailController extends GetxController {
     String? tdsPercentage,
   }) async {
     isLoading.value = true;
+
     try {
       final success = await ApiService.updateExpensePaymentRequestStatusApi(
         paymentRequestId: _requestId,
@@ -292,24 +296,14 @@ class PaymentRequestDetailController extends GetxController {
       );
 
       if (success) {
-        showAppSnackbar(
-            title: 'Success',
-            message: 'Payment submitted successfully',
-            type: SnackbarType.success);
+        // Controller refreshes the data but does not show snackbars.
         await fetchPaymentRequestDetail();
-      } else {
-        showAppSnackbar(
-            title: 'Error',
-            message: 'Failed to update status. Please try again.',
-            type: SnackbarType.error);
+        paymentRequestController.fetchPaymentRequests();
       }
 
       return success;
     } catch (e) {
-      showAppSnackbar(
-          title: 'Error',
-          message: 'Something went wrong: $e',
-          type: SnackbarType.error);
+      // Controller returns false on error; UI will show the snackbar.
       return false;
     } finally {
       isLoading.value = false;

lib/controller/infra_project/infra_project_screen_controller.dart

@@ -0,0 +1,48 @@
+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

@@ -0,0 +1,38 @@
+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:marco/controller/my_controller.dart';
+import 'package:on_field_work/controller/my_controller.dart';
 
 class AuthLayout2Controller extends MyController {}

lib/controller/layout/auth_layout_controller.dart

@@ -1,7 +1,7 @@
 import 'dart:async';
 
-import 'package:marco/controller/my_controller.dart';
-import 'package:marco/helpers/widgets/my_text_utils.dart';
+import 'package:on_field_work/controller/my_controller.dart';
+import 'package:on_field_work/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:marco/helpers/services/app_logger.dart';
-import 'package:marco/helpers/services/api_service.dart';
-import 'package:marco/helpers/theme/theme_customizer.dart';
-import 'package:marco/model/project_model.dart';
+import 'package:on_field_work/helpers/services/app_logger.dart';
+import 'package:on_field_work/helpers/services/api_service.dart';
+import 'package:on_field_work/helpers/theme/theme_customizer.dart';
+import 'package:on_field_work/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.getProjects();
+      final response = await ApiService.getGlobalProjects();
 
       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:marco/helpers/theme/theme_customizer.dart';
+import 'package:on_field_work/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:marco/helpers/services/app_logger.dart';
-import 'package:marco/helpers/services/permission_service.dart';
-import 'package:marco/model/user_permission.dart';
-import 'package:marco/model/employees/employee_info.dart';
-import 'package:marco/model/projects_model.dart';
+import 'package:on_field_work/helpers/services/app_logger.dart';
+import 'package:on_field_work/helpers/services/permission_service.dart';
+import 'package:on_field_work/model/user_permission.dart';
+import 'package:on_field_work/model/employees/employee_info.dart';
+import 'package:on_field_work/model/projects_model.dart';
 
 class PermissionController extends GetxController {
   var permissions = <UserPermission>[].obs;
@@ -15,6 +15,9 @@ 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();
@@ -52,6 +55,10 @@ 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);
@@ -103,7 +110,7 @@ class PermissionController extends GetxController {
   }
 
   void _startAutoRefresh() {
-    _refreshTimer = Timer.periodic(Duration(minutes: 30), (timer) async {
+    _refreshTimer = Timer.periodic(const Duration(minutes: 30), (timer) async {
       logSafe("Auto-refresh triggered.");
       final token = await _getAuthToken();
       if (token?.isNotEmpty ?? false) {
@@ -117,8 +124,6 @@ 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:marco/helpers/services/app_logger.dart'; 
-import 'package:marco/helpers/services/api_service.dart';
-import 'package:marco/model/global_project_model.dart';
-import 'package:marco/helpers/services/storage/local_storage.dart';
+import 'package:on_field_work/helpers/services/app_logger.dart'; 
+import 'package:on_field_work/helpers/services/api_service.dart';
+import 'package:on_field_work/model/global_project_model.dart';
+import 'package:on_field_work/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,56 +1,58 @@
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'package:marco/helpers/services/api_service.dart';
-import 'package:marco/model/employees/employee_model.dart';
-import 'package:marco/helpers/widgets/my_snackbar.dart';
-import 'package:marco/controller/service_project/service_project_details_screen_controller.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
+  // FORM CONTROLLERS
   final titleCtrl = TextEditingController();
   final descCtrl = TextEditingController();
   final tagCtrl = TextEditingController();
-  final FocusNode searchFocusNode = FocusNode();
-  final RxBool showEmployeePicker = true.obs;
+  final searchFocusNode = FocusNode();
 
-// Observables
+  // OBSERVABLES
   final startDate = Rx<DateTime?>(DateTime.now());
   final dueDate = Rx<DateTime?>(DateTime.now().add(const Duration(days: 1)));
+
   final enteredTags = <String>[].obs;
-
-  final employees = <EmployeeModel>[].obs;
   final selectedAssignees = <EmployeeModel>[].obs;
-  final isSearchingEmployees = false.obs;
 
-// Loading states
+  // Branches
+  final branches = <Branch>[].obs;
+  final selectedBranch = Rxn<Branch>();
+  final isBranchLoading = false.obs;
+
+  // Loading
   final isLoading = false.obs;
-  final isAllEmployeeLoading = false.obs;
-  final allEmployees = <EmployeeModel>[].obs;
-  final employeeSearchResults = <EmployeeModel>[].obs;
-
-  @override
-  void onInit() {
-    super.onInit();
-  }
 
   @override
   void onClose() {
     titleCtrl.dispose();
     descCtrl.dispose();
     tagCtrl.dispose();
+    searchFocusNode.dispose();
     super.onClose();
   }
 
-  /// Toggle employee selection
-  void toggleAssignee(EmployeeModel employee) {
-    if (selectedAssignees.contains(employee)) {
-      selectedAssignees.remove(employee);
-    } else {
-      selectedAssignees.add(employee);
+  // 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 Service Project Job API call
+  // CREATE JOB
   Future<void> createJob(String projectId) async {
     if (titleCtrl.text.trim().isEmpty || descCtrl.text.trim().isEmpty) {
       showAppSnackbar(
@@ -61,22 +63,34 @@ class AddServiceProjectJobController extends GetxController {
       return;
     }
 
-    final assigneeIds = selectedAssignees.map((e) => e.id).toList();
+    isLoading.value = true;
 
-    final success = await ApiService.createServiceProjectJobApi(
+    final jobId = await ApiService.createServiceProjectJobApi(
       title: titleCtrl.text.trim(),
       description: descCtrl.text.trim(),
       projectId: projectId,
-      assignees: assigneeIds.map((id) => {"id": id}).toList(),
+      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) => {"name": tag}).toList(),
+      tags: enteredTags
+          .map((tag) => {"id": null, "name": tag, "isActive": true})
+          .toList(),
     );
 
-    if (success) {
-      // 🔥 Auto-refresh job list in ServiceProjectDetailsController
+    isLoading.value = false;
+
+    if (jobId != null) {
       if (Get.isRegistered<ServiceProjectDetailsController>()) {
-        Get.find<ServiceProjectDetailsController>().refreshJobsAfterAdd();
+        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();

lib/controller/service_project/service_project_allocation_controller.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'package:marco/model/service_project/job_allocation_model.dart';
-import 'package:marco/helpers/services/api_service.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;

lib/controller/service_project/service_project_details_screen_controller.dart

@@ -1,15 +1,17 @@
 import 'package:get/get.dart';
-import 'package:marco/helpers/services/api_service.dart';
-import 'package:marco/model/service_project/service_projects_details_model.dart';
-import 'package:marco/model/service_project/job_list_model.dart';
-import 'package:marco/model/service_project/service_project_job_detail_model.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:marco/model/service_project/job_attendance_logs_model.dart';
-import 'package:marco/model/service_project/job_allocation_model.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 --------------------
@@ -17,6 +19,7 @@ class ServiceProjectDetailsController extends GetxController {
   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;
@@ -27,6 +30,8 @@ class ServiceProjectDetailsController extends GetxController {
   var errorMessage = ''.obs;
   var jobErrorMessage = ''.obs;
   var jobDetailErrorMessage = ''.obs;
+  final ImagePicker picker = ImagePicker();
+  var isProcessingAttachment = false.obs; 
 
   // Pagination
   var pageNumber = 1;
@@ -39,21 +44,56 @@ class ServiceProjectDetailsController extends GetxController {
   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(); // always load jobs even without projectId
+    fetchProjectJobs();
+    filteredJobList.value = jobList;
   }
 
   // -------------------- Project --------------------
   void setProjectId(String id) {
+    if (projectId.value == id) return;
     projectId.value = id;
-    fetchProjectDetail();
+
+    // Reset pagination and list
     pageNumber = 1;
     hasMoreJobs.value = true;
-    fetchProjectJobs(); // no initialLoad
+    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 {
@@ -83,6 +123,41 @@ class ServiceProjectDetailsController extends GetxController {
     }
   }
 
+  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";
@@ -135,33 +210,39 @@ class ServiceProjectDetailsController extends GetxController {
   }
 
   // -------------------- Job List (modified to always load) --------------------
-  Future<void> fetchProjectJobs() async {
-    if (!hasMoreJobs.value) return;
+  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, // allows empty projectId
+        projectId: projectId.value,
         pageNumber: pageNumber,
         pageSize: pageSize,
         isActive: true,
+        isArchive: showArchivedJobs.value,
       );
 
       if (result != null && result.data != null) {
         final newJobs = result.data?.data ?? [];
 
-        if (pageNumber == 1) {
+        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 job list";
+        jobErrorMessage.value = result?.message ?? "Failed to fetch jobs";
       }
     } catch (e) {
       jobErrorMessage.value = "Error fetching jobs: $e";
@@ -238,6 +319,91 @@ class ServiceProjectDetailsController extends GetxController {
     }
   }
 
+  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,

lib/controller/service_project/service_project_screen_controller.dart

@@ -1,6 +1,6 @@
 import 'package:get/get.dart';
-import 'package:marco/helpers/services/api_service.dart';
-import 'package:marco/model/service_project/service_projects_list_model.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;

lib/controller/task_planning/add_task_controller.dart

@@ -1,9 +1,9 @@
 import 'package:get/get.dart';
-import 'package:marco/helpers/services/app_logger.dart';
-import 'package:marco/helpers/services/api_service.dart';
-import 'package:marco/helpers/widgets/my_form_validator.dart';
-import 'package:marco/helpers/widgets/my_snackbar.dart';
-import 'package:marco/model/dailyTaskPlanning/master_work_category_model.dart';
+import 'package:on_field_work/helpers/services/app_logger.dart';
+import 'package:on_field_work/helpers/services/api_service.dart';
+import 'package:on_field_work/helpers/widgets/my_form_validator.dart';
+import 'package:on_field_work/helpers/widgets/my_snackbar.dart';
+import 'package:on_field_work/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:marco/helpers/services/app_logger.dart';
-import 'package:marco/helpers/services/api_service.dart';
-import 'package:marco/model/project_model.dart';
-import 'package:marco/model/dailyTaskPlanning/daily_task_model.dart';
-import 'package:marco/model/dailyTaskPlanning/daily_progress_report_filter_response_model.dart';
+import 'package:on_field_work/helpers/services/app_logger.dart';
+import 'package:on_field_work/helpers/services/api_service.dart';
+import 'package:on_field_work/model/project_model.dart';
+import 'package:on_field_work/model/dailyTaskPlanning/daily_task_model.dart';
+import 'package:on_field_work/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:marco/helpers/services/app_logger.dart';
-import 'package:marco/helpers/services/api_service.dart';
-import 'package:marco/helpers/widgets/my_form_validator.dart';
-import 'package:marco/helpers/widgets/my_snackbar.dart';
-import 'package:marco/model/project_model.dart';
-import 'package:marco/model/dailyTaskPlanning/daily_task_planning_model.dart';
-import 'package:marco/model/employees/employee_model.dart';
+import 'package:on_field_work/helpers/services/app_logger.dart';
+import 'package:on_field_work/helpers/services/api_service.dart';
+import 'package:on_field_work/helpers/widgets/my_form_validator.dart';
+import 'package:on_field_work/helpers/widgets/my_snackbar.dart';
+import 'package:on_field_work/model/project_model.dart';
+import 'package:on_field_work/model/dailyTaskPlanning/daily_task_planning_model.dart';
+import 'package:on_field_work/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:marco/helpers/services/app_logger.dart';
+import 'package:on_field_work/helpers/services/app_logger.dart';
 
-import 'package:marco/controller/my_controller.dart';
-import 'package:marco/controller/task_Planning/daily_task_Planning_controller.dart';
-import 'package:marco/helpers/services/api_service.dart';
-import 'package:marco/helpers/widgets/my_form_validator.dart';
-import 'package:marco/helpers/widgets/my_image_compressor.dart';
-import 'package:marco/helpers/widgets/my_snackbar.dart';
-import 'package:marco/model/dailyTaskPlanning/work_status_model.dart';
-import 'package:marco/helpers/widgets/time_stamp_image_helper.dart';
+import 'package:on_field_work/controller/my_controller.dart';
+import 'package:on_field_work/controller/task_Planning/daily_task_Planning_controller.dart';
+import 'package:on_field_work/helpers/services/api_service.dart';
+import 'package:on_field_work/helpers/widgets/my_form_validator.dart';
+import 'package:on_field_work/helpers/widgets/my_image_compressor.dart';
+import 'package:on_field_work/helpers/widgets/my_snackbar.dart';
+import 'package:on_field_work/model/dailyTaskPlanning/work_status_model.dart';
+import 'package:on_field_work/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:marco/controller/my_controller.dart';
-import 'package:marco/helpers/widgets/my_form_validator.dart';
-import 'package:marco/helpers/services/api_service.dart';
+import 'package:on_field_work/controller/my_controller.dart';
+import 'package:on_field_work/helpers/widgets/my_form_validator.dart';
+import 'package:on_field_work/helpers/services/api_service.dart';
 import 'package:get/get.dart';
-import 'package:marco/helpers/services/app_logger.dart';
-import 'package:marco/helpers/widgets/my_snackbar.dart';
-import 'package:marco/controller/task_Planning/daily_task_Planning_controller.dart';
+import 'package:on_field_work/helpers/services/app_logger.dart';
+import 'package:on_field_work/helpers/widgets/my_snackbar.dart';
+import 'package:on_field_work/controller/task_Planning/daily_task_Planning_controller.dart';
 import 'package:image_picker/image_picker.dart';
 import 'dart:io';
 import 'dart:convert';
-import 'package:marco/helpers/widgets/my_image_compressor.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';
 
 enum ApiStatus { idle, loading, success, failure }
 

lib/controller/tenant/all_organization_controller.dart

@@ -1,7 +1,7 @@
 import 'package:get/get.dart';
-import 'package:marco/helpers/services/app_logger.dart';
-import 'package:marco/helpers/services/api_service.dart';
-import 'package:marco/model/all_organization_model.dart';
+import 'package:on_field_work/helpers/services/app_logger.dart';
+import 'package:on_field_work/helpers/services/api_service.dart';
+import 'package:on_field_work/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:marco/helpers/services/app_logger.dart';
-import 'package:marco/helpers/services/api_service.dart';
-import 'package:marco/model/attendance/organization_per_project_list_model.dart';
+import 'package:on_field_work/helpers/services/app_logger.dart';
+import 'package:on_field_work/helpers/services/api_service.dart';
+import 'package:on_field_work/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:marco/helpers/services/api_service.dart';
-import 'package:marco/helpers/services/app_logger.dart';
-import 'package:marco/model/tenant/tenant_services_model.dart';
+import 'package:on_field_work/helpers/services/api_service.dart';
+import 'package:on_field_work/helpers/services/app_logger.dart';
+import 'package:on_field_work/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:marco/helpers/services/app_logger.dart';
-import 'package:marco/helpers/services/tenant_service.dart';
-import 'package:marco/model/tenant/tenant_list_model.dart';
-import 'package:marco/helpers/widgets/my_snackbar.dart';
-import 'package:marco/helpers/services/storage/local_storage.dart';
-import 'package:marco/controller/permission_controller.dart';
+import 'package:on_field_work/helpers/services/app_logger.dart';
+import 'package:on_field_work/helpers/services/tenant_service.dart';
+import 'package:on_field_work/model/tenant/tenant_list_model.dart';
+import 'package:on_field_work/helpers/widgets/my_snackbar.dart';
+import 'package:on_field_work/helpers/services/storage/local_storage.dart';
+import 'package:on_field_work/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:marco/helpers/services/app_logger.dart';
-import 'package:marco/helpers/services/tenant_service.dart';
-import 'package:marco/model/tenant/tenant_list_model.dart';
-import 'package:marco/helpers/widgets/my_snackbar.dart';
-import 'package:marco/helpers/services/storage/local_storage.dart';
-import 'package:marco/controller/permission_controller.dart';
+import 'package:on_field_work/helpers/services/app_logger.dart';
+import 'package:on_field_work/helpers/services/tenant_service.dart';
+import 'package:on_field_work/model/tenant/tenant_list_model.dart';
+import 'package:on_field_work/helpers/widgets/my_snackbar.dart';
+import 'package:on_field_work/helpers/services/storage/local_storage.dart';
+import 'package:on_field_work/controller/permission_controller.dart';
 
 class TenantSwitchController extends GetxController {
   final TenantService _tenantService = TenantService();

lib/controller/ui/buttons_controller.dart

@@ -1,4 +1,4 @@
-import 'package:marco/controller/my_controller.dart';
+import 'package:on_field_work/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:marco/controller/my_controller.dart';
+import 'package:on_field_work/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:marco/controller/my_controller.dart';
-import 'package:marco/helpers/widgets/my_text_utils.dart';
+import 'package:on_field_work/controller/my_controller.dart';
+import 'package:on_field_work/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:marco/controller/my_controller.dart';
+import 'package:on_field_work/controller/my_controller.dart';
 
 class LoadersController extends MyController {}

lib/controller/ui/modal_controller.dart

@@ -1,5 +1,5 @@
-import 'package:marco/controller/my_controller.dart';
-import 'package:marco/helpers/widgets/my_text_utils.dart';
+import 'package:on_field_work/controller/my_controller.dart';
+import 'package:on_field_work/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:marco/controller/my_controller.dart';
-import 'package:marco/helpers/extensions/string.dart';
-import 'package:marco/helpers/theme/admin_theme.dart';
-import 'package:marco/helpers/widgets/my_button.dart';
-import 'package:marco/helpers/widgets/my_spacing.dart';
-import 'package:marco/helpers/widgets/my_text.dart';
+import 'package:on_field_work/controller/my_controller.dart';
+import 'package:on_field_work/helpers/extensions/string.dart';
+import 'package:on_field_work/helpers/theme/admin_theme.dart';
+import 'package:on_field_work/helpers/widgets/my_button.dart';
+import 'package:on_field_work/helpers/widgets/my_spacing.dart';
+import 'package:on_field_work/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:marco/controller/my_controller.dart';
-import 'package:marco/helpers/widgets/my_text_utils.dart';
+import 'package:on_field_work/controller/my_controller.dart';
+import 'package:on_field_work/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:marco/controller/my_controller.dart';
+import 'package:on_field_work/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:marco/helpers/services/localizations/language.dart';
-import 'package:marco/helpers/theme/app_notifier.dart';
+import 'package:on_field_work/helpers/services/localizations/language.dart';
+import 'package:on_field_work/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:marco/helpers/services/localizations/translator.dart';
+import 'package:on_field_work/helpers/services/localizations/translator.dart';
 
 extension StringUtil on String {
   Color get toColor {

lib/helpers/services/api_endpoints.dart

@@ -3,6 +3,8 @@ class ApiEndpoints {
   // 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 =
@@ -34,6 +36,10 @@ 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";
@@ -42,6 +48,7 @@ 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";
@@ -145,8 +152,19 @@ class ApiEndpoints {
   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 = "/job/attendance/log";
+  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/api_service.dart

@@ -4,41 +4,50 @@ import 'package:http/http.dart' as http;
 import 'package:image_picker/image_picker.dart';
 import 'package:intl/intl.dart';
 
-import 'package:marco/helpers/services/auth_service.dart';
-import 'package:marco/helpers/services/api_endpoints.dart';
-import 'package:marco/helpers/services/storage/local_storage.dart';
+import 'package:on_field_work/helpers/services/auth_service.dart';
+import 'package:on_field_work/helpers/services/api_endpoints.dart';
+import 'package:on_field_work/helpers/services/storage/local_storage.dart';
 import 'package:jwt_decoder/jwt_decoder.dart';
-import 'package:marco/model/dashboard/project_progress_model.dart';
-import 'package:marco/model/dashboard/dashboard_tasks_model.dart';
-import 'package:marco/model/dashboard/dashboard_teams_model.dart';
-import 'package:marco/helpers/services/app_logger.dart';
-import 'package:marco/model/document/document_filter_model.dart';
-import 'package:marco/model/document/documents_list_model.dart';
-import 'package:marco/model/document/master_document_tags.dart';
-import 'package:marco/model/document/master_document_type_model.dart';
-import 'package:marco/model/document/document_details_model.dart';
-import 'package:marco/model/document/document_version_model.dart';
-import 'package:marco/model/attendance/organization_per_project_list_model.dart';
-import 'package:marco/model/tenant/tenant_services_model.dart';
-import 'package:marco/model/dailyTaskPlanning/daily_task_model.dart';
-import 'package:marco/model/dailyTaskPlanning/daily_progress_report_filter_response_model.dart';
-import 'package:marco/model/all_organization_model.dart';
-import 'package:marco/model/dashboard/pending_expenses_model.dart';
-import 'package:marco/model/dashboard/expense_type_report_model.dart';
-import 'package:marco/model/dashboard/monthly_expence_model.dart';
-import 'package:marco/model/finance/expense_category_model.dart';
-import 'package:marco/model/finance/currency_list_model.dart';
-import 'package:marco/model/finance/payment_payee_request_model.dart';
-import 'package:marco/model/finance/payment_request_list_model.dart';
-import 'package:marco/model/finance/payment_request_filter.dart';
-import 'package:marco/model/finance/payment_request_details_model.dart';
-import 'package:marco/model/finance/advance_payment_model.dart';
-import 'package:marco/model/service_project/service_projects_list_model.dart';
-import 'package:marco/model/service_project/service_projects_details_model.dart';
-import 'package:marco/model/service_project/job_list_model.dart';
-import 'package:marco/model/service_project/service_project_job_detail_model.dart';
-import 'package:marco/model/service_project/job_attendance_logs_model.dart';
-import 'package:marco/model/service_project/job_allocation_model.dart';
+import 'package:on_field_work/model/dashboard/project_progress_model.dart';
+import 'package:on_field_work/model/dashboard/dashboard_tasks_model.dart';
+import 'package:on_field_work/model/dashboard/dashboard_teams_model.dart';
+import 'package:on_field_work/helpers/services/app_logger.dart';
+import 'package:on_field_work/model/document/document_filter_model.dart';
+import 'package:on_field_work/model/document/documents_list_model.dart';
+import 'package:on_field_work/model/document/master_document_tags.dart';
+import 'package:on_field_work/model/document/master_document_type_model.dart';
+import 'package:on_field_work/model/document/document_details_model.dart';
+import 'package:on_field_work/model/document/document_version_model.dart';
+import 'package:on_field_work/model/attendance/organization_per_project_list_model.dart';
+import 'package:on_field_work/model/tenant/tenant_services_model.dart';
+import 'package:on_field_work/model/dailyTaskPlanning/daily_task_model.dart';
+import 'package:on_field_work/model/dailyTaskPlanning/daily_progress_report_filter_response_model.dart';
+import 'package:on_field_work/model/all_organization_model.dart';
+import 'package:on_field_work/model/dashboard/pending_expenses_model.dart';
+import 'package:on_field_work/model/dashboard/expense_type_report_model.dart';
+import 'package:on_field_work/model/dashboard/monthly_expence_model.dart';
+import 'package:on_field_work/model/finance/expense_category_model.dart';
+import 'package:on_field_work/model/finance/currency_list_model.dart';
+import 'package:on_field_work/model/finance/payment_payee_request_model.dart';
+import 'package:on_field_work/model/finance/payment_request_list_model.dart';
+import 'package:on_field_work/model/finance/payment_request_filter.dart';
+import 'package:on_field_work/model/finance/payment_request_details_model.dart';
+import 'package:on_field_work/model/finance/advance_payment_model.dart';
+import 'package:on_field_work/model/service_project/service_projects_list_model.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: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/service_project_branches_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 'package:on_field_work/model/employees/employee_model.dart';
+import 'package:on_field_work/model/infra_project/infra_project_list.dart';
+import 'package:on_field_work/model/infra_project/infra_project_details.dart';
+import 'package:on_field_work/model/dashboard/collection_overview_model.dart';
+import 'package:on_field_work/model/dashboard/purchase_invoice_model.dart';
+
 
 class ApiService {
   static const bool enableLogs = true;
@@ -310,6 +319,319 @@ class ApiService {
     }
   }
 
+
+   /// ============================================
+  /// GET PURCHASE INVOICE OVERVIEW (Dashboard)
+  /// ============================================
+  static Future<PurchaseInvoiceOverviewResponse?> getPurchaseInvoiceOverview({
+    String? projectId,
+  }) async {
+    try {
+      final queryParams = <String, String>{};
+      if (projectId != null && projectId.isNotEmpty) {
+        queryParams['projectId'] = projectId;
+      }
+
+      final response = await _getRequest(
+        ApiEndpoints.getPurchaseInvoiceOverview,
+        queryParams: queryParams,
+      );
+
+      if (response == null) {
+        _log("getPurchaseInvoiceOverview: No response from server",
+            level: LogLevel.error);
+        return null;
+      }
+
+      final parsedJson = _parseResponseForAllData(
+        response,
+        label: "PurchaseInvoiceOverview",
+      );
+
+      if (parsedJson == null) return null;
+
+      return PurchaseInvoiceOverviewResponse.fromJson(parsedJson);
+    } catch (e, stack) {
+      _log("Exception in getPurchaseInvoiceOverview: $e\n$stack",
+          level: LogLevel.error);
+      return null;
+    }
+  }
+  /// ============================================
+  /// GET COLLECTION OVERVIEW (Dashboard)
+  /// ============================================
+  static Future<CollectionOverviewResponse?> getCollectionOverview({
+    String? projectId,
+  }) async {
+    try {
+      // Build query params (only add projectId if not null)
+      final queryParams = <String, String>{};
+      if (projectId != null && projectId.isNotEmpty) {
+        queryParams['projectId'] = projectId;
+      }
+
+      final response = await _getRequest(
+        ApiEndpoints.getCollectionOverview,
+        queryParams: queryParams,
+      );
+
+      if (response == null) {
+        _log("getCollectionOverview: No response from server",
+            level: LogLevel.error);
+        return null;
+      }
+
+      // Parse full JSON (success, message, data, etc.)
+      final parsedJson =
+          _parseResponseForAllData(response, label: "CollectionOverview");
+
+      if (parsedJson == null) return null;
+
+      return CollectionOverviewResponse.fromJson(parsedJson);
+    } catch (e, stack) {
+      _log("Exception in getCollectionOverview: $e\n$stack",
+          level: LogLevel.error);
+      return null;
+    }
+  }
+
+// Infra Project Module APIs
+
+  /// ================================
+  /// GET INFRA PROJECT DETAILS
+  /// ================================
+  static Future<ProjectDetailsResponse?> getInfraProjectDetails({
+    required String projectId,
+  }) async {
+    final endpoint = "${ApiEndpoints.getInfraProjectDetail}/$projectId";
+
+    try {
+      final response = await _getRequest(endpoint);
+
+      if (response == null) {
+        _log("getInfraProjectDetails: No response from server",
+            level: LogLevel.error);
+        return null;
+      }
+
+      final parsedJson =
+          _parseResponseForAllData(response, label: "InfraProjectDetails");
+
+      if (parsedJson == null) return null;
+
+      return ProjectDetailsResponse.fromJson(parsedJson);
+    } catch (e, stack) {
+      _log("Exception in getInfraProjectDetails: $e\n$stack",
+          level: LogLevel.error);
+      return null;
+    }
+  }
+
+  /// ================================
+  /// GET INFRA PROJECTS LIST
+  /// ================================
+  static Future<ProjectsResponse?> getInfraProjectsList({
+    int pageSize = 20,
+    int pageNumber = 1,
+    String searchString = "",
+  }) async {
+    final queryParams = {
+      "pageSize": pageSize.toString(),
+      "pageNumber": pageNumber.toString(),
+      "searchString": searchString,
+    };
+
+    try {
+      final response = await _getRequest(
+        ApiEndpoints.getInfraProjectsList,
+        queryParams: queryParams,
+      );
+
+      if (response == null) {
+        _log("getInfraProjectsList: No response from server",
+            level: LogLevel.error);
+        return null;
+      }
+
+      final parsedJson =
+          _parseResponseForAllData(response, label: "InfraProjectsList");
+
+      if (parsedJson == null) return null;
+
+      return ProjectsResponse.fromJson(parsedJson);
+    } catch (e, stack) {
+      _log("Exception in getInfraProjectsList: $e\n$stack",
+          level: LogLevel.error);
+      return null;
+    }
+  }
+
+  static Future<JobCommentResponse?> getJobCommentList({
+    required String jobTicketId,
+    int pageNumber = 1,
+    int pageSize = 20,
+  }) async {
+    final queryParams = {
+      'jobTicketId': jobTicketId,
+      'pageNumber': pageNumber.toString(),
+      'pageSize': pageSize.toString(),
+    };
+
+    try {
+      final response = await _getRequest(
+        ApiEndpoints.getJobCommentList,
+        queryParams: queryParams,
+      );
+
+      if (response == null) {
+        _log("getJobCommentList: No response from server",
+            level: LogLevel.error);
+        return null;
+      }
+
+      final parsedJson =
+          _parseResponseForAllData(response, label: "JobCommentList");
+      if (parsedJson == null) return null;
+
+      return JobCommentResponse.fromJson(parsedJson);
+    } catch (e, stack) {
+      _log("Exception in getJobCommentList: $e\n$stack", level: LogLevel.error);
+      return null;
+    }
+  }
+
+  static Future<bool> addJobComment({
+    required String jobTicketId,
+    required String comment,
+    List<Map<String, dynamic>> attachments = const [],
+  }) async {
+    final body = {
+      "jobTicketId": jobTicketId,
+      "comment": comment,
+      "attachments": attachments,
+    };
+
+    try {
+      final response = await _postRequest(
+        ApiEndpoints.addJobComment,
+        body,
+      );
+
+      if (response == null) {
+        _log("addJobComment: No response from server", level: LogLevel.error);
+        return false;
+      }
+
+      // Handle 201 Created as success manually
+      if (response.statusCode == 201) {
+        _log("AddJobComment: Comment added successfully (201).",
+            level: LogLevel.info);
+        return true;
+      }
+
+      // Otherwise fallback to existing _parseResponse
+      final parsed = _parseResponse(response, label: "AddJobComment");
+
+      if (parsed != null && parsed['success'] == true) {
+        _log("AddJobComment: Comment added successfully.",
+            level: LogLevel.info);
+        return true;
+      } else {
+        _log(
+          "AddJobComment failed: ${parsed?['message'] ?? 'Unknown error'}",
+          level: LogLevel.error,
+        );
+        return false;
+      }
+    } catch (e, stack) {
+      _log("Exception in addJobComment: $e\n$stack", level: LogLevel.error);
+      return false;
+    }
+  }
+
+  static Future<List<JobStatus>?> getMasterJobStatus({
+    required String statusId,
+    required String projectId,
+  }) async {
+    final queryParams = {
+      'statusId': statusId,
+      'projectId': projectId,
+    };
+
+    try {
+      final response = await _getRequest(
+        ApiEndpoints.getMasterJobStatus,
+        queryParams: queryParams,
+      );
+
+      if (response == null) {
+        _log("getMasterJobStatus: No response received.");
+        return null;
+      }
+
+      final parsedJson =
+          _parseResponseForAllData(response, label: "MasterJobStatus");
+
+      if (parsedJson == null) return null;
+
+      // Directly parse JobStatus list
+      final dataList = (parsedJson['data'] as List<dynamic>?)
+          ?.map((e) => JobStatus.fromJson(e))
+          .toList();
+
+      return dataList;
+    } catch (e, stack) {
+      _log("Exception in getMasterJobStatus: $e\n$stack",
+          level: LogLevel.error);
+      return null;
+    }
+  }
+
+  /// Fetch Service Project Branches with full response
+  static Future<ServiceProjectBranchesResponse?> getServiceProjectBranchesFull({
+    required String projectId,
+    int pageNumber = 1,
+    int pageSize = 20,
+    String searchString = '',
+    bool isActive = true,
+  }) async {
+    final queryParams = {
+      'pageNumber': pageNumber.toString(),
+      'pageSize': pageSize.toString(),
+      'searchString': searchString,
+      'isActive': isActive.toString(),
+    };
+
+    final endpoint = "${ApiEndpoints.getServiceProjectBranches}/$projectId";
+
+    try {
+      final response = await _getRequest(
+        endpoint,
+        queryParams: queryParams,
+      );
+
+      if (response == null) {
+        _log("getServiceProjectBranchesFull: No response received.");
+        return null;
+      }
+
+      final parsedJson = _parseResponseForAllData(
+        response,
+        label: "ServiceProjectBranchesFull",
+      );
+
+      if (parsedJson == null) return null;
+
+      return ServiceProjectBranchesResponse.fromJson(parsedJson);
+    } catch (e, stack) {
+      _log(
+        "Exception in getServiceProjectBranchesFull: $e\n$stack",
+        level: LogLevel.error,
+      );
+      return null;
+    }
+  }
+
   // Service Project Module APIs
   static Future<List<TeamRole>?> getTeamRoles() async {
     try {
@@ -549,8 +871,7 @@ class ApiService {
     return null;
   }
 
-  /// Create a new Service Project Job
-  static Future<bool> createServiceProjectJobApi({
+  static Future<String?> createServiceProjectJobApi({
     required String title,
     required String description,
     required String projectId,
@@ -558,6 +879,7 @@ class ApiService {
     required DateTime startDate,
     required DateTime dueDate,
     required List<Map<String, dynamic>> tags,
+    required String? branchId,
   }) async {
     const endpoint = ApiEndpoints.createServiceProjectJob;
     logSafe("Creating Service Project Job for projectId: $projectId");
@@ -570,49 +892,43 @@ class ApiService {
       "startDate": startDate.toIso8601String(),
       "dueDate": dueDate.toIso8601String(),
       "tags": tags,
+      "projectBranchId": branchId,
     };
 
     try {
       final response = await _postRequest(endpoint, body);
 
-      if (response == null) {
-        logSafe("Create Service Project Job failed: null response",
-            level: LogLevel.error);
-        return false;
-      }
-
-      logSafe(
-          "Create Service Project Job response status: ${response.statusCode}");
-      logSafe("Create Service Project Job response body: ${response.body}");
+      if (response == null) return null;
 
       final json = jsonDecode(response.body);
+
       if (json['success'] == true) {
-        logSafe("Service Project Job created successfully: ${json['data']}");
-        return true;
-      } else {
-        logSafe(
-          "Failed to create Service Project Job: ${json['message'] ?? 'Unknown error'}",
-          level: LogLevel.warning,
-        );
-        return false;
+        final jobId = json['data']?['id'];
+        logSafe("Service Project Job created successfully: $jobId");
+        return jobId;
       }
+
+      return null;
     } catch (e, stack) {
       logSafe("Exception during createServiceProjectJobApi: $e",
           level: LogLevel.error);
       logSafe("StackTrace: $stack", level: LogLevel.debug);
-      return false;
+      return null;
     }
   }
 
-  /// Get Service Project Job List
+  /// Get Service Project Job List (Active or Archived)
   static Future<JobResponse?> getServiceProjectJobListApi({
     required String projectId,
     int pageNumber = 1,
     int pageSize = 20,
     bool isActive = true,
+    bool isArchive = false, // new parameter to fetch archived jobs
   }) async {
     const endpoint = ApiEndpoints.getServiceProjectJobList;
-    logSafe("Fetching Job List for Service Project: $projectId");
+    logSafe(
+      "Fetching Job List for Service Project: $projectId | isActive: $isActive | isArchive: $isArchive",
+    );
 
     try {
       final queryParams = {
@@ -620,27 +936,34 @@ class ApiService {
         'pageNumber': pageNumber.toString(),
         'pageSize': pageSize.toString(),
         'isActive': isActive.toString(),
+        if (isArchive) 'isArchive': 'true',
       };
 
       final response = await _getRequest(endpoint, queryParams: queryParams);
 
       if (response == null) {
-        logSafe("Service Project Job List request failed: null response",
-            level: LogLevel.error);
+        logSafe(
+          "Service Project Job List request failed: null response",
+          level: LogLevel.error,
+        );
         return null;
       }
 
       final jsonResponse = _parseResponseForAllData(
         response,
-        label: "Service Project Job List",
+        label: isArchive
+            ? "Archived Service Project Job List"
+            : "Active Service Project Job List",
       );
 
       if (jsonResponse != null) {
         return JobResponse.fromJson(jsonResponse);
       }
     } catch (e, stack) {
-      logSafe("Exception during getServiceProjectJobListApi: $e",
-          level: LogLevel.error);
+      logSafe(
+        "Exception during getServiceProjectJobListApi: $e",
+        level: LogLevel.error,
+      );
       logSafe("StackTrace: $stack", level: LogLevel.debug);
     }
 
@@ -1281,14 +1604,14 @@ class ApiService {
     return null;
   }
 
-  /// Get Expense Type Report
+  /// Get Expense Category Report
   static Future<ExpenseTypeReportResponse?> getExpenseTypeReportApi({
     required String projectId,
     required DateTime startDate,
     required DateTime endDate,
   }) async {
     const endpoint = ApiEndpoints.getExpenseTypeReport;
-    logSafe("Fetching Expense Type Report for projectId: $projectId");
+    logSafe("Fetching Expense Category Report for projectId: $projectId");
 
     try {
       final response = await _getRequest(
@@ -1301,13 +1624,13 @@ class ApiService {
       );
 
       if (response == null) {
-        logSafe("Expense Type Report request failed: null response",
+        logSafe("Expense Category Report request failed: null response",
             level: LogLevel.error);
         return null;
       }
 
       final jsonResponse =
-          _parseResponseForAllData(response, label: "Expense Type Report");
+          _parseResponseForAllData(response, label: "Expense Category Report");
 
       if (jsonResponse != null) {
         return ExpenseTypeReportResponse.fromJson(jsonResponse);
@@ -2380,11 +2703,11 @@ class ApiService {
         : null);
   }
 
-  /// Fetch Master Expense Types
+  /// Fetch Master Expense Categorys
   static Future<List<dynamic>?> getMasterExpenseTypes() async {
     const endpoint = ApiEndpoints.getMasterExpenseCategory;
     return _getRequest(endpoint).then((res) => res != null
-        ? _parseResponse(res, label: 'Master Expense Types')
+        ? _parseResponse(res, label: 'Master Expense Categorys')
         : null);
   }
 
@@ -3150,6 +3473,30 @@ class ApiService {
             res != null ? _parseResponse(res, label: 'Employees') : null);
   }
 
+  static Future<List<EmployeeModel>?> getAttendanceForDashboard(
+      String projectId) async {
+    String endpoint = ApiEndpoints.getAttendanceForDashboard.replaceFirst(
+      ':projectId',
+      projectId,
+    );
+
+    final res = await _getRequest(endpoint);
+
+    if (res == null) return null;
+
+    final data = _parseResponse(res, label: 'Dashboard Attendance');
+    if (data == null) return null;
+
+    // Wrap single object in a list if needed
+    if (data is Map<String, dynamic>) {
+      return [EmployeeModel.fromJson(data)];
+    } else if (data is List) {
+      return data.map((e) => EmployeeModel.fromJson(e)).toList();
+    }
+
+    return null;
+  }
+
   static Future<List<dynamic>?> getRegularizationLogs(
     String projectId, {
     String? organizationId,

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:marco/helpers/services/storage/local_storage.dart';
-import 'package:marco/helpers/services/app_logger.dart';
-import 'package:marco/helpers/services/auth_service.dart';
-import 'package:marco/helpers/services/firebase/firebase_messaging_service.dart';
-import 'package:marco/helpers/services/device_info_service.dart';
-import 'package:marco/helpers/theme/theme_customizer.dart';
-import 'package:marco/helpers/theme/app_theme.dart';
+import 'package:on_field_work/helpers/services/storage/local_storage.dart';
+import 'package:on_field_work/helpers/services/app_logger.dart';
+import 'package:on_field_work/helpers/services/auth_service.dart';
+import 'package:on_field_work/helpers/services/firebase/firebase_messaging_service.dart';
+import 'package:on_field_work/helpers/services/device_info_service.dart';
+import 'package:on_field_work/helpers/theme/theme_customizer.dart';
+import 'package:on_field_work/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:marco/helpers/services/api_service.dart';
+import 'package:on_field_work/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:marco/helpers/services/api_endpoints.dart';
-import 'package:marco/helpers/services/storage/local_storage.dart';
-import 'package:marco/helpers/services/app_logger.dart';
+import 'package:on_field_work/helpers/services/api_endpoints.dart';
+import 'package:on_field_work/helpers/services/storage/local_storage.dart';
+import 'package:on_field_work/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:marco/helpers/services/local_notification_service.dart';
-import 'package:marco/helpers/services/storage/local_storage.dart';
-import 'package:marco/helpers/services/auth_service.dart';
-import 'package:marco/helpers/services/notification_action_handler.dart';
+import 'package:on_field_work/helpers/services/local_notification_service.dart';
+import 'package:on_field_work/helpers/services/storage/local_storage.dart';
+import 'package:on_field_work/helpers/services/auth_service.dart';
+import 'package:on_field_work/helpers/services/notification_action_handler.dart';
 
 /// Firebase Notification Service
 class FirebaseNotificationService {

lib/helpers/services/localizations/language.dart

@@ -1,5 +1,5 @@
-import 'package:marco/helpers/services/storage/local_storage.dart';
-import 'package:marco/helpers/theme/theme_customizer.dart';
+import 'package:on_field_work/helpers/services/storage/local_storage.dart';
+import 'package:on_field_work/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:marco/helpers/services/localizations/language.dart';
+import 'package:on_field_work/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:marco/controller/attendance/attendance_screen_controller.dart';
-import 'package:marco/controller/task_planning/daily_task_controller.dart';
-import 'package:marco/controller/task_Planning/daily_task_Planning_controller.dart';
-import 'package:marco/controller/expense/expense_screen_controller.dart';
-import 'package:marco/controller/expense/expense_detail_controller.dart';
-import 'package:marco/controller/directory/directory_controller.dart';
-import 'package:marco/controller/directory/notes_controller.dart';
-import 'package:marco/controller/document/user_document_controller.dart';
-import 'package:marco/controller/document/document_details_controller.dart';
-import 'package:marco/controller/dashboard/dashboard_controller.dart';
-import 'package:marco/helpers/utils/permission_constants.dart';
+import 'package:on_field_work/controller/attendance/attendance_screen_controller.dart';
+import 'package:on_field_work/controller/task_planning/daily_task_controller.dart';
+import 'package:on_field_work/controller/task_Planning/daily_task_Planning_controller.dart';
+import 'package:on_field_work/controller/expense/expense_screen_controller.dart';
+import 'package:on_field_work/controller/expense/expense_detail_controller.dart';
+import 'package:on_field_work/controller/directory/directory_controller.dart';
+import 'package:on_field_work/controller/directory/notes_controller.dart';
+import 'package:on_field_work/controller/document/user_document_controller.dart';
+import 'package:on_field_work/controller/document/document_details_controller.dart';
+import 'package:on_field_work/controller/dashboard/dashboard_controller.dart';
+import 'package:on_field_work/helpers/utils/permission_constants.dart';
 
 /// Handles incoming FCM notification actions and updates UI/controllers.
 class NotificationActionHandler {
@@ -414,12 +414,17 @@ 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(notFoundMessage);
+      _logger.w('⚠️ Error updating controller: $e');
     }
   }
 }

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:marco/helpers/services/app_logger.dart';
-import 'package:marco/model/user_permission.dart';
-import 'package:marco/model/employees/employee_info.dart';
-import 'package:marco/model/projects_model.dart';
-import 'package:marco/helpers/services/storage/local_storage.dart';
-import 'package:marco/helpers/services/auth_service.dart';
-import 'package:marco/helpers/services/api_endpoints.dart';
+import 'package:on_field_work/helpers/services/app_logger.dart';
+import 'package:on_field_work/model/user_permission.dart';
+import 'package:on_field_work/model/employees/employee_info.dart';
+import 'package:on_field_work/model/projects_model.dart';
+import 'package:on_field_work/helpers/services/storage/local_storage.dart';
+import 'package:on_field_work/helpers/services/auth_service.dart';
+import 'package:on_field_work/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:marco/controller/project_controller.dart';
-import 'package:marco/helpers/services/auth_service.dart';
-import 'package:marco/helpers/services/localizations/language.dart';
-import 'package:marco/helpers/theme/theme_customizer.dart';
-import 'package:marco/model/employees/employee_info.dart';
-import 'package:marco/model/user_permission.dart';
-import 'package:marco/model/dynamicMenu/dynamic_menu_model.dart';
+import 'package:on_field_work/controller/project_controller.dart';
+import 'package:on_field_work/helpers/services/auth_service.dart';
+import 'package:on_field_work/helpers/services/localizations/language.dart';
+import 'package:on_field_work/helpers/theme/theme_customizer.dart';
+import 'package:on_field_work/model/employees/employee_info.dart';
+import 'package:on_field_work/model/user_permission.dart';
+import 'package:on_field_work/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:marco/controller/project_controller.dart';
+import 'package:on_field_work/controller/project_controller.dart';
 
-import 'package:marco/helpers/services/api_endpoints.dart';
-import 'package:marco/helpers/services/storage/local_storage.dart';
-import 'package:marco/helpers/services/app_logger.dart';
-import 'package:marco/helpers/services/auth_service.dart';
-import 'package:marco/model/tenant/tenant_list_model.dart';
+import 'package:on_field_work/helpers/services/api_endpoints.dart';
+import 'package:on_field_work/helpers/services/storage/local_storage.dart';
+import 'package:on_field_work/helpers/services/app_logger.dart';
+import 'package:on_field_work/helpers/services/auth_service.dart';
+import 'package:on_field_work/model/tenant/tenant_list_model.dart';
 
 /// Abstract interface for tenant service functionality
 abstract class ITenantService {
@@ -63,29 +63,39 @@ 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(Uri.parse("$_baseUrl/auth/get/user/tenants"), headers: headers);
-      final data = jsonDecode(response.body);
+      final response = await http.get(
+        Uri.parse("$_baseUrl/auth/get/user/tenants"),
+        headers: headers,
+      );
 
-      logSafe(
-          "⬅️ Response: ${jsonEncode(data)} [Status: ${response.statusCode}]",
-          level: LogLevel.info);
-
-      if (response.statusCode == 200 && data['success'] == true) {
-        logSafe("✅ Tenants fetched successfully.");
-        return List<Map<String, dynamic>>.from(data['data']);
+      // ✅ Handle empty response BEFORE decoding
+      if (response.body.isEmpty || response.body.trim().isEmpty) {
+        logSafe("❌ Empty tenant response — auto logout");
+        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'];
+        if (list is! List) return null;
+        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;
       }
 
@@ -130,7 +140,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:marco/helpers/theme/theme_customizer.dart';
+import 'package:on_field_work/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:marco/helpers/services/localizations/language.dart';
-import 'package:marco/helpers/services/storage/local_storage.dart';
-import 'package:marco/helpers/theme/app_theme.dart';
-import 'package:marco/helpers/theme/theme_customizer.dart';
-import 'package:marco/helpers/widgets/my.dart';
+import 'package:on_field_work/helpers/services/localizations/language.dart';
+import 'package:on_field_work/helpers/services/storage/local_storage.dart';
+import 'package:on_field_work/helpers/theme/app_theme.dart';
+import 'package:on_field_work/helpers/theme/theme_customizer.dart';
+import 'package:on_field_work/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:marco/helpers/theme/admin_theme.dart';
-import 'package:marco/helpers/theme/theme_customizer.dart';
-import 'package:marco/helpers/widgets/my.dart';
-import 'package:marco/helpers/widgets/my_breadcrumb_item.dart';
-import 'package:marco/helpers/widgets/my_constant.dart';
-import 'package:marco/helpers/widgets/my_screen_media.dart';
-import 'package:marco/helpers/widgets/my_text_style.dart';
+import 'package:on_field_work/helpers/theme/admin_theme.dart';
+import 'package:on_field_work/helpers/theme/theme_customizer.dart';
+import 'package:on_field_work/helpers/widgets/my.dart';
+import 'package:on_field_work/helpers/widgets/my_breadcrumb_item.dart';
+import 'package:on_field_work/helpers/widgets/my_constant.dart';
+import 'package:on_field_work/helpers/widgets/my_screen_media.dart';
+import 'package:on_field_work/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: 'Marco', route: '/client/dashboard'),
+      defaultBreadCrumbItem: MyBreadcrumbItem(name: 'On Field Work', 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:marco/helpers/services/json_decoder.dart';
-import 'package:marco/helpers/services/localizations/language.dart';
-import 'package:marco/helpers/services/localizations/translator.dart';
-import 'package:marco/helpers/services/navigation_services.dart';
-import 'package:marco/helpers/theme/admin_theme.dart';
-import 'package:marco/helpers/theme/app_notifier.dart';
-import 'package:marco/helpers/theme/app_theme.dart';
+import 'package:on_field_work/helpers/services/json_decoder.dart';
+import 'package:on_field_work/helpers/services/localizations/language.dart';
+import 'package:on_field_work/helpers/services/localizations/translator.dart';
+import 'package:on_field_work/helpers/services/navigation_services.dart';
+import 'package:on_field_work/helpers/theme/admin_theme.dart';
+import 'package:on_field_work/helpers/theme/app_notifier.dart';
+import 'package:on_field_work/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:marco/helpers/widgets/my_text.dart';
-import 'package:marco/helpers/widgets/wave_background.dart';
-import 'package:marco/helpers/theme/admin_theme.dart';
-import 'package:marco/helpers/theme/theme_customizer.dart';
+import 'package:on_field_work/helpers/widgets/my_text.dart';
+import 'package:on_field_work/helpers/widgets/wave_background.dart';
+import 'package:on_field_work/helpers/theme/admin_theme.dart';
+import 'package:on_field_work/helpers/theme/theme_customizer.dart';
 
 class ThemeOption {
   final String label;
@@ -63,6 +63,9 @@ 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:marco/helpers/widgets/my_spacing.dart';
-import 'package:marco/helpers/widgets/my_text.dart';
-import 'package:marco/helpers/utils/mixins/ui_mixin.dart';
+import 'package:on_field_work/helpers/widgets/my_spacing.dart';
+import 'package:on_field_work/helpers/widgets/my_text.dart';
+import 'package:on_field_work/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:marco/helpers/widgets/my_snackbar.dart';
-import 'package:marco/helpers/services/app_logger.dart';
+import 'package:on_field_work/helpers/widgets/my_snackbar.dart';
+import 'package:on_field_work/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:marco/helpers/widgets/my_snackbar.dart';
-import 'package:marco/helpers/services/app_logger.dart';
+import 'package:on_field_work/helpers/widgets/my_snackbar.dart';
+import 'package:on_field_work/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:marco/helpers/theme/admin_theme.dart';
-import 'package:marco/helpers/theme/app_theme.dart';
-import 'package:marco/helpers/widgets/my_dashed_divider.dart';
-import 'package:marco/helpers/widgets/my_navigation_mixin.dart';
+import 'package:on_field_work/helpers/theme/admin_theme.dart';
+import 'package:on_field_work/helpers/theme/app_theme.dart';
+import 'package:on_field_work/helpers/widgets/my_dashed_divider.dart';
+import 'package:on_field_work/helpers/widgets/my_navigation_mixin.dart';
 import 'package:flutter/material.dart';
 
 mixin UIMixin {

lib/helpers/utils/permission_constants.dart

@@ -161,6 +161,33 @@ class MenuItems {
   /// Documents menu
   static const String documents = "92d2cc39-9e6a-46b2-ae50-84fbf83c95d3";
 
-  /// Service Projects 
+  /// 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:marco/helpers/extensions/date_time_extension.dart';
+import 'package:on_field_work/helpers/extensions/date_time_extension.dart';
 
 class Utils {
   static getDateStringFromDateTime(DateTime dateTime,

lib/helpers/widgets/avatar.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
-import 'package:marco/helpers/widgets/my_container.dart';
-import 'package:marco/helpers/widgets/my_text.dart';
+import 'package:on_field_work/helpers/widgets/my_container.dart';
+import 'package:on_field_work/helpers/widgets/my_text.dart';
 
 class Avatar extends StatelessWidget {
   final String firstName;

lib/helpers/widgets/custom_app_bar.dart

@@ -1,90 +1,230 @@
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'package:marco/controller/project_controller.dart';
-import 'package:marco/helpers/widgets/my_spacing.dart';
-import 'package:marco/helpers/widgets/my_text.dart';
+import 'package:on_field_work/controller/project_controller.dart';
+import 'package:on_field_work/helpers/widgets/my_spacing.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 StatelessWidget implements PreferredSizeWidget {
+class CustomAppBar extends StatefulWidget
+    with UIMixin
+    implements PreferredSizeWidget {
   final String title;
+  final String? projectName; // If passed, show static text
   final VoidCallback? onBackPressed;
+  final Color? backgroundColor;
 
-  const CustomAppBar({
+  CustomAppBar({
     super.key,
     required this.title,
+    this.projectName,
     this.onBackPressed,
+    this.backgroundColor,
   });
 
   @override
-  Widget build(BuildContext context) {
-    return PreferredSize(
-      preferredSize: const Size.fromHeight(72),
-      child: AppBar(
-        backgroundColor: const Color(0xFFF5F5F5),
-        elevation: 0.5,
-        automaticallyImplyLeading: false,
-        titleSpacing: 0,
-        title: Padding(
-          padding: MySpacing.xy(16, 0),
-          child: Row(
-            crossAxisAlignment: CrossAxisAlignment.center,
-            children: [
-              IconButton(
-                icon: const Icon(
-                  Icons.arrow_back_ios_new,
-                  color: Colors.black,
-                  size: 20,
-                ),
-                onPressed: onBackPressed ?? () => Get.back(),
-              ),
-              MySpacing.width(5),
-              Expanded(
-                child: Column(
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  mainAxisSize: MainAxisSize.min,
-                  children: [
-                    // TITLE
-                    MyText.titleLarge(
-                      title,
-                      fontWeight: 700,
-                      color: Colors.black,
-                    ),
+  Size get preferredSize => const Size.fromHeight(72);
 
-                    MySpacing.height(2),
+  @override
+  State<CustomAppBar> createState() => _CustomAppBarState();
+}
 
-                    // PROJECT NAME ROW (copied exactly)
-                    GetBuilder<ProjectController>(
-                      builder: (projectController) {
-                        final projectName =
-                            projectController.selectedProject?.name ??
-                                'Select Project';
+class _CustomAppBarState extends State<CustomAppBar> with UIMixin {
+  final ProjectController projectController = Get.find();
+  OverlayEntry? _overlayEntry;
+  final LayerLink _layerLink = LayerLink();
 
-                        return Row(
-                          children: [
-                            const Icon(Icons.work_outline,
-                                size: 14, color: Colors.grey),
-                            MySpacing.width(4),
-                            Expanded(
-                              child: MyText.bodySmall(
-                                projectName,
-                                fontWeight: 600,
-                                overflow: TextOverflow.ellipsis,
-                                color: Colors.grey[700],
-                              ),
-                            ),
-                          ],
-                        );
-                      },
-                    ),
-                  ],
+  void _toggleDropdown() {
+    if (_overlayEntry == null) {
+      _overlayEntry = _createOverlayEntry();
+      Overlay.of(context).insert(_overlayEntry!);
+    } else {
+      _overlayEntry?.remove();
+      _overlayEntry = null;
+    }
+  }
+
+  OverlayEntry _createOverlayEntry() {
+    final renderBox = context.findRenderObject() as RenderBox;
+    final size = renderBox.size;
+    final offset = renderBox.localToGlobal(Offset.zero);
+
+    return OverlayEntry(
+      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(
+                    children: [
+                      TextField(
+                        decoration: InputDecoration(
+                          hintText: "Search project...",
+                          isDense: true,
+                          prefixIcon: const Icon(Icons.search),
+                          border: OutlineInputBorder(
+                              borderRadius: BorderRadius.circular(5)),
+                        ),
+                      ),
+                      Expanded(
+                        child: ListView.builder(
+                          itemCount: projectController.projects.length,
+                          itemBuilder: (_, index) {
+                            final project = projectController.projects[index];
+                            return RadioListTile<String>(
+                              dense: true,
+                              value: project.id,
+                              groupValue:
+                                  projectController.selectedProjectId.value,
+                              onChanged: (v) {
+                                if (v != null) {
+                                  projectController.updateSelectedProject(v);
+                                  _toggleDropdown();
+                                }
+                              },
+                              title: Text(project.name),
+                            );
+                          },
+                        ),
+                      ),
+                    ],
+                  ),
                 ),
               ),
-            ],
-          ),
+            ),
+          ],
         ),
       ),
     );
   }
 
   @override
-  Size get preferredSize => const Size.fromHeight(72);
+  Widget build(BuildContext context) {
+    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();
+  }
 }

lib/helpers/widgets/dashbaord/attendance_overview_chart.dart

@@ -2,8 +2,8 @@ import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:intl/intl.dart';
 import 'package:syncfusion_flutter_charts/charts.dart';
-import 'package:marco/controller/dashboard/dashboard_controller.dart';
-import 'package:marco/helpers/widgets/my_text.dart';
+import 'package:on_field_work/controller/dashboard/dashboard_controller.dart';
+import 'package:on_field_work/helpers/widgets/my_text.dart';
 
 class AttendanceDashboardChart extends StatelessWidget {
   AttendanceDashboardChart({Key? key}) : super(key: key);

lib/helpers/widgets/dashbaord/collection_dashboard_card.dart

@@ -0,0 +1,426 @@
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:on_field_work/helpers/widgets/my_text.dart';
+import 'package:on_field_work/controller/dashboard/dashboard_controller.dart';
+import 'package:on_field_work/model/dashboard/collection_overview_model.dart';
+import 'package:on_field_work/helpers/widgets/my_custom_skeleton.dart';
+
+class CollectionsHealthWidget extends StatelessWidget {
+  @override
+  Widget build(BuildContext context) {
+    final DashboardController controller = Get.find<DashboardController>();
+
+    return Obx(() {
+      final data = controller.collectionOverviewData.value;
+      final isLoading = controller.isCollectionOverviewLoading.value;
+
+      // Loading state
+      if (isLoading) {
+        return Container(
+          decoration: _boxDecoration(), // Maintain the outer box decoration
+          padding: const EdgeInsets.all(16.0),
+          child: SkeletonLoaders.collectionHealthSkeleton(),
+        );
+      }
+
+      // No data
+      if (data == null) {
+        return Container(
+          decoration: _boxDecoration(),
+          padding: const EdgeInsets.all(16.0),
+          child: Center(
+            child: MyText.bodyMedium('No collection overview data available.'),
+          ),
+        );
+      }
+
+      // Data available
+      final double totalDue = data.totalDueAmount;
+      final double totalCollected = data.totalCollectedAmount;
+      final double pendingPercentage = data.pendingPercentage / 100.0;
+      final double dsoDays = controller.calculatedDSO;
+
+      return Container(
+        decoration: _boxDecoration(),
+        padding: const EdgeInsets.all(16.0),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: <Widget>[
+            _buildHeader(),
+            const SizedBox(height: 20),
+            Row(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: <Widget>[
+                Expanded(
+                  flex: 5,
+                  child: _buildLeftChartSection(
+                    totalDue: totalDue,
+                    pendingPercentage: pendingPercentage,
+                    totalCollected: totalCollected,
+                  ),
+                ),
+                const SizedBox(width: 16),
+                Expanded(
+                  flex: 4,
+                  child: _buildRightMetricsSection(
+                    data: data,
+                    dsoDays: dsoDays,
+                  ),
+                ),
+              ],
+            ),
+            const SizedBox(height: 20),
+            _buildAgingAnalysis(data: data),
+          ],
+        ),
+      );
+    });
+  }
+
+  // ==============================
+  // HEADER
+  // ==============================
+  Widget _buildHeader() {
+    return Row(
+      children: [
+        Expanded(
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              MyText.bodyMedium('Collections Health Overview', fontWeight: 700),
+              const SizedBox(height: 2),
+              MyText.bodySmall('View your collection health data.',
+                  color: Colors.grey),
+            ],
+          ),
+        ),
+      ],
+    );
+  }
+
+  // ==============================
+  // LEFT SECTION (GAUGE + SUMMARY)
+  // ==============================
+  Widget _buildLeftChartSection({
+    required double totalDue,
+    required double pendingPercentage,
+    required double totalCollected,
+  }) {
+    String pendingPercentStr = (pendingPercentage * 100).toStringAsFixed(0);
+    String collectedPercentStr =
+        ((1 - pendingPercentage) * 100).toStringAsFixed(0);
+
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: <Widget>[
+        Row(
+          children: [
+            _GaugeChartPlaceholder(
+              backgroundColor: Colors.white,
+              pendingPercentage: pendingPercentage,
+            ),
+            const SizedBox(width: 12),
+          ],
+        ),
+        const SizedBox(height: 20),
+        Row(
+          children: [
+            Expanded(
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: <Widget>[
+                  MyText.bodyLarge(
+                    '₹${totalDue.toStringAsFixed(0)} DUE',
+                    fontWeight: 700,
+                  ),
+                  const SizedBox(height: 4),
+                  MyText.bodySmall(
+                    '• Pending ($pendingPercentStr%) • Collected ($collectedPercentStr%)',
+                    color: Colors.black54,
+                  ),
+                  MyText.bodySmall(
+                    '₹${totalCollected.toStringAsFixed(0)} Collected',
+                    color: Colors.black54,
+                  ),
+                ],
+              ),
+            ),
+          ],
+        ),
+      ],
+    );
+  }
+
+  // ==============================
+  // RIGHT METRICS SECTION
+  // ==============================
+  Widget _buildRightMetricsSection({
+    required CollectionOverviewData data,
+    required double dsoDays,
+  }) {
+    final String topClientName = data.topClient?.name ?? 'N/A';
+    final double topClientBalance = data.topClientBalance;
+
+    return Column(
+      children: <Widget>[
+        _buildMetricCard(
+          title: 'Top Client Balance',
+          value: topClientName,
+          subValue: '₹${topClientBalance.toStringAsFixed(0)}',
+          valueColor: Colors.red,
+          isDetailed: true,
+        ),
+        const SizedBox(height: 10),
+        _buildMetricCard(
+          title: 'Total Collected (YTD)',
+          value: '₹${data.totalCollectedAmount.toStringAsFixed(0)}',
+          subValue: 'Collected',
+          valueColor: Colors.green,
+          isDetailed: false,
+        ),
+      ],
+    );
+  }
+
+  Widget _buildMetricCard({
+    required String title,
+    required String value,
+    required String subValue,
+    required Color valueColor,
+    required bool isDetailed,
+  }) {
+    return Container(
+      padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 8),
+      decoration: BoxDecoration(
+        color: const Color(0xFFF5F5F5),
+        borderRadius: BorderRadius.circular(5),
+      ),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: <Widget>[
+          MyText.bodySmall(title, color: Colors.black54),
+          const SizedBox(height: 2),
+          if (isDetailed) ...[
+            MyText.bodySmall(value, fontWeight: 600),
+            MyText.bodyMedium(subValue, color: valueColor, fontWeight: 700),
+          ] else
+            Row(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: <Widget>[
+                MyText.bodySmall(value, fontWeight: 600),
+                MyText.bodySmall(subValue, color: valueColor, fontWeight: 600),
+              ],
+            ),
+        ],
+      ),
+    );
+  }
+
+  // ==============================
+  // AGING ANALYSIS
+  // ==============================
+  Widget _buildAgingAnalysis({required CollectionOverviewData data}) {
+    final buckets = [
+      AgingBucketData('0-30 Days', data.bucket0To30Amount, Colors.green,
+          data.bucket0To30Invoices),
+      AgingBucketData('30-60 Days', data.bucket30To60Amount, Colors.orange,
+          data.bucket30To60Invoices),
+      AgingBucketData('60-90 Days', data.bucket60To90Amount,
+          Colors.red.shade300, data.bucket60To90Invoices),
+      AgingBucketData('> 90 Days', data.bucket90PlusAmount, Colors.red,
+          data.bucket90PlusInvoices),
+    ];
+
+    final double totalOutstanding = buckets.fold(0, (sum, b) => sum + b.amount);
+
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        MyText.bodyMedium('Outstanding Collections Aging Analysis',
+            fontWeight: 700),
+        MyText.bodySmall(
+            'Total Outstanding: ₹${totalOutstanding.toStringAsFixed(0)}',
+            color: Colors.black54),
+        const SizedBox(height: 10),
+        _AgingStackedBar(buckets: buckets, totalOutstanding: totalOutstanding),
+        const SizedBox(height: 15),
+        Wrap(
+          spacing: 12,
+          runSpacing: 8,
+          children: buckets
+              .map((bucket) => _buildAgingLegendItem(bucket.title,
+                  bucket.amount, bucket.color, bucket.invoiceCount))
+              .toList(),
+        ),
+      ],
+    );
+  }
+
+  Widget _buildAgingLegendItem(
+      String title, double amount, Color color, int count) {
+    return Row(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        Container(
+            width: 10,
+            height: 10,
+            decoration: BoxDecoration(color: color, shape: BoxShape.circle)),
+        const SizedBox(width: 6),
+        MyText.bodySmall(
+            '$title: ₹${amount.toStringAsFixed(0)} ($count Invoices)'),
+      ],
+    );
+  }
+
+  BoxDecoration _boxDecoration() {
+    return BoxDecoration(
+      color: Colors.white,
+      borderRadius: BorderRadius.circular(5),
+      boxShadow: [
+        BoxShadow(
+          color: Colors.black.withOpacity(0.1),
+          blurRadius: 10,
+          offset: const Offset(0, 5),
+        ),
+      ],
+    );
+  }
+}
+
+// =====================================================================
+// CUSTOM PLACEHOLDER WIDGETS (Gauge + Bar/Area + Aging Bars)
+// =====================================================================
+
+// Gauge Chart
+class _GaugeChartPlaceholder extends StatelessWidget {
+  final Color backgroundColor;
+  final double pendingPercentage;
+
+  const _GaugeChartPlaceholder({
+    required this.backgroundColor,
+    required this.pendingPercentage,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return SizedBox(
+      width: 120,
+      height: 80,
+      child: Stack(
+        children: [
+          CustomPaint(
+            size: const Size(120, 70),
+            painter: _SemiCirclePainter(
+              canvasColor: backgroundColor,
+              pendingPercentage: pendingPercentage,
+            ),
+          ),
+          Align(
+            alignment: Alignment.bottomCenter,
+            child: Padding(
+              padding: const EdgeInsets.only(bottom: 8),
+              child: FittedBox(
+                child: MyText.bodySmall('RISK LEVEL', fontWeight: 600),
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+class _SemiCirclePainter extends CustomPainter {
+  final Color canvasColor;
+  final double pendingPercentage;
+
+  _SemiCirclePainter(
+      {required this.canvasColor, required this.pendingPercentage});
+
+  @override
+  void paint(Canvas canvas, Size size) {
+    final rect = Rect.fromCircle(
+      center: Offset(size.width / 2, size.height),
+      radius: size.width / 2,
+    );
+
+    const double arc = 3.14159;
+    final double pendingSweep = arc * pendingPercentage;
+    final double collectedSweep = arc * (1 - pendingPercentage);
+
+    final backgroundPaint = Paint()
+      ..color = Colors.black.withOpacity(0.1)
+      ..strokeWidth = 10
+      ..style = PaintingStyle.stroke;
+    canvas.drawArc(rect, arc, arc, false, backgroundPaint);
+
+    final pendingPaint = Paint()
+      ..strokeWidth = 10
+      ..style = PaintingStyle.stroke
+      ..shader = const LinearGradient(
+        colors: [Colors.orange, Colors.red],
+      ).createShader(rect);
+    canvas.drawArc(rect, arc, pendingSweep, false, pendingPaint);
+
+    final collectedPaint = Paint()
+      ..color = Colors.green
+      ..strokeWidth = 10
+      ..style = PaintingStyle.stroke;
+    canvas.drawArc(
+        rect, arc + pendingSweep, collectedSweep, false, collectedPaint);
+  }
+
+  @override
+  bool shouldRepaint(covariant CustomPainter oldDelegate) => false;
+}
+
+// AGING BUCKET
+class AgingBucketData {
+  final String title;
+  final double amount;
+  final Color color;
+  final int invoiceCount; // ADDED
+
+  // UPDATED CONSTRUCTOR
+  AgingBucketData(this.title, this.amount, this.color, this.invoiceCount);
+}
+
+class _AgingStackedBar extends StatelessWidget {
+  final List<AgingBucketData> buckets;
+  final double totalOutstanding;
+
+  const _AgingStackedBar({
+    required this.buckets,
+    required this.totalOutstanding,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    if (totalOutstanding == 0) {
+      return Container(
+        height: 16,
+        decoration: BoxDecoration(
+          color: Colors.grey[200],
+          borderRadius: BorderRadius.circular(8),
+        ),
+        child: Center(
+          child: MyText.bodySmall('No Outstanding Collections',
+              color: Colors.black54),
+        ),
+      );
+    }
+
+    return ClipRRect(
+      borderRadius: BorderRadius.circular(8),
+      child: Row(
+        children: buckets.where((b) => b.amount > 0).map((bucket) {
+          final flexValue = bucket.amount / totalOutstanding;
+          return Expanded(
+            flex: (flexValue * 1000).toInt(),
+            child: Container(height: 16, color: bucket.color),
+          );
+        }).toList(),
+      ),
+    );
+  }
+}

lib/helpers/widgets/dashbaord/dashboard_overview_widgets.dart

@@ -4,10 +4,10 @@ import 'package:intl/intl.dart';
 import 'package:syncfusion_flutter_charts/charts.dart';
 
 // Assuming these exist in the project
-import 'package:marco/controller/dashboard/dashboard_controller.dart';
-import 'package:marco/helpers/widgets/my_card.dart';
-import 'package:marco/helpers/widgets/my_spacing.dart';
-import 'package:marco/helpers/widgets/my_text.dart';
+import 'package:on_field_work/controller/dashboard/dashboard_controller.dart';
+import 'package:on_field_work/helpers/widgets/my_card.dart';
+import 'package:on_field_work/helpers/widgets/my_spacing.dart';
+import 'package:on_field_work/helpers/widgets/my_text.dart';
 
 class DashboardOverviewWidgets {
   static final DashboardController dashboardController =

lib/helpers/widgets/dashbaord/expense_breakdown_chart.dart

@@ -1,11 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:syncfusion_flutter_charts/charts.dart';
-import 'package:marco/controller/dashboard/dashboard_controller.dart';
-import 'package:marco/helpers/widgets/my_text.dart';
-import 'package:marco/model/dashboard/expense_type_report_model.dart';
-import 'package:marco/helpers/utils/utils.dart';
-import 'package:marco/helpers/widgets/my_custom_skeleton.dart';
+import 'package:on_field_work/controller/dashboard/dashboard_controller.dart';
+import 'package:on_field_work/helpers/widgets/my_text.dart';
+import 'package:on_field_work/model/dashboard/expense_type_report_model.dart';
+import 'package:on_field_work/helpers/utils/utils.dart';
+import 'package:on_field_work/helpers/widgets/my_custom_skeleton.dart';
 
 class ExpenseTypeReportChart extends StatelessWidget {
   ExpenseTypeReportChart({Key? key}) : super(key: key);