From c6166d1e75af58c3b3619e1fc043008913e3ba1c Mon Sep 17 00:00:00 2001 From: WaseemAbbasi22 <50428976+WaseemAbbasi22@users.noreply.github.com> Date: Wed, 10 Jun 2026 09:19:39 +0300 Subject: [PATCH] improvements --- .../signup/models/signup_request_model.dart | 8 ++++++-- lib/modules/signup/screens/signup_screen.dart | 15 +++++++++------ 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/lib/modules/signup/models/signup_request_model.dart b/lib/modules/signup/models/signup_request_model.dart index c4012cbd..88bd954d 100644 --- a/lib/modules/signup/models/signup_request_model.dart +++ b/lib/modules/signup/models/signup_request_model.dart @@ -32,15 +32,19 @@ class SignUpRequestModel { Map toJson() { return { 'assetGroupId': assetGroupId ?? 0, + 'companyId': companyId ?? 0, 'employeeId': employeeId ?? '', 'fullName': fullName ?? '', 'emailAddress': emailAddress ?? '', 'mobileNumber': mobileNumber ?? '', 'extensionNumber': extensionNumber ?? '', - 'siteId': siteId ?? 0, + if(siteId!=null) + 'siteId': siteId, + // 'siteId': siteId ?? 0, 'erpSite': erpSite ?? '', - 'departmentId': departmentId ?? 0, + if(departmentId!=null) + 'departmentId': departmentId, 'erpDepartment': erpDepartment ?? '', 'role': role ?? '', 'isFromERP': isFromERP, diff --git a/lib/modules/signup/screens/signup_screen.dart b/lib/modules/signup/screens/signup_screen.dart index 70327f18..d1feba31 100644 --- a/lib/modules/signup/screens/signup_screen.dart +++ b/lib/modules/signup/screens/signup_screen.dart @@ -1,3 +1,5 @@ +import 'dart:developer'; + import 'package:flutter/material.dart'; import 'package:fluttertoast/fluttertoast.dart'; import 'package:provider/provider.dart'; @@ -182,10 +184,10 @@ class _SignUpScreenState extends State { _buildReadOnlyField("Mobile Number", _mobileController), 16.height, _buildExtensionField(), - 16.height, - _buildSiteDropdown(), - 16.height, - _buildDepartmentDropdown(), + // 16.height, + // _buildSiteDropdown(), + // 16.height, + // _buildDepartmentDropdown(), 16.height, _buildRoleField(), ], @@ -446,13 +448,14 @@ class _SignUpScreenState extends State { Fluttertoast.showToast(msg: "Please enter a valid Employee ID"); return; } + log('hmg ${_isHMGGroup}'); - if (_selectedSite == null) { + if (!_isHMGGroup &&_selectedSite == null) { Fluttertoast.showToast(msg: "Please select a site"); return; } - if (_selectedDepartment == null) { + if (!_isHMGGroup&&_selectedDepartment == null) { Fluttertoast.showToast(msg: "Please select a department"); return; }