From 4e89566d1fe12b0ffe40795f3f85d91a32019126 Mon Sep 17 00:00:00 2001
From: nextwo <1234>
Date: Wed, 31 May 2023 12:05:09 +0300
Subject: [PATCH] implement searchWorkOrders api and edit on ui

---
 assets/subtitles/ar_subtitle.json             |  4 +---
 assets/subtitles/en_subtitle.json             |  2 --
 lib/models/user.dart                          |  9 +++-----
 .../report/future_service_report.dart         | 21 ++++++++-----------
 4 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/assets/subtitles/ar_subtitle.json b/assets/subtitles/ar_subtitle.json
index cf09ef87..885647d2 100644
--- a/assets/subtitles/ar_subtitle.json
+++ b/assets/subtitles/ar_subtitle.json
@@ -137,7 +137,6 @@
   "workPerformed": "العمل انجز",
 
   "actualDate": "تاريخ الفعلي",
-  "done": "تم الانتهاء",
   "expectDate": "التاريخ المتوقع",
   "images": "الصور",
   "imagesRequired": "الصور مطلوبة",
@@ -195,8 +194,7 @@
   "assetName": "اسم الاصل",
   "site": "الموقع",
   "maintenanceSituation": "موقع الصيانه",
-  "currentSituation": "الموقع الحالي"
-  "duplicateRequest": "تكرار الطلب",
+  "currentSituation": "الموقع الحالي",
   "comment" : "تعليق",
   "updateServiceRequest" : "تعديل طلب الخدمة"
 }
\ No newline at end of file
diff --git a/assets/subtitles/en_subtitle.json b/assets/subtitles/en_subtitle.json
index 068fa16c..36162c41 100644
--- a/assets/subtitles/en_subtitle.json
+++ b/assets/subtitles/en_subtitle.json
@@ -136,7 +136,6 @@
   "workPerformed": "Work Performed",
 
   "actualDate": "Actual Date",
-  "done": "Done",
   "expectDate": "Expect Date",
   "images": "Images",
   "imagesRequired": "Images Required",
@@ -198,6 +197,5 @@
   "duplicateRequest": "Duplicate Request",
   "comment" : "Comment",
   "updateServiceRequest" : "Update Service Request"
-  "duplicateRequest": "Duplicate Request"
 
 }
\ No newline at end of file
diff --git a/lib/models/user.dart b/lib/models/user.dart
index 7cfcb713..880e4fce 100644
--- a/lib/models/user.dart
+++ b/lib/models/user.dart
@@ -76,7 +76,7 @@ class User {
   }
 
   UsersTypes get type {
-    switch (userRoles.first.name) {
+    switch (userRoles?.first?.name) {
       case "Engineer":
         return UsersTypes.engineer;
       case "Hospital":
@@ -157,11 +157,8 @@ class User {
     password = json['password'];
     token = json['token'];
     roles = json['roles'];
-    if (json['userRoles'] != null) {
-      userRoles = [];
-      json['userRoles'].forEach((v) {
-        userRoles.add(UserRoles.fromJson(v));
-      });
+    if (userRoles != null) {
+      json['userRoles'] = userRoles.map((v) => v.toJson()).toList();
     }
     tokenlife = json['tokenlife'];
     isAuthenticated = json['isAuthenticated'];
diff --git a/lib/views/pages/user/requests/report/future_service_report.dart b/lib/views/pages/user/requests/report/future_service_report.dart
index 15c792ea..1a987b0d 100644
--- a/lib/views/pages/user/requests/report/future_service_report.dart
+++ b/lib/views/pages/user/requests/report/future_service_report.dart
@@ -12,18 +12,18 @@ import 'package:test_sa/views/widgets/loaders/app_loading.dart';
 import 'package:test_sa/views/widgets/loaders/failed_loading.dart';
 
 import 'edit_service_report.dart';
+
 class FutureServiceReport extends StatefulWidget {
   final ServiceRequest request;
   final SearchWorkOrders workOrder;
 
-  const FutureServiceReport({Key key, this.request,this.workOrder}) : super(key: key);
+  const FutureServiceReport({Key key, this.request, this.workOrder}) : super(key: key);
 
   @override
   _FutureServiceReportState createState() => _FutureServiceReportState();
 }
 
 class _FutureServiceReportState extends State<FutureServiceReport> {
-
   UserProvider _userProvider;
   SettingProvider _settingProvider;
   @override
@@ -33,19 +33,16 @@ class _FutureServiceReportState extends State<FutureServiceReport> {
     Subtitle _subtitle = AppLocalization.of(context).subtitle;
     return Scaffold(
       body: FutureBuilder<ServiceReport>(
-        future: ServiceRequestsProvider().getSingleServiceReport(
-          reportId: widget.workOrder.id,
-          user: _userProvider.user,
-          host: _settingProvider.host,
-          subtitle: _subtitle
-        ),
-        builder: (BuildContext context, AsyncSnapshot<ServiceReport> snapshot){
-          if(snapshot.hasError)
+        future: ServiceRequestsProvider().getSingleServiceReport(reportId: widget.workOrder.id, user: _userProvider.user, host: _settingProvider.host, subtitle: _subtitle),
+        builder: (BuildContext context, AsyncSnapshot<ServiceReport> snapshot) {
+          if (snapshot.hasError)
             return FailedLoading(
               message: snapshot.error.toString(),
-              onReload: (){setState(() {});},
+              onReload: () {
+                setState(() {});
+              },
             );
-          if(snapshot.hasData){
+          if (snapshot.hasData) {
             return EditServiceReport(
               report: snapshot.data,
               request: widget.request,