From 2514fefb05b5372faeeb3e4aba1a441c1d2fd10f Mon Sep 17 00:00:00 2001 From: WaseemAbbasi22 <50428976+WaseemAbbasi22@users.noreply.github.com> Date: Mon, 22 Jun 2026 12:09:32 +0300 Subject: [PATCH] improvements for demo request form --- .../models/application_demo_request_model.dart | 17 +++++++++-------- .../screens/demo_request_form_screen.dart | 4 ++-- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/lib/modules/applicationDemo/models/application_demo_request_model.dart b/lib/modules/applicationDemo/models/application_demo_request_model.dart index 17139b4b..147ef3c6 100644 --- a/lib/modules/applicationDemo/models/application_demo_request_model.dart +++ b/lib/modules/applicationDemo/models/application_demo_request_model.dart @@ -5,10 +5,11 @@ class ApplicationDemoRequestModel { final String emailAddress; final String mobileNumber; final String? companyName; - final int? companyId; + + // final String? companyName; final List roleIds; final List roleNames; - final String status; // Pending, Approved, Rejected + final String? status; // Pending, Approved, Rejected final DateTime requestDate; ApplicationDemoRequestModel({ @@ -17,10 +18,10 @@ class ApplicationDemoRequestModel { required this.emailAddress, required this.mobileNumber, this.companyName, - this.companyId, + // this.companyId, required this.roleIds, required this.roleNames, - required this.status, + this.status, required this.requestDate, }); @@ -31,8 +32,8 @@ class ApplicationDemoRequestModel { 'fullName': fullName, 'emailAddress': emailAddress, 'mobileNumber': mobileNumber, - // 'companyName': companyId ?? 88, - 'companyId': 88, + 'companyName': companyName, + // 'companyId': 88, 'demoRequestUserRoleIds': roleIds, }; } @@ -45,7 +46,7 @@ class ApplicationDemoRequestModel { emailAddress: json['emailAddress'] ?? json['email'] ?? '', mobileNumber: json['mobileNumber'] ?? json['mobile'] ?? '', companyName: json['companyName'] ?? json['company'] ?? '', - companyId: json['companyId'], + // companyId: json['companyId'], roleIds: _parseList(json['roleIds'] ?? json['demoRequestUserRoleIds']), roleNames: _parseList(json['roleNames'] ?? json['roles']), status: json['status'] ?? 'Pending', @@ -107,7 +108,7 @@ class ApplicationDemoRequestModel { emailAddress: emailAddress ?? this.emailAddress, mobileNumber: mobileNumber ?? this.mobileNumber, companyName: companyName ?? this.companyName, - companyId: companyId ?? this.companyId, + // companyId: companyId ?? this.companyId, roleIds: roleIds ?? this.roleIds, roleNames: roleNames ?? this.roleNames, status: status ?? this.status, diff --git a/lib/modules/applicationDemo/screens/demo_request_form_screen.dart b/lib/modules/applicationDemo/screens/demo_request_form_screen.dart index 40326b88..a3726290 100644 --- a/lib/modules/applicationDemo/screens/demo_request_form_screen.dart +++ b/lib/modules/applicationDemo/screens/demo_request_form_screen.dart @@ -258,10 +258,10 @@ class _DemoRequestFormScreenState extends State { fullName: _fullNameController.text.trim(), emailAddress: _emailController.text.trim(), mobileNumber: _mobileController.text.trim(), - companyId: 0, + companyName: _companyNameController.text.trim(), roleIds: _selectedRoles.map((role) => role.identifier ?? '').toList(), roleNames: _selectedRoles.map((role) => role.name ?? '').toList(), - status: 'Pending', + // status: 'Pending', requestDate: DateTime.now(), );