diff --git a/lib/pages/roles_and_permission/users_page/add_user_dialog/view/add_user_dialog.dart b/lib/pages/roles_and_permission/users_page/add_user_dialog/view/add_user_dialog.dart index f29aec8e..700e8f46 100644 --- a/lib/pages/roles_and_permission/users_page/add_user_dialog/view/add_user_dialog.dart +++ b/lib/pages/roles_and_permission/users_page/add_user_dialog/view/add_user_dialog.dart @@ -237,10 +237,11 @@ class _AddNewUserDialogState extends State { onTap: () { setState(() { currentStep = step; - bloc.add(CheckStepStatus(isEditUser: false)); + bloc.add(const CheckStepStatus(isEditUser: false)); if (step3 == 3) { bloc.add(const CheckRoleStepStatus()); } + }); }, child: Column( diff --git a/lib/pages/roles_and_permission/users_page/add_user_dialog/view/basics_view.dart b/lib/pages/roles_and_permission/users_page/add_user_dialog/view/basics_view.dart index c5025fc3..7261ba50 100644 --- a/lib/pages/roles_and_permission/users_page/add_user_dialog/view/basics_view.dart +++ b/lib/pages/roles_and_permission/users_page/add_user_dialog/view/basics_view.dart @@ -47,7 +47,9 @@ class BasicsView extends StatelessWidget { ), Row( children: [ - Expanded( + SizedBox( + width: MediaQuery.of(context).size.width * 0.18, + height: MediaQuery.of(context).size.width * 0.08, child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ @@ -76,12 +78,12 @@ class BasicsView extends StatelessWidget { child: TextFormField( style: const TextStyle(color: ColorsManager.blackColor), - onChanged: (value) { - Future.delayed(const Duration(milliseconds: 200), - () { - _blocRole.add(ValidateBasicsStep()); - }); - }, + // onChanged: (value) { + // Future.delayed(const Duration(milliseconds: 200), + // () { + // _blocRole.add(const ValidateBasicsStep()); + // }); + // }, controller: _blocRole.firstNameController, decoration: inputTextFormDeco( hintText: "Enter first name", @@ -103,7 +105,9 @@ class BasicsView extends StatelessWidget { ), ), const SizedBox(width: 10), - Expanded( + SizedBox( + width: MediaQuery.of(context).size.width * 0.18, + height: MediaQuery.of(context).size.width * 0.08, child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ @@ -128,12 +132,12 @@ class BasicsView extends StatelessWidget { Padding( padding: const EdgeInsets.all(8.0), child: TextFormField( - onChanged: (value) { - Future.delayed(const Duration(milliseconds: 200), - () { - _blocRole.add(ValidateBasicsStep()); - }); - }, + // onChanged: (value) { + // Future.delayed(const Duration(milliseconds: 200), + // () { + // _blocRole.add(ValidateBasicsStep()); + // }); + // }, controller: _blocRole.lastNameController, style: const TextStyle(color: Colors.black), decoration: @@ -186,13 +190,13 @@ class BasicsView extends StatelessWidget { padding: const EdgeInsets.all(8.0), child: TextFormField( enabled: userId != '' ? false : true, - onChanged: (value) { - Future.delayed(const Duration(milliseconds: 200), () { - _blocRole.add(CheckStepStatus( - isEditUser: userId != '' ? false : true)); - _blocRole.add(ValidateBasicsStep()); - }); - }, + // onChanged: (value) { + // Future.delayed(const Duration(milliseconds: 200), () { + // _blocRole.add(CheckStepStatus( + // isEditUser: userId != '' ? false : true)); + // _blocRole.add(ValidateBasicsStep()); + // }); + // }, controller: _blocRole.emailController, style: const TextStyle(color: ColorsManager.blackColor), decoration: inputTextFormDeco(hintText: "name@example.com") diff --git a/lib/pages/roles_and_permission/users_page/add_user_dialog/view/permission_management.dart b/lib/pages/roles_and_permission/users_page/add_user_dialog/view/permission_management.dart index 266d431e..c5c38e76 100644 --- a/lib/pages/roles_and_permission/users_page/add_user_dialog/view/permission_management.dart +++ b/lib/pages/roles_and_permission/users_page/add_user_dialog/view/permission_management.dart @@ -128,7 +128,7 @@ class _PermissionManagementState extends State { ), const SizedBox(width: 8), Text( - option.title, + ' ${option.title[0].toUpperCase()}${option.title.substring(1)}', style: context.textTheme.bodyMedium?.copyWith( fontWeight: FontWeight.w700, fontSize: 12, @@ -184,7 +184,7 @@ class _PermissionManagementState extends State { ), const SizedBox(width: 8), Text( - subOption.title, + ' ${subOption.title[0].toUpperCase()}${subOption.title.substring(1)}', style: context.textTheme.bodyMedium?.copyWith( fontWeight: FontWeight.w700, fontSize: 12, @@ -246,7 +246,7 @@ class _PermissionManagementState extends State { ), const SizedBox(width: 8), Text( - child.title, + ' ${child.title[0].toUpperCase()}${child.title.substring(1)}', style: context.textTheme.bodyMedium?.copyWith( fontWeight: FontWeight.w400, fontSize: 12, diff --git a/lib/pages/roles_and_permission/users_page/add_user_dialog/view/popup_menu_filter.dart b/lib/pages/roles_and_permission/users_page/add_user_dialog/view/popup_menu_filter.dart index c3a245c1..80228657 100644 --- a/lib/pages/roles_and_permission/users_page/add_user_dialog/view/popup_menu_filter.dart +++ b/lib/pages/roles_and_permission/users_page/add_user_dialog/view/popup_menu_filter.dart @@ -5,8 +5,8 @@ import 'package:syncrow_web/utils/style.dart'; Future showPopUpFilterMenu({ required BuildContext context, - required Function(String value)? onSortAtoZ, // Accept a parameter - required Function(String value)? onSortZtoA, // Accept a parameter + required Function(String value)? onSortAtoZ, + required Function(String value)? onSortZtoA, Function()? cancelButton, required Map checkboxStates, required RelativeRect position, diff --git a/lib/pages/roles_and_permission/users_page/users_table/bloc/user_table_bloc.dart b/lib/pages/roles_and_permission/users_page/users_table/bloc/user_table_bloc.dart index b1131ca4..c50667be 100644 --- a/lib/pages/roles_and_permission/users_page/users_table/bloc/user_table_bloc.dart +++ b/lib/pages/roles_and_permission/users_page/users_table/bloc/user_table_bloc.dart @@ -93,7 +93,7 @@ class UserTableBloc extends Bloc { try { emit(UsersLoadingState()); bool res = await UserPermissionApi().changeUserStatusById( - event.userId, event.newStatus == "disabled" ? true : false); + event.userId, event.newStatus == "disabled" ? false : true); if (res == true) { add(const GetUsers()); // users = users.map((user) { diff --git a/lib/pages/roles_and_permission/users_page/users_table/view/user_table.dart b/lib/pages/roles_and_permission/users_page/users_table/view/user_table.dart index ca641cbe..92229643 100644 --- a/lib/pages/roles_and_permission/users_page/users_table/view/user_table.dart +++ b/lib/pages/roles_and_permission/users_page/users_table/view/user_table.dart @@ -46,7 +46,7 @@ class _DynamicTableScreenState extends State 0.12; // 20% of screen width for the second column } else if (index == 9) { return newScreenWidth * - 0.2; // 25% of screen width for the tenth column + 0.1; // 25% of screen width for the tenth column } return newScreenWidth * 0.09; // Default to 10% of screen width for other columns @@ -57,14 +57,14 @@ class _DynamicTableScreenState extends State @override Widget build(BuildContext context) { final screenWidth = MediaQuery.of(context).size.width; - if (columnWidths.every((width) => width == 120.0)) { + if (columnWidths.every((width) => width == screenWidth * 7)) { columnWidths = List.generate(widget.titles.length, (index) { if (index == 1) { return screenWidth * 0.11; } else if (index == 9) { - return screenWidth * 0.2; + return screenWidth * 0.1; } - return screenWidth * 0.11; + return screenWidth * 0.09; }); setState(() {}); }