diff --git a/lib/controllers/api_routes/api_manager.dart b/lib/controllers/api_routes/api_manager.dart index ece2395a..1a0a125c 100644 --- a/lib/controllers/api_routes/api_manager.dart +++ b/lib/controllers/api_routes/api_manager.dart @@ -30,7 +30,8 @@ class ApiManager { headers.addAll(_headers); Uri _url = Uri.parse(url); -// print(_url); + // print(_url); + // print(headers); http.Response response = await http.get(_url,headers: headers); if(jsonDecode(response.body) is Map){ final message = jsonDecode(response.body)["message"]; @@ -54,9 +55,9 @@ class ApiManager { headers.addAll(_headers); Uri _url = Uri.parse(url); -// print(_url); -// print(headers); - log(json.encode(body)); + // print(_url); + // print(headers); + // log(json.encode(body)); var request = http.Request('POST', _url); request.body = json.encode(body); request.headers.addAll(headers); diff --git a/lib/controllers/providers/api/user_provider.dart b/lib/controllers/providers/api/user_provider.dart index 8adcd357..35634708 100644 --- a/lib/controllers/providers/api/user_provider.dart +++ b/lib/controllers/providers/api/user_provider.dart @@ -59,7 +59,7 @@ class UserProvider extends ChangeNotifier{ if(response.statusCode >= 200 && response.statusCode < 300) { // client's request was successfully received _user = User.fromJson(jsonDecode(response.body)); - + ApiManager.instance.user = _user; return response.statusCode; } notifyListeners(); diff --git a/lib/models/user.dart b/lib/models/user.dart index 246ed717..aea639a8 100644 --- a/lib/models/user.dart +++ b/lib/models/user.dart @@ -103,10 +103,10 @@ class User{ id: parsedJson["userID"], userName: parsedJson["username"], email: parsedJson["email"], - // hospital: Hospital( - // id: parsedJson["client_id"], - // name: parsedJson["client_name"] - // ), + hospital: Hospital( + id: parsedJson["client_id"], + name: parsedJson["client_name"] + ), department: Department( id: parsedJson["department_id"], name: parsedJson["department_name"], diff --git a/lib/views/pages/user/land_page.dart b/lib/views/pages/user/land_page.dart index 6982b955..e89430c6 100644 --- a/lib/views/pages/user/land_page.dart +++ b/lib/views/pages/user/land_page.dart @@ -154,7 +154,7 @@ class _LandPageState extends State { mainAxisSpacing: 5, childAspectRatio: 1.15, children: [ - if (_userProvider.user.type == UsersTypes.normal_user) + if (_userProvider.user?.type == UsersTypes.normal_user) LandPageItem( text: _subtitle.newServiceRequest, icon: FontAwesomeIcons.tools,