diff --git a/lib/components/common/custom_drop_down.dart b/lib/components/common/custom_drop_down.dart index cc9a989..7472828 100644 --- a/lib/components/common/custom_drop_down.dart +++ b/lib/components/common/custom_drop_down.dart @@ -194,7 +194,7 @@ class _CustomDropdownState extends State> { message: widget.itemLabel(item), child: Text( widget.itemLabel(item), - style: 12.txtSBoldGrey, + style: 11.txtSBoldGrey, ), ), onTap: () => _selectItem(item), @@ -278,7 +278,7 @@ class _CustomDropdownState extends State> { selectedItem != null ? widget.itemLabel(selectedItem as T) : widget.hintText, - style: 12.txtSBoldGrey, + style: 11.txtSBoldGrey, overflow: TextOverflow.ellipsis, ), // Text( diff --git a/lib/feature/presentation/screens/admin/user_management/manage_user.dart b/lib/feature/presentation/screens/admin/user_management/manage_user.dart index d9bcb60..921b1cb 100644 --- a/lib/feature/presentation/screens/admin/user_management/manage_user.dart +++ b/lib/feature/presentation/screens/admin/user_management/manage_user.dart @@ -59,7 +59,7 @@ class ManageUser extends StatelessWidget { selected; } }, - hintText: 'Select Plant'), + hintText: 'Select UserName'), ], )), SizedBox(width: 16), @@ -84,7 +84,7 @@ class ManageUser extends StatelessWidget { selected; } }, - hintText: 'Select Plant'), + hintText: 'Select User Type'), ], )), SizedBox(width: 16), @@ -109,11 +109,12 @@ class ManageUser extends StatelessWidget { selected; } }, - hintText: 'Select Plant'), + hintText: 'Select Email Address'), ], )), ], ), + SizedBox(height: 8), Row( children: [ Expanded( @@ -137,7 +138,7 @@ class ManageUser extends StatelessWidget { selected; } }, - hintText: 'Select Product'), + hintText: 'Select Employer Code'), ], )), SizedBox(width: 16), diff --git a/lib/feature/presentation/screens/dashboard/controller/dashboard_ctrl.dart b/lib/feature/presentation/screens/dashboard/controller/dashboard_ctrl.dart index 3efcf81..b4758e6 100644 --- a/lib/feature/presentation/screens/dashboard/controller/dashboard_ctrl.dart +++ b/lib/feature/presentation/screens/dashboard/controller/dashboard_ctrl.dart @@ -124,20 +124,20 @@ var userNames =[].obs; var userTypesNames =[].obs; var userEmpCode =[].obs; var userEmail =[].obs; - var selectUser = "Select Status".obs; - var selectEmail = "Select Status".obs; - var selectCode = "Select Status".obs; - var selectType = "Select Status".obs; + var selectUser = "Select User Name".obs; + var selectEmail = "Select Email".obs; + var selectCode = "Select Employee Code".obs; + var selectType = "Select UserType".obs; getManageUser() async { try { userLoading.value = true; Map requestBody = { - "userName": nameCtrl.text.isEmpty ? "" : nameCtrl.text, - "userTypeName": userTypeCtrl.text.isEmpty ? "" : userTypeCtrl.text, - "Email": emailCtrl.text.isEmpty ? "" : emailCtrl.text, + "userName": selectUser.value == "Select User Name" ? "" : selectUser.value, + "userTypeName": selectUser.value == "Select User Name" ? "" : selectUser.value, + "Email": selectEmail.value == "Select Email" ?"": selectEmail.value, "EmployeeTransCode": - employeeCodeCtrl.text.isEmpty ? "" : employeeCodeCtrl.text, + selectCode.value == "Select Employee Code" ? "" : selectCode.value, "status": selectUserStatus.value == "Select Status" ? "" : selectUserStatus.value == "Active"