admin/marco.pms.mobileapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Vaibhav_Feature-#768 #59

Closed
vaibhav.surve wants to merge 74 commits from Vaibhav_Feature-#768 into Feature_Expense
pull from: Vaibhav_Feature-#768
merge into: admin:Feature_Expense
Conversation 0 Commits 74 Files Changed 85 +380 -388
2 changed files with 380 additions and 388 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 008d35d576 - Show all commits

71
lib/controller/dashboard/employees_screen_controller.dart
View File

@ -17,24 +17,25 @@ class EmployeesScreenController extends GetxController {
RxBool isLoading = false.obs; RxBool isLoading = false.obs;
RxMap<String, RxBool> uploadingStates = <String, RxBool>{}.obs; RxMap<String, RxBool> uploadingStates = <String, RxBool>{}.obs;
Rxn<EmployeeDetailsModel> selectedEmployeeDetails = Rxn<EmployeeDetailsModel>(); Rxn<EmployeeDetailsModel> selectedEmployeeDetails =
Rxn<EmployeeDetailsModel>();
RxBool isLoadingEmployeeDetails = false.obs; RxBool isLoadingEmployeeDetails = false.obs;
@override @override
void onInit() { void onInit() {
super.onInit(); super.onInit();
fetchAllProjects(); isLoading.value = true;
fetchAllProjects().then((_) {
final projectId = Get.find<ProjectController>().selectedProject?.id; final projectId = Get.find<ProjectController>().selectedProject?.id;
if (projectId != null) {
if (projectId != null) { selectedProjectId = projectId;
selectedProjectId = projectId; fetchEmployeesByProject(projectId);
fetchEmployeesByProject(projectId); } else if (isAllEmployeeSelected.value) {
} else if (isAllEmployeeSelected.value) { fetchAllEmployees();
fetchAllEmployees(); } else {
} else { clearEmployees();
clearEmployees(); }
} });
} }
Future<void> fetchAllProjects() async { Future<void> fetchAllProjects() async {
@ -50,7 +51,8 @@ class EmployeesScreenController extends GetxController {
); );
}, },
onEmpty: () { onEmpty: () {
logSafe("No project data found or API call failed.", level: LogLevel.warning); logSafe("No project data found or API call failed.",
level: LogLevel.warning);
}, },
); );
@ -66,19 +68,19 @@ class EmployeesScreenController extends GetxController {
Future<void> fetchAllEmployees() async { Future<void> fetchAllEmployees() async {
isLoading.value = true; isLoading.value = true;
update(['employee_screen_controller']);
await _handleApiCall( await _handleApiCall(
ApiService.getAllEmployees, ApiService.getAllEmployees,
onSuccess: (data) { onSuccess: (data) {
employees.assignAll(data.map((json) => EmployeeModel.fromJson(json))); employees.assignAll(data.map((json) => EmployeeModel.fromJson(json)));
logSafe( logSafe("All Employees fetched: ${employees.length} employees loaded.",
"All Employees fetched: ${employees.length} employees loaded.", level: LogLevel.info);
level: LogLevel.info,
);
}, },
onEmpty: () { onEmpty: () {
employees.clear(); employees.clear();
logSafe("No Employee data found or API call failed.", level: LogLevel.warning); logSafe("No Employee data found or API call failed.",
level: LogLevel.warning);
}, },
); );
@ -88,7 +90,8 @@ class EmployeesScreenController extends GetxController {
Future<void> fetchEmployeesByProject(String? projectId) async { Future<void> fetchEmployeesByProject(String? projectId) async {
if (projectId == null || projectId.isEmpty) { if (projectId == null || projectId.isEmpty) {
logSafe("Project ID is required but was null or empty.", level: LogLevel.error); logSafe("Project ID is required but was null or empty.",
level: LogLevel.error);
return; return;
} }
@ -106,15 +109,21 @@ class EmployeesScreenController extends GetxController {
logSafe( logSafe(
"Employees fetched: ${employees.length} for project $projectId", "Employees fetched: ${employees.length} for project $projectId",
level: LogLevel.info, level: LogLevel.info,
); );
}, },
onEmpty: () { onEmpty: () {
employees.clear(); employees.clear();
logSafe("No employees found for project $projectId.", level: LogLevel.warning, ); logSafe(
"No employees found for project $projectId.",
level: LogLevel.warning,
);
}, },
onError: (e) { onError: (e) {
logSafe("Error fetching employees for project $projectId", level: LogLevel.error, error: e, ); logSafe(
"Error fetching employees for project $projectId",
level: LogLevel.error,
error: e,
);
}, },
); );
@ -131,15 +140,25 @@ class EmployeesScreenController extends GetxController {
() => ApiService.getEmployeeDetails(employeeId), () => ApiService.getEmployeeDetails(employeeId),
onSuccess: (data) { onSuccess: (data) {
selectedEmployeeDetails.value = EmployeeDetailsModel.fromJson(data); selectedEmployeeDetails.value = EmployeeDetailsModel.fromJson(data);
logSafe("Employee details loaded for $employeeId", level: LogLevel.info, ); logSafe(
"Employee details loaded for $employeeId",
level: LogLevel.info,
);
}, },
onEmpty: () { onEmpty: () {
selectedEmployeeDetails.value = null; selectedEmployeeDetails.value = null;
logSafe("No employee details found for $employeeId", level: LogLevel.warning, ); logSafe(
"No employee details found for $employeeId",
level: LogLevel.warning,
);
}, },
onError: (e) { onError: (e) {
selectedEmployeeDetails.value = null; selectedEmployeeDetails.value = null;
logSafe("Error fetching employee details for $employeeId", level: LogLevel.error, error: e, ); logSafe(
"Error fetching employee details for $employeeId",
level: LogLevel.error,
error: e,
);
}, },
); );

697
lib/view/employees/employees_screen.dart
View File

@ -4,7 +4,6 @@ import 'package:marco/helpers/theme/app_theme.dart';
import 'package:marco/helpers/utils/mixins/ui_mixin.dart'; import 'package:marco/helpers/utils/mixins/ui_mixin.dart';
import 'package:marco/helpers/widgets/my_spacing.dart'; import 'package:marco/helpers/widgets/my_spacing.dart';
import 'package:marco/helpers/widgets/my_text.dart'; import 'package:marco/helpers/widgets/my_text.dart';
import 'package:marco/controller/permission_controller.dart';
import 'package:marco/model/employees/add_employee_bottom_sheet.dart'; import 'package:marco/model/employees/add_employee_bottom_sheet.dart';
import 'package:marco/controller/dashboard/employees_screen_controller.dart'; import 'package:marco/controller/dashboard/employees_screen_controller.dart';
import 'package:marco/helpers/widgets/avatar.dart'; import 'package:marco/helpers/widgets/avatar.dart';
@ -23,210 +22,117 @@ class EmployeesScreen extends StatefulWidget {
} }
class _EmployeesScreenState extends State<EmployeesScreen> with UIMixin { class _EmployeesScreenState extends State<EmployeesScreen> with UIMixin {
final EmployeesScreenController employeeScreenController = final EmployeesScreenController _employeeController =
Get.put(EmployeesScreenController()); Get.put(EmployeesScreenController());
final PermissionController permissionController =
Get.put(PermissionController());
final TextEditingController _searchController = TextEditingController(); final TextEditingController _searchController = TextEditingController();
final RxList<EmployeeModel> _filteredEmployees = <EmployeeModel>[].obs; final RxList<EmployeeModel> _filteredEmployees = <EmployeeModel>[].obs;
@override @override
void initState() { void initState() {
super.initState(); super.initState();
WidgetsBinding.instance.addPostFrameCallback((_) { WidgetsBinding.instance.addPostFrameCallback((_) {
final selectedProjectId = _initEmployees();
Get.find<ProjectController>().selectedProject?.id;
if (selectedProjectId != null) {
employeeScreenController.selectedProjectId = selectedProjectId;
employeeScreenController.fetchEmployeesByProject(selectedProjectId);
} else if (employeeScreenController.isAllEmployeeSelected.value) {
employeeScreenController.selectedProjectId = null;
employeeScreenController.fetchAllEmployees();
} else {
employeeScreenController.clearEmployees();
}
_searchController.addListener(() { _searchController.addListener(() {
_filterEmployees(_searchController.text); _filterEmployees(_searchController.text);
}); });
}); });
} }
Future<void> _initEmployees() async {
final selectedProjectId = Get.find<ProjectController>().selectedProject?.id;
if (selectedProjectId != null) {
_employeeController.selectedProjectId = selectedProjectId;
await _employeeController.fetchEmployeesByProject(selectedProjectId);
} else if (_employeeController.isAllEmployeeSelected.value) {
_employeeController.selectedProjectId = null;
await _employeeController.fetchAllEmployees();
} else {
_employeeController.clearEmployees();
}
_filterEmployees(_searchController.text);
}
Future<void> _refreshEmployees() async { Future<void> _refreshEmployees() async {
try { try {
final selectedProjectId = final selectedProjectId =
Get.find<ProjectController>().selectedProject?.id; Get.find<ProjectController>().selectedProject?.id;
final isAllSelected = final isAllSelected = _employeeController.isAllEmployeeSelected.value;
employeeScreenController.isAllEmployeeSelected.value;
if (isAllSelected) { if (isAllSelected) {
employeeScreenController.selectedProjectId = null; _employeeController.selectedProjectId = null;
await employeeScreenController.fetchAllEmployees(); await _employeeController.fetchAllEmployees();
} else if (selectedProjectId != null) { } else if (selectedProjectId != null) {
employeeScreenController.selectedProjectId = selectedProjectId; _employeeController.selectedProjectId = selectedProjectId;
await employeeScreenController await _employeeController.fetchEmployeesByProject(selectedProjectId);
.fetchEmployeesByProject(selectedProjectId);
} else { } else {
employeeScreenController.clearEmployees(); _employeeController.clearEmployees();
} }
_filterEmployees(_searchController.text); _filterEmployees(_searchController.text);
employeeScreenController.update(['employee_screen_controller']); _employeeController.update(['employee_screen_controller']);
} catch (e, stackTrace) { } catch (e, stackTrace) {
debugPrint('Error refreshing employee data: ${e.toString()}'); debugPrint('Error refreshing employee data: $e');
debugPrintStack(stackTrace: stackTrace); debugPrintStack(stackTrace: stackTrace);
} }
} }
void _filterEmployees(String query) { void _filterEmployees(String query) {
final employees = employeeScreenController.employees; final employees = _employeeController.employees;
if (query.isEmpty) { if (query.isEmpty) {
_filteredEmployees.assignAll(employees); _filteredEmployees.assignAll(employees);
} else { return;
final lowerQuery = query.toLowerCase();
_filteredEmployees.assignAll(
employees.where((e) {
return e.name.toLowerCase().contains(lowerQuery) ||
e.email.toLowerCase().contains(lowerQuery) ||
e.phoneNumber.toLowerCase().contains(lowerQuery) ||
e.jobRole.toLowerCase().contains(lowerQuery);
}),
);
} }
final lowerQuery = query.toLowerCase();
_filteredEmployees.assignAll(
employees.where((e) =>
e.name.toLowerCase().contains(lowerQuery) ||
e.email.toLowerCase().contains(lowerQuery) ||
e.phoneNumber.toLowerCase().contains(lowerQuery) ||
e.jobRole.toLowerCase().contains(lowerQuery)),
);
}
Future<void> _onAddNewEmployee() async {
final result = await showModalBottomSheet<Map<String, dynamic>>(
context: context,
isScrollControlled: true,
shape: const RoundedRectangleBorder(
borderRadius: BorderRadius.vertical(top: Radius.circular(16))),
backgroundColor: Colors.transparent,
builder: (context) => AddEmployeeBottomSheet(),
);
if (result == null || result['success'] != true) return;
final employeeData = result['data'];
final employeeId = employeeData['id'] as String;
final jobRoleId = employeeData['jobRoleId'] as String?;
await showModalBottomSheet(
context: context,
isScrollControlled: true,
shape: const RoundedRectangleBorder(
borderRadius: BorderRadius.vertical(top: Radius.circular(24))),
backgroundColor: Colors.transparent,
builder: (context) => AssignProjectBottomSheet(
employeeId: employeeId,
jobRoleId: jobRoleId ?? '',
),
);
await _refreshEmployees();
} }
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
backgroundColor: Colors.white, backgroundColor: Colors.white,
appBar: PreferredSize( appBar: _buildAppBar(),
preferredSize: const Size.fromHeight(72), floatingActionButton: _buildFloatingActionButton(),
child: AppBar(
backgroundColor: const Color(0xFFF5F5F5),
elevation: 0.5,
automaticallyImplyLeading: false,
titleSpacing: 0,
title: Padding(
padding: MySpacing.xy(16, 0),
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
IconButton(
icon: const Icon(Icons.arrow_back_ios_new,
color: Colors.black, size: 20),
onPressed: () => Get.offNamed('/dashboard'),
),
MySpacing.width(8),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: [
MyText.titleLarge(
'Employees',
fontWeight: 700,
color: Colors.black,
),
MySpacing.height(2),
GetBuilder<ProjectController>(
builder: (projectController) {
final projectName =
projectController.selectedProject?.name ??
'Select Project';
return Row(
children: [
const Icon(Icons.work_outline,
size: 14, color: Colors.grey),
MySpacing.width(4),
Expanded(
child: MyText.bodySmall(
projectName,
fontWeight: 600,
overflow: TextOverflow.ellipsis,
color: Colors.grey[700],
),
),
],
);
},
),
],
),
),
],
),
),
),
),
floatingActionButton: InkWell(
onTap: () async {
// Step 1: Open AddEmployeeBottomSheet
final result = await showModalBottomSheet<Map<String, dynamic>>(
context: context,
isScrollControlled: true,
shape: const RoundedRectangleBorder(
borderRadius: BorderRadius.vertical(top: Radius.circular(16)),
),
backgroundColor: Colors.transparent,
builder: (context) => AddEmployeeBottomSheet(),
);
// Step 2: Check if employee creation was successful
if (result != null && result['success'] == true) {
print("Employee data from bottom sheet: $result");
final employeeData = result['data'];
final employeeId = employeeData['id'] as String;
final jobRoleId = employeeData['jobRoleId'] as String?;
// Step 3: Open AssignProjectBottomSheet for the new employee
await showModalBottomSheet(
context: context,
isScrollControlled: true,
shape: const RoundedRectangleBorder(
borderRadius: BorderRadius.vertical(top: Radius.circular(24)),
),
backgroundColor: Colors.transparent,
builder: (context) => AssignProjectBottomSheet(
employeeId: employeeId,
jobRoleId: jobRoleId ?? '',
),
);
// Step 4: Refresh employee list after project assignment
await _refreshEmployees();
}
},
borderRadius: BorderRadius.circular(28),
child: Container(
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
decoration: BoxDecoration(
color: Colors.red,
borderRadius: BorderRadius.circular(28),
boxShadow: const [
BoxShadow(
color: Colors.black26,
blurRadius: 6,
offset: Offset(0, 3),
),
],
),
child: const Row(
mainAxisSize: MainAxisSize.min,
children: [
Icon(Icons.add, color: Colors.white),
SizedBox(width: 8),
Text('Add New Employee', style: TextStyle(color: Colors.white)),
],
),
),
),
body: SafeArea( body: SafeArea(
child: GetBuilder<EmployeesScreenController>( child: GetBuilder<EmployeesScreenController>(
init: employeeScreenController, init: _employeeController,
tag: 'employee_screen_controller', tag: 'employee_screen_controller',
builder: (controller) { builder: (controller) {
_filterEmployees(_searchController.text); _filterEmployees(_searchController.text);
@ -236,180 +142,11 @@ class _EmployeesScreenState extends State<EmployeesScreen> with UIMixin {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
MySpacing.height(flexSpacing), MySpacing.height(flexSpacing),
_buildSearchAndActionRow(),
// Search Bar + Actions Row
Padding(
padding: MySpacing.x(flexSpacing),
child: Row(
children: [
// Search Field
Expanded(
child: SizedBox(
height: 36,
child: TextField(
controller: _searchController,
style: const TextStyle(fontSize: 13, height: 1.2),
decoration: InputDecoration(
isDense: true,
contentPadding: const EdgeInsets.symmetric(
horizontal: 8, vertical: 8),
prefixIcon: const Icon(Icons.search,
size: 18, color: Colors.grey),
prefixIconConstraints: const BoxConstraints(
minWidth: 32,
minHeight: 32,
),
hintText: 'Search contacts...',
hintStyle: const TextStyle(
fontSize: 13, color: Colors.grey),
filled: true,
fillColor: Colors.white,
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(8),
borderSide: BorderSide(
color: Colors.grey.shade300, width: 1),
),
enabledBorder: OutlineInputBorder(
borderRadius: BorderRadius.circular(8),
borderSide: BorderSide(
color: Colors.grey.shade300, width: 1),
),
suffixIcon: _searchController.text.isNotEmpty
? GestureDetector(
onTap: () {
_searchController.clear();
_filterEmployees('');
setState(() {});
},
child: const Icon(Icons.close,
size: 18, color: Colors.grey),
)
: null,
),
onChanged: (value) => setState(() {}),
),
),
),
const SizedBox(width: 8),
// Refresh Button
Tooltip(
message: 'Refresh Data',
child: InkWell(
borderRadius: BorderRadius.circular(24),
onTap: _refreshEmployees,
child: const Padding(
padding: EdgeInsets.all(10),
child: Icon(Icons.refresh,
color: Colors.green, size: 28),
),
),
),
const SizedBox(width: 4),
// Three-dot Menu
PopupMenuButton<String>(
icon: Stack(
clipBehavior: Clip.none,
children: [
const Icon(Icons.tune, color: Colors.black),
Obx(() {
return employeeScreenController
.isAllEmployeeSelected.value
? Positioned(
right: -1,
top: -1,
child: Container(
width: 10,
height: 10,
decoration: const BoxDecoration(
color: Colors.red,
shape: BoxShape.circle,
),
),
)
: const SizedBox.shrink();
}),
],
),
onSelected: (value) async {
if (value == 'all_employees') {
employeeScreenController
.isAllEmployeeSelected.value =
!employeeScreenController
.isAllEmployeeSelected.value;
if (employeeScreenController
.isAllEmployeeSelected.value) {
employeeScreenController.selectedProjectId =
null;
await employeeScreenController
.fetchAllEmployees();
} else {
final selectedProjectId =
Get.find<ProjectController>()
.selectedProject
?.id;
if (selectedProjectId != null) {
employeeScreenController.selectedProjectId =
selectedProjectId;
await employeeScreenController
.fetchEmployeesByProject(
selectedProjectId);
} else {
employeeScreenController.clearEmployees();
}
}
_filterEmployees(_searchController.text);
employeeScreenController
.update(['employee_screen_controller']);
}
},
itemBuilder: (context) => [
PopupMenuItem<String>(
value: 'all_employees',
child: Obx(
() => Row(
children: [
Checkbox(
value: employeeScreenController
.isAllEmployeeSelected.value,
onChanged: (bool? value) {
Navigator.pop(context, 'all_employees');
},
checkColor: Colors.white,
activeColor: Colors.red,
side: const BorderSide(
color: Colors.black,
width: 1.5,
),
fillColor:
MaterialStateProperty.resolveWith(
(states) {
if (states
.contains(MaterialState.selected)) {
return Colors.red;
}
return Colors.white;
}),
),
const Text('All Employees'),
],
),
),
),
],
)
],
),
),
MySpacing.height(flexSpacing), MySpacing.height(flexSpacing),
// Employee List
Padding( Padding(
padding: MySpacing.x(flexSpacing), padding: MySpacing.x(flexSpacing),
child: dailyProgressReportTab(), child: _buildEmployeeList(),
), ),
], ],
), ),
@ -420,33 +157,272 @@ class _EmployeesScreenState extends State<EmployeesScreen> with UIMixin {
); );
} }
Widget dailyProgressReportTab() { PreferredSizeWidget _buildAppBar() {
return PreferredSize(
preferredSize: const Size.fromHeight(72),
child: AppBar(
backgroundColor: const Color(0xFFF5F5F5),
elevation: 0.5,
automaticallyImplyLeading: false,
titleSpacing: 0,
title: Padding(
padding: MySpacing.xy(16, 0),
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
IconButton(
icon: const Icon(Icons.arrow_back_ios_new,
color: Colors.black, size: 20),
onPressed: () => Get.offNamed('/dashboard'),
),
MySpacing.width(8),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: [
MyText.titleLarge(
'Employees',
fontWeight: 700,
color: Colors.black,
),
MySpacing.height(2),
GetBuilder<ProjectController>(
builder: (projectController) {
final projectName =
projectController.selectedProject?.name ??
'Select Project';
return Row(
children: [
const Icon(Icons.work_outline,
size: 14, color: Colors.grey),
MySpacing.width(4),
Expanded(
child: MyText.bodySmall(
projectName,
fontWeight: 600,
overflow: TextOverflow.ellipsis,
color: Colors.grey[700],
),
),
],
);
},
),
],
),
),
],
),
),
),
);
}
Widget _buildFloatingActionButton() {
return InkWell(
onTap: _onAddNewEmployee,
borderRadius: BorderRadius.circular(28),
child: Container(
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
decoration: BoxDecoration(
color: Colors.red,
borderRadius: BorderRadius.circular(28),
boxShadow: const [
BoxShadow(
color: Colors.black26,
blurRadius: 6,
offset: Offset(0, 3),
),
],
),
child: const Row(
mainAxisSize: MainAxisSize.min,
children: [
Icon(Icons.add, color: Colors.white),
SizedBox(width: 8),
Text('Add New Employee', style: TextStyle(color: Colors.white)),
],
),
),
);
}
Widget _buildSearchAndActionRow() {
return Padding(
padding: MySpacing.x(flexSpacing),
child: Row(
children: [
Expanded(child: _buildSearchField()),
const SizedBox(width: 8),
_buildRefreshButton(),
const SizedBox(width: 4),
_buildPopupMenu(),
],
),
);
}
Widget _buildSearchField() {
return SizedBox(
height: 36,
child: TextField(
controller: _searchController,
style: const TextStyle(fontSize: 13, height: 1.2),
decoration: InputDecoration(
isDense: true,
contentPadding:
const EdgeInsets.symmetric(horizontal: 8, vertical: 8),
prefixIcon: const Icon(Icons.search, size: 18, color: Colors.grey),
prefixIconConstraints:
const BoxConstraints(minWidth: 32, minHeight: 32),
hintText: 'Search contacts...',
hintStyle: const TextStyle(fontSize: 13, color: Colors.grey),
filled: true,
fillColor: Colors.white,
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(8),
borderSide: BorderSide(color: Colors.grey.shade300, width: 1),
),
enabledBorder: OutlineInputBorder(
borderRadius: BorderRadius.circular(8),
borderSide: BorderSide(color: Colors.grey.shade300, width: 1),
),
suffixIcon: _searchController.text.isNotEmpty
? GestureDetector(
onTap: () {
_searchController.clear();
_filterEmployees('');
setState(() {});
},
child: const Icon(Icons.close, size: 18, color: Colors.grey),
)
: null,
),
onChanged: (_) => setState(() {}),
),
);
}
Widget _buildRefreshButton() {
return Tooltip(
message: 'Refresh Data',
child: InkWell(
borderRadius: BorderRadius.circular(24),
onTap: _refreshEmployees,
child: const Padding(
padding: EdgeInsets.all(10),
child: Icon(Icons.refresh, color: Colors.green, size: 28),
),
),
);
}
Widget _buildPopupMenu() {
return PopupMenuButton<String>(
icon: Stack(
clipBehavior: Clip.none,
children: [
const Icon(Icons.tune, color: Colors.black),
Obx(() {
return _employeeController.isAllEmployeeSelected.value
? Positioned(
right: -1,
top: -1,
child: Container(
width: 10,
height: 10,
decoration: const BoxDecoration(
color: Colors.red, shape: BoxShape.circle),
),
)
: const SizedBox.shrink();
}),
],
),
onSelected: (value) async {
if (value == 'all_employees') {
_employeeController.isAllEmployeeSelected.value =
!_employeeController.isAllEmployeeSelected.value;
if (_employeeController.isAllEmployeeSelected.value) {
_employeeController.selectedProjectId = null;
await _employeeController.fetchAllEmployees();
} else {
final selectedProjectId =
Get.find<ProjectController>().selectedProject?.id;
if (selectedProjectId != null) {
_employeeController.selectedProjectId = selectedProjectId;
await _employeeController
.fetchEmployeesByProject(selectedProjectId);
} else {
_employeeController.clearEmployees();
}
}
_filterEmployees(_searchController.text);
_employeeController.update(['employee_screen_controller']);
}
},
itemBuilder: (context) => [
PopupMenuItem<String>(
value: 'all_employees',
child: Obx(
() => Row(
children: [
Checkbox(
value: _employeeController.isAllEmployeeSelected.value,
onChanged: (bool? value) =>
Navigator.pop(context, 'all_employees'),
checkColor: Colors.white,
activeColor: Colors.red,
side: const BorderSide(color: Colors.black, width: 1.5),
fillColor: MaterialStateProperty.resolveWith<Color>((states) {
if (states.contains(MaterialState.selected)) {
return Colors.red;
}
return Colors.white;
}),
),
const Text('All Employees'),
],
),
),
),
],
);
}
Widget _buildEmployeeList() {
return Obx(() { return Obx(() {
final isLoading = employeeScreenController.isLoading.value; final isLoading = _employeeController.isLoading.value;
final employees = _filteredEmployees; final employees = _filteredEmployees;
// Show skeleton loader while data is being fetched
if (isLoading) { if (isLoading) {
return ListView.separated( return ListView.separated(
shrinkWrap: true, shrinkWrap: true,
physics: const NeverScrollableScrollPhysics(), physics: const NeverScrollableScrollPhysics(),
itemCount: 10, itemCount: 8, // number of skeleton items
separatorBuilder: (_, __) => MySpacing.height(12), separatorBuilder: (_, __) => MySpacing.height(12),
itemBuilder: (_, __) => SkeletonLoaders.employeeSkeletonCard(), itemBuilder: (_, __) => SkeletonLoaders.employeeSkeletonCard(),
); );
} }
// Show empty state when no employees are found
if (employees.isEmpty) { if (employees.isEmpty) {
return Padding( return Padding(
padding: const EdgeInsets.only(top: 50), padding: const EdgeInsets.only(top: 60),
child: Center( child: Center(
child: MyText.bodySmall( child: MyText.bodySmall(
"No Employees Found", "No Employees Found",
fontWeight: 600, fontWeight: 600,
color: Colors.grey[700],
), ),
), ),
); );
} }
// Show the actual employee list
return ListView.separated( return ListView.separated(
shrinkWrap: true, shrinkWrap: true,
physics: const NeverScrollableScrollPhysics(), physics: const NeverScrollableScrollPhysics(),
@ -455,16 +431,15 @@ class _EmployeesScreenState extends State<EmployeesScreen> with UIMixin {
separatorBuilder: (_, __) => MySpacing.height(12), separatorBuilder: (_, __) => MySpacing.height(12),
itemBuilder: (context, index) { itemBuilder: (context, index) {
final employee = employees[index]; final employee = employees[index];
final nameParts = employee.name.trim().split(" "); final nameParts = employee.name.trim().split(' ');
final firstName = nameParts.first; final firstName = nameParts.first;
final lastName = nameParts.length > 1 ? nameParts.last : ""; final lastName = nameParts.length > 1 ? nameParts.last : '';
return InkWell( return InkWell(
onTap: () { onTap: () =>
Get.to(() => EmployeeDetailPage(employeeId: employee.id)); Get.to(() => EmployeeDetailPage(employeeId: employee.id)),
},
child: Padding( child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 0, vertical: 0), padding: const EdgeInsets.symmetric(vertical: 0),
child: Row( child: Row(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
@ -474,16 +449,19 @@ class _EmployeesScreenState extends State<EmployeesScreen> with UIMixin {
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
MyText.titleSmall(employee.name, MyText.titleSmall(
fontWeight: 600, overflow: TextOverflow.ellipsis), employee.name,
if (employee.jobRole.isNotEmpty) ...[ fontWeight: 600,
MyText.bodySmall(employee.jobRole, overflow: TextOverflow.ellipsis,
color: Colors.grey[700], ),
overflow: TextOverflow.ellipsis), if (employee.jobRole.isNotEmpty)
], MyText.bodySmall(
employee.jobRole,
color: Colors.grey[700],
overflow: TextOverflow.ellipsis,
),
MySpacing.height(8), MySpacing.height(8),
if (employee.email.isNotEmpty && if (employee.email.isNotEmpty && employee.email != '-')
employee.email != '-') ...[
GestureDetector( GestureDetector(
onTap: () => onTap: () =>
LauncherUtils.launchEmail(employee.email), LauncherUtils.launchEmail(employee.email),
@ -508,9 +486,9 @@ class _EmployeesScreenState extends State<EmployeesScreen> with UIMixin {
], ],
), ),
), ),
if (employee.email.isNotEmpty && employee.email != '-')
MySpacing.height(6), MySpacing.height(6),
], if (employee.phoneNumber.isNotEmpty)
if (employee.phoneNumber.isNotEmpty) ...[
GestureDetector( GestureDetector(
onTap: () => onTap: () =>
LauncherUtils.launchPhone(employee.phoneNumber), LauncherUtils.launchPhone(employee.phoneNumber),
@ -530,16 +508,11 @@ class _EmployeesScreenState extends State<EmployeesScreen> with UIMixin {
], ],
), ),
), ),
],
], ],
), ),
), ),
Column( const Icon(Icons.arrow_forward_ios,
children: const [ color: Colors.grey, size: 16),
Icon(Icons.arrow_forward_ios,
color: Colors.grey, size: 16),
],
),
], ],
), ),
), ),