first commit

lib/Screens/hrm/attendance/add_new_attendance.dart

@@ -0,0 +1,364 @@
+// File: add_new_attendance.dart (Modified)
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:iconly/iconly.dart';
+import 'package:icons_plus/icons_plus.dart';
+import 'package:intl/intl.dart';
+import 'package:mobile_pos/Screens/hrm/attendance/repo/attendence_repo.dart';
+import 'package:mobile_pos/generated/l10n.dart' as lang;
+// --- Local Imports ---
+import '../../../constant.dart';
+import '../employee/model/employee_list_model.dart' as employee;
+import '../widgets/set_time.dart'; // setTime function import
+
+// --- Data Layer Imports ---
+import 'package:mobile_pos/Screens/hrm/employee/provider/emplpyee_list_provider.dart';
+// *** CORRECT SHIFT IMPORTS ***
+import 'package:mobile_pos/Screens/hrm/shift/Model/shift_list_model.dart' as shift;
+
+import 'model/attendence_list_model.dart';
+
+class AddNewAttendance extends ConsumerStatefulWidget {
+  final AttendanceData? attendanceData;
+
+  const AddNewAttendance({super.key, this.attendanceData});
+
+  @override
+  ConsumerState<AddNewAttendance> createState() => _AddNewAttendanceState();
+}
+
+class _AddNewAttendanceState extends ConsumerState<AddNewAttendance> {
+  // --- Form Controllers ---
+  final GlobalKey<FormState> _key = GlobalKey();
+  final dateController = TextEditingController();
+  final shiftController = TextEditingController();
+  final timeInController = TextEditingController();
+  final timeOutController = TextEditingController();
+  final noteController = TextEditingController();
+
+  // --- Selected Values (API payload) ---
+  employee.EmployeeData? _selectedEmployee;
+  DateTime? _selectedDate;
+  String? _selectedMonth;
+
+  // --- UI/API Helpers ---
+  final DateFormat _displayDateFormat = DateFormat('dd/MM/yyyy');
+  final DateFormat _apiDateFormat = DateFormat('yyyy-MM-dd');
+  final DateFormat _apiTimeFormat = DateFormat('HH:mm');
+  final DateFormat _monthFormat = DateFormat('MMMM');
+
+  bool get isEditing => widget.attendanceData != null;
+
+  @override
+  void initState() {
+    super.initState();
+    if (isEditing) {
+      final data = widget.attendanceData!;
+      noteController.text = data.note ?? '';
+
+      try {
+        if (data.date != null) {
+          _selectedDate = DateTime.parse(data.date!);
+          dateController.text = _displayDateFormat.format(_selectedDate!);
+          _selectedMonth = data.month;
+        }
+        timeInController.text = data.timeIn ?? '';
+        timeOutController.text = data.timeOut ?? '';
+      } catch (e) {
+        debugPrint('Error parsing dates/times for editing: $e');
+      }
+    }
+  }
+
+  @override
+  void dispose() {
+    dateController.dispose();
+    timeOutController.dispose();
+    timeInController.dispose();
+    noteController.dispose();
+    super.dispose();
+  }
+
+  Future<void> _selectDate(BuildContext context) async {
+    final DateTime? picked = await showDatePicker(
+      initialDate: _selectedDate ?? DateTime.now(),
+      firstDate: DateTime(2015, 8),
+      lastDate: DateTime(2101),
+      context: context,
+    );
+    setState(() {
+      if (picked != null) {
+        _selectedDate = picked;
+        dateController.text = _displayDateFormat.format(picked);
+        _selectedMonth = _monthFormat.format(picked).toLowerCase();
+      }
+    });
+  }
+
+  String? _convertDisplayTimeToAPI(String displayTime) {
+    try {
+      final dateTime = DateFormat('hh:mm a').parse(displayTime);
+      return _apiTimeFormat.format(dateTime);
+    } catch (e) {
+      debugPrint('Time conversion error: $e');
+      return null;
+    }
+  }
+
+  void _submit() async {
+    String? _formatDateForAPI(String dateDisplay) {
+      // Converts display format (dd/MM/yyyy) to API format (YYYY-MM-DD)
+      if (dateDisplay.isEmpty) return null;
+      try {
+        final dateTime = DateFormat('dd/MM/yyyy').parse(dateDisplay);
+        return DateFormat('yyyy-MM-dd').format(dateTime);
+      } catch (_) {
+        return null;
+      }
+    }
+
+    if (_key.currentState!.validate() && _selectedEmployee != null) {
+      final repo = AttendanceRepo();
+
+      final apiTimeIn = _convertDisplayTimeToAPI(timeInController.text);
+      final apiTimeOut = _convertDisplayTimeToAPI(timeOutController.text);
+
+      if (apiTimeIn == null || apiTimeOut == null) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          const SnackBar(content: Text('Error converting time format.')),
+        );
+        return;
+      }
+
+      final payload = {
+        'employee_id': _selectedEmployee!.id!,
+        'shift_id': _selectedEmployee!.shiftId!,
+        'time_in': (apiTimeIn),
+        'time_out': apiTimeOut,
+        'date': _apiDateFormat.format(_selectedDate!),
+        // 'month': _selectedMonth!,
+        'note': noteController.text,
+      };
+      if (isEditing) {
+        await repo.updateAttendance(
+          ref: ref,
+          context: context,
+          id: widget.attendanceData!.id!,
+          employeeId: payload['employee_id'] as num,
+          shiftId: payload['shift_id'] as num,
+          timeIn: payload['time_in'] as String,
+          timeOut: payload['time_out'] as String,
+          date: payload['date'] as String,
+          // month: payload['month'] as String,
+          note: payload['note'] as String?,
+        );
+      } else {
+        await repo.createAttendance(
+          ref: ref,
+          context: context,
+          employeeId: payload['employee_id'] as num,
+          shiftId: payload['shift_id'] as num,
+          timeIn: payload['time_in'] as String,
+          timeOut: payload['time_out'] as String,
+          date: payload['date'] as String,
+          // month: payload['month'] as String,
+          note: payload['note'] as String?,
+        );
+      }
+    }
+  }
+
+  void _resetForm() {
+    if (!isEditing) {
+      setState(() {
+        _key.currentState?.reset();
+        dateController.clear();
+        shiftController.clear();
+        timeInController.clear();
+        timeOutController.clear();
+        noteController.clear();
+        _selectedEmployee = null;
+        _selectedMonth = null;
+        _selectedDate = null;
+      });
+    } else {
+      Navigator.pop(context);
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    // Watch required providers
+    final _lang = lang.S.of(context);
+    final employeesAsync = ref.watch(employeeListProvider);
+
+    return Scaffold(
+      backgroundColor: kWhite,
+      appBar: AppBar(
+        centerTitle: true,
+        title: Text(isEditing ? _lang.editAttendance : _lang.addNewAttendance),
+        bottom: const PreferredSize(
+          preferredSize: Size.fromHeight(1),
+          child: Divider(height: 2, color: kBackgroundColor),
+        ),
+      ),
+      body: employeesAsync.when(
+          loading: () => const Center(child: CircularProgressIndicator()),
+          error: (err, stack) => Center(child: Text('Error loading employees: $err')),
+          data: (employeeModel) {
+            final employees = employeeModel.employees ?? [];
+
+            if (isEditing) {
+              final data = widget.attendanceData!;
+
+              _selectedEmployee ??= employees.firstWhere(
+                (e) => e.id == data.employeeId,
+                orElse: () => _selectedEmployee ?? employees.first,
+              );
+              shiftController.text = _selectedEmployee?.shift?.name ?? '';
+            }
+
+            return SingleChildScrollView(
+              padding: const EdgeInsets.all(16),
+              child: Form(
+                key: _key,
+                child: Column(
+                  children: [
+                    _buildEmployeeDropdown(employees),
+                    const SizedBox(height: 20),
+                    _buildShiftDropdown(), // Pass actual shift data
+                    const SizedBox(height: 20),
+                    Row(
+                      children: [
+                        Expanded(child: _buildMonthDropdown()),
+                        const SizedBox(width: 16),
+                        Expanded(child: _buildDateInput()),
+                      ],
+                    ),
+                    const SizedBox(height: 20),
+                    Row(
+                      children: [
+                        Expanded(child: _buildTimeInput(true, context)),
+                        const SizedBox(width: 16),
+                        Expanded(child: _buildTimeInput(false, context)),
+                      ],
+                    ),
+                    const SizedBox(height: 20),
+                    TextFormField(
+                      controller: noteController,
+                      decoration: InputDecoration(labelText: _lang.note, hintText: _lang.enterNote),
+                    ),
+                    const SizedBox(height: 20),
+                    Row(
+                      children: [
+                        Expanded(
+                            child: OutlinedButton(
+                                onPressed: _resetForm, child: Text(isEditing ? _lang.cancel : _lang.resets))),
+                        const SizedBox(width: 16),
+                        Expanded(
+                            child:
+                                ElevatedButton(onPressed: _submit, child: Text(isEditing ? _lang.update : _lang.save))),
+                      ],
+                    ),
+                  ],
+                ),
+              ),
+            );
+          }),
+    );
+  }
+
+  // --- Widget Builders ---
+
+  Widget _buildEmployeeDropdown(List<employee.EmployeeData> employees) {
+    final _lang = lang.S.of(context);
+    return DropdownButtonFormField<employee.EmployeeData>(
+      value: _selectedEmployee,
+      icon: const Icon(Icons.keyboard_arrow_down, color: kNeutral800),
+      decoration: InputDecoration(labelText: _lang.employee, hintText: _lang.selectOne),
+      validator: (value) => value == null ? _lang.pleaseSelectAnEmployee : null,
+      items: employees.map((entry) {
+        return DropdownMenuItem<employee.EmployeeData>(
+          value: entry,
+          child: Text(entry.name ?? 'N/A'),
+        );
+      }).toList(),
+      onChanged: (employee.EmployeeData? value) {
+        setState(() {
+          _selectedEmployee = value;
+          shiftController.text = _selectedEmployee?.shift?.name ?? '';
+        });
+      },
+    );
+  }
+
+  // *** SHIFT DROPDOWN USING ShiftData ***
+  Widget _buildShiftDropdown() {
+    return TextFormField(
+      controller: shiftController,
+      readOnly: true,
+      decoration:
+          InputDecoration(labelText: lang.S.of(context).shift, hintText: lang.S.of(context).selectEmployeeFirst),
+    );
+  }
+
+  Widget _buildMonthDropdown() {
+    final monthDisplay = _selectedMonth != null
+        ? _selectedMonth![0].toUpperCase() + _selectedMonth!.substring(1)
+        : lang.S.of(context).selectDateFirst;
+
+    return TextFormField(
+      // initialValue: monthDisplay,
+      controller: TextEditingController(text: monthDisplay),
+      readOnly: true,
+      // icon: const Icon(Icons.keyboard_arrow_down, color: kNeutral800),
+      decoration: InputDecoration(labelText: lang.S.of(context).month, hintText: lang.S.of(context).autoSelected),
+      validator: (value) => _selectedDate == null ? lang.S.of(context).pleaseSelectDate : null,
+      // items: [
+      //   DropdownMenuItem(value: monthDisplay, child: Text(monthDisplay)),
+      // ],
+      onChanged: null,
+    );
+  }
+
+  Widget _buildDateInput() {
+    return TextFormField(
+      keyboardType: TextInputType.name,
+      readOnly: true,
+      controller: dateController,
+      decoration: InputDecoration(
+        labelText: lang.S.of(context).date,
+        hintText: 'DD/MM/YYYY',
+        border: const OutlineInputBorder(),
+        suffixIcon: IconButton(
+          padding: EdgeInsets.zero,
+          visualDensity: const VisualDensity(horizontal: -4, vertical: -4),
+          onPressed: () => _selectDate(context),
+          icon: const Icon(IconlyLight.calendar, size: 22),
+        ),
+      ),
+      validator: (value) => value!.isEmpty ? lang.S.of(context).pleaseSelectDate : null,
+    );
+  }
+
+  Widget _buildTimeInput(bool isTimeIn, BuildContext context) {
+    final controller = isTimeIn ? timeInController : timeOutController;
+    final label = isTimeIn ? lang.S.of(context).timeIn : lang.S.of(context).timeOut;
+
+    return TextFormField(
+      onTap: () => setTime(controller, context),
+      readOnly: true,
+      controller: controller,
+      decoration: InputDecoration(
+        labelText: label,
+        hintText: isTimeIn ? '09:00 AM' : '05:00 PM',
+        suffixIcon: Icon(
+          AntDesign.clock_circle_outline,
+          size: 18,
+          color: kNeutral800,
+        ),
+      ),
+      validator: (value) => value!.isEmpty ? '${lang.S.of(context).selectDate} $label' : null,
+    );
+  }
+}

lib/Screens/hrm/attendance/attendance_screen.dart

@@ -0,0 +1,450 @@
+// File: attendance_screen.dart (Final Code)
+
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:hugeicons/hugeicons.dart';
+import 'package:intl/intl.dart';
+
+// --- Local Imports ---
+import 'package:mobile_pos/Screens/hrm/attendance/add_new_attendance.dart';
+import 'package:mobile_pos/Screens/hrm/attendance/provider/attendence_provider.dart';
+import 'package:mobile_pos/Screens/hrm/attendance/repo/attendence_repo.dart';
+import 'package:mobile_pos/Screens/hrm/widgets/filter_dropdown.dart';
+import 'package:mobile_pos/Screens/hrm/widgets/model_bottom_sheet.dart';
+import 'package:mobile_pos/constant.dart';
+import 'package:mobile_pos/generated/l10n.dart' as lang;
+import '../../../service/check_user_role_permission_provider.dart';
+import '../../../widgets/empty_widget/_empty_widget.dart';
+import '../widgets/deleteing_alart_dialog.dart';
+
+// --- Data Layer Imports ---
+import 'package:mobile_pos/Screens/hrm/employee/provider/emplpyee_list_provider.dart';
+
+import 'model/attendence_list_model.dart';
+
+class AttendanceScreen extends ConsumerStatefulWidget {
+  const AttendanceScreen({super.key});
+
+  @override
+  ConsumerState<AttendanceScreen> createState() => _AttendanceScreenState();
+}
+
+class _AttendanceScreenState extends ConsumerState<AttendanceScreen> {
+  // --- Filter State ---
+  String? _selectedEmployeeFilter;
+  String? _selectedTimeFilter;
+
+  List<AttendanceData> _filteredList = [];
+  final TextEditingController _searchController = TextEditingController();
+
+  final List<String> _timeFilters = ['Today', 'Weekly', 'Monthly', 'Yearly'];
+
+  @override
+  void initState() {
+    super.initState();
+    _searchController.addListener(_applyFilters);
+    _selectedEmployeeFilter = 'All Employee';
+    _selectedTimeFilter = 'Today';
+  }
+
+  @override
+  void dispose() {
+    _searchController.removeListener(_applyFilters);
+    _searchController.dispose();
+    super.dispose();
+  }
+
+  // --- Filtering Logic ---
+
+  void _applyFilters() {
+    setState(() {}); // Trigger rebuild to re-run filtering
+  }
+
+  void _filterAttendance(List<AttendanceData> allAttendance) {
+    _filteredList = allAttendance.where((att) {
+      final name = (att.employee?.name ?? '').toLowerCase();
+
+      // 1. Employee Filter
+      final employeeNameMatches =
+          _selectedEmployeeFilter == 'All Employee' || name == _selectedEmployeeFilter!.toLowerCase();
+
+      // 2. Time Filter (Simplified date logic)
+      bool timeMatches = true;
+      if (_selectedTimeFilter == 'Today') {
+        final today = DateFormat('yyyy-MM-dd').format(DateTime.now());
+        timeMatches = att.date == today;
+      } else {
+        // Show all for other filter types, as full date range logic is complex
+        timeMatches = true;
+      }
+
+      return employeeNameMatches && timeMatches;
+    }).toList();
+  }
+
+  // --- Utility Functions ---
+
+  String _formatTimeForDisplay(String? time) {
+    if (time == null) return 'N/A';
+    try {
+      final dateTime = DateFormat('HH:mm:ss').parse(time);
+      return DateFormat('hh:mm a').format(dateTime);
+    } catch (_) {
+      return time;
+    }
+  }
+
+  String _formatDateForDisplay(String? date) {
+    if (date == null) return 'N/A';
+    try {
+      final dateTime = DateFormat('yyyy-MM-dd').parse(date);
+      return DateFormat('dd MMM yyyy').format(dateTime);
+    } catch (_) {
+      return date;
+    }
+  }
+
+  // --- Delete Logic ---
+
+  void _showDeleteConfirmationDialog(BuildContext context, WidgetRef ref, num id, String name) async {
+    bool result = await showDeleteConfirmationDialog(
+      context: context,
+      itemName: name,
+    );
+
+    if (result) {
+      final repo = AttendanceRepo();
+      await repo.deleteAttendance(id: id, context: context, ref: ref);
+      ref.invalidate(attendanceListProvider); // Force list refresh
+    }
+  }
+
+  // --- Pull to Refresh ---
+
+  Future<void> _refreshData() async {
+    ref.invalidate(attendanceListProvider);
+    return ref.watch(attendanceListProvider.future);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final _lang = lang.S.of(context);
+    final theme = Theme.of(context);
+    final attendanceAsync = ref.watch(attendanceListProvider);
+    final employeesAsync = ref.watch(employeeListProvider); // Employee List for filter data
+    final permissionService = PermissionService(ref);
+
+    // Combine data fetching results for UI
+    final combinedAsync = attendanceAsync.asData != null && employeesAsync.asData != null
+        ? AsyncValue.data(true)
+        : attendanceAsync.hasError || employeesAsync.hasError
+            ? AsyncValue.error(attendanceAsync.error ?? employeesAsync.error!, StackTrace.current)
+            : const AsyncValue.loading();
+
+    return Scaffold(
+      backgroundColor: Colors.white,
+      appBar: AppBar(
+        centerTitle: true,
+        title: Text(_lang.attendance),
+        bottom: PreferredSize(
+            preferredSize: const Size.fromHeight(65),
+            child: Column(
+              children: [
+                const Divider(thickness: 1.5, color: kBackgroundColor, height: 1),
+                Padding(
+                  padding: const EdgeInsets.fromLTRB(16, 10, 16, 13),
+                  child: Row(
+                    children: [
+                      // Employee Filter Dropdown
+                      Expanded(
+                        flex: 6,
+                        child: FilterDropdownButton<String>(
+                          value: _selectedEmployeeFilter,
+                          items: [
+                            DropdownMenuItem(
+                              value: 'All Employee',
+                              child: Text(_lang.allEmployee),
+                            ),
+                            // CRITICAL FIX: Accessing Employee List Data via .data
+                            ...(employeesAsync.value?.employees ?? [])
+                                .map((e) => DropdownMenuItem(
+                                      value: e.name,
+                                      child: Text(e.name ?? 'n/a'),
+                                    ))
+                                .toList(),
+                          ]
+                              .map((item) => item.value != null
+                                  ? DropdownMenuItem(
+                                      value: item.value,
+                                      child: Text(
+                                        item.value!,
+                                        style: theme.textTheme.bodyLarge?.copyWith(color: kNeutral800),
+                                        maxLines: 1,
+                                        overflow: TextOverflow.ellipsis,
+                                      ),
+                                    )
+                                  : item)
+                              .toList(),
+                          onChanged: (String? value) {
+                            setState(() {
+                              _selectedEmployeeFilter = value;
+                              _applyFilters();
+                            });
+                          },
+                        ),
+                      ),
+                      const SizedBox(width: 10),
+                      // Time Filter Dropdown
+                      Expanded(
+                        flex: 4,
+                        child: FilterDropdownButton<String>(
+                          buttonDecoration: BoxDecoration(
+                            color: kBackgroundColor,
+                            borderRadius: BorderRadius.circular(5),
+                            border: Border.all(color: kBorderColor),
+                          ),
+                          value: _selectedTimeFilter,
+                          items: _timeFilters.map((entry) {
+                            return DropdownMenuItem(
+                              value: entry,
+                              child: Text(
+                                entry,
+                                style: theme.textTheme.bodyLarge?.copyWith(color: kNeutral800),
+                                maxLines: 1,
+                                overflow: TextOverflow.ellipsis,
+                              ),
+                            );
+                          }).toList(),
+                          onChanged: (String? value) {
+                            setState(() {
+                              _selectedTimeFilter = value;
+                              _applyFilters();
+                            });
+                          },
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
+                const Divider(thickness: 1.5, color: kBackgroundColor, height: 1),
+              ],
+            )),
+      ),
+
+      // Body handles loading/error and displays filtered list
+      body: combinedAsync.when(
+        loading: () => const Center(child: CircularProgressIndicator()),
+        error: (err, stack) => Center(child: Text('Error: Failed to load data.')),
+        data: (_) {
+          if (!permissionService.hasPermission(Permit.attendancesRead.value)) {
+            return const Center(child: PermitDenyWidget());
+          }
+          // Data is loaded, apply filter
+          _filterAttendance(attendanceAsync.value?.data ?? []);
+
+          if (_filteredList.isEmpty) {
+            return RefreshIndicator(
+              onRefresh: _refreshData,
+              child: Center(
+                child: SingleChildScrollView(
+                  physics: AlwaysScrollableScrollPhysics(),
+                  child: Text(_lang.noAvailableRecordFound),
+                ),
+              ),
+            );
+          }
+
+          return RefreshIndicator(
+            onRefresh: _refreshData,
+            child: ListView.separated(
+              padding: EdgeInsets.zero,
+              itemCount: _filteredList.length,
+              separatorBuilder: (_, __) => const Divider(
+                color: kBackgroundColor,
+                height: 1.5,
+              ),
+              itemBuilder: (_, index) => _buildAttendanceItem(
+                context: context,
+                ref: ref,
+                attendance: _filteredList[index],
+              ),
+            ),
+          );
+        },
+      ),
+
+      bottomNavigationBar: permissionService.hasPermission(Permit.attendancesCreate.value)
+          ? Padding(
+              padding: const EdgeInsets.all(16),
+              child: ElevatedButton.icon(
+                onPressed: () {
+                  Navigator.push(
+                    context,
+                    MaterialPageRoute(builder: (context) => const AddNewAttendance()),
+                  );
+                },
+                icon: const Icon(Icons.add, color: Colors.white),
+                label: Text(_lang.addAttendance),
+              ),
+            )
+          : null,
+    );
+  }
+
+  // --- List Item Builder ---
+
+  Widget _buildAttendanceItem({
+    required BuildContext context,
+    required WidgetRef ref,
+    required AttendanceData attendance,
+  }) {
+    final theme = Theme.of(context);
+
+    String timeInDisplay = _formatTimeForDisplay(attendance.timeIn);
+    String timeOutDisplay = _formatTimeForDisplay(attendance.timeOut);
+    String dateDisplay = _formatDateForDisplay(attendance.date);
+
+    return InkWell(
+      onTap: () => viewModalSheet(
+        context: context,
+        item: {
+          "Employee": attendance.employee?.name ?? 'N/A',
+          "Shift": attendance.shift?.name ?? 'N/A',
+          "Month": attendance.month ?? 'N/A',
+          "Date": dateDisplay,
+          "Time In": timeInDisplay,
+          "Time Out": timeOutDisplay,
+        },
+        description: attendance.note ?? lang.S.of(context).noNoteProvided,
+      ),
+      child: Padding(
+        padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 13.5),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Row(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: [
+                Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Text(
+                      attendance.employee?.name ?? 'N/A Employee',
+                      style: theme.textTheme.titleMedium?.copyWith(
+                        fontWeight: FontWeight.w600,
+                      ),
+                    ),
+                    const SizedBox(height: 8),
+                    Text(
+                      dateDisplay,
+                      style: theme.textTheme.bodyMedium?.copyWith(color: kNeutral800),
+                    ),
+                  ],
+                ),
+                _buildActionButtons(
+                  context,
+                  ref,
+                  attendance.id,
+                  attendance.employee?.name ?? lang.S.of(context).attendance,
+                ),
+              ],
+            ),
+            const SizedBox(height: 20),
+            Row(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: [
+                _buildTimeColumn(
+                  time: timeInDisplay,
+                  label: lang.S.of(context).timeIn,
+                  theme: theme,
+                ),
+                _buildTimeColumn(
+                  time: timeOutDisplay,
+                  label: lang.S.of(context).timeOut,
+                  theme: theme,
+                ),
+                _buildTimeColumn(
+                  time: attendance.duration ?? 'N/A',
+                  label: lang.S.of(context).duration,
+                  theme: theme,
+                ),
+              ],
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildTimeColumn({
+    required String time,
+    required String label,
+    required ThemeData theme,
+  }) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Text(time, style: theme.textTheme.titleMedium?.copyWith(fontWeight: FontWeight.w600)),
+        const SizedBox(height: 6),
+        Text(label, style: theme.textTheme.bodyMedium?.copyWith(color: kNeutral800)),
+      ],
+    );
+  }
+
+  Widget _buildActionButtons(BuildContext context, WidgetRef ref, num? id, String name) {
+    final permissionService = PermissionService(ref);
+    return Column(
+      children: [
+        GestureDetector(
+          onTap: () {
+            if (!permissionService.hasPermission(Permit.attendancesUpdate.value)) {
+              ScaffoldMessenger.of(context).showSnackBar(
+                SnackBar(
+                  backgroundColor: Colors.red,
+                  content: Text(lang.S.of(context).youDoNotHavePermissionToViewAttendance),
+                ),
+              );
+              return;
+            }
+            if (id != null) {
+              final attendanceData = _filteredList.firstWhere((a) => a.id == id);
+              Navigator.push(
+                context,
+                MaterialPageRoute(
+                  builder: (context) => AddNewAttendance(attendanceData: attendanceData),
+                ),
+              );
+            }
+          },
+          child: const HugeIcon(
+            icon: HugeIcons.strokeRoundedPencilEdit02,
+            color: kSuccessColor,
+            size: 20,
+          ),
+        ),
+        const SizedBox(height: 8),
+        GestureDetector(
+          onTap: () {
+            if (!permissionService.hasPermission(Permit.attendancesDelete.value)) {
+              ScaffoldMessenger.of(context).showSnackBar(
+                SnackBar(
+                  backgroundColor: Colors.red,
+                  content: Text(lang.S.of(context).youDoNotHavePermissionToViewAttendance),
+                ),
+              );
+              return;
+            }
+            if (id != null) {
+              _showDeleteConfirmationDialog(context, ref, id, name);
+            }
+          },
+          child: const HugeIcon(
+            icon: HugeIcons.strokeRoundedDelete03,
+            color: Colors.red,
+            size: 20,
+          ),
+        ),
+      ],
+    );
+  }
+}

lib/Screens/hrm/attendance/model/attendence_list_model.dart

@@ -0,0 +1,113 @@
+// File: attendance_model.dart
+
+class AttendanceListModel {
+  AttendanceListModel({
+    this.message,
+    this.data,
+  });
+
+  AttendanceListModel.fromJson(dynamic json) {
+    message = json['message'];
+    if (json['data'] != null) {
+      data = [];
+      json['data'].forEach((v) {
+        data?.add(AttendanceData.fromJson(v));
+      });
+    }
+  }
+  String? message;
+  List<AttendanceData>? data;
+}
+
+class AttendanceData {
+  AttendanceData({
+    this.id,
+    this.businessId,
+    this.branchId,
+    this.employeeId,
+    this.shiftId,
+    this.timeIn,
+    this.timeOut,
+    this.date,
+    this.duration,
+    this.month,
+    this.note,
+    this.createdAt,
+    this.updatedAt,
+    this.employee,
+    this.shift,
+  });
+
+  AttendanceData.fromJson(dynamic json) {
+    id = json['id'];
+    businessId = json['business_id'];
+    branchId = json['branch_id'];
+    employeeId = json['employee_id'];
+    shiftId = json['shift_id'];
+    timeIn = json['time_in'];
+    timeOut = json['time_out'];
+    date = json['date'];
+    duration = json['duration'];
+    month = json['month'];
+    note = json['note'];
+    createdAt = json['created_at'];
+    updatedAt = json['updated_at'];
+    employee = json['employee'] != null ? Employee.fromJson(json['employee']) : null;
+    shift = json['shift'] != null ? Shift.fromJson(json['shift']) : null;
+  }
+  num? id;
+  num? businessId;
+  dynamic branchId;
+  num? employeeId;
+  num? shiftId;
+  String? timeIn;
+  String? timeOut;
+  String? date;
+  String? duration;
+  String? month;
+  String? note;
+  String? createdAt;
+  String? updatedAt;
+  Employee? employee;
+  Shift? shift;
+}
+
+class Employee {
+  Employee({this.id, this.name});
+  Employee.fromJson(dynamic json) {
+    id = json['id'];
+    name = json['name'];
+  }
+  num? id;
+  String? name;
+}
+
+class Shift {
+  Shift({this.id, this.name});
+  Shift.fromJson(dynamic json) {
+    id = json['id'];
+    name = json['name'];
+  }
+  num? id;
+  String? name;
+}
+
+// Assume EmployeeData model exists elsewhere for provider list consumption
+class EmployeeData {
+  num? id;
+  String? name;
+  EmployeeData.fromJson(dynamic json) {
+    id = json['id'];
+    name = json['name'];
+  }
+}
+
+// Assume ShiftData model exists elsewhere for provider list consumption
+class ShiftData {
+  num? id;
+  String? name;
+  ShiftData.fromJson(dynamic json) {
+    id = json['id'];
+    name = json['name'];
+  }
+}

lib/Screens/hrm/attendance/provider/attendence_provider.dart

@@ -0,0 +1,9 @@
+
+
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+
+import '../model/attendence_list_model.dart';
+import '../repo/attendence_repo.dart';
+
+final repo = AttendanceRepo();
+final attendanceListProvider = FutureProvider<AttendanceListModel>((ref) => repo.fetchAllAttendance());

lib/Screens/hrm/attendance/repo/attendence_repo.dart

@@ -0,0 +1,182 @@
+// File: attendance_repo.dart
+
+import 'dart:convert';
+import 'package:flutter/material.dart';
+import 'package:flutter_easyloading/flutter_easyloading.dart';
+import 'package:http/http.dart' as http;
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+
+// --- Local Imports ---
+import '../../../../Const/api_config.dart';
+import '../../../../http_client/custome_http_client.dart';
+import '../../../../http_client/customer_http_client_get.dart';
+import '../model/attendence_list_model.dart';
+import '../provider/attendence_provider.dart';
+
+class AttendanceRepo {
+  static const String _endpoint = '/attendances'; // Assuming a suitable endpoint
+
+  ///---------------- FETCH ALL ATTENDANCE (GET) ----------------///
+  Future<AttendanceListModel> fetchAllAttendance() async {
+    CustomHttpClientGet clientGet = CustomHttpClientGet(client: http.Client());
+    final uri = Uri.parse('${APIConfig.url}$_endpoint');
+
+    final response = await clientGet.get(url: uri);
+
+    if (response.statusCode == 200) {
+      final parsedData = jsonDecode(response.body);
+      return AttendanceListModel.fromJson(parsedData);
+    } else {
+      throw Exception('Failed to fetch attendance list. Status: ${response.statusCode}');
+    }
+  }
+
+  ///---------------- CREATE ATTENDANCE (POST) ----------------///
+  Future<void> createAttendance({
+    required WidgetRef ref,
+    required BuildContext context,
+    required num employeeId,
+    required num shiftId,
+    required String timeIn, // HH:MM:SS format
+    required String timeOut, // HH:MM:SS format
+    required String date, // YYYY-MM-DD format
+    // required String month,
+    String? note,
+  }) async {
+    final uri = Uri.parse('${APIConfig.url}$_endpoint');
+
+    final requestBody = jsonEncode({
+      'employee_id': employeeId,
+      'shift_id': shiftId,
+      'time_in': timeIn,
+      'time_out': timeOut,
+      'date': date,
+      // 'month': month,
+      'note': note,
+    });
+
+    try {
+      EasyLoading.show(status: 'Recording Attendance...');
+      CustomHttpClient customHttpClient = CustomHttpClient(client: http.Client(), context: context, ref: ref);
+
+      var responseData = await customHttpClient.post(
+        url: uri,
+        addContentTypeInHeader: true,
+        body: requestBody,
+      );
+
+      final parsedData = jsonDecode(responseData.body);
+      EasyLoading.dismiss();
+
+      if (responseData.statusCode == 200 || responseData.statusCode == 201) {
+        ref.invalidate(attendanceListProvider); // Refresh the list
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text(parsedData['message'] ?? 'Attendance recorded successfully')),
+        );
+        Navigator.pop(context);
+      } else {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text('Recording failed: ${parsedData['message'] ?? 'Unknown error'}')),
+        );
+      }
+    } catch (error) {
+      EasyLoading.dismiss();
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text('An error occurred: $error')),
+      );
+    }
+  }
+
+  ///---------------- UPDATE ATTENDANCE (PUT) ----------------///
+  Future<void> updateAttendance({
+    required WidgetRef ref,
+    required BuildContext context,
+    required num id,
+    required num employeeId,
+    required num shiftId,
+    required String timeIn,
+    required String timeOut,
+    required String date,
+    // required String month,
+    String? note,
+  }) async {
+    final uri = Uri.parse('${APIConfig.url}$_endpoint/$id');
+
+    final requestBody = jsonEncode({
+      '_method': 'put',
+      'employee_id': employeeId,
+      'shift_id': shiftId,
+      'time_in': timeIn,
+      'time_out': timeOut,
+      'date': date,
+      // 'month': month,
+      'note': note,
+    });
+
+    try {
+      EasyLoading.show(status: 'Updating...');
+      CustomHttpClient customHttpClient = CustomHttpClient(client: http.Client(), context: context, ref: ref);
+
+      var responseData = await customHttpClient.post(
+        url: uri,
+        addContentTypeInHeader: true,
+        body: requestBody,
+      );
+
+      final parsedData = jsonDecode(responseData.body);
+      EasyLoading.dismiss();
+
+      if (responseData.statusCode == 200) {
+        ref.invalidate(attendanceListProvider); // Refresh the list
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text(parsedData['message'] ?? 'Attendance updated successfully')),
+        );
+        Navigator.pop(context);
+      } else {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text('Update failed: ${parsedData['message'] ?? 'Unknown error'}')),
+        );
+      }
+    } catch (error) {
+      EasyLoading.dismiss();
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text('An error occurred: $error')),
+      );
+    }
+  }
+
+  ///---------------- DELETE ATTENDANCE ----------------///
+  Future<bool> deleteAttendance({
+    required num id,
+    required BuildContext context,
+    required WidgetRef ref,
+  }) async {
+    try {
+      EasyLoading.show(status: 'Deleting...');
+      final url = Uri.parse('${APIConfig.url}$_endpoint/$id');
+      CustomHttpClient customHttpClient = CustomHttpClient(ref: ref, context: context, client: http.Client());
+      final response = await customHttpClient.delete(url: url);
+
+      EasyLoading.dismiss();
+      if (response.statusCode == 200) {
+        ref.invalidate(attendanceListProvider); // Refresh the list
+        ScaffoldMessenger.of(context).showSnackBar(
+          const SnackBar(content: Text('Attendance deleted successfully')),
+        );
+        return true;
+      } else {
+        final parsedData = jsonDecode(response.body);
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text('Deletion failed: ${parsedData['message'] ?? 'Unknown error'}')),
+        );
+        return false;
+      }
+    } catch (error) {
+      EasyLoading.dismiss();
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text('An error occurred during deletion: $error')),
+      );
+      return false;
+    }
+  }
+}

lib/Screens/hrm/department/add_new_depertment.dart

@@ -0,0 +1,191 @@
+// File: add_edit_department.dart
+
+import 'package:flutter/material.dart';
+import 'package:flutter_easyloading/flutter_easyloading.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+
+// --- Local Imports ---
+import 'package:mobile_pos/Screens/hrm/department/model/department_list_model.dart';
+import 'package:mobile_pos/Screens/hrm/department/repo/department_repo.dart';
+import 'package:mobile_pos/constant.dart';
+// Assuming DepartmentRepo is available via this path
+
+class AddEditDepartment extends ConsumerStatefulWidget {
+  final bool isEdit;
+  final DepartmentData? department;
+
+  const AddEditDepartment({super.key, this.isEdit = false, this.department});
+
+  @override
+  ConsumerState<AddEditDepartment> createState() => _AddEditDepartmentState();
+}
+
+class _AddEditDepartmentState extends ConsumerState<AddEditDepartment> {
+  final GlobalKey<FormState> _key = GlobalKey<FormState>();
+  final TextEditingController nameController = TextEditingController();
+  final TextEditingController descController = TextEditingController();
+
+  String? _selectedStatus; // UI state for dropdown
+
+  final List<String> _statusOptions = ['Active', 'Inactive'];
+
+  @override
+  void initState() {
+    super.initState();
+    if (widget.isEdit && widget.department != null) {
+      final data = widget.department!;
+      nameController.text = data.name ?? '';
+      descController.text = data.description ?? '';
+      // Convert num status (1/0) to string status ('Active'/'Inactive')
+      _selectedStatus = data.status.toString() == '1' || data.status.toString() == 'Active' ? 'Active' : 'Inactive';
+    } else {
+      _selectedStatus = 'Active'; // Default status for new entry
+    }
+  }
+
+  @override
+  void dispose() {
+    nameController.dispose();
+    descController.dispose();
+    super.dispose();
+  }
+
+  // --- Submission Logic ---
+  Future<void> _submit() async {
+    if (!_key.currentState!.validate()) {
+      return;
+    }
+
+    final repo = DepartmentRepo();
+    // Convert selected string status to API required string "1" (Active) or "0" (Inactive)
+    final String apiStatus = _selectedStatus == 'Active' ? '1' : '0';
+
+    EasyLoading.show(status: widget.isEdit ? 'Updating...' : 'Saving...');
+
+    if (widget.isEdit) {
+      await repo.updateDepartment(
+        ref: ref,
+        context: context,
+
+        // Assuming ID is non-null when isEdit is true
+        id: widget.department!.id!.round(),
+        name: nameController.text,
+        description: descController.text,
+        status: apiStatus,
+      );
+    } else {
+      await repo.createDepartment(
+        ref: ref,
+        context: context,
+        name: nameController.text,
+        description: descController.text,
+        status: apiStatus,
+      );
+    }
+  }
+
+  // --- Reset Logic ---
+  void _resetForm() {
+    setState(() {
+      _key.currentState?.reset();
+      nameController.clear();
+      descController.clear();
+      _selectedStatus = 'Active';
+
+      // If editing, pressing reset should revert to original values
+      if (widget.isEdit && widget.department != null) {
+        final data = widget.department!;
+        nameController.text = data.name ?? '';
+        descController.text = data.description ?? '';
+        _selectedStatus = data.status == '1' || data.status == 'Active' ? 'Active' : 'Inactive';
+      }
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      backgroundColor: Colors.white,
+      appBar: AppBar(
+        centerTitle: true,
+        title: Text(widget.isEdit ? 'Edit Department' : 'Add Department'),
+      ),
+      body: SingleChildScrollView(
+        padding: const EdgeInsets.all(16),
+        child: Form(
+          key: _key,
+          child: Column(
+            children: [
+              // 1. Department Name
+              TextFormField(
+                controller: nameController,
+                decoration: kInputDecoration.copyWith(
+                  labelText: 'Department Name',
+                  hintText: 'Enter Department Name',
+                ),
+                validator: (value) => value!.isEmpty ? 'Please enter department name' : null,
+              ),
+              const SizedBox(height: 16),
+
+              // 2. Status Dropdown
+              DropdownButtonFormField<String>(
+                value: _selectedStatus,
+                icon: const Icon(Icons.keyboard_arrow_down, color: kNeutral800),
+                decoration: kInputDecoration.copyWith(labelText: 'Status'),
+                items: _statusOptions.map((String value) {
+                  return DropdownMenuItem(value: value, child: Text(value));
+                }).toList(),
+                onChanged: (String? newValue) {
+                  setState(() {
+                    _selectedStatus = newValue;
+                  });
+                },
+                validator: (value) => value == null ? 'Please select a status' : null,
+              ),
+              const SizedBox(height: 16),
+
+              // 3. Description
+              TextFormField(
+                controller: descController,
+                maxLines: 3,
+                decoration: kInputDecoration.copyWith(
+                  labelText: 'Description',
+                  hintText: 'Enter Description',
+                  contentPadding: const EdgeInsets.symmetric(horizontal: 12.0, vertical: 10.0),
+                ),
+              ),
+              const SizedBox(height: 30),
+
+              // 4. Action Buttons (Reset/Save)
+              Row(
+                children: [
+                  // Reset Button
+                  Expanded(
+                    child: OutlinedButton(
+                      onPressed: _resetForm,
+                      style: OutlinedButton.styleFrom(
+                        minimumSize: const Size(double.infinity, 50),
+                      ),
+                      child: Text(widget.isEdit ? 'Cancel' : 'Reset'),
+                    ),
+                  ),
+                  const SizedBox(width: 16),
+                  // Save/Update Button
+                  Expanded(
+                    child: ElevatedButton.icon(
+                      onPressed: _submit,
+                      label: Text(widget.isEdit ? 'Update' : 'Save'),
+                      style: ElevatedButton.styleFrom(
+                        minimumSize: const Size(double.infinity, 50),
+                      ),
+                    ),
+                  ),
+                ],
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}

lib/Screens/hrm/department/department_screen.dart

@@ -0,0 +1,236 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_easyloading/flutter_easyloading.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:hugeicons/hugeicons.dart';
+import 'package:mobile_pos/Screens/hrm/department/add_new_depertment.dart';
+import 'package:mobile_pos/Screens/hrm/department/provider/department_list_provider.dart';
+import 'package:mobile_pos/Screens/hrm/department/repo/department_repo.dart';
+import 'package:mobile_pos/Screens/hrm/widgets/deleteing_alart_dialog.dart';
+import 'package:mobile_pos/Screens/hrm/widgets/global_search_appbar.dart';
+import 'package:mobile_pos/Screens/hrm/widgets/model_bottom_sheet.dart';
+import 'package:mobile_pos/constant.dart';
+import 'package:mobile_pos/generated/l10n.dart' as lang;
+
+import '../../../generated/l10n.dart' as lang;
+import '../../../service/check_user_role_permission_provider.dart';
+import '../../../widgets/empty_widget/_empty_widget.dart';
+
+class DepartmentScreen extends ConsumerStatefulWidget {
+  const DepartmentScreen({super.key});
+
+  @override
+  ConsumerState<DepartmentScreen> createState() => _DepartmentScreenState();
+}
+
+class _DepartmentScreenState extends ConsumerState<DepartmentScreen> {
+  bool _isSearch = false;
+  final _searchController = TextEditingController();
+  String _searchQuery = '';
+
+  Future<void> _refreshList() async {
+    await ref.refresh(departmentListProvider.future);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final _lang = lang.S.of(context);
+    final theme = Theme.of(context);
+    final departmentAsync = ref.watch(departmentListProvider);
+    final permissionService = PermissionService(ref);
+
+    return Scaffold(
+      backgroundColor: kWhite,
+      appBar: GlobalSearchAppBar(
+        isSearch: _isSearch,
+        onSearchToggle: () => setState(() {
+          _isSearch = !_isSearch;
+          _searchController.clear();
+          _searchQuery = '';
+        }),
+        title: _lang.department,
+        controller: _searchController,
+        onChanged: (query) {
+          setState(() => _searchQuery = query.trim().toLowerCase());
+        },
+      ),
+      body: departmentAsync.when(
+        data: (data) {
+          if (!permissionService.hasPermission(Permit.departmentRead.value)) {
+            return const Center(child: PermitDenyWidget());
+          }
+          final departmentList = data.data ?? [];
+
+          // Search filter
+          final filteredList = departmentList.where((dept) {
+            final name = dept.name?.toLowerCase() ?? '';
+            final desc = dept.description?.toLowerCase() ?? '';
+            return name.contains(_searchQuery) || desc.contains(_searchQuery);
+          }).toList();
+
+          if (filteredList.isEmpty) {
+            return Center(child: Text(_lang.noDepartmentFound));
+          }
+
+          return RefreshIndicator(
+            onRefresh: _refreshList,
+            child: ListView.separated(
+              physics: const AlwaysScrollableScrollPhysics(),
+              padding: EdgeInsets.zero,
+              itemBuilder: (_, index) {
+                final dept = filteredList[index];
+                return ListTile(
+                  onTap: () {
+                    viewModalSheet(
+                      context: context,
+                      item: {
+                        _lang.department: dept.name ?? 'n/a',
+                        _lang.status: (dept.status == 1) ? _lang.active : _lang.inactive,
+                      },
+                      description: dept.description ?? _lang.noDescriptionAvailableForThisDepartment,
+                    );
+                  },
+                  contentPadding: const EdgeInsetsDirectional.symmetric(
+                    horizontal: 16,
+                    vertical: 0,
+                  ),
+                  visualDensity: const VisualDensity(horizontal: -4, vertical: -4),
+                  title: Row(
+                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                    children: [
+                      Flexible(
+                        child: Text(
+                          dept.name ?? 'n/a',
+                          style: theme.textTheme.titleMedium?.copyWith(
+                            fontWeight: FontWeight.w500,
+                          ),
+                        ),
+                      ),
+                      IconButton(
+                        style: const ButtonStyle(
+                          padding: WidgetStatePropertyAll(EdgeInsets.all(0)),
+                        ),
+                        padding: EdgeInsets.zero,
+                        visualDensity: const VisualDensity(horizontal: -4, vertical: -4),
+                        onPressed: () {
+                          if (!permissionService.hasPermission(Permit.departmentUpdate.value)) {
+                            ScaffoldMessenger.of(context).showSnackBar(
+                              SnackBar(
+                                backgroundColor: Colors.red,
+                                content: Text(_lang.youDoNotHavePermissionToUpdateDepartment),
+                              ),
+                            );
+                            return;
+                          }
+                          Navigator.push(
+                            context,
+                            MaterialPageRoute(
+                              builder: (context) => AddEditDepartment(
+                                isEdit: true,
+                                department: dept,
+                              ),
+                            ),
+                          );
+                        },
+                        icon: const HugeIcon(
+                          icon: HugeIcons.strokeRoundedPencilEdit02,
+                          color: kSuccessColor,
+                          size: 20,
+                        ),
+                      ),
+                    ],
+                  ),
+                  subtitle: Row(
+                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                    children: [
+                      Flexible(
+                        child: Text(
+                          dept.description ?? 'n/a',
+                          style: theme.textTheme.bodyMedium?.copyWith(
+                            color: kNeutral800,
+                          ),
+                          maxLines: 1,
+                          overflow: TextOverflow.ellipsis,
+                        ),
+                      ),
+                      IconButton(
+                        padding: EdgeInsets.zero,
+                        style: const ButtonStyle(
+                          padding: WidgetStatePropertyAll(EdgeInsets.all(0)),
+                        ),
+                        visualDensity: const VisualDensity(horizontal: -4, vertical: -4),
+                        onPressed: () async {
+                          if (!permissionService.hasPermission(Permit.departmentDelete.value)) {
+                            ScaffoldMessenger.of(context).showSnackBar(
+                              SnackBar(
+                                backgroundColor: Colors.red,
+                                content: Text(lang.S.of(context).youDoNotHavePermissionToDeleteDepartment),
+                              ),
+                            );
+                            return;
+                          }
+                          final _lang = lang.S.of(context);
+                          final confirm = await showDeleteConfirmationDialog(
+                            itemName: lang.S.of(context).department,
+                            context: context,
+                          );
+
+                          if (confirm) {
+                            EasyLoading.show(status: _lang.deleting);
+                            final DepartmentRepo repo = DepartmentRepo();
+                            try {
+                              final result =
+                                  await repo.deleteDepartment(id: dept.id.toString(), ref: ref, context: context);
+                              if (result) {
+                                ref.refresh(departmentListProvider);
+                                EasyLoading.showSuccess(_lang.deletedSuccessFully);
+                              } else {
+                                EasyLoading.showError(_lang.failedToDeleteTheDeterment);
+                              }
+                            } catch (e) {
+                              EasyLoading.showError('${"Error deleting"}: $e');
+                            } finally {
+                              EasyLoading.dismiss();
+                            }
+                          }
+                        },
+                        icon: const HugeIcon(
+                          icon: HugeIcons.strokeRoundedDelete03,
+                          color: Colors.red,
+                          size: 20,
+                        ),
+                      ),
+                    ],
+                  ),
+                );
+              },
+              separatorBuilder: (_, __) => const Divider(
+                color: kBackgroundColor,
+                height: 2,
+              ),
+              itemCount: filteredList.length,
+            ),
+          );
+        },
+        loading: () => const Center(child: CircularProgressIndicator()),
+        error: (err, _) => Center(
+          child: Text('${lang.S.of(context).failedToLoadDepartment}.\n$err'),
+        ),
+      ),
+      bottomNavigationBar: permissionService.hasPermission(Permit.departmentCreate.value)
+          ? Padding(
+              padding: const EdgeInsets.all(16),
+              child: ElevatedButton.icon(
+                onPressed: () {
+                  Navigator.push(
+                    context,
+                    MaterialPageRoute(builder: (context) => const AddEditDepartment(isEdit: false)),
+                  );
+                },
+                label: Text(lang.S.of(context).addDepartment),
+                icon: const Icon(Icons.add, color: Colors.white),
+              ),
+            )
+          : null,
+    );
+  }
+}

lib/Screens/hrm/department/model/department_list_model.dart

@@ -0,0 +1,68 @@
+class DepartmentListModel {
+  DepartmentListModel({
+    this.message,
+    this.data,
+  });
+
+  DepartmentListModel.fromJson(dynamic json) {
+    message = json['message'];
+    if (json['data'] != null) {
+      data = [];
+      json['data'].forEach((v) {
+        data?.add(DepartmentData.fromJson(v));
+      });
+    }
+  }
+  String? message;
+  List<DepartmentData>? data;
+
+  Map<String, dynamic> toJson() {
+    final map = <String, dynamic>{};
+    map['message'] = message;
+    if (data != null) {
+      map['data'] = data?.map((v) => v.toJson()).toList();
+    }
+    return map;
+  }
+}
+
+class DepartmentData {
+  DepartmentData({
+    this.id,
+    this.businessId,
+    this.name,
+    this.description,
+    this.status,
+    this.createdAt,
+    this.updatedAt,
+  });
+
+  DepartmentData.fromJson(dynamic json) {
+    id = json['id'];
+    businessId = json['business_id'];
+    name = json['name'];
+    description = json['description'];
+    status = json['status'];
+    createdAt = json['created_at'];
+    updatedAt = json['updated_at'];
+  }
+  num? id;
+  num? businessId;
+  String? name;
+  String? description;
+  num? status;
+  String? createdAt;
+  String? updatedAt;
+
+  Map<String, dynamic> toJson() {
+    final map = <String, dynamic>{};
+    map['id'] = id;
+    map['business_id'] = businessId;
+    map['name'] = name;
+    map['description'] = description;
+    map['status'] = status;
+    map['created_at'] = createdAt;
+    map['updated_at'] = updatedAt;
+    return map;
+  }
+}

lib/Screens/hrm/department/provider/department_list_provider.dart

@@ -0,0 +1,6 @@
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:mobile_pos/Screens/hrm/department/model/department_list_model.dart';
+import 'package:mobile_pos/Screens/hrm/department/repo/department_repo.dart';
+
+DepartmentRepo repo = DepartmentRepo();
+final departmentListProvider = FutureProvider<DepartmentListModel>((ref) => repo.fetchAllDepartments());

lib/Screens/hrm/department/repo/department_repo.dart

@@ -0,0 +1,149 @@
+import 'dart:convert';
+import 'package:flutter/material.dart';
+import 'package:flutter_easyloading/flutter_easyloading.dart';
+import 'package:http/http.dart' as http;
+import 'package:mobile_pos/Screens/hrm/department/model/department_list_model.dart';
+
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+
+import '../../../../Const/api_config.dart';
+import '../../../../http_client/custome_http_client.dart';
+import '../../../../http_client/customer_http_client_get.dart';
+import '../provider/department_list_provider.dart';
+
+class DepartmentRepo {
+  Future<DepartmentListModel> fetchAllDepartments() async {
+    CustomHttpClientGet clientGet = CustomHttpClientGet(client: http.Client());
+    final uri = Uri.parse('${APIConfig.url}/departments');
+
+    final response = await clientGet.get(url: uri);
+
+    if (response.statusCode == 200) {
+      final parsedData = jsonDecode(response.body);
+
+      return DepartmentListModel.fromJson(parsedData);
+    } else {
+      throw Exception('Failed to fetch Department list');
+    }
+  }
+
+  ///---------------- CREATE DEPARTMENT ----------------///
+  Future<void> createDepartment({
+    required WidgetRef ref,
+    required BuildContext context,
+    required String name,
+    required String description,
+    required String status,
+  }) async {
+    final uri = Uri.parse('${APIConfig.url}/departments');
+
+    final requestBody = jsonEncode({
+      'name': name,
+      'description': description,
+      'status': status,
+    });
+
+    try {
+      EasyLoading.show(status: 'Creating...');
+      CustomHttpClient customHttpClient = CustomHttpClient(client: http.Client(), context: context, ref: ref);
+
+      var responseData = await customHttpClient.post(
+        url: uri,
+        addContentTypeInHeader: true,
+        body: requestBody,
+      );
+
+      final parsedData = jsonDecode(responseData.body);
+      EasyLoading.dismiss();
+
+      if (responseData.statusCode == 200) {
+        ref.refresh(departmentListProvider);
+
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text(parsedData['message'] ?? 'Department created')),
+        );
+        Navigator.pop(context);
+      } else {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text('Department creation failed: ${parsedData['message'] ?? 'Unknown error'}')),
+        );
+      }
+    } catch (error) {
+      EasyLoading.dismiss();
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text('An error occurred: $error')),
+      );
+    }
+  }
+
+  ///---------------- UPDATE DEPARTMENT ----------------///
+  Future<void> updateDepartment({
+    required WidgetRef ref,
+    required BuildContext context,
+    required int id,
+    required String name,
+    required String description,
+    required String status,
+  }) async {
+    final uri = Uri.parse('${APIConfig.url}/departments/$id');
+
+    final requestBody = jsonEncode({
+      '_method': 'put',
+      'name': name,
+      'description': description,
+      'status': status,
+    });
+
+    try {
+      EasyLoading.show(status: 'Updating...');
+      CustomHttpClient customHttpClient = CustomHttpClient(client: http.Client(), context: context, ref: ref);
+
+      var responseData = await customHttpClient.post(
+        url: uri,
+        addContentTypeInHeader: true,
+        body: requestBody,
+      );
+
+      final parsedData = jsonDecode(responseData.body);
+      EasyLoading.dismiss();
+
+      if (responseData.statusCode == 200) {
+        ref.refresh(departmentListProvider);
+
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text(parsedData['message'] ?? 'Department updated')),
+        );
+        Navigator.pop(context);
+      } else {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text('Department update failed: ${parsedData['message'] ?? 'Unknown error'}')),
+        );
+      }
+    } catch (error) {
+      EasyLoading.dismiss();
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text('An error occurred: $error')),
+      );
+    }
+  }
+
+  Future<bool> deleteDepartment({required String id, required BuildContext context, required WidgetRef ref}) async {
+    try {
+      final url = Uri.parse('${APIConfig.url}/departments/$id');
+      CustomHttpClient customHttpClient = CustomHttpClient(ref: ref, context: context, client: http.Client());
+      final response = await customHttpClient.delete(url: url);
+
+      if (response.statusCode == 200) {
+        return true;
+      } else {
+        print('Error deleting Department: ${response.statusCode} - ${response.body}');
+        return false;
+      }
+    } catch (error) {
+      print('Error during delete operation: $error');
+      return false;
+    } finally {
+      EasyLoading.dismiss();
+    }
+  }
+}

lib/Screens/hrm/designation/Model/designation_list_model.dart

@@ -0,0 +1,68 @@
+class DesignationListModel {
+  DesignationListModel({
+    this.message,
+    this.data,
+  });
+
+  DesignationListModel.fromJson(dynamic json) {
+    message = json['message'];
+    if (json['data'] != null) {
+      data = [];
+      json['data'].forEach((v) {
+        data?.add(DesignationData.fromJson(v));
+      });
+    }
+  }
+  String? message;
+  List<DesignationData>? data;
+
+  Map<String, dynamic> toJson() {
+    final map = <String, dynamic>{};
+    map['message'] = message;
+    if (data != null) {
+      map['data'] = data?.map((v) => v.toJson()).toList();
+    }
+    return map;
+  }
+}
+
+class DesignationData {
+  DesignationData({
+    this.id,
+    this.name,
+    this.businessId,
+    this.description,
+    this.status,
+    this.createdAt,
+    this.updatedAt,
+  });
+
+  DesignationData.fromJson(dynamic json) {
+    id = json['id'];
+    name = json['name'];
+    businessId = json['business_id'];
+    description = json['description'];
+    status = json['status'];
+    createdAt = json['created_at'];
+    updatedAt = json['updated_at'];
+  }
+  num? id;
+  String? name;
+  num? businessId;
+  String? description;
+  num? status;
+  String? createdAt;
+  String? updatedAt;
+
+  Map<String, dynamic> toJson() {
+    final map = <String, dynamic>{};
+    map['id'] = id;
+    map['name'] = name;
+    map['business_id'] = businessId;
+    map['description'] = description;
+    map['status'] = status;
+    map['created_at'] = createdAt;
+    map['updated_at'] = updatedAt;
+    return map;
+  }
+}

lib/Screens/hrm/designation/add_new_designation.dart

@@ -0,0 +1,153 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_easyloading/flutter_easyloading.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:mobile_pos/Screens/hrm/designation/Model/designation_list_model.dart';
+import 'package:mobile_pos/Screens/hrm/designation/repo/designation_repo.dart';
+import 'package:mobile_pos/Screens/hrm/widgets/label_style.dart';
+import 'package:mobile_pos/generated/l10n.dart' as lang;
+import 'package:mobile_pos/constant.dart';
+
+class AddEditDesignation extends ConsumerStatefulWidget {
+  final bool isEdit;
+  final DesignationData? designation;
+
+  const AddEditDesignation({super.key, this.isEdit = false, this.designation});
+
+  @override
+  ConsumerState<AddEditDesignation> createState() => _AddEditDesignationState();
+}
+
+class _AddEditDesignationState extends ConsumerState<AddEditDesignation> {
+  final nameController = TextEditingController();
+  final descriptionController = TextEditingController();
+  String? selectedValue = 'Active';
+  final key = GlobalKey<FormState>();
+
+  @override
+  void initState() {
+    super.initState();
+    if (widget.isEdit && widget.designation != null) {
+      nameController.text = widget.designation?.name ?? '';
+      descriptionController.text = widget.designation?.description ?? '';
+      selectedValue = widget.designation?.status.toString() == '1' ? 'Active' : 'InActive';
+    }
+  }
+
+  Future<void> _submit() async {
+    if (!key.currentState!.validate()) return;
+
+    final repo = DesignationRepo();
+    EasyLoading.show(status: '${lang.S.of(context).saving}...');
+
+    if (widget.isEdit) {
+      await repo.updateDesignation(
+        ref: ref,
+        context: context,
+        id: widget.designation!.id.toString(),
+        name: nameController.text,
+        status: selectedValue ?? lang.S.of(context).active,
+        description: descriptionController.text,
+      );
+    } else {
+      await repo.createDesignation(
+        ref: ref,
+        context: context,
+        name: nameController.text,
+        status: selectedValue ?? lang.S.of(context).active,
+        description: descriptionController.text,
+      );
+    }
+  }
+
+  @override
+  void dispose() {
+    nameController.dispose();
+    descriptionController.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final _lang = lang.S.of(context);
+    return Scaffold(
+      backgroundColor: kWhite,
+      appBar: AppBar(
+        centerTitle: true,
+        title: Text(
+          widget.isEdit ? _lang.editDesignation : _lang.addDesignation,
+        ),
+        bottom: PreferredSize(
+          preferredSize: const Size.fromHeight(1),
+          child: Divider(height: 2, color: kBackgroundColor),
+        ),
+      ),
+      body: SingleChildScrollView(
+        padding: const EdgeInsets.all(16),
+        child: Form(
+          key: key,
+          child: Column(
+            children: [
+              TextFormField(
+                controller: nameController,
+                decoration: InputDecoration(
+                  label: labelSpan(title: _lang.designationName, context: context),
+                  hintText: _lang.enterDesignationName,
+                ),
+                validator: (value) => value!.isEmpty ? _lang.pleaseEnterDesignationName : null,
+              ),
+              const SizedBox(height: 20),
+              DropdownButtonFormField(
+                value: selectedValue,
+                icon: Icon(Icons.keyboard_arrow_down, color: kNeutral800),
+                decoration: InputDecoration(
+                  labelText: _lang.status,
+                  hintText: _lang.select,
+                ),
+                items:
+                    ['Active', 'InActive'].map((value) => DropdownMenuItem(value: value, child: Text(value))).toList(),
+                onChanged: (String? newValue) {
+                  setState(() {
+                    selectedValue = newValue;
+                  });
+                },
+                validator: (value) => value == null ? _lang.pleaseSelectAStatus : null,
+              ),
+              const SizedBox(height: 20),
+              TextFormField(
+                controller: descriptionController,
+                decoration: InputDecoration(
+                  labelText: _lang.description,
+                  hintText: '${_lang.enterDescription}...',
+                ),
+              ),
+              const SizedBox(height: 20),
+              Row(
+                children: [
+                  Expanded(
+                    child: OutlinedButton(
+                      onPressed: () {
+                        key.currentState?.reset();
+                        nameController.clear();
+                        descriptionController.clear();
+                        selectedValue = null;
+                        setState(() {});
+                      },
+                      child: Text(_lang.resets),
+                    ),
+                  ),
+                  const SizedBox(width: 16),
+                  Expanded(
+                    child: ElevatedButton(
+                      onPressed: _submit,
+                      child: Text(widget.isEdit ? _lang.update : _lang.save),
+                    ),
+                  ),
+                ],
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}

lib/Screens/hrm/designation/designation_list.dart

@@ -0,0 +1,246 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_easyloading/flutter_easyloading.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:hugeicons/hugeicons.dart';
+import 'package:mobile_pos/Screens/hrm/designation/add_new_designation.dart';
+import 'package:mobile_pos/Screens/hrm/designation/provider/designation_list_provider.dart';
+import 'package:mobile_pos/Screens/hrm/designation/repo/designation_repo.dart';
+import 'package:mobile_pos/Screens/hrm/widgets/deleteing_alart_dialog.dart';
+import 'package:mobile_pos/Screens/hrm/widgets/global_search_appbar.dart';
+import 'package:mobile_pos/Screens/hrm/widgets/model_bottom_sheet.dart';
+import 'package:mobile_pos/constant.dart';
+
+import '../../../generated/l10n.dart' as lang;
+import '../../../service/check_user_role_permission_provider.dart';
+import '../../../widgets/empty_widget/_empty_widget.dart';
+
+class DesignationListScreen extends ConsumerStatefulWidget {
+  const DesignationListScreen({super.key});
+
+  @override
+  ConsumerState<DesignationListScreen> createState() => _DesignationListScreenState();
+}
+
+class _DesignationListScreenState extends ConsumerState<DesignationListScreen> {
+  bool _isSearch = false;
+  final _searchController = TextEditingController();
+  String _searchQuery = '';
+
+  Future<void> _refreshList() async {
+    await ref.refresh(designationListProvider.future);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final _lang = lang.S.of(context);
+    final theme = Theme.of(context);
+    final designationAsync = ref.watch(designationListProvider);
+    final permissionService = PermissionService(ref);
+
+    return Scaffold(
+      backgroundColor: kWhite,
+      appBar: GlobalSearchAppBar(
+        isSearch: _isSearch,
+        onSearchToggle: () => setState(() {
+          _isSearch = !_isSearch;
+          _searchController.clear();
+          _searchQuery = '';
+        }),
+        title: _lang.designation,
+        controller: _searchController,
+        onChanged: (query) {
+          setState(() => _searchQuery = query.trim().toLowerCase());
+        },
+      ),
+      body: designationAsync.when(
+        data: (data) {
+          if (!permissionService.hasPermission(Permit.designationsRead.value)) {
+            return const Center(child: PermitDenyWidget());
+          }
+          final designationList = data.data ?? [];
+
+          // Search filter
+          final filteredList = designationList.where((item) {
+            final name = item.name?.toLowerCase() ?? '';
+            final desc = item.description?.toLowerCase() ?? '';
+            return name.contains(_searchQuery) || desc.contains(_searchQuery);
+          }).toList();
+
+          if (filteredList.isEmpty) {
+            return Center(child: Text(_lang.noDesignationFound));
+          }
+
+          return RefreshIndicator(
+            onRefresh: _refreshList,
+            child: ListView.separated(
+              physics: const AlwaysScrollableScrollPhysics(),
+              padding: EdgeInsets.zero,
+              itemBuilder: (_, index) {
+                final desig = filteredList[index];
+                return ListTile(
+                  onTap: () {
+                    viewModalSheet(
+                      context: context,
+                      item: {
+                        _lang.designation: desig.name ?? 'n/a',
+                        _lang.status: (desig.status == 1) ? _lang.active : _lang.inactive,
+                      },
+                      description: desig.description ?? _lang.noDescriptionAvailableForThisDesignation,
+                    );
+                  },
+                  contentPadding: const EdgeInsetsDirectional.symmetric(
+                    horizontal: 16,
+                    vertical: 0,
+                  ),
+                  visualDensity: const VisualDensity(horizontal: -4, vertical: -4),
+                  title: Row(
+                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                    children: [
+                      Flexible(
+                        child: Text(
+                          desig.name ?? 'n/a',
+                          style: theme.textTheme.titleMedium?.copyWith(
+                            fontWeight: FontWeight.w500,
+                          ),
+                        ),
+                      ),
+                      Row(
+                        children: [
+                          Container(
+                            decoration: BoxDecoration(
+                                borderRadius: BorderRadius.circular(8),
+                                color: desig.status.toString() != '1'
+                                    ? kMainColor.withOpacity(0.1)
+                                    : Colors.green.withOpacity(0.1)),
+                            child: Padding(
+                              padding: const EdgeInsets.only(right: 8.0, left: 8),
+                              child: Text(
+                                desig.status.toString() == '1' ? _lang.active : _lang.inactive ?? '',
+                                style: theme.textTheme.titleMedium?.copyWith(),
+                              ),
+                            ),
+                          ),
+                          IconButton(
+                            padding: EdgeInsets.zero,
+                            visualDensity: const VisualDensity(horizontal: -4, vertical: -4),
+                            onPressed: () {
+                              if (!permissionService.hasPermission(Permit.designationsUpdate.value)) {
+                                ScaffoldMessenger.of(context).showSnackBar(
+                                  SnackBar(
+                                    backgroundColor: Colors.red,
+                                    content: Text(_lang.youDoNotPermissionToUpdateDesignation),
+                                  ),
+                                );
+                                return;
+                              }
+                              Navigator.push(
+                                context,
+                                MaterialPageRoute(
+                                  builder: (context) => AddEditDesignation(
+                                    isEdit: true,
+                                    designation: desig,
+                                  ),
+                                ),
+                              );
+                            },
+                            icon: const HugeIcon(
+                              icon: HugeIcons.strokeRoundedPencilEdit02,
+                              color: kSuccessColor,
+                              size: 20,
+                            ),
+                          ),
+                        ],
+                      ),
+                    ],
+                  ),
+                  subtitle: Row(
+                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                    children: [
+                      Flexible(
+                        child: Text(
+                          desig.description ?? 'n/a',
+                          style: theme.textTheme.bodyMedium?.copyWith(
+                            color: kNeutral800,
+                          ),
+                          maxLines: 1,
+                          overflow: TextOverflow.ellipsis,
+                        ),
+                      ),
+                      IconButton(
+                        padding: EdgeInsets.zero,
+                        visualDensity: const VisualDensity(horizontal: -4, vertical: -4),
+                        onPressed: () async {
+                          if (!permissionService.hasPermission(Permit.designationsDelete.value)) {
+                            ScaffoldMessenger.of(context).showSnackBar(
+                              SnackBar(
+                                backgroundColor: Colors.red,
+                                content: Text(_lang.youDoNotHavePermissionToDeleteDesignation),
+                              ),
+                            );
+                            return;
+                          }
+                          final confirm = await showDeleteConfirmationDialog(
+                            itemName: _lang.designation,
+                            context: context,
+                          );
+
+                          if (confirm) {
+                            EasyLoading.show(status: _lang.deleting);
+                            final repo = DesignationRepo();
+                            try {
+                              final result =
+                                  await repo.deleteDesignation(id: desig.id.toString(), ref: ref, context: context);
+                              if (result) {
+                                ref.refresh(designationListProvider);
+                                EasyLoading.showSuccess(_lang.deletedSuccessFully);
+                              } else {
+                                EasyLoading.showError(_lang.failedToDeleteTheTax);
+                              }
+                            } catch (e) {
+                              EasyLoading.showError('${_lang.errorDeletingTax}: $e');
+                            } finally {
+                              EasyLoading.dismiss();
+                            }
+                          }
+                        },
+                        icon: const HugeIcon(
+                          icon: HugeIcons.strokeRoundedDelete03,
+                          color: Colors.red,
+                          size: 20,
+                        ),
+                      ),
+                    ],
+                  ),
+                );
+              },
+              separatorBuilder: (_, __) => const Divider(
+                color: kBackgroundColor,
+                height: 2,
+              ),
+              itemCount: filteredList.length,
+            ),
+          );
+        },
+        loading: () => const Center(child: CircularProgressIndicator()),
+        error: (err, _) => Center(child: Text('Failed to load designations.\n$err')),
+      ),
+      bottomNavigationBar: permissionService.hasPermission(Permit.designationsCreate.value)
+          ? Padding(
+              padding: const EdgeInsets.all(16),
+              child: ElevatedButton.icon(
+                onPressed: () {
+                  Navigator.push(
+                    context,
+                    MaterialPageRoute(
+                      builder: (context) => const AddEditDesignation(),
+                    ),
+                  );
+                },
+                label: Text(_lang.addDesignation),
+                icon: const Icon(Icons.add, color: Colors.white),
+              ),
+            )
+          : null,
+    );
+  }
+}

lib/Screens/hrm/designation/provider/designation_list_provider.dart

@@ -0,0 +1,8 @@
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:mobile_pos/Screens/hrm/department/model/department_list_model.dart';
+import 'package:mobile_pos/Screens/hrm/department/repo/department_repo.dart';
+import 'package:mobile_pos/Screens/hrm/designation/Model/designation_list_model.dart';
+import 'package:mobile_pos/Screens/hrm/designation/repo/designation_repo.dart';
+
+final repo = DesignationRepo();
+final designationListProvider = FutureProvider<DesignationListModel>((ref) => repo.fetchAllDesignation());

lib/Screens/hrm/designation/repo/designation_repo.dart

@@ -0,0 +1,131 @@
+// ignore_for_file: use_build_context_synchronously
+import 'dart:convert';
+import 'package:flutter/material.dart';
+import 'package:flutter_easyloading/flutter_easyloading.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:http/http.dart' as http;
+import 'package:mobile_pos/Screens/hrm/designation/Model/designation_list_model.dart';
+import 'package:mobile_pos/Screens/hrm/designation/provider/designation_list_provider.dart';
+import '../../../../Const/api_config.dart';
+import '../../../../http_client/custome_http_client.dart';
+import '../../../../http_client/customer_http_client_get.dart';
+
+class DesignationRepo {
+  Future<DesignationListModel> fetchAllDesignation() async {
+    CustomHttpClientGet clientGet = CustomHttpClientGet(client: http.Client());
+    final uri = Uri.parse('${APIConfig.url}/designations');
+
+    final response = await clientGet.get(url: uri);
+
+    if (response.statusCode == 200) {
+      final parsedData = jsonDecode(response.body);
+
+      return DesignationListModel.fromJson(parsedData);
+    } else {
+      throw Exception('Failed to fetch Designation list');
+    }
+  }
+
+  /// Create Designation
+  Future<void> createDesignation({
+    required WidgetRef ref,
+    required BuildContext context,
+    required String name,
+    required String status,
+    required String description,
+  }) async {
+    final uri = Uri.parse('${APIConfig.url}/designations');
+    final body = jsonEncode({
+      'name': name,
+      'status': status == 'Active' ? '1' : "0",
+      'description': description,
+    });
+
+    try {
+      CustomHttpClient client = CustomHttpClient(client: http.Client(), context: context, ref: ref);
+
+      final response = await client.post(
+        url: uri,
+        addContentTypeInHeader: true,
+        body: body,
+      );
+
+      final data = jsonDecode(response.body);
+      EasyLoading.dismiss();
+
+      if (response.statusCode == 200) {
+        ref.refresh(designationListProvider);
+        Navigator.pop(context);
+        EasyLoading.showSuccess('Designation Created Successfully');
+      } else {
+        ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text('Failed: ${data['message']}')));
+      }
+    } catch (e) {
+      EasyLoading.dismiss();
+      ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text('Error: $e')));
+    }
+  }
+
+  /// Update Designation
+  Future<void> updateDesignation({
+    required WidgetRef ref,
+    required BuildContext context,
+    required String id,
+    required String name,
+    required String status,
+    required String description,
+  }) async {
+    final uri = Uri.parse('${APIConfig.url}/designations/$id');
+    final body = jsonEncode({
+      '_method': 'put',
+      'name': name,
+      'status': status == 'Active' ? '1' : "0",
+      'description': description,
+    });
+
+    try {
+      CustomHttpClient client = CustomHttpClient(client: http.Client(), context: context, ref: ref);
+
+      final response = await client.post(
+        url: uri,
+        addContentTypeInHeader: true,
+        body: body,
+      );
+
+      final data = jsonDecode(response.body);
+      EasyLoading.dismiss();
+
+      if (response.statusCode == 200) {
+        ref.refresh(designationListProvider);
+        Navigator.pop(context);
+        EasyLoading.showSuccess('Designation Updated Successfully');
+      } else {
+        ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text('Failed: ${data['message']}')));
+      }
+    } catch (e) {
+      EasyLoading.dismiss();
+      ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text('Error: $e')));
+    }
+  }
+
+  ///________Delete_Designations______________________________________________________
+  Future<bool> deleteDesignation({required String id, required BuildContext context, required WidgetRef ref}) async {
+    try {
+      final url = Uri.parse('${APIConfig.url}/designations/$id');
+      CustomHttpClient customHttpClient = CustomHttpClient(ref: ref, context: context, client: http.Client());
+      final response = await customHttpClient.delete(url: url);
+
+      if (response.statusCode == 200) {
+        return true;
+      } else {
+        print('Error deleting Designations: ${response.statusCode} - ${response.body}');
+        return false;
+      }
+    } catch (error) {
+      print('Error during delete operation: $error');
+      return false;
+    } finally {
+      EasyLoading.dismiss();
+    }
+  }
+}

lib/Screens/hrm/employee/add_new_employee.dart

@@ -0,0 +1,613 @@
+import 'dart:io';
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:iconly/iconly.dart';
+import 'package:image_picker/image_picker.dart';
+import 'package:intl/intl.dart';
+import 'package:mobile_pos/Const/api_config.dart';
+import 'package:mobile_pos/Screens/hrm/employee/repo/employee_repo.dart';
+import 'package:mobile_pos/generated/l10n.dart' as lang;
+// Assuming these imports are correct based on your previous code
+import '../../../constant.dart';
+import '../department/provider/department_list_provider.dart';
+import '../designation/provider/designation_list_provider.dart';
+import '../shift/provider/shift_list_provider.dart';
+import 'model/employee_list_model.dart';
+
+class AddNewEmployee extends ConsumerStatefulWidget {
+  const AddNewEmployee({super.key, this.isEdit = false, this.employeeToEdit});
+
+  final bool isEdit;
+  final EmployeeData? employeeToEdit; // Assume you pass the data here
+
+  @override
+  ConsumerState<AddNewEmployee> createState() => _AddNewEmployeeState();
+}
+
+class _AddNewEmployeeState extends ConsumerState<AddNewEmployee> {
+  // Assuming 'status' is num (1 for active) or string ('Active')
+  bool _isActive(dynamic item) {
+    if (item == null) return false;
+    if (item.status is num) {
+      return item.status == 1;
+    }
+    if (item.status is String) {
+      return item.status.toLowerCase() == 'active';
+    }
+    // Default to true if status is missing or unknown (for safety)
+    return true;
+  }
+
+  final nameController = TextEditingController();
+  final emailController = TextEditingController();
+  final phoneController = TextEditingController();
+  final countryController = TextEditingController();
+  final salaryController = TextEditingController();
+  final birthDateController = TextEditingController();
+  final joinDateController = TextEditingController();
+  final GlobalKey<FormState> _key = GlobalKey();
+
+  // Storing IDs for API submission
+  int? selectedDesignationId;
+  int? selectedDepartmentId;
+  int? selectShiftId;
+
+  // Storing names for Dropdown display (if initial value is set)
+  String? selectedDesignationName;
+  String? selectedDepartmentName;
+  String? selectedShiftName;
+
+  String? selectedGender;
+  String? selectedStatus;
+
+  final ImagePicker _picker = ImagePicker();
+  XFile? pickedImage;
+
+  // Repositories for API calls
+  final _employeeCrudRepo = EmployeeRepo();
+
+  @override
+  void initState() {
+    super.initState();
+    if (widget.isEdit && widget.employeeToEdit != null) {
+      _loadInitialData(widget.employeeToEdit!);
+    }
+  }
+
+  void _loadInitialData(EmployeeData employee) {
+    nameController.text = employee.name ?? '';
+    emailController.text = employee.email ?? '';
+    phoneController.text = employee.phone ?? '';
+    countryController.text = employee.country ?? '';
+    salaryController.text = employee.amount?.toString() ?? '';
+    birthDateController.text = _formatDateForDisplay(employee.birthDate);
+    joinDateController.text = _formatDateForDisplay(employee.joinDate);
+
+    // Set initial values for dropdowns (using IDs for submission)
+    selectedDesignationId = employee.designationId?.toInt();
+    selectedDesignationName = employee.designation?.name;
+
+    selectedDepartmentId = employee.departmentId?.toInt();
+    selectedDepartmentName = employee.department?.name;
+
+    selectShiftId = employee.shiftId?.toInt();
+    selectedShiftName = employee.shift?.name;
+
+    selectedGender = employee.gender;
+    selectedStatus = employee.status;
+
+    // Note: Image needs a separate logic if you want to load the existing one from URL
+  }
+
+  String _formatDateForDisplay(String? date) {
+    if (date == null || date.isEmpty) return '';
+    try {
+      final dateTime = DateTime.parse(date);
+      return DateFormat('dd/MM/yyyy').format(dateTime);
+    } catch (_) {
+      return date; // return as is if parsing fails
+    }
+  }
+
+  @override
+  void dispose() {
+    nameController.dispose();
+    emailController.dispose();
+    phoneController.dispose();
+    countryController.dispose();
+    salaryController.dispose();
+    birthDateController.dispose();
+    joinDateController.dispose();
+    super.dispose();
+  }
+
+  // --- API Submission Logic ---
+  Future<void> _submitForm() async {
+    if (!_key.currentState!.validate()) return;
+
+    final isEdit = widget.isEdit;
+    final employeeId = widget.employeeToEdit?.id?.toString();
+
+    // Prepare formData for API (using form-data structure from Postman)
+    final Map<String, String> formData = {
+      if (isEdit) '_method': 'put',
+      'name': nameController.text,
+      'designation_id': selectedDesignationId?.toString() ?? "",
+      'department_id': selectedDepartmentId?.toString() ?? "",
+      'shift_id': selectShiftId?.toString() ?? "",
+      'amount': salaryController.text,
+      'phone': phoneController.text,
+      'email': emailController.text,
+      'gender': selectedGender?.toLowerCase() ?? "",
+      'country': countryController.text,
+      // Date formatting to YYYY-MM-DD for API
+      'birth_date': _formatDateForAPI(birthDateController.text) ?? "",
+      'join_date': _formatDateForAPI(joinDateController.text) ?? "",
+      'status': selectedStatus?.toLowerCase() ?? "", // active | terminate | suspended
+    };
+
+    await _employeeCrudRepo.saveEmployee(
+      ref: ref,
+      context: context,
+      formData: formData,
+      isEdit: isEdit,
+      image: pickedImage != null ? File(pickedImage!.path) : null,
+      employeeId: employeeId,
+    );
+  }
+
+  String? _formatDateForAPI(String dateDisplay) {
+    // Converts display format (dd/MM/yyyy) to API format (YYYY-MM-DD)
+    if (dateDisplay.isEmpty) return null;
+    try {
+      final dateTime = DateFormat('dd/MM/yyyy').parse(dateDisplay);
+      return DateFormat('yyyy-MM-dd').format(dateTime);
+    } catch (_) {
+      return null;
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    // 1. Watch the three provider
+    final _lang = lang.S.of(context);
+    final designationAsync = ref.watch(designationListProvider);
+    final departmentAsync = ref.watch(departmentListProvider);
+    final shiftAsync = ref.watch(shiftListProvider);
+
+    return Scaffold(
+      backgroundColor: kWhite,
+      appBar: AppBar(
+        centerTitle: true,
+        title: Text(
+          widget.isEdit ? _lang.editEmployee : _lang.addNewEmployee,
+        ),
+        bottom: PreferredSize(
+          preferredSize: const Size.fromHeight(1),
+          child: Divider(
+            height: 2,
+            color: kBackgroundColor,
+          ),
+        ),
+      ),
+      body: SingleChildScrollView(
+        padding: const EdgeInsets.all(16),
+        child: Form(
+          key: _key,
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              // --- Name ---
+              TextFormField(
+                controller: nameController,
+                keyboardType: TextInputType.name,
+                decoration: InputDecoration(
+                  labelText: _lang.name,
+                  hintText: _lang.enterYourFullName,
+                ),
+                validator: (value) => value!.isEmpty ? _lang.enterFullName : null,
+              ),
+              const SizedBox(height: 20),
+
+              // --- Designation Dropdown (Dynamic) ---
+              designationAsync.when(
+                loading: () => const LinearProgressIndicator(),
+                error: (err, stack) => Text('Designation Error: $err'),
+                data: (model) {
+                  final items = (model.data ?? []).where(_isActive).toList();
+                  return DropdownButtonFormField<int>(
+                    decoration: InputDecoration(
+                      labelText: _lang.designation,
+                      hintText: _lang.selectOne,
+                    ),
+                    // Use ID for value, Name for display
+                    value: selectedDesignationId,
+                    validator: (value) => value == null ? _lang.pleaseSelectDesignation : null,
+                    items: items.map((data) {
+                      return DropdownMenuItem<int>(
+                        value: data.id?.toInt(),
+                        child: Text(data.name ?? 'N/A'),
+                      );
+                    }).toList(),
+                    onChanged: (int? value) {
+                      setState(() {
+                        selectedDesignationId = value;
+                      });
+                    },
+                  );
+                },
+              ),
+              const SizedBox(height: 20),
+
+              // --- Department Dropdown (Dynamic) ---
+              departmentAsync.when(
+                loading: () => const LinearProgressIndicator(),
+                error: (err, stack) => Text('Department Error: $err'),
+                data: (model) {
+                  final items = (model.data ?? []).where(_isActive).toList();
+                  return DropdownButtonFormField<int>(
+                    decoration: InputDecoration(
+                      labelText: _lang.department,
+                      hintText: _lang.selectOne,
+                    ),
+                    value: selectedDepartmentId,
+                    validator: (value) => value == null ? _lang.pleaseSelectDepartment : null,
+                    items: items.map((data) {
+                      return DropdownMenuItem<int>(
+                        value: data.id?.toInt(),
+                        child: Text(data.name ?? 'N/A'),
+                      );
+                    }).toList(),
+                    onChanged: (int? value) {
+                      setState(() {
+                        selectedDepartmentId = value;
+                      });
+                    },
+                  );
+                },
+              ),
+              const SizedBox(height: 20),
+
+              // --- Email ---
+              TextFormField(
+                controller: emailController,
+                keyboardType: TextInputType.emailAddress,
+                decoration: InputDecoration(
+                  labelText: _lang.email,
+                  hintText: _lang.enterYourEmailAddress,
+                ),
+              ),
+              const SizedBox(height: 20),
+
+              // --- Phone ---
+              TextFormField(
+                controller: phoneController,
+                keyboardType: TextInputType.phone,
+                decoration: InputDecoration(
+                  labelText: _lang.phone,
+                  hintText: _lang.enterYourPhoneNumber,
+                ),
+                validator: (value) => value!.isEmpty ? _lang.pleaseEnterYourPhoneNumber : null,
+              ),
+              const SizedBox(height: 20),
+
+              // --- Country ---
+              TextFormField(
+                controller: countryController,
+                keyboardType: TextInputType.name,
+                decoration: InputDecoration(
+                  labelText: _lang.countryName,
+                  hintText: _lang.enterYourCountry,
+                ),
+              ),
+              const SizedBox(height: 20),
+
+              // --- Salary ---
+              TextFormField(
+                controller: salaryController,
+                keyboardType: TextInputType.number,
+                decoration: InputDecoration(
+                  labelText: _lang.salary,
+                  hintText: 'Ex: \$500',
+                ),
+                validator: (value) => value!.isEmpty ? _lang.pleaseEnterYourSalary : null,
+              ),
+              const SizedBox(height: 20),
+
+              // --- Gender & Shift (Dynamic) ---
+              Row(
+                children: [
+                  // --- Gender ---
+                  Expanded(
+                    child: DropdownButtonFormField<String>(
+                        decoration: InputDecoration(
+                          labelText: _lang.gender,
+                          hintText: _lang.selectOne,
+                        ),
+                        value: selectedGender,
+                        validator: (value) => value == null ? _lang.pleaseSelectYourGender : null,
+                        items: ['Male', 'Female', 'Others'].map((entry) {
+                          return DropdownMenuItem<String>(value: entry.toLowerCase(), child: Text(entry));
+                        }).toList(),
+                        onChanged: (String? value) {
+                          setState(() {
+                            selectedGender = value;
+                          });
+                        }),
+                  ),
+                  const SizedBox(width: 16),
+
+                  // --- Shift Dropdown (Dynamic) ---
+                  Expanded(
+                    child: shiftAsync.when(
+                      loading: () => const LinearProgressIndicator(),
+                      error: (err, stack) => Text('Shift Error: $err'),
+                      data: (model) {
+                        final items = (model.data ?? []).where(_isActive).toList();
+                        return DropdownButtonFormField<int>(
+                          decoration: InputDecoration(
+                            labelText: _lang.shift,
+                            hintText: _lang.selectOne,
+                          ),
+                          value: selectShiftId,
+                          validator: (value) => value == null ? _lang.pleaseSelectYourShift : null,
+                          items: items.map((data) {
+                            return DropdownMenuItem<int>(
+                              value: data.id?.toInt(),
+                              child: Text(data.name ?? 'N/A'),
+                            );
+                          }).toList(),
+                          onChanged: (int? value) {
+                            setState(() {
+                              selectShiftId = value;
+                            });
+                          },
+                        );
+                      },
+                    ),
+                  ),
+                ],
+              ),
+              const SizedBox(height: 20),
+
+              // --- Birth Date & Join Date ---
+              Row(
+                children: [
+                  Expanded(
+                    child: TextFormField(
+                      keyboardType: TextInputType.name,
+                      readOnly: true,
+                      controller: birthDateController,
+                      decoration: InputDecoration(
+                        labelText: _lang.birthDate,
+                        hintText: '06/02/2025',
+                        border: const OutlineInputBorder(),
+                        suffixIcon: IconButton(
+                          padding: EdgeInsets.zero,
+                          visualDensity: const VisualDensity(horizontal: -4, vertical: -4),
+                          onPressed: () async {
+                            final DateTime? picked = await showDatePicker(
+                              initialDate: DateTime.now(),
+                              firstDate: DateTime(1900),
+                              lastDate: DateTime.now(),
+                              context: context,
+                            );
+                            if (picked != null) {
+                              birthDateController.text = DateFormat('dd/MM/yyyy').format(picked);
+                            }
+                          },
+                          icon: const Icon(IconlyLight.calendar, size: 22),
+                        ),
+                      ),
+                    ),
+                  ),
+                  const SizedBox(width: 16),
+                  Expanded(
+                    child: TextFormField(
+                      keyboardType: TextInputType.name,
+                      readOnly: true,
+                      controller: joinDateController,
+                      decoration: InputDecoration(
+                        labelText: _lang.joinDate,
+                        hintText: '06/02/2025',
+                        border: const OutlineInputBorder(),
+                        suffixIcon: IconButton(
+                          padding: EdgeInsets.zero,
+                          visualDensity: const VisualDensity(horizontal: -4, vertical: -4),
+                          onPressed: () async {
+                            final DateTime? picked = await showDatePicker(
+                              initialDate: DateTime.now(),
+                              firstDate: DateTime(2000),
+                              lastDate: DateTime(2101),
+                              context: context,
+                            );
+                            if (picked != null) {
+                              joinDateController.text = DateFormat('dd/MM/yyyy').format(picked);
+                            }
+                          },
+                          icon: const Icon(IconlyLight.calendar, size: 22),
+                        ),
+                      ),
+                    ),
+                  ),
+                ],
+              ),
+              const SizedBox(height: 20),
+
+              // --- Status ---
+              Row(
+                children: [
+                  Expanded(
+                    child: DropdownButtonFormField<String>(
+                        decoration: InputDecoration(
+                          labelText: _lang.status,
+                          hintText: _lang.selectOne,
+                        ),
+                        value: selectedStatus,
+                        validator: (value) => value == null ? _lang.pleaseSelectAStatus : null,
+                        items: ['Active', 'Terminated', 'Suspended'].map((entry) {
+                          return DropdownMenuItem<String>(value: entry.toLowerCase(), child: Text(entry));
+                        }).toList(),
+                        onChanged: (String? value) {
+                          setState(() {
+                            selectedStatus = value;
+                          });
+                        }),
+                  ),
+                  const SizedBox(width: 16),
+                  const Expanded(child: SizedBox())
+                ],
+              ),
+              const SizedBox(height: 20),
+
+              // --- Image Picker UI (Your existing code) ---
+              Text(
+                _lang.image,
+                style: Theme.of(context).textTheme.titleMedium?.copyWith(
+                      fontWeight: FontWeight.w500,
+                    ),
+              ),
+              Center(
+                child: Column(
+                  children: [
+                    const SizedBox(height: 10),
+                    GestureDetector(
+                      onTap: () => showDialog(
+                        context: context,
+                        builder: (_) => Dialog(
+                          shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
+                          child: SizedBox(
+                            height: 200,
+                            width: MediaQuery.of(context).size.width - 80,
+                            child: Row(
+                              mainAxisAlignment: MainAxisAlignment.center,
+                              children: [
+                                _imageOption(
+                                  icon: Icons.photo_library_rounded,
+                                  label: _lang.gallery,
+                                  color: kMainColor,
+                                  source: ImageSource.gallery,
+                                ),
+                                const SizedBox(width: 40),
+                                _imageOption(
+                                  icon: Icons.camera,
+                                  label: _lang.camera,
+                                  color: kGreyTextColor,
+                                  source: ImageSource.camera,
+                                ),
+                              ],
+                            ),
+                          ),
+                        ),
+                      ),
+                      child: Stack(
+                        children: [
+                          Container(
+                            height: 120,
+                            width: 120,
+                            decoration: BoxDecoration(
+                              border: Border.all(color: Colors.black54),
+                              borderRadius: BorderRadius.circular(120),
+                              image: DecorationImage(
+                                image: pickedImage != null
+                                    ? FileImage(File(pickedImage!.path))
+                                    : widget.employeeToEdit?.image != null
+                                        ? NetworkImage('${APIConfig.domain}${widget.employeeToEdit?.image}')
+                                        : const AssetImage('assets/hrm/image_icon.jpg') as ImageProvider,
+                                fit: BoxFit.cover,
+                              ),
+                            ),
+                          ),
+                          Positioned(
+                            bottom: 0,
+                            right: 0,
+                            child: Container(
+                              height: 35,
+                              width: 35,
+                              decoration: BoxDecoration(
+                                color: kMainColor,
+                                border: Border.all(color: Colors.white, width: 2),
+                                borderRadius: BorderRadius.circular(120),
+                              ),
+                              child: const Icon(Icons.camera_alt_outlined, size: 20, color: Colors.white),
+                            ),
+                          ),
+                        ],
+                      ),
+                    ),
+                    const SizedBox(height: 10),
+                  ],
+                ),
+              ),
+              const SizedBox(height: 20),
+
+              // --- Save/Update & Reset Buttons ---
+              Row(
+                children: [
+                  Expanded(
+                    child: OutlinedButton(
+                      onPressed: () {
+                        // Reset logic remains the same
+                        setState(() {
+                          _key.currentState?.reset();
+                          nameController.clear();
+                          emailController.clear();
+                          phoneController.clear();
+                          countryController.clear();
+                          salaryController.clear();
+                          birthDateController.clear();
+                          joinDateController.clear();
+                          selectedDesignationId = null;
+                          selectedDepartmentId = null;
+                          selectShiftId = null;
+                          selectedGender = null;
+                          selectedStatus = null;
+                          pickedImage = null; // Reset image
+                        });
+                      },
+                      child: Text(_lang.resets),
+                    ),
+                  ),
+                  const SizedBox(width: 16),
+                  Expanded(
+                    child: ElevatedButton(
+                      onPressed: _submitForm, // Call the submit function
+                      child: Text(widget.isEdit ? _lang.update : _lang.save),
+                    ),
+                  ),
+                ],
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+
+  /// Helper Widget
+  Widget _imageOption({
+    required IconData icon,
+    required String label,
+    required Color color,
+    required ImageSource source,
+  }) {
+    return GestureDetector(
+      onTap: () async {
+        final navigator = Navigator.of(context);
+        pickedImage = await _picker.pickImage(source: source);
+        setState(() {});
+        Future.delayed(
+          const Duration(milliseconds: 100),
+          () => navigator.pop(),
+        );
+      },
+      child: Column(
+        mainAxisAlignment: MainAxisAlignment.center,
+        children: [
+          Icon(icon, size: 60, color: color),
+          Text(label, style: Theme.of(context).textTheme.titleMedium?.copyWith(color: kGreyTextColor)),
+        ],
+      ),
+    );
+  }
+}

lib/Screens/hrm/employee/employee_list_screen.dart

@@ -0,0 +1,322 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_easyloading/flutter_easyloading.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:hugeicons/hugeicons.dart';
+import 'package:mobile_pos/Screens/hrm/employee/add_new_employee.dart';
+import 'package:mobile_pos/Screens/hrm/employee/provider/emplpyee_list_provider.dart';
+import 'package:mobile_pos/Screens/hrm/employee/repo/employee_repo.dart';
+import 'package:mobile_pos/Screens/hrm/widgets/deleteing_alart_dialog.dart';
+import 'package:mobile_pos/Screens/hrm/widgets/global_search_appbar.dart';
+import 'package:mobile_pos/Screens/hrm/widgets/model_bottom_sheet.dart';
+import 'package:mobile_pos/constant.dart';
+
+import '../../../Const/api_config.dart';
+import '../../../generated/l10n.dart' as lang;
+import '../../../service/check_user_role_permission_provider.dart';
+import '../../../widgets/empty_widget/_empty_widget.dart';
+
+class EmployeeListScreen extends ConsumerStatefulWidget {
+  const EmployeeListScreen({super.key});
+
+  @override
+  ConsumerState<EmployeeListScreen> createState() => _EmployeeListScreenState();
+}
+
+class _EmployeeListScreenState extends ConsumerState<EmployeeListScreen> {
+  bool _isSearch = false;
+  final _searchController = TextEditingController();
+  String _searchQuery = '';
+
+  @override
+  void initState() {
+    super.initState();
+    _searchController.addListener(() {
+      setState(() {
+        _searchQuery = _searchController.text.toLowerCase();
+      });
+    });
+  }
+
+  @override
+  void dispose() {
+    _searchController.dispose();
+    super.dispose();
+  }
+
+  // 2. Refresh logic using Riverpod's invalidate
+  Future<void> _refreshEmployeeList() async {
+    // Invalidate the provider, which forces it to refetch the data
+    ref.invalidate(employeeListProvider);
+    // Wait for the new future to complete
+    await ref.read(employeeListProvider.future);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final _theme = Theme.of(context);
+    final employeeListAsync = ref.watch(employeeListProvider);
+    final permissionService = PermissionService(ref);
+    final _lang = lang.S.of(context);
+    return Scaffold(
+      backgroundColor: kWhite,
+      appBar: GlobalSearchAppBar(
+        isSearch: _isSearch,
+        onSearchToggle: () {
+          setState(() {
+            _isSearch = !_isSearch;
+            if (!_isSearch) {
+              _searchController.clear();
+              _searchQuery = '';
+            }
+          });
+        },
+        title: 'Employee',
+        controller: _searchController,
+        onChanged: (query) {
+          // Listener handles the search logic
+        },
+      ),
+      body: employeeListAsync.when(
+        loading: () => const Center(child: CircularProgressIndicator()),
+        error: (err, stack) => Center(child: Text('Error: $err')),
+        data: (employeeModel) {
+          if (!permissionService.hasPermission(Permit.employeesRead.value)) {
+            return const Center(child: PermitDenyWidget());
+          }
+          final allEmployees = employeeModel.employees ?? [];
+
+          // Filtering logic
+          final filteredEmployees = allEmployees.where((employee) {
+            final nameLower = employee.name?.toLowerCase() ?? '';
+            final phoneLower = employee.phone?.toLowerCase() ?? '';
+            final emailLower = employee.email?.toLowerCase() ?? '';
+
+            return nameLower.contains(_searchQuery) || phoneLower.contains(_searchQuery) || emailLower.contains(_searchQuery);
+          }).toList();
+
+          if (filteredEmployees.isEmpty) {
+            return Center(child: Text(_searchQuery.isEmpty ? 'No employees found.' : 'No results found for "$_searchQuery".'));
+          }
+
+          // 3. Wrap the ListView with RefreshIndicator
+          return RefreshIndicator(
+            onRefresh: _refreshEmployeeList, // Calls the Riverpod refresh logic
+            child: ListView.separated(
+                padding: EdgeInsets.zero,
+                itemBuilder: (_, index) {
+                  final employee = filteredEmployees[index];
+
+                  // Dynamic Data Mapping
+                  final name = employee.name ?? 'N/A';
+                  final phone = employee.phone ?? 'N/A';
+                  final designation = employee.designation?.name ?? 'N/A';
+                  final department = employee.department?.name ?? 'N/A';
+                  final image = employee.image;
+                  final email = employee.email ?? 'N/A';
+                  final country = employee.country ?? 'N/A';
+                  final salary = '\$${employee.amount?.toStringAsFixed(2) ?? '0.00'}';
+                  final gender = employee.gender ?? 'N/A';
+                  final shift = employee.shift?.name ?? 'N/A';
+                  final birthDate = employee.birthDate ?? 'N/A';
+                  final joinDate = employee.joinDate ?? 'N/A';
+                  final status = employee.status ?? 'N/A';
+
+                  return ListTile(
+                    onTap: () {
+                      // Displaying dynamic data in Modal Sheet
+                      viewModalSheet(
+                        context: context,
+                        showImage: true,
+                        image: image,
+                        item: {
+                          "Full Name": name,
+                          "Designation ": designation,
+                          "Department ": department,
+                          "Email ": email,
+                          "Phone ": phone,
+                          "Country": country,
+                          "Salary": salary,
+                          "Gender": gender,
+                          "Shift": shift,
+                          "Birth Date": birthDate,
+                          "Join Date": joinDate,
+                          "Status": status,
+                        },
+                      );
+                    },
+                    contentPadding: const EdgeInsetsDirectional.symmetric(
+                      horizontal: 16,
+                      vertical: 0,
+                    ),
+                    horizontalTitleGap: 14,
+                    visualDensity: const VisualDensity(horizontal: -4, vertical: -4),
+                    leading: Container(
+                      alignment: Alignment.center,
+                      height: 40,
+                      width: 40,
+                      clipBehavior: Clip.antiAlias,
+                      decoration: BoxDecoration(shape: BoxShape.circle, color: kMainColor.withValues(alpha: 0.1)),
+                      child: image == null
+                          ? Text(
+                              name.substring(0, 1),
+                              style: _theme.textTheme.titleLarge?.copyWith(
+                                fontWeight: FontWeight.w500,
+                                color: kMainColor,
+                              ),
+                            )
+                          : Image.network(
+                              fit: BoxFit.fill,
+                              "${APIConfig.domain}$image",
+                            ),
+                    ),
+                    title: Row(
+                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                      children: [
+                        Flexible(
+                          child: Text(
+                            name,
+                            style: _theme.textTheme.titleMedium?.copyWith(
+                              fontWeight: FontWeight.w500,
+                            ),
+                          ),
+                        ),
+                        SizedBox(
+                          height: 28,
+                          width: 28,
+                          child: IconButton(
+                            style: const ButtonStyle(
+                              padding: WidgetStatePropertyAll(
+                                EdgeInsets.zero,
+                              ),
+                            ),
+                            padding: EdgeInsets.zero,
+                            visualDensity: const VisualDensity(
+                              horizontal: -4,
+                              vertical: -4,
+                            ),
+                            onPressed: () {
+                              if (!permissionService.hasPermission(Permit.employeesUpdate.value)) {
+                                ScaffoldMessenger.of(context).showSnackBar(
+                                  SnackBar(
+                                    backgroundColor: Colors.red,
+                                    content: Text("You do not have permission to update Employee."),
+                                  ),
+                                );
+                                return;
+                              }
+                              // Navigation to edit employee screen
+                              Navigator.push(
+                                context,
+                                MaterialPageRoute(
+                                  builder: (context) => AddNewEmployee(
+                                    isEdit: true,
+                                    employeeToEdit: employee,
+                                  ),
+                                ),
+                              );
+                            },
+                            icon: const HugeIcon(
+                              icon: HugeIcons.strokeRoundedPencilEdit02,
+                              color: kSuccessColor,
+                              size: 20,
+                            ),
+                          ),
+                        ),
+                      ],
+                    ),
+                    subtitle: Row(
+                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                      children: [
+                        Flexible(
+                            child: Text(
+                          phone,
+                          style: _theme.textTheme.bodyMedium?.copyWith(
+                            color: kNeutral800,
+                          ),
+                          maxLines: 1,
+                          overflow: TextOverflow.ellipsis,
+                        )),
+                        SizedBox(
+                          height: 28,
+                          width: 28,
+                          child: IconButton(
+                            padding: EdgeInsets.zero,
+                            style: const ButtonStyle(
+                              padding: WidgetStatePropertyAll(
+                                EdgeInsets.zero,
+                              ),
+                            ),
+                            visualDensity: const VisualDensity(
+                              horizontal: -4,
+                              vertical: -4,
+                            ),
+                            onPressed: () async {
+                              if (!permissionService.hasPermission(Permit.employeesDelete.value)) {
+                                ScaffoldMessenger.of(context).showSnackBar(
+                                  SnackBar(
+                                    backgroundColor: Colors.red,
+                                    content: Text("You do not have permission to delete Employee."),
+                                  ),
+                                );
+                                return;
+                              }
+                              final confirm = await showDeleteConfirmationDialog(
+                                itemName: 'Employee',
+                                context: context,
+                              );
+
+                              if (confirm) {
+                                EasyLoading.show(status: _lang.deleting);
+                                final repo = EmployeeRepo();
+                                try {
+                                  final result = await repo.deleteEmployee(id: employee.id.toString(), ref: ref, context: context);
+                                  if (result) {
+                                    ref.refresh(employeeListProvider);
+                                    EasyLoading.showSuccess(_lang.deletedSuccessFully);
+                                  } else {
+                                    EasyLoading.showError("Failed to delete the Employee");
+                                  }
+                                } catch (e) {
+                                  EasyLoading.showError('Error deleting: $e');
+                                } finally {
+                                  EasyLoading.dismiss();
+                                }
+                              }
+                            },
+                            icon: const HugeIcon(
+                              icon: HugeIcons.strokeRoundedDelete03,
+                              color: Colors.red,
+                              size: 20,
+                            ),
+                          ),
+                        )
+                      ],
+                    ),
+                  );
+                },
+                separatorBuilder: (_, __) => Divider(
+                      color: kBackgroundColor,
+                      height: 2,
+                    ),
+                itemCount: filteredEmployees.length),
+          );
+        },
+      ),
+      bottomNavigationBar: permissionService.hasPermission(Permit.employeesCreate.value)
+          ? Padding(
+              padding: const EdgeInsets.all(16),
+              child: ElevatedButton.icon(
+                onPressed: () {
+                  Navigator.push(context, MaterialPageRoute(builder: (context) => const AddNewEmployee()));
+                },
+                label: const Text('Add Employee'),
+                icon: const Icon(
+                  Icons.add,
+                  color: Colors.white,
+                ),
+              ),
+            )
+          : null,
+    );
+  }
+}

lib/Screens/hrm/employee/model/employee_list_model.dart

@@ -0,0 +1,220 @@
+class EmployeeListModel {
+  EmployeeListModel({
+    this.message,
+    this.employees,
+  });
+
+  EmployeeListModel.fromJson(dynamic json) {
+    message = json['message'];
+    if (json['data'] != null) {
+      employees = [];
+      json['data'].forEach((v) {
+        employees?.add(EmployeeData.fromJson(v));
+      });
+    }
+  }
+  String? message;
+  List<EmployeeData>? employees;
+
+  Map<String, dynamic> toJson() {
+    final map = <String, dynamic>{};
+    map['message'] = message;
+    if (employees != null) {
+      map['data'] = employees?.map((v) => v.toJson()).toList();
+    }
+    return map;
+  }
+}
+
+class EmployeeData {
+  EmployeeData({
+    this.id,
+    this.name,
+    this.businessId,
+    this.branchId,
+    this.designationId,
+    this.departmentId,
+    this.shiftId,
+    this.amount,
+    this.image,
+    this.phone,
+    this.email,
+    this.gender,
+    this.country,
+    this.birthDate,
+    this.joinDate,
+    this.status,
+    this.createdAt,
+    this.updatedAt,
+    this.department,
+    this.designation,
+    this.shift,
+    this.branch,
+  });
+
+  EmployeeData.fromJson(dynamic json) {
+    id = json['id'];
+    name = json['name'];
+    businessId = json['business_id'];
+    branchId = json['branch_id'];
+    designationId = json['designation_id'];
+    departmentId = json['department_id'];
+    shiftId = json['shift_id'];
+    amount = json['amount'];
+    image = json['image'];
+    phone = json['phone'];
+    email = json['email'];
+    gender = json['gender'];
+    country = json['country'];
+    birthDate = json['birth_date'];
+    joinDate = json['join_date'];
+    status = json['status'];
+    createdAt = json['created_at'];
+    updatedAt = json['updated_at'];
+    department = json['department'] != null ? Department.fromJson(json['department']) : null;
+    designation = json['designation'] != null ? Designation.fromJson(json['designation']) : null;
+    shift = json['shift'] != null ? Shift.fromJson(json['shift']) : null;
+    branch = json['branch'] != null ? Branch.fromJson(json['branch']) : null;
+  }
+  num? id;
+  String? name;
+  num? businessId;
+  num? branchId;
+  num? designationId;
+  num? departmentId;
+  num? shiftId;
+  num? amount;
+  dynamic image;
+  String? phone;
+  String? email;
+  String? gender;
+  String? country;
+  String? birthDate;
+  String? joinDate;
+  String? status;
+  String? createdAt;
+  String? updatedAt;
+  Department? department;
+  Designation? designation;
+  Shift? shift;
+  Branch? branch;
+
+  Map<String, dynamic> toJson() {
+    final map = <String, dynamic>{};
+    map['id'] = id;
+    map['name'] = name;
+    map['business_id'] = businessId;
+    map['branch_id'] = branchId;
+    map['designation_id'] = designationId;
+    map['department_id'] = departmentId;
+    map['shift_id'] = shiftId;
+    map['amount'] = amount;
+    map['image'] = image;
+    map['phone'] = phone;
+    map['email'] = email;
+    map['gender'] = gender;
+    map['country'] = country;
+    map['birth_date'] = birthDate;
+    map['join_date'] = joinDate;
+    map['status'] = status;
+    map['created_at'] = createdAt;
+    map['updated_at'] = updatedAt;
+    if (department != null) {
+      map['department'] = department?.toJson();
+    }
+    if (designation != null) {
+      map['designation'] = designation?.toJson();
+    }
+    if (shift != null) {
+      map['shift'] = shift?.toJson();
+    }
+    if (branch != null) {
+      map['branch'] = branch?.toJson();
+    }
+    return map;
+  }
+}
+
+class Branch {
+  Branch({
+    this.id,
+    this.name,
+  });
+
+  Branch.fromJson(dynamic json) {
+    id = json['id'];
+    name = json['name'];
+  }
+  num? id;
+  String? name;
+
+  Map<String, dynamic> toJson() {
+    final map = <String, dynamic>{};
+    map['id'] = id;
+    map['name'] = name;
+    return map;
+  }
+}
+
+class Shift {
+  Shift({
+    this.id,
+    this.name,
+  });
+
+  Shift.fromJson(dynamic json) {
+    id = json['id'];
+    name = json['name'];
+  }
+  num? id;
+  String? name;
+
+  Map<String, dynamic> toJson() {
+    final map = <String, dynamic>{};
+    map['id'] = id;
+    map['name'] = name;
+    return map;
+  }
+}
+
+class Designation {
+  Designation({
+    this.id,
+    this.name,
+  });
+
+  Designation.fromJson(dynamic json) {
+    id = json['id'];
+    name = json['name'];
+  }
+  num? id;
+  String? name;
+
+  Map<String, dynamic> toJson() {
+    final map = <String, dynamic>{};
+    map['id'] = id;
+    map['name'] = name;
+    return map;
+  }
+}
+
+class Department {
+  Department({
+    this.id,
+    this.name,
+  });
+
+  Department.fromJson(dynamic json) {
+    id = json['id'];
+    name = json['name'];
+  }
+  num? id;
+  String? name;
+
+  Map<String, dynamic> toJson() {
+    final map = <String, dynamic>{};
+    map['id'] = id;
+    map['name'] = name;
+    return map;
+  }
+}

lib/Screens/hrm/employee/provider/emplpyee_list_provider.dart

@@ -0,0 +1,6 @@
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:mobile_pos/Screens/hrm/employee/model/employee_list_model.dart';
+import 'package:mobile_pos/Screens/hrm/employee/repo/employee_repo.dart';
+
+final repo = EmployeeRepo();
+final employeeListProvider = FutureProvider<EmployeeListModel>((ref) => repo.fetchAllEmployee());

lib/Screens/hrm/employee/repo/employee_repo.dart

@@ -0,0 +1,98 @@
+import 'dart:convert';
+import 'dart:io';
+import 'package:flutter_easyloading/flutter_easyloading.dart';
+import 'package:http/http.dart' as http;
+import 'package:mobile_pos/Screens/hrm/employee/model/employee_list_model.dart';
+import '../../../../Const/api_config.dart';
+import '../../../../http_client/custome_http_client.dart';
+import '../../../../http_client/customer_http_client_get.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+
+import '../provider/emplpyee_list_provider.dart';
+
+class EmployeeRepo {
+  Future<EmployeeListModel> fetchAllEmployee() async {
+    CustomHttpClientGet clientGet = CustomHttpClientGet(client: http.Client());
+    final uri = Uri.parse('${APIConfig.url}/employees');
+
+    final response = await clientGet.get(url: uri);
+
+    if (response.statusCode == 200) {
+      final parsedData = jsonDecode(response.body);
+
+      return EmployeeListModel.fromJson(parsedData);
+    } else {
+      throw Exception('Failed to fetch Employee list');
+    }
+  }
+
+  Future<void> saveEmployee({
+    required WidgetRef ref,
+    required BuildContext context,
+    required Map<String, String> formData,
+    required bool isEdit,
+    required File? image,
+    String? employeeId,
+  }) async {
+    final url = isEdit ? Uri.parse('${APIConfig.url}/employees/$employeeId') : Uri.parse('${APIConfig.url}/employees');
+
+    try {
+      EasyLoading.show(status: isEdit ? 'Updating...' : 'Saving...');
+
+      final client = http.Client();
+
+      // We assume CustomHttpClient handles form-data and authorization.
+      CustomHttpClient customClient = CustomHttpClient(client: client, context: context, ref: ref);
+
+      // We need to use post for both create and update (with _method: put)
+      final response = await customClient.uploadFile(
+        url: url,
+        fields: formData, // Passing the map directly for form-data
+        file: image,
+        fileFieldName: 'image',
+      );
+
+      EasyLoading.dismiss();
+      final responseData = await response.stream.bytesToString();
+      final data = jsonDecode(responseData);
+
+      if (response.statusCode == 200 || response.statusCode == 201) {
+        // Refresh the main employee list provider after successful operation
+        ref.invalidate(employeeListProvider);
+        Navigator.pop(context);
+        EasyLoading.showSuccess(isEdit ? 'Employee Updated Successfully' : 'Employee Saved Successfully');
+      } else {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text('Failed: ${data['message'] ?? 'Unknown error'}')),
+        );
+      }
+    } catch (e) {
+      EasyLoading.dismiss();
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text('Error: $e')),
+      );
+    }
+  }
+
+  ///________Delete_Employee______________________________________________________
+  Future<bool> deleteEmployee({required String id, required BuildContext context, required WidgetRef ref}) async {
+    try {
+      final url = Uri.parse('${APIConfig.url}/employees/$id');
+      CustomHttpClient customHttpClient = CustomHttpClient(ref: ref, context: context, client: http.Client());
+      final response = await customHttpClient.delete(url: url);
+
+      if (response.statusCode == 200) {
+        return true;
+      } else {
+        print('Error deleting Employee: ${response.statusCode} - ${response.body}');
+        return false;
+      }
+    } catch (error) {
+      print('Error during delete operation: $error');
+      return false;
+    } finally {
+      EasyLoading.dismiss();
+    }
+  }
+}

lib/Screens/hrm/holiday/add_new_holiday.dart

@@ -0,0 +1,280 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart'; // Import Riverpod
+import 'package:iconly/iconly.dart';
+import 'package:intl/intl.dart';
+import 'package:mobile_pos/generated/l10n.dart' as lang;
+import '../../../constant.dart';
+
+// --- Riverpod Imports (Assuming these paths are correct) ---
+import 'package:mobile_pos/Screens/hrm/holiday/model/holiday_list_model.dart';
+import 'package:mobile_pos/Screens/hrm/holiday/repo/holiday_repo.dart';
+// -----------------------------------------------------------
+
+// Accept optional HolidayData for editing (renamed from isEdit)
+class AddNewHoliday extends ConsumerStatefulWidget {
+  final HolidayData? holidayData;
+  // Changed constructor to use key and remove isEdit
+  const AddNewHoliday({super.key, this.holidayData});
+
+  @override
+  ConsumerState<AddNewHoliday> createState() => _AddNewHolidayState();
+}
+
+class _AddNewHolidayState extends ConsumerState<AddNewHoliday> {
+  final nameController = TextEditingController();
+  final startDateController = TextEditingController();
+  final endDateController = TextEditingController();
+  final descriptionController = TextEditingController();
+  final GlobalKey<FormState> _key = GlobalKey();
+
+  // Variables to hold parsed dates for comparison/API formatting
+  DateTime? _selectedStartDate;
+  DateTime? _selectedEndDate;
+
+  bool get isEditing => widget.holidayData != null;
+  final DateFormat _displayFormat = DateFormat('dd/MM/yyyy');
+  final DateFormat _apiFormat = DateFormat('yyyy-MM-dd'); // API typically needs YYYY-MM-DD
+
+  @override
+  void initState() {
+    super.initState();
+    if (isEditing) {
+      final holiday = widget.holidayData!;
+      nameController.text = holiday.name ?? '';
+      descriptionController.text = holiday.description ?? '';
+
+      try {
+        if (holiday.startDate != null) {
+          _selectedStartDate = DateTime.parse(holiday.startDate!);
+          startDateController.text = _displayFormat.format(_selectedStartDate!);
+        }
+        if (holiday.endDate != null) {
+          _selectedEndDate = DateTime.parse(holiday.endDate!);
+          endDateController.text = _displayFormat.format(_selectedEndDate!);
+        }
+      } catch (e) {
+        // Handle date parsing failure if API format is inconsistent
+        debugPrint('Error parsing date for editing: $e');
+        startDateController.text = holiday.startDate ?? '';
+        endDateController.text = holiday.endDate ?? '';
+      }
+    }
+  }
+
+  @override
+  void dispose() {
+    nameController.dispose();
+    startDateController.dispose();
+    endDateController.dispose();
+    descriptionController.dispose();
+    super.dispose();
+  }
+
+  Future<void> _selectDate(BuildContext context, TextEditingController controller, bool isStart) async {
+    DateTime initialDate = DateTime.now();
+    if (isStart) {
+      initialDate = _selectedStartDate ?? initialDate;
+    } else {
+      initialDate = _selectedEndDate ?? _selectedStartDate ?? initialDate;
+    }
+
+    final DateTime? picked = await showDatePicker(
+      initialDate: initialDate,
+      firstDate: DateTime(2015, 8),
+      lastDate: DateTime(2101),
+      context: context,
+    );
+
+    if (picked != null) {
+      setState(() {
+        controller.text = _displayFormat.format(picked);
+        if (isStart) {
+          _selectedStartDate = picked;
+          // Auto-adjust end date if it is before the new start date
+          if (_selectedEndDate != null && _selectedEndDate!.isBefore(picked)) {
+            _selectedEndDate = picked;
+            endDateController.text = _displayFormat.format(picked);
+          }
+        } else {
+          _selectedEndDate = picked;
+        }
+      });
+    }
+  }
+
+  void _submit() async {
+    if (_key.currentState!.validate()) {
+      // Validate that dates are not null and end date is not before start date
+      if (_selectedStartDate == null || _selectedEndDate == null) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text(lang.S.of(context).pleaseSelectValidStartAndEndDates)),
+        );
+        return;
+      }
+
+      if (_selectedEndDate!.isBefore(_selectedStartDate!)) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text(lang.S.of(context).endDateCannotBeBeforeStartDate)),
+        );
+        return;
+      }
+
+      final repo = HolidayRepo();
+      final String apiStartDate = _apiFormat.format(_selectedStartDate!);
+      final String apiEndDate = _apiFormat.format(_selectedEndDate!);
+
+      if (isEditing) {
+        // --- UPDATE HOLIDAY ---
+        await repo.updateHolidays(
+          ref: ref,
+          context: context,
+          id: widget.holidayData!.id!.toInt(),
+          name: nameController.text,
+          startDate: apiStartDate,
+          endDate: apiEndDate,
+          description: descriptionController.text,
+        );
+      } else {
+        // --- CREATE HOLIDAY ---
+        await repo.createHolidays(
+          ref: ref,
+          context: context,
+          name: nameController.text,
+          startDate: apiStartDate,
+          endDate: apiEndDate,
+          description: descriptionController.text,
+        );
+      }
+      // Note: The repo functions already handle Navigator.pop(context) and SnackBar
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final _lang = lang.S.of(context);
+    return Scaffold(
+      backgroundColor: kWhite,
+      appBar: AppBar(
+        centerTitle: true,
+        title: Text(
+          isEditing ? _lang.editHoliday : _lang.addNewHoliday,
+        ),
+        bottom: const PreferredSize(
+          preferredSize: Size.fromHeight(1),
+          child: Divider(
+            height: 2,
+            color: kBackgroundColor,
+          ),
+        ),
+      ),
+      body: SingleChildScrollView(
+        padding: const EdgeInsets.all(16),
+        child: Form(
+            key: _key,
+            child: Column(
+              children: [
+                TextFormField(
+                  controller: nameController,
+                  decoration: InputDecoration(
+                    labelText: _lang.name,
+                    hintText: _lang.enterHolidayName,
+                  ),
+                  validator: (value) => value!.isEmpty ? _lang.pleaseEnterHolidayName : null,
+                ),
+                const SizedBox(height: 20),
+                Row(
+                  children: [
+                    Expanded(
+                      child: TextFormField(
+                        keyboardType: TextInputType.name,
+                        readOnly: true,
+                        controller: startDateController,
+                        decoration: InputDecoration(
+                          labelText: _lang.startDate,
+                          hintText: _lang.pleaseEnterDate,
+                          suffixIcon: IconButton(
+                            padding: EdgeInsets.zero,
+                            visualDensity: const VisualDensity(horizontal: -4, vertical: -4),
+                            onPressed: () => _selectDate(context, startDateController, true),
+                            icon: const Icon(IconlyLight.calendar, size: 22),
+                          ),
+                        ),
+                        validator: (value) => value!.isEmpty ? _lang.pleaseSelectStartDate : null,
+                      ),
+                    ),
+                    const SizedBox(width: 16),
+                    Expanded(
+                      child: TextFormField(
+                        keyboardType: TextInputType.name,
+                        readOnly: true,
+                        controller: endDateController,
+                        decoration: InputDecoration(
+                          labelText: _lang.endDate,
+                          hintText: _lang.pleaseEnterDate,
+                          suffixIcon: IconButton(
+                            padding: EdgeInsets.zero,
+                            visualDensity: const VisualDensity(horizontal: -4, vertical: -4),
+                            onPressed: () => _selectDate(context, endDateController, false),
+                            icon: const Icon(IconlyLight.calendar, size: 22),
+                          ),
+                        ),
+                        validator: (value) {
+                          if (value!.isEmpty) {
+                            return _lang.pleaseEnterEndDate;
+                          }
+                          if (_selectedStartDate != null &&
+                              _selectedEndDate != null &&
+                              _selectedEndDate!.isBefore(_selectedStartDate!)) {
+                            return _lang.endDateBeforeStartDate;
+                          }
+                          return null;
+                        },
+                      ),
+                    ),
+                  ],
+                ),
+                const SizedBox(height: 20),
+                TextFormField(
+                  controller: descriptionController,
+                  decoration: InputDecoration(
+                    labelText: _lang.description,
+                    hintText: '${_lang.enterDescription}...',
+                  ),
+                ),
+                const SizedBox(height: 20),
+                Row(
+                  children: [
+                    Expanded(
+                      child: OutlinedButton(
+                        onPressed: () {
+                          // Reset functionality
+                          setState(() {
+                            _key.currentState?.reset();
+                            nameController.clear();
+                            descriptionController.clear();
+                            startDateController.clear();
+                            endDateController.clear();
+                            _selectedStartDate = null;
+                            _selectedEndDate = null;
+                          });
+                        },
+                        child: Text(_lang.resets),
+                      ),
+                    ),
+                    const SizedBox(width: 16),
+                    Expanded(
+                      child: ElevatedButton(
+                        onPressed: _submit, // Call the submission function
+                        child: Text(
+                          isEditing ? _lang.update : _lang.save,
+                        ),
+                      ),
+                    ),
+                  ],
+                ),
+              ],
+            )),
+      ),
+    );
+  }
+}

lib/Screens/hrm/holiday/holiday_list_screen.dart

@@ -0,0 +1,324 @@
+// File: holiday_list.dart
+
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:hugeicons/hugeicons.dart';
+import 'package:intl/intl.dart'; // Import for DateFormat
+
+// --- Local Imports (Assuming correct paths) ---
+import 'package:mobile_pos/Screens/hrm/holiday/add_new_holiday.dart';
+import 'package:mobile_pos/Screens/hrm/widgets/model_bottom_sheet.dart';
+import 'package:mobile_pos/constant.dart';
+import '../../../service/check_user_role_permission_provider.dart'; // PermissionService
+import '../../../widgets/empty_widget/_empty_widget.dart'; // PermitDenyWidget (Assuming this exists)
+import '../widgets/deleteing_alart_dialog.dart';
+import '../widgets/global_search_appbar.dart';
+import 'package:mobile_pos/generated/l10n.dart' as lang;
+
+// --- Data Layer Imports ---
+import 'package:mobile_pos/Screens/hrm/holiday/model/holiday_list_model.dart';
+import 'package:mobile_pos/Screens/hrm/holiday/repo/holiday_repo.dart';
+import 'package:mobile_pos/Screens/hrm/holiday/provider/holidays_list_provider.dart';
+
+class HolidayList extends ConsumerStatefulWidget {
+  const HolidayList({super.key});
+
+  @override
+  ConsumerState<HolidayList> createState() => _HolidayListState();
+}
+
+class _HolidayListState extends ConsumerState<HolidayList> {
+  final TextEditingController _searchController = TextEditingController();
+  List<HolidayData> _filteredHolidays = [];
+  bool _isSearch = false;
+
+  @override
+  void initState() {
+    super.initState();
+    _searchController.addListener(_onSearchChanged);
+  }
+
+  @override
+  void dispose() {
+    _searchController.removeListener(_onSearchChanged);
+    _searchController.dispose();
+    super.dispose();
+  }
+
+  // --- Date Formatting Utility (FIX) ---
+  String _formatDateForDisplay(String? date) {
+    if (date == null || date.isEmpty) return 'N/A';
+    try {
+      // Parse YYYY-MM-DD from API
+      final dateTime = DateFormat('yyyy-MM-dd').parse(date);
+      // Format to dd MMM, yyyy (e.g., 02 Jun, 2025)
+      return DateFormat('dd MMM, yyyy').format(dateTime);
+    } catch (_) {
+      return date;
+    }
+  }
+  // --- End Date Formatting Utility ---
+
+  void _onSearchChanged() {
+    setState(() {
+      // Trigger rebuild to re-apply filter
+    });
+  }
+
+  void _filterHolidays(List<HolidayData> allHolidays) {
+    final query = _searchController.text.toLowerCase().trim();
+    if (query.isEmpty) {
+      _filteredHolidays = allHolidays;
+    } else {
+      _filteredHolidays = allHolidays.where((holiday) {
+        final nameMatch = (holiday.name ?? '').toLowerCase().contains(query);
+        final branchMatch = (holiday.branch?.name ?? '').toLowerCase().contains(query);
+        final startDateMatch = (holiday.startDate ?? '').toLowerCase().contains(query);
+        final endDateMatch = (holiday.endDate ?? '').toLowerCase().contains(query);
+
+        return nameMatch || branchMatch || startDateMatch || endDateMatch;
+      }).toList();
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final _lang = lang.S.of(context);
+    final holidayListAsync = ref.watch(holidayListProvider);
+    // Assuming PermissionService and Permit enum exist globally or are accessible
+    final permissionService = PermissionService(ref);
+
+    return Scaffold(
+      backgroundColor: Colors.white,
+      appBar: GlobalSearchAppBar(
+        isSearch: _isSearch,
+        onSearchToggle: () {
+          setState(() {
+            _isSearch = !_isSearch;
+            if (!_isSearch) {
+              _searchController.clear();
+            }
+          });
+        },
+        title: _lang.holidayList,
+        controller: _searchController,
+        onChanged: (query) {
+          // Handled by _searchController.addListener
+        },
+      ),
+      body: holidayListAsync.when(
+        loading: () => const Center(child: CircularProgressIndicator()),
+        error: (err, stack) => Center(
+          child: Text('Failed to load holidays: $err'),
+        ),
+        data: (model) {
+          // Check read permission
+          if (!permissionService.hasPermission(Permit.holidaysRead.value)) {
+            return const Center(child: PermitDenyWidget());
+          }
+          final allHolidays = model.data ?? [];
+
+          // Apply filter
+          _filterHolidays(allHolidays);
+
+          if (_filteredHolidays.isEmpty) {
+            return Center(
+              child: Text(
+                _searchController.text.isEmpty
+                    ? _lang.noHolidayFound
+                    : '${_lang.noHolidayFundMatching}"${_searchController.text}".',
+                style: Theme.of(context).textTheme.titleMedium,
+              ),
+            );
+          }
+
+          return ListView.separated(
+            padding: EdgeInsets.zero,
+            itemCount: _filteredHolidays.length,
+            separatorBuilder: (_, __) => const Divider(
+              color: kBackgroundColor,
+              height: 1.5,
+            ),
+            itemBuilder: (_, index) => _buildHolidayItem(
+              context: context,
+              ref: ref,
+              holiday: _filteredHolidays[index], // Use filtered list
+            ),
+          );
+        },
+      ),
+      bottomNavigationBar: permissionService.hasPermission(Permit.holidaysCreate.value)
+          ? Padding(
+              padding: const EdgeInsets.all(16),
+              child: ElevatedButton.icon(
+                onPressed: () => Navigator.push(
+                  context,
+                  MaterialPageRoute(
+                    builder: (context) => const AddNewHoliday(),
+                  ),
+                ),
+                icon: const Icon(Icons.add, color: Colors.white),
+                label: Text(_lang.addHoliday),
+              ),
+            )
+          : null,
+    );
+  }
+
+  // --- Helper Methods ---
+
+  Widget _buildHolidayItem({
+    required BuildContext context,
+    required WidgetRef ref,
+    required HolidayData holiday,
+  }) {
+    final theme = Theme.of(context);
+
+    // FIX: Formatting the dates for display
+    final String startDateDisplay = _formatDateForDisplay(holiday.startDate);
+    final String endDateDisplay = _formatDateForDisplay(holiday.endDate);
+    final String description = holiday.description ?? 'N/A';
+
+    return InkWell(
+      onTap: () => viewModalSheet(
+        context: context,
+        item: {
+          lang.S.of(context).name: holiday.name ?? 'N/A',
+          lang.S.of(context).startDate: startDateDisplay,
+          lang.S.of(context).endDate: endDateDisplay,
+        },
+        description: description,
+      ),
+      child: Padding(
+        padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 13.5),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Row(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: [
+                Text(
+                  holiday.name ?? 'n/a',
+                  style: theme.textTheme.titleMedium?.copyWith(
+                    fontWeight: FontWeight.w600,
+                  ),
+                  textAlign: TextAlign.center,
+                ),
+                _buildActionButtons(context, ref, holiday),
+              ],
+            ),
+            const SizedBox(height: 16),
+            Row(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: [
+                _buildTimeColumn(
+                  time: startDateDisplay, // Use formatted date
+                  label: lang.S.of(context).startDate,
+                  theme: theme,
+                ),
+                _buildTimeColumn(
+                  time: endDateDisplay, // Use formatted date
+                  label: lang.S.of(context).endDate,
+                  theme: theme,
+                ),
+                const SizedBox(width: 50),
+              ],
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildTimeColumn({
+    required String time,
+    required String label,
+    required ThemeData theme,
+  }) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.center,
+      children: [
+        Text(
+          time,
+          style: theme.textTheme.titleMedium?.copyWith(
+            fontWeight: FontWeight.w600,
+          ),
+        ),
+        const SizedBox(height: 6),
+        Text(
+          label,
+          style: theme.textTheme.bodyMedium?.copyWith(
+            color: kNeutral800,
+          ),
+        ),
+      ],
+    );
+  }
+
+  Widget _buildActionButtons(BuildContext context, WidgetRef ref, HolidayData holiday) {
+    final permissionService = PermissionService(ref);
+    return Column(
+      children: [
+        GestureDetector(
+          onTap: () {
+            if (!permissionService.hasPermission(Permit.holidaysUpdate.value)) {
+              ScaffoldMessenger.of(context).showSnackBar(
+                SnackBar(
+                  backgroundColor: Colors.red,
+                  content: Text(lang.S.of(context).youDoNotHavePermissionToUpgradeHoliday),
+                ),
+              );
+              return;
+            }
+            Navigator.push(
+              context,
+              MaterialPageRoute(
+                builder: (context) => AddNewHoliday(holidayData: holiday),
+              ),
+            );
+          },
+          child: const HugeIcon(
+            icon: HugeIcons.strokeRoundedPencilEdit02,
+            color: kSuccessColor,
+            size: 20,
+          ),
+        ),
+        const SizedBox(height: 8),
+        GestureDetector(
+          onTap: () {
+            if (!permissionService.hasPermission(Permit.holidaysDelete.value)) {
+              ScaffoldMessenger.of(context).showSnackBar(
+                const SnackBar(
+                  backgroundColor: Colors.red,
+                  content: Text("You do not have permission to delete Holidays."),
+                ),
+              );
+              return;
+            }
+            if (holiday.id != null) {
+              _showDeleteConfirmationDialog(context, ref, holiday.id!);
+            }
+          },
+          child: const HugeIcon(
+            icon: HugeIcons.strokeRoundedDelete03,
+            color: Colors.red,
+            size: 20,
+          ),
+        ),
+      ],
+    );
+  }
+
+  void _showDeleteConfirmationDialog(BuildContext context, WidgetRef ref, num id) async {
+    bool result = await showDeleteConfirmationDialog(
+      context: context,
+      itemName: lang.S.of(context).holiday,
+    );
+
+    if (result) {
+      final repo = HolidayRepo();
+      await repo.deleteHolidays(id: id, context: context, ref: ref);
+      // The repo method handles refreshing the list
+    }
+  }
+}

lib/Screens/hrm/holiday/model/holiday_list_model.dart

@@ -0,0 +1,103 @@
+class HolidayListModel {
+  HolidayListModel({
+    this.message,
+    this.data,
+  });
+
+  HolidayListModel.fromJson(dynamic json) {
+    message = json['message'];
+    if (json['data'] != null) {
+      data = [];
+      json['data'].forEach((v) {
+        data?.add(HolidayData.fromJson(v));
+      });
+    }
+  }
+  String? message;
+  List<HolidayData>? data;
+
+  Map<String, dynamic> toJson() {
+    final map = <String, dynamic>{};
+    map['message'] = message;
+    if (data != null) {
+      map['data'] = data?.map((v) => v.toJson()).toList();
+    }
+    return map;
+  }
+}
+
+class HolidayData {
+  HolidayData({
+    this.id,
+    this.businessId,
+    this.branchId,
+    this.name,
+    this.startDate,
+    this.endDate,
+    this.description,
+    this.createdAt,
+    this.updatedAt,
+    this.branch,
+  });
+
+  HolidayData.fromJson(dynamic json) {
+    id = json['id'];
+    businessId = json['business_id'];
+    branchId = json['branch_id'];
+    name = json['name'];
+    startDate = json['start_date'];
+    endDate = json['end_date'];
+    description = json['description'];
+    createdAt = json['created_at'];
+    updatedAt = json['updated_at'];
+    branch = json['branch'] != null ? Branch.fromJson(json['branch']) : null;
+  }
+  num? id;
+  num? businessId;
+  num? branchId;
+  String? name;
+  String? startDate;
+  String? endDate;
+  String? description;
+  String? createdAt;
+  String? updatedAt;
+  Branch? branch;
+
+  Map<String, dynamic> toJson() {
+    final map = <String, dynamic>{};
+    map['id'] = id;
+    map['business_id'] = businessId;
+    map['branch_id'] = branchId;
+    map['name'] = name;
+    map['start_date'] = startDate;
+    map['end_date'] = endDate;
+    map['description'] = description;
+    map['created_at'] = createdAt;
+    map['updated_at'] = updatedAt;
+    if (branch != null) {
+      map['branch'] = branch?.toJson();
+    }
+    return map;
+  }
+}
+
+class Branch {
+  Branch({
+    this.id,
+    this.name,
+  });
+
+  Branch.fromJson(dynamic json) {
+    id = json['id'];
+    name = json['name'];
+  }
+  num? id;
+  String? name;
+
+  Map<String, dynamic> toJson() {
+    final map = <String, dynamic>{};
+    map['id'] = id;
+    map['name'] = name;
+    return map;
+  }
+}

lib/Screens/hrm/holiday/provider/holidays_list_provider.dart

@@ -0,0 +1,8 @@
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:mobile_pos/Screens/hrm/department/model/department_list_model.dart';
+import 'package:mobile_pos/Screens/hrm/department/repo/department_repo.dart';
+import 'package:mobile_pos/Screens/hrm/holiday/model/holiday_list_model.dart';
+import 'package:mobile_pos/Screens/hrm/holiday/repo/holiday_repo.dart';
+
+final repo = HolidayRepo();
+final holidayListProvider = FutureProvider<HolidayListModel>((ref) => repo.fetchAllHolidays());

lib/Screens/hrm/holiday/repo/holiday_repo.dart

@@ -0,0 +1,171 @@
+import 'dart:convert';
+import 'package:flutter/material.dart';
+import 'package:flutter_easyloading/flutter_easyloading.dart';
+import 'package:http/http.dart' as http;
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+
+import 'package:mobile_pos/Screens/hrm/holiday/model/holiday_list_model.dart';
+import 'package:mobile_pos/Screens/hrm/holiday/provider/holidays_list_provider.dart';
+
+import '../../../../Const/api_config.dart';
+import '../../../../http_client/custome_http_client.dart';
+import '../../../../http_client/customer_http_client_get.dart';
+
+class HolidayRepo {
+  ///---------------- FETCH HOLIDAYS ----------------///
+  Future<HolidayListModel> fetchAllHolidays() async {
+    CustomHttpClientGet clientGet = CustomHttpClientGet(client: http.Client());
+    final uri = Uri.parse('${APIConfig.url}/holidays');
+
+    final response = await clientGet.get(url: uri);
+
+    if (response.statusCode == 200) {
+      final parsedData = jsonDecode(response.body);
+      return HolidayListModel.fromJson(parsedData);
+    } else {
+      throw Exception('Failed to fetch Holidays list');
+    }
+  }
+
+  ///---------------- CREATE HOLIDAY ----------------///
+  Future<void> createHolidays({
+    required WidgetRef ref,
+    required BuildContext context,
+    required String name,
+    required String startDate,
+    required String endDate,
+    required String description,
+  }) async {
+    final uri = Uri.parse('${APIConfig.url}/holidays'); // Modified endpoint
+
+    final requestBody = jsonEncode({
+      'name': name,
+      'start_date': startDate, // Field names match the model/API
+      'end_date': endDate, // Field names match the model/API
+      'description': description,
+    });
+
+    try {
+      EasyLoading.show(status: 'Creating Holiday...');
+      CustomHttpClient customHttpClient = CustomHttpClient(client: http.Client(), context: context, ref: ref);
+
+      var responseData = await customHttpClient.post(
+        url: uri,
+        addContentTypeInHeader: true,
+        body: requestBody,
+      );
+
+      final parsedData = jsonDecode(responseData.body);
+      EasyLoading.dismiss();
+
+      if (responseData.statusCode == 200) {
+        ref.refresh(holidayListProvider); // Refresh the list after creation
+
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text(parsedData['message'] ?? 'Holiday created successfully')),
+        );
+        Navigator.pop(context);
+      } else {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text('Holiday creation failed: ${parsedData['message'] ?? 'Unknown error'}')),
+        );
+      }
+    } catch (error) {
+      EasyLoading.dismiss();
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text('An error occurred: $error')),
+      );
+    }
+  }
+
+  ///---------------- UPDATE HOLIDAY ----------------///
+  Future<void> updateHolidays({
+    // Renamed function
+    required WidgetRef ref,
+    required BuildContext context,
+    required int id,
+    required String name,
+    required String startDate,
+    required String endDate,
+    required String description,
+  }) async {
+    final uri = Uri.parse('${APIConfig.url}/holidays/$id'); // Modified endpoint
+
+    final requestBody = jsonEncode({
+      '_method': 'put', // Required for PUT/PATCH via POST on some APIs
+      'name': name,
+      'start_date': startDate,
+      'end_date': endDate,
+      'description': description,
+    });
+
+    try {
+      EasyLoading.show(status: 'Updating Holiday...');
+      CustomHttpClient customHttpClient = CustomHttpClient(client: http.Client(), context: context, ref: ref);
+
+      var responseData = await customHttpClient.post(
+        // Assuming the PUT is sent via POST with '_method': 'put'
+        url: uri,
+        addContentTypeInHeader: true,
+        body: requestBody,
+      );
+
+      final parsedData = jsonDecode(responseData.body);
+      EasyLoading.dismiss();
+
+      if (responseData.statusCode == 200) {
+        ref.refresh(holidayListProvider); // Refresh the list after update
+
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text(parsedData['message'] ?? 'Holiday updated successfully')),
+        );
+        Navigator.pop(context);
+      } else {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text('Holiday update failed: ${parsedData['message'] ?? 'Unknown error'}')),
+        );
+      }
+    } catch (error) {
+      EasyLoading.dismiss();
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text('An error occurred: $error')),
+      );
+    }
+  }
+
+  ///---------------- DELETE HOLIDAY ----------------///
+  Future<bool> deleteHolidays({
+    // Renamed function
+    required num id, // Changed to num to match model's id type
+    required BuildContext context,
+    required WidgetRef ref,
+  }) async {
+    try {
+      EasyLoading.show(status: 'Deleting...');
+      final url = Uri.parse('${APIConfig.url}/holidays/$id'); // Modified endpoint
+      CustomHttpClient customHttpClient = CustomHttpClient(ref: ref, context: context, client: http.Client());
+      final response = await customHttpClient.delete(url: url);
+
+      EasyLoading.dismiss();
+      if (response.statusCode == 200) {
+        ref.refresh(holidayListProvider); // Refresh the list after deletion
+        ScaffoldMessenger.of(context).showSnackBar(
+          const SnackBar(content: Text('Holiday deleted successfully')),
+        );
+        return true;
+      } else {
+        final parsedData = jsonDecode(response.body);
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text('Deletion failed: ${parsedData['message'] ?? 'Unknown error'}')),
+        );
+        return false;
+      }
+    } catch (error) {
+      EasyLoading.dismiss();
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text('An error occurred during deletion: $error')),
+      );
+      return false;
+    }
+  }
+}

lib/Screens/hrm/hrm_manu_screen.dart

@@ -0,0 +1,240 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:flutter_svg/flutter_svg.dart';
+import 'package:mobile_pos/generated/l10n.dart' as l;
+import 'package:mobile_pos/Screens/hrm/attendance/attendance_screen.dart';
+import 'package:mobile_pos/Screens/hrm/department/department_screen.dart';
+import 'package:mobile_pos/Screens/hrm/designation/designation_list.dart';
+import 'package:mobile_pos/Screens/hrm/employee/employee_list_screen.dart';
+import 'package:mobile_pos/Screens/hrm/holiday/holiday_list_screen.dart';
+import 'package:mobile_pos/Screens/hrm/leave_request/leave/leave_list_screen.dart';
+import 'package:mobile_pos/Screens/hrm/leave_request/leave_type/leave_type_list.dart';
+import 'package:mobile_pos/Screens/hrm/payroll/payroll_list.dart';
+import 'package:mobile_pos/Screens/hrm/reports/attandence_report.dart';
+import 'package:mobile_pos/Screens/hrm/reports/leave_reports.dart';
+import 'package:mobile_pos/Screens/hrm/reports/payroll_reports.dart';
+import 'package:mobile_pos/Screens/hrm/shift/shift_screen.dart';
+
+import '../../constant.dart';
+import '../../service/check_user_role_permission_provider.dart';
+
+class HrmScreen extends ConsumerStatefulWidget {
+  const HrmScreen({super.key});
+
+  @override
+  ConsumerState<HrmScreen> createState() => _HrmScreenState();
+}
+
+class _HrmScreenState extends ConsumerState<HrmScreen> {
+  @override
+  Widget build(BuildContext context) {
+    final _lang = l.S.of(context);
+    final permissionService = PermissionService(ref);
+    return Scaffold(
+      backgroundColor: kBackgroundColor,
+      appBar: AppBar(
+        title: Text(_lang.hrm),
+        centerTitle: true,
+        elevation: 0.0,
+      ),
+      body: SingleChildScrollView(
+        padding: const EdgeInsets.all(16.0),
+        child: Column(
+          children: [
+            //---------------Department--------------------
+            _buildListItem(
+              context,
+              icon: 'assets/hrm/depertment.svg',
+              title: _lang.department,
+              destination: DepartmentScreen(),
+            ),
+            const SizedBox(height: 10),
+            //-----------------Designation----------------------
+            _buildListItem(
+              context,
+              icon: 'assets/hrm/designation.svg',
+              title: _lang.designation,
+              destination: DesignationListScreen(),
+            ),
+            const SizedBox(height: 10),
+            //---------------------Shift----------------------------
+            _buildListItem(
+              context,
+              icon: 'assets/hrm/shift.svg',
+              title: _lang.shift,
+              destination: const ShiftScreen(),
+            ),
+            SizedBox(height: 10),
+            //-----------------Employee---------------------------------
+            _buildListItem(
+              context,
+              icon: 'assets/hrm/employee.svg',
+              title: _lang.employee,
+              destination: const EmployeeListScreen(),
+            ),
+            SizedBox(height: 10),
+            //-----------------Leave request-----------------------------
+            _buildExpansionTile(
+              context,
+              icon: 'assets/hrm/leave.svg',
+              title: _lang.leaveRequest,
+              children: [
+                _buildSubMenuItem(
+                  context,
+                  title: _lang.leaveType,
+                  destination: const LeaveTypeList(),
+                ),
+                _buildSubMenuItem(
+                  context,
+                  title: _lang.leave,
+                  destination: const LeaveListScreen(),
+                ),
+              ],
+            ),
+            SizedBox(height: 10),
+            //------------------------Holiday----------------------------------
+            _buildListItem(
+              context,
+              icon: 'assets/hrm/holiday.svg',
+              title: _lang.holiday,
+              destination: const HolidayList(),
+            ),
+            SizedBox(height: 10),
+            //------------------------Attendance-------------------------------
+            _buildListItem(
+              context,
+              icon: 'assets/hrm/attendence.svg',
+              title: _lang.attendance,
+              destination: const AttendanceScreen(),
+            ),
+            SizedBox(height: 10),
+            //-------------------------payroll----------------------------------
+            _buildListItem(
+              context,
+              icon: 'assets/hrm/payroll.svg',
+              title: _lang.payroll,
+              destination: const PayrollScreen(),
+            ),
+            SizedBox(height: 10),
+            //--------------------------Reports--------------------------------
+            if (permissionService.hasPermission(Permit.attendanceReportsRead.value) ||
+                permissionService.hasPermission(Permit.payrollReportsRead.value) ||
+                permissionService.hasPermission(Permit.leaveReportsRead.value))
+              _buildExpansionTile(
+                context,
+                icon: 'assets/hrm/reports.svg',
+                title: _lang.reports,
+                children: [
+                  if (permissionService.hasPermission(Permit.attendanceReportsRead.value))
+                    _buildSubMenuItem(
+                      context,
+                      title: _lang.attendance,
+                      destination: const AttendanceReports(),
+                    ),
+                  if (permissionService.hasPermission(Permit.payrollReportsRead.value))
+                    _buildSubMenuItem(
+                      context,
+                      title: _lang.payroll,
+                      destination: const PayrollReports(),
+                    ),
+                  if (permissionService.hasPermission(Permit.leaveReportsRead.value))
+                    _buildSubMenuItem(
+                      context,
+                      title: _lang.leave,
+                      destination: const LeaveReports(),
+                    ),
+                ],
+              ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  ///-------------build menu item------------------------------
+  Widget _buildListItem(
+    BuildContext context, {
+    required String icon,
+    required String title,
+    required Widget destination,
+  }) {
+    final _theme = Theme.of(context);
+    return ListTile(
+      tileColor: Colors.white,
+      shape: RoundedRectangleBorder(borderRadius: BorderRadiusGeometry.circular(6)),
+      horizontalTitleGap: 15,
+      contentPadding: EdgeInsetsDirectional.symmetric(horizontal: 8),
+      onTap: () {
+        // expansibleController.collapse();
+        // expansibleController2.collapse();
+        Navigator.push(context, MaterialPageRoute(builder: (context) => destination));
+      },
+      leading: SvgPicture.asset(
+        icon,
+        height: 40,
+        width: 40,
+      ),
+      title: Text(
+        title,
+        style: _theme.textTheme.bodyLarge,
+      ),
+      trailing: Icon(
+        Icons.arrow_forward_ios,
+        size: 18,
+        color: kNeutral800,
+      ),
+    );
+  }
+
+  ///---------------------expansion tile item---------------------------------
+  Widget _buildExpansionTile(
+    BuildContext context, {
+    required String icon,
+    required String title,
+    required List<Widget> children,
+  }) {
+    return Theme(
+      data: Theme.of(context).copyWith(
+        dividerColor: WidgetStateColor.transparent,
+      ),
+      child: ExpansionTile(
+        backgroundColor: Colors.white,
+        collapsedBackgroundColor: Colors.white,
+        collapsedShape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(6)),
+        shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(6)),
+        iconColor: kNeutral800,
+        tilePadding: const EdgeInsets.symmetric(horizontal: 8),
+        childrenPadding: const EdgeInsets.symmetric(horizontal: 50),
+        leading: SvgPicture.asset(
+          icon,
+          height: 40,
+          width: 40,
+        ),
+        title: Text(title, style: Theme.of(context).textTheme.bodyLarge),
+        children: children,
+      ),
+    );
+  }
+
+  ///-------------------sub menu item---------------------------------------
+  Widget _buildSubMenuItem(
+    BuildContext context, {
+    required String title,
+    required Widget destination,
+  }) {
+    return ListTile(
+      onTap: () {
+        // setState(() => selectedTitle = title);
+
+        Navigator.push(context, MaterialPageRoute(builder: (context) => destination));
+      },
+      visualDensity: const VisualDensity(vertical: -4),
+      title: Text(
+        title,
+        style: Theme.of(context).textTheme.bodyLarge?.copyWith(
+              color: kTitleColor,
+            ),
+      ),
+    );
+  }
+}

lib/Screens/hrm/leave_request/leave/add_new_leave.dart

@@ -0,0 +1,473 @@
+// File: add_new_leave.dart
+
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:iconly/iconly.dart';
+import 'package:intl/intl.dart';
+import 'package:mobile_pos/Screens/hrm/leave_request/leave/repo/leave_repo.dart';
+import 'package:mobile_pos/generated/l10n.dart' as lang;
+// --- Local Imports ---
+import '../../../../constant.dart';
+import '../../employee/model/employee_list_model.dart';
+import '../../employee/provider/emplpyee_list_provider.dart';
+import '../leave_type/model/leave_type_list_model.dart';
+import '../leave_type/provider/leave_type_list_provider.dart';
+import 'model/leave_list_model.dart';
+
+class AddNewLeave extends ConsumerStatefulWidget {
+  final LeaveRequestData? leaveRequestData;
+
+  const AddNewLeave({super.key, this.leaveRequestData});
+
+  @override
+  ConsumerState<AddNewLeave> createState() => _AddNewLeaveState();
+}
+
+class _AddNewLeaveState extends ConsumerState<AddNewLeave> {
+  bool _isActive(dynamic item) {
+    if (item == null) return false;
+    if (item.status is num) {
+      return item.status == 1;
+    }
+    if (item.status is String) {
+      return item.status.toLowerCase() == 'active';
+    }
+    // Default to true if status is missing or unknown (for safety)
+    return true;
+  }
+
+  // --- Form Controllers ---
+  final GlobalKey<FormState> _key = GlobalKey();
+  final startDateController = TextEditingController();
+  final endDateController = TextEditingController();
+  final leaveDurationController = TextEditingController();
+  final noteController = TextEditingController();
+
+  // --- Selected Values (API payload) ---
+  EmployeeData? _selectedEmployee;
+  LeaveTypeData? _selectedLeaveType;
+  DateTime? _selectedStartDate;
+  DateTime? _selectedEndDate;
+  String? _selectedMonth;
+  String _selectedStatus = 'pending';
+
+  // --- UI/API Helpers ---
+  final DateFormat _displayFormat = DateFormat('dd/MM/yyyy');
+  final DateFormat _apiFormat = DateFormat('yyyy-MM-dd');
+  final DateFormat _monthFormat = DateFormat('MMMM');
+
+  // UI state for Department (Auto-filled)
+  final TextEditingController _currentEmployeeDepartmentName = TextEditingController(text: 'Select an employee');
+
+  bool get isEditing => widget.leaveRequestData != null;
+
+  @override
+  void initState() {
+    super.initState();
+    if (isEditing) {
+      final data = widget.leaveRequestData!;
+      noteController.text = data.description ?? '';
+      leaveDurationController.text = data.leaveDuration?.toString() ?? '';
+      _selectedStatus = data.status ?? 'pending';
+
+      try {
+        if (data.startDate != null) {
+          _selectedStartDate = DateTime.parse(data.startDate!);
+          startDateController.text = _displayFormat.format(_selectedStartDate!);
+        }
+        if (data.endDate != null) {
+          _selectedEndDate = DateTime.parse(data.endDate!);
+          endDateController.text = _displayFormat.format(_selectedEndDate!);
+        }
+        _selectedMonth = data.month;
+      } catch (e) {
+        debugPrint('Error parsing dates for editing: $e');
+      }
+      _currentEmployeeDepartmentName.text = data.department?.name ?? '';
+    }
+  }
+
+  @override
+  void dispose() {
+    startDateController.dispose();
+    endDateController.dispose();
+    leaveDurationController.dispose();
+    noteController.dispose();
+    super.dispose();
+  }
+
+  Future<void> _selectDate(bool isStart) async {
+    final controller = isStart ? startDateController : endDateController;
+
+    DateTime initialDate =
+        isStart ? _selectedStartDate ?? DateTime.now() : _selectedEndDate ?? _selectedStartDate ?? DateTime.now();
+
+    final DateTime? picked = await showDatePicker(
+      initialDate: initialDate,
+      firstDate: DateTime(2015, 8),
+      lastDate: DateTime(2101),
+      context: context,
+    );
+
+    if (picked != null) {
+      setState(() {
+        controller.text = _displayFormat.format(picked);
+
+        if (isStart) {
+          _selectedStartDate = picked;
+        } else {
+          _selectedEndDate = picked;
+        }
+
+        _updateCalculatedFields();
+      });
+    }
+  }
+
+  void _updateCalculatedFields() {
+    // 1. Month
+    if (_selectedStartDate != null) {
+      _selectedMonth = _monthFormat.format(_selectedStartDate!).toLowerCase();
+    }
+
+    // 2. Duration
+    if (_selectedStartDate != null && _selectedEndDate != null) {
+      final duration = _selectedEndDate!.difference(_selectedStartDate!).inDays + 1;
+      leaveDurationController.text = duration.toString();
+    } else {
+      leaveDurationController.clear();
+    }
+  }
+
+  void _submit() async {
+    if (_key.currentState!.validate() && _selectedEmployee != null && _selectedLeaveType != null) {
+      final repo = LeaveRepo();
+
+      final String apiStartDate = _apiFormat.format(_selectedStartDate!);
+      final String apiEndDate = _apiFormat.format(_selectedEndDate!);
+
+      final payload = {
+        'employee_id': _selectedEmployee!.id!,
+        'leave_type_id': _selectedLeaveType!.id!,
+        'start_date': apiStartDate,
+        'end_date': apiEndDate,
+        'leave_duration': leaveDurationController.text,
+        'month': _selectedMonth!,
+        'description': noteController.text,
+        'status': _selectedStatus.toLowerCase(),
+      };
+
+      if (isEditing) {
+        await repo.updateLeaveRequest(
+          ref: ref,
+          context: context,
+          id: widget.leaveRequestData!.id!,
+          employeeId: payload['employee_id'] as num,
+          leaveTypeId: payload['leave_type_id'] as num,
+          startDate: payload['start_date'] as String,
+          endDate: payload['end_date'] as String,
+          leaveDuration: payload['leave_duration'],
+          month: payload['month'] as String,
+          description: payload['description'] as String,
+          status: payload['status'] as String,
+        );
+      } else {
+        await repo.createLeaveRequest(
+          ref: ref,
+          context: context,
+          employeeId: payload['employee_id'] as num,
+          leaveTypeId: payload['leave_type_id'] as num,
+          startDate: payload['start_date'] as String,
+          endDate: payload['end_date'] as String,
+          leaveDuration: payload['leave_duration'],
+          month: payload['month'] as String,
+          description: payload['description'] as String,
+          status: payload['status'] as String,
+        );
+      }
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final employeesAsync = ref.watch(employeeListProvider);
+    final leaveTypesAsync = ref.watch(leaveTypeListProvider);
+    final _lang = lang.S.of(context);
+
+    return Scaffold(
+      backgroundColor: kWhite,
+      appBar: AppBar(
+        centerTitle: true,
+        title: Text(
+          isEditing ? _lang.editLeave : _lang.addNewLeave,
+        ),
+        bottom: const PreferredSize(
+          preferredSize: Size.fromHeight(1),
+          child: Divider(
+            height: 2,
+            color: kBackgroundColor,
+          ),
+        ),
+      ),
+      body: employeesAsync.when(
+        loading: () => const Center(child: CircularProgressIndicator()),
+        error: (err, stack) => Center(child: Text('Error loading employees: $err')),
+        data: (employeeModel) => leaveTypesAsync.when(
+          loading: () => const Center(child: CircularProgressIndicator()),
+          error: (err, stack) => Center(child: Text('Error loading leave types: $err')),
+          data: (leaveTypeModel) {
+            final employees = employeeModel.employees ?? [];
+            final leaveTypes = (leaveTypeModel.data ?? []).where(_isActive).toList();
+
+            if (isEditing) {
+              final data = widget.leaveRequestData!;
+
+              if (_selectedEmployee == null) {
+                _selectedEmployee = employees.firstWhere(
+                  (e) => e.id == data.employeeId,
+                  orElse: () => _selectedEmployee ?? employees.first,
+                );
+                _currentEmployeeDepartmentName.text = data.department?.name ?? '';
+              }
+
+              _selectedLeaveType ??= leaveTypes.firstWhere(
+                (lt) => lt.id == data.leaveTypeId,
+                orElse: () => _selectedLeaveType ?? leaveTypes.first,
+              );
+            }
+
+            return SingleChildScrollView(
+              padding: const EdgeInsets.all(16),
+              child: Form(
+                key: _key,
+                child: Column(
+                  children: [
+                    _buildEmployeeDropdown(employees),
+                    const SizedBox(height: 20),
+
+                    // 2. Department Field (Auto-filled and Read-only)
+                    _buildDepartmentDisplay(),
+                    const SizedBox(height: 20),
+
+                    _buildLeaveTypeDropdown(leaveTypes),
+                    const SizedBox(height: 20),
+
+                    _buildMonthDropdown(),
+                    const SizedBox(height: 20),
+
+                    Row(
+                      children: [
+                        Expanded(child: _buildDateInput(true)),
+                        const SizedBox(width: 16),
+                        Expanded(child: _buildDateInput(false)),
+                      ],
+                    ),
+                    const SizedBox(height: 20),
+
+                    Row(
+                      children: [
+                        Expanded(child: _buildDurationInput()),
+                        const SizedBox(width: 16),
+                        Expanded(child: _buildStatusDropdown()),
+                      ],
+                    ),
+                    const SizedBox(height: 20),
+
+                    TextFormField(
+                      controller: noteController,
+                      decoration: InputDecoration(
+                        labelText: _lang.note,
+                        hintText: _lang.enterNote,
+                      ),
+                    ),
+                    const SizedBox(height: 20),
+
+                    Row(
+                      children: [
+                        Expanded(
+                          child: OutlinedButton(
+                            onPressed: _resetForm,
+                            child: Text(isEditing ? _lang.cancel : _lang.resets),
+                          ),
+                        ),
+                        const SizedBox(width: 16),
+                        Expanded(
+                          child: ElevatedButton(
+                            onPressed: _submit,
+                            child: Text(isEditing ? _lang.update : _lang.save),
+                          ),
+                        ),
+                      ],
+                    ),
+                  ],
+                ),
+              ),
+            );
+          },
+        ),
+      ),
+    );
+  }
+
+  // --- Widget Builders ---
+
+  Widget _buildEmployeeDropdown(List<EmployeeData> employees) {
+    return DropdownButtonFormField<EmployeeData>(
+      value: _selectedEmployee,
+      icon: const Icon(Icons.keyboard_arrow_down, color: kNeutral800),
+      decoration: InputDecoration(
+        labelText: lang.S.of(context).employee,
+        hintText: lang.S.of(context).selectOne,
+      ),
+      validator: (value) => value == null ? lang.S.of(context).pleaseSelectAnEmployee : null,
+      items: employees.map((entry) {
+        return DropdownMenuItem<EmployeeData>(
+          value: entry,
+          child: Text(entry.name ?? 'N/A'),
+        );
+      }).toList(),
+      onChanged: (EmployeeData? value) {
+        setState(() {
+          _selectedEmployee = value;
+          // Auto-set department for display
+          _currentEmployeeDepartmentName.text = value?.department?.name ?? '';
+          print('Name: ${_currentEmployeeDepartmentName.text}');
+        });
+      },
+    );
+  }
+
+  // --- Department Display (TextFormField equivalent) ---
+  Widget _buildDepartmentDisplay() {
+    return TextFormField(
+      readOnly: true,
+      controller: _currentEmployeeDepartmentName,
+      // initialValue: _selectedEmployee?.department?.name ?? 'Select an employee',
+      decoration: InputDecoration(
+        labelText: lang.S.of(context).department,
+        hintText: lang.S.of(context).autoSelected,
+      ),
+    );
+  }
+
+  // --- (Other builders remain the same) ---
+
+  Widget _buildLeaveTypeDropdown(List<LeaveTypeData> leaveTypes) {
+    return DropdownButtonFormField<LeaveTypeData>(
+      value: _selectedLeaveType,
+      icon: const Icon(Icons.keyboard_arrow_down, color: kNeutral800),
+      decoration: InputDecoration(
+        labelText: lang.S.of(context).leaveType,
+        hintText: lang.S.of(context).selectOne,
+      ),
+      validator: (value) => value == null ? lang.S.of(context).pleaseSelectALeaveType : null,
+      items: leaveTypes.map((entry) {
+        return DropdownMenuItem<LeaveTypeData>(
+          value: entry,
+          child: Text(entry.name ?? 'N/A'),
+        );
+      }).toList(),
+      onChanged: (LeaveTypeData? value) {
+        setState(() {
+          _selectedLeaveType = value;
+        });
+      },
+    );
+  }
+
+  Widget _buildMonthDropdown() {
+    return TextFormField(
+      readOnly: true,
+      controller: TextEditingController(text: _selectedMonth),
+      decoration: InputDecoration(
+        labelText: lang.S.of(context).month,
+        hintText: lang.S.of(context).autoSelected,
+      ),
+      validator: (value) => value == null ? lang.S.of(context).pleaseSelectAStartDate : null,
+      onChanged: null,
+    );
+  }
+
+  Widget _buildDateInput(bool isStart) {
+    final controller = isStart ? startDateController : endDateController;
+    final label = isStart ? lang.S.of(context).startDate : lang.S.of(context).endDate;
+
+    return TextFormField(
+      keyboardType: TextInputType.name,
+      readOnly: true,
+      controller: controller,
+      decoration: InputDecoration(
+        labelText: label,
+        hintText: 'DD/MM/YYYY',
+        border: const OutlineInputBorder(),
+        suffixIcon: IconButton(
+          padding: EdgeInsets.zero,
+          visualDensity: const VisualDensity(horizontal: -4, vertical: -4),
+          onPressed: () => _selectDate(isStart),
+          icon: const Icon(IconlyLight.calendar, size: 22),
+        ),
+      ),
+      validator: (value) {
+        if (value!.isEmpty) return 'Please enter $label';
+
+        if (!isStart &&
+            _selectedStartDate != null &&
+            _selectedEndDate != null &&
+            _selectedEndDate!.isBefore(_selectedStartDate!)) {
+          return lang.S.of(context).endDateCannotBeBeforeStartDate;
+        }
+        return null;
+      },
+    );
+  }
+
+  Widget _buildDurationInput() {
+    return TextFormField(
+      controller: leaveDurationController,
+      readOnly: true,
+      decoration: InputDecoration(
+        labelText: lang.S.of(context).leaveDuration,
+        hintText: lang.S.of(context).autoCalculatedDays,
+      ),
+    );
+  }
+
+  Widget _buildStatusDropdown() {
+    final List<String> statusOptions = ['Pending', 'Approved', 'Rejected'];
+
+    return DropdownButtonFormField<String>(
+        value: _selectedStatus.isNotEmpty ? _selectedStatus[0].toUpperCase() + _selectedStatus.substring(1) : null,
+        icon: const Icon(Icons.keyboard_arrow_down, color: kNeutral800),
+        decoration: InputDecoration(labelText: lang.S.of(context).status, hintText: lang.S.of(context).selectOne),
+        validator: (value) => value == null ? lang.S.of(context).pleaseSelectStatus : null,
+        items: statusOptions.map((entry) {
+          return DropdownMenuItem(value: entry, child: Text(entry));
+        }).toList(),
+        onChanged: (String? value) {
+          setState(() {
+            _selectedStatus = value!.toLowerCase();
+          });
+        });
+  }
+
+  void _resetForm() {
+    if (!isEditing) {
+      setState(() {
+        _key.currentState?.reset();
+        startDateController.clear();
+        endDateController.clear();
+        leaveDurationController.clear();
+        noteController.clear();
+        _selectedEmployee = null;
+        _currentEmployeeDepartmentName.clear(); // Clear department name
+        _selectedLeaveType = null;
+        _selectedMonth = null;
+        _selectedStartDate = null;
+        _selectedEndDate = null;
+        _selectedStatus = 'pending';
+      });
+    } else {
+      Navigator.pop(context);
+    }
+  }
+}

lib/Screens/hrm/leave_request/leave/leave_list_screen.dart

@@ -0,0 +1,513 @@
+// File: leave_list_screen.dart
+
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:hugeicons/hugeicons.dart';
+import 'package:intl/intl.dart';
+
+// --- Local Imports ---
+import 'package:mobile_pos/Screens/hrm/leave_request/leave/add_new_leave.dart'; // Correct Provider Name
+import 'package:mobile_pos/Screens/hrm/leave_request/leave/provider/leave_list_provider.dart';
+import 'package:mobile_pos/Screens/hrm/widgets/filter_dropdown.dart';
+import 'package:mobile_pos/Screens/hrm/widgets/model_bottom_sheet.dart';
+import 'package:mobile_pos/constant.dart';
+import 'package:mobile_pos/generated/l10n.dart' as lang;
+import '../../../../service/check_user_role_permission_provider.dart';
+import '../../../../widgets/empty_widget/_empty_widget.dart';
+import '../../widgets/deleteing_alart_dialog.dart';
+
+// --- Data Layer Imports ---
+import 'package:mobile_pos/Screens/hrm/leave_request/leave/repo/leave_repo.dart';
+import 'package:mobile_pos/Screens/hrm/leave_request/leave/model/leave_list_model.dart';
+import 'package:mobile_pos/Screens/hrm/employee/provider/emplpyee_list_provider.dart'; // Employee Provider
+
+class LeaveListScreen extends ConsumerStatefulWidget {
+  const LeaveListScreen({super.key});
+
+  @override
+  ConsumerState<LeaveListScreen> createState() => _LeaveListScreenState();
+}
+
+class _LeaveListScreenState extends ConsumerState<LeaveListScreen> {
+  // --- Filter State ---
+  String? _selectedEmployeeFilter;
+  String? _selectedMonthFilter;
+
+  List<LeaveRequestData> _filteredList = [];
+  final TextEditingController _searchController = TextEditingController();
+
+  static const List<String> _monthOptions = [
+    'All Month',
+    'January',
+    'February',
+    'March',
+    'April',
+    'May',
+    'June',
+    'July',
+    'August',
+    'September',
+    'October',
+    'November',
+    'December'
+  ];
+
+  @override
+  void initState() {
+    super.initState();
+    _searchController.addListener(_applyFilters);
+    _selectedEmployeeFilter = 'All Employee';
+    _selectedMonthFilter = 'All Month';
+  }
+
+  @override
+  void dispose() {
+    _searchController.removeListener(_applyFilters);
+    _searchController.dispose();
+    super.dispose();
+  }
+
+  // --- Filtering Logic ---
+
+  void _applyFilters() {
+    setState(() {}); // Rebuild to apply filters
+  }
+
+  void _filterLeaveRequests(List<LeaveRequestData> allRequests) {
+    final query = _searchController.text.toLowerCase().trim();
+
+    _filteredList = allRequests.where((leave) {
+      final name = (leave.employee?.name ?? '').toLowerCase();
+      final leaveType = (leave.leaveType?.name ?? '').toLowerCase();
+      final month = (leave.month ?? '').toLowerCase();
+      final status = (leave.status ?? '').toLowerCase();
+
+      // 1. Search Query Filter
+      final matchesQuery = query.isEmpty ||
+          name.contains(query) ||
+          leaveType.contains(query) ||
+          month.contains(query) ||
+          status.contains(query);
+
+      if (!matchesQuery) return false;
+
+      // 2. Employee Filter
+      final employeeNameMatches =
+          _selectedEmployeeFilter == 'All Employee' || name == _selectedEmployeeFilter!.toLowerCase();
+
+      // 3. Month Filter
+      final monthMatches = _selectedMonthFilter == 'All Month' || month.startsWith(_selectedMonthFilter!.toLowerCase());
+
+      return employeeNameMatches && monthMatches;
+    }).toList();
+  }
+
+  // --- Utility Functions ---
+
+  Color _getStatusColor(String? status) {
+    switch (status?.toLowerCase()) {
+      case 'approved':
+        return kSuccessColor;
+      case 'rejected':
+        return Colors.red;
+      case 'pending':
+        return Colors.orange;
+      default:
+        return kNeutral800;
+    }
+  }
+
+  // --- Delete Logic ---
+
+  void _showDeleteConfirmationDialog(BuildContext context, WidgetRef ref, num id, String name) async {
+    bool result = await showDeleteConfirmationDialog(
+      context: context,
+      itemName: name,
+    );
+
+    if (result) {
+      final repo = LeaveRepo();
+      await repo.deleteLeaveRequest(id: id, context: context, ref: ref);
+
+      // The repo method should handle ref.invalidate(leaveRequestListProvider)
+      // If it doesn't, uncomment the line below:
+      // ref.invalidate(leaveRequestListProvider);
+    }
+  }
+
+  // --- Pull to Refresh ---
+
+  Future<void> _refreshData() async {
+    // Invalidate and watch future to force reload of the leave list
+    ref.invalidate(leaveRequestListProvider);
+    return ref.watch(leaveRequestListProvider.future);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final _lang = lang.S.of(context);
+    final theme = Theme.of(context);
+    final leaveListAsync = ref.watch(leaveRequestListProvider);
+    final employeesAsync = ref.watch(employeeListProvider);
+    final permissionService = PermissionService(ref);
+
+    // Combine data fetching results for UI
+    final combinedAsync = leaveListAsync.asData != null && employeesAsync.asData != null
+        ? AsyncValue.data(true)
+        : leaveListAsync.hasError || employeesAsync.hasError
+            ? AsyncValue.error(leaveListAsync.error ?? employeesAsync.error!, StackTrace.current)
+            : const AsyncValue.loading();
+
+    return Scaffold(
+      backgroundColor: Colors.white,
+      appBar: AppBar(
+        centerTitle: true,
+        title: Text(_lang.leaveList),
+        // Filter Dropdowns in AppBar bottom section
+        bottom: PreferredSize(
+            preferredSize: const Size.fromHeight(65),
+            child: Column(
+              children: [
+                const Divider(thickness: 1.5, color: kBackgroundColor, height: 1),
+                Padding(
+                  padding: const EdgeInsets.fromLTRB(16, 10, 16, 13),
+                  child: Row(
+                    children: [
+                      // Employee Filter Dropdown
+                      Expanded(
+                        flex: 6,
+                        child: FilterDropdownButton<String>(
+                          value: _selectedEmployeeFilter,
+                          items: [
+                            DropdownMenuItem(
+                              value: 'All Employee',
+                              child: Text(_lang.allEmployee),
+                            ),
+                            // CRITICAL: Employee data access uses .data property
+                            ...(employeesAsync.value?.employees ?? [])
+                                .map((e) => DropdownMenuItem(
+                                      value: e.name,
+                                      child: Text(e.name ?? 'n/a'),
+                                    ))
+                                .toList(),
+                          ]
+                              .map((item) => item.value != null
+                                  ? DropdownMenuItem(
+                                      value: item.value,
+                                      child: Text(
+                                        item.value!,
+                                        style: theme.textTheme.bodyLarge?.copyWith(color: kNeutral800),
+                                        maxLines: 1,
+                                        overflow: TextOverflow.ellipsis,
+                                      ),
+                                    )
+                                  : item)
+                              .toList(),
+                          onChanged: (String? value) {
+                            setState(() {
+                              _selectedEmployeeFilter = value;
+                              _applyFilters();
+                            });
+                          },
+                        ),
+                      ),
+                      const SizedBox(width: 10),
+                      // Month Filter Dropdown
+                      Expanded(
+                        flex: 4,
+                        child: FilterDropdownButton<String>(
+                          buttonDecoration: BoxDecoration(
+                            color: kBackgroundColor,
+                            borderRadius: BorderRadius.circular(5),
+                            border: Border.all(color: kBorderColor),
+                          ),
+                          value: _selectedMonthFilter,
+                          items: _monthOptions.map((entry) {
+                            return DropdownMenuItem(
+                              value: entry,
+                              child: Text(
+                                entry,
+                                style: theme.textTheme.bodyLarge?.copyWith(color: kNeutral800),
+                                maxLines: 1,
+                                overflow: TextOverflow.ellipsis,
+                              ),
+                            );
+                          }).toList(),
+                          onChanged: (String? value) {
+                            setState(() {
+                              _selectedMonthFilter = value;
+                              _applyFilters();
+                            });
+                          },
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
+                const Divider(thickness: 1.5, color: kBackgroundColor, height: 1),
+              ],
+            )),
+      ),
+      // Body handles loading/error and displays filtered list
+      body: combinedAsync.when(
+        loading: () => const Center(child: CircularProgressIndicator()),
+        error: (err, stack) => Center(child: Text('Error: Failed to load data.')),
+        data: (_) {
+          // Permission Check
+          if (!permissionService.hasPermission(Permit.leavesRead.value)) {
+            return const Center(child: PermitDenyWidget());
+          }
+
+          // Data is loaded, apply filter
+          _filterLeaveRequests(leaveListAsync.value?.data ?? []);
+
+          if (_filteredList.isEmpty) {
+            return RefreshIndicator(
+              onRefresh: _refreshData,
+              child: Center(
+                child: SingleChildScrollView(
+                  physics: const AlwaysScrollableScrollPhysics(),
+                  child: Text(
+                    _lang.noLeaveRequestFound,
+                    style: theme.textTheme.titleMedium,
+                  ),
+                ),
+              ),
+            );
+          }
+
+          return RefreshIndicator(
+            onRefresh: _refreshData,
+            child: ListView.separated(
+              padding: EdgeInsets.zero,
+              itemCount: _filteredList.length,
+              separatorBuilder: (_, __) => const Divider(
+                color: kBackgroundColor,
+                height: 1.5,
+              ),
+              itemBuilder: (_, index) => _buildShiftItem(
+                context: context,
+                ref: ref,
+                leave: _filteredList[index],
+              ),
+            ),
+          );
+        },
+      ),
+
+      bottomNavigationBar: permissionService.hasPermission(Permit.leavesCreate.value)
+          ? Padding(
+              padding: const EdgeInsets.all(16),
+              child: ElevatedButton.icon(
+                onPressed: () => Navigator.push(
+                  context,
+                  MaterialPageRoute(builder: (context) => const AddNewLeave()),
+                ),
+                icon: const Icon(Icons.add, color: Colors.white),
+                label: Text(_lang.addLeave),
+              ),
+            )
+          : null,
+    );
+  }
+
+  // --- List Item Builder ---
+
+  Widget _buildShiftItem({
+    required BuildContext context,
+    required WidgetRef ref,
+    required LeaveRequestData leave,
+  }) {
+    final theme = Theme.of(context);
+    final status = leave.status;
+    final statusColor = _getStatusColor(status);
+
+    return InkWell(
+      onTap: () => viewModalSheet(
+        context: context,
+        item: {
+          "Name": leave.employee?.name ?? 'N/A',
+          "Department": leave.department?.name ?? 'N/A',
+          "Leave Type": leave.leaveType?.name ?? 'N/A',
+          "Month": leave.month ?? 'N/A',
+          "Start Date": leave.startDate ?? 'N/A',
+          "End Date": leave.endDate ?? 'N/A',
+          "Leave Duration": leave.leaveDuration?.toString() ?? '0',
+          "Status": status?.toUpperCase() ?? 'N/A'
+        },
+        description: leave.description ?? lang.S.of(context).noDescriptionProvided,
+      ),
+      child: Padding(
+        padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 13.5),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Row(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: [
+                Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Text(
+                      leave.employee?.name ?? 'N/A Employee',
+                      style: theme.textTheme.titleMedium?.copyWith(
+                        fontWeight: FontWeight.w600,
+                      ),
+                    ),
+                    const SizedBox(height: 8),
+                    Row(
+                      children: [
+                        Text(
+                          leave.leaveType?.name ?? 'N/A Type',
+                          style: theme.textTheme.bodyMedium?.copyWith(color: kNeutral800),
+                        ),
+                        const SizedBox(width: 8),
+                        Container(
+                          padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
+                          decoration: BoxDecoration(
+                            color: statusColor.withOpacity(0.1),
+                            borderRadius: BorderRadius.circular(4),
+                          ),
+                          child: Text(
+                            status?.toUpperCase() ?? 'N/A',
+                            style: theme.textTheme.labelSmall?.copyWith(
+                              color: statusColor,
+                              fontWeight: FontWeight.bold,
+                            ),
+                          ),
+                        ),
+                      ],
+                    ),
+                  ],
+                ),
+                _buildActionButtons(context, ref, leave),
+              ],
+            ),
+            const SizedBox(height: 20),
+            Row(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: [
+                _buildTimeColumn(
+                  time: leave.month ?? 'N/A',
+                  label: lang.S.of(context).month,
+                  theme: theme,
+                ),
+                _buildTimeColumn(
+                  time: leave.startDate ?? 'N/A',
+                  label: lang.S.of(context).startDate,
+                  theme: theme,
+                ),
+                _buildTimeColumn(
+                  time: leave.endDate ?? 'N/A',
+                  label: lang.S.of(context).endDate,
+                  theme: theme,
+                ),
+              ],
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildTimeColumn({
+    required String time,
+    required String label,
+    required ThemeData theme,
+  }) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.center,
+      children: [
+        Text(
+          time,
+          style: theme.textTheme.titleMedium?.copyWith(
+            fontWeight: FontWeight.w600,
+          ),
+        ),
+        const SizedBox(height: 6),
+        Text(
+          label,
+          style: theme.textTheme.bodyMedium?.copyWith(
+            color: kNeutral800,
+          ),
+        ),
+      ],
+    );
+  }
+
+  Widget _buildActionButtons(BuildContext context, WidgetRef ref, LeaveRequestData leave) {
+    final permissionService = PermissionService(ref);
+    return Column(
+      children: [
+        GestureDetector(
+          onTap: () async {
+            // Made async to await navigation
+            if (!permissionService.hasPermission(Permit.leavesUpdate.value)) {
+              ScaffoldMessenger.of(context).showSnackBar(
+                SnackBar(
+                  backgroundColor: Colors.red,
+                  content: Text(lang.S.of(context).youDoNotHavePermissionToUpdateLeaveRequest),
+                ),
+              );
+              return;
+            }
+            // Await the push operation
+            await Navigator.push(
+              context,
+              MaterialPageRoute(
+                builder: (context) => AddNewLeave(leaveRequestData: leave),
+              ),
+            );
+            // The repo call inside AddNewLeave should invalidate the provider,
+            // causing this screen to rebuild automatically upon return.
+          },
+          child: const HugeIcon(
+            icon: HugeIcons.strokeRoundedPencilEdit02,
+            color: kSuccessColor,
+            size: 20,
+          ),
+        ),
+        const SizedBox(height: 8),
+        GestureDetector(
+          onTap: () {
+            if (!permissionService.hasPermission(Permit.leavesDelete.value)) {
+              ScaffoldMessenger.of(context).showSnackBar(
+                SnackBar(
+                  backgroundColor: Colors.red,
+                  content: Text(lang.S.of(context).youDoNotHavePermissionToDeleteLeaveRequest),
+                ),
+              );
+              return;
+            }
+            if (leave.id != null) {
+              _showDeleteConfirmationDialog(
+                context,
+                ref,
+                leave.id!,
+                leave.employee?.name ?? lang.S.of(context).leaveRequest,
+              );
+            }
+          },
+          child: const HugeIcon(
+            icon: HugeIcons.strokeRoundedDelete03,
+            color: Colors.red,
+            size: 20,
+          ),
+        ),
+      ],
+    );
+  }
+
+  // void _showDeleteConfirmationDialog(BuildContext context, WidgetRef ref, num id, String name) async {
+  //   bool result = await showDeleteConfirmationDialog(
+  //     context: context,
+  //     itemName: name,
+  //   );
+  //
+  //   if (result) {
+  //     final repo = LeaveRepo();
+  //     // This call should trigger list refresh via repo's ref.invalidate()
+  //     await repo.deleteLeaveRequest(id: id, context: context, ref: ref);
+  //   }
+  // }
+}

lib/Screens/hrm/leave_request/leave/model/leave_list_model.dart

@@ -0,0 +1,181 @@
+class LeaveListModel {
+  LeaveListModel({
+    this.message,
+    this.data,
+  });
+
+  LeaveListModel.fromJson(dynamic json) {
+    message = json['message'];
+    if (json['data'] != null) {
+      data = [];
+      json['data'].forEach((v) {
+        data?.add(LeaveRequestData.fromJson(v));
+      });
+    }
+  }
+  String? message;
+  List<LeaveRequestData>? data;
+
+  Map<String, dynamic> toJson() {
+    final map = <String, dynamic>{};
+    map['message'] = message;
+    if (data != null) {
+      map['data'] = data?.map((v) => v.toJson()).toList();
+    }
+    return map;
+  }
+}
+
+class LeaveRequestData {
+  LeaveRequestData({
+    this.id,
+    this.businessId,
+    this.branchId,
+    this.employeeId,
+    this.leaveTypeId,
+    this.departmentId,
+    this.startDate,
+    this.endDate,
+    this.leaveDuration,
+    this.month,
+    this.status,
+    this.description,
+    this.createdAt,
+    this.updatedAt,
+    this.employee,
+    this.branch,
+    this.leaveType,
+    this.department,
+  });
+
+  LeaveRequestData.fromJson(dynamic json) {
+    id = json['id'];
+    businessId = json['business_id'];
+    branchId = json['branch_id'];
+    employeeId = json['employee_id'];
+    leaveTypeId = json['leave_type_id'];
+    departmentId = json['department_id'];
+    startDate = json['start_date'];
+    endDate = json['end_date'];
+    leaveDuration = json['leave_duration'];
+    month = json['month'];
+    status = json['status'];
+    description = json['description'];
+    createdAt = json['created_at'];
+    updatedAt = json['updated_at'];
+    employee = json['employee'] != null ? Employee.fromJson(json['employee']) : null;
+    branch = json['branch'];
+    leaveType = json['leave_type'] != null ? LeaveType.fromJson(json['leave_type']) : null;
+    department = json['department'] != null ? Department.fromJson(json['department']) : null;
+  }
+  num? id;
+  num? businessId;
+  dynamic branchId;
+  num? employeeId;
+  num? leaveTypeId;
+  num? departmentId;
+  String? startDate;
+  String? endDate;
+  num? leaveDuration;
+  String? month;
+  String? status;
+  String? description;
+  String? createdAt;
+  String? updatedAt;
+  Employee? employee;
+  dynamic branch;
+  LeaveType? leaveType;
+  Department? department;
+
+  Map<String, dynamic> toJson() {
+    final map = <String, dynamic>{};
+    map['id'] = id;
+    map['business_id'] = businessId;
+    map['branch_id'] = branchId;
+    map['employee_id'] = employeeId;
+    map['leave_type_id'] = leaveTypeId;
+    map['department_id'] = departmentId;
+    map['start_date'] = startDate;
+    map['end_date'] = endDate;
+    map['leave_duration'] = leaveDuration;
+    map['month'] = month;
+    map['status'] = status;
+    map['description'] = description;
+    map['created_at'] = createdAt;
+    map['updated_at'] = updatedAt;
+    if (employee != null) {
+      map['employee'] = employee?.toJson();
+    }
+    map['branch'] = branch;
+    if (leaveType != null) {
+      map['leave_type'] = leaveType?.toJson();
+    }
+    if (department != null) {
+      map['department'] = department?.toJson();
+    }
+    return map;
+  }
+}
+
+class Department {
+  Department({
+    this.id,
+    this.name,
+  });
+
+  Department.fromJson(dynamic json) {
+    id = json['id'];
+    name = json['name'];
+  }
+  num? id;
+  String? name;
+
+  Map<String, dynamic> toJson() {
+    final map = <String, dynamic>{};
+    map['id'] = id;
+    map['name'] = name;
+    return map;
+  }
+}
+
+class LeaveType {
+  LeaveType({
+    this.id,
+    this.name,
+  });
+
+  LeaveType.fromJson(dynamic json) {
+    id = json['id'];
+    name = json['name'];
+  }
+  num? id;
+  String? name;
+
+  Map<String, dynamic> toJson() {
+    final map = <String, dynamic>{};
+    map['id'] = id;
+    map['name'] = name;
+    return map;
+  }
+}
+
+class Employee {
+  Employee({
+    this.id,
+    this.name,
+  });
+
+  Employee.fromJson(dynamic json) {
+    id = json['id'];
+    name = json['name'];
+  }
+  num? id;
+  String? name;
+
+  Map<String, dynamic> toJson() {
+    final map = <String, dynamic>{};
+    map['id'] = id;
+    map['name'] = name;
+    return map;
+  }
+}

lib/Screens/hrm/leave_request/leave/provider/leave_list_provider.dart

@@ -0,0 +1,10 @@
+// File: leave_request_provider.dart
+
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+
+import '../model/leave_list_model.dart';
+import '../repo/leave_repo.dart';
+
+final repo = LeaveRepo();
+// This provider will fetch the list of all leave requests
+final leaveRequestListProvider = FutureProvider<LeaveListModel>((ref) => repo.fetchAllLeaveRequests());

lib/Screens/hrm/leave_request/leave/repo/leave_repo.dart

@@ -0,0 +1,189 @@
+// File: leave_repo.dart
+
+import 'dart:convert';
+import 'package:flutter/material.dart';
+import 'package:flutter_easyloading/flutter_easyloading.dart';
+import 'package:http/http.dart' as http;
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+
+import '../../../../../Const/api_config.dart';
+import '../../../../../http_client/custome_http_client.dart';
+import '../../../../../http_client/customer_http_client_get.dart';
+import '../model/leave_list_model.dart';
+import '../provider/leave_list_provider.dart';
+
+class LeaveRepo {
+  // Base endpoint for leave requests from Postman screenshots
+  static const String _endpoint = '/leaves';
+
+  ///---------------- FETCH ALL LEAVE REQUESTS (GET) ----------------///
+  Future<LeaveListModel> fetchAllLeaveRequests() async {
+    CustomHttpClientGet clientGet = CustomHttpClientGet(client: http.Client());
+    final uri = Uri.parse('${APIConfig.url}$_endpoint');
+
+    final response = await clientGet.get(url: uri);
+
+    if (response.statusCode == 200) {
+      final parsedData = jsonDecode(response.body);
+      return LeaveListModel.fromJson(parsedData);
+    } else {
+      throw Exception('Failed to fetch leave requests list. Status: ${response.statusCode}');
+    }
+  }
+
+  ///---------------- CREATE LEAVE REQUEST (POST) ----------------///
+  Future<void> createLeaveRequest({
+    required WidgetRef ref,
+    required BuildContext context,
+    required num employeeId,
+    required num leaveTypeId,
+    required String startDate,
+    required String endDate,
+    required dynamic leaveDuration,
+    required String month,
+    required String description,
+    required String status, // e.g., 'pending'
+  }) async {
+    final uri = Uri.parse('${APIConfig.url}$_endpoint');
+
+    final requestBody = jsonEncode({
+      'employee_id': employeeId,
+      'leave_type_id': leaveTypeId,
+      'start_date': startDate,
+      'end_date': endDate,
+      'leave_duration': leaveDuration,
+      'month': month,
+      'description': description,
+      'status': status,
+    });
+
+    try {
+      EasyLoading.show(status: 'Submitting Leave Request...');
+      CustomHttpClient customHttpClient = CustomHttpClient(client: http.Client(), context: context, ref: ref);
+
+      var responseData = await customHttpClient.post(
+        url: uri,
+        addContentTypeInHeader: true,
+        body: requestBody,
+      );
+
+      final parsedData = jsonDecode(responseData.body);
+      EasyLoading.dismiss();
+
+      if (responseData.statusCode == 200 || responseData.statusCode == 201) {
+        ref.refresh(leaveRequestListProvider); // Assuming you'll define this provider
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text(parsedData['message'] ?? 'Leave Request created successfully')),
+        );
+        Navigator.pop(context);
+      } else {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text('Submission failed: ${parsedData['message'] ?? 'Unknown error'}')),
+        );
+      }
+    } catch (error) {
+      EasyLoading.dismiss();
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text('An error occurred: $error')),
+      );
+    }
+  }
+
+  ///---------------- UPDATE LEAVE REQUEST (POST with _method=put) ----------------///
+  Future<void> updateLeaveRequest({
+    required WidgetRef ref,
+    required BuildContext context,
+    required num id, // Leave Request ID from Postman URL
+    required num employeeId,
+    required num leaveTypeId,
+    required String startDate,
+    required String endDate,
+    required dynamic leaveDuration,
+    required String month,
+    required String description,
+    required String status, // e.g., 'approved'
+  }) async {
+    // Postman URL: {{url}}/api/v1/leaves/2
+    final uri = Uri.parse('${APIConfig.url}$_endpoint/$id');
+
+    final requestBody = jsonEncode({
+      '_method': 'put', // Required for sending PUT data via POST
+      'employee_id': employeeId,
+      'leave_type_id': leaveTypeId,
+      'start_date': startDate,
+      'end_date': endDate,
+      'leave_duration': leaveDuration,
+      'month': month,
+      'description': description,
+      'status': status,
+    });
+
+    try {
+      EasyLoading.show(status: 'Updating Request...');
+      CustomHttpClient customHttpClient = CustomHttpClient(client: http.Client(), context: context, ref: ref);
+
+      // Sending as POST request based on the Postman screenshot
+      var responseData = await customHttpClient.post(
+        url: uri,
+        addContentTypeInHeader: true,
+        body: requestBody,
+      );
+
+      final parsedData = jsonDecode(responseData.body);
+      EasyLoading.dismiss();
+
+      if (responseData.statusCode == 200) {
+        ref.refresh(leaveRequestListProvider); // Assuming you'll define this provider
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text(parsedData['message'] ?? 'Leave Request updated successfully')),
+        );
+        Navigator.pop(context);
+      } else {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text('Update failed: ${parsedData['message'] ?? 'Unknown error'}')),
+        );
+      }
+    } catch (error) {
+      EasyLoading.dismiss();
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text('An error occurred: $error')),
+      );
+    }
+  }
+
+  ///---------------- DELETE LEAVE REQUEST (DELETE) ----------------///
+  Future<bool> deleteLeaveRequest({
+    required num id,
+    required BuildContext context,
+    required WidgetRef ref,
+  }) async {
+    try {
+      EasyLoading.show(status: 'Deleting...');
+      // URL: {{url}}/api/v1/leaves/{id}
+      final url = Uri.parse('${APIConfig.url}$_endpoint/$id');
+      CustomHttpClient customHttpClient = CustomHttpClient(ref: ref, context: context, client: http.Client());
+      final response = await customHttpClient.delete(url: url);
+
+      EasyLoading.dismiss();
+      if (response.statusCode == 200) {
+        ref.refresh(leaveRequestListProvider); // Assuming you'll define this provider
+        ScaffoldMessenger.of(context).showSnackBar(
+          const SnackBar(content: Text('Leave Request deleted successfully')),
+        );
+        return true;
+      } else {
+        final parsedData = jsonDecode(response.body);
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text('Deletion failed: ${parsedData['message'] ?? 'Unknown error'}')),
+        );
+        return false;
+      }
+    } catch (error) {
+      EasyLoading.dismiss();
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text('An error occurred during deletion: $error')),
+      );
+      return false;
+    }
+  }
+}

lib/Screens/hrm/leave_request/leave_type/add_new_leave_type.dart

@@ -0,0 +1,186 @@
+// File: add_new_leave_type.dart
+
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:mobile_pos/Screens/hrm/leave_request/leave_type/repo/leave_type_repo.dart';
+
+// --- Local Imports ---
+import 'package:mobile_pos/Screens/hrm/widgets/label_style.dart';
+import 'package:mobile_pos/constant.dart';
+
+import 'model/leave_type_list_model.dart';
+
+class AddNewLeaveType extends ConsumerStatefulWidget {
+  final LeaveTypeData? leaveTypeData; // For editing
+
+  // isEdit property replaced by checking if leaveTypeData is null
+  const AddNewLeaveType({super.key, this.leaveTypeData});
+
+  @override
+  ConsumerState<AddNewLeaveType> createState() => _AddNewLeaveTypeState();
+}
+
+class _AddNewLeaveTypeState extends ConsumerState<AddNewLeaveType> {
+  final nameController = TextEditingController();
+  final descriptionController = TextEditingController();
+  String? selectedValue;
+  GlobalKey<FormState> key = GlobalKey();
+
+  bool get isEditing => widget.leaveTypeData != null;
+
+  @override
+  void initState() {
+    super.initState();
+    if (isEditing) {
+      final data = widget.leaveTypeData!;
+      nameController.text = data.name ?? '';
+      descriptionController.text = data.description ?? '';
+
+      // Convert num status (1/0) to string status ('Active'/'Inactive')
+      if (data.status == 1) {
+        selectedValue = 'Active';
+      } else if (data.status == 0) {
+        selectedValue = 'Inactive';
+      }
+    } else {
+      // Default status for new entry
+      selectedValue = 'Active';
+    }
+  }
+
+  @override
+  void dispose() {
+    nameController.dispose();
+    descriptionController.dispose();
+    super.dispose();
+  }
+
+  void _submit() async {
+    if (key.currentState!.validate() && selectedValue != null) {
+      final repo = LeaveTypeRepo();
+      final statusNum = selectedValue == 'Active' ? 1 : 0;
+
+      if (isEditing) {
+        // --- UPDATE LEAVE TYPE ---
+        await repo.updateLeaveType(
+          ref: ref,
+          context: context,
+          id: widget.leaveTypeData!.id!,
+          name: nameController.text,
+          description: descriptionController.text,
+          status: statusNum,
+        );
+      } else {
+        // --- CREATE LEAVE TYPE ---
+        await repo.createLeaveType(
+          ref: ref,
+          context: context,
+          name: nameController.text,
+          description: descriptionController.text,
+          status: statusNum,
+        );
+      }
+    }
+  }
+
+  void _resetOrCancel() {
+    if (isEditing) {
+      Navigator.pop(context);
+    } else {
+      setState(() {
+        key.currentState?.reset();
+        nameController.clear();
+        descriptionController.clear();
+        selectedValue = 'Active';
+      });
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      backgroundColor: kWhite,
+      appBar: AppBar(
+        centerTitle: true,
+        title: Text(
+          isEditing ? 'Edit Leave Type' : 'Add New Leave Type',
+        ),
+        bottom: const PreferredSize(
+          preferredSize: Size.fromHeight(1),
+          child: Divider(
+            height: 2,
+            color: kBackgroundColor,
+          ),
+        ),
+      ),
+      body: SingleChildScrollView(
+        padding: const EdgeInsets.all(16),
+        child: Form(
+          key: key,
+          child: Column(
+            children: [
+              TextFormField(
+                controller: nameController,
+                decoration: InputDecoration(
+                  label: labelSpan(
+                    title: 'Name',
+                    context: context,
+                  ),
+                  hintText: 'Enter leave type name',
+                ),
+                validator: (value) => value!.isEmpty ? 'Please Enter leave type name' : null,
+              ),
+              const SizedBox(height: 20),
+              DropdownButtonFormField<String>(
+                value: selectedValue,
+                icon: const Icon(
+                  Icons.keyboard_arrow_down,
+                  color: kNeutral800,
+                ),
+                decoration: const InputDecoration(
+                  labelText: 'Status',
+                  hintText: 'Select a status',
+                ),
+                items: ['Active', 'Inactive'].map((String value) {
+                  return DropdownMenuItem<String>(value: value, child: Text(value));
+                }).toList(),
+                onChanged: (String? newValue) {
+                  setState(() {
+                    selectedValue = newValue;
+                  });
+                },
+                validator: (value) => value == null ? 'Please select a status' : null,
+              ),
+              const SizedBox(height: 20),
+              TextFormField(
+                controller: descriptionController,
+                decoration: const InputDecoration(
+                  labelText: 'Description ',
+                  hintText: 'Enter Description...',
+                ),
+              ),
+              const SizedBox(height: 20),
+              Row(
+                children: [
+                  Expanded(
+                    child: OutlinedButton(
+                      onPressed: _resetOrCancel,
+                      child: Text(isEditing ? 'Cancel' : 'Reset'),
+                    ),
+                  ),
+                  const SizedBox(width: 16),
+                  Expanded(
+                    child: ElevatedButton(
+                      onPressed: _submit,
+                      child: Text(isEditing ? 'Update' : 'Save'),
+                    ),
+                  ),
+                ],
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}

lib/Screens/hrm/leave_request/leave_type/leave_type_list.dart

@@ -0,0 +1,298 @@
+// File: leave_type_list.dart
+
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:hugeicons/hugeicons.dart';
+
+// --- Local Imports ---
+import 'package:mobile_pos/Screens/hrm/leave_request/leave_type/add_new_leave_type.dart';
+import 'package:mobile_pos/Screens/hrm/leave_request/leave_type/provider/leave_type_list_provider.dart';
+import 'package:mobile_pos/Screens/hrm/leave_request/leave_type/repo/leave_type_repo.dart';
+import 'package:mobile_pos/Screens/hrm/widgets/deleteing_alart_dialog.dart';
+import 'package:mobile_pos/Screens/hrm/widgets/global_search_appbar.dart';
+import 'package:mobile_pos/Screens/hrm/widgets/model_bottom_sheet.dart';
+import 'package:mobile_pos/constant.dart';
+
+import '../../../../service/check_user_role_permission_provider.dart';
+import '../../../../widgets/empty_widget/_empty_widget.dart';
+import 'model/leave_type_list_model.dart';
+
+class LeaveTypeList extends ConsumerStatefulWidget {
+  const LeaveTypeList({super.key});
+
+  @override
+  ConsumerState<LeaveTypeList> createState() => _LeaveTypeListState();
+}
+
+class _LeaveTypeListState extends ConsumerState<LeaveTypeList> {
+  bool _isSearch = false;
+  final _searchController = TextEditingController();
+  List<LeaveTypeData> _filteredLeaveTypes = [];
+
+  @override
+  void initState() {
+    super.initState();
+    _searchController.addListener(_onSearchChanged);
+  }
+
+  @override
+  void dispose() {
+    _searchController.removeListener(_onSearchChanged);
+    _searchController.dispose();
+    super.dispose();
+  }
+
+  // Method to refresh the list manually (for pull-to-refresh)
+  Future<void> _refreshList() async {
+    ref.invalidate(leaveTypeListProvider);
+    // Wait for the future provider to reload
+    await ref.read(leaveTypeListProvider.future);
+  }
+
+  void _onSearchChanged() {
+    setState(() {
+      // Trigger widget rebuild to run filter
+    });
+  }
+
+  void _filterLeaveTypes(List<LeaveTypeData> allTypes) {
+    final query = _searchController.text.toLowerCase().trim();
+    if (query.isEmpty) {
+      _filteredLeaveTypes = allTypes;
+    } else {
+      _filteredLeaveTypes = allTypes.where((type) {
+        final nameMatch = (type.name ?? '').toLowerCase().contains(query);
+        final descriptionMatch = (type.description ?? '').toLowerCase().contains(query);
+        final status = type.status == 1 ? 'active' : 'inactive';
+        final statusMatch = status.contains(query);
+
+        return nameMatch || descriptionMatch || statusMatch;
+      }).toList();
+    }
+  }
+
+  String _getStatusText(num? status) {
+    if (status == 1) return 'Active';
+    if (status == 0) return 'Inactive';
+    return 'N/A';
+  }
+
+  Color _getStatusColor(num? status) {
+    if (status == 1) return kSuccessColor;
+    if (status == 0) return Colors.red;
+    return kNeutral800;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final _theme = Theme.of(context);
+    final leaveListAsync = ref.watch(leaveTypeListProvider);
+    final permissionService = PermissionService(ref);
+
+    return Scaffold(
+      backgroundColor: kWhite,
+      appBar: GlobalSearchAppBar(
+        isSearch: _isSearch,
+        onSearchToggle: () => setState(() {
+          _isSearch = !_isSearch;
+          if (!_isSearch) _searchController.clear();
+        }),
+        title: 'Leave Type',
+        controller: _searchController,
+        onChanged: (query) {
+          // Handled by listener
+        },
+      ),
+      body: leaveListAsync.when(
+        loading: () => const Center(child: CircularProgressIndicator()),
+        error: (err, stack) => Center(
+          child: Text('Failed to load leave types: $err'),
+        ),
+        data: (model) {
+          if (!permissionService.hasPermission(Permit.leaveTypesRead.value)) {
+            return const Center(child: PermitDenyWidget());
+          }
+          final allTypes = model.data ?? [];
+          _filterLeaveTypes(allTypes);
+
+          if (_filteredLeaveTypes.isEmpty) {
+            return RefreshIndicator(
+              onRefresh: _refreshList,
+              child: Center(
+                child: SingleChildScrollView(
+                  physics: const AlwaysScrollableScrollPhysics(),
+                  child: Text(
+                    _searchController.text.isEmpty ? 'No leave types found.' : 'No results found for "${_searchController.text}".',
+                    style: _theme.textTheme.titleMedium,
+                  ),
+                ),
+              ),
+            );
+          }
+
+          return RefreshIndicator(
+            onRefresh: _refreshList,
+            child: ListView.separated(
+              padding: EdgeInsets.zero,
+              itemBuilder: (_, index) {
+                final leaveType = _filteredLeaveTypes[index];
+                return ListTile(
+                  onTap: () {
+                    viewModalSheet(
+                      context: context,
+                      item: {
+                        "Name": leaveType.name ?? 'N/A',
+                        "Status": _getStatusText(leaveType.status),
+                      },
+                      description: leaveType.description ?? 'N/A',
+                    );
+                  },
+                  contentPadding: const EdgeInsetsDirectional.symmetric(
+                    horizontal: 16,
+                    vertical: 0,
+                  ),
+                  visualDensity: const VisualDensity(horizontal: -4, vertical: -4),
+                  title: Row(
+                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                    children: [
+                      Flexible(
+                        child: Text(
+                          leaveType.name ?? 'n/a',
+                          style: _theme.textTheme.titleMedium?.copyWith(
+                            fontWeight: FontWeight.w500,
+                          ),
+                        ),
+                      ),
+                      _buildEditButton(context, leaveType),
+                    ],
+                  ),
+                  subtitle: Row(
+                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                    children: [
+                      Flexible(
+                          child: Text(
+                        leaveType.description ?? 'No description',
+                        style: _theme.textTheme.bodyMedium?.copyWith(
+                          color: kNeutral800,
+                        ),
+                        maxLines: 1,
+                        overflow: TextOverflow.ellipsis,
+                      )),
+                      _buildDeleteButton(context, ref, leaveType),
+                    ],
+                  ),
+                );
+              },
+              separatorBuilder: (_, __) => const Divider(
+                color: kBackgroundColor,
+                height: 2,
+              ),
+              itemCount: _filteredLeaveTypes.length,
+            ),
+          );
+        },
+      ),
+      bottomNavigationBar: permissionService.hasPermission(Permit.leaveTypesCreate.value)
+          ? Padding(
+              padding: const EdgeInsets.all(16),
+              child: ElevatedButton.icon(
+                onPressed: () {
+                  Navigator.push(context, MaterialPageRoute(builder: (context) => const AddNewLeaveType()));
+                },
+                label: const Text('Add Leave Type'),
+                icon: const Icon(
+                  Icons.add,
+                  color: Colors.white,
+                ),
+              ),
+            )
+          : null,
+    );
+  }
+
+  Widget _buildEditButton(BuildContext context, LeaveTypeData leaveType) {
+    final permissionService = PermissionService(ref);
+    return IconButton(
+      style: const ButtonStyle(
+        padding: WidgetStatePropertyAll(
+          EdgeInsets.all(0),
+        ),
+      ),
+      padding: EdgeInsets.zero,
+      visualDensity: const VisualDensity(
+        horizontal: -4,
+        vertical: -4,
+      ),
+      onPressed: () {
+        if (!permissionService.hasPermission(Permit.leaveTypesUpdate.value)) {
+          ScaffoldMessenger.of(context).showSnackBar(
+            SnackBar(
+              backgroundColor: Colors.red,
+              content: Text("You do not have permission to update Leave Type."),
+            ),
+          );
+          return;
+        }
+        Navigator.push(
+          context,
+          MaterialPageRoute(
+            // Pass data for editing
+            builder: (context) => AddNewLeaveType(leaveTypeData: leaveType),
+          ),
+        );
+      },
+      icon: const HugeIcon(
+        icon: HugeIcons.strokeRoundedPencilEdit02,
+        color: kSuccessColor,
+        size: 20,
+      ),
+    );
+  }
+
+  Widget _buildDeleteButton(BuildContext context, WidgetRef ref, LeaveTypeData leaveType) {
+    return IconButton(
+      padding: EdgeInsets.zero,
+      style: const ButtonStyle(
+        padding: WidgetStatePropertyAll(
+          EdgeInsets.all(0),
+        ),
+      ),
+      visualDensity: const VisualDensity(
+        horizontal: -4,
+        vertical: -4,
+      ),
+      onPressed: () {
+        if (leaveType.id != null) {
+          _showDeleteConfirmationDialog(context, ref, leaveType.id!, leaveType.name ?? 'this leave type');
+        }
+      },
+      icon: const HugeIcon(
+        icon: HugeIcons.strokeRoundedDelete03,
+        color: Colors.red,
+        size: 20,
+      ),
+    );
+  }
+
+  void _showDeleteConfirmationDialog(BuildContext context, WidgetRef ref, num id, String name) async {
+    final permissionService = PermissionService(ref);
+    if (!permissionService.hasPermission(Permit.leaveTypesDelete.value)) {
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(
+          backgroundColor: Colors.red,
+          content: Text("You do not have permission to delete Leave Type."),
+        ),
+      );
+      return;
+    }
+    bool result = await showDeleteConfirmationDialog(
+      context: context,
+      itemName: 'Leave Type',
+    );
+
+    if (result) {
+      final repo = LeaveTypeRepo();
+      await repo.deleteLeaveType(id: id, context: context, ref: ref);
+    }
+  }
+}

lib/Screens/hrm/leave_request/leave_type/model/leave_type_list_model.dart

@@ -0,0 +1,71 @@
+// File: leave_type_model.dart
+
+class LeaveTypeListModel {
+  LeaveTypeListModel({
+    this.message,
+    this.data,
+  });
+
+  LeaveTypeListModel.fromJson(dynamic json) {
+    message = json['message'];
+    if (json['data'] != null) {
+      data = [];
+      json['data'].forEach((v) {
+        data?.add(LeaveTypeData.fromJson(v));
+      });
+    }
+  }
+  String? message;
+  List<LeaveTypeData>? data;
+
+  Map<String, dynamic> toJson() {
+    final map = <String, dynamic>{};
+    map['message'] = message;
+    if (data != null) {
+      map['data'] = data?.map((v) => v.toJson()).toList();
+    }
+    return map;
+  }
+}
+
+class LeaveTypeData {
+  LeaveTypeData({
+    this.id,
+    this.businessId,
+    this.name,
+    this.description,
+    this.status,
+    this.createdAt,
+    this.updatedAt,
+  });
+
+  LeaveTypeData.fromJson(dynamic json) {
+    id = json['id'];
+    businessId = json['business_id'];
+    name = json['name'];
+    description = json['description'];
+    // Assuming status 1 means 'Active' and 0 means 'Inactive' in the UI
+    status = json['status'];
+    createdAt = json['created_at'];
+    updatedAt = json['updated_at'];
+  }
+  num? id;
+  num? businessId;
+  String? name;
+  String? description;
+  num? status; // status is a number (1 or 0)
+  String? createdAt;
+  String? updatedAt;
+
+  Map<String, dynamic> toJson() {
+    final map = <String, dynamic>{};
+    map['id'] = id;
+    map['business_id'] = businessId;
+    map['name'] = name;
+    map['description'] = description;
+    map['status'] = status;
+    map['created_at'] = createdAt;
+    map['updated_at'] = updatedAt;
+    return map;
+  }
+}

lib/Screens/hrm/leave_request/leave_type/provider/leave_type_list_provider.dart

@@ -0,0 +1,9 @@
+// File: leave_type_provider.dart
+
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+
+import '../model/leave_type_list_model.dart';
+import '../repo/leave_type_repo.dart';
+
+final repo = LeaveTypeRepo();
+final leaveTypeListProvider = FutureProvider<LeaveTypeListModel>((ref) => repo.fetchAllLeaveTypes());

lib/Screens/hrm/leave_request/leave_type/repo/leave_type_repo.dart

@@ -0,0 +1,166 @@
+// File: leave_type_repo.dart
+
+import 'dart:convert';
+import 'package:flutter/material.dart';
+import 'package:flutter_easyloading/flutter_easyloading.dart';
+import 'package:http/http.dart' as http;
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+
+// --- Local Imports ---
+import '../../../../../Const/api_config.dart';
+import '../../../../../http_client/custome_http_client.dart';
+import '../../../../../http_client/customer_http_client_get.dart';
+import '../model/leave_type_list_model.dart';
+import '../provider/leave_type_list_provider.dart';
+
+class LeaveTypeRepo {
+  static const String _endpoint = '/leave-types';
+
+  ///---------------- FETCH ALL LEAVE TYPES ----------------///
+  Future<LeaveTypeListModel> fetchAllLeaveTypes() async {
+    CustomHttpClientGet clientGet = CustomHttpClientGet(client: http.Client());
+    final uri = Uri.parse('${APIConfig.url}$_endpoint');
+
+    final response = await clientGet.get(url: uri);
+
+    if (response.statusCode == 200) {
+      final parsedData = jsonDecode(response.body);
+      return LeaveTypeListModel.fromJson(parsedData);
+    } else {
+      throw Exception('Failed to fetch leave types list. Status: ${response.statusCode}');
+    }
+  }
+
+  ///---------------- CREATE LEAVE TYPE ----------------///
+  Future<void> createLeaveType({
+    required WidgetRef ref,
+    required BuildContext context,
+    required String name,
+    required String description,
+    required num status, // 1 for Active, 0 for Inactive
+  }) async {
+    final uri = Uri.parse('${APIConfig.url}$_endpoint');
+
+    final requestBody = jsonEncode({
+      'name': name,
+      'description': description,
+      'status': status,
+    });
+
+    try {
+      EasyLoading.show(status: 'Creating...');
+      CustomHttpClient customHttpClient = CustomHttpClient(client: http.Client(), context: context, ref: ref);
+
+      var responseData = await customHttpClient.post(
+        url: uri,
+        addContentTypeInHeader: true,
+        body: requestBody,
+      );
+
+      final parsedData = jsonDecode(responseData.body);
+      EasyLoading.dismiss();
+
+      if (responseData.statusCode == 200 || responseData.statusCode == 201) {
+        ref.refresh(leaveTypeListProvider);
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text(parsedData['message'] ?? 'Leave Type created successfully')),
+        );
+        Navigator.pop(context);
+      } else {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text('Creation failed: ${parsedData['message'] ?? 'Unknown error'}')),
+        );
+      }
+    } catch (error) {
+      EasyLoading.dismiss();
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text('An error occurred: $error')),
+      );
+    }
+  }
+
+  ///---------------- UPDATE LEAVE TYPE ----------------///
+  Future<void> updateLeaveType({
+    required WidgetRef ref,
+    required BuildContext context,
+    required num id,
+    required String name,
+    required String description,
+    required num status,
+  }) async {
+    final uri = Uri.parse('${APIConfig.url}$_endpoint/$id');
+
+    final requestBody = jsonEncode({
+      '_method': 'put',
+      'name': name,
+      'description': description,
+      'status': status,
+    });
+
+    try {
+      EasyLoading.show(status: 'Updating...');
+      CustomHttpClient customHttpClient = CustomHttpClient(client: http.Client(), context: context, ref: ref);
+
+      var responseData = await customHttpClient.post(
+        url: uri,
+        addContentTypeInHeader: true,
+        body: requestBody,
+      );
+
+      final parsedData = jsonDecode(responseData.body);
+      EasyLoading.dismiss();
+
+      if (responseData.statusCode == 200) {
+        ref.refresh(leaveTypeListProvider);
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text(parsedData['message'] ?? 'Leave Type updated successfully')),
+        );
+        Navigator.pop(context);
+      } else {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text('Update failed: ${parsedData['message'] ?? 'Unknown error'}')),
+        );
+      }
+    } catch (error) {
+      EasyLoading.dismiss();
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text('An error occurred: $error')),
+      );
+    }
+  }
+
+  ///---------------- DELETE LEAVE TYPE ----------------///
+  Future<bool> deleteLeaveType({
+    required num id,
+    required BuildContext context,
+    required WidgetRef ref,
+  }) async {
+    try {
+      EasyLoading.show(status: 'Deleting...');
+      final url = Uri.parse('${APIConfig.url}$_endpoint/$id');
+      CustomHttpClient customHttpClient = CustomHttpClient(ref: ref, context: context, client: http.Client());
+      final response = await customHttpClient.delete(url: url);
+
+      EasyLoading.dismiss();
+      if (response.statusCode == 200) {
+        ref.refresh(leaveTypeListProvider);
+        ScaffoldMessenger.of(context).showSnackBar(
+          const SnackBar(content: Text('Leave Type deleted successfully')),
+        );
+        return true;
+      } else {
+        final parsedData = jsonDecode(response.body);
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text('Deletion failed: ${parsedData['message'] ?? 'Unknown error'}')),
+        );
+        return false;
+      }
+    } catch (error) {
+      EasyLoading.dismiss();
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text('An error occurred during deletion: $error')),
+      );
+      return false;
+    }
+  }
+}

lib/Screens/hrm/payroll/Model/payroll_lsit_model.dart

@@ -0,0 +1,100 @@
+// File: payroll_list_model.dart
+
+import '../../../../widgets/multipal payment mathods/model/payment_transaction_model.dart';
+
+class PayrollListModel {
+  PayrollListModel({
+    this.message,
+    this.data,
+  });
+
+  PayrollListModel.fromJson(dynamic json) {
+    message = json['message'];
+    if (json['data'] != null) {
+      data = [];
+      json['data'].forEach((v) {
+        data?.add(PayrollData.fromJson(v));
+      });
+    }
+  }
+  String? message;
+  List<PayrollData>? data;
+}
+
+class PayrollData {
+  PayrollData({
+    this.id,
+    this.businessId,
+    this.branchId,
+    this.employeeId,
+    this.paymentTypeId,
+    this.month,
+    this.puid,
+    this.date,
+    this.amount,
+    this.payemntYear,
+    this.note,
+    this.createdAt,
+    this.updatedAt,
+    this.employee,
+    this.transactions,
+    this.branch,
+  });
+
+  PayrollData.fromJson(dynamic json) {
+    id = json['id'];
+    businessId = json['business_id'];
+    branchId = json['branch_id'];
+    employeeId = json['employee_id'];
+    paymentTypeId = json['payment_type_id'];
+    month = json['month'];
+    puid = json['puid'];
+    date = json['date'];
+    amount = json['amount'];
+    payemntYear = json['payemnt_year'];
+    note = json['note'];
+    createdAt = json['created_at'];
+    updatedAt = json['updated_at'];
+    employee = json['employee'] != null ? Employee.fromJson(json['employee']) : null;
+    if (json['transactions'] != null) {
+      transactions = [];
+      json['transactions'].forEach((v) {
+        transactions?.add(PaymentsTransaction.fromJson(v));
+      });
+    }
+    branch = json['branch'];
+  }
+  num? id;
+  num? businessId;
+  dynamic branchId;
+  num? employeeId;
+  num? paymentTypeId;
+  String? month;
+  String? puid;
+  String? date;
+  num? amount;
+  String? payemntYear;
+  String? note;
+  String? createdAt;
+  String? updatedAt;
+  Employee? employee;
+  List<PaymentsTransaction>? transactions;
+  dynamic branch;
+}
+
+
+// Reusing Employee model from previous section (assuming it's available)
+class Employee {
+  Employee({this.id, this.name});
+  Employee.fromJson(dynamic json) {
+    id = json['id'];
+    name = json['name'];
+  }
+  num? id;
+  String? name;
+}
+
+// Placeholder for list consumption
+class PaymentTypeData extends PaymentType {
+  PaymentTypeData.fromJson(dynamic json) : super.fromJson(json);
+}

lib/Screens/hrm/payroll/add_new_payroll.dart

@@ -0,0 +1,383 @@
+// File: add_new_payroll.dart
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:iconly/iconly.dart';
+import 'package:intl/intl.dart';
+import 'package:mobile_pos/widgets/multipal%20payment%20mathods/multi_payment_widget.dart';
+import 'package:mobile_pos/generated/l10n.dart' as lang;
+// --- Local Imports ---
+import '../../../constant.dart';
+
+// --- Data Layer Imports ---
+import 'package:mobile_pos/Screens/hrm/payroll/repo/payroll_repo.dart';
+import 'package:mobile_pos/Screens/hrm/employee/model/employee_list_model.dart';
+import 'package:mobile_pos/Screens/hrm/employee/provider/emplpyee_list_provider.dart';
+import 'Model/payroll_lsit_model.dart';
+
+class AddNewPayroll extends ConsumerStatefulWidget {
+  final PayrollData? payrollData;
+
+  const AddNewPayroll({super.key, this.payrollData});
+
+  @override
+  ConsumerState<AddNewPayroll> createState() => _AddNewPayrollState();
+}
+
+class _AddNewPayrollState extends ConsumerState<AddNewPayroll> {
+  // --- Form Controllers ---
+  final GlobalKey<FormState> _key = GlobalKey();
+  final GlobalKey<MultiPaymentWidgetState> _paymentKey = GlobalKey<MultiPaymentWidgetState>();
+  final dateController = TextEditingController();
+  final amountController = TextEditingController();
+  final noteController = TextEditingController();
+
+  // --- Selected Values (API payload) ---
+  EmployeeData? _selectedEmployee;
+  String? _selectedYear;
+  String? _selectedMonth;
+  DateTime? _selectedDate;
+
+  // --- UI/API Helpers ---
+  final DateFormat _displayDateFormat = DateFormat('dd/MM/yyyy');
+  final DateFormat _apiFormat = DateFormat('yyyy-MM-dd');
+  final List<String> _months = [
+    'January',
+    'February',
+    'March',
+    'April',
+    'May',
+    'June',
+    'July',
+    'August',
+    'September',
+    'October',
+    'November',
+    'December'
+  ];
+
+  bool get isEditing => widget.payrollData != null;
+
+  @override
+  void initState() {
+    super.initState();
+    if (isEditing) {
+      final data = widget.payrollData!;
+      amountController.text = data.amount?.toString() ?? '';
+      noteController.text = data.note ?? '';
+      _selectedYear = data.payemntYear;
+      _selectedMonth = data.month != null ? data.month![0].toUpperCase() + data.month!.substring(1) : null;
+
+      try {
+        if (data.date != null) {
+          _selectedDate = DateTime.parse(data.date!);
+          dateController.text = _displayDateFormat.format(_selectedDate!);
+        }
+      } catch (e) {
+        debugPrint('Error parsing date for editing: $e');
+      }
+    }
+  }
+
+  @override
+  void dispose() {
+    dateController.dispose();
+    amountController.dispose();
+    noteController.dispose();
+    super.dispose();
+  }
+
+  // --- Year Generation Logic ---
+  List<String> _getYearOptions() {
+    final currentYear = DateTime.now().year;
+    List<String> years = [];
+    for (int i = 0; i <= 5; i++) {
+      years.add((currentYear - i).toString());
+    }
+    years.insert(0, (currentYear + 1).toString());
+    return years.toSet().toList().reversed.toList();
+  }
+
+  // --- Date Picker Logic ---
+  Future<void> _selectDate(BuildContext context) async {
+    final DateTime? picked = await showDatePicker(
+      initialDate: _selectedDate ?? DateTime.now(),
+      firstDate: DateTime(2015, 1),
+      lastDate: DateTime(2101),
+      context: context,
+    );
+    setState(() {
+      if (picked != null) {
+        _selectedDate = picked;
+        dateController.text = _displayDateFormat.format(picked);
+      }
+    });
+  }
+
+  // --- Submission Logic ---
+  void _submit() async {
+    if (_key.currentState!.validate() && _selectedEmployee != null && _selectedDate != null) {
+      // Get Payments from the MultiPaymentWidget
+      List<PaymentEntry> payments = _paymentKey.currentState?.getPaymentEntries() ?? [];
+
+      // Validation: Ensure payments are added
+      if (payments.isEmpty) {
+        ScaffoldMessenger.of(context).showSnackBar(const SnackBar(content: Text('Please add a payment method')));
+        return;
+      }
+
+      final repo = PayrollRepo();
+
+      // Convert payments to JSON list for API
+      final paymentListJson = payments.map((e) => e.toJson()).toList();
+
+      final payload = {
+        'employee_id': _selectedEmployee!.id!,
+        'month': _selectedMonth!.toLowerCase(),
+        'date': _apiFormat.format(_selectedDate!),
+        'amount': amountController.text,
+        'payemnt_year': _selectedYear!,
+        'note': noteController.text,
+        'payments': paymentListJson,
+      };
+
+      if (isEditing) {
+        await repo.updatePayroll(
+          ref: ref,
+          context: context,
+          id: widget.payrollData!.id!,
+          employeeId: payload['employee_id'] as num,
+          month: payload['month'] as String,
+          date: payload['date'] as String,
+          amount: payload['amount'] as String,
+          paymentYear: payload['payemnt_year'] as String,
+          note: payload['note'] as String?,
+          payments: paymentListJson,
+        );
+      } else {
+        await repo.createPayroll(
+          ref: ref,
+          context: context,
+          employeeId: payload['employee_id'] as num,
+          month: payload['month'] as String,
+          date: payload['date'] as String,
+          amount: payload['amount'] as String,
+          paymentYear: payload['payemnt_year'] as String,
+          note: payload['note'] as String?,
+          payments: paymentListJson,
+        );
+      }
+    }
+  }
+
+  void _resetForm() {
+    if (!isEditing) {
+      setState(() {
+        _key.currentState?.reset();
+        dateController.clear();
+        amountController.clear();
+        noteController.clear();
+        _selectedEmployee = null;
+        _selectedYear = null;
+        _selectedMonth = null;
+        _selectedDate = null;
+        // _paymentKey state resets automatically on rebuild or you can clear manually if needed
+      });
+    } else {
+      Navigator.pop(context);
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    // Watch required providers
+    final employeesAsync = ref.watch(employeeListProvider);
+    final _lang = lang.S.of(context);
+
+    return Scaffold(
+      backgroundColor: kWhite,
+      appBar: AppBar(
+        centerTitle: true,
+        title: Text(isEditing ? _lang.editPayroll : _lang.addNewPayroll),
+        bottom: const PreferredSize(
+          preferredSize: Size.fromHeight(1),
+          child: Divider(height: 2, color: kBackgroundColor),
+        ),
+      ),
+      body: employeesAsync.when(
+        loading: () => const Center(child: CircularProgressIndicator()),
+        error: (err, stack) => Center(child: Text('Error loading employees: $err')),
+        data: (employeeModel) {
+          final employees = employeeModel.employees ?? [];
+
+          if (isEditing) {
+            final data = widget.payrollData!;
+            _selectedEmployee = employees.firstWhere(
+              (e) => e.id == data.employeeId,
+              orElse: () => _selectedEmployee ?? employees.first,
+            );
+            amountController.text = _selectedEmployee?.amount.toString() ?? '';
+          }
+
+          return SingleChildScrollView(
+            padding: const EdgeInsets.all(16),
+            child: Form(
+              key: _key,
+              child: Column(
+                children: [
+                  // 1. Employee Dropdown
+                  _buildEmployeeDropdown(employees),
+                  const SizedBox(height: 20),
+
+                  // 2. Payment Year Dropdown
+                  _buildYearDropdown(),
+                  const SizedBox(height: 20),
+
+                  // 3. Month & Date
+                  Row(
+                    children: [
+                      Expanded(child: _buildMonthDropdown()),
+                      const SizedBox(width: 16),
+                      Expanded(child: _buildDateInput()),
+                    ],
+                  ),
+                  const SizedBox(height: 20),
+
+                  // 4. Amount Field (Read Only - Based on Employee)
+                  _buildAmountInput(),
+                  const SizedBox(height: 20),
+
+                  // 5. Payment Methods
+                  MultiPaymentWidget(
+                    key: _paymentKey,
+                    hideAddButton: true,
+                    disableDropdown: widget.payrollData != null,
+                    showWalletOption: false,
+                    showChequeOption: false,
+                    totalAmountController: amountController,
+                    initialTransactions: widget.payrollData?.transactions, // <--- Passing data for Edit
+                  ),
+                  const SizedBox(height: 20),
+
+                  // 6. Note
+                  _buildNoteInput(),
+                  const SizedBox(height: 20),
+
+                  // 7. Action Buttons
+                  Row(
+                    children: [
+                      Expanded(
+                          child: OutlinedButton(
+                              onPressed: _resetForm, child: Text(isEditing ? _lang.cancel : _lang.resets))),
+                      const SizedBox(width: 16),
+                      Expanded(
+                          child:
+                              ElevatedButton(onPressed: _submit, child: Text(isEditing ? _lang.update : _lang.save))),
+                    ],
+                  ),
+                ],
+              ),
+            ),
+          );
+        },
+      ),
+    );
+  }
+
+  // --- Widget Builder Helpers ---
+
+  Widget _buildEmployeeDropdown(List<EmployeeData> employees) {
+    return DropdownButtonFormField<EmployeeData>(
+      value: _selectedEmployee,
+      icon: const Icon(Icons.keyboard_arrow_down, color: kNeutral800),
+      decoration: InputDecoration(labelText: lang.S.of(context).employee, hintText: lang.S.of(context).selectOne),
+      validator: (value) => value == null ? lang.S.of(context).pleaseSelectAnEmployee : null,
+      items: employees.map((entry) {
+        return DropdownMenuItem<EmployeeData>(
+          value: entry,
+          child: Text(entry.name ?? 'N/A'),
+        );
+      }).toList(),
+      onChanged: (EmployeeData? value) {
+        setState(() {
+          _selectedEmployee = value;
+          amountController.text = _selectedEmployee?.amount.toString() ?? '0';
+        });
+      },
+    );
+  }
+
+  Widget _buildYearDropdown() {
+    return DropdownButtonFormField<String>(
+      value: _selectedYear,
+      icon: const Icon(Icons.keyboard_arrow_down, color: kNeutral800),
+      decoration: InputDecoration(labelText: lang.S.of(context).paymentYear, hintText: lang.S.of(context).selectOne),
+      validator: (value) => value == null ? lang.S.of(context).pleaseSelectPaymentYear : null,
+      items: _getYearOptions().map((entry) {
+        return DropdownMenuItem(value: entry, child: Text(entry));
+      }).toList(),
+      onChanged: (String? value) {
+        setState(() => _selectedYear = value);
+      },
+    );
+  }
+
+  Widget _buildMonthDropdown() {
+    return DropdownButtonFormField<String>(
+      value: _selectedMonth,
+      icon: const Icon(Icons.keyboard_arrow_down, color: kNeutral800),
+      decoration: InputDecoration(labelText: lang.S.of(context).month, hintText: lang.S.of(context).selectOne),
+      validator: (value) => value == null ? lang.S.of(context).pleaseSelectAnMonth : null,
+      items: _months.map((entry) {
+        return DropdownMenuItem(value: entry, child: Text(entry));
+      }).toList(),
+      onChanged: (String? value) {
+        setState(() => _selectedMonth = value);
+      },
+    );
+  }
+
+  Widget _buildDateInput() {
+    return TextFormField(
+      keyboardType: TextInputType.name,
+      readOnly: true,
+      controller: dateController,
+      decoration: InputDecoration(
+        labelText: lang.S.of(context).month,
+        hintText: 'DD/MM/YYYY',
+        border: const OutlineInputBorder(),
+        suffixIcon: IconButton(
+          padding: EdgeInsets.zero,
+          visualDensity: const VisualDensity(horizontal: -4, vertical: -4),
+          onPressed: () => _selectDate(context),
+          icon: const Icon(IconlyLight.calendar, size: 22),
+        ),
+      ),
+      validator: (value) => value!.isEmpty ? lang.S.of(context).pleaseEnterADate : null,
+    );
+  }
+
+  Widget _buildAmountInput() {
+    return TextFormField(
+      readOnly: true,
+      controller: amountController,
+      keyboardType: TextInputType.number,
+      decoration: InputDecoration(
+        labelText: lang.S.of(context).totalSalaryAmount,
+        hintText: lang.S.of(context).selectEmployeeFirst,
+        border: OutlineInputBorder(),
+      ),
+    );
+  }
+
+  Widget _buildNoteInput() {
+    return TextFormField(
+      controller: noteController,
+      maxLines: 2,
+      decoration: InputDecoration(
+        labelText: lang.S.of(context).note,
+        hintText: lang.S.of(context).enterNote,
+        border: OutlineInputBorder(),
+      ),
+    );
+  }
+}

lib/Screens/hrm/payroll/payroll_list.dart

@@ -0,0 +1,436 @@
+// File: payroll_screen.dart
+
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:hugeicons/hugeicons.dart';
+import 'package:mobile_pos/currency.dart';
+
+// --- Local Imports ---
+import 'package:mobile_pos/Screens/hrm/payroll/add_new_payroll.dart';
+import 'package:mobile_pos/Screens/hrm/widgets/filter_dropdown.dart';
+import 'package:mobile_pos/Screens/hrm/widgets/model_bottom_sheet.dart';
+import 'package:mobile_pos/constant.dart';
+import 'package:mobile_pos/generated/l10n.dart' as lang;
+import '../../../service/check_user_role_permission_provider.dart';
+import '../../../widgets/empty_widget/_empty_widget.dart';
+import '../widgets/deleteing_alart_dialog.dart';
+
+// --- Data Layer Imports ---
+import 'package:mobile_pos/Screens/hrm/payroll/repo/payroll_repo.dart';
+import 'package:mobile_pos/Screens/hrm/payroll/provider/payroll_provider.dart';
+import 'package:mobile_pos/Screens/hrm/employee/provider/emplpyee_list_provider.dart';
+import 'package:mobile_pos/Screens/hrm/employee/model/employee_list_model.dart';
+
+import 'Model/payroll_lsit_model.dart';
+
+class PayrollScreen extends ConsumerStatefulWidget {
+  const PayrollScreen({super.key});
+
+  @override
+  ConsumerState<PayrollScreen> createState() => _PayrollScreenState();
+}
+
+class _PayrollScreenState extends ConsumerState<PayrollScreen> {
+  // --- Filter State ---
+  String? _selectedEmployeeFilter;
+  String? _selectedMonthFilter;
+
+  List<PayrollData> _filteredList = [];
+
+  final List<String> _monthFilters = [
+    'All Month',
+    'January',
+    'February',
+    'March',
+    'April',
+    'May',
+    'June',
+    'July',
+    'August',
+    'September',
+    'October',
+    'November',
+    'December'
+  ];
+
+  @override
+  void initState() {
+    super.initState();
+    _selectedEmployeeFilter = 'All Employee';
+    _selectedMonthFilter = 'All Month';
+  }
+
+  void _applyFilters() {
+    setState(() {}); // Trigger rebuild to apply filters
+  }
+
+  void _filterPayrolls(List<PayrollData> allPayrolls) {
+    _filteredList = allPayrolls.where((payroll) {
+      final employeeName = (payroll.employee?.name ?? '').toLowerCase();
+      final month = (payroll.month ?? '').toLowerCase();
+
+      // 1. Employee Filter
+      final employeeMatches =
+          _selectedEmployeeFilter == 'All Employee' || employeeName == _selectedEmployeeFilter!.toLowerCase();
+
+      // 2. Month Filter
+      final monthMatches = _selectedMonthFilter == 'All Month' || month == _selectedMonthFilter!.toLowerCase();
+
+      return employeeMatches && monthMatches;
+    }).toList();
+  }
+
+  Color _getStatusColor(String? status) {
+    if (status?.toLowerCase() == 'paid') return kSuccessColor;
+    return Colors.orange; // Defaulting any other status to orange/pending
+  }
+
+  Future<void> _refreshData() async {
+    ref.invalidate(payrollListProvider);
+    return ref.watch(payrollListProvider.future);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final _lang = lang.S.of(context);
+    final theme = Theme.of(context);
+    final payrollsAsync = ref.watch(payrollListProvider);
+    final employeesAsync = ref.watch(employeeListProvider);
+    final permissionService = PermissionService(ref);
+
+    final combinedAsync = payrollsAsync.asData != null && employeesAsync.asData != null
+        ? AsyncValue.data(true)
+        : payrollsAsync.hasError || employeesAsync.hasError
+            ? AsyncValue.error(payrollsAsync.error ?? employeesAsync.error!, StackTrace.current)
+            : const AsyncValue.loading();
+
+    return Scaffold(
+      backgroundColor: Colors.white,
+      appBar: AppBar(
+        centerTitle: true,
+        title: Text(_lang.payrollList),
+        bottom: PreferredSize(
+            preferredSize: const Size.fromHeight(65),
+            child: Column(
+              children: [
+                const Divider(thickness: 1.5, color: kBackgroundColor, height: 1),
+                Padding(
+                  padding: const EdgeInsets.fromLTRB(16, 10, 16, 13),
+                  child: Row(
+                    children: [
+                      // Employee Filter Dropdown
+                      Expanded(
+                        flex: 6,
+                        child: FilterDropdownButton<String>(
+                          value: _selectedEmployeeFilter,
+                          items: [
+                            DropdownMenuItem(value: 'All Employee', child: Text(_lang.allEmployee)),
+                            ...(employeesAsync.value?.employees ?? [])
+                                .map((e) => DropdownMenuItem(value: e.name, child: Text(e.name ?? 'n/a')))
+                                .toList(),
+                          ]
+                              .map((item) => item.value != null
+                                  ? DropdownMenuItem(
+                                      value: item.value,
+                                      child: Text(item.value!,
+                                          style: theme.textTheme.bodyLarge?.copyWith(color: kNeutral800),
+                                          maxLines: 1,
+                                          overflow: TextOverflow.ellipsis),
+                                    )
+                                  : item)
+                              .toList(),
+                          onChanged: (String? value) {
+                            setState(() {
+                              _selectedEmployeeFilter = value;
+                              _applyFilters();
+                            });
+                          },
+                        ),
+                      ),
+                      const SizedBox(width: 10),
+                      // Month Filter Dropdown
+                      Expanded(
+                        flex: 4,
+                        child: FilterDropdownButton<String>(
+                          buttonDecoration: BoxDecoration(
+                            color: kBackgroundColor,
+                            borderRadius: BorderRadius.circular(5),
+                            border: Border.all(color: kBorderColor),
+                          ),
+                          value: _selectedMonthFilter,
+                          items: _monthFilters.map((entry) {
+                            return DropdownMenuItem(
+                              value: entry,
+                              child: Text(entry,
+                                  style: theme.textTheme.bodyLarge?.copyWith(color: kNeutral800),
+                                  maxLines: 1,
+                                  overflow: TextOverflow.ellipsis),
+                            );
+                          }).toList(),
+                          onChanged: (String? value) {
+                            setState(() {
+                              _selectedMonthFilter = value;
+                              _applyFilters();
+                            });
+                          },
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
+                const Divider(thickness: 1.5, color: kBackgroundColor, height: 1),
+              ],
+            )),
+      ),
+      body: combinedAsync.when(
+        loading: () => const Center(child: CircularProgressIndicator()),
+        error: (err, stack) => Center(child: Text('Error: Failed to load data.')),
+        data: (_) {
+          if (!permissionService.hasPermission(Permit.payrollsRead.value)) {
+            return const Center(child: PermitDenyWidget());
+          }
+          _filterPayrolls(payrollsAsync.value?.data ?? []);
+
+          if (_filteredList.isEmpty) {
+            return RefreshIndicator(
+              onRefresh: _refreshData,
+              child: Center(
+                  child: SingleChildScrollView(
+                      physics: AlwaysScrollableScrollPhysics(), child: Text(lang.S.of(context).noPayrollFound))),
+            );
+          }
+
+          return RefreshIndicator(
+            onRefresh: _refreshData,
+            child: ListView.separated(
+              padding: EdgeInsets.zero,
+              itemCount: _filteredList.length,
+              separatorBuilder: (_, __) => const Divider(color: kBackgroundColor, height: 1.5),
+              itemBuilder: (_, index) => _buildPayrollItem(
+                context: context,
+                ref: ref,
+                payroll: _filteredList[index],
+              ),
+            ),
+          );
+        },
+      ),
+      bottomNavigationBar: permissionService.hasPermission(Permit.payrollsCreate.value)
+          ? Padding(
+              padding: const EdgeInsets.all(16),
+              child: ElevatedButton.icon(
+                onPressed: () => Navigator.push(
+                  context,
+                  MaterialPageRoute(builder: (context) => const AddNewPayroll()),
+                ),
+                icon: const Icon(Icons.add, color: Colors.white),
+                label: Text(_lang.addNewPayroll),
+              ),
+            )
+          : null,
+    );
+  }
+
+  // --- List Item Builder ---
+
+  Widget _buildPayrollItem({
+    required BuildContext context,
+    required WidgetRef ref,
+    required PayrollData payroll,
+  }) {
+    final theme = Theme.of(context);
+    final status = payroll.amount != null ? lang.S.of(context).paid : lang.S.of(context).unPaid;
+    final statusColor = _getStatusColor(status);
+
+    // Logic to prepare Detail String for transactions
+    String paymentDetails = "";
+    if (payroll.transactions != null && payroll.transactions!.isNotEmpty) {
+      // Create a list of strings like "Cash: 500", "Bank: 200"
+      List<String> details = payroll.transactions!.map((t) {
+        return (t.transactionType == 'cash_payment') ? 'Cash' : (t.paymentType?.name ?? 'Unknown');
+      }).toList();
+      paymentDetails = details.join('\n');
+    } else {
+      // Fallback for old data or no transactions
+      paymentDetails = "N/A";
+    }
+
+    // Logic for Summary text in the List view
+    String paymentSummary = "N/A";
+    if (payroll.transactions != null && payroll.transactions!.isNotEmpty) {
+      paymentSummary = (payroll.transactions!.first.transactionType == 'cash_payment')
+          ? 'Cash'
+          : (payroll.transactions!.first.paymentType?.name ?? 'Unknown');
+      if (payroll.transactions!.length > 1) {
+        paymentSummary += " +${payroll.transactions!.length - 1}";
+      }
+    }
+
+    return InkWell(
+      onTap: () => viewModalSheet(
+        context: context,
+        item: {
+          lang.S.of(context).employee: payroll.employee?.name ?? 'N/A',
+          lang.S.of(context).paymentYear: payroll.payemntYear ?? 'N/A',
+          lang.S.of(context).month: payroll.month ?? 'N/A',
+          lang.S.of(context).date: payroll.date ?? 'N/A',
+          lang.S.of(context).amount: '$currency${payroll.amount?.toStringAsFixed(2) ?? '0.00'}',
+          lang.S.of(context).paymentDetails: paymentDetails, // Showing Full Details Here
+        },
+        descriptionTitle: '${lang.S.of(context).paymentDetails} : ',
+        description: payroll.note ?? 'N/A',
+      ),
+      child: Padding(
+        padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 13.5),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Row(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: [
+                Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Text(
+                      payroll.employee?.name ?? 'N/A Employee',
+                      style: theme.textTheme.titleMedium?.copyWith(
+                        fontWeight: FontWeight.w600,
+                      ),
+                    ),
+                    const SizedBox(height: 8),
+                    Text(
+                      payroll.date ?? 'N/A Date',
+                      style: theme.textTheme.bodyMedium?.copyWith(color: kNeutral800),
+                    ),
+                  ],
+                ),
+                _buildActionButtons(context, ref, payroll),
+              ],
+            ),
+            const SizedBox(height: 16),
+            Row(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: [
+                _buildTimeColumn(
+                  time: '$currency${payroll.amount?.toStringAsFixed(2) ?? '0.00'}',
+                  label: lang.S.of(context).amount,
+                  theme: theme,
+                ),
+                _buildTimeColumn(
+                  time: paymentSummary, // Showing Summary Here
+                  label: lang.S.of(context).payment,
+                  theme: theme,
+                ),
+                _buildTimeColumn(
+                  time: status,
+                  label: lang.S.of(context).status,
+                  titleColor: statusColor,
+                  theme: theme,
+                ),
+              ],
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildTimeColumn({
+    required String time,
+    required String label,
+    required ThemeData theme,
+    Color? titleColor,
+  }) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.center,
+      children: [
+        Text(
+          time,
+          style: theme.textTheme.titleMedium?.copyWith(
+            fontWeight: FontWeight.w600,
+            color: titleColor ?? kTitleColor,
+          ),
+        ),
+        const SizedBox(height: 6),
+        Text(
+          label,
+          style: theme.textTheme.bodyMedium?.copyWith(
+            color: kNeutral800,
+          ),
+        ),
+      ],
+    );
+  }
+
+  Widget _buildActionButtons(BuildContext context, WidgetRef ref, PayrollData payroll) {
+    final permissionService = PermissionService(ref);
+    return Column(
+      children: [
+        GestureDetector(
+          onTap: () {
+            if (!permissionService.hasPermission(Permit.payrollsUpdate.value)) {
+              ScaffoldMessenger.of(context).showSnackBar(
+                SnackBar(
+                  backgroundColor: Colors.red,
+                  content: Text(lang.S.of(context).youDoNotHaveUpdatePayroll),
+                ),
+              );
+              return;
+            }
+            Navigator.push(
+              context,
+              MaterialPageRoute(
+                builder: (context) => AddNewPayroll(payrollData: payroll),
+              ),
+            );
+          },
+          child: const HugeIcon(
+            icon: HugeIcons.strokeRoundedPencilEdit02,
+            color: kSuccessColor,
+            size: 20,
+          ),
+        ),
+        const SizedBox(height: 8),
+        GestureDetector(
+          onTap: () {
+            if (!permissionService.hasPermission(Permit.payrollsDelete.value)) {
+              ScaffoldMessenger.of(context).showSnackBar(
+                SnackBar(
+                  backgroundColor: Colors.red,
+                  content: Text(lang.S.of(context).youDoNotHavePermissionToDeletePayroll),
+                ),
+              );
+              return;
+            }
+            if (payroll.id != null) {
+              _showDeleteConfirmationDialog(
+                context,
+                ref,
+                payroll.id!,
+                payroll.employee?.name ?? lang.S.of(context).payrollRecord,
+              );
+            }
+          },
+          child: const HugeIcon(
+            icon: HugeIcons.strokeRoundedDelete03,
+            color: Colors.red,
+            size: 20,
+          ),
+        ),
+      ],
+    );
+  }
+
+  void _showDeleteConfirmationDialog(BuildContext context, WidgetRef ref, num id, String name) async {
+    bool result = await showDeleteConfirmationDialog(
+      context: context,
+      itemName: name,
+    );
+
+    if (result) {
+      final repo = PayrollRepo();
+      await repo.deletePayroll(id: id, context: context, ref: ref);
+      ref.invalidate(payrollListProvider);
+    }
+  }
+}

lib/Screens/hrm/payroll/provider/payroll_provider.dart

@@ -0,0 +1,9 @@
+// File: payroll_provider.dart
+
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:mobile_pos/Screens/hrm/payroll/repo/payroll_repo.dart';
+
+import '../Model/payroll_lsit_model.dart';
+
+final repo = PayrollRepo();
+final payrollListProvider = FutureProvider<PayrollListModel>((ref) => repo.fetchAllPayrolls());

lib/Screens/hrm/payroll/repo/payroll_repo.dart

@@ -0,0 +1,183 @@
+// File: payroll_repo.dart
+
+import 'dart:convert';
+import 'package:flutter/material.dart';
+import 'package:flutter_easyloading/flutter_easyloading.dart';
+import 'package:http/http.dart' as http;
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+
+import '../../../../../Const/api_config.dart';
+import '../../../../../http_client/custome_http_client.dart';
+import '../../../../../http_client/customer_http_client_get.dart';
+import '../Model/payroll_lsit_model.dart';
+import '../provider/payroll_provider.dart';
+
+class PayrollRepo {
+  static const String _endpoint = '/payrolls';
+
+  ///---------------- FETCH ALL PAYROLLS (GET) ----------------///
+  Future<PayrollListModel> fetchAllPayrolls() async {
+    CustomHttpClientGet clientGet = CustomHttpClientGet(client: http.Client());
+    final uri = Uri.parse('${APIConfig.url}$_endpoint');
+
+    final response = await clientGet.get(url: uri);
+
+    if (response.statusCode == 200) {
+      final parsedData = jsonDecode(response.body);
+      return PayrollListModel.fromJson(parsedData);
+    } else {
+      throw Exception('Failed to fetch payroll list. Status: ${response.statusCode}');
+    }
+  }
+
+  ///---------------- CREATE PAYROLL (POST) ----------------///
+  Future<void> createPayroll({
+    required WidgetRef ref,
+    required BuildContext context,
+    required num employeeId,
+    required String month,
+    required String date, // YYYY-MM-DD
+    required String amount,
+    required String paymentYear,
+    required List<Map<String, dynamic>> payments,
+    String? note,
+  }) async {
+    final uri = Uri.parse('${APIConfig.url}$_endpoint');
+
+    final requestBody = jsonEncode({
+      'employee_id': employeeId,
+      'payments': payments,
+      'month': month.toLowerCase(),
+      'date': date,
+      'amount': amount,
+      'payemnt_year': paymentYear,
+      'note': note,
+    });
+
+    try {
+      EasyLoading.show(status: 'Creating Payroll...');
+      CustomHttpClient customHttpClient = CustomHttpClient(client: http.Client(), context: context, ref: ref);
+
+      var responseData = await customHttpClient.post(
+        addContentTypeInHeader: true,
+        url: uri,
+        body: requestBody,
+      );
+
+      final parsedData = jsonDecode(responseData.body);
+      EasyLoading.dismiss();
+
+      if (responseData.statusCode == 200 || responseData.statusCode == 201) {
+        ref.invalidate(payrollListProvider);
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text(parsedData['message'] ?? 'Payroll created successfully')),
+        );
+        Navigator.pop(context);
+      } else {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text('Creation failed: ${parsedData['message'] ?? 'Unknown error'}')),
+        );
+      }
+    } catch (error) {
+      EasyLoading.dismiss();
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text('An error occurred: $error')),
+      );
+    }
+  }
+
+  ///---------------- UPDATE PAYROLL (POST with _method=put) ----------------///
+  Future<void> updatePayroll({
+    required WidgetRef ref,
+    required BuildContext context,
+    required num id,
+    required num employeeId,
+    required String month,
+    required String date,
+    required String amount,
+    required String paymentYear,
+    required List<Map<String, dynamic>> payments,
+    String? note,
+  }) async {
+    final uri = Uri.parse('${APIConfig.url}$_endpoint/$id');
+
+    final requestBody = jsonEncode({
+      '_method': 'put',
+      'employee_id': employeeId,
+      'payments': payments,
+      'month': month.toLowerCase(),
+      'date': date,
+      'amount': amount,
+      'payemnt_year': paymentYear,
+      'note': note,
+    });
+
+    try {
+      EasyLoading.show(status: 'Updating Payroll...');
+      CustomHttpClient customHttpClient = CustomHttpClient(client: http.Client(), context: context, ref: ref);
+
+      var responseData = await customHttpClient.post(
+        url: uri,
+        addContentTypeInHeader: true,
+        body: requestBody,
+      );
+
+      final parsedData = jsonDecode(responseData.body);
+      EasyLoading.dismiss();
+      print('Payroll Update POST:-------> ${requestBody}');
+      print('Payroll Update:-------> ${parsedData}');
+
+      if (responseData.statusCode == 200) {
+        ref.invalidate(payrollListProvider);
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text(parsedData['message'] ?? 'Payroll updated successfully')),
+        );
+        Navigator.pop(context);
+      } else {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text('Update failed: ${parsedData['message'] ?? 'Unknown error'}')),
+        );
+      }
+    } catch (error) {
+      EasyLoading.dismiss();
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text('An error occurred: $error')),
+      );
+    }
+  }
+
+  ///---------------- DELETE PAYROLL ----------------///
+  Future<bool> deletePayroll({
+    required num id,
+    required BuildContext context,
+    required WidgetRef ref,
+  }) async {
+    try {
+      EasyLoading.show(status: 'Deleting...');
+      final url = Uri.parse('${APIConfig.url}$_endpoint/$id');
+      CustomHttpClient customHttpClient = CustomHttpClient(ref: ref, context: context, client: http.Client());
+      final response = await customHttpClient.delete(url: url);
+
+      EasyLoading.dismiss();
+      if (response.statusCode == 200) {
+        ref.invalidate(payrollListProvider);
+        ScaffoldMessenger.of(context).showSnackBar(
+          const SnackBar(content: Text('Payroll deleted successfully')),
+        );
+        return true;
+      } else {
+        final parsedData = jsonDecode(response.body);
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text('Deletion failed: ${parsedData['message'] ?? 'Unknown error'}')),
+        );
+        return false;
+      }
+    } catch (error) {
+      EasyLoading.dismiss();
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text('An error occurred during deletion: $error')),
+      );
+      return false;
+    }
+  }
+}

lib/Screens/hrm/reports/attandence_report.dart

@@ -0,0 +1,378 @@
+// File: attendance_reports.dart (Final Code with Search)
+
+import 'package:flutter/material.dart';
+import 'package:flutter_feather_icons/flutter_feather_icons.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:intl/intl.dart';
+import 'package:mobile_pos/generated/l10n.dart' as lang;
+import 'package:hugeicons/hugeicons.dart'; // HugeIcons Import
+
+// --- Local Imports ---
+import 'package:mobile_pos/Screens/hrm/widgets/filter_dropdown.dart';
+import 'package:mobile_pos/Screens/hrm/widgets/model_bottom_sheet.dart';
+import 'package:mobile_pos/constant.dart';
+
+// --- Data Layer Imports ---
+import 'package:mobile_pos/Screens/hrm/employee/provider/emplpyee_list_provider.dart';
+import '../attendance/model/attendence_list_model.dart';
+import '../attendance/provider/attendence_provider.dart';
+
+class AttendanceReports extends ConsumerStatefulWidget {
+  const AttendanceReports({super.key});
+
+  @override
+  ConsumerState<AttendanceReports> createState() => _AttendanceReportsState();
+}
+
+class _AttendanceReportsState extends ConsumerState<AttendanceReports> {
+  // --- Filter State ---
+  String? _selectedEmployeeFilter;
+  String? _selectedTimeFilter;
+
+  List<AttendanceData> _filteredList = [];
+  final TextEditingController _searchController = TextEditingController();
+  bool _isSearch = false; // State to manage search bar visibility
+
+  final List<String> _timeFilters = ['Today', 'Weekly', 'Monthly', 'Yearly'];
+
+  @override
+  void initState() {
+    super.initState();
+    _searchController.addListener(_applyFilters); // Listen to search input changes
+    _selectedEmployeeFilter = 'All Employee';
+    _selectedTimeFilter = 'Today';
+  }
+
+  @override
+  void dispose() {
+    _searchController.removeListener(_applyFilters);
+    _searchController.dispose();
+    super.dispose();
+  }
+
+  // --- Filtering Logic ---
+
+  void _applyFilters() {
+    // This is called when dropdowns or the search bar input changes
+    setState(() {});
+  }
+
+  void _filterAttendance(List<AttendanceData> allAttendance) {
+    final query = _searchController.text.toLowerCase().trim();
+
+    _filteredList = allAttendance.where((att) {
+      final employeeName = (att.employee?.name ?? '').toLowerCase();
+      final date = (att.date ?? '').toLowerCase();
+      final timeIn = (att.timeIn ?? '').toLowerCase();
+      final timeOut = (att.timeOut ?? '').toLowerCase();
+
+      // 1. Search Query Filter (Checks Employee, Date, Time In, Time Out)
+      final matchesQuery = query.isEmpty ||
+          employeeName.contains(query) ||
+          date.contains(query) ||
+          timeIn.contains(query) ||
+          timeOut.contains(query);
+
+      if (!matchesQuery) return false;
+
+      // 2. Employee Filter
+      final employeeNameMatches =
+          _selectedEmployeeFilter == 'All Employee' || employeeName.contains(_selectedEmployeeFilter!.toLowerCase());
+
+      // 3. Time Filter (Simplified date logic)
+      bool timeMatches = true;
+      final today = DateFormat('yyyy-MM-dd').format(DateTime.now());
+
+      if (_selectedTimeFilter == 'Today') {
+        timeMatches = att.date == today;
+      }
+      // NOTE: Other time filters are just placeholders now.
+
+      return employeeNameMatches && timeMatches;
+    }).toList();
+  }
+
+  // --- Utility Functions ---
+
+  String _formatTimeForDisplay(String? time) {
+    if (time == null) return 'N/A';
+    try {
+      final dateTime = DateFormat('H:m:s').parse(time);
+      return DateFormat('hh:mm a').format(dateTime);
+    } catch (_) {
+      return time;
+    }
+  }
+
+  String _formatDateForDisplay(String? date) {
+    if (date == null) return 'N/A';
+    try {
+      final dateTime = DateFormat('yyyy-MM-dd').parse(date);
+      return DateFormat('dd MMM yyyy').format(dateTime);
+    } catch (_) {
+      return date;
+    }
+  }
+
+  Future<void> _refreshData() async {
+    ref.invalidate(attendanceListProvider);
+    return ref.watch(attendanceListProvider.future);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final _lang = lang.S.of(context);
+    final theme = Theme.of(context);
+    final attendanceAsync = ref.watch(attendanceListProvider);
+    final employeesAsync = ref.watch(employeeListProvider);
+
+    final combinedAsync = attendanceAsync.asData != null && employeesAsync.asData != null
+        ? AsyncValue.data(true)
+        : attendanceAsync.hasError || employeesAsync.hasError
+            ? AsyncValue.error(attendanceAsync.error ?? employeesAsync.error!, StackTrace.current)
+            : const AsyncValue.loading();
+
+    return Scaffold(
+      backgroundColor: Colors.white,
+      appBar: AppBar(
+        centerTitle: true,
+        // *** SEARCH IMPLEMENTATION ***
+        title: _isSearch
+            ? TextField(
+                autofocus: true,
+                controller: _searchController,
+                decoration: InputDecoration(
+                  hintText: '${lang.S.of(context).searchAttendance}...',
+                  border: InputBorder.none,
+                  suffixIcon: Icon(
+                    FeatherIcons.search,
+                    // size: 18,
+                    color: kNeutral800,
+                  ),
+                ),
+              )
+            : Text(lang.S.of(context).attendanceReport),
+        actions: [
+          IconButton(
+            icon: Icon(
+              _isSearch ? Icons.close : FeatherIcons.search,
+              color: _isSearch ? kMainColor : kNeutral800,
+              size: _isSearch ? null : 22,
+            ),
+            onPressed: () {
+              setState(() {
+                _isSearch = !_isSearch;
+                if (!_isSearch) {
+                  _searchController.clear();
+                  _applyFilters(); // Re-apply filters when search is closed
+                }
+              });
+            },
+          ),
+        ],
+        // *** END SEARCH IMPLEMENTATION ***
+        bottom: PreferredSize(
+            preferredSize: const Size.fromHeight(65),
+            child: Column(
+              children: [
+                const Divider(thickness: 1.5, color: kBackgroundColor, height: 1),
+                Padding(
+                  padding: const EdgeInsets.fromLTRB(16, 10, 16, 13),
+                  child: Row(
+                    children: [
+                      // Employee Filter
+                      Expanded(
+                        flex: 6,
+                        child: FilterDropdownButton<String>(
+                          value: _selectedEmployeeFilter,
+                          items: [
+                            DropdownMenuItem(value: 'All Employee', child: Text(lang.S.of(context).allEmployee)),
+                            ...(employeesAsync.value?.employees ?? [])
+                                .map((e) => DropdownMenuItem(value: e.name, child: Text(e.name ?? 'Unknown')))
+                                .toList(),
+                          ]
+                              .map((item) => item.value != null
+                                  ? DropdownMenuItem(
+                                      value: item.value,
+                                      child: Text(item.value!,
+                                          style: theme.textTheme.bodyLarge?.copyWith(color: kNeutral800),
+                                          maxLines: 1,
+                                          overflow: TextOverflow.ellipsis),
+                                    )
+                                  : item)
+                              .toList(),
+                          onChanged: (String? value) {
+                            setState(() {
+                              _selectedEmployeeFilter = value;
+                              _applyFilters();
+                            });
+                          },
+                        ),
+                      ),
+                      const SizedBox(width: 10),
+                      // Time Filter
+                      Expanded(
+                        flex: 4,
+                        child: FilterDropdownButton<String>(
+                          buttonDecoration: BoxDecoration(
+                            color: kBackgroundColor,
+                            borderRadius: BorderRadius.circular(5),
+                            border: Border.all(color: kBorderColor),
+                          ),
+                          value: _selectedTimeFilter,
+                          items: _timeFilters.map((entry) {
+                            return DropdownMenuItem(
+                              value: entry,
+                              child: Text(entry,
+                                  style: theme.textTheme.bodyLarge?.copyWith(color: kNeutral800),
+                                  maxLines: 1,
+                                  overflow: TextOverflow.ellipsis),
+                            );
+                          }).toList(),
+                          onChanged: (String? value) {
+                            setState(() {
+                              _selectedTimeFilter = value;
+                              _applyFilters();
+                            });
+                          },
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
+                const Divider(thickness: 1.5, color: kBackgroundColor, height: 1),
+              ],
+            )),
+      ),
+
+      // Body handles loading/error and displays filtered list
+      body: combinedAsync.when(
+        loading: () => const Center(child: CircularProgressIndicator()),
+        error: (err, stack) => Center(child: Text('Error: Failed to load reports.')),
+        data: (_) {
+          _filterAttendance(attendanceAsync.value?.data ?? []);
+
+          if (_filteredList.isEmpty) {
+            return RefreshIndicator(
+              onRefresh: _refreshData,
+              child: Center(
+                child: SingleChildScrollView(
+                  physics: AlwaysScrollableScrollPhysics(),
+                  child: Text(
+                    lang.S.of(context).noAttendanceRecordFound,
+                  ),
+                ),
+              ),
+            );
+          }
+
+          return RefreshIndicator(
+            onRefresh: _refreshData,
+            child: ListView.separated(
+              padding: EdgeInsets.zero,
+              itemCount: _filteredList.length,
+              separatorBuilder: (_, __) => const Divider(color: kBackgroundColor, height: 1.5),
+              itemBuilder: (_, index) => _buildReportItem(context, _filteredList[index]),
+            ),
+          );
+        },
+      ),
+    );
+  }
+
+  // --- List Item Builder (Unchanged) ---
+
+  Widget _buildReportItem(BuildContext context, AttendanceData attendance) {
+    final theme = Theme.of(context);
+    final timeInDisplay = _formatTimeForDisplay(attendance.timeIn);
+    final timeOutDisplay = _formatTimeForDisplay(attendance.timeOut);
+    final dateDisplay = _formatDateForDisplay(attendance.date);
+
+    return InkWell(
+      onTap: () => viewModalSheet(
+        context: context,
+        item: {
+          lang.S.of(context).employee: attendance.employee?.name ?? 'N/A',
+          lang.S.of(context).shift: attendance.shift?.name ?? 'N/A',
+          lang.S.of(context).month: attendance.month ?? 'N/A',
+          lang.S.of(context).date: dateDisplay,
+          lang.S.of(context).timeIn: timeInDisplay,
+          lang.S.of(context).timeOut: timeOutDisplay,
+        },
+        description: attendance.note,
+      ),
+      child: Padding(
+        padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 13.5),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Text(
+                  attendance.employee?.name ?? 'N/A Employee',
+                  style: theme.textTheme.titleMedium?.copyWith(
+                    fontWeight: FontWeight.w600,
+                  ),
+                ),
+                const SizedBox(height: 8),
+                Text(
+                  dateDisplay,
+                  style: theme.textTheme.bodyMedium?.copyWith(color: kNeutral800),
+                ),
+              ],
+            ),
+            const SizedBox(height: 20),
+            Row(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: [
+                _buildValueColumn(
+                  value: timeInDisplay,
+                  label: lang.S.of(context).timeIn,
+                  theme: theme,
+                ),
+                _buildValueColumn(
+                  value: timeOutDisplay,
+                  label: lang.S.of(context).timeOut,
+                  theme: theme,
+                ),
+                _buildValueColumn(
+                  value: attendance.duration ?? 'N/A',
+                  label: lang.S.of(context).duration,
+                  theme: theme,
+                ),
+              ],
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildValueColumn({
+    required String value,
+    required String label,
+    required ThemeData theme,
+    Color? titleColor,
+  }) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.center,
+      children: [
+        Text(
+          value,
+          style: theme.textTheme.titleMedium?.copyWith(
+            fontWeight: FontWeight.w600,
+            color: titleColor ?? kTitleColor,
+          ),
+        ),
+        const SizedBox(height: 6),
+        Text(
+          label,
+          style: theme.textTheme.bodyMedium?.copyWith(
+            color: kNeutral800,
+          ),
+        ),
+      ],
+    );
+  }
+}

lib/Screens/hrm/reports/leave_reports.dart

@@ -0,0 +1,395 @@
+// File: leave_reports.dart (Final Code)
+
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:hugeicons/hugeicons.dart';
+import 'package:flutter_feather_icons/flutter_feather_icons.dart';
+import 'package:intl/intl.dart';
+// --- Local Imports ---
+import 'package:mobile_pos/Screens/hrm/widgets/filter_dropdown.dart';
+import 'package:mobile_pos/Screens/hrm/widgets/model_bottom_sheet.dart';
+import 'package:mobile_pos/constant.dart';
+import 'package:mobile_pos/generated/l10n.dart' as l;
+
+// --- Data Layer Imports ---
+import 'package:mobile_pos/Screens/hrm/leave_request/leave/model/leave_list_model.dart'; // LeaveRequestData model
+import 'package:mobile_pos/Screens/hrm/employee/provider/emplpyee_list_provider.dart'; // Employee List Provider
+import 'package:mobile_pos/Screens/hrm/employee/model/employee_list_model.dart';
+
+import '../leave_request/leave/provider/leave_list_provider.dart'; // EmployeeData model
+
+class LeaveReports extends ConsumerStatefulWidget {
+  const LeaveReports({super.key});
+
+  @override
+  ConsumerState<LeaveReports> createState() => _LeaveReportsState();
+}
+
+class _LeaveReportsState extends ConsumerState<LeaveReports> {
+  // --- Filter & Search State ---
+  String? _selectedEmployeeFilter;
+  String? _selectedMonthFilter;
+
+  List<LeaveRequestData> _filteredList = [];
+  final TextEditingController _searchController = TextEditingController();
+  bool _isSearch = false;
+
+  final List<String> _monthFilters = [
+    'All Month',
+    'January',
+    'February',
+    'March',
+    'April',
+    'May',
+    'June',
+    'July',
+    'August',
+    'September',
+    'October',
+    'November',
+    'December'
+  ];
+
+  @override
+  void initState() {
+    super.initState();
+    _searchController.addListener(_applyFilters);
+    _selectedEmployeeFilter = 'All Employee';
+    _selectedMonthFilter = 'All Month';
+  }
+
+  @override
+  void dispose() {
+    _searchController.removeListener(_applyFilters);
+    _searchController.dispose();
+    super.dispose();
+  }
+
+  // --- Filtering Logic ---
+
+  void _applyFilters() {
+    setState(() {}); // Trigger rebuild
+  }
+
+  void _filterLeaves(List<LeaveRequestData> allLeaves) {
+    final query = _searchController.text.toLowerCase().trim();
+
+    _filteredList = allLeaves.where((leave) {
+      final employeeName = (leave.employee?.name ?? '').toLowerCase();
+      final leaveType = (leave.leaveType?.name ?? '').toLowerCase();
+      final month = (leave.month ?? '').toLowerCase();
+      final status = (leave.status ?? '').toLowerCase();
+
+      // 1. Search Query Filter
+      final matchesQuery = query.isEmpty ||
+          employeeName.contains(query) ||
+          leaveType.contains(query) ||
+          month.contains(query) ||
+          status.contains(query);
+
+      if (!matchesQuery) return false;
+
+      // 2. Employee Filter
+      final employeeMatches =
+          _selectedEmployeeFilter == 'All Employee' || employeeName.contains(_selectedEmployeeFilter!.toLowerCase());
+
+      // 3. Month Filter
+      final monthMatches = _selectedMonthFilter == 'All Month' || month.startsWith(_selectedMonthFilter!.toLowerCase());
+
+      return employeeMatches && monthMatches;
+    }).toList();
+  }
+
+  // --- Utility Functions ---
+
+  Color _getStatusColor(String? status) {
+    switch (status?.toLowerCase()) {
+      case 'approved':
+        return kSuccessColor;
+      case 'rejected':
+        return Colors.red;
+      case 'pending':
+        return Colors.orange;
+      default:
+        return kNeutral800;
+    }
+  }
+
+  Future<void> _refreshData() async {
+    ref.invalidate(leaveRequestListProvider);
+    return ref.watch(leaveRequestListProvider.future);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final _lang = l.S.of(context);
+    final theme = Theme.of(context);
+    final leavesAsync = ref.watch(leaveRequestListProvider);
+    final employeesAsync = ref.watch(employeeListProvider);
+
+    final combinedAsync = leavesAsync.asData != null && employeesAsync.asData != null
+        ? AsyncValue.data(true)
+        : leavesAsync.hasError || employeesAsync.hasError
+            ? AsyncValue.error(leavesAsync.error ?? employeesAsync.error!, StackTrace.current)
+            : const AsyncValue.loading();
+
+    return Scaffold(
+      backgroundColor: Colors.white,
+      appBar: AppBar(
+        centerTitle: true,
+        // Search implementation
+        title: _isSearch
+            ? TextField(
+                autofocus: true,
+                controller: _searchController,
+                decoration: InputDecoration(
+                  hintText: '${_lang.searchLeave}...',
+                  border: InputBorder.none,
+                  suffixIcon: Icon(FeatherIcons.search, color: kNeutral800),
+                ),
+              )
+            : Text(_lang.leaveReports),
+        actions: [
+          IconButton(
+            icon: Icon(
+              _isSearch ? Icons.close : FeatherIcons.search,
+              color: _isSearch ? kMainColor : kNeutral800,
+              size: _isSearch ? null : 22,
+            ),
+            onPressed: () {
+              setState(() {
+                _isSearch = !_isSearch;
+                if (!_isSearch) {
+                  _searchController.clear();
+                  _applyFilters();
+                }
+              });
+            },
+          ),
+        ],
+        // Filter Dropdowns
+        bottom: PreferredSize(
+            preferredSize: const Size.fromHeight(65),
+            child: Column(
+              children: [
+                const Divider(thickness: 1.5, color: kBackgroundColor, height: 1),
+                Padding(
+                  padding: const EdgeInsets.fromLTRB(16, 10, 16, 13),
+                  child: Row(
+                    children: [
+                      // Employee Filter
+                      Expanded(
+                        flex: 6,
+                        child: FilterDropdownButton<String>(
+                          value: _selectedEmployeeFilter,
+                          items: [
+                            DropdownMenuItem(value: 'All Employee', child: Text(_lang.allEmployee)),
+                            ...(employeesAsync.value?.employees ?? [])
+                                .map((e) => DropdownMenuItem(value: e.name, child: Text(e.name ?? 'Unknown')))
+                                .toList(),
+                          ]
+                              .map((item) => item.value != null
+                                  ? DropdownMenuItem(
+                                      value: item.value,
+                                      child: Text(item.value!,
+                                          style: theme.textTheme.bodyLarge?.copyWith(color: kNeutral800),
+                                          maxLines: 1,
+                                          overflow: TextOverflow.ellipsis),
+                                    )
+                                  : item)
+                              .toList(),
+                          onChanged: (String? value) {
+                            setState(() {
+                              _selectedEmployeeFilter = value;
+                              _applyFilters();
+                            });
+                          },
+                        ),
+                      ),
+                      const SizedBox(width: 10),
+                      // Month Filter
+                      Expanded(
+                        flex: 4,
+                        child: FilterDropdownButton<String>(
+                          buttonDecoration: BoxDecoration(
+                            color: kBackgroundColor,
+                            borderRadius: BorderRadius.circular(5),
+                            border: Border.all(color: kBorderColor),
+                          ),
+                          value: _selectedMonthFilter,
+                          items: _monthFilters.map((entry) {
+                            return DropdownMenuItem(
+                              value: entry,
+                              child: Text(entry,
+                                  style: theme.textTheme.bodyLarge?.copyWith(color: kNeutral800),
+                                  maxLines: 1,
+                                  overflow: TextOverflow.ellipsis),
+                            );
+                          }).toList(),
+                          onChanged: (String? value) {
+                            setState(() {
+                              _selectedMonthFilter = value;
+                              _applyFilters();
+                            });
+                          },
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
+                const Divider(thickness: 1.5, color: kBackgroundColor, height: 1),
+              ],
+            )),
+      ),
+
+      // Body handles loading/error and displays filtered list
+      body: combinedAsync.when(
+        loading: () => const Center(child: CircularProgressIndicator()),
+        error: (err, stack) => Center(child: Text('Error: Failed to load reports.')),
+        data: (_) {
+          _filterLeaves(leavesAsync.value?.data ?? []);
+
+          if (_filteredList.isEmpty) {
+            return RefreshIndicator(
+              onRefresh: _refreshData,
+              child: Center(
+                  child: SingleChildScrollView(
+                      physics: AlwaysScrollableScrollPhysics(), child: Text(_lang.noLeaveRecordFound))),
+            );
+          }
+
+          return RefreshIndicator(
+            onRefresh: _refreshData,
+            child: ListView.separated(
+              padding: EdgeInsets.zero,
+              itemCount: _filteredList.length,
+              separatorBuilder: (_, __) => const Divider(color: kBackgroundColor, height: 1.5),
+              itemBuilder: (_, index) => _buildReportItem(context, _filteredList[index]),
+            ),
+          );
+        },
+      ),
+    );
+  }
+
+  // --- List Item Builder ---
+
+  Widget _buildReportItem(BuildContext context, LeaveRequestData leave) {
+    final theme = Theme.of(context);
+    final statusColor = _getStatusColor(leave.status);
+
+    return InkWell(
+      onTap: () => viewModalSheet(
+        context: context,
+        item: {
+          l.S.of(context).name: leave.employee?.name ?? 'N/A',
+          l.S.of(context).department: leave.department?.name ?? 'N/A',
+          l.S.of(context).leaveType: leave.leaveType?.name ?? 'N/A',
+          l.S.of(context).month: leave.month ?? 'N/A',
+          l.S.of(context).startDate: leave.startDate ?? 'N/A',
+          l.S.of(context).endDate: leave.endDate ?? 'N/A',
+          l.S.of(context).leaveDuration: leave.leaveDuration?.toString() ?? '0',
+          l.S.of(context).status: leave.status?.toUpperCase() ?? 'N/A',
+        },
+        description: leave.description,
+      ),
+      child: Padding(
+        padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 13.5),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Row(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: [
+                Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Text(
+                      leave.employee?.name ?? 'N/A Employee',
+                      style: theme.textTheme.titleMedium?.copyWith(
+                        fontWeight: FontWeight.w600,
+                      ),
+                    ),
+                    const SizedBox(height: 8),
+                    Row(
+                      children: [
+                        Text(
+                          leave.leaveType?.name ?? 'N/A Type',
+                          style: theme.textTheme.bodyMedium?.copyWith(color: kNeutral800),
+                        ),
+                        const SizedBox(width: 8),
+                        Container(
+                          padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
+                          decoration: BoxDecoration(
+                            color: statusColor.withOpacity(0.1),
+                            borderRadius: BorderRadius.circular(4),
+                          ),
+                          child: Text(
+                            leave.status?.toUpperCase() ?? 'N/A',
+                            style: theme.textTheme.labelSmall?.copyWith(
+                              color: statusColor,
+                              fontWeight: FontWeight.bold,
+                            ),
+                          ),
+                        ),
+                      ],
+                    ),
+                  ],
+                ),
+              ],
+            ),
+            const SizedBox(height: 20),
+            Row(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: [
+                _buildTimeColumn(
+                  value: leave.month ?? 'N/A',
+                  label: l.S.of(context).month,
+                  theme: theme,
+                ),
+                _buildTimeColumn(
+                  value: leave.startDate ?? 'N/A',
+                  label: l.S.of(context).startDate,
+                  theme: theme,
+                ),
+                _buildTimeColumn(
+                  value: leave.leaveDuration?.toString() ?? 'N/A',
+                  label: l.S.of(context).durationDays,
+                  theme: theme,
+                ),
+              ],
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  // Changed name from _buildTimeColumn to _buildValueColumn for consistency
+  Widget _buildTimeColumn({
+    required String value,
+    required String label,
+    required ThemeData theme,
+    Color? titleColor,
+  }) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.center,
+      children: [
+        Text(
+          value,
+          style: theme.textTheme.titleMedium?.copyWith(
+            fontWeight: FontWeight.w600,
+            color: titleColor ?? kTitleColor,
+          ),
+        ),
+        const SizedBox(height: 6),
+        Text(
+          label,
+          style: theme.textTheme.bodyMedium?.copyWith(
+            color: kNeutral800,
+          ),
+        ),
+      ],
+    );
+  }
+}

lib/Screens/hrm/reports/payroll_reports.dart

@@ -0,0 +1,346 @@
+// File: payroll_reports.dart
+
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+
+// --- Local Imports ---
+import 'package:mobile_pos/Screens/hrm/widgets/filter_dropdown.dart';
+import 'package:mobile_pos/Screens/hrm/widgets/model_bottom_sheet.dart';
+import 'package:mobile_pos/constant.dart';
+import 'package:mobile_pos/currency.dart';
+import 'package:mobile_pos/generated/l10n.dart' as l;
+
+// --- Data Layer Imports ---
+import 'package:mobile_pos/Screens/hrm/payroll/provider/payroll_provider.dart';
+import 'package:mobile_pos/Screens/hrm/employee/provider/emplpyee_list_provider.dart';
+
+import '../payroll/Model/payroll_lsit_model.dart';
+
+class PayrollReports extends ConsumerStatefulWidget {
+  const PayrollReports({super.key});
+
+  @override
+  ConsumerState<PayrollReports> createState() => _PayrollReportsState();
+}
+
+class _PayrollReportsState extends ConsumerState<PayrollReports> {
+  // --- Filter State ---
+  String? _selectedEmployeeFilter;
+  String? _selectedMonthFilter;
+
+  List<PayrollData> _filteredList = [];
+
+  final List<String> _monthFilters = [
+    'All Month',
+    'January',
+    'February',
+    'March',
+    'April',
+    'May',
+    'June',
+    'July',
+    'August',
+    'September',
+    'October',
+    'November',
+    'December'
+  ];
+
+  @override
+  void initState() {
+    super.initState();
+    _selectedEmployeeFilter = 'All Employee';
+    _selectedMonthFilter = 'All Month';
+  }
+
+  // --- Filtering Logic ---
+
+  void _applyFilters() {
+    setState(() {}); // Trigger rebuild to re-run filtering
+  }
+
+  void _filterPayrolls(List<PayrollData> allPayrolls) {
+    _filteredList = allPayrolls.where((payroll) {
+      final employeeName = (payroll.employee?.name ?? '').toLowerCase();
+      final month = (payroll.month ?? '').toLowerCase();
+
+      // 1. Employee Filter
+      final employeeMatches =
+          _selectedEmployeeFilter == 'All Employee' || employeeName == _selectedEmployeeFilter!.toLowerCase();
+
+      // 2. Month Filter
+      final monthMatches = _selectedMonthFilter == 'All Month' || month == _selectedMonthFilter!.toLowerCase();
+
+      return employeeMatches && monthMatches;
+    }).toList();
+  }
+
+  // --- Pull to Refresh ---
+
+  Future<void> _refreshData() async {
+    ref.invalidate(payrollListProvider);
+    return ref.watch(payrollListProvider.future);
+  }
+
+  Color _getStatusColor(String? status) {
+    if (status?.toLowerCase() == 'paid') return kSuccessColor;
+    return Colors.red;
+  }
+
+  String _formatAmount(num? amount) {
+    return '$currency${amount?.toStringAsFixed(2) ?? '0.00'}';
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+    final _lang = l.S.of(context);
+
+    // Watch primary data source and filter options
+    final payrollsAsync = ref.watch(payrollListProvider);
+    final employeesAsync = ref.watch(employeeListProvider);
+
+    // Combine loading state
+    final combinedAsync = payrollsAsync.asData != null && employeesAsync.asData != null
+        ? AsyncValue.data(true)
+        : payrollsAsync.hasError || employeesAsync.hasError
+            ? AsyncValue.error(payrollsAsync.error ?? employeesAsync.error!, StackTrace.current)
+            : const AsyncValue.loading();
+
+    return Scaffold(
+      backgroundColor: Colors.white,
+      appBar: AppBar(
+        centerTitle: true,
+        title: Text(_lang.payrollReports),
+        bottom: PreferredSize(
+            preferredSize: const Size.fromHeight(65),
+            child: Column(
+              children: [
+                const Divider(thickness: 1.5, color: kBackgroundColor, height: 1),
+                Padding(
+                  padding: const EdgeInsets.fromLTRB(16, 10, 16, 13),
+                  child: Row(
+                    children: [
+                      // Employee Filter
+                      Expanded(
+                        flex: 6,
+                        child: FilterDropdownButton<String>(
+                          value: _selectedEmployeeFilter,
+                          items: [
+                            DropdownMenuItem(value: 'All Employee', child: Text(_lang.allEmployee)),
+                            // Map Employee List names from provider
+                            ...(employeesAsync.value?.employees ?? [])
+                                .map((e) => DropdownMenuItem(value: e.name, child: Text(e.name ?? 'Unknown')))
+                                .toList(),
+                          ]
+                              .map((item) => item.value != null
+                                  ? DropdownMenuItem(
+                                      value: item.value,
+                                      child: Text(item.value!,
+                                          style: theme.textTheme.bodyLarge?.copyWith(color: kNeutral800),
+                                          maxLines: 1,
+                                          overflow: TextOverflow.ellipsis),
+                                    )
+                                  : item)
+                              .toList(),
+                          onChanged: (String? value) {
+                            setState(() {
+                              _selectedEmployeeFilter = value;
+                              _applyFilters();
+                            });
+                          },
+                        ),
+                      ),
+                      const SizedBox(width: 10),
+                      // Month Filter
+                      Expanded(
+                        flex: 4,
+                        child: FilterDropdownButton<String>(
+                          buttonDecoration: BoxDecoration(
+                            color: kBackgroundColor,
+                            borderRadius: BorderRadius.circular(5),
+                            border: Border.all(color: kBorderColor),
+                          ),
+                          value: _selectedMonthFilter,
+                          items: _monthFilters.map((entry) {
+                            return DropdownMenuItem(
+                              value: entry,
+                              child: Text(entry,
+                                  style: theme.textTheme.bodyLarge?.copyWith(color: kNeutral800),
+                                  maxLines: 1,
+                                  overflow: TextOverflow.ellipsis),
+                            );
+                          }).toList(),
+                          onChanged: (String? value) {
+                            setState(() {
+                              _selectedMonthFilter = value;
+                              _applyFilters();
+                            });
+                          },
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
+                const Divider(thickness: 1.5, color: kBackgroundColor, height: 1),
+              ],
+            )),
+      ),
+
+      // Body handles loading/error and displays filtered list
+      body: combinedAsync.when(
+        loading: () => const Center(child: CircularProgressIndicator()),
+        error: (err, stack) => Center(child: Text('Error: Failed to load report data.')),
+        data: (_) {
+          _filterPayrolls(payrollsAsync.value?.data ?? []);
+
+          if (_filteredList.isEmpty) {
+            return RefreshIndicator(
+              onRefresh: _refreshData,
+              child: Center(
+                child: SingleChildScrollView(
+                  physics: AlwaysScrollableScrollPhysics(),
+                  child: Text(
+                    _lang.noMatchingPayrollFound,
+                  ),
+                ),
+              ),
+            );
+          }
+
+          return RefreshIndicator(
+            onRefresh: _refreshData,
+            child: ListView.separated(
+              padding: EdgeInsets.zero,
+              itemCount: _filteredList.length,
+              separatorBuilder: (_, __) => const Divider(color: kBackgroundColor, height: 1.5),
+              itemBuilder: (_, index) => _buildPayrollItem(context: context, payroll: _filteredList[index]),
+            ),
+          );
+        },
+      ),
+    );
+  }
+
+  // --- List Item Builder ---
+
+  Widget _buildPayrollItem({
+    required BuildContext context,
+    required PayrollData payroll,
+  }) {
+    final theme = Theme.of(context);
+    // Determine status and color
+    final isPaid = payroll.amount != null && payroll.amount! > 0;
+    final status = isPaid ? 'Paid' : 'Unpaid';
+    final statusColor = _getStatusColor(status);
+
+    // Logic to prepare Detail String for transactions (Modal)
+    String paymentDetails = "";
+    if (payroll.transactions != null && payroll.transactions!.isNotEmpty) {
+      List<String> details = payroll.transactions!.map((t) {
+        return (t.transactionType == 'cash_payment') ? 'Cash' : (t.paymentType?.name ?? 'Unknown');
+      }).toList();
+      paymentDetails = details.join('\n');
+    } else {
+      paymentDetails = "N/A";
+    }
+
+    // Logic for Summary text in the List view (Row)
+    String paymentSummary = "N/A";
+    if (payroll.transactions != null && payroll.transactions!.isNotEmpty) {
+      paymentSummary = payroll.transactions!.first.paymentType?.name ?? 'Unknown';
+      if (payroll.transactions!.length > 1) {
+        paymentSummary += " +${payroll.transactions!.length - 1}";
+      }
+    }
+
+    return InkWell(
+      onTap: () => viewModalSheet(
+        context: context,
+        item: {
+          l.S.of(context).employee: payroll.employee?.name ?? 'N/A',
+          l.S.of(context).paymentYear: payroll.payemntYear ?? 'N/A',
+          l.S.of(context).month: payroll.month ?? 'N/A',
+          l.S.of(context).date: payroll.date ?? 'N/A',
+          l.S.of(context).amount: _formatAmount(payroll.amount),
+          l.S.of(context).paymentDetails: paymentDetails, // Showing Full Details Here
+        },
+        descriptionTitle: 'Note : ',
+        description: payroll.note ?? 'N/A',
+      ),
+      child: Padding(
+        padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 13.5),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Text(
+                  payroll.employee?.name ?? 'N/A Employee',
+                  style: theme.textTheme.titleMedium?.copyWith(
+                    fontWeight: FontWeight.w600,
+                  ),
+                ),
+                const SizedBox(height: 8),
+                Text(
+                  payroll.date ?? 'N/A Date',
+                  style: theme.textTheme.bodyMedium?.copyWith(color: kNeutral800),
+                ),
+              ],
+            ),
+            const SizedBox(height: 16),
+            Row(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: [
+                _buildTimeColumn(
+                  time: _formatAmount(payroll.amount),
+                  label: l.S.of(context).amount,
+                  theme: theme,
+                ),
+                _buildTimeColumn(
+                  time: paymentSummary, // Showing Summary Here
+                  label: l.S.of(context).payment,
+                  theme: theme,
+                ),
+                _buildTimeColumn(
+                  time: status,
+                  label: l.S.of(context).status,
+                  titleColor: statusColor,
+                  theme: theme,
+                ),
+              ],
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildTimeColumn({
+    required String time,
+    required String label,
+    required ThemeData theme,
+    Color? titleColor,
+  }) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.center,
+      children: [
+        Text(
+          time,
+          style: theme.textTheme.titleMedium?.copyWith(
+            fontWeight: FontWeight.w600,
+            color: titleColor ?? kTitleColor,
+          ),
+        ),
+        const SizedBox(height: 6),
+        Text(
+          label,
+          style: theme.textTheme.bodyMedium?.copyWith(
+            color: kNeutral800,
+          ),
+        ),
+      ],
+    );
+  }
+}

lib/Screens/hrm/reports/repo/attendence_report_repo.dart

@@ -0,0 +1,182 @@
+// File: attendance_repo.dart
+
+import 'dart:convert';
+import 'package:flutter/material.dart';
+import 'package:flutter_easyloading/flutter_easyloading.dart';
+import 'package:http/http.dart' as http;
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+
+// --- Local Imports ---
+import '../../../../Const/api_config.dart';
+import '../../../../http_client/custome_http_client.dart';
+import '../../../../http_client/customer_http_client_get.dart';
+import '../../attendance/model/attendence_list_model.dart';
+import '../../attendance/provider/attendence_provider.dart';
+
+class AttendanceRepo {
+  static const String _endpoint = '/attendances'; // Assuming a suitable endpoint
+
+  ///---------------- FETCH ALL ATTENDANCE (GET) ----------------///
+  Future<AttendanceListModel> fetchAllAttendance() async {
+    CustomHttpClientGet clientGet = CustomHttpClientGet(client: http.Client());
+    final uri = Uri.parse('${APIConfig.url}$_endpoint');
+
+    final response = await clientGet.get(url: uri);
+
+    if (response.statusCode == 200) {
+      final parsedData = jsonDecode(response.body);
+      return AttendanceListModel.fromJson(parsedData);
+    } else {
+      throw Exception('Failed to fetch attendance list. Status: ${response.statusCode}');
+    }
+  }
+
+  ///---------------- CREATE ATTENDANCE (POST) ----------------///
+  Future<void> createAttendance({
+    required WidgetRef ref,
+    required BuildContext context,
+    required num employeeId,
+    required num shiftId,
+    required String timeIn, // HH:MM:SS format
+    required String timeOut, // HH:MM:SS format
+    required String date, // YYYY-MM-DD format
+    // required String month,
+    String? note,
+  }) async {
+    final uri = Uri.parse('${APIConfig.url}$_endpoint');
+
+    final requestBody = jsonEncode({
+      'employee_id': employeeId,
+      'shift_id': shiftId,
+      'time_in': timeIn,
+      'time_out': timeOut,
+      'date': date,
+      // 'month': month,
+      'note': note,
+    });
+
+    try {
+      EasyLoading.show(status: 'Recording Attendance...');
+      CustomHttpClient customHttpClient = CustomHttpClient(client: http.Client(), context: context, ref: ref);
+
+      var responseData = await customHttpClient.post(
+        url: uri,
+        addContentTypeInHeader: true,
+        body: requestBody,
+      );
+
+      final parsedData = jsonDecode(responseData.body);
+      EasyLoading.dismiss();
+
+      if (responseData.statusCode == 200 || responseData.statusCode == 201) {
+        ref.invalidate(attendanceListProvider); // Refresh the list
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text(parsedData['message'] ?? 'Attendance recorded successfully')),
+        );
+        Navigator.pop(context);
+      } else {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text('Recording failed: ${parsedData['message'] ?? 'Unknown error'}')),
+        );
+      }
+    } catch (error) {
+      EasyLoading.dismiss();
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text('An error occurred: $error')),
+      );
+    }
+  }
+
+  ///---------------- UPDATE ATTENDANCE (PUT) ----------------///
+  Future<void> updateAttendance({
+    required WidgetRef ref,
+    required BuildContext context,
+    required num id,
+    required num employeeId,
+    required num shiftId,
+    required String timeIn,
+    required String timeOut,
+    required String date,
+    // required String month,
+    String? note,
+  }) async {
+    final uri = Uri.parse('${APIConfig.url}$_endpoint/$id');
+
+    final requestBody = jsonEncode({
+      '_method': 'put',
+      'employee_id': employeeId,
+      'shift_id': shiftId,
+      'time_in': timeIn,
+      'time_out': timeOut,
+      'date': date,
+      // 'month': month,
+      'note': note,
+    });
+
+    try {
+      EasyLoading.show(status: 'Updating...');
+      CustomHttpClient customHttpClient = CustomHttpClient(client: http.Client(), context: context, ref: ref);
+
+      var responseData = await customHttpClient.post(
+        url: uri,
+        addContentTypeInHeader: true,
+        body: requestBody,
+      );
+
+      final parsedData = jsonDecode(responseData.body);
+      EasyLoading.dismiss();
+
+      if (responseData.statusCode == 200) {
+        ref.invalidate(attendanceListProvider); // Refresh the list
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text(parsedData['message'] ?? 'Attendance updated successfully')),
+        );
+        Navigator.pop(context);
+      } else {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text('Update failed: ${parsedData['message'] ?? 'Unknown error'}')),
+        );
+      }
+    } catch (error) {
+      EasyLoading.dismiss();
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text('An error occurred: $error')),
+      );
+    }
+  }
+
+  ///---------------- DELETE ATTENDANCE ----------------///
+  Future<bool> deleteAttendance({
+    required num id,
+    required BuildContext context,
+    required WidgetRef ref,
+  }) async {
+    try {
+      EasyLoading.show(status: 'Deleting...');
+      final url = Uri.parse('${APIConfig.url}$_endpoint/$id');
+      CustomHttpClient customHttpClient = CustomHttpClient(ref: ref, context: context, client: http.Client());
+      final response = await customHttpClient.delete(url: url);
+
+      EasyLoading.dismiss();
+      if (response.statusCode == 200) {
+        ref.invalidate(attendanceListProvider); // Refresh the list
+        ScaffoldMessenger.of(context).showSnackBar(
+          const SnackBar(content: Text('Attendance deleted successfully')),
+        );
+        return true;
+      } else {
+        final parsedData = jsonDecode(response.body);
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text('Deletion failed: ${parsedData['message'] ?? 'Unknown error'}')),
+        );
+        return false;
+      }
+    } catch (error) {
+      EasyLoading.dismiss();
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text('An error occurred during deletion: $error')),
+      );
+      return false;
+    }
+  }
+}

lib/Screens/hrm/reports/repo/leave_report_repo.dart

@@ -0,0 +1,188 @@
+// File: leave_repo.dart
+
+import 'dart:convert';
+import 'package:flutter/material.dart';
+import 'package:flutter_easyloading/flutter_easyloading.dart';
+import 'package:http/http.dart' as http;
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+
+import '../../../../../Const/api_config.dart';
+import '../../../../../http_client/custome_http_client.dart';
+import '../../../../../http_client/customer_http_client_get.dart';
+import '../../leave_request/leave/model/leave_list_model.dart';
+
+class LeaveRepo {
+  // Base endpoint for leave requests from Postman screenshots
+  static const String _endpoint = '/leaves';
+
+  ///---------------- FETCH ALL LEAVE REQUESTS (GET) ----------------///
+  Future<LeaveListModel> fetchAllLeaveRequests() async {
+    CustomHttpClientGet clientGet = CustomHttpClientGet(client: http.Client());
+    final uri = Uri.parse('${APIConfig.url}$_endpoint');
+
+    final response = await clientGet.get(url: uri);
+
+    if (response.statusCode == 200) {
+      final parsedData = jsonDecode(response.body);
+      return LeaveListModel.fromJson(parsedData);
+    } else {
+      throw Exception('Failed to fetch leave requests list. Status: ${response.statusCode}');
+    }
+  }
+
+  ///---------------- CREATE LEAVE REQUEST (POST) ----------------///
+  Future<void> createLeaveRequest({
+    required WidgetRef ref,
+    required BuildContext context,
+    required num employeeId,
+    required num leaveTypeId,
+    required String startDate,
+    required String endDate,
+    required dynamic leaveDuration,
+    required String month,
+    required String description,
+    required String status, // e.g., 'pending'
+  }) async {
+    final uri = Uri.parse('${APIConfig.url}$_endpoint');
+
+    final requestBody = jsonEncode({
+      'employee_id': employeeId,
+      'leave_type_id': leaveTypeId,
+      'start_date': startDate,
+      'end_date': endDate,
+      'leave_duration': leaveDuration,
+      'month': month,
+      'description': description,
+      'status': status,
+    });
+
+    try {
+      EasyLoading.show(status: 'Submitting Leave Request...');
+      CustomHttpClient customHttpClient = CustomHttpClient(client: http.Client(), context: context, ref: ref);
+
+      var responseData = await customHttpClient.post(
+        url: uri,
+        addContentTypeInHeader: true,
+        body: requestBody,
+      );
+
+      final parsedData = jsonDecode(responseData.body);
+      EasyLoading.dismiss();
+
+      if (responseData.statusCode == 200 || responseData.statusCode == 201) {
+        // ref.refresh(leaveRequestListProvider); // Assuming you'll define this provider
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text(parsedData['message'] ?? 'Leave Request created successfully')),
+        );
+        Navigator.pop(context);
+      } else {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text('Submission failed: ${parsedData['message'] ?? 'Unknown error'}')),
+        );
+      }
+    } catch (error) {
+      EasyLoading.dismiss();
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text('An error occurred: $error')),
+      );
+    }
+  }
+
+  ///---------------- UPDATE LEAVE REQUEST (POST with _method=put) ----------------///
+  Future<void> updateLeaveRequest({
+    required WidgetRef ref,
+    required BuildContext context,
+    required num id, // Leave Request ID from Postman URL
+    required num employeeId,
+    required num leaveTypeId,
+    required String startDate,
+    required String endDate,
+    required dynamic leaveDuration,
+    required String month,
+    required String description,
+    required String status, // e.g., 'approved'
+  }) async {
+    // Postman URL: {{url}}/api/v1/leaves/2
+    final uri = Uri.parse('${APIConfig.url}$_endpoint/$id');
+
+    final requestBody = jsonEncode({
+      '_method': 'put', // Required for sending PUT data via POST
+      'employee_id': employeeId,
+      'leave_type_id': leaveTypeId,
+      'start_date': startDate,
+      'end_date': endDate,
+      'leave_duration': leaveDuration,
+      'month': month,
+      'description': description,
+      'status': status,
+    });
+
+    try {
+      EasyLoading.show(status: 'Updating Request...');
+      CustomHttpClient customHttpClient = CustomHttpClient(client: http.Client(), context: context, ref: ref);
+
+      // Sending as POST request based on the Postman screenshot
+      var responseData = await customHttpClient.post(
+        url: uri,
+        addContentTypeInHeader: true,
+        body: requestBody,
+      );
+
+      final parsedData = jsonDecode(responseData.body);
+      EasyLoading.dismiss();
+
+      if (responseData.statusCode == 200) {
+        // ref.refresh(leaveRequestListProvider); // Assuming you'll define this provider
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text(parsedData['message'] ?? 'Leave Request updated successfully')),
+        );
+        Navigator.pop(context);
+      } else {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text('Update failed: ${parsedData['message'] ?? 'Unknown error'}')),
+        );
+      }
+    } catch (error) {
+      EasyLoading.dismiss();
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text('An error occurred: $error')),
+      );
+    }
+  }
+
+  ///---------------- DELETE LEAVE REQUEST (DELETE) ----------------///
+  Future<bool> deleteLeaveRequest({
+    required num id,
+    required BuildContext context,
+    required WidgetRef ref,
+  }) async {
+    try {
+      EasyLoading.show(status: 'Deleting...');
+      // URL: {{url}}/api/v1/leaves/{id}
+      final url = Uri.parse('${APIConfig.url}$_endpoint/$id');
+      CustomHttpClient customHttpClient = CustomHttpClient(ref: ref, context: context, client: http.Client());
+      final response = await customHttpClient.delete(url: url);
+
+      EasyLoading.dismiss();
+      if (response.statusCode == 200) {
+        // ref.refresh(leaveRequestListProvider); // Assuming you'll define this provider
+        ScaffoldMessenger.of(context).showSnackBar(
+          const SnackBar(content: Text('Leave Request deleted successfully')),
+        );
+        return true;
+      } else {
+        final parsedData = jsonDecode(response.body);
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text('Deletion failed: ${parsedData['message'] ?? 'Unknown error'}')),
+        );
+        return false;
+      }
+    } catch (error) {
+      EasyLoading.dismiss();
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text('An error occurred during deletion: $error')),
+      );
+      return false;
+    }
+  }
+}

lib/Screens/hrm/reports/repo/payroll_report_repo.dart

@@ -0,0 +1,181 @@
+// File: payroll_repo.dart
+
+import 'dart:convert';
+import 'package:flutter/material.dart';
+import 'package:flutter_easyloading/flutter_easyloading.dart';
+import 'package:http/http.dart' as http;
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+
+import '../../../../../Const/api_config.dart';
+import '../../../../../http_client/custome_http_client.dart';
+import '../../../../../http_client/customer_http_client_get.dart';
+import '../../payroll/Model/payroll_lsit_model.dart';
+import '../../payroll/provider/payroll_provider.dart';
+
+class PayrollRepo {
+  static const String _endpoint = '/payrolls';
+
+  ///---------------- FETCH ALL PAYROLLS (GET) ----------------///
+  Future<PayrollListModel> fetchAllPayrolls() async {
+    CustomHttpClientGet clientGet = CustomHttpClientGet(client: http.Client());
+    final uri = Uri.parse('${APIConfig.url}$_endpoint');
+
+    final response = await clientGet.get(url: uri);
+
+    if (response.statusCode == 200) {
+      final parsedData = jsonDecode(response.body);
+      return PayrollListModel.fromJson(parsedData);
+    } else {
+      throw Exception('Failed to fetch payroll list. Status: ${response.statusCode}');
+    }
+  }
+
+  ///---------------- CREATE PAYROLL (POST) ----------------///
+  Future<void> createPayroll({
+    required WidgetRef ref,
+    required BuildContext context,
+    required num employeeId,
+    required num paymentTypeId,
+    required String month,
+    required String date, // YYYY-MM-DD
+    required String amount,
+    required String paymentYear,
+    String? note,
+  }) async {
+    final uri = Uri.parse('${APIConfig.url}$_endpoint');
+
+    final requestBody = jsonEncode({
+      'employee_id': employeeId,
+      'payment_type_id': paymentTypeId,
+      'month': month.toLowerCase(),
+      'date': date,
+      'amount': amount,
+      'payemnt_year': paymentYear,
+      'note': note,
+    });
+
+    try {
+      EasyLoading.show(status: 'Creating Payroll...');
+      CustomHttpClient customHttpClient = CustomHttpClient(client: http.Client(), context: context, ref: ref);
+
+      var responseData = await customHttpClient.post(
+        addContentTypeInHeader: true,
+        url: uri,
+        body: requestBody,
+      );
+
+      final parsedData = jsonDecode(responseData.body);
+      EasyLoading.dismiss();
+
+      if (responseData.statusCode == 200 || responseData.statusCode == 201) {
+        ref.invalidate(payrollListProvider);
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text(parsedData['message'] ?? 'Payroll created successfully')),
+        );
+        Navigator.pop(context);
+      } else {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text('Creation failed: ${parsedData['message'] ?? 'Unknown error'}')),
+        );
+      }
+    } catch (error) {
+      EasyLoading.dismiss();
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text('An error occurred: $error')),
+      );
+    }
+  }
+
+  ///---------------- UPDATE PAYROLL (POST with _method=put) ----------------///
+  Future<void> updatePayroll({
+    required WidgetRef ref,
+    required BuildContext context,
+    required num id,
+    required num employeeId,
+    required num paymentTypeId,
+    required String month,
+    required String date,
+    required String amount,
+    required String paymentYear,
+    String? note,
+  }) async {
+    final uri = Uri.parse('${APIConfig.url}$_endpoint/$id');
+
+    final requestBody = jsonEncode({
+      '_method': 'put',
+      'employee_id': employeeId,
+      'payment_type_id': paymentTypeId,
+      'month': month.toLowerCase(),
+      'date': date,
+      'amount': amount,
+      'payemnt_year': paymentYear,
+      'note': note,
+    });
+
+    try {
+      EasyLoading.show(status: 'Updating Payroll...');
+      CustomHttpClient customHttpClient = CustomHttpClient(client: http.Client(), context: context, ref: ref);
+
+      var responseData = await customHttpClient.post(
+        url: uri,
+        addContentTypeInHeader: true,
+        body: requestBody,
+      );
+
+      final parsedData = jsonDecode(responseData.body);
+      EasyLoading.dismiss();
+
+      if (responseData.statusCode == 200) {
+        ref.invalidate(payrollListProvider);
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text(parsedData['message'] ?? 'Payroll updated successfully')),
+        );
+        Navigator.pop(context);
+      } else {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text('Update failed: ${parsedData['message'] ?? 'Unknown error'}')),
+        );
+      }
+    } catch (error) {
+      EasyLoading.dismiss();
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text('An error occurred: $error')),
+      );
+    }
+  }
+
+  ///---------------- DELETE PAYROLL ----------------///
+  Future<bool> deletePayroll({
+    required num id,
+    required BuildContext context,
+    required WidgetRef ref,
+  }) async {
+    try {
+      EasyLoading.show(status: 'Deleting...');
+      final url = Uri.parse('${APIConfig.url}$_endpoint/$id');
+      CustomHttpClient customHttpClient = CustomHttpClient(ref: ref, context: context, client: http.Client());
+      final response = await customHttpClient.delete(url: url);
+
+      EasyLoading.dismiss();
+      if (response.statusCode == 200) {
+        ref.invalidate(payrollListProvider);
+        ScaffoldMessenger.of(context).showSnackBar(
+          const SnackBar(content: Text('Payroll deleted successfully')),
+        );
+        return true;
+      } else {
+        final parsedData = jsonDecode(response.body);
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text('Deletion failed: ${parsedData['message'] ?? 'Unknown error'}')),
+        );
+        return false;
+      }
+    } catch (error) {
+      EasyLoading.dismiss();
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text('An error occurred during deletion: $error')),
+      );
+      return false;
+    }
+  }
+}

lib/Screens/hrm/shift/Model/shift_list_model.dart

@@ -0,0 +1,88 @@
+class ShiftListModel {
+  ShiftListModel({
+    this.message,
+    this.data,
+  });
+
+  ShiftListModel.fromJson(dynamic json) {
+    message = json['message'];
+    if (json['data'] != null) {
+      data = [];
+      json['data'].forEach((v) {
+        data?.add(ShiftData.fromJson(v));
+      });
+    }
+  }
+  String? message;
+  List<ShiftData>? data;
+
+  Map<String, dynamic> toJson() {
+    final map = <String, dynamic>{};
+    map['message'] = message;
+    if (data != null) {
+      map['data'] = data?.map((v) => v.toJson()).toList();
+    }
+    return map;
+  }
+}
+
+class ShiftData {
+  ShiftData({
+    this.id,
+    this.name,
+    this.businessId,
+    this.startTime,
+    this.endTime,
+    this.startBreakTime,
+    this.endBreakTime,
+    this.breakTime,
+    this.breakStatus,
+    this.status,
+    this.createdAt,
+    this.updatedAt,
+  });
+
+  ShiftData.fromJson(dynamic json) {
+    id = json['id'];
+    name = json['name'];
+    businessId = json['business_id'];
+    startTime = json['start_time'];
+    endTime = json['end_time'];
+    startBreakTime = json['start_break_time'];
+    endBreakTime = json['end_break_time'];
+    breakTime = json['break_time'];
+    breakStatus = json['break_status'];
+    status = json['status'];
+    createdAt = json['created_at'];
+    updatedAt = json['updated_at'];
+  }
+  num? id;
+  String? name;
+  num? businessId;
+  String? startTime;
+  String? endTime;
+  String? startBreakTime;
+  String? endBreakTime;
+  String? breakTime;
+  String? breakStatus;
+  num? status;
+  String? createdAt;
+  String? updatedAt;
+
+  Map<String, dynamic> toJson() {
+    final map = <String, dynamic>{};
+    map['id'] = id;
+    map['name'] = name;
+    map['business_id'] = businessId;
+    map['start_time'] = startTime;
+    map['end_time'] = endTime;
+    map['start_break_time'] = startBreakTime;
+    map['end_break_time'] = endBreakTime;
+    map['break_time'] = breakTime;
+    map['break_status'] = breakStatus;
+    map['status'] = status;
+    map['created_at'] = createdAt;
+    map['updated_at'] = updatedAt;
+    return map;
+  }
+}

lib/Screens/hrm/shift/add_new_shift.dart

@@ -0,0 +1,316 @@
+// File: add_new_shift.dart (Shift Name Changed back to Dropdown)
+
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:mobile_pos/Screens/hrm/shift/Model/shift_list_model.dart';
+import 'package:mobile_pos/Screens/hrm/shift/repo/shift_repo.dart';
+import 'package:mobile_pos/generated/l10n.dart' as l;
+import 'package:icons_plus/icons_plus.dart';
+import '../../../constant.dart';
+import '../widgets/set_time.dart';
+import 'package:intl/intl.dart';
+
+class AddNewShift extends ConsumerStatefulWidget {
+  const AddNewShift({super.key, this.isEdit = false, this.shift});
+
+  final bool isEdit;
+  final ShiftData? shift;
+
+  @override
+  ConsumerState<AddNewShift> createState() => _AddNewShiftState();
+}
+
+class _AddNewShiftState extends ConsumerState<AddNewShift> {
+  final GlobalKey<FormState> _key = GlobalKey();
+
+  // *** CHANGED: Shift Name is now managed by selectedShift String? ***
+  String? selectedShift;
+  // shiftNameController is now unnecessary for dropdown, but kept for cleanup clarity
+  final TextEditingController shiftNameController = TextEditingController();
+
+  String? selectedBreakStatus;
+  String? _selectedStatus;
+
+  final startTimeController = TextEditingController();
+  final endTimeController = TextEditingController();
+  final startBreakTimeController = TextEditingController();
+  final endBreakTimeController = TextEditingController();
+
+  final List<String> _statusOptions = ['Active', 'Inactive'];
+  final List<String> _shiftNameOptions = ['Morning', "Day", "Evening", 'Night']; // Fixed list for dropdown
+
+  String formatTime(String time24) {
+    try {
+      DateTime parsedTime = DateFormat("HH:mm:ss").parse(time24);
+      return DateFormat("h:mm a").format(parsedTime);
+    } catch (e) {
+      return time24;
+    }
+  }
+
+  @override
+  void initState() {
+    super.initState();
+    if (widget.isEdit && widget.shift != null) {
+      final data = widget.shift!;
+
+      // *** FIX: Use Shift Name from data for selectedShift state ***
+      selectedShift = data.name;
+
+      selectedBreakStatus = data.breakStatus == 'yes' ? "Yes" : "No";
+      _selectedStatus = data.status == 1 ? 'Active' : 'Inactive';
+
+      startTimeController.text = formatTime(data.startTime ?? '');
+      endTimeController.text = formatTime(data.endTime ?? '');
+      startBreakTimeController.text = formatTime(data.startBreakTime ?? '');
+      endBreakTimeController.text = formatTime(data.endBreakTime ?? '');
+    } else {
+      _selectedStatus = 'Active';
+      selectedBreakStatus = 'No';
+    }
+  }
+
+  @override
+  void dispose() {
+    // shiftNameController.dispose(); // No longer needed if using dropdown
+    startTimeController.dispose();
+    endTimeController.dispose();
+    startBreakTimeController.dispose();
+    endBreakTimeController.dispose();
+    super.dispose();
+  }
+
+  Future<void> _saveOrUpdateShift(BuildContext context) async {
+    if (!_key.currentState!.validate()) return;
+
+    // Check if the required state variables are set by the dropdowns
+    if (selectedShift == null) {
+      ScaffoldMessenger.of(context).showSnackBar(
+        const SnackBar(content: Text('Please select Shift Name')),
+      );
+      return;
+    }
+
+    final repo = ShiftRepo();
+    final int apiStatus = _selectedStatus == 'Active' ? 1 : 0;
+
+    // Ensure times are in HH:mm format before sending (setTime uses HH:mm a,
+    // but the repo needs to handle conversion to HH:mm:ss if necessary)
+
+    if (widget.isEdit) {
+      await repo.updateShift(
+        ref: ref,
+        context: context,
+        id: widget.shift!.id!.round(),
+        shiftName: selectedShift!,
+        breakStatus: selectedBreakStatus!,
+        startTime: startTimeController.text,
+        endTime: endTimeController.text,
+        breakStartTime: startBreakTimeController.text.isEmpty ? null : startBreakTimeController.text,
+        breakEndTime: endBreakTimeController.text.isEmpty ? null : endBreakTimeController.text,
+        status: apiStatus.toString(),
+      );
+    } else {
+      await repo.createShift(
+        ref: ref,
+        context: context,
+        shiftName: selectedShift!,
+        breakStatus: selectedBreakStatus ?? "No",
+        startTime: startTimeController.text,
+        endTime: endTimeController.text,
+        breakStartTime: startBreakTimeController.text.isEmpty ? null : startBreakTimeController.text,
+        breakEndTime: endBreakTimeController.text.isEmpty ? null : endBreakTimeController.text,
+        status: apiStatus.toString(),
+      );
+    }
+  }
+
+  void _resetForm() {
+    _key.currentState?.reset();
+    setState(() {
+      selectedShift = null; // Reset dropdown selection
+      selectedBreakStatus = 'No';
+      _selectedStatus = 'Active';
+
+      // Reset time controllers
+      startTimeController.clear();
+      endTimeController.clear();
+      startBreakTimeController.clear();
+      endBreakTimeController.clear();
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final _lang = l.S.of(context);
+    return Scaffold(
+      backgroundColor: kWhite,
+      appBar: AppBar(
+        centerTitle: true,
+        title: Text(
+          widget.isEdit ? _lang.editShift : _lang.addNewShift,
+        ),
+        bottom: PreferredSize(
+          preferredSize: const Size.fromHeight(1),
+          child: Divider(height: 2, color: kBackgroundColor),
+        ),
+      ),
+      body: SingleChildScrollView(
+        padding: const EdgeInsets.all(16),
+        child: Form(
+          key: _key,
+          child: Column(
+            children: [
+              // 1. Shift Name (FIXED: Changed back to Dropdown)
+              DropdownButtonFormField<String>(
+                value: selectedShift,
+                icon: const Icon(Icons.keyboard_arrow_down, color: kNeutral800),
+                decoration: InputDecoration(labelText: _lang.shiftName, hintText: _lang.selectOne),
+                items: _shiftNameOptions
+                    .map((String value) => DropdownMenuItem(value: value, child: Text(value)))
+                    .toList(),
+                onChanged: (String? newValue) => setState(() => selectedShift = newValue),
+                validator: (value) => value == null ? _lang.pleaseSelectAShift : null,
+              ),
+              const SizedBox(height: 20),
+
+              // 2. Break Status Dropdown
+              DropdownButtonFormField<String>(
+                value: selectedBreakStatus,
+                icon: const Icon(Icons.keyboard_arrow_down, color: kNeutral800),
+                decoration: InputDecoration(
+                  labelText: _lang.breakStatus,
+                  hintText: _lang.selectOne,
+                ),
+                items: const ['Yes', 'No']
+                    .map((String value) => DropdownMenuItem(value: value, child: Text(value)))
+                    .toList(),
+                onChanged: (String? newValue) => setState(() => selectedBreakStatus = newValue),
+                validator: (value) => value == null ? _lang.pleaseSelectBreakStatus : null,
+              ),
+              const SizedBox(height: 20),
+
+              // 3. Status Dropdown
+              DropdownButtonFormField<String>(
+                value: _selectedStatus,
+                icon: const Icon(Icons.keyboard_arrow_down, color: kNeutral800),
+                decoration: InputDecoration(
+                  labelText: _lang.status,
+                  hintText: _lang.selectOne,
+                ),
+                items:
+                    _statusOptions.map((String value) => DropdownMenuItem(value: value, child: Text(value))).toList(),
+                onChanged: (String? newValue) => setState(() => _selectedStatus = newValue),
+                validator: (value) => value == null ? _lang.pleaseSelectAStatus : null,
+              ),
+              const SizedBox(height: 20),
+
+              // 4. Start Time & End Time
+              Row(
+                children: [
+                  Expanded(
+                    child: TextFormField(
+                      onTap: () => setTime(startTimeController, context),
+                      readOnly: true,
+                      controller: startTimeController,
+                      validator: (value) => value.isNullOrEmpty() ? _lang.startTimeIsRequired : null,
+                      decoration: InputDecoration(
+                        labelText: _lang.startTime,
+                        hintText: _lang.enterStartTime,
+                        suffixIcon: Icon(
+                          AntDesign.clock_circle_outline,
+                          size: 18,
+                          color: kNeutral800,
+                        ),
+                      ),
+                    ),
+                  ),
+                  const SizedBox(width: 16),
+                  Expanded(
+                    child: TextFormField(
+                      readOnly: true,
+                      controller: endTimeController,
+                      onTap: () => setTime(endTimeController, context),
+                      validator: (value) => value.isNullOrEmpty() ? _lang.endTimeIsRequired : null,
+                      decoration: InputDecoration(
+                        labelText: _lang.endTime,
+                        hintText: _lang.enterEndTime,
+                        suffixIcon: Icon(
+                          AntDesign.clock_circle_outline,
+                          size: 18,
+                          color: kNeutral800,
+                        ),
+                      ),
+                    ),
+                  ),
+                ],
+              ),
+              const SizedBox(height: 20),
+
+              // 5. Break Time (Conditional)
+              if (selectedBreakStatus == 'Yes')
+                Row(
+                  children: [
+                    Expanded(
+                      child: TextFormField(
+                        onTap: () => setTime(startBreakTimeController, context),
+                        readOnly: true,
+                        controller: startBreakTimeController,
+                        decoration: InputDecoration(
+                          labelText: _lang.startBreakTime,
+                          hintText: _lang.enterBreakTime,
+                          suffixIcon: Icon(
+                            AntDesign.clock_circle_outline,
+                            size: 18,
+                            color: kNeutral800,
+                          ),
+                        ),
+                      ),
+                    ),
+                    const SizedBox(width: 16),
+                    Expanded(
+                      child: TextFormField(
+                        readOnly: true,
+                        controller: endBreakTimeController,
+                        onTap: () => setTime(endBreakTimeController, context),
+                        decoration: InputDecoration(
+                          labelText: _lang.endBreakTime,
+                          hintText: _lang.enterBreakTime,
+                          suffixIcon: Icon(
+                            AntDesign.clock_circle_outline,
+                            size: 18,
+                            color: kNeutral800,
+                          ),
+                        ),
+                      ),
+                    ),
+                  ],
+                ),
+              const SizedBox(height: 20),
+
+              // 6. Action Buttons
+              Row(
+                children: [
+                  Expanded(
+                    child: OutlinedButton(onPressed: _resetForm, child: Text(_lang.resets)),
+                  ),
+                  const SizedBox(width: 16),
+                  Expanded(
+                    child: ElevatedButton(
+                        onPressed: () => _saveOrUpdateShift(context),
+                        child: Text(widget.isEdit ? _lang.update : _lang.save)),
+                  ),
+                ],
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}
+
+// Extension to help with simple validation checks
+extension on String? {
+  bool isNullOrEmpty() => this == null || this!.isEmpty;
+}

lib/Screens/hrm/shift/provider/shift_list_provider.dart

@@ -0,0 +1,8 @@
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:mobile_pos/Screens/hrm/department/model/department_list_model.dart';
+import 'package:mobile_pos/Screens/hrm/department/repo/department_repo.dart';
+import 'package:mobile_pos/Screens/hrm/shift/Model/shift_list_model.dart';
+import 'package:mobile_pos/Screens/hrm/shift/repo/shift_repo.dart';
+
+ShiftRepo repo = ShiftRepo();
+final shiftListProvider = FutureProvider<ShiftListModel>((ref) => repo.fetchAllShifts());

lib/Screens/hrm/shift/repo/shift_repo.dart

@@ -0,0 +1,185 @@
+// ignore_for_file: use_build_context_synchronously
+import 'dart:convert';
+import 'package:flutter/material.dart';
+import 'package:flutter_easyloading/flutter_easyloading.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:http/http.dart' as http;
+import 'package:mobile_pos/Screens/hrm/shift/Model/shift_list_model.dart';
+import 'package:mobile_pos/Screens/hrm/shift/provider/shift_list_provider.dart';
+import '../../../../Const/api_config.dart';
+import '../../../../http_client/custome_http_client.dart';
+import '../../../../http_client/customer_http_client_get.dart';
+import 'package:intl/intl.dart';
+
+class ShiftRepo {
+  String convertTo24HourFormat(String time12h) {
+    // Example input: "8:00 PM"
+    final dateTime = DateFormat('h:mm a').parse(time12h);
+    return DateFormat('HH:mm').format(dateTime); // Output: "20:00"
+  }
+
+  /// Fetch all shifts
+  Future<ShiftListModel> fetchAllShifts() async {
+    CustomHttpClientGet clientGet = CustomHttpClientGet(client: http.Client());
+    final uri = Uri.parse('${APIConfig.url}/shifts');
+
+    final response = await clientGet.get(url: uri);
+
+    if (response.statusCode == 200) {
+      final parsedData = jsonDecode(response.body);
+      return ShiftListModel.fromJson(parsedData);
+    } else {
+      throw Exception('Failed to fetch Shift list');
+    }
+  }
+
+  /// Create new shift (form-data format)
+  Future<void> createShift({
+    required WidgetRef ref,
+    required BuildContext context,
+    required String shiftName,
+    required String breakStatus,
+    required String startTime,
+    required String endTime,
+    required String status,
+    String? breakStartTime,
+    String? breakEndTime,
+  }) async {
+    final uri = Uri.parse('${APIConfig.url}/shifts');
+
+    // Build form-data map (Postman style)
+    final Map<String, String> body = {
+      'name': shiftName,
+      'start_time': convertTo24HourFormat(startTime),
+      'status': status,
+      'end_time': convertTo24HourFormat(endTime),
+      'break_status': breakStatus.toLowerCase(), // yes/no
+      if (breakStartTime != null && breakStartTime.isNotEmpty) 'start_break_time': breakStatus.toLowerCase() == 'no' ? '' : convertTo24HourFormat(breakStartTime),
+      if (breakEndTime != null && breakEndTime.isNotEmpty) 'end_break_time': breakStatus.toLowerCase() == 'no' ? '' : convertTo24HourFormat(breakEndTime),
+    };
+
+    try {
+      EasyLoading.show(status: 'Saving...');
+      CustomHttpClient client = CustomHttpClient(client: http.Client(), context: context, ref: ref);
+
+      print("POST Data For: $body");
+
+      final response = await client.post(
+        url: uri,
+        body: body, // form-data
+        addContentTypeInHeader: false, // important for form-data
+      );
+
+      EasyLoading.dismiss();
+
+      final parsed = jsonDecode(response.body);
+
+      if (response.statusCode == 200 || response.statusCode == 201) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          const SnackBar(content: Text('Shift created successfully!')),
+        );
+        ref.refresh(shiftListProvider);
+        Navigator.pop(context);
+      } else {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text('Failed to create shift: ${parsed['message']}')),
+        );
+      }
+    } catch (e) {
+      EasyLoading.dismiss();
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text('Error: $e')),
+      );
+    }
+  }
+
+  /// Update existing shift (form-data format)
+  Future<void> updateShift({
+    required WidgetRef ref,
+    required BuildContext context,
+    required int id,
+    required String shiftName,
+    required String breakStatus,
+    required String startTime,
+    required String endTime,
+    required String status,
+    String? breakStartTime,
+    String? breakEndTime,
+  }) async {
+    final uri = Uri.parse('${APIConfig.url}/shifts/$id');
+
+    final Map<String, String> body = {
+      "_method": 'put',
+      'name': shiftName,
+      'status': status,
+      'start_time': convertTo24HourFormat(startTime),
+      'end_time': convertTo24HourFormat(endTime),
+      'break_status': breakStatus.toLowerCase(),
+      if (breakStartTime != null && breakStartTime.isNotEmpty) 'start_break_time': breakStatus.toLowerCase() == 'no' ? '' : convertTo24HourFormat(breakStartTime),
+      if (breakEndTime != null && breakEndTime.isNotEmpty) 'end_break_time': breakStatus.toLowerCase() == 'no' ? '' : convertTo24HourFormat(breakEndTime),
+    };
+
+    try {
+      EasyLoading.show(status: 'Updating...');
+      CustomHttpClient client = CustomHttpClient(client: http.Client(), context: context, ref: ref);
+
+      final response = await client.post(
+        url: uri,
+        body: body,
+        addContentTypeInHeader: false, // still form-data
+      );
+
+      EasyLoading.dismiss();
+
+      final parsed = jsonDecode(response.body);
+
+      if (response.statusCode == 200) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          const SnackBar(content: Text('Shift updated successfully!')),
+        );
+        ref.refresh(shiftListProvider);
+        Navigator.pop(context);
+      } else {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text('Failed to update shift: ${parsed['message']}')),
+        );
+      }
+    } catch (e) {
+      EasyLoading.dismiss();
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text('Error: $e')),
+      );
+    }
+  }
+
+  /// Delete shift
+  Future<bool> deleteShift({
+    required WidgetRef ref,
+    required BuildContext context,
+    required int id,
+  }) async {
+    final uri = Uri.parse('${APIConfig.url}/shifts/$id');
+
+    try {
+      EasyLoading.show(status: 'Deleting...');
+      CustomHttpClient client = CustomHttpClient(client: http.Client(), context: context, ref: ref);
+      final response = await client.delete(url: uri);
+
+      EasyLoading.dismiss();
+
+      if (response.statusCode == 200) {
+        return true;
+      } else {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text('Failed to delete shift: ${response.body}')),
+        );
+      }
+    } catch (e) {
+      EasyLoading.dismiss();
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text('Error: $e')),
+      );
+    }
+    return false;
+  }
+}

lib/Screens/hrm/shift/shift_screen.dart

@@ -0,0 +1,287 @@
+// ignore_for_file: use_build_context_synchronously
+import 'package:flutter/material.dart';
+import 'package:flutter_easyloading/flutter_easyloading.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:hugeicons/hugeicons.dart';
+import 'package:intl/intl.dart';
+import 'package:mobile_pos/Screens/hrm/shift/add_new_shift.dart';
+import 'package:mobile_pos/Screens/hrm/shift/provider/shift_list_provider.dart';
+import 'package:mobile_pos/Screens/hrm/shift/repo/shift_repo.dart';
+import 'package:mobile_pos/Screens/hrm/shift/Model/shift_list_model.dart';
+import 'package:mobile_pos/Screens/hrm/widgets/global_search_appbar.dart';
+import 'package:mobile_pos/Screens/hrm/widgets/model_bottom_sheet.dart';
+import 'package:mobile_pos/Screens/hrm/widgets/deleteing_alart_dialog.dart';
+import 'package:mobile_pos/constant.dart';
+
+import '../../../generated/l10n.dart' as lang;
+import '../../../service/check_user_role_permission_provider.dart';
+import '../../../widgets/empty_widget/_empty_widget.dart';
+
+class ShiftScreen extends ConsumerStatefulWidget {
+  const ShiftScreen({super.key});
+
+  @override
+  ConsumerState<ShiftScreen> createState() => _ShiftScreenState();
+}
+
+class _ShiftScreenState extends ConsumerState<ShiftScreen> {
+  bool _isSearch = false;
+  final _searchController = TextEditingController();
+  String _searchQuery = '';
+
+  @override
+  void dispose() {
+    _searchController.dispose();
+    super.dispose();
+  }
+
+  Future<void> _refreshList() async {
+    ref.refresh(shiftListProvider);
+  }
+
+  /// ✅ Convert "HH:mm" to "hh:mm a" format safely
+  String _formatToAmPm(String? time) {
+    if (time == null || time.isEmpty || !time.contains(':')) return 'n/a';
+    try {
+      final date = DateFormat("HH:mm").parse(time);
+      return DateFormat("hh:mm a").format(date);
+    } catch (_) {
+      return time; // fallback
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final asyncShifts = ref.watch(shiftListProvider);
+    final permissionService = PermissionService(ref);
+    final _lang = lang.S.of(context);
+
+    return Scaffold(
+      backgroundColor: Colors.white,
+      appBar: GlobalSearchAppBar(
+        isSearch: _isSearch,
+        onSearchToggle: () => setState(() {
+          _isSearch = !_isSearch;
+          _searchQuery = '';
+          _searchController.clear();
+        }),
+        title: _lang.shift,
+        controller: _searchController,
+        onChanged: (query) {
+          setState(() {
+            _searchQuery = query.toLowerCase().trim();
+          });
+        },
+      ),
+      body: RefreshIndicator(
+        onRefresh: _refreshList,
+        child: asyncShifts.when(
+          data: (shiftList) {
+            if (!permissionService.hasPermission(Permit.shiftsRead.value)) {
+              return const Center(child: PermitDenyWidget());
+            }
+            final allShifts = shiftList.data ?? [];
+
+            // ✅ Apply search filter
+            final shifts = allShifts.where((shift) {
+              final name = (shift.name ?? '').toLowerCase();
+              return name.contains(_searchQuery);
+            }).toList();
+
+            if (shifts.isEmpty) {
+              return Center(child: Text(_lang.noShiftFound));
+            }
+
+            return ListView.separated(
+              padding: EdgeInsets.zero,
+              itemCount: shifts.length,
+              separatorBuilder: (_, __) => const Divider(
+                color: kBackgroundColor,
+                height: 2,
+              ),
+              itemBuilder: (_, index) {
+                final shift = shifts[index];
+                return _buildShiftItem(context, shift);
+              },
+            );
+          },
+          loading: () => const Center(child: CircularProgressIndicator()),
+          error: (e, _) => Center(child: Text('Error: $e')),
+        ),
+      ),
+      bottomNavigationBar: permissionService.hasPermission(Permit.shiftsCreate.value)
+          ? Padding(
+              padding: const EdgeInsets.all(16),
+              child: ElevatedButton.icon(
+                onPressed: () => Navigator.push(
+                  context,
+                  MaterialPageRoute(
+                    builder: (context) => const AddNewShift(isEdit: false),
+                  ),
+                ),
+                icon: const Icon(Icons.add, color: Colors.white),
+                label: Text(_lang.addShift),
+              ),
+            )
+          : null,
+    );
+  }
+
+  Widget _buildShiftItem(BuildContext context, ShiftData shift) {
+    final theme = Theme.of(context);
+
+    return InkWell(
+      onTap: () => viewModalSheet(
+        context: context,
+        item: {
+          lang.S.of(context).shift: shift.name ?? 'n/a',
+          lang.S.of(context).startTime: _formatToAmPm(shift.startTime),
+          lang.S.of(context).endTime: _formatToAmPm(shift.endTime),
+          lang.S.of(context).breakTime: (shift.startBreakTime == null ||
+                  shift.startBreakTime!.isEmpty ||
+                  shift.endBreakTime == null ||
+                  shift.endBreakTime!.isEmpty)
+              ? 'N/A'
+              : "${_formatToAmPm(shift.startBreakTime)} - ${_formatToAmPm(shift.endBreakTime)}",
+          lang.S.of(context).breakDuration: shift.breakTime?.isEmpty ?? true ? 'N/A' : shift.breakTime!,
+          lang.S.of(context).status: shift.status == 1 ? lang.S.of(context).active : lang.S.of(context).inactive,
+        },
+      ),
+      child: Padding(
+        padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 13.5),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Text(
+              shift.name ?? 'n/a',
+              style: theme.textTheme.titleMedium?.copyWith(
+                fontWeight: FontWeight.w600,
+              ),
+            ),
+            const SizedBox(height: 10),
+            if (shift.breakStatus == 'yes')
+              Text.rich(
+                TextSpan(
+                  text: '${lang.S.of(context).breakTime}: ',
+                  style: const TextStyle(color: kNeutral800),
+                  children: [
+                    TextSpan(
+                      text: '${_formatToAmPm(shift.startBreakTime)} - ${_formatToAmPm(shift.endBreakTime)}',
+                      style: const TextStyle(color: kTitleColor),
+                    ),
+                  ],
+                ),
+                style: theme.textTheme.bodyMedium,
+              ),
+            const SizedBox(height: 20.5),
+            Row(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: [
+                _buildTimeColumn(_formatToAmPm(shift.startTime), lang.S.of(context).startTime, theme),
+                _buildTimeColumn(_formatToAmPm(shift.endTime), lang.S.of(context).endTime, theme),
+                _buildActionButtons(context, shift),
+              ],
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildTimeColumn(String time, String label, ThemeData theme) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Text(
+          time,
+          style: theme.textTheme.titleMedium?.copyWith(
+            fontWeight: FontWeight.w600,
+          ),
+        ),
+        const SizedBox(height: 8),
+        Text(
+          label,
+          style: theme.textTheme.bodyMedium?.copyWith(color: kNeutral800),
+        ),
+      ],
+    );
+  }
+
+  Widget _buildActionButtons(BuildContext context, shift) {
+    final _lang = lang.S.of(context);
+    final permissionService = PermissionService(ref);
+    return Column(
+      children: [
+        GestureDetector(
+          onTap: () {
+            if (!permissionService.hasPermission(Permit.shiftsUpdate.value)) {
+              ScaffoldMessenger.of(context).showSnackBar(
+                SnackBar(
+                  backgroundColor: Colors.red,
+                  content: Text(_lang.youDoNotToHavePermissionToUpdateShift),
+                ),
+              );
+              return;
+            }
+            Navigator.push(
+              context,
+              MaterialPageRoute(
+                builder: (context) => AddNewShift(
+                  isEdit: true,
+                  shift: shift,
+                ),
+              ),
+            );
+          },
+          child: const HugeIcon(
+            icon: HugeIcons.strokeRoundedPencilEdit02,
+            color: kSuccessColor,
+            size: 20,
+          ),
+        ),
+        const SizedBox(height: 8),
+        GestureDetector(
+          onTap: () async {
+            if (!permissionService.hasPermission(Permit.shiftsDelete.value)) {
+              ScaffoldMessenger.of(context).showSnackBar(
+                SnackBar(
+                  backgroundColor: Colors.red,
+                  content: Text(lang.S.of(context).youDoNotToHavePermissionToDeleteShift),
+                ),
+              );
+              return;
+            }
+            final _lang = lang.S.of(context);
+            final confirm = await showDeleteConfirmationDialog(
+              itemName: _lang.shift,
+              context: context,
+            );
+
+            if (confirm) {
+              EasyLoading.show(status: _lang.deleting);
+              final repo = ShiftRepo();
+              try {
+                final result = await repo.deleteShift(id: shift.id, ref: ref, context: context);
+                if (result) {
+                  ref.refresh(shiftListProvider);
+                  EasyLoading.showSuccess(_lang.deletedSuccessFully);
+                } else {
+                  EasyLoading.showError('Failed to delete the Shift');
+                }
+              } catch (e) {
+                EasyLoading.showError('Error: $e');
+              } finally {
+                EasyLoading.dismiss();
+              }
+            }
+          },
+          child: const HugeIcon(
+            icon: HugeIcons.strokeRoundedDelete03,
+            color: Colors.red,
+            size: 20,
+          ),
+        ),
+      ],
+    );
+  }
+}

lib/Screens/hrm/widgets/deleteing_alart_dialog.dart

@@ -0,0 +1,72 @@
+import 'package:flutter/material.dart';
+import 'package:mobile_pos/generated/l10n.dart' as l;
+import 'package:flutter_svg/flutter_svg.dart';
+
+Future<bool> showDeleteConfirmationDialog({
+  required BuildContext context,
+  required String itemName, // Name of the item to delete
+}) async {
+  final _theme = Theme.of(context);
+  final _lang = l.S.of(context);
+  return await showDialog(
+    barrierDismissible: false,
+    context: context,
+    builder: (BuildContext dialogContext) {
+      return Padding(
+        padding: const EdgeInsets.all(16.0),
+        child: Center(
+          child: Container(
+            decoration: const BoxDecoration(
+              color: Colors.white,
+              borderRadius: BorderRadius.all(
+                Radius.circular(15),
+              ),
+            ),
+            child: Padding(
+              padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 30),
+              child: Column(
+                mainAxisSize: MainAxisSize.min,
+                crossAxisAlignment: CrossAxisAlignment.center,
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: [
+                  Text(
+                    '${_lang.doYouReallyWantToDeleteThis}  $itemName?',
+                    style: _theme.textTheme.titleLarge?.copyWith(
+                      fontWeight: FontWeight.w500,
+                      color: Colors.black,
+                    ),
+                    textAlign: TextAlign.center,
+                  ),
+                  SizedBox(height: 26),
+                  Center(child: SvgPicture.asset('assets/hrm/delete.svg')),
+                  SizedBox(height: 26),
+                  Row(
+                    children: [
+                      Expanded(
+                        child: OutlinedButton(
+                          onPressed: () {
+                            Navigator.pop(context, false);
+                          },
+                          child: Text(_lang.no),
+                        ),
+                      ),
+                      SizedBox(width: 16),
+                      Expanded(
+                        child: ElevatedButton(
+                          onPressed: () {
+                            Navigator.pop(context, true);
+                          },
+                          child: Text(_lang.yes),
+                        ),
+                      ),
+                    ],
+                  )
+                ],
+              ),
+            ),
+          ),
+        ),
+      );
+    },
+  );
+}

lib/Screens/hrm/widgets/filter_dropdown.dart

@@ -0,0 +1,102 @@
+import 'package:dropdown_button2/dropdown_button2.dart';
+import 'package:flutter/material.dart';
+import 'package:mobile_pos/generated/l10n.dart' as l;
+import 'package:mobile_pos/constant.dart';
+
+class FilterDropdownButton<T> extends StatefulWidget {
+  const FilterDropdownButton({
+    super.key,
+    this.value,
+    required this.items,
+    this.onChanged,
+    this.buttonDecoration,
+    this.hint,
+    this.buttonHeight = 40,
+    this.buttonWidth,
+    this.dropdownWidth,
+    this.icon,
+    this.iconSize = 24,
+    this.dropdownDecoration,
+    this.selectedItemBuilder,
+  });
+
+  final T? value;
+  final List<DropdownMenuItem<T>> items;
+  final ValueChanged<T?>? onChanged;
+  final BoxDecoration? buttonDecoration;
+  final Widget? hint;
+  final double buttonHeight;
+  final double? buttonWidth;
+  final double? dropdownWidth;
+  final Widget? icon;
+  final double iconSize;
+  final BoxDecoration? dropdownDecoration;
+  final DropdownButtonBuilder? selectedItemBuilder;
+
+  @override
+  State<FilterDropdownButton<T>> createState() => _FilterDropdownButtonState<T>();
+}
+
+class _FilterDropdownButtonState<T> extends State<FilterDropdownButton<T>> {
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+    final isDarkMode = theme.brightness == Brightness.dark;
+
+    return DropdownButtonHideUnderline(
+      child: DropdownButton2<T>(
+        isExpanded: true,
+        value: widget.value,
+        items: widget.items,
+        onChanged: widget.onChanged,
+        selectedItemBuilder: widget.selectedItemBuilder,
+        hint: widget.hint ?? Text(l.S.of(context).selectOne),
+        buttonStyleData: ButtonStyleData(
+          height: widget.buttonHeight,
+          width: widget.buttonWidth,
+          padding: const EdgeInsets.symmetric(horizontal: 2),
+          decoration: widget.buttonDecoration ??
+              BoxDecoration(
+                borderRadius: BorderRadius.circular(5),
+                border: Border.all(
+                  color: kBorderColor,
+                ),
+                color: isDarkMode ? Colors.grey.shade900 : Colors.white,
+              ),
+          elevation: 0,
+        ),
+        iconStyleData: IconStyleData(
+          icon: widget.icon ??
+              const Icon(
+                Icons.keyboard_arrow_down,
+                color: kNeutral800,
+              ),
+          iconSize: widget.iconSize,
+          iconEnabledColor: theme.iconTheme.color,
+          iconDisabledColor: Colors.grey,
+        ),
+        dropdownStyleData: DropdownStyleData(
+          maxHeight: 250,
+          width: widget.dropdownWidth,
+          padding: null,
+          decoration: widget.dropdownDecoration ??
+              BoxDecoration(
+                borderRadius: BorderRadius.circular(8),
+                color: isDarkMode ? Colors.grey.shade900 : Colors.white,
+              ),
+          elevation: 4,
+          // offset: const Offset(0, 0),
+          scrollbarTheme: ScrollbarThemeData(
+            radius: const Radius.circular(40),
+            thickness: WidgetStateProperty.all<double>(6),
+            thumbVisibility: WidgetStateProperty.all<bool>(true),
+          ),
+        ),
+        menuItemStyleData: const MenuItemStyleData(
+          height: 40,
+          padding: EdgeInsets.symmetric(horizontal: 12),
+        ),
+      ),
+    );
+  }
+}

lib/Screens/hrm/widgets/global_search_appbar.dart

@@ -0,0 +1,80 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_feather_icons/flutter_feather_icons.dart';
+import 'package:mobile_pos/generated/l10n.dart' as l;
+
+import '../../../constant.dart';
+
+class GlobalSearchAppBar extends StatelessWidget implements PreferredSizeWidget {
+  final bool isSearch;
+  final VoidCallback onSearchToggle;
+  final String title;
+  final TextEditingController? controller;
+  final ValueChanged<String>? onChanged;
+  final PopupMenuItemSelected<dynamic>? onManuSelect;
+  final List<PopupMenuItem>? popupMenuButtons;
+
+  const GlobalSearchAppBar({
+    super.key,
+    required this.isSearch,
+    required this.onSearchToggle,
+    required this.title,
+    this.controller,
+    this.onChanged,
+    this.popupMenuButtons,
+    this.onManuSelect,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return AppBar(
+      title: isSearch
+          ? TextField(
+              autofocus: true,
+              controller: controller,
+              onChanged: onChanged,
+              decoration: InputDecoration(
+                hintText: '${l.S.of(context).searchH}...',
+                border: InputBorder.none,
+                suffixIcon: Icon(
+                  FeatherIcons.search,
+                  // size: 18,
+                  color: kNeutral800,
+                ),
+              ),
+            )
+          : Text(title),
+      centerTitle: true,
+      automaticallyImplyLeading: !isSearch,
+      actions: [
+        IconButton(
+          style: ButtonStyle(
+            overlayColor: WidgetStatePropertyAll(Colors.transparent),
+          ),
+          visualDensity: const VisualDensity(horizontal: -4),
+          padding: EdgeInsets.only(right: 16),
+          onPressed: onSearchToggle,
+          icon: Icon(
+            isSearch ? Icons.close : FeatherIcons.search,
+            color: isSearch ? kMainColor : kNeutral800,
+            size: isSearch ? null : 22,
+          ),
+        ),
+        if (popupMenuButtons != null)
+          PopupMenuButton(
+            onSelected: onManuSelect,
+            itemBuilder: (context) => popupMenuButtons!,
+            icon: const Icon(Icons.more_vert),
+          )
+      ],
+      bottom: PreferredSize(
+          preferredSize: Size.fromHeight(1),
+          child: Divider(
+            height: 2,
+            color: kBackgroundColor,
+          )),
+    );
+  }
+
+  @override
+  Size get preferredSize => Size.fromHeight(isSearch ? 65 : kToolbarHeight);
+}

lib/Screens/hrm/widgets/label_style.dart

@@ -0,0 +1,16 @@
+import 'package:flutter/material.dart';
+
+Widget labelSpan({required String title, required BuildContext context}) {
+  final _theme = Theme.of(context);
+  return Text.rich(
+    TextSpan(text: title, children: [
+      TextSpan(
+        text: '*',
+        style: TextStyle(color: Colors.red),
+      )
+    ]),
+    style: _theme.textTheme.titleSmall?.copyWith(
+      fontWeight: FontWeight.w500,
+    ),
+  );
+}

lib/Screens/hrm/widgets/model_bottom_sheet.dart

@@ -0,0 +1,138 @@
+import 'package:flutter/material.dart';
+import 'package:mobile_pos/generated/l10n.dart' as l;
+import '../../../Const/api_config.dart';
+import '../../../constant.dart';
+
+void viewModalSheet({
+  required BuildContext context,
+  required Map<String, String> item,
+  String? description,
+  bool? showImage,
+  String? image,
+  String? descriptionTitle,
+}) {
+  final _theme = Theme.of(context);
+
+  showModalBottomSheet(
+    context: context,
+    isScrollControlled: true,
+    useSafeArea: true,
+    isDismissible: false,
+    builder: (BuildContext context) {
+      return SingleChildScrollView(
+        padding: EdgeInsets.only(
+          bottom: MediaQuery.of(context).viewInsets.bottom,
+        ),
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            Padding(
+              padding: EdgeInsetsDirectional.only(start: 16),
+              child: Row(
+                mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                children: [
+                  Text(
+                    l.S.of(context).viewDetails,
+                    style: _theme.textTheme.titleMedium?.copyWith(
+                      fontWeight: FontWeight.w600,
+                      fontSize: 18,
+                    ),
+                  ),
+                  IconButton(
+                    onPressed: () => Navigator.pop(context),
+                    icon: Icon(Icons.close, size: 18),
+                  )
+                ],
+              ),
+            ),
+            Divider(color: kBorderColor, height: 1),
+            Padding(
+              padding: const EdgeInsets.all(16.0),
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  if (showImage == true) ...[
+                    SizedBox(height: 15),
+                    image != null
+                        ? Center(
+                            child: Container(
+                              height: 120,
+                              width: 120,
+                              decoration: BoxDecoration(
+                                shape: BoxShape.circle,
+                                image: DecorationImage(
+                                  fit: BoxFit.cover,
+                                  image: NetworkImage('${APIConfig.domain}$image'),
+                                ),
+                              ),
+                            ),
+                          )
+                        : Center(
+                            child: Image.asset(
+                              height: 120,
+                              width: 120,
+                              fit: BoxFit.cover,
+                              'assets/hrm/image_icon.jpg',
+                            ),
+                          ),
+                    SizedBox(height: 21),
+                  ],
+                  Column(
+                    children: item.entries.map((entry) {
+                      return Padding(
+                        padding: const EdgeInsets.symmetric(vertical: 4.0),
+                        child: Row(
+                          crossAxisAlignment: CrossAxisAlignment.start,
+                          children: [
+                            Flexible(
+                              fit: FlexFit.tight,
+                              flex: 2,
+                              child: Text(
+                                '${entry.key} ',
+                                style: _theme.textTheme.bodyLarge?.copyWith(
+                                  color: kNeutral800,
+                                  fontWeight: FontWeight.w500,
+                                ),
+                              ),
+                            ),
+                            SizedBox(width: 8),
+                            Flexible(
+                              fit: FlexFit.tight,
+                              flex: 4,
+                              child: Text(
+                                ': ${entry.value}',
+                                style: _theme.textTheme.bodyLarge,
+                              ),
+                            ),
+                          ],
+                        ),
+                      );
+                    }).toList(),
+                  ),
+                  if (description != null) ...[
+                    SizedBox(height: 16),
+                    Text.rich(
+                      TextSpan(
+                          text: "${descriptionTitle ?? l.S.of(context).description}\n",
+                          style: _theme.textTheme.titleMedium?.copyWith(
+                            fontWeight: FontWeight.w500,
+                          ),
+                          children: [
+                            TextSpan(
+                              text: description,
+                              style: _theme.textTheme.bodyLarge?.copyWith(
+                                color: kNeutral800,
+                              ),
+                            )
+                          ]),
+                    ),
+                  ],
+                ],
+              ),
+            ),
+          ],
+        ),
+      );
+    },
+  );
+}

lib/Screens/hrm/widgets/set_time.dart

@@ -0,0 +1,86 @@
+// import 'package:flutter/material.dart';
+//
+// Future<void> setTime(TextEditingController controller, BuildContext context) async {
+//   TimeOfDay initialTime = TimeOfDay.now();
+//
+//   if (controller.text.isNotEmpty) {
+//     final timeParts = controller.text.split(' ');
+//     final time = timeParts[0].split(':');
+//     final period = timeParts[1];
+//
+//     int hour = int.parse(time[0]);
+//     if (period == 'PM' && hour != 12) hour += 12;
+//     if (period == 'AM' && hour == 12) hour = 0;
+//
+//     initialTime = TimeOfDay(hour: hour, minute: int.parse(time[1]));
+//   }
+//
+//   final TimeOfDay? picked = await showTimePicker(
+//     context: context,
+//     initialTime: initialTime,
+//     builder: (context, child) => MediaQuery(
+//       data: MediaQuery.of(context).copyWith(alwaysUse24HourFormat: false),
+//       child: child!,
+//     ),
+//   );
+//
+//   if (picked != null) {
+//     final hours = picked.hourOfPeriod;
+//     final minutes = picked.minute.toString().padLeft(2, '0');
+//     final period = picked.period == DayPeriod.am ? 'AM' : 'PM';
+//     controller.text = '$hours:$minutes $period';
+//   }
+// }
+
+import 'package:flutter/material.dart';
+
+Future<void> setTime(TextEditingController controller, BuildContext context) async {
+  TimeOfDay initialTime = TimeOfDay.now();
+
+  if (controller.text.isNotEmpty) {
+    final timeParts = controller.text.split(' ');
+    final time = timeParts[0].split(':');
+    final period = timeParts.length > 1 ? timeParts[1] : '';
+
+    int hour = int.parse(time[0]);
+    if (period == 'PM' && hour != 12) hour += 12;
+    if (period == 'AM' && hour == 12) hour = 0;
+
+    initialTime = TimeOfDay(hour: hour, minute: int.parse(time[1]));
+  }
+
+  final TimeOfDay? picked = await showTimePicker(
+    context: context,
+    initialTime: initialTime,
+    builder: (context, child) {
+      final theme = Theme.of(context);
+      return Theme(
+        data: theme.copyWith(
+          colorScheme: theme.colorScheme.copyWith(
+            primary: theme.colorScheme.primary, // active selection color
+            onPrimary: Colors.white, // text color on primary (e.g., white text)
+            surface: theme.colorScheme.surface, // dialog background
+            onSurface: theme.colorScheme.onSurface, // default text color
+          ),
+          timePickerTheme: TimePickerThemeData(
+            backgroundColor: theme.dialogBackgroundColor,
+            hourMinuteTextColor: theme.colorScheme.onSurface,
+            dialBackgroundColor: theme.colorScheme.surfaceVariant,
+            dialHandColor: theme.colorScheme.primary,
+          ),
+        ),
+        child: MediaQuery(
+          data: MediaQuery.of(context).copyWith(alwaysUse24HourFormat: false),
+          child: child!,
+        ),
+      );
+    },
+  );
+
+  if (picked != null) {
+    final hours = picked.hourOfPeriod == 0 ? 12 : picked.hourOfPeriod;
+    final minutes = picked.minute.toString().padLeft(2, '0');
+    final period = picked.period == DayPeriod.am ? 'AM' : 'PM';
+    controller.text = '$hours:$minutes $period';
+  }
+}