Merge branch 'main_latest_merged' into zaid_development_new

# Conflicts:
#	lib/controllers/providers/api/service_requests_provider.dart
#	lib/models/service_report.dart
#	lib/views/pages/user/requests/report/create_service_report.dart

lib/controllers/providers/api/service_requests_provider.dart

@@ -319,15 +319,15 @@ class ServiceRequestsProvider extends ChangeNotifier {
         "reason": report.reason?.toMap(),
         "startofWorkTime": report.startDate?.toIso8601String() ?? "",
         "endofWorkTime": report.endDate?.toIso8601String() ?? "",
-        "workingHours": report.timer?.durationInSecond,
+        "workingHours": ((report?.endDate?.difference(report?.startDate)?.inMinutes ?? 0) / 60),
         "travelingHours": report.travelingHours,
         "travelingExpenses": report.travelingExpense ?? 0,
         if (report.faultDescription != null) "faultDescription": report.faultDescription.toJson(),
         "sparePartsWorkOrders": report.parts
             ?.map(
               (p) => {
-                "id": p.id,
-                "sparePart": {"id": p.reportPartID ?? 0, "partNo": p.code, "partName": p.name},
+                "id": p.reportPartID ?? 0,
+                "sparePart": {"id": p.id, "partNo": p.code, "partName": p.name},
                 "qty": p.quantity
               },
             )

lib/models/service_report.dart

@@ -11,7 +11,7 @@ import 'package:test_sa/models/timer_model.dart';
 
 class ServiceReport {
   int id;
-  String operatingHours;
+  double operatingHours;
   DateTime visitDate;
   DateTime endDate;
   DateTime startDate;
@@ -26,7 +26,7 @@ class ServiceReport {
   String workPreformed;
 
   //String workHours;
-  String travelingHours;
+  double travelingHours;
   String invoiceNumber;
   String invoiceCode;
   List<Part> parts;
@@ -93,7 +93,14 @@ class ServiceReport {
       _map["endofWorkTime"] = (timer.endAt ?? DateTime.now()).toIso8601String();
       _map["workingHours"] = (timer.durationInSecond / 60 / 60).toStringAsFixed(5);
     }
-    if (travelingHours != null && travelingHours.isNotEmpty) _map["traveling_hours"] = travelingHours;
+    if (travelingHours != null && travelingHours.toString().isNotEmpty) _map["traveling_hours"] = travelingHours;
+    // if(workPreformed != null && workPreformed.isNotEmpty){
+    //   _map["faultDescription"] = {
+    //     //"id":faultDescriptionId ?? 0,
+    //     "workPerformed":workPreformed
+    //   };
+    // }
+    if (travelingHours != null) _map["traveling_hours"] = travelingHours;
     if (workPreformed != null && workPreformed.isNotEmpty) {
       _map["faultDescription"] = faultDescription.toJson();
     }
@@ -170,7 +177,7 @@ class ServiceReport {
       reason: Lookup.fromJson(parsedJson["reason"]),
       status: Lookup.fromJson(parsedJson["status"]),
       type: Lookup.fromJson(parsedJson["typeOfWO"]),
-      //faultDescriptionId: parsedJson["fault_description"],
+      faultDescriptionId: parsedJson["fault_description"],
       endDate: DateTime.tryParse(parsedJson["endofWorkTime"]),
       //invoiceCode: parsedJson["invoice_code"],
       //invoiceNumber: parsedJson["invoice_no"],