improvements

export_module_ui_ux_enhancement_signup
WaseemAbbasi22 3 weeks ago
parent 3258095a7e
commit c6166d1e75

@ -32,15 +32,19 @@ class SignUpRequestModel {
Map<String, dynamic> toJson() { Map<String, dynamic> toJson() {
return { return {
'assetGroupId': assetGroupId ?? 0, 'assetGroupId': assetGroupId ?? 0,
'companyId': companyId ?? 0, 'companyId': companyId ?? 0,
'employeeId': employeeId ?? '', 'employeeId': employeeId ?? '',
'fullName': fullName ?? '', 'fullName': fullName ?? '',
'emailAddress': emailAddress ?? '', 'emailAddress': emailAddress ?? '',
'mobileNumber': mobileNumber ?? '', 'mobileNumber': mobileNumber ?? '',
'extensionNumber': extensionNumber ?? '', 'extensionNumber': extensionNumber ?? '',
'siteId': siteId ?? 0, if(siteId!=null)
'siteId': siteId,
// 'siteId': siteId ?? 0,
'erpSite': erpSite ?? '', 'erpSite': erpSite ?? '',
'departmentId': departmentId ?? 0, if(departmentId!=null)
'departmentId': departmentId,
'erpDepartment': erpDepartment ?? '', 'erpDepartment': erpDepartment ?? '',
'role': role ?? '', 'role': role ?? '',
'isFromERP': isFromERP, 'isFromERP': isFromERP,

@ -1,3 +1,5 @@
import 'dart:developer';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:fluttertoast/fluttertoast.dart'; import 'package:fluttertoast/fluttertoast.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
@ -182,10 +184,10 @@ class _SignUpScreenState extends State<SignUpScreen> {
_buildReadOnlyField("Mobile Number", _mobileController), _buildReadOnlyField("Mobile Number", _mobileController),
16.height, 16.height,
_buildExtensionField(), _buildExtensionField(),
16.height, // 16.height,
_buildSiteDropdown(), // _buildSiteDropdown(),
16.height, // 16.height,
_buildDepartmentDropdown(), // _buildDepartmentDropdown(),
16.height, 16.height,
_buildRoleField(), _buildRoleField(),
], ],
@ -446,13 +448,14 @@ class _SignUpScreenState extends State<SignUpScreen> {
Fluttertoast.showToast(msg: "Please enter a valid Employee ID"); Fluttertoast.showToast(msg: "Please enter a valid Employee ID");
return; return;
} }
log('hmg ${_isHMGGroup}');
if (_selectedSite == null) { if (!_isHMGGroup &&_selectedSite == null) {
Fluttertoast.showToast(msg: "Please select a site"); Fluttertoast.showToast(msg: "Please select a site");
return; return;
} }
if (_selectedDepartment == null) { if (!_isHMGGroup&&_selectedDepartment == null) {
Fluttertoast.showToast(msg: "Please select a department"); Fluttertoast.showToast(msg: "Please select a department");
return; return;
} }

Loading…
Cancel
Save