From 00ba893bf21f22363903d3d4ac2616377bad5eb6 Mon Sep 17 00:00:00 2001 From: Sikander Saleem Date: Tue, 12 Sep 2023 17:27:05 +0300 Subject: [PATCH] fixes. --- lib/controllers/api_routes/urls.dart | 3 ++- .../api/service_requests_provider.dart | 27 ++++++++++++------- lib/models/user.dart | 6 ++--- 3 files changed, 23 insertions(+), 13 deletions(-) diff --git a/lib/controllers/api_routes/urls.dart b/lib/controllers/api_routes/urls.dart index f748d37d..00896c39 100644 --- a/lib/controllers/api_routes/urls.dart +++ b/lib/controllers/api_routes/urls.dart @@ -2,7 +2,8 @@ class URLs { URLs._(); static const host2 = "http://194.163.164.213/atoms/api"; - static const host1 = "https://atomsuat.hmg.com"; // uat url + //static const host1 = "https://atomsuat.hmg.com"; // old uat url + static const host1 = "https://atomsm.hmg.com"; // production url // static const host1 = "http://109.123.243.118:9000"; diff --git a/lib/controllers/providers/api/service_requests_provider.dart b/lib/controllers/providers/api/service_requests_provider.dart index c27d9a50..5aee9c12 100644 --- a/lib/controllers/providers/api/service_requests_provider.dart +++ b/lib/controllers/providers/api/service_requests_provider.dart @@ -178,17 +178,26 @@ class ServiceRequestsProvider extends ChangeNotifier { body["voiceNote"] = serviceRequest.audio; } Response response; - try { - response = await ApiManager.instance.post(URLs.createRequest, body: body); - stateCode = response.statusCode; - if (response.statusCode >= 200 && response.statusCode < 300) { - if (serviceRequests != null) serviceRequests.insert(0, ServiceRequest.fromJson(json.decode(utf8.decode(response.bodyBytes))[0])); - notifyListeners(); + //try { + response = await ApiManager.instance.post(URLs.createRequest, body: body); + stateCode = response.statusCode; + if (response.statusCode >= 200 && response.statusCode < 300) { + if (serviceRequests != null) { + var data = json.decode(utf8.decode(response.bodyBytes)); + if (data is List) { + serviceRequests.insert(0, ServiceRequest.fromJson(data[0])); + } else { + if (data["data"] != null && data["data"] == true) { + // serviceRequests.insert(0, ServiceRequest.fromJson(data[0])); + } + } } - return response.statusCode; - } catch (error) { - return -1; + notifyListeners(); } + return response.statusCode; + // } catch (error) { + // return -1; + // } } Future createIssueReport({ diff --git a/lib/models/user.dart b/lib/models/user.dart index ee567784..4daa7964 100644 --- a/lib/models/user.dart +++ b/lib/models/user.dart @@ -76,10 +76,10 @@ class User { } UsersTypes get type { - switch (userRoles?.first?.name) { - case "Engineer": + switch (userRoles?.first?.value) { + case "R-6": return UsersTypes.engineer; - case "Hospital": + case "R-7": return UsersTypes.normal_user; default: return null;