Merge remote-tracking branch 'origin/design_3.0_sdk_upgrade' into design_3.0_sdk_upgrade

# Conflicts:
#	lib/service_request_latest/views/forms/maintenance_request/components/assistant_employee_card.dart
#	lib/views/widgets/status/assistant_employee_menu.dart
#	lib/views/widgets/status/report/service_report_assistant_employee_menu.dart

lib/controllers/api_routes/urls.dart

@@ -35,6 +35,7 @@ class URLs {
   static get nurseDashboardCountUrl=> '$_baseUrl/ServiceRequest/GetDashboardNurseCount';
   static get nurseDashboardDetailsUrl=> '$_baseUrl/ServiceRequest/GetDashboardNurseDetails';
   static get nurseRejectUrl=> '$_baseUrl/ServiceRequest/NurseReject';
+  static get engineerStopTimer=> '$_baseUrl/ServiceRequest/EngineerStopTimer';
   static get nurseConfirmUrl=> '$_baseUrl/ServiceRequest/NurseConfirm';
   static get engineerDashboardCountUrl=> '$_baseUrl/ServiceRequest/GetDashboardEngineerCount';
   static get engineerDashboardDetailsUrl=> '$_baseUrl/ServiceRequest/GetDashboardEngineerDetails';

lib/dashboard_latest/dashboard_provider.dart

@@ -41,7 +41,8 @@ class DashBoardProvider extends ChangeNotifier {
 
   List<CategoryTabs> tabs = [];
 
-  void setTabs(UsersTypes userType, context) {
+  void setTabs({required UsersTypes userType, required BuildContext  context}) {
+    print('user type i got in method is ${userType}');
     tabs = CategoryTabs.getTabs(userType: userType, context: context);
   }
 
@@ -78,10 +79,10 @@ class DashBoardProvider extends ChangeNotifier {
     isAllCountLoading = true;
     notifyListeners();
     String url = '';
-    if (usersType == UsersTypes.nurse) {
-      url = URLs.nurseDashboardCountUrl;
-    } else {
+    if (usersType == UsersTypes.engineer) {
       url = URLs.engineerDashboardCountUrl;
+    } else {
+      url = URLs.nurseDashboardCountUrl;
     }
     Response response;
     try {
@@ -159,16 +160,18 @@ class DashBoardProvider extends ChangeNotifier {
       notifyListeners();
     }
 
+    print('i am called...${usersType}');
+
     Response response;
     String url = '';
-    if (usersType == UsersTypes.nurse) {
-      url = URLs.nurseDashboardDetailsUrl;
-    } else {
+    if (usersType == UsersTypes.engineer) {
       url = URLs.engineerDashboardDetailsUrl;
+    } else {
+      url = URLs.nurseDashboardDetailsUrl;
     }
     try {
       Map<String, dynamic> body = {"pageNumber": pageNum, "pageSize": pageItemNumber};
-      if (status != null) body["status"] = status;
+      if (status != null) body["statusValue"] = status;
       if (isHighPriority) body["isHighPriority"] = true;
       if (isOverdue) body["isOverdue"] = true;
       response = await ApiManager.instance.post(url, body: body);
@@ -227,7 +230,7 @@ class CategoryTabs {
     tabs.add(CategoryTabs('Open Request', 1));
     tabs.add(CategoryTabs('In Progress', 2));
     tabs.add(CategoryTabs('Acknowledged', 3));
-    tabs.add(CategoryTabs('Rejected', 4));
+    tabs.add(CategoryTabs('Rejected', 6));
     return tabs;
   }
 }

lib/dashboard_latest/dashboard_view.dart

@@ -49,6 +49,7 @@ class _DashboardViewState extends State<DashboardView> {
   }
 
   void getRequests() {
+    _dashBoardProvider.setTabs(userType:userProvider.user!.type!,context: context);
     _dashBoardProvider.getDashBoardCount(usersType: userProvider.user!.type!);
     _dashBoardProvider.resetRequestDataList();
     _dashBoardProvider.getRequestDetail(usersType: userProvider.user!.type!, status: _dashBoardProvider.tabs[_dashBoardProvider.currentListIndex].tag);
@@ -58,10 +59,8 @@ class _DashboardViewState extends State<DashboardView> {
     scheduleMicrotask(() async {
       userProvider = Provider.of<UserProvider>(context, listen: false);
       settingProvider = Provider.of<SettingProvider>(context, listen: false);
-      RequestDetailProvider requestDetailProvider = Provider.of<RequestDetailProvider>(context, listen: false);
-      //allRequestsProvider = Provider.of<AllRequestsProvider>(context, listen: false);
       _dashBoardProvider = Provider.of<DashBoardProvider>(context, listen: false);
-      _dashBoardProvider.setTabs(userProvider.user!.type!, context);
+
       notificationsProvider = Provider.of<NotificationsProvider>(context, listen: false);
       user = userProvider.user!;
       getRequests();

lib/dashboard_latest/widgets/request_category_fragment.dart

@@ -42,7 +42,7 @@ class RequestCategoryFragment extends StatelessWidget {
   }
 
   Widget getTabs({required BuildContext context, required DashBoardProvider requestsProvider, required UsersTypes userType}) {
-    List<CategoryTabs> tabs = CategoryTabs.getTabs(userType: UsersTypes.engineer, context: context);
+    List<CategoryTabs> tabs = CategoryTabs.getTabs(userType: userType, context: context);
     return SizedBox(
       height: 44 + 16,
       child: ListView.separated(

lib/models/helper_data_models/maintenance_request/activity_maintenance_model.dart

@@ -76,7 +76,7 @@ class ActivityMaintenanceHelperModel {
     if(lastSituation!=null){
       data['lastSituationId'] = lastSituation?.id;
     }
-    if (assignedEmployee != null&&assignedEmployee?.userId!=null) {
+    if (assistantEmployees != null&&assistantEmployees!.isNotEmpty) {
       data['assistantEmployees'] =  [modelAssistantEmployees?.toJson()];
     }
     else{

lib/new_views/common_widgets/default_app_bar.dart

@@ -9,8 +9,9 @@ import '../app_style/app_color.dart';
 class DefaultAppBar extends StatelessWidget implements PreferredSizeWidget {
   final String? title;
   final List<Widget>? actions;
+  final VoidCallback ?onBackPress;
 
-  const DefaultAppBar({this.title, this.actions, Key? key}) : super(key: key);
+  const DefaultAppBar({this.title,this.onBackPress, this.actions, Key? key}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
@@ -20,7 +21,7 @@ class DefaultAppBar extends StatelessWidget implements PreferredSizeWidget {
       title: Row(
         children: [
           const Icon(Icons.arrow_back_ios).onPress(() {
-            Navigator.of(context).pop();
+           onBackPress?? Navigator.of(context).pop();
           }),
           10.width,
           Text(

lib/service_request_latest/request_detail_provider.dart

@@ -38,8 +38,13 @@ class RequestDetailProvider extends ChangeNotifier {
   }
 
   void stopTimer() {
+    Timer.periodic(const Duration(seconds: 1), (Timer t) {
+      timerStartTime = timerStartTime.add(const Duration(seconds: 1));
+      notifyListeners(); // Notify UI when time is updated
+    });
     timer?.cancel();
     isTimerRunning = false;
+    engineerStopTimer();
     notifyListeners(); // Notify UI when timer stops
   }
 
@@ -209,6 +214,28 @@ class RequestDetailProvider extends ChangeNotifier {
       notifyListeners();
       return -1;
     }
+  }  //engineerAcceptWorkOrder......
+  Future<int> engineerStopTimer() async {
+    Response response;
+    try {
+      final body = {"workOrderId": currentWorkOrder?.data?.requestId};
+      isLoading = true;
+      notifyListeners();
+      response = await ApiManager.instance.post(URLs.engineerStopTimer, body: body);
+      print('response of stop timer is ${response.body}');
+      stateCode = response.statusCode;
+      if (response.statusCode >= 200 && response.statusCode < 300) {
+
+      }
+      isLoading = false;
+      notifyListeners();
+      return response.statusCode;
+    } catch (e) {
+      log("engineer accept  [error] : $e");
+      isLoading = false;
+      notifyListeners();
+      return -1;
+    }
   }
 
   //engineerRejectWorkOrder......
@@ -413,6 +440,8 @@ class RequestDetailProvider extends ChangeNotifier {
     }
   }
 
+
+
   //Nurse confirm reopen
   Future<CommonResponseModel> nurseReject() async {
     try {
@@ -421,14 +450,16 @@ class RequestDetailProvider extends ChangeNotifier {
       final response = await ApiManager.instance.post(URLs.nurseRejectUrl, body: nurseActionHelperModel!.toJson());
       stateCode = response.statusCode;
       CommonResponseModel commonResponseModel = CommonResponseModel();
+
       if (response.statusCode >= 200 && response.statusCode < 300) {
+
         commonResponseModel = CommonResponseModel.fromJson(json.decode(response.body));
       }
       isLoading = false;
       notifyListeners();
       return commonResponseModel;
     } catch (e) {
-      log("engineer accept  [error] : $e");
+      log("nurse  reject  [error] : $e");
       isLoading = false;
       notifyListeners();
       return CommonResponseModel();

lib/service_request_latest/views/components/action_button/footer_action_button.dart

@@ -42,8 +42,10 @@ class FooterActionButton {
           return const SizedBox();
         // TODO: Handle this case.
         case WorkOrderNextStepEnum.markedAsFixed:
+          break;
         // TODO: Handle this case.
         case WorkOrderNextStepEnum.nTakeAction:
+          print('i am here take action ..');
           // const SizedBox().flushBar(context: context, title: context.translation.youMarkedThisIssueAsFixedWaitingForTheRequesterToConfirm, message: '');
           return footerContainer(
               child: AppFilledButton(
@@ -177,8 +179,12 @@ class FooterActionButton {
             fontSize: 12.toScreenWidth,
           ));
       }
-    } else if (userProvider.user?.type == UsersTypes.nurse) {
+    }
+    else  {
+      print('value is ${workOrderNextStepStatus}');
       if (workOrderNextStepStatus == WorkOrderNextStepEnum.nTakeAction) {
+        print('i am here take action ..');
+
         return footerContainer(
             child: AppFilledButton(
           label: context.translation.takeAction,

lib/service_request_latest/views/components/bottom_sheets/service_request_bottomsheet.dart

@@ -4,6 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:provider/provider.dart';
 import 'package:test_sa/app_strings/app_asset.dart';
+import 'package:test_sa/dashboard_latest/widgets/request_category_list.dart';
 import 'package:test_sa/extensions/context_extension.dart';
 import 'package:test_sa/extensions/int_extensions.dart';
 import 'package:test_sa/extensions/string_extensions.dart';
@@ -611,6 +612,62 @@ class ServiceRequestBottomSheet {
           );
         }));
   }
+  static Future nurseRejectBackBottomSheet({required BuildContext context}) {
+    String feedback = '';
+    return buildBottomSheetParent(
+        context: context,
+        childWidget: Consumer<RequestDetailProvider>(builder: (context, RequestDetailProvider requestDetailProvider, child) {
+          return Column(
+            crossAxisAlignment: CrossAxisAlignment.center,
+            children: [
+              const SizedBox().indicatorWidget(),
+              8.height,
+              Align(
+                alignment: AlignmentDirectional.centerStart,
+                child: context.translation.rejectionReason.bottomSheetHeadingTextStyle(context),
+              ),
+              21.height,
+              AppTextFormField(
+                labelText: context.translation.comments,
+                textInputType: TextInputType.multiline,
+                labelStyle: AppTextStyles.textFieldLabelStyle,
+                showWithoutDecoration: true,
+                backgroundColor: context.isDark ? AppColor.neutral20 : AppColor.neutral100,
+                alignLabelWithHint: true,
+                onChange: (text) {
+                  feedback = text;
+                },
+                onSaved: (text) {
+                  feedback = text;
+                },
+              ),
+              16.height,
+              AppFilledButton(
+                label: context.translation.reject,
+                maxWidth: true,
+                buttonColor: Colors.white54,
+                textColor: AppColor.red30,
+                showBorder: true,
+                onPressed: () {
+                  if (feedback.isNotEmpty) {
+                    requestDetailProvider.nurseActionHelperModel = NurseActionHelperModel(
+                      workOrderId: requestDetailProvider.currentWorkOrder!.data!.requestId,
+                      feedback: feedback,
+                    );
+                    requestDetailProvider.nurseReject();
+                    Navigator.pop(context);
+                    if(requestDetailProvider.currentWorkOrder!.data!.requestId!=null){
+                      requestDetailProvider.getWorkOrderById(id: requestDetailProvider.currentWorkOrder!.data!.requestId!);
+                    }
+                  }
+                  // Navigator.pop(context);
+                  // requestDetailProvider.engineerMarkAsFixed(workOrderId: requestDetailProvider.currentWorkOrder!.data!.requestId!, feedback: feedback);
+                },
+              ),
+            ],
+          );
+        }));
+  }
 
   static Future nurseTakeActionBottomSheet({required BuildContext context}) {
     bool acknowledge = false;
@@ -618,7 +675,7 @@ class ServiceRequestBottomSheet {
     String? nurseSignature;
     return buildBottomSheetParent(
         context: context,
-        childWidget: Consumer<RequestDetailProvider>(builder: (context, requestDetailProvider, child) {
+        childWidget: Consumer<RequestDetailProvider>(builder: (context, RequestDetailProvider requestDetailProvider, child) {
           return Column(
             crossAxisAlignment: CrossAxisAlignment.center,
             children: [
@@ -629,37 +686,63 @@ class ServiceRequestBottomSheet {
                 child: context.translation.pleaseConfirmTheIssueHasBeenResolved.bottomSheetHeadingTextStyle(context),
               ),
               10.height,
-              Row(
-                children: [
-                  InkWell(
-                    child: acknowledge
-                        ? const Icon(
-                            Icons.check_box,
-                            color: AppColor.primary10,
-                          )
-                        : const Icon(
-                            Icons.check_box_outline_blank,
-                            color: AppColor.neutral120,
+              StatefulBuilder(
+                builder: (context, setState) {
+                  return Column(
+                    children: [
+                      Row(
+                        children: [
+                          InkWell(
+                            child: acknowledge
+                                ? const Icon(
+                              Icons.check_box,
+                              color: AppColor.primary10,
+                            )
+                                : const Icon(
+                              Icons.check_box_outline_blank,
+                              color: AppColor.neutral120,
+                            ),
+                            onTap: () {
+                              setState(() {
+                                acknowledge = !acknowledge;
+                              });
+                            },
                           ),
-                    onTap: () {
-                      acknowledge = !acknowledge;
-                    },
-                  ),
-                  6.width,
-                  Flexible(child: context.translation.nurseAcknowledge.bodyText(context).custom(color: context.isDark ? AppColor.primary50 : AppColor.neutral120)),
-                ],
-              ),
-              17.height,
-              ESignature(
-                title: '',
-                oldSignature: '',
-                newSignature: newSignature,
-                backgroundColor: AppColor.neutral100,
-                showShadow: false,
-                onSaved: (signature) {
-                  if (signature == null || signature.isEmpty) return;
-                  newSignature = signature;
-                  nurseSignature = "${DateTime.now().toIso8601String()}.png|${base64Encode(signature)}";
+                          6.width,
+                          Flexible(
+                            child: context.translation.nurseAcknowledge
+                                .bodyText(context)
+                                .custom(color: context.isDark ? AppColor.primary50 : AppColor.neutral120),
+                          ),
+                        ],
+                      ),
+                      17.height,
+                      ESignature(
+                        title: '',
+                        oldSignature: '',
+                        newSignature: newSignature,
+                        backgroundColor: AppColor.neutral100,
+                        showShadow: false,
+                        onChange:(signature){
+                          setState(() {
+                            if (signature == null || signature.isEmpty) return;
+                            newSignature = signature;
+                            nurseSignature = "${DateTime.now().toIso8601String()}.png|${base64Encode(signature)}";
+                            print('signature i got is ${newSignature}');
+                          });
+                  },
+                        onSaved: (signature) {
+
+                          setState(() {
+                            if (signature == null || signature.isEmpty) return;
+                            newSignature = signature;
+                            nurseSignature = "${DateTime.now().toIso8601String()}.png|${base64Encode(signature)}";
+                            print('signature i got is ${newSignature}');
+                          });
+                        },
+                      ),
+                    ],
+                  );
                 },
               ),
               36.height,
@@ -674,14 +757,8 @@ class ServiceRequestBottomSheet {
                     textColor: AppColor.red30,
                     showBorder: true,
                     onPressed: () async {
-                      if (newSignature != null && acknowledge) {
-                        requestDetailProvider.nurseActionHelperModel = NurseActionHelperModel(
-                          workOrderId: requestDetailProvider.currentWorkOrder!.data!.requestId,
-                          signatureNurse: nurseSignature,
-                        );
-                        requestDetailProvider.nurseReject();
-                        Navigator.pop(context);
-                      }
+                      Navigator.pop(context);
+                      nurseRejectBackBottomSheet(context: context);
                     },
                   ).expanded,
                   const SizedBox(
@@ -692,14 +769,18 @@ class ServiceRequestBottomSheet {
                     maxWidth: true,
                     buttonColor: AppColor.green70,
                     onPressed: () async {
-                      if (newSignature != null && acknowledge) {
-                        //TODO replace provider with new provider and also check workorder id is not correct.
+                      if (newSignature != null) {
                         requestDetailProvider.nurseActionHelperModel = NurseActionHelperModel(
                           workOrderId: requestDetailProvider.currentWorkOrder!.data!.requestId!,
                           signatureNurse: nurseSignature,
                         );
                         requestDetailProvider.nurseConfirm();
+                        if(requestDetailProvider.currentWorkOrder!.data!.requestId!=null){
+                          requestDetailProvider.getWorkOrderById(id: requestDetailProvider.currentWorkOrder!.data!.requestId!);
+                        }
                         Navigator.pop(context);
+                      }else{
+                        //show some toast...
                       }
                     },
                   ).expanded,

lib/service_request_latest/views/components/request_detail_view.dart

@@ -16,6 +16,7 @@ import 'package:test_sa/new_views/common_widgets/app_filled_button.dart';
 import 'package:test_sa/service_request_latest/request_detail_provider.dart';
 import 'package:test_sa/service_request_latest/views/components/action_button/footer_action_button.dart';
 import 'package:test_sa/service_request_latest/views/components/initial_visit_card.dart';
+import 'package:test_sa/service_request_latest/views/components/timer_widget.dart';
 import 'package:test_sa/service_request_latest/views/forms/asset_retired/asset_retired.dart';
 import 'package:test_sa/views/widgets/images/files_list.dart';
 import 'package:test_sa/views/widgets/loaders/no_data_found.dart';
@@ -29,6 +30,7 @@ class WorkOrderDetailView extends StatelessWidget {
   Widget build(BuildContext context) {
     UserProvider _userProvider = Provider.of<UserProvider>(context, listen: false);
     return Consumer<RequestDetailProvider>(builder: (pContext, requestProvider, _) {
+
       return requestProvider.isLoading
           ? const CircularProgressIndicator(color: AppColor.primary10).center
           : requestProvider.currentWorkOrder == null
@@ -56,15 +58,16 @@ class WorkOrderDetailView extends StatelessWidget {
                             context: context),
                       ],
                     ),
-                    // const TimerWidget(),
+                    if (requestProvider.timer!=null&&requestProvider.timer!.isActive)...[
+                      const TimerWidget(),
+                    ]
                   ],
                 );
     });
   }
 
   Widget workOrderDetailCard(BuildContext context, WorkOrderData workOrder, UserProvider userProvider) {
-    print('callids i got is ${workOrder.requestId}');
-    print('work order next step value is ${workOrder.nextStep?.toJson()}');
+
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
@@ -391,7 +394,7 @@ class WorkOrderDetailView extends StatelessWidget {
 //                       ),
 //                     ),
 //                     FooterActionButton.requestDetailsFooterWidget(status: 7, context: context),
-//                     TimerWidget(),
+
 //                   ],
 //                 ),
 //     );

lib/service_request_latest/views/components/timer_widget.dart

@@ -22,8 +22,6 @@ class _TimerWidgetState extends State<TimerWidget> {
   Offset position = Offset(SizeConfig.screenWidth! - 100, SizeConfig.screenHeight! / 2 - 50);
   @override
   void initState() {
-    // TODO: implement initState
-    Provider.of<RequestDetailProvider>(context,listen: false).startTimer();
     super.initState();
   }
   @override
@@ -64,8 +62,6 @@ class _TimerWidgetState extends State<TimerWidget> {
       onTap: () {
         if (provider.isTimerRunning) {
           provider.stopTimer();
-        } else {
-          provider.startTimer();
         }
       },
       child: Container(

lib/service_request_latest/views/components/verify_arrival_view.dart

@@ -146,18 +146,13 @@ class _VerifyArrivalViewState extends State<VerifyArrivalView> {
             // showDialog(context: context, barrierDismissible: false, builder: (context) => const AppLazyLoading());
 
             status = await requestDetailProvider.engineerConfirmArrival(
-                workOrderId: requestDetailProvider.currentWorkOrder!.data!.requestId!,
-                verificationTypeId: 1,
-                photoInfo: '',
-                otp: '',
-                assetNo: requestDetailProvider.currentWorkOrder!.data!.asset!.assetNumber!);
-            print('status i got is $status');
+                workOrderId: requestDetailProvider.currentWorkOrder!.data!.requestId!, verificationTypeId: 1, photoInfo: '', otp: '', assetNo: result);
             if (status == 200) {
               requestDetailProvider.getWorkOrderById(id: requestDetailProvider.currentWorkOrder!.data!.requestId!);
               //Navigator.pop(context);
+              requestDetailProvider.startTimer();
               Navigator.pushReplacement(context, MaterialPageRoute(builder: (context) => RequestDetailMain(requestId: requestDetailProvider.currentWorkOrder!.data!.requestId!)));
-            }
-            else {
+            } else {
               // Navigator.pop(context);
               //show some message.
             }
@@ -172,41 +167,35 @@ class _VerifyArrivalViewState extends State<VerifyArrivalView> {
         break;
       case 2:
         //TODO add loader.
-      // showDialog(context: context, barrierDismissible: false, builder: (context) => const AppLazyLoading());
+        // showDialog(context: context, barrierDismissible: false, builder: (context) => const AppLazyLoading());
 
         requestDetailProvider.sendOtp(workOrderId: requestDetailProvider.currentWorkOrder!.data!.requestId!);
-         //Navigator.pop(context);
+        //Navigator.pop(context);
         Navigator.pushReplacement(
           context,
           MaterialPageRoute(builder: (context) => const VerifyOtpView()),
         );
         break;
       case 3:
-        File ?pickedFile = await onFilePicker();
-        if(pickedFile!=null){
+        File? pickedFile = await onFilePicker();
+        if (pickedFile != null) {
           var fileObj = ("${pickedFile.path.split("/").last}|${base64Encode(File(pickedFile.path).readAsBytesSync())}");
           int? status;
-          try{
+          try {
             //TODO add loader
             // showDialog(context: context, barrierDismissible: false, builder: (context) => const AppLazyLoading());
-            status = await requestDetailProvider.engineerConfirmArrival(
-                workOrderId: requestDetailProvider.currentWorkOrder!.data!.requestId!,
-                verificationTypeId: 1,
-                photoInfo: fileObj,
-                otp: '',
-                assetNo: requestDetailProvider.currentWorkOrder!.data!.asset?.assetNumber);
+            status = await requestDetailProvider.engineerConfirmArrival(workOrderId: requestDetailProvider.currentWorkOrder!.data!.requestId!, verificationTypeId: 4, photoInfo: fileObj, otp: '');
 
             if (status == 200) {
               requestDetailProvider.getWorkOrderById(id: requestDetailProvider.currentWorkOrder!.data!.requestId!);
               // Navigator.pop(context);
+              requestDetailProvider.startTimer();
               Navigator.pushReplacement(context, MaterialPageRoute(builder: (context) => RequestDetailMain(requestId: requestDetailProvider.currentWorkOrder!.data!.requestId!)));
-            }
-            else{
+            } else {
               //show some message.
               // Navigator.pop(context);
-
             }
-          }catch(e){
+          } catch (e) {
             print('error i got is $e');
             // Navigator.pop(context);
           }
@@ -225,8 +214,8 @@ class _VerifyArrivalViewState extends State<VerifyArrivalView> {
     }
     //   ScanQr
   }
-  Future<File?> onFilePicker() async {
 
+  Future<File?> onFilePicker() async {
     // ImageSource? source = await showModalBottomSheet<ImageSource>(
     //   context: context,
     //   builder: (BuildContext context) {
@@ -276,12 +265,12 @@ class _VerifyArrivalViewState extends State<VerifyArrivalView> {
     //   },
     // );
     // if (source == null) return null;
-    File ?fileImage;
+    File? fileImage;
     final pickedFile = await ImagePicker().pickImage(source: ImageSource.camera, imageQuality: 70, maxWidth: 800, maxHeight: 800);
 
     if (pickedFile != null) {
       fileImage = File(pickedFile.path);
-        }
-return fileImage;
+    }
+    return fileImage;
   }
 }

lib/service_request_latest/views/components/verify_otp_view.dart

@@ -62,6 +62,7 @@ class VerifyOtpView extends StatelessWidget {
                         await requestDetailProvider.engineerConfirmArrival(
                             workOrderId: requestDetailProvider.currentWorkOrder!.data!.requestId!, verificationTypeId: 3, photoInfo: '', otp: pin, assetNo: '');
                         // Navigator.pop(context);
+                        requestDetailProvider.startTimer();
                         Navigator.pushReplacement(context, MaterialPageRoute(builder: (context) => RequestDetailMain(requestId: requestDetailProvider.currentWorkOrder!.data!.requestId!)));
                       }
                     },

lib/service_request_latest/views/forms/asset_retired/verify_asset_detail.dart

@@ -14,6 +14,7 @@ import 'package:test_sa/models/helper_data_models/workorder/work_order_helper_mo
 import 'package:test_sa/models/new_models/work_order_detail_model.dart';
 import 'package:test_sa/new_views/app_style/app_color.dart';
 import 'package:test_sa/new_views/common_widgets/app_filled_button.dart';
+import 'package:test_sa/new_views/common_widgets/app_lazy_loading.dart';
 import 'package:test_sa/new_views/common_widgets/single_item_drop_down_menu.dart';
 import 'package:test_sa/providers/loading_list_notifier.dart';
 import 'package:test_sa/providers/service_request_providers/equipment_status_provider.dart';
@@ -82,7 +83,7 @@ class _VerifyAssetDetailsState extends State<VerifyAssetDetails> with TickerProv
         equipmentStatus: currentWorkOrderData.equipmentStatus,
         loanAvailability: currentWorkOrderData.loanAvailablity,
         failureReason: currentWorkOrderData.failureReasone,
-        // faultDescription: currentWorkOrderData.problemDescription,
+         // faultDescription: currentWorkOrderData.fa,
         solution: currentWorkOrderData.solution?.name,
         returnToService: currentWorkOrderData.returnToService,
         serviceType: currentWorkOrderData.serviceType,
@@ -212,8 +213,11 @@ class _VerifyAssetDetailsState extends State<VerifyAssetDetails> with TickerProv
                 label: context.translation.verify_asset_details,
                 buttonColor: AppColor.primary10,
                 onPressed: () async {
+                  //TODO add loader..
+                   showDialog(context: context, barrierDismissible: false, builder: (context) => const AppLazyLoading());
                   await requestDetailProvider.engineerUpdateWorkOrder();
                   Navigator.pop(context);
+                  Navigator.pop(context);
                 },
               ),
             ),

lib/service_request_latest/views/forms/maintenance_request/components/internal_request.dart

@@ -42,11 +42,13 @@ class _InternalMaintenanceRequestState extends State<InternalMaintenanceRequest>
   final GlobalKey<FormState> _formKey = GlobalKey<FormState>();
   final TextEditingController _workingHoursController = TextEditingController();
   final TextEditingController _travellingHoursController = TextEditingController();
+  Lookup statusLookup = Lookup.fromJson({"id": 5619, "name": "New", "value": 1});
 
   @override
   void initState() {
     _activityStatusProvider = Provider.of<ActivityStatusProvider>(context, listen: false);
     _requestDetailProvider = Provider.of<RequestDetailProvider>(context, listen: false);
+    _requestDetailProvider?.activityMaintenanceHelperModel?.activityStatus = _requestDetailProvider?.activityMaintenanceHelperModel?.activityStatus ?? statusLookup;
     super.initState();
     WidgetsBinding.instance.addPostFrameCallback((_) {
       _travellingHoursController.text =
@@ -77,7 +79,6 @@ class _InternalMaintenanceRequestState extends State<InternalMaintenanceRequest>
   @override
   Widget build(BuildContext context) {
     return Consumer<RequestDetailProvider>(builder: (context, requestDetailProvider, child) {
-      print('data in consumer is ${requestDetailProvider.activityMaintenanceHelperModel?.activityStatus?.toJson()}');
       return SingleChildScrollView(
         child: Column(
           children: [
@@ -86,31 +87,32 @@ class _InternalMaintenanceRequestState extends State<InternalMaintenanceRequest>
               child: Column(
                 crossAxisAlignment: CrossAxisAlignment.stretch,
                 children: [
-                  SingleItemDropDownMenu<Lookup, LastSituationProvider>(
+                  SingleItemDropDownMenu<Lookup, ActivityStatusProvider>(
                     context: context,
                     height: 56.toScreenHeight,
-                    title: context.translation.lastSituationStatus,
+                    title: context.translation.activityStatus,
                     showShadow: false,
                     backgroundColor: AppColor.neutral100,
-                    showAsBottomSheet: true,
-                    initialValue: requestDetailProvider.activityMaintenanceHelperModel?.lastSituation,
+                    initialValue: requestDetailProvider.activityMaintenanceHelperModel?.activityStatus,
                     onSelect: (status) {
-                      if (status != null) {
-                        requestDetailProvider.activityMaintenanceHelperModel?.lastSituation = status;
-                        setState(() {});
-                      }
+                      print('status i got is ${status?.toJson()}');
+                      requestDetailProvider.activityMaintenanceHelperModel?.activityStatus = status;
                     },
                   ),
                   8.height,
-                  SingleItemDropDownMenu<Lookup, ActivityStatusProvider>(
+                  SingleItemDropDownMenu<Lookup, LastSituationProvider>(
                     context: context,
                     height: 56.toScreenHeight,
-                    title: context.translation.activityStatus,
+                    title: context.translation.lastSituationStatus,
                     showShadow: false,
                     backgroundColor: AppColor.neutral100,
-                    initialValue: requestDetailProvider.activityMaintenanceHelperModel?.activityStatus,
+                    showAsBottomSheet: true,
+                    initialValue: requestDetailProvider.activityMaintenanceHelperModel?.lastSituation,
                     onSelect: (status) {
-                      requestDetailProvider.activityMaintenanceHelperModel?.activityStatus = status;
+                      if (status != null) {
+                        requestDetailProvider.activityMaintenanceHelperModel?.lastSituation = status;
+                        setState(() {});
+                      }
                     },
                   ),
                   8.height,

lib/service_request_latest/views/request_detail_main_view.dart

@@ -41,45 +41,75 @@ class _RequestDetailMainState extends State<RequestDetailMain> {
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
-      backgroundColor: AppColor.neutral100,
-      appBar: DefaultAppBar(title: context.translation.serviceDetails),
-      body: DefaultTabController(
-        length: 2,
-        child: Column(
-          mainAxisSize: MainAxisSize.min,
-          children: <Widget>[
-            Container(
-              margin: EdgeInsets.only(left: 16.toScreenWidth, right: 16.toScreenWidth, top: 12.toScreenHeight),
-              decoration: BoxDecoration(color: context.isDark ? AppColor.neutral50 : AppColor.white10, borderRadius: BorderRadius.circular(10)),
-              child: TabBar(
-                //controller: _tabController,
-                padding: EdgeInsets.symmetric(vertical: 4.toScreenHeight, horizontal: 4.toScreenWidth),
-                labelColor: context.isDark ? AppColor.neutral30 : AppColor.black20,
-                unselectedLabelColor: context.isDark ? AppColor.neutral30 : AppColor.black20,
-                unselectedLabelStyle: AppTextStyles.bodyText,
-                labelStyle: AppTextStyles.bodyText,
-                indicatorPadding: EdgeInsets.zero,
-                indicatorSize: TabBarIndicatorSize.tab,
-                dividerColor: Colors.transparent,
-                indicator: BoxDecoration(color: context.isDark ? AppColor.neutral60 : AppColor.neutral110, borderRadius: BorderRadius.circular(7)),
-                onTap: (index) {
-                  // setState(() {});
-                },
-                tabs: [
-                  Tab(text: context.translation.requestDetail, height: 57.toScreenHeight),
-                  Tab(text: context.translation.historyLogs, height: 57.toScreenHeight),
-                ],
+    return WillPopScope(
+      onWillPop: () async {
+        // Implement custom back button handling logic here
+        RequestDetailProvider requestDetailProvider = Provider.of<RequestDetailProvider>(context,listen: false);
+        if(requestDetailProvider.timer!=null&&requestDetailProvider.timer!.isActive){
+          requestDetailProvider.stopTimer();
+        }
+        return true; // Return true if you want to allow popping the screen, false otherwise
+      },
+      child: Scaffold(
+        backgroundColor: AppColor.neutral100,
+        appBar:AppBar(
+          automaticallyImplyLeading: false,
+          titleSpacing: 16,
+          title: Row(
+            children: [
+              const Icon(Icons.arrow_back_ios).onPress(() {
+                RequestDetailProvider requestDetailProvider = Provider.of<RequestDetailProvider>(context,listen: false);
+                if(requestDetailProvider.timer!=null&&requestDetailProvider.timer!.isActive){
+                 requestDetailProvider.stopTimer();
+                }
+                Navigator.pop(context);
+
+              }),
+              10.width,
+              Text(
+                context.translation.serviceDetails ,
+                style: AppTextStyles.heading3.copyWith(fontWeight: FontWeight.w500, color: context.isDark ? AppColor.neutral30 : AppColor.neutral50),
+              ).expanded,
+            ],
+          ),
+        ),
+        body: DefaultTabController(
+          length: 2,
+          child: Column(
+            mainAxisSize: MainAxisSize.min,
+            children: <Widget>[
+              Container(
+                margin: EdgeInsets.only(left: 16.toScreenWidth, right: 16.toScreenWidth, top: 12.toScreenHeight),
+                decoration: BoxDecoration(color: context.isDark ? AppColor.neutral50 : AppColor.white10, borderRadius: BorderRadius.circular(10)),
+                child: TabBar(
+                  //controller: _tabController,
+                  padding: EdgeInsets.symmetric(vertical: 4.toScreenHeight, horizontal: 4.toScreenWidth),
+                  labelColor: context.isDark ? AppColor.neutral30 : AppColor.black20,
+                  unselectedLabelColor: context.isDark ? AppColor.neutral30 : AppColor.black20,
+                  unselectedLabelStyle: AppTextStyles.bodyText,
+                  labelStyle: AppTextStyles.bodyText,
+                  indicatorPadding: EdgeInsets.zero,
+                  indicatorSize: TabBarIndicatorSize.tab,
+                  dividerColor: Colors.transparent,
+                  indicator: BoxDecoration(color: context.isDark ? AppColor.neutral60 : AppColor.neutral110, borderRadius: BorderRadius.circular(7)),
+                  onTap: (index) {
+                    // setState(() {});
+                  },
+                  tabs: [
+                    Tab(text: context.translation.requestDetail, height: 57.toScreenHeight),
+                    Tab(text: context.translation.historyLogs, height: 57.toScreenHeight),
+                  ],
+                ),
               ),
-            ),
-            12.height,
-            TabBarView(
-              children: [
-                WorkOrderDetailView(),
-                const HistoryLogView(),
-              ],
-            ).expanded,
-          ],
+              12.height,
+              TabBarView(
+                children: [
+                  WorkOrderDetailView(),
+                  const HistoryLogView(),
+                ],
+              ).expanded,
+            ],
+          ),
         ),
       ),
     );