From d99a0837928dff725f85717dc1e58758f86120fe Mon Sep 17 00:00:00 2001 From: "muhammad.abbasi" Date: Mon, 16 Sep 2024 09:42:45 +0300 Subject: [PATCH] bug fixes --- .../providers/api/service_requests_provider.dart | 6 +++--- lib/models/lookup.dart | 3 ++- .../views/request_detail_main_view.dart | 1 + lib/views/pages/user/requests/service_request_details.dart | 1 + 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/controllers/providers/api/service_requests_provider.dart b/lib/controllers/providers/api/service_requests_provider.dart index f3f60954..925f7cc9 100644 --- a/lib/controllers/providers/api/service_requests_provider.dart +++ b/lib/controllers/providers/api/service_requests_provider.dart @@ -613,7 +613,7 @@ class ServiceRequestsProvider extends ChangeNotifier { } Future getServiceRequestObjectById({required String requestId}) async { - try { + // try { isDetialLoading = true; Response response = await ApiManager.instance.get(URLs.getServiceRequestById + "?callRequestId=$requestId"); if (response.statusCode >= 200 && response.statusCode < 300) { @@ -623,10 +623,10 @@ class ServiceRequestsProvider extends ChangeNotifier { isDetialLoading = false; return null; } - } catch (error) { + // } catch (error) { isDetialLoading = false; return null; - } + // } } Future> getServiceRequestById({required String requestId}) async { diff --git a/lib/models/lookup.dart b/lib/models/lookup.dart index eee96ef2..79a03e1d 100644 --- a/lib/models/lookup.dart +++ b/lib/models/lookup.dart @@ -33,7 +33,8 @@ class Lookup extends Base { // userName = json['userName'] ?? ''; // } - factory Lookup.fromJson(Map parsedJson) { + factory Lookup.fromJson(Map? parsedJson) { + if(parsedJson==null) return Lookup(); return Lookup( name: parsedJson["name"], id: parsedJson["id"], diff --git a/lib/service_request_latest/views/request_detail_main_view.dart b/lib/service_request_latest/views/request_detail_main_view.dart index aaefa7c7..a3d72342 100644 --- a/lib/service_request_latest/views/request_detail_main_view.dart +++ b/lib/service_request_latest/views/request_detail_main_view.dart @@ -8,6 +8,7 @@ import 'package:test_sa/new_views/app_style/app_color.dart'; import 'package:test_sa/new_views/common_widgets/default_app_bar.dart'; import 'package:test_sa/service_request_latest/views/components/history_log_view.dart'; import 'package:test_sa/service_request_latest/views/components/initial_visit_card.dart'; +import 'package:test_sa/views/pages/user/requests/service_request_details.dart'; import 'components/request_detail_view.dart'; diff --git a/lib/views/pages/user/requests/service_request_details.dart b/lib/views/pages/user/requests/service_request_details.dart index 6e642c8f..ce3ad62c 100644 --- a/lib/views/pages/user/requests/service_request_details.dart +++ b/lib/views/pages/user/requests/service_request_details.dart @@ -49,6 +49,7 @@ class _ServiceRequestDetailsPageState extends State { WidgetsFlutterBinding.ensureInitialized().addPostFrameCallback((timeStamp) async { Provider.of(context, listen: false).reset(); serviceRequest = await Provider.of(context, listen: false).getServiceRequestObjectById(requestId: widget.serviceRequest.id!); + print('service request i got is ${serviceRequest?.id}'); loading = false; setState(() {}); });