diff --git a/lib/models/new_models/users_based_on_search_model.dart b/lib/models/new_models/users_based_on_search_model.dart index 54480f91..4dea3117 100644 --- a/lib/models/new_models/users_based_on_search_model.dart +++ b/lib/models/new_models/users_based_on_search_model.dart @@ -6,17 +6,11 @@ class UsersBasedOnSearchModel { int? languageId; String? extensionNo; String? phoneNumber; + String? positionName; + String? position; bool? isActive; - UsersBasedOnSearchModel( - {this.userId, - this.userName, - this.email, - this.employeeId, - this.languageId, - this.extensionNo, - this.phoneNumber, - this.isActive}); + UsersBasedOnSearchModel({this.userId, this.userName, this.email, this.employeeId, this.languageId, this.extensionNo, this.phoneNumber, this.positionName, this.position, this.isActive}); UsersBasedOnSearchModel.fromJson(Map json) { userId = json['userId']; @@ -26,6 +20,8 @@ class UsersBasedOnSearchModel { languageId = json['languageId']; extensionNo = json['extensionNo']; phoneNumber = json['phoneNumber']; + positionName = json['positionName']; + position = json['position']; isActive = json['isActive']; } @@ -38,6 +34,8 @@ class UsersBasedOnSearchModel { data['languageId'] = this.languageId; data['extensionNo'] = this.extensionNo; data['phoneNumber'] = this.phoneNumber; + data['positionName'] = this.positionName; + data['position'] = this.position; data['isActive'] = this.isActive; return data; } diff --git a/lib/modules/traf_module/create_traf_request_page.dart b/lib/modules/traf_module/create_traf_request_page.dart index fd895ee1..66133805 100644 --- a/lib/modules/traf_module/create_traf_request_page.dart +++ b/lib/modules/traf_module/create_traf_request_page.dart @@ -288,7 +288,8 @@ class _CreateTRAFRequestPageState extends State { dense: true, contentPadding: EdgeInsets.zero, title: Text("Name: ${userBasedOnSearch[index].userName ?? ""}"), - subtitle: Text("Email: ${userBasedOnSearch[index].email ?? ""}\nPhone: ${userBasedOnSearch[index].phoneNumber ?? ""}"), + subtitle: Text( + "Position: ${userBasedOnSearch[index].position ?? "-"}\nEmail: ${userBasedOnSearch[index].email ?? ""}\nPhone: ${userBasedOnSearch[index].phoneNumber ?? ""}"), trailing: const Icon(Icons.delete_rounded, color: Color(0xffF63939), size: 20).onPress(() { userBasedOnSearch.removeAt(index); setState(() {}); diff --git a/lib/modules/traf_module/users_auto_complete_field.dart b/lib/modules/traf_module/users_auto_complete_field.dart index 12060844..f05e77fa 100644 --- a/lib/modules/traf_module/users_auto_complete_field.dart +++ b/lib/modules/traf_module/users_auto_complete_field.dart @@ -87,7 +87,7 @@ class _UsersAutoCompleteFieldState extends State { }); return workOrders; }, - displayStringForOption: (UsersBasedOnSearchModel option) => widget.byName ? option.userName ?? "" : option.employeeId ?? "", + displayStringForOption: (UsersBasedOnSearchModel option) => widget.byName ? "${option.userName ?? "-"} (${option.position ?? "-"})" ?? "" : option.employeeId ?? "", fieldViewBuilder: (BuildContext context, TextEditingController fieldTextEditingController, FocusNode fieldFocusNode, VoidCallback onFieldSubmitted) { return TextField( controller: _controller,