From ecb8d1e1a7221e3bf03327b8fd3e4f01d7e036c7 Mon Sep 17 00:00:00 2001
From: Sikander Saleem <sikander.saleem@cloudsolutions.com.sa>
Date: Thu, 1 Jun 2023 08:34:27 +0300
Subject: [PATCH] improvements

---
 lib/models/service_report.dart                |  2 +-
 .../pages/user/requests/request_details.dart  | 19 ++++++++++++-------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/lib/models/service_report.dart b/lib/models/service_report.dart
index 60d4e4f2..8f5b873a 100644
--- a/lib/models/service_report.dart
+++ b/lib/models/service_report.dart
@@ -154,7 +154,7 @@ class ServiceReport {
   factory ServiceReport.fromJson(Map<String, dynamic> parsedJson, int id) {
     List<Part> _parts = [];
     if (parsedJson["sparePartsWorkOrders"] != null) {
-      if (parsedJson["sparePartsWorkOrders"][0]["id"] != null) {
+      if ((parsedJson["sparePartsWorkOrders"]as List ).isNotEmpty && parsedJson["sparePartsWorkOrders"][0]["id"] != null) {
         List partsList = parsedJson["sparePartsWorkOrders"];
         _parts = partsList.map((e) => Part.fromJson(e["sparePart"], reportJson: e)).toList();
       }
diff --git a/lib/views/pages/user/requests/request_details.dart b/lib/views/pages/user/requests/request_details.dart
index 8f77c34b..0d17f864 100644
--- a/lib/views/pages/user/requests/request_details.dart
+++ b/lib/views/pages/user/requests/request_details.dart
@@ -12,6 +12,7 @@ import 'package:test_sa/models/service_request/service_request.dart';
 import 'package:test_sa/models/subtitle.dart';
 import 'package:test_sa/views/app_style/colors.dart';
 import 'package:test_sa/views/app_style/sizing.dart';
+import 'package:test_sa/views/pages/user/requests/create_request.dart';
 import 'package:test_sa/views/pages/user/requests/report/create_service_report.dart';
 import 'package:test_sa/views/widgets/buttons/app_back_button.dart';
 import 'package:test_sa/views/widgets/buttons/app_button.dart';
@@ -84,13 +85,16 @@ class RequestDetailsPage extends StatelessWidget {
                             buttonSize: 42,
                             backgroundColor: AColors.green,
                             onPressed: () async {
-                              showModalBottomSheet(
-                                  context: context,
-                                  builder: (context) {
-                                    return ServiceRequestsUpdateDialog(
-                                      request: serviceRequest,
-                                    );
-                                  });
+                              Navigator.of(context).push(
+                                MaterialPageRoute(builder: (_) => CreateRequestPage(serviceRequest: serviceRequest)),
+                              );
+                              // showModalBottomSheet(
+                              //     context: context,
+                              //     builder: (context) {
+                              //       return ServiceRequestsUpdateDialog(
+                              //         request: serviceRequest,
+                              //       );
+                              //     });
                               // DateTime picked = await showDatePicker(
                               //     context: context,
                               //     initialDate: DateTime.now(),
@@ -302,6 +306,7 @@ class RequestDetailsPage extends StatelessWidget {
                       future: _serviceRequestsProvider.searchWorkOrders(callId: serviceRequest.requestCode),
                       builder: (context, snap) {
                         workOrders = snap.data as List<SearchWorkOrders>;
+                        if (snap.connectionState == ConnectionState.waiting) return Center(child: CircularProgressIndicator());
                         if (snap.connectionState == ConnectionState.done && (snap.data?.length ?? 0) != 0) {
                           return ListView.separated(
                             padding: EdgeInsets.all(21),