From 8d4b9f2f79bfe4030663823479fc9ff1d8a44ce0 Mon Sep 17 00:00:00 2001 From: WaseemAbbasi22 <50428976+WaseemAbbasi22@users.noreply.github.com> Date: Mon, 22 Jun 2026 12:06:13 +0300 Subject: [PATCH] improvements for signup form --- lib/modules/signup/screens/signup_screen.dart | 29 ++++++++++++++----- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/lib/modules/signup/screens/signup_screen.dart b/lib/modules/signup/screens/signup_screen.dart index 18b5f32a..03d707de 100644 --- a/lib/modules/signup/screens/signup_screen.dart +++ b/lib/modules/signup/screens/signup_screen.dart @@ -46,6 +46,8 @@ class _SignUpScreenState extends State { final TextEditingController _fullNameController = TextEditingController(); final TextEditingController _emailController = TextEditingController(); final TextEditingController _mobileController = TextEditingController(); + final TextEditingController _siteController = TextEditingController(); + final TextEditingController _departmentController = TextEditingController(); final TextEditingController _extensionController = TextEditingController(); final TextEditingController _roleController = TextEditingController(); @@ -73,6 +75,8 @@ class _SignUpScreenState extends State { _fullNameController.dispose(); _emailController.dispose(); _mobileController.dispose(); + _siteController.dispose(); + _departmentController.dispose(); _extensionController.dispose(); _roleController.dispose(); super.dispose(); @@ -198,10 +202,10 @@ class _SignUpScreenState extends State { 16.height, if (_employeeFetched) ...[ _buildReadOnlyField("Full Name", _fullNameController), - 16.height, _buildReadOnlyField("Email Address", _emailController), - 16.height, _buildReadOnlyField("Mobile Number", _mobileController), + _buildReadOnlyField("Site", _siteController), + _buildReadOnlyField("Department", _departmentController), 16.height, _buildExtensionField(), // 16.height, @@ -276,11 +280,19 @@ class _SignUpScreenState extends State { } Widget _buildReadOnlyField(String label, TextEditingController controller) { - return AppTextFormField( - controller: controller, - labelText: label, - enable: false, - backgroundColor: AppColor.disableFieldBackground(context), + if(controller.text.isEmpty) { + return const SizedBox(); + } + return Column( + children: [ + 16.height, + AppTextFormField( + controller: controller, + labelText: label, + enable: false, + backgroundColor: AppColor.disableFieldBackground(context), + ), + ], ); } @@ -423,6 +435,9 @@ class _SignUpScreenState extends State { _fullNameController.text = employee.employeeName ?? ''; _emailController.text = employee.employeeEmailAddress ?? ''; _mobileController.text = employee.employeeMobileNumber ?? ''; + //Todo need to map site and department from ERP data + _departmentController.text = ''; + _siteController.text = employee.branchCode ?? ''; }); } else { // Check if it's a duplicate account error