From ac38159b0a29c0e6351ff00a59e157d86667ef21 Mon Sep 17 00:00:00 2001 From: zaid_daoud Date: Mon, 14 Aug 2023 13:17:45 +0300 Subject: [PATCH] User Model Change --- .../providers/api/user_provider.dart | 1 + lib/models/user.dart | 18 +++++++++++++---- lib/views/pages/register.dart | 20 +++++++++---------- lib/views/pages/user/profile_page.dart | 18 ++++++++--------- 4 files changed, 32 insertions(+), 25 deletions(-) diff --git a/lib/controllers/providers/api/user_provider.dart b/lib/controllers/providers/api/user_provider.dart index bce2ce22..bf96f4e7 100644 --- a/lib/controllers/providers/api/user_provider.dart +++ b/lib/controllers/providers/api/user_provider.dart @@ -63,6 +63,7 @@ class UserProvider extends ChangeNotifier { notifyListeners(); return response.statusCode; } catch (error) { + print(error); _loading = false; notifyListeners(); return -1; diff --git a/lib/models/user.dart b/lib/models/user.dart index c64c471f..ee567784 100644 --- a/lib/models/user.dart +++ b/lib/models/user.dart @@ -4,8 +4,8 @@ import 'package:test_sa/models/enums/user_types.dart'; class User { int clientId; String clientName; - int departmentId; - String departmentName; + List departmentId; + List departmentName; String message; String username; String userID; @@ -148,8 +148,18 @@ class User { User.fromJson(dynamic json) { clientId = json['client_id']; clientName = json['client_name']; - departmentId = json['department_id']; - departmentName = json['department_name']; + if (json['department_id'] != null) { + departmentId = []; + json['department_id'].forEach((v) { + departmentId.add(v); + }); + } + if (json['department_name'] != null) { + departmentId = []; + json['department_name'].forEach((v) { + departmentId.add(v); + }); + } message = json['message']; username = json['username']; userID = json['userID']; diff --git a/lib/views/pages/register.dart b/lib/views/pages/register.dart index ab370de9..1246fff3 100644 --- a/lib/views/pages/register.dart +++ b/lib/views/pages/register.dart @@ -6,14 +6,12 @@ import 'package:test_sa/controllers/localization/localization.dart'; import 'package:test_sa/controllers/providers/api/user_provider.dart'; import 'package:test_sa/controllers/providers/settings/setting_provider.dart'; import 'package:test_sa/controllers/validator/validator.dart'; -import 'package:test_sa/models/department.dart'; import 'package:test_sa/models/hospital.dart'; import 'package:test_sa/models/subtitle.dart'; import 'package:test_sa/models/user.dart'; import 'package:test_sa/views/widgets/app_text_form_field.dart'; import 'package:test_sa/views/widgets/buttons/app_back_button.dart'; import 'package:test_sa/views/widgets/buttons/app_button.dart'; -import 'package:test_sa/views/widgets/departments/department_button.dart'; import 'package:test_sa/views/widgets/hospitals/hospital_button.dart'; import 'package:test_sa/views/widgets/loaders/loading_manager.dart'; @@ -131,15 +129,15 @@ class _RegisterState extends State { setState(() {}); }, ), - const SizedBox(height: 12), - DepartmentButton( - department: Department(id: _user.departmentId, name: _user.departmentName), - onDepartmentPick: (department) { - _user.departmentId = department.id; - _user.departmentName = department.name; - setState(() {}); - }, - ), + // const SizedBox(height: 12), + // DepartmentButton( + // department: Department(id: _user.departmentId, name: _user.departmentName), + // onDepartmentPick: (department) { + // _user.departmentId = department.id; + // _user.departmentName = department.name; + // setState(() {}); + // }, + // ), const SizedBox(height: 12), ATextFormField( initialValue: _user.phoneNumber, diff --git a/lib/views/pages/user/profile_page.dart b/lib/views/pages/user/profile_page.dart index 79732e4e..d5c014de 100644 --- a/lib/views/pages/user/profile_page.dart +++ b/lib/views/pages/user/profile_page.dart @@ -5,7 +5,6 @@ import 'package:test_sa/controllers/localization/localization.dart'; import 'package:test_sa/controllers/providers/api/user_provider.dart'; import 'package:test_sa/controllers/providers/settings/setting_provider.dart'; import 'package:test_sa/controllers/validator/validator.dart'; -import 'package:test_sa/models/department.dart'; import 'package:test_sa/models/hospital.dart'; import 'package:test_sa/models/subtitle.dart'; import 'package:test_sa/models/user.dart'; @@ -14,7 +13,6 @@ import 'package:test_sa/views/app_style/sizing.dart'; import 'package:test_sa/views/widgets/app_text_form_field.dart'; import 'package:test_sa/views/widgets/buttons/app_back_button.dart'; import 'package:test_sa/views/widgets/buttons/app_button.dart'; -import 'package:test_sa/views/widgets/departments/department_button.dart'; import 'package:test_sa/views/widgets/hospitals/hospital_button.dart'; import 'package:test_sa/views/widgets/loaders/loading_manager.dart'; @@ -121,14 +119,14 @@ class _ProfilePageState extends State { SizedBox( height: 8, ), - DepartmentButton( - department: Department(name: _user.departmentName, id: _user.departmentId), - onDepartmentPick: (department) { - _user.departmentName = department.name; - _user.departmentId = department.id; - setState(() {}); - }, - ), + // DepartmentButton( + // department: Department(name: _user.departmentName, id: _user.departmentId), + // onDepartmentPick: (department) { + // _user.departmentName = department.name; + // _user.departmentId = department.id; + // setState(() {}); + // }, + // ), SizedBox( height: 8, ),