From 44bbbf9bfbb23235484cb8ebaf124103bc25ce3c Mon Sep 17 00:00:00 2001 From: Vaibhav Surve Date: Tue, 11 Nov 2025 19:21:53 +0530 Subject: [PATCH] fixed the assign project to eployeee issue after creating employee and added fabicon on expense details screen for assign to project --- .../employees/employee_detail_screen.dart | 27 +++++++++++++++++++ lib/view/employees/employees_screen.dart | 2 +- 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/lib/view/employees/employee_detail_screen.dart b/lib/view/employees/employee_detail_screen.dart index 7e72066..904d101 100644 --- a/lib/view/employees/employee_detail_screen.dart +++ b/lib/view/employees/employee_detail_screen.dart @@ -11,6 +11,7 @@ import 'package:marco/helpers/widgets/my_refresh_indicator.dart'; import 'package:marco/model/employees/add_employee_bottom_sheet.dart'; import 'package:marco/helpers/utils/mixins/ui_mixin.dart'; import 'package:marco/helpers/widgets/my_custom_skeleton.dart'; +import 'package:marco/view/employees/assign_employee_bottom_sheet.dart'; class EmployeeDetailPage extends StatefulWidget { final String employeeId; @@ -424,6 +425,32 @@ class _EmployeeDetailPageState extends State with UIMixin { ), ); }), + + // Floating “Assign to Project” FAB + floatingActionButton: Obx(() { + final employee = controller.selectedEmployeeDetails.value; + if (employee == null) return const SizedBox.shrink(); + + return FloatingActionButton.extended( + onPressed: () { + showModalBottomSheet( + context: context, + isScrollControlled: true, + backgroundColor: Colors.transparent, + builder: (context) => AssignProjectBottomSheet( + employeeId: widget.employeeId, + jobRoleId: employee.jobRoleId, + ), + ); + }, + backgroundColor: contentTheme.primary, + label: const Text( + 'Assign to Project', + style: TextStyle(fontSize: 14, fontWeight: FontWeight.w500), + ), + icon: const Icon(Icons.add), + ); + }), ); } } diff --git a/lib/view/employees/employees_screen.dart b/lib/view/employees/employees_screen.dart index dea9f7b..5a6d925 100644 --- a/lib/view/employees/employees_screen.dart +++ b/lib/view/employees/employees_screen.dart @@ -99,7 +99,7 @@ class _EmployeesScreenState extends State with UIMixin { backgroundColor: Colors.transparent, builder: (_) => AssignProjectBottomSheet( employeeId: employeeId, - jobRoleId: '', // no jobRoleId required + jobRoleId: employeeData['jobRoleId'] as String, ), );