User Model Change

main_design2.0
zaid_daoud 2 years ago
parent b16ca9ce77
commit ac38159b0a

@ -63,6 +63,7 @@ class UserProvider extends ChangeNotifier {
notifyListeners(); notifyListeners();
return response.statusCode; return response.statusCode;
} catch (error) { } catch (error) {
print(error);
_loading = false; _loading = false;
notifyListeners(); notifyListeners();
return -1; return -1;

@ -4,8 +4,8 @@ import 'package:test_sa/models/enums/user_types.dart';
class User { class User {
int clientId; int clientId;
String clientName; String clientName;
int departmentId; List<int> departmentId;
String departmentName; List<String> departmentName;
String message; String message;
String username; String username;
String userID; String userID;
@ -148,8 +148,18 @@ class User {
User.fromJson(dynamic json) { User.fromJson(dynamic json) {
clientId = json['client_id']; clientId = json['client_id'];
clientName = json['client_name']; clientName = json['client_name'];
departmentId = json['department_id']; if (json['department_id'] != null) {
departmentName = json['department_name']; 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']; message = json['message'];
username = json['username']; username = json['username'];
userID = json['userID']; userID = json['userID'];

@ -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/api/user_provider.dart';
import 'package:test_sa/controllers/providers/settings/setting_provider.dart'; import 'package:test_sa/controllers/providers/settings/setting_provider.dart';
import 'package:test_sa/controllers/validator/validator.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/hospital.dart';
import 'package:test_sa/models/subtitle.dart'; import 'package:test_sa/models/subtitle.dart';
import 'package:test_sa/models/user.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/app_text_form_field.dart';
import 'package:test_sa/views/widgets/buttons/app_back_button.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/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/hospitals/hospital_button.dart';
import 'package:test_sa/views/widgets/loaders/loading_manager.dart'; import 'package:test_sa/views/widgets/loaders/loading_manager.dart';
@ -131,15 +129,15 @@ class _RegisterState extends State<Register> {
setState(() {}); setState(() {});
}, },
), ),
const SizedBox(height: 12), // const SizedBox(height: 12),
DepartmentButton( // DepartmentButton(
department: Department(id: _user.departmentId, name: _user.departmentName), // department: Department(id: _user.departmentId, name: _user.departmentName),
onDepartmentPick: (department) { // onDepartmentPick: (department) {
_user.departmentId = department.id; // _user.departmentId = department.id;
_user.departmentName = department.name; // _user.departmentName = department.name;
setState(() {}); // setState(() {});
}, // },
), // ),
const SizedBox(height: 12), const SizedBox(height: 12),
ATextFormField( ATextFormField(
initialValue: _user.phoneNumber, initialValue: _user.phoneNumber,

@ -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/api/user_provider.dart';
import 'package:test_sa/controllers/providers/settings/setting_provider.dart'; import 'package:test_sa/controllers/providers/settings/setting_provider.dart';
import 'package:test_sa/controllers/validator/validator.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/hospital.dart';
import 'package:test_sa/models/subtitle.dart'; import 'package:test_sa/models/subtitle.dart';
import 'package:test_sa/models/user.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/app_text_form_field.dart';
import 'package:test_sa/views/widgets/buttons/app_back_button.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/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/hospitals/hospital_button.dart';
import 'package:test_sa/views/widgets/loaders/loading_manager.dart'; import 'package:test_sa/views/widgets/loaders/loading_manager.dart';
@ -121,14 +119,14 @@ class _ProfilePageState extends State<ProfilePage> {
SizedBox( SizedBox(
height: 8, height: 8,
), ),
DepartmentButton( // DepartmentButton(
department: Department(name: _user.departmentName, id: _user.departmentId), // department: Department(name: _user.departmentName, id: _user.departmentId),
onDepartmentPick: (department) { // onDepartmentPick: (department) {
_user.departmentName = department.name; // _user.departmentName = department.name;
_user.departmentId = department.id; // _user.departmentId = department.id;
setState(() {}); // setState(() {});
}, // },
), // ),
SizedBox( SizedBox(
height: 8, height: 8,
), ),

Loading…
Cancel
Save