lib/controllers/api_routes/urls.dart

@@ -3,12 +3,12 @@ class URLs {
 
   static const String appReleaseBuildNumber = "50";
 
-  // static const host1 = "https://atomsm.hmg.com"; // production url
+  static const host1 = "https://atomsm.hmg.com"; // production url
   // static const host1 = "https://atomsmdev.hmg.com"; // local DEV url
-  static const host1 = "https://atomsmuat.hmg.com"; // local UAT url
+  // static const host1 = "https://atomsmuat.hmg.com"; // local UAT url
 
-  // static final String _baseUrl = "$_host/mobile"; // host local UAT
+  static final String _baseUrl = "$_host/mobile"; // host local UAT
-  static final String _baseUrl = "$_host/v2/mobile"; // new V2 apis
+  // static final String _baseUrl = "$_host/v2/mobile"; // new V2 apis
   // static final String _baseUrl = "$_host/v3/mobile"; // v3 for production CM,PM,TM
   // static final String _baseUrl = "$_host/v4/mobile"; // v4 for Demo module
   // static final String _baseUrl = "$_host/v5/mobile"; // v5 for data segregation
@@ -254,13 +254,8 @@ class URLs {
   static get getRegularVisits => "$_baseUrl/Visit/GetVisits"; // get
   static get updateRegularVisits => "$_baseUrl/Visit/UpdateVisits"; // get
 
-  static get getPlanPreventiveVisitById => "$_baseUrl/PlanPreventiveVisit/GetPlanPreventiveVisitById";
+  static get getPlanPreventiveVisitById => "$_baseUrl/PlanPreventiveVisit/GetPlanPreventiveVisitById"; // get
-  static get updateVisitByEngineer => "$_baseUrl/PlanPreventiveVisit/UpdateVisitByEngineer";
+  static get updateVisitByEngineer => "$_baseUrl/PlanPreventiveVisit/UpdateVisitByEngineer"; // get
-  static get createPmActivitySparePart => "$_baseUrl/PlanPreventiveVisit/CreateActivitySparePart";
-  static get updatePmActivitySparePart => "$_baseUrl/PlanPreventiveVisit/UpdateActivitySparePart";
-  static get deletePmActivitySparePart => "$_baseUrl/PlanPreventiveVisit/DeleteActivitySparePart";
-  static get updatePmActivityCost => "$_baseUrl/PlanPreventiveVisit/EngineerUpdateCost";
-
 
   static get getSingleServiceRequest => "$_baseUrl/return/call/information"; // get
   static get getSuppliersAutoComplete => "$_baseUrl/Supplier/GetSuppliersAutoComplete";
@@ -609,8 +604,4 @@ class URLs {
   static get submitApplicationDemoRequest => "$_baseUrl/DemoUser/CreateDemoUser"; // post submit application demo request// get application demo request history
   static get sendDemoUserOtp => "$_baseUrl/DemoUser/EmailVerification"; // post send OTP to user
   static get verifyDemoUserOtp => "$_baseUrl/DemoUser/VerifyOtp"; // post verify OTP
-
-// spare part request endpoint.
-
-
 }

lib/controllers/providers/api/parts_provider.dart

@@ -88,39 +88,32 @@ class PartsProvider extends ChangeNotifier {
     late Response response;
     try {
       if (partNo != null) {
-        response = await ApiManager.instance.post(URLs.getPartNumber, body: {
+        response = await ApiManager.instance.post(URLs.getPartNumber, body: {"partNo": partNo, });
-          "partNo": partNo,
-        });
       } else {
-        response = await ApiManager.instance.post(URLs.getPartNumber, body: {
+        response = await ApiManager.instance.post(URLs.getPartNumber, body: {"partName": partName, });
-          "partName": partName,
-        });
       }
       List<SparePart> page = [];
       if (response.statusCode >= 200 && response.statusCode < 300) {
         // client's request was successfully received
         List categoriesListJson = json.decode(response.body)["data"];
-        page = categoriesListJson.map((part) => SparePart.fromJson(part, false)).toList();
+        page = categoriesListJson.map((part) => SparePart.fromJson(part,false)).toList();
       }
       return page;
     } catch (error) {
       return [];
     }
   }
-
   // Implement this only for spare part request for now show and search on display name ....
 
   Future<List<SparePart>> getPartsListByDisplayName({num? assetId, String? displayName}) async {
     late Response response;
     try {
-      response = await ApiManager.instance.post(URLs.getPartNumber, body: {
+        response = await ApiManager.instance.post(URLs.getPartNumber, body: {"displayName": displayName, });
-        "displayName": displayName,
-      });
       List<SparePart> page = [];
       if (response.statusCode >= 200 && response.statusCode < 300) {
         // client's request was successfully received
         List categoriesListJson = json.decode(response.body)["data"];
-        page = categoriesListJson.map((part) => SparePart.fromJson(part, true)).toList();
+        page = categoriesListJson.map((part) => SparePart.fromJson(part,true)).toList();
       }
       return page;
     } catch (error) {

lib/controllers/providers/api/ppm_provider.dart

@@ -9,12 +9,9 @@ import 'package:test_sa/controllers/api_routes/api_manager.dart';
 import 'package:test_sa/controllers/api_routes/urls.dart';
 import 'package:test_sa/extensions/context_extension.dart';
 import 'package:test_sa/models/generic_attachment_model.dart';
-import 'package:test_sa/models/helper_data_models/spare_part/activity_spare_part_model.dart';
-import 'package:test_sa/models/helper_data_models/workorder/work_order_helper_models.dart';
 import 'package:test_sa/models/plan_preventive_visit/plan_preventive_visit_model.dart';
 import 'package:test_sa/models/ppm/ppm.dart';
 import 'package:test_sa/models/ppm/ppm_search.dart';
-import 'package:test_sa/models/service_request/spare_parts.dart';
 import 'package:test_sa/models/user.dart';
 
 import '../../../new_views/common_widgets/app_lazy_loading.dart';
@@ -23,15 +20,6 @@ class PpmProvider extends ChangeNotifier {
   // number of items call in each request
   final pageItemNumber = 12;
 
-  bool _isReadOnlyRequest = false;
-
-  bool get isReadOnlyRequest => _isReadOnlyRequest;
-
-  set isReadOnlyRequest(bool value) {
-    _isReadOnlyRequest = value;
-    notifyListeners();
-  }
-
   PlanPreventiveVisit? _planPreventiveVisit;
   late int _totalTabs = 4;
   TabController? tabController;
@@ -72,14 +60,6 @@ class PpmProvider extends ChangeNotifier {
     nextPage = true;
     stateCode = null;
   }
-  List<StoreAvailability> _storeAvailability = [];
-
-  List<StoreAvailability> get storeAvailability => _storeAvailability;
-
-  set storeAvailability(List<StoreAvailability> value) {
-    _storeAvailability = value;
-    notifyListeners();
-  }
 
   // state code of current request to defied error message
   // like 400 customer request failed
@@ -98,13 +78,6 @@ class PpmProvider extends ChangeNotifier {
   bool isLoading = false;
 
   PpmSearch visitsSearch = PpmSearch();
-  WorkOrderCostModel? workOrderCostModel;
-  SparePartHelperModel? sparePartHelperModel;
-
-  void updateSparePartHelperModel(SparePartHelperModel? value) {
-    sparePartHelperModel = value;
-    notifyListeners();
-  }
 
   /// return -2 if request in progress
   /// return -1 if error happen when sending request
@@ -191,24 +164,11 @@ class PpmProvider extends ChangeNotifier {
       if (response.statusCode >= 200 && response.statusCode < 300) {
         ppmPlanAttachments = [];
         planPreventiveVisit = PlanPreventiveVisit.fromJson(json.decode(response.body)["data"]);
-        
-        // Set isReadOnly based on visit status (1 or 3 means closed/completed)
         if (planPreventiveVisit?.visitStatus?.value! == 1 || planPreventiveVisit?.visitStatus?.value == 3) {
           isReadOnly = true;
         } else {
           isReadOnly = false;
         }
-        
-        // Set isReadOnlyRequest based on visit status - same logic as CMDetailProvider
-        //Need to confirm this with backend Status values: 3 = Closed, 5 = Completed, 6 = Cancelled (adjust based on your PM status values)
-        if (planPreventiveVisit?.visitStatus?.value == 3 || 
-            planPreventiveVisit?.visitStatus?.value == 5 || 
-            planPreventiveVisit?.visitStatus?.value == 6) {
-          isReadOnlyRequest = true;
-        } else {
-          isReadOnlyRequest = false;
-        }
-        
         isLoading = false;
         notifyListeners();
         return planPreventiveVisit;
@@ -404,123 +364,4 @@ class PpmProvider extends ChangeNotifier {
 
     return true;
   }
-
-  Future<bool> createActivitySparePart() async {
-    isLoading = true;
-    Response response;
-    try {
-      response = await ApiManager.instance.post(
-        URLs.createPmActivitySparePart,
-        body: sparePartHelperModel!.toPMJson(),
-      );
-      stateCode = response.statusCode;
-      isLoading = false;
-      notifyListeners();
-      if (stateCode == 200) {
-        return true;
-      }
-      return false;
-    } catch (error) {
-      isLoading = false;
-      stateCode = -1;
-      notifyListeners();
-      return false;
-    }
-  }
-
-  Future<bool> updateActivitySparePart() async {
-    isLoading = true;
-    Response response;
-    try {
-      response = await ApiManager.instance.post(URLs.updatePmActivitySparePart, body: sparePartHelperModel!.toPMJson());
-      stateCode = response.statusCode;
-      isLoading = false;
-      notifyListeners();
-      if (stateCode == 200) {
-        return true;
-      }
-      return false;
-    } catch (error) {
-      isLoading = false;
-      stateCode = -1;
-      notifyListeners();
-      return false;
-    }
-  }
-
-  Future<int> deleteActivitySparePart({required int id}) async {
-    isLoading = true;
-    notifyListeners();
-    try {
-      final response = await ApiManager.instance.delete('${URLs.deletePmActivitySparePart}?activitySparePartPPMId=$id', body: {});
-      stateCode = response.statusCode;
-      if (response.statusCode >= 200 && response.statusCode < 300) {
-      }
-      isLoading = false;
-      notifyListeners();
-      return response.statusCode;
-    } catch (error) {
-      isLoading = false;
-      notifyListeners();
-      return -1;
-    }
-  }
-
-  Future<bool> engineerUpdateCost() async {
-    isLoading = true;
-    Response response;
-    try {
-      response = await ApiManager.instance.post(URLs.updatePmActivityCost, body: workOrderCostModel!.toPMCostJson());
-      stateCode = response.statusCode;
-      isLoading = false;
-      notifyListeners();
-      if (stateCode == 200) {
-        planPreventiveVisit = PlanPreventiveVisit.fromJson(json.decode(response.body)["data"]);
-        
-        // Update isReadOnlyRequest after fetching updated data
-        if (planPreventiveVisit?.visitStatus?.value == 3 || 
-            planPreventiveVisit?.visitStatus?.value == 5 || 
-            planPreventiveVisit?.visitStatus?.value == 6) {
-          isReadOnlyRequest = true;
-        } else {
-          isReadOnlyRequest = false;
-        }
-        
-        notifyListeners();
-        return true;
-      }
-      return false;
-    } catch (error) {
-      isLoading = false;
-      stateCode = -1;
-      notifyListeners();
-      return false;
-    }
-  }
-
-  Future<void> getStoreAvailabilityById({required num? partId}) async {
-    try {
-      isLoading = true;
-      notifyListeners();
-
-      final response = await ApiManager.instance.post(
-        URLs.getSparePartAvailableQuantity + "?PartId=$partId",
-        body: {},
-      );
-
-      stateCode = response.statusCode;
-
-      if (response.statusCode >= 200 && response.statusCode < 300) {
-        final List<dynamic> data = json.decode(response.body)["data"];
-        storeAvailability = data.map((item) => StoreAvailability.fromJson(item)).toList();
-      }
-
-      isLoading = false;
-      notifyListeners();
-    } catch (e) {
-      log("getStoreAvalivility  [error] : $e");
-      isLoading = false;
-      notifyListeners();
-    }
-  }
 }

lib/models/helper_data_models/spare_part/activity_spare_part_model.dart

@@ -4,7 +4,6 @@ import 'package:test_sa/models/service_request/spare_parts.dart';
 class SparePartHelperModel {
   int? id;
   int? workOrderId;
-  String? pmVisitId;
   int? partCatalogItemId;
   int? activityStatusId;
   SparePart? sparePart;
@@ -13,13 +12,11 @@ class SparePartHelperModel {
   num? installQty;
   num? returnQty;
   String? comment;
-
+  List<SparePartAttachments>? sparePartAttachments;
-  List<SparePartAttachments> sparePartAttachments;
 
   SparePartHelperModel({
     this.id,
     this.workOrderId,
-    this.pmVisitId,
     this.partCatalogItemId,
     this.quantity,
     this.installQty,
@@ -27,9 +24,9 @@ class SparePartHelperModel {
     this.sparePart,
     this.activityStatusId,
     this.activityStatus,
-    this.comment,
+    this.comment,this.sparePartAttachments,
-    List<SparePartAttachments>? sparePartAttachments,
+  });
-  }) : sparePartAttachments = sparePartAttachments ?? [];
+
 
   Map<String, dynamic> toJson() {
     final Map<String, dynamic> data = <String, dynamic>{};
@@ -39,42 +36,13 @@ class SparePartHelperModel {
     data['quantity'] = quantity;
     data['installQty'] = installQty;
     data['returnQty'] = returnQty;
-    if (activityStatus != null) {
+    if(activityStatus!=null){
       data['activityStatusId'] = activityStatus?.id;
     }
     data['comment'] = comment;
-    if (sparePartAttachments.isNotEmpty) {
+    if (sparePartAttachments != null) {
-      data['acitiySparePartAttachments'] = sparePartAttachments!.map((v) => v.toJson()).toList();
+      data['acitiySparePartAttachments'] =
-    }
+          sparePartAttachments!.map((v) => v.toJson()).toList();
-    return data;
-  }
-
-  //{
-  //   "id": 0,
-  //   "planPreventiveVisitId": 0,
-  //   "partCatalogItemId": 0,
-  //   "quantity": 0,
-  //   "comment": "string",
-  //   "acitiySparePartAttachments": [
-  //     {
-  //       "id": 0,
-  //       "name": "string",
-  //       "originalName": "string",
-  //       "attachmentTypeId": 0,
-  //       "attachmentName": "string",
-  //       "attachmentURL": "string"
-  //     }
-  //   ]
-  // }
-  Map<String, dynamic> toPMJson() {
-    final Map<String, dynamic> data = <String, dynamic>{};
-    data['id'] = id;
-    data['planPreventiveVisitId'] = pmVisitId;
-    data['partCatalogItemId'] = sparePart?.id;
-    data['quantity'] = quantity;
-    data['comment'] = comment;
-    if (sparePartAttachments.isNotEmpty) {
-      data['acitiySparePartAttachments'] = sparePartAttachments!.map((v) => v.toJson()).toList();
     }
     return data;
   }

lib/models/helper_data_models/workorder/work_order_helper_models.dart

@@ -178,7 +178,4 @@ class WorkOrderCostModel {
   Map<String, dynamic> toJson() {
     return {'workOrderId': workOrderId, 'sparePartCost': sparePartCost, 'laborCost': labourCost, 'travelCost': travelCost, 'qAmount': qAmount, 'prNo': prNo, 'poNo': poNo,'mrNo':mrNo,'exchangeCost':exchangeCost};
   }
-  Map<String, dynamic> toPMCostJson() {
-    return {'planPreventiveVisitId': workOrderId, 'sparePartCost': sparePartCost, 'laborCost': labourCost, 'travelCost': travelCost, 'qAmount': qAmount, 'prNo': prNo, 'poNo': poNo,'mrNo':mrNo,'exchangeCost':exchangeCost};
-  }
 }

lib/models/plan_preventive_visit/plan_preventive_visit_model.dart

@@ -1,11 +1,9 @@
-import 'dart:developer';
 import 'dart:io';
 
 import 'package:flutter/widgets.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:test_sa/extensions/context_extension.dart';
 import 'package:test_sa/models/device/asset.dart';
-import 'package:test_sa/models/helper_data_models/spare_part/activity_spare_part_model.dart';
 import 'package:test_sa/models/lookup.dart';
 import 'package:test_sa/models/service_request/supplier_details.dart';
 import 'package:test_sa/models/timer_model.dart';
@@ -51,20 +49,10 @@ class PlanPreventiveVisit {
   List<PreventiveVisitKits>? preventiveVisitKits;
   List<PreventiveVisitTimers>? preventiveVisitTimers;
   List<PreventiveVisitSuppliers>? preventiveVisitSuppliers;
-  List<PMSparePartActivityModel>? activities;
-  num? sparePartCost;
-  num? labourCost;
-  num? travelCost;
-  num? qAmount;
-  String? prNo;
-  String? poNo;
-  String? mrNo;
-  num? exchangeCost;
   TimerModel? tbsTimer = TimerModel();
   List<TimerModel>? timerModelList = [];
   TimerModel? ppMTimePicker;
 
-
   PlanPreventiveVisit(
       {this.id,
       this.visitNo,
@@ -107,15 +95,6 @@ class PlanPreventiveVisit {
       this.preventiveVisitTimers,
       this.timerModelList,
       this.ppMTimePicker,
-      this.activities,
-        this.labourCost,
-        this.sparePartCost,
-        this.travelCost,
-        this.qAmount,
-        this.prNo,
-        this.poNo,
-        this.mrNo,
-        this.exchangeCost,
       this.preventiveVisitSuppliers});
 
   PlanPreventiveVisit.fromJson(Map<String, dynamic> json) {
@@ -152,14 +131,6 @@ class PlanPreventiveVisit {
     safety = json['safety'] != null ? Lookup.fromJson(json['safety']) : null;
     engSignature = json['engSignature'];
     nurseSignature = json['nurseSignature'];
-    travelCost= json['travelCost'];
-    sparePartCost= json['sparePartCost'];
-    labourCost =json['laborCost'];
-    qAmount= json['qAmount'];
-    prNo= json['prNo'];
-    poNo= json['poNo'];
-    mrNo= json['mrNo'];
-    exchangeCost= json['exchangeCost'];
     if (json['preventiveVisitAttachments'] != null) {
       preventiveVisitAttachments = <PreventiveVisitAttachments>[];
       json['preventiveVisitAttachments'].forEach((v) {
@@ -196,13 +167,6 @@ class PlanPreventiveVisit {
         preventiveVisitSuppliers!.add(PreventiveVisitSuppliers.fromJson(v));
       });
     }
-    if (json['activitySparePartsPPM'] != null) {
-      log("activitySparePartsPPM: ${json['activitySparePartsPPM']}");
-      activities = <PMSparePartActivityModel>[];
-      json['activitySparePartsPPM'].forEach((v) {
-        activities!.add(PMSparePartActivityModel.fromJson(v));
-      });
-    }
   }
 
   Map<String, dynamic> toJson({required int status}) {
@@ -219,6 +183,50 @@ class PlanPreventiveVisit {
     data['safetyId'] = safety?.id;
     data['engSignature'] = engSignature;
     data['nurseSignature'] = nurseSignature;
+    //
+    // if (asset != null) {
+    //   data['asset'] = asset!.toJson();
+    // }
+    // data['visitNo'] = visitNo;
+    // data['planNo'] = planNo;
+    // data['planName'] = planName;
+    // data['nextPMDate'] = nextPMDate;
+    // data['assetName'] = assetName;
+    // data['model'] = model;
+    // data['manufacturer'] = manufacturer;
+    // data['supplierName'] = supplierName;
+    // data['siteName'] = siteName;
+    // data['buildingName'] = buildingName;
+    // data['floorName'] = floorName;
+    // data['departmentName'] = departmentName;
+    // data['roomName'] = roomName;
+    // data['fromDate'] = fromDate;
+    // data['toDate'] = toDate;
+    // if (assignedEmployee != null) {
+    //   data['assignedEmployee'] = assignedEmployee!.toJson();
+    // }
+    // data['acutalDateOfVisit'] = acutalDateOfVisit;
+    // if (typeOfService != null) {
+    //   data['typeOfService'] = typeOfService!.toJson();
+    // }
+    // if (visitStatus != null) {
+    //   data['visitStatus'] = visitStatus!.toJson();
+    // }
+    // data['travelingHours'] = travelingHours;
+    // data['comments'] = comments;
+    // data['executionTimeFrame'] = executionTimeFrame;
+    // if (taskStatus != null) {
+    //   data['taskStatus'] = taskStatus!.toJson();
+    // }
+    // if (deviceStatus != null) {
+    //   data['deviceStatus'] = deviceStatus!.toJson();
+    // }
+    // data['assetAvailability'] = assetAvailability;
+    // if (safety != null) {
+    //   data['safety'] = safety!.toJson();
+    // }
+    // data['engSignature'] = engSignature;
+    // data['nurseSignature'] = nurseSignature;
 
     if (preventiveVisitAttachments != null) {
       data['preventiveVisitAttachments'] = preventiveVisitAttachments!.map((v) => v.toJson()).toList();
@@ -238,12 +246,14 @@ class PlanPreventiveVisit {
     if (preventiveVisitSuppliers != null) {
       data['preventiveVisitSuppliers'] = preventiveVisitSuppliers!.map((v) => v.toJson()).toList();
     }
-    if (activities != null) {
-      data['activitySparePartsPPM'] = activities!.map((v) => v.toJson()).toList();
-    }
     return data;
   }
 
+  bool _isLocalUrl(String url) {
+    if (url.isEmpty != false) return false;
+    return url.startsWith("/") || url.startsWith("file://") || url.substring(1).startsWith(':\\');
+  }
+
   Future<bool> validate(BuildContext context) async {
     if (visitStatus?.id == null) {
       await Fluttertoast.showToast(msg: "${context.translation.youHaveToSelect} ${context.translation.status}");
@@ -280,6 +290,276 @@ class PlanPreventiveVisit {
   }
 }
 
+// class PlanPreventiveVisit {
+//   String? id;
+//   String? visitNo;
+//   Asset? asset;
+//   String? planNo;
+//   String? planName;
+//   String? nextPMDate;
+//   String? assetName;
+//   String? model;
+//   String? manufacturer;
+//   String? supplierName;
+//   String? siteName;
+//   String? buildingName;
+//   String? floorName;
+//   String? departmentName;
+//   String? roomName;
+//   String? fromDate;
+//   String? toDate;
+//   AssignedEmployee? assignedEmployee;
+//   String? acutalDateOfVisit;
+//   TypeOfService? typeOfService;
+//   VisitStatus? visitStatus;
+//   String? travelingHours;
+//   String? comments;
+//   int? executionTimeFrame;
+//   Lookup? taskStatus;
+//   String? deviceStatus;
+//   Lookup? assetAvailability;
+//   Lookup? safety;
+//   String? engSignature;
+//   String? nurseSignature;
+//   List<PreventiveVisitChecklists>? preventiveVisitAttachments;
+//   List<PreventiveVisitChecklists>? preventiveVisitCalibrations;
+//   List<PreventiveVisitChecklists>? preventiveVisitChecklists;
+//   List<PreventiveVisitChecklists>? preventiveVisitKits;
+//   List<PreventiveVisitTimers>? preventiveVisitTimers;
+//   List<PreventiveVisitChecklists>? preventiveVisitSuppliers;
+//   TimerModel? tbsTimer = TimerModel();
+//
+//   PlanPreventiveVisit(
+//       {this.id,
+//       this.visitNo,
+//       this.asset,
+//       this.planNo,
+//       this.planName,
+//       this.nextPMDate,
+//       this.assetName,
+//       this.model,
+//       this.manufacturer,
+//       this.supplierName,
+//       this.siteName,
+//       this.buildingName,
+//       this.floorName,
+//       this.departmentName,
+//       this.roomName,
+//       this.fromDate,
+//       this.toDate,
+//       this.assignedEmployee,
+//       this.acutalDateOfVisit,
+//       this.typeOfService,
+//       this.visitStatus,
+//       this.travelingHours,
+//       this.comments,
+//       this.executionTimeFrame,
+//       this.taskStatus,
+//       this.deviceStatus,
+//       this.assetAvailability,
+//       this.safety,
+//       this.engSignature,
+//       this.nurseSignature,
+//       this.preventiveVisitAttachments,
+//       this.preventiveVisitCalibrations,
+//       this.preventiveVisitChecklists,
+//       this.preventiveVisitKits,
+//       this.preventiveVisitTimers,
+//       this.preventiveVisitSuppliers});
+//
+//   PlanPreventiveVisit.fromJson(Map<String, dynamic> json) {
+//     id = json['id'];
+//     visitNo = json['visitNo'];
+//     asset = json['asset'] != null ?  Asset.fromJson(json['asset']) : null;
+//     planNo = json['planNo'];
+//     planName = json['planName'];
+//     nextPMDate = json['nextPMDate'];
+//     assetName = json['assetName'];
+//     model = json['model'];
+//     manufacturer = json['manufacturer'];
+//     supplierName = json['supplierName'];
+//     siteName = json['siteName'];
+//     buildingName = json['buildingName'];
+//     floorName = json['floorName'];
+//     departmentName = json['departmentName'];
+//     roomName = json['roomName'];
+//     fromDate = json['fromDate'];
+//     toDate = json['toDate'];
+//     assignedEmployee = json['assignedEmployee'] != null ?  AssignedEmployee.fromJson(json['assignedEmployee']) : null;
+//     acutalDateOfVisit = json['acutalDateOfVisit'];
+//     typeOfService = json['typeOfService'] != null ?  TypeOfService.fromJson(json['typeOfService']) : null;
+//     visitStatus = json['visitStatus'] != null ?  VisitStatus.fromJson(json['visitStatus']) : null;
+//     travelingHours = json['travelingHours'];
+//     comments = json['comments'];
+//     executionTimeFrame = json['executionTimeFrame'];
+//     taskStatus = json['taskStatus'];
+//     deviceStatus = json['deviceStatus'];
+//     assetAvailability = json['assetAvailability'];
+//     safety = json['safety'];
+//     engSignature = json['engSignature'];
+//     nurseSignature = json['nurseSignature'];
+//     if (json['preventiveVisitAttachments'] != null) {
+//       preventiveVisitAttachments = <PreventiveVisitChecklists>[];
+//       json['preventiveVisitAttachments'].forEach((v) {
+//         preventiveVisitAttachments!.add(PreventiveVisitChecklists.fromJson(v));
+//       });
+//     }
+//     if (json['preventiveVisitCalibrations'] != null) {
+//       preventiveVisitCalibrations = <PreventiveVisitChecklists>[];
+//       json['preventiveVisitCalibrations'].forEach((v) {
+//         preventiveVisitCalibrations!.add( PreventiveVisitChecklists.fromJson(v));
+//       });
+//     }
+//     if (json['preventiveVisitChecklists'] != null) {
+//       preventiveVisitChecklists = <PreventiveVisitChecklists>[];
+//       json['preventiveVisitChecklists'].forEach((v) {
+//         preventiveVisitChecklists!.add( PreventiveVisitChecklists.fromJson(v));
+//       });
+//     }
+//     if (json['preventiveVisitKits'] != null) {
+//       preventiveVisitKits = <PreventiveVisitChecklists>[];
+//       json['preventiveVisitKits'].forEach((v) {
+//         preventiveVisitKits!.add( PreventiveVisitChecklists.fromJson(v));
+//       });
+//     }
+//     if (json['preventiveVisitTimers'] != null) {
+//       preventiveVisitTimers = <PreventiveVisitTimers>[];
+//       json['preventiveVisitTimers'].forEach((v) {
+//         preventiveVisitTimers!.add( PreventiveVisitTimers.fromJson(v));
+//       });
+//     }
+//     if (json['preventiveVisitSuppliers'] != null) {
+//       preventiveVisitSuppliers = <PreventiveVisitChecklists>[];
+//       json['preventiveVisitSuppliers'].forEach((v) {
+//         preventiveVisitSuppliers!.add( PreventiveVisitChecklists.fromJson(v));
+//       });
+//     }
+//   }
+//
+//   Map<String, dynamic> toJson() {
+//     final Map<String, dynamic> data =  Map<String, dynamic>();
+//     data['id'] = this.id;
+//     data['visitNo'] = this.visitNo;
+//     if (this.asset != null) {
+//       data['asset'] = this.asset!.toJson();
+//     }
+//     data['planNo'] = this.planNo;
+//     data['planName'] = this.planName;
+//     data['nextPMDate'] = this.nextPMDate;
+//     data['assetName'] = this.assetName;
+//     data['model'] = this.model;
+//     data['manufacturer'] = this.manufacturer;
+//     data['supplierName'] = this.supplierName;
+//     data['siteName'] = this.siteName;
+//     data['buildingName'] = this.buildingName;
+//     data['floorName'] = this.floorName;
+//     data['departmentName'] = this.departmentName;
+//     data['roomName'] = this.roomName;
+//     data['fromDate'] = this.fromDate;
+//     data['toDate'] = this.toDate;
+//     if (this.assignedEmployee != null) {
+//       data['assignedEmployee'] = this.assignedEmployee!.toJson();
+//     }
+//     data['acutalDateOfVisit'] = this.acutalDateOfVisit;
+//     if (this.typeOfService != null) {
+//       data['typeOfService'] = this.typeOfService!.toJson();
+//     }
+//     if (this.visitStatus != null) {
+//       data['visitStatus'] = this.visitStatus!.toJson();
+//     }
+//     data['travelingHours'] = this.travelingHours;
+//     data['comments'] = this.comments;
+//     data['executionTimeFrame'] = this.executionTimeFrame;
+//     data['taskStatus'] = this.taskStatus;
+//     data['deviceStatus'] = this.deviceStatus;
+//     data['assetAvailability'] = this.assetAvailability;
+//     data['safety'] = this.safety;
+//     data['engSignature'] = this.engSignature;
+//     data['nurseSignature'] = this.nurseSignature;
+//     if (this.preventiveVisitAttachments != null) {
+//       data['preventiveVisitAttachments'] = this.preventiveVisitAttachments!.map((v) => v.toJson()).toList();
+//     }
+//     if (this.preventiveVisitCalibrations != null) {
+//       data['preventiveVisitCalibrations'] = this.preventiveVisitCalibrations!.map((v) => v.toJson()).toList();
+//     }
+//     if (this.preventiveVisitChecklists != null) {
+//       data['preventiveVisitChecklists'] = this.preventiveVisitChecklists!.map((v) => v.toJson()).toList();
+//     }
+//     if (this.preventiveVisitKits != null) {
+//       data['preventiveVisitKits'] = this.preventiveVisitKits!.map((v) => v.toJson()).toList();
+//     }
+//     if (this.preventiveVisitTimers != null) {
+//       data['preventiveVisitTimers'] = this.preventiveVisitTimers!.map((v) => v.toJson()).toList();
+//     }
+//     if (this.preventiveVisitSuppliers != null) {
+//       data['preventiveVisitSuppliers'] = this.preventiveVisitSuppliers!.map((v) => v.toJson()).toList();
+//     }
+//     return data;
+//   }
+//
+//   bool _isLocalUrl(String url) {
+//     if (url.isEmpty != false) return false;
+//     return url.startsWith("/") || url.startsWith("file://") || url.substring(1).startsWith(':\\');
+//   }
+//
+//   Future<bool> validate(BuildContext context) async {
+//     if (visitStatus?.id == null) {
+//       await Fluttertoast.showToast(msg: "${context.translation.youHaveToSelect} ${context.translation.status}");
+//       return false;
+//     }
+//     if (acutalDateOfVisit == null) {
+//       await Fluttertoast.showToast(msg: "${context.translation.youHaveToSelect} ${context.translation.actualDate}");
+//       return false;
+//     }
+//     // if (expectedDate == null) {
+//     //   await Fluttertoast.showToast(msg: "${context.translation.youHaveToSelect} ${context.translation.visitDate}");
+//     //   return false;
+//     // }
+//     if (tbsTimer?.startAt == null) {
+//       await Fluttertoast.showToast(msg: "Working Hours Required");
+//       return false;
+//     }
+//     if (tbsTimer?.endAt == null) {
+//       await Fluttertoast.showToast(msg: "Please Stop The Timer");
+//       return false;
+//     }
+//
+//     // if (externalEngineerTimer?.startAt != null && externalEngineerTimer?.endAt == null) {
+//     //   await Fluttertoast.showToast(msg: "Please Stop External Engineer Timer");
+//     //   return false;
+//     // }
+//
+//     return true;
+//   }
+//
+//   void removeEmptyObjects() {
+//     // if (vCalibrationTools?.isNotEmpty ?? false) vCalibrationTools!.removeWhere((element) => element.assetId == null && element.calibrationDateOfTesters == null);
+//     //  if (vKits?.isNotEmpty ?? false) vKits!.removeWhere((element) => element.partName == null && element.partNumber == null);
+//   }
+// }
+
+// class Asset {
+//   num? id;
+//   String? assetNumber;
+//   String? assetSerialNo;
+//
+//   Asset({this.id, this.assetNumber, this.assetSerialNo});
+//
+//   Asset.fromJson(Map<String, dynamic> json) {
+//     id = json['id'];
+//     assetNumber = json['assetNumber'];
+//     assetSerialNo = json['assetSerialNo'];
+//   }
+//
+//   Map<String, dynamic> toJson() {
+//     final Map<String, dynamic> data = Map<String, dynamic>();
+//     data['id'] = this.id;
+//     data['assetNumber'] = this.assetNumber;
+//     data['assetSerialNo'] = this.assetSerialNo;
+//     return data;
+//   }
+// }
+
 class AssignedEmployee {
   String? userId;
   String? userName;
@@ -308,6 +588,50 @@ class AssignedEmployee {
   }
 }
 
+// class Lookup {
+//   int? id;
+//   String? name;
+//   int? value;
+//
+//   Lookup({this.id, this.name, this.value});
+//
+//   Lookup.fromJson(Map<String, dynamic> json) {
+//     id = json['id'];
+//     name = json['name'];
+//     value = json['value'];
+//   }
+//
+//   Map<String, dynamic> toJson() {
+//     final Map<String, dynamic> data =  Map<String, dynamic>();
+//     data['id'] = this.id;
+//     data['name'] = this.name;
+//     data['value'] = this.value;
+//     return data;
+//   }
+// }
+
+// class VisitStatus {
+//   int? id;
+//   String? name;
+//   int? value;
+//
+//   VisitStatus({this.id, this.name, this.value});
+//
+//   VisitStatus.fromJson(Map<String, dynamic> json) {
+//     id = json['id'];
+//     name = json['name'];
+//     value = json['value'];
+//   }
+//
+//   Map<String, dynamic> toJson() {
+//     final Map<String, dynamic> data =  Map<String, dynamic>();
+//     data['id'] = this.id;
+//     data['name'] = this.name;
+//     data['value'] = this.value;
+//     return data;
+//   }
+// }
+
 class PreventiveVisitChecklists {
   int? id;
   Lookup? taskStatus;
@@ -464,6 +788,171 @@ class PreventiveVisitSuppliers {
   }
 }
 
+// class Supplier {
+//   int? id;
+//   String? suppliername;
+//   String? name;
+//   String? website;
+//   String? email;
+//   String? code;
+//   int? suppNo;
+//   String? suppStatusId;
+//   String? cityId;
+//   String? person;
+//   String? comment;
+//   String? zipcode;
+//   String? contact;
+//   List<String>? telephones;
+//   List<String>? faxes;
+//   List<String>? addresses;
+//   List<String>? attachments;
+//   List<SuppPersons>? suppPersons;
+//   List<String>? suppTCodes;
+//
+//   Supplier(
+//       {this.id,
+//       this.suppliername,
+//       this.name,
+//       this.website,
+//       this.email,
+//       this.code,
+//       this.suppNo,
+//       this.suppStatusId,
+//       this.cityId,
+//       this.person,
+//       this.comment,
+//       this.zipcode,
+//       this.contact,
+//       this.telephones,
+//       this.faxes,
+//       this.addresses,
+//       this.attachments,
+//       this.suppPersons,
+//       this.suppTCodes});
+//
+//   Supplier.fromJson(Map<String, dynamic> json) {
+//     id = json['id'];
+//     suppliername = json['suppliername'];
+//     name = json['name'];
+//     website = json['website'];
+//     email = json['email'];
+//     code = json['code'];
+//     suppNo = json['suppNo'];
+//     suppStatusId = json['suppStatusId'];
+//     cityId = json['cityId'];
+//     person = json['person'];
+//     comment = json['comment'];
+//     zipcode = json['zipcode'];
+//     contact = json['contact'];
+//     if (json['telephones'] != null) {
+//       telephones = <String>[];
+//       json['telephones'].forEach((v) {
+//         telephones!.add(v);
+//       });
+//     }
+//     if (json['faxes'] != null) {
+//       faxes = <String>[];
+//       json['faxes'].forEach((v) {
+//         faxes!.add(v);
+//       });
+//     }
+//     if (json['addresses'] != null) {
+//       addresses = <String>[];
+//       json['addresses'].forEach((v) {
+//         addresses!.add(v);
+//       });
+//     }
+//     if (json['attachments'] != null) {
+//       attachments = <String>[];
+//       json['attachments'].forEach((v) {
+//         attachments!.add(v);
+//       });
+//     }
+//     if (json['suppPersons'] != null) {
+//       suppPersons = <SuppPersons>[];
+//       json['suppPersons'].forEach((v) {
+//         suppPersons!.add(SuppPersons.fromJson(v));
+//       });
+//     }
+//     if (json['suppTCodes'] != null) {
+//       suppTCodes = <String>[];
+//       json['suppTCodes'].forEach((v) {
+//         suppTCodes!.add(v);
+//       });
+//     }
+//   }
+//
+//   Map<String, dynamic> toJson() {
+//     final Map<String, dynamic> data = <String, dynamic>{};
+//     data['id'] = id;
+//     data['suppliername'] = suppliername;
+//     data['name'] = name;
+//     data['website'] = website;
+//     data['email'] = email;
+//     data['code'] = code;
+//     data['suppNo'] = suppNo;
+//     data['suppStatusId'] = suppStatusId;
+//     data['cityId'] = cityId;
+//     data['person'] = person;
+//     data['comment'] = comment;
+//     data['zipcode'] = zipcode;
+//     data['contact'] = contact;
+//     if (telephones != null) {
+//       data['telephones'] = telephones!.map((v) => v).toList();
+//     }
+//     if (faxes != null) {
+//       data['faxes'] = faxes!.map((v) => v).toList();
+//     }
+//     if (addresses != null) {
+//       data['addresses'] = addresses!.map((v) => v).toList();
+//     }
+//     if (attachments != null) {
+//       data['attachments'] = attachments!.map((v) => v).toList();
+//     }
+//     if (suppPersons != null) {
+//       data['suppPersons'] = suppPersons!.map((v) => v.toJson()).toList();
+//     }
+//     if (suppTCodes != null) {
+//       data['suppTCodes'] = suppTCodes!.map((v) => v).toList();
+//     }
+//     return data;
+//   }
+// }
+
+// class SuppPersons {
+//   int? id;
+//   int? supplierId;
+//   String? personName;
+//   int? personRoleId;
+//   String? contact;
+//   String? externalEngCode;
+//   String? email;
+//
+//   SuppPersons({this.id, this.supplierId, this.personName, this.personRoleId, this.contact, this.externalEngCode, this.email});
+//
+//   SuppPersons.fromJson(Map<String, dynamic> json) {
+//     id = json['id'];
+//     supplierId = json['supplierId'];
+//     personName = json['personName'];
+//     personRoleId = json['personRoleId'];
+//     contact = json['contact'];
+//     externalEngCode = json['externalEngCode'];
+//     email = json['email'];
+//   }
+//
+//   Map<String, dynamic> toJson() {
+//     final Map<String, dynamic> data =  Map<String, dynamic>();
+//     data['id'] = this.id;
+//     data['supplierId'] = this.supplierId;
+//     data['personName'] = this.personName;
+//     data['personRoleId'] = this.personRoleId;
+//     data['contact'] = this.contact;
+//     data['externalEngCode'] = this.externalEngCode;
+//     data['email'] = this.email;
+//     return data;
+//   }
+// }
+
 class PreventiveVisitKits {
   int? id;
   PartCatalogItem? partCatalogItem;
@@ -510,80 +999,3 @@ class PartCatalogItem {
     return data;
   }
 }
-
-class PMSparePartActivityModel {
-  int? id;
-  PartCatalogItem? partCatalogItem;
-  Lookup? activityStatus;
-  double? quantity;
-  double? installQty;
-  double? returnQty;
-  String? comment;
-  dynamic price;
-
-  List<SparePartAttachments> activitySparePartPPMAttachments;
-
-  PMSparePartActivityModel({
-    this.id,
-    this.partCatalogItem,
-    this.activityStatus,
-    this.quantity,
-    this.installQty,
-    this.returnQty,
-    this.comment,
-    this.price,
-    List<SparePartAttachments>? activitySparePartPPMAttachments,
-  }) : activitySparePartPPMAttachments = activitySparePartPPMAttachments ?? [];
-
-  PMSparePartActivityModel.fromJson(Map<String, dynamic> json) : activitySparePartPPMAttachments = [] {
-    id = json['id'];
-
-    partCatalogItem = json['partCatalogItem'] != null ? PartCatalogItem.fromJson(json['partCatalogItem']) : null;
-
-    activityStatus = json['activityStatus'] != null ? Lookup.fromJson(json['activityStatus']) : null;
-
-    quantity = json['quantity']?.toDouble();
-    installQty = json['installQty']?.toDouble();
-    returnQty = json['returnQty']?.toDouble();
-
-    comment = json['comment'];
-    price = json['price'];
-
-    // Handle typo in API response: "acitiySparePartPPMAttachments" instead of "activitySparePartPPMAttachments"
-    final attachmentsKey = json.containsKey('acitiySparePartPPMAttachments') 
-        ? 'acitiySparePartPPMAttachments' 
-        : 'activitySparePartPPMAttachments';
-    
-    activitySparePartPPMAttachments = json[attachmentsKey] == null 
-        ? [] 
-        : List.from(json[attachmentsKey]).map((e) => SparePartAttachments.fromJson(e)).toList();
-  }
-
-  Map<String, dynamic> toJson() {
-    final Map<String, dynamic> data = {};
-
-    data['id'] = id;
-
-    if (partCatalogItem != null) {
-      data['partCatalogItem'] = partCatalogItem!.toJson();
-    }
-
-    if (activityStatus != null) {
-      data['activityStatus'] = activityStatus!.toJson();
-    }
-
-    data['quantity'] = quantity;
-    data['installQty'] = installQty;
-    data['returnQty'] = returnQty;
-    data['comment'] = comment;
-    data['price'] = price;
-
-    data['activitySparePartPPMAttachments'] = activitySparePartPPMAttachments
-        .map(
-          (v) => v.toJson(),
-        )
-        .toList();
-
-    return data;
-  }
-}

lib/modules/cm_module/views/components/activities_list_view.dart

@@ -251,6 +251,7 @@ class _ActivitiesListViewState extends State<ActivitiesListView> {
             label: context.translation.assistantEmployee,
             value: activity.activityMaintenance?.assistantEmployees?.first.user?.userName,
           ),
+
         ] else ...[
           InfoTextWidget(
             label: context.translation.assignedEmployee,
@@ -343,31 +344,27 @@ class _ActivitiesListViewState extends State<ActivitiesListView> {
   }
 
   void editSparePartRequest({required BuildContext context, required CMDetailProvider requestDetailProvider, required Activities activity}) async {
-    final model = SparePartHelperModel(
+    requestDetailProvider.sparePartHelperModel = SparePartHelperModel(
       id: activity.id,
       workOrderId: requestDetailProvider.currentWorkOrder?.data?.requestId,
       comment: activity.activitySparePart?.comment,
       sparePartAttachments: activity.activitySparePart?.acitiySparePartAttachments ?? [],
       activityStatus: activity.activityStatus,
       sparePart: SparePart(
-        id: activity.activitySparePart?.partCatalogItem?.id,
+          id: activity.activitySparePart?.partCatalogItem?.id,
-        partName: activity.activitySparePart?.partCatalogItem?.partName,
+          partName: activity.activitySparePart?.partCatalogItem?.partName,
-        partNo: activity.activitySparePart?.partCatalogItem?.partNumber,
+          partNo: activity.activitySparePart?.partCatalogItem?.partNumber,
-        oracleCode: activity.activitySparePart?.partCatalogItem?.oracleCode,
+          oracleCode: activity.activitySparePart?.partCatalogItem?.oracleCode),
-      ),
       quantity: activity.activitySparePart?.quantity,
       installQty: activity.activitySparePart?.installQty,
       returnQty: activity.activitySparePart?.returnQty,
       activityStatusId: activity.activityStatus?.id,
     );
 
-    // Navigate and let SparePartRequest._initializeModel() handle provider setup
+    requestDetailProvider.updateSparePartHelperModel(requestDetailProvider.sparePartHelperModel);
+
     Navigator.of(context).push(MaterialPageRoute(
-      builder: (_) => SparePartRequest(
+      builder: (_) => const SparePartRequest(),
-        model: model,
-        provider: requestDetailProvider,
-        fromCm: true,
-      ),
     ));
   }
 }

lib/modules/cm_module/views/components/bottom_sheets/service_request_bottomsheet.dart

@@ -5,7 +5,6 @@ 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/controllers/providers/api/ppm_provider.dart';
 import 'package:test_sa/controllers/providers/api/service_requests_provider.dart';
 import 'package:test_sa/extensions/context_extension.dart';
 import 'package:test_sa/extensions/int_extensions.dart';
@@ -669,26 +668,16 @@ class ServiceRequestBottomSheet {
     }
 
     void onItemTap({required int index, required BuildContext context}) {
-      CMDetailProvider requestDetailProvider = Provider.of<CMDetailProvider>(context, listen: false);
       switch (index) {
         case 0:
-          // Create fresh model - SparePartRequest will handle setting it in provider
+          Provider.of<CMDetailProvider>(context, listen: false).sparePartHelperModel = SparePartHelperModel();
-          final model = SparePartHelperModel(
-            id: 0,
-            workOrderId: requestDetailProvider.currentWorkOrder?.data?.requestId,
-          );
           Navigator.pushReplacement(
             context,
-            MaterialPageRoute(
+            MaterialPageRoute(builder: (context) => const SparePartRequest()),
-              builder: (context) => SparePartRequest(
-                model: model,
-                provider: requestDetailProvider,
-                fromCm: true,
-              ),
-            ),
           );
           break;
         case 1:
+          CMDetailProvider requestDetailProvider = Provider.of<CMDetailProvider>(context, listen: false);
           requestDetailProvider.activityMaintenanceHelperModel = ActivityMaintenanceHelperModel(
             workOrderId: requestDetailProvider.currentWorkOrder?.data?.requestId,
             id: 0,
@@ -779,7 +768,7 @@ class ServiceRequestBottomSheet {
         }));
   }
 
-  static Future addAnotherSpareRequestBottomSheet({required BuildContext context, bool fromCm = false}) {
+  static Future addAnotherSpareRequestBottomSheet({required BuildContext context}) {
     return buildBottomSheetParent(
       context: context,
       childWidget: Consumer<ServiceRequestsProvider>(
@@ -815,23 +804,11 @@ class ServiceRequestBottomSheet {
                     buttonColor: AppColor.primary10,
                     loading: false,
                     onPressed: () {
-                      dynamic provider = fromCm ? Provider.of<CMDetailProvider>(context, listen: false) : Provider.of<PpmProvider>(context, listen: false);
                       Navigator.pop(context);
-                      final model = SparePartHelperModel(
+                      Provider.of<CMDetailProvider>(context, listen: false).sparePartHelperModel = SparePartHelperModel();
-                        id: 0,
-                        workOrderId: fromCm? provider.currentWorkOrder?.data?.requestId:null,
-                        pmVisitId: !fromCm? provider.planPreventiveVisit?.id:null,
-                      );
-
                       Navigator.pushReplacement(
                         context,
-                        MaterialPageRoute(
+                        MaterialPageRoute(builder: (context) => const SparePartRequest()),
-                          builder: (context) => SparePartRequest(
-                            model: model,
-                            provider: provider,
-                            fromCm: fromCm,
-                          ),
-                        ),
                       );
                     },
                   ).expanded,

lib/modules/cm_module/views/components/service_request_detail_view.dart

@@ -338,26 +338,8 @@ class _ServiceRequestDetailViewState extends State<ServiceRequestDetailView> {
             const Spacer(),
             if (!provider.isReadOnlyRequest)
               "edit_icon".toSvgAsset(height: 24, width: 24, color: AppColor.icon2Color(context)).onPress(() async {
-                WorkOrderData currentWorkOrderData = provider.currentWorkOrder!.data!;
-                provider.workOrderCostModel = WorkOrderCostModel(
-                  workOrderId: currentWorkOrderData.requestId,
-                  labourCost: currentWorkOrderData.labourCost,
-                  sparePartCost: currentWorkOrderData.sparePartCost,
-                  travelCost: currentWorkOrderData.travelCost,
-                  qAmount: currentWorkOrderData.qAmount,
-                  prNo: currentWorkOrderData.prNo,
-                  poNo: currentWorkOrderData.poNo,
-                  mrNo: currentWorkOrderData.mrNo,
-                  exchangeCost: currentWorkOrderData.exchangeCost,
-                );
                 provider.refreshTimer = false;
-                await Navigator.push(
+                await Navigator.push(context, MaterialPageRoute(builder: (context) => CostDetailFormScreen(isEdit: true)));
-                    context,
-                    MaterialPageRoute(
-                        builder: (context) => CostDetailFormScreen(
-                              model: provider.workOrderCostModel,
-                              provider: provider,
-                            )));
                 provider.refreshTimer = true;
               }),
           ],

lib/modules/cm_module/views/forms/cost/cost_detail_form_screen.dart

@@ -1,216 +1,273 @@
-import 'dart:developer';
-
 import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+import 'package:test_sa/extensions/context_extension.dart';
 import 'package:test_sa/extensions/int_extensions.dart';
 import 'package:test_sa/extensions/text_extensions.dart';
 import 'package:test_sa/extensions/widget_extensions.dart';
 import 'package:test_sa/models/helper_data_models/workorder/work_order_helper_models.dart';
+import 'package:test_sa/models/new_models/work_order_detail_model.dart';
+import 'package:test_sa/modules/cm_module/cm_detail_provider.dart';
 import 'package:test_sa/modules/cm_module/views/components/action_button/footer_action_button.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/app_text_form_field.dart';
 import 'package:test_sa/new_views/common_widgets/default_app_bar.dart';
+import 'package:test_sa/providers/service_request_providers/equipment_status_provider.dart';
 
 class CostDetailFormScreen extends StatefulWidget {
   static const String id = "/cost-detail-form-screen";
-  final WorkOrderCostModel? model;
+  bool isEdit = false;
-  final dynamic provider; // CMDetailProvider or PpmProvider
 
-  const CostDetailFormScreen({
+  CostDetailFormScreen({Key? key, required this.isEdit}) : super(key: key);
-    Key? key,
-    required this.model,
-    required this.provider,
-  }) : super(key: key);
 
   @override
   _CostDetailFormScreenState createState() => _CostDetailFormScreenState();
 }
 
-class _CostDetailFormScreenState extends State<CostDetailFormScreen> {
+class _CostDetailFormScreenState extends State<CostDetailFormScreen> with TickerProviderStateMixin {
-  late WorkOrderCostModel _localModel;
+  CMDetailProvider? _requestDetailProvider;
+
+  final GlobalKey<ScaffoldState> _scaffoldKey = GlobalKey<ScaffoldState>();
 
   @override
   void initState() {
     super.initState();
-    _localModel = WorkOrderCostModel(
+  }
-      workOrderId: widget.model?.workOrderId,
+
-      labourCost: widget.model?.labourCost,
+  void assignValues() {
-      sparePartCost: widget.model?.sparePartCost,
+    // ServiceRequestDetailProvider requestDetailProvider = Provider.of<ServiceRequestDetailProvider>(context, listen: false);
-      travelCost: widget.model?.travelCost,
+    //  _requestDetailProvider = Provider.of<ServiceRequestDetailProvider>(context, listen: false);
-      qAmount: widget.model?.qAmount,
+    WorkOrderData currentWorkOrderData = _requestDetailProvider!.currentWorkOrder!.data!;
-      prNo: widget.model?.prNo,
+    _requestDetailProvider!.workOrderCostModel = WorkOrderCostModel(
-      poNo: widget.model?.poNo,
+      workOrderId: currentWorkOrderData.requestId,
-      mrNo: widget.model?.mrNo,
+      labourCost: currentWorkOrderData.labourCost,
-      exchangeCost: widget.model?.exchangeCost,
+      sparePartCost: currentWorkOrderData.sparePartCost,
+      travelCost: currentWorkOrderData.travelCost,
+      qAmount: currentWorkOrderData.qAmount,
+      prNo: currentWorkOrderData.prNo,
+      poNo: currentWorkOrderData.poNo,
+      mrNo: currentWorkOrderData.mrNo,
+      exchangeCost: currentWorkOrderData.exchangeCost,
     );
-    log('Initialized Cost Model: ${_localModel.toJson()}');
   }
 
   @override
   Widget build(BuildContext context) {
+    if (_requestDetailProvider == null) {
+      _requestDetailProvider = Provider.of<CMDetailProvider>(context, listen: false);
+      assignValues();
+    }
+
     return Scaffold(
+      key: _scaffoldKey,
       appBar: const DefaultAppBar(title: "Cost Details"),
-      body: ListenableBuilder(
+      body: Consumer<CMDetailProvider>(builder: (context, CMDetailProvider requestDetailProvider, child) {
-        listenable: widget.provider,
+        return Column(
-        builder: (context, child) {
+          crossAxisAlignment: CrossAxisAlignment.start,
-          return Column(
+          mainAxisAlignment: MainAxisAlignment.spaceBetween,
-            crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
-            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            SingleChildScrollView(
-            children: [
+              child: Column(
-              Expanded(
+                crossAxisAlignment: CrossAxisAlignment.start,
-                child: SingleChildScrollView(
+                mainAxisSize: MainAxisSize.min,
-                  child: Column(
+                children: [
-                    crossAxisAlignment: CrossAxisAlignment.start,
+                  AppTextFormField(
-                    mainAxisSize: MainAxisSize.min,
+                    labelText: "Spare Part Cost",
-                    children: [
+                    backgroundColor: AppColor.neutral100,
-                      AppTextFormField(
+                    initialValue: requestDetailProvider.workOrderCostModel?.sparePartCost?.toString(),
-                        labelText: "Spare Part Cost",
+                    textAlign: TextAlign.center,
-                        backgroundColor: AppColor.neutral100,
+                    enable: false,
-                        initialValue: _localModel.sparePartCost?.toString() ?? '0',
+                    labelStyle: AppTextStyles.textFieldLabelStyle,
-                        textAlign: TextAlign.center,
+                    textInputType: TextInputType.number,
-                        enable: false,
+                    showShadow: false,
-                        labelStyle: AppTextStyles.textFieldLabelStyle,
+                    onChange: (value) {
-                        textInputType: TextInputType.number,
+                      requestDetailProvider.workOrderCostModel?.sparePartCost = num.parse(value);
-                        showShadow: false,
+                    },
-                        style: Theme.of(context).textTheme.titleMedium,
+                    style: Theme.of(context).textTheme.titleMedium,
-                      ),
+                  ),
-                      8.height,
+                  8.height,
-                      AppTextFormField(
+                  AppTextFormField(
-                        initialValue: _localModel.labourCost?.toString() ?? '',
+                    initialValue: requestDetailProvider.workOrderCostModel?.labourCost?.toString(),
-                        textAlign: TextAlign.center,
+                    textAlign: TextAlign.center,
-                        labelText: "Labor Cost",
+                    labelText: "Labor Cost",
-                        backgroundColor: AppColor.fieldBgColor(context),
+                    backgroundColor: AppColor.fieldBgColor(context),
-                        labelStyle: AppTextStyles.textFieldLabelStyle.copyWith(color: AppColor.textColor(context)),
+                    labelStyle: AppTextStyles.textFieldLabelStyle.copyWith(color: AppColor.textColor(context)),
-                        textInputType: const TextInputType.numberWithOptions(decimal: true),
+                    textInputType: const TextInputType.numberWithOptions(decimal: true),
-                        showShadow: false,
+                    showShadow: false,
-                        onChange: (value) {
+                    onChange: (value) {
-                          _localModel.labourCost = num.tryParse(value);
+                      requestDetailProvider.workOrderCostModel?.labourCost = num.parse(value);
-                        },
+                    },
-                        style: Theme.of(context).textTheme.titleMedium,
+                    style: Theme.of(context).textTheme.titleMedium,
-                      ),
+                  ),
-                      8.height,
+                  8.height,
-                      AppTextFormField(
+                  AppTextFormField(
-                        labelText: "Travel Cost",
+                    labelText: "Travel Cost",
-                        backgroundColor: AppColor.fieldBgColor(context),
+                    backgroundColor: AppColor.fieldBgColor(context),
-                        labelStyle: AppTextStyles.textFieldLabelStyle.copyWith(color: AppColor.textColor(context)),
+                    labelStyle: AppTextStyles.textFieldLabelStyle.copyWith(color: AppColor.textColor(context)),
-                        initialValue: _localModel.travelCost?.toString() ?? '',
+                    initialValue: requestDetailProvider.workOrderCostModel?.travelCost?.toString(),
-                        textAlign: TextAlign.center,
+                    textAlign: TextAlign.center,
-                        textInputType: const TextInputType.numberWithOptions(decimal: true),
+                    textInputType: const TextInputType.numberWithOptions(decimal: true),
-                        showShadow: false,
+                    showShadow: false,
-                        onChange: (value) {
+                    onChange: (value) {
-                          _localModel.travelCost = num.tryParse(value);
+                      requestDetailProvider.workOrderCostModel?.travelCost = num.parse(value);
-                        },
+                    },
-                        style: Theme.of(context).textTheme.titleMedium,
+                    style: Theme.of(context).textTheme.titleMedium,
-                      ),
+                  ),
-                      8.height,
+                  8.height,
-                      AppTextFormField(
+                  AppTextFormField(
-                        labelText: "Quot Amount",
+                    labelText: "Quot Amount",
-                        backgroundColor: AppColor.fieldBgColor(context),
+                    backgroundColor: AppColor.fieldBgColor(context),
-                        labelStyle: AppTextStyles.textFieldLabelStyle.copyWith(color: AppColor.textColor(context)),
+                    labelStyle: AppTextStyles.textFieldLabelStyle.copyWith(color: AppColor.textColor(context)),
-                        initialValue: _localModel.qAmount?.toString() ?? '',
+                    initialValue: requestDetailProvider.workOrderCostModel?.qAmount?.toString(),
-                        textAlign: TextAlign.center,
+                    textAlign: TextAlign.center,
-                        textInputType: const TextInputType.numberWithOptions(decimal: true),
+                    textInputType: const TextInputType.numberWithOptions(decimal: true),
-                        showShadow: false,
+                    showShadow: false,
-                        onChange: (value) {
+                    onChange: (value) {
-                          _localModel.qAmount = num.tryParse(value);
+                      requestDetailProvider.workOrderCostModel?.qAmount = num.parse(value);
-                        },
+                    },
-                        style: Theme.of(context).textTheme.titleMedium,
+                    style: Theme.of(context).textTheme.titleMedium,
-                      ),
+                  ),
-                      8.height,
+                  8.height,
-                      AppTextFormField(
+                  AppTextFormField(
-                        labelText: "PR No",
+                    labelText: "PR No",
-                        backgroundColor: AppColor.fieldBgColor(context),
+                    backgroundColor: AppColor.fieldBgColor(context),
-                        labelStyle: AppTextStyles.textFieldLabelStyle.copyWith(color: AppColor.textColor(context)),
+                    labelStyle: AppTextStyles.textFieldLabelStyle.copyWith(color: AppColor.textColor(context)),
-                        initialValue: _localModel.prNo ?? '',
+                    initialValue: requestDetailProvider.workOrderCostModel?.prNo,
-                        textAlign: TextAlign.center,
+                    textAlign: TextAlign.center,
-                        textInputType: TextInputType.text,
+                    textInputType: const TextInputType.numberWithOptions(decimal: true),
-                        showShadow: false,
+                    showShadow: false,
-                        onChange: (value) {
+                    onChange: (value) {
-                          _localModel.prNo = value.isEmpty ? null : value;
+                      requestDetailProvider.workOrderCostModel?.prNo = value;
-                        },
+                    },
-                        style: Theme.of(context).textTheme.titleMedium,
+                    style: Theme.of(context).textTheme.titleMedium,
-                      ),
+                  ),
-                      8.height,
+                  8.height,
-                      AppTextFormField(
+                  AppTextFormField(
-                        labelText: "PO No",
+                    labelText: "PO No",
-                        backgroundColor: AppColor.fieldBgColor(context),
+                    backgroundColor: AppColor.fieldBgColor(context),
-                        labelStyle: AppTextStyles.textFieldLabelStyle.copyWith(color: AppColor.textColor(context)),
+                    labelStyle: AppTextStyles.textFieldLabelStyle.copyWith(color: AppColor.textColor(context)),
-                        initialValue: _localModel.poNo ?? '',
+                    initialValue: requestDetailProvider.workOrderCostModel?.poNo,
-                        textAlign: TextAlign.center,
+                    textAlign: TextAlign.center,
-                        textInputType: TextInputType.text,
+                    textInputType: const TextInputType.numberWithOptions(decimal: true),
-                        showShadow: false,
+                    showShadow: false,
-                        onChange: (value) {
+                    onChange: (value) {
-                          _localModel.poNo = value.isEmpty ? null : value;
+                      requestDetailProvider.workOrderCostModel?.poNo = value;
-                        },
+                    },
-                        style: Theme.of(context).textTheme.titleMedium,
+                    style: Theme.of(context).textTheme.titleMedium,
-                      ),
+                  ),
-                      8.height,
+                  8.height,
-                      AppTextFormField(
+                  AppTextFormField(
-                        labelText: "MR No",
+                    labelText: "MR No",
-                        backgroundColor: AppColor.fieldBgColor(context),
+                    backgroundColor: AppColor.fieldBgColor(context),
-                        labelStyle: AppTextStyles.textFieldLabelStyle.copyWith(color: AppColor.textColor(context)),
+                    labelStyle: AppTextStyles.textFieldLabelStyle.copyWith(color: AppColor.textColor(context)),
-                        initialValue: _localModel.mrNo ?? '',
+                    initialValue: requestDetailProvider.workOrderCostModel?.mrNo,
-                        textAlign: TextAlign.center,
+                    textAlign: TextAlign.center,
-                        textInputType: TextInputType.text,
+                    textInputType: const TextInputType.numberWithOptions(decimal: true),
-                        showShadow: false,
+                    showShadow: false,
-                        onChange: (value) {
+                    onChange: (value) {
-                          _localModel.mrNo = value.isEmpty ? null : value;
+                      requestDetailProvider.workOrderCostModel?.mrNo = value;
-                        },
+                    },
-                        style: Theme.of(context).textTheme.titleMedium,
+                    style: Theme.of(context).textTheme.titleMedium,
-                      ),
+                  ),
-                      8.height,
+                  8.height,
-                      AppTextFormField(
+                  AppTextFormField(
-                        labelText: "Exchange Cost",
+                    labelText: "Exchange Cost",
-                        backgroundColor: AppColor.fieldBgColor(context),
+                    backgroundColor: AppColor.fieldBgColor(context),
-                        labelStyle: AppTextStyles.textFieldLabelStyle.copyWith(color: AppColor.textColor(context)),
+                    labelStyle: AppTextStyles.textFieldLabelStyle.copyWith(color: AppColor.textColor(context)),
-                        initialValue: _localModel.exchangeCost?.toString() ?? '',
+                    initialValue: requestDetailProvider.workOrderCostModel?.exchangeCost != null ? requestDetailProvider.workOrderCostModel?.exchangeCost.toString() : '',
-                        textAlign: TextAlign.center,
+                    textAlign: TextAlign.center,
-                        textInputType: const TextInputType.numberWithOptions(decimal: true),
+                    textInputType: const TextInputType.numberWithOptions(decimal: true),
-                        showShadow: false,
+                    showShadow: false,
-                        onChange: (value) {
+                    onChange: (value) {
-                          _localModel.exchangeCost = num.tryParse(value);
+                      requestDetailProvider.workOrderCostModel?.exchangeCost = num.parse(value);
-                        },
+                    },
-                        style: Theme.of(context).textTheme.titleMedium,
+                    style: Theme.of(context).textTheme.titleMedium,
-                      ),
+                  ),
-                    ],
+                ],
-                  ).toShadowContainer(context).paddingAll(16),
+              ).toShadowContainer(context).paddingAll(16),
-                ),
+            ).expanded,
+            FooterActionButton.footerContainer(
+              context: context,
+              child: AppFilledButton(
+                label: "Update Cost Details",
+                buttonColor: AppColor.primary10,
+                onPressed: () async {
+                  if (validateForm(requestDetailProvider: requestDetailProvider)) {
+                    showDialog(context: context, barrierDismissible: false, builder: (context) => const AppLazyLoading());
+                    await requestDetailProvider.engineerUpdateCost().then((success) {
+                      Navigator.pop(context);
+                      if (success) {
+                        Navigator.pop(context);
+                      }
+                    });
+                  }
+                },
               ),
-              FooterActionButton.footerContainer(
+            ),
-                context: context,
+          ],
-                child: AppFilledButton(
+        );
-                  label: "Update Cost Details",
+      }),
-                  buttonColor: AppColor.primary10,
-                  onPressed: () => _onSubmit(),
-                ),
-              ),
-            ],
-          );
-        },
-      ),
     );
   }
 
-  Future<void> _onSubmit() async {
+  bool validateForm({required CMDetailProvider requestDetailProvider}) {
-    widget.provider.workOrderCostModel = _localModel;
+    bool isValid = true;
-    showDialog(
+    if (!widget.isEdit) {
-      context: context,
+      return true;
-      barrierDismissible: false,
-      builder: (context) => const AppLazyLoading(),
-    );
-
-    try {
-      final success = await widget.provider.engineerUpdateCost();
-
-      if (mounted) Navigator.pop(context); // Close loading
-
-      if (success && mounted) {
-        Navigator.pop(context);
-      }
-    } catch (e) {
-      if (mounted) Navigator.pop(context);
-      log('Error updating cost: $e');
     }
+    // if (requestDetailProvider.engineerUpdateWorkOrderHelperModel!.equipmentStatus != null) {
+    //   if (requestDetailProvider.engineerUpdateWorkOrderHelperModel!.equipmentStatus!.value == 1 || requestDetailProvider.engineerUpdateWorkOrderHelperModel!.equipmentStatus!.value == 2) {
+    //     if (requestDetailProvider.engineerUpdateWorkOrderHelperModel!.returnToService == null) {
+    //       Fluttertoast.showToast(msg: "Return to service is required ", toastLength: Toast.LENGTH_LONG);
+    //       return false;
+    //     }
+    //   }
+    // }
+    return isValid;
+  }
+
+  Widget assetStatusWidget({required BuildContext context, required EngineerUpdateWorkOrderHelperModel workOrderData}) {
+    return Consumer<EquipmentStatusProvider>(builder: (cxt, snapshot, _) {
+      return Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          context.translation.assetStatus.bodyText(context).custom(color: AppColor.black20),
+          8.height,
+          Wrap(
+            runSpacing: 8,
+            spacing: 8,
+            children: [
+              for (var element in snapshot.items)
+                Row(
+                  mainAxisSize: MainAxisSize.min,
+                  children: [
+                    SizedBox(
+                      width: 24,
+                      height: 24,
+                      child: Radio(
+                          value: element,
+                          activeColor: Colors.red,
+                          fillColor: WidgetStateColor.resolveWith((states) {
+                            if (states.contains(WidgetState.selected)) return AppColor.primary10;
+                            return AppColor.neutral130;
+                          }),
+                          groupValue: workOrderData.equipmentStatus,
+                          onChanged: (state) {
+                            setState(() {
+                              workOrderData.equipmentStatus = element;
+                            });
+                          }),
+                    ),
+                    8.width,
+                    Text(element.name ?? '', style: AppTextStyles.tinyFont.copyWith(color: AppColor.neutral120)),
+                  ],
+                )
+            ],
+          ).toShimmer(isShow: snapshot.loading, context: context),
+        ],
+      );
+    });
   }
 }

lib/modules/cm_module/views/forms/spare_part/spare_part_request.dart

@@ -1,7 +1,7 @@
-
+import 'dart:async';
 import 'dart:convert';
-import 'dart:developer';
 import 'dart:io';
+
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:test_sa/controllers/providers/api/parts_provider.dart';
@@ -16,6 +16,7 @@ import 'package:test_sa/models/helper_data_models/spare_part/activity_spare_part
 import 'package:test_sa/models/lookup.dart';
 import 'package:test_sa/models/service_request/spare_parts.dart';
 import 'package:test_sa/models/size_config.dart';
+import 'package:test_sa/modules/cm_module/cm_detail_provider.dart';
 import 'package:test_sa/modules/cm_module/cm_request_utils.dart';
 import 'package:test_sa/modules/cm_module/views/components/action_button/footer_action_button.dart';
 import 'package:test_sa/modules/cm_module/views/components/bottom_sheets/service_request_bottomsheet.dart';
@@ -32,372 +33,331 @@ import 'package:test_sa/views/widgets/loaders/no_data_found.dart';
 
 class SparePartRequest extends StatefulWidget {
   static const String id = "/spare-part-request";
-  final SparePartHelperModel? model;
-  final dynamic provider;
-  final bool fromCm;
 
-  const SparePartRequest({
+  const SparePartRequest({Key? key}) : super(key: key);
-    Key? key,
-    required this.model,
-    required this.provider,
-    this.fromCm = false,
-  }) : super(key: key);
 
   @override
   _SparePartRequestState createState() => _SparePartRequestState();
 }
 
-class _SparePartRequestState extends State<SparePartRequest> {
+class _SparePartRequestState extends State<SparePartRequest> with TickerProviderStateMixin {
+  CMDetailProvider? _requestDetailProvider;
   PartsProvider? _partsProvider;
   bool _isLoading = false;
   List<SparePart> _spareParts = [];
-  List<GenericAttachmentModel> _attachments = [];
 
+  List<GenericAttachmentModel> attachments = [];
   final GlobalKey<FormState> _formKey = GlobalKey<FormState>();
+  final GlobalKey<ScaffoldState> _scaffoldKey = GlobalKey<ScaffoldState>();
+  final TextEditingController _partQtyController = TextEditingController();
+  final TextEditingController _installQtyController = TextEditingController();
+  final TextEditingController _returnQtyController = TextEditingController();
+  final TextEditingController _oracleNoController = TextEditingController();
+  final TextEditingController _descriptionController = TextEditingController();
+
   Lookup statusLookup = Lookup.fromJson({"id": 5619, "name": "New", "value": 1});
+  int? activityStatus;
 
   @override
   void initState() {
     super.initState();
     _partsProvider = Provider.of<PartsProvider>(context, listen: false);
-    _initializeModel();
+    _requestDetailProvider = Provider.of<CMDetailProvider>(context, listen: false);
-    _loadInitialData();
+    _requestDetailProvider?.sparePartHelperModel = SparePartHelperModel(
+      id: _requestDetailProvider?.sparePartHelperModel?.id ?? 0,
+      workOrderId: _requestDetailProvider?.sparePartHelperModel?.workOrderId ?? _requestDetailProvider?.currentWorkOrder?.data?.requestId,
+      sparePartAttachments: _requestDetailProvider?.sparePartHelperModel?.sparePartAttachments ?? [],
+      sparePart: _requestDetailProvider?.sparePartHelperModel?.sparePart ?? SparePart(),
+      quantity: _requestDetailProvider?.sparePartHelperModel?.quantity,
+      installQty: _requestDetailProvider?.sparePartHelperModel?.installQty,
+      returnQty: _requestDetailProvider?.sparePartHelperModel?.returnQty,
+      activityStatusId: _requestDetailProvider?.sparePartHelperModel?.activityStatusId ?? statusLookup.id,
+      activityStatus: _requestDetailProvider?.sparePartHelperModel?.activityStatus ?? statusLookup,
+      comment: _requestDetailProvider?.sparePartHelperModel?.comment ?? '',
+    );
+    _partQtyController.text = _requestDetailProvider?.sparePartHelperModel?.quantity != null ? _requestDetailProvider!.sparePartHelperModel!.quantity!.round().toString() : '';
+    _installQtyController.text = _requestDetailProvider?.sparePartHelperModel?.installQty != null ? _requestDetailProvider!.sparePartHelperModel!.installQty!.round().toString() : '';
+    _returnQtyController.text = _requestDetailProvider?.sparePartHelperModel?.returnQty != null ? _requestDetailProvider!.sparePartHelperModel!.returnQty!.round().toString() : '';
+    _oracleNoController.text = _requestDetailProvider?.sparePartHelperModel?.sparePart?.oracleCode != null ? _requestDetailProvider!.sparePartHelperModel!.sparePart!.oracleCode! : '';
+    _descriptionController.text = _requestDetailProvider?.sparePartHelperModel?.comment != null ? _requestDetailProvider!.sparePartHelperModel!.comment! : '';
+    activityStatus = _requestDetailProvider?.sparePartHelperModel?.activityStatus?.value;
+    scheduleMicrotask(() async {
+      _isLoading = true;
+      attachments = _requestDetailProvider?.sparePartHelperModel?.sparePartAttachments?.map((e) => GenericAttachmentModel(id: e.id!, name: e.name ?? '')).toList() ?? [];
+      setState(() {});
+      _spareParts = await _partsProvider!.getPartsListByDisplayName(assetId: _requestDetailProvider?.currentWorkOrder?.data?.asset?.id);
+      _isLoading = false;
+      setState(() {});
+    });
   }
 
-  void _initializeModel() {
+  void restValues({required CMDetailProvider requestDetailProvider}) {
-    final bool isNewActivity = widget.model?.id == null || widget.model?.id == 0;
+    requestDetailProvider.sparePartHelperModel = SparePartHelperModel(id: 0, workOrderId: _requestDetailProvider?.currentWorkOrder?.data?.requestId, sparePartAttachments: []);
-    if (isNewActivity) {
+    _partQtyController.clear();
-      widget.provider.sparePartHelperModel = SparePartHelperModel(
+    _installQtyController.clear();
-        id: 0,
+    _returnQtyController.clear();
-        workOrderId: widget.fromCm ? widget.provider.currentWorkOrder?.data?.requestId : null,
+    _oracleNoController.clear();
-        pmVisitId: !widget.fromCm ? widget.provider.planPreventiveVisit?.id : null,
+    _descriptionController.clear();
-        sparePartAttachments: [],
+    attachments = [];
-        sparePart: SparePart(),
-        quantity: null,
-        installQty: null,
-        returnQty: null,
-        activityStatusId: statusLookup.id,
-        activityStatus: statusLookup,
-        comment: '',
-      );
-    } else if (widget.provider.sparePartHelperModel == null ||
-               widget.provider.sparePartHelperModel?.id != widget.model?.id) {
-      widget.provider.sparePartHelperModel = SparePartHelperModel(
-        id: widget.model?.id ?? 0,
-        workOrderId: widget.fromCm ? widget.model?.workOrderId ?? widget.provider.currentWorkOrder?.data?.requestId : null,
-        pmVisitId: !widget.fromCm ? widget.model?.pmVisitId : null,
-        sparePartAttachments: widget.model?.sparePartAttachments ?? [],
-        sparePart: widget.model?.sparePart ?? SparePart(),
-        quantity: widget.model?.quantity,
-        installQty: widget.model?.installQty,
-        returnQty: widget.model?.returnQty,
-        activityStatusId: widget.model?.activityStatusId ?? statusLookup.id,
-        activityStatus: widget.model?.activityStatus ?? statusLookup,
-        comment: widget.model?.comment ?? '',
-      );
-    }
-    log('Initialized SparePartHelperModel: ${widget.provider.sparePartHelperModel?.toJson()}');
   }
 
-  Future<void> _loadInitialData() async {
+  @override
-    setState(() => _isLoading = true);
+  void dispose() {
-    _spareParts = await _partsProvider!.getPartsListByDisplayName(
+    _partQtyController.dispose();
-      assetId: widget.fromCm
+    _installQtyController.dispose();
-          ? widget.provider.currentWorkOrder?.data?.asset?.id
+    _returnQtyController.dispose();
-          : widget.provider.planPreventiveVisit.asset.id,
+    _oracleNoController.dispose();
-    );
+    _descriptionController.dispose();
-    final bool isNewActivity = widget.model?.id == null || widget.model?.id == 0;
+    super.dispose();
-    _attachments = [];
+  }
-    if (!isNewActivity) {
-      try {
-        final attachmentsList = widget.model?.sparePartAttachments;
-        if (attachmentsList != null && attachmentsList.isNotEmpty) {
-          for (var item in attachmentsList) {
-            _attachments.add(GenericAttachmentModel(
-              id: item.id ?? 0,
-              name: item.name ?? '',
-            ));
-          }
-        }
-        log('Loaded ${_attachments.length} attachments for existing activity');
-      } catch (e) {
-        log('Error loading attachments: $e');
-        _attachments = [];
-      }
-    } else {
-      log('New activity - starting with empty attachments');
-    }
 
-    if (mounted) setState(() => _isLoading = false);
+  bool _isLocalUrl(String url) {
+    if (url.isEmpty != false) return false;
+    return url.startsWith("/") || url.startsWith("file://") || url.substring(1).startsWith(':\\');
   }
 
   @override
   Widget build(BuildContext context) {
+    bool showInstallAndReturnQty = activityStatus == 3 || activityStatus == 4;
     return Scaffold(
+      key: _scaffoldKey,
       appBar: DefaultAppBar(title: context.translation.sparePartRequest),
-      body: ListenableBuilder(
+      body: Consumer<CMDetailProvider>(builder: (context, CMDetailProvider requestDetailProvider, child) {
-        listenable: widget.provider,
+        return Form(
-        builder: (context, _) {
+          key: _formKey,
-          final provider = widget.provider;
+          child: Column(
-          final model = provider.sparePartHelperModel;
+            children: [
-          final bool showInstallAndReturnQty = (model?.activityStatus?.value == 3 || model?.activityStatus?.value == 4);
+              SingleChildScrollView(
-          final bool isReadOnly = provider.isReadOnlyRequest ?? false;
+                padding: const EdgeInsets.all(16),
-
+                child: IgnorePointer(
-          return Form(
+                  ignoring: _requestDetailProvider!.isReadOnlyRequest,
-            key: _formKey,
+                  child: Column(
-            child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.stretch,
-              children: [
+                    children: [
-                Expanded(
+                      Column(
-                  child: SingleChildScrollView(
-                    padding: const EdgeInsets.all(16),
-                    child: IgnorePointer(
-                      ignoring: isReadOnly,
-                      child: Column(
                         crossAxisAlignment: CrossAxisAlignment.stretch,
                         children: [
-                          _buildFormContent(
+                          context.translation.sparePartDetails.heading5(context).custom(color: AppColor.textStyleColor(context)),
-                            context,
+                          // 12.height,
-                            model,
+                          // SingleItemDropDownMenu<Lookup, ActivityStatusProvider>(
-                            provider,
+                          //   context: context,
-                            showInstallAndReturnQty,
+                          //   height: 56.toScreenHeight,
+                          //   title: context.translation.activityStatus,
+                          //   showShadow: false,
+                          //   backgroundColor: AppColor.neutral100,
+                          //   initialValue: requestDetailProvider.sparePartHelperModel?.activityStatus,
+                          //   onSelect: (status) {
+                          //     requestDetailProvider.sparePartHelperModel?.activityStatus = status;
+                          //   },
+                          // ),
+                          12.height,
+                          SingleItemDropDownMenu<SparePart, NullableLoadingProvider>(
+                            context: context,
+                            title: context.translation.part,
+                            staticData: _spareParts,
+                            showShadow: false,
+                            showAsBottomSheet: true,
+                            loading: _isLoading,
+                            initialValue: requestDetailProvider.sparePartHelperModel?.sparePart,
+                            // backgroundColor: context.isDark ? AppColor.neutral20 : AppColor.neutral90,
+                            onSelect: (part) async {
+                              if (part != null) {
+                                requestDetailProvider.sparePartHelperModel?.sparePart = part;
+                                _oracleNoController.text = part.oracleCode ?? '';
+                                requestDetailProvider.updateSparePartHelperModel(_requestDetailProvider?.sparePartHelperModel);
+                              }
+                            },
+                          ),
+
+                          if (requestDetailProvider.sparePartHelperModel?.sparePart?.id != null) ...[
+                            12.height,
+                            SizedBox(
+                              height: 30.toScreenHeight,
+                              child: Text('View Parts Availability',
+                                  style: TextStyle(
+                                    fontSize: 12.toScreenWidth,
+                                    fontWeight: FontWeight.w500,
+                                    fontStyle: FontStyle.normal,
+                                    color: AppColor.primary10,
+                                    decorationColor: AppColor.primary10,
+                                    decoration: TextDecoration.underline,
+                                  )).onPress(
+                                () async {
+                                  requestDetailProvider.getStoreAvailabilityById(partId: requestDetailProvider.sparePartHelperModel?.sparePart?.id);
+                                  showModalBottomSheet(
+                                    context: context,
+                                    useSafeArea: true,
+                                    isScrollControlled: true,
+                                    isDismissible: true,
+                                    backgroundColor: AppColor.bottomSheetColor(context),
+                                    builder: (BuildContext context) => PartDetailBottomSheetSheet().bottomSheetContainer(context),
+                                  );
+                                },
+                              ),
+                            ),
+                          ],
+                          12.height,
+                          AppTextFormField(
+                            controller: _partQtyController,
+                            labelText: context.translation.quantity,
+                            textInputType: TextInputType.number,
+                            labelStyle: AppTextStyles.textFieldLabelStyle,
+                            // showWithoutDecoration: true,
+                            // backgroundColor: context.isDark ? AppColor.neutral20 : AppColor.neutral90,
+                            enable: requestDetailProvider.sparePartHelperModel?.sparePart?.id != null,
+                            validator: (value) => value == null || value.isEmpty
+                                ? context.translation.requiredField
+                                : Validator.isNumeric(value)
+                                    ? null
+                                    : context.translation.onlyNumbers,
+                            onChange: (value) {
+                              requestDetailProvider.sparePartHelperModel?.quantity = num.tryParse(value ?? "");
+                            },
+                            onSaved: (text) {
+                              requestDetailProvider.sparePartHelperModel?.quantity = num.tryParse(text ?? "");
+                            },
+                          ),
+                          12.height,
+                          if (showInstallAndReturnQty) ...[
+                            AppTextFormField(
+                              controller: _installQtyController,
+                              labelText: context.translation.installedQty,
+                              textInputType: const TextInputType.numberWithOptions(decimal: true),
+                              labelStyle: AppTextStyles.textFieldLabelStyle,
+                              // showWithoutDecoration: true,
+                              // backgroundColor: context.isDark ? AppColor.neutral20 : AppColor.neutral90,
+                              enable: requestDetailProvider.sparePartHelperModel?.sparePart?.id != null,
+                              validator: (value) => value == null || value.isEmpty
+                                  ? context.translation.requiredField
+                                  : Validator.isNumeric(value)
+                                      ? null
+                                      : context.translation.onlyNumbers,
+                              onChange: (value) {
+                                requestDetailProvider.sparePartHelperModel?.installQty = num.tryParse(value ?? "");
+                              },
+                              onSaved: (text) {
+                                requestDetailProvider.sparePartHelperModel?.installQty = num.tryParse(text ?? "");
+                              },
+                            ),
+                            12.height,
+                            AppTextFormField(
+                              controller: _returnQtyController,
+                              labelText: context.translation.returnQty,
+                              textInputType: TextInputType.number,
+                              labelStyle: AppTextStyles.textFieldLabelStyle,
+                              // showWithoutDecoration: true,
+                              // backgroundColor: context.isDark ? AppColor.neutral20 : AppColor.neutral90,
+                              enable: requestDetailProvider.sparePartHelperModel?.sparePart?.id != null,
+                              validator: (value) => value == null || value.isEmpty
+                                  ? context.translation.requiredField
+                                  : Validator.isNumeric(value)
+                                      ? null
+                                      : context.translation.onlyNumbers,
+                              onChange: (value) {
+                                requestDetailProvider.sparePartHelperModel?.returnQty = num.tryParse(value ?? "");
+                              },
+                              onSaved: (text) {
+                                requestDetailProvider.sparePartHelperModel?.returnQty = num.tryParse(text ?? "");
+                              },
+                            ),
+                            12.height,
+                          ],
+                          AppTextFormField(
+                            labelStyle: AppTextStyles.textFieldLabelStyle,
+                            controller: _oracleNoController,
+                            labelText: context.translation.oracleNo,
+                            textInputType: TextInputType.number,
+                            // showWithoutDecoration: true,
+                            backgroundColor: AppColor.disableFieldBackground(context),
+                            enable: false,
+                          ),
+                          12.height,
+                          AppTextFormField(
+                            initialValue: requestDetailProvider.sparePartHelperModel?.comment,
+                            labelStyle: AppTextStyles.textFieldLabelStyle,
+                            controller: _descriptionController,
+                            showSpeechToText: true,
+                            // backgroundColor: context.isDark ? AppColor.neutral20 : AppColor.neutral90,
+                            labelText: "Engineer Comment",
+                            alignLabelWithHint: true,
+                            // showWithoutDecoration: true,
+                            textInputType: TextInputType.multiline,
+                            onChange: (value) {
+                              requestDetailProvider.sparePartHelperModel?.comment = value;
+                            },
+                            onSaved: (value) {
+                              requestDetailProvider.sparePartHelperModel?.comment = value;
+                            },
+                          ),
+                          12.height,
+                          AttachmentPicker(
+                            label: context.translation.attachQuotation,
+                            attachment: attachments,
+                            buttonIcon: 'quotation_icon'.toSvgAsset(color: AppColor.primary10),
+                            buttonColor: AppColor.primary10,
                           ),
                         ],
-                      ),
+                      ).toShadowContainer(context),
-                    ),
+                      8.height,
+                    ],
                   ),
                 ),
-                if (!isReadOnly) _buildSubmitButton(context, provider),
+              ).expanded,
-              ],
+              if (!requestDetailProvider.isReadOnlyRequest)
-            ),
+                FooterActionButton.footerContainer(
-          );
+                    context: context,
-        },
+                    child: AppFilledButton(
-      ),
+                      label: _requestDetailProvider?.sparePartHelperModel?.id == 0 ? context.translation.addSparePartActivity : context.translation.updateSparePartActivity,
-    );
+                      buttonColor: AppColor.green70,
-  }
+                      onPressed: () {
-
+                        _onSubmit(requestDetailProvider: requestDetailProvider);
-  Widget _buildFormContent(
+                      },
-    BuildContext context,
+                    )),
-    SparePartHelperModel? model,
+            ],
-    dynamic provider,
-    bool showInstallAndReturnQty,
-  ) {
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.stretch,
-      children: [
-        context.translation.sparePartDetails.heading5(context).custom(color: AppColor.textStyleColor(context)),
-        12.height,
-        SingleItemDropDownMenu<SparePart, NullableLoadingProvider>(
-          context: context,
-          title: context.translation.part,
-          staticData: _spareParts,
-          showShadow: false,
-          showAsBottomSheet: true,
-          loading: _isLoading,
-          initialValue: model?.sparePart,
-          onSelect: (part) {
-            if (part != null) {
-              model?.sparePart = part;
-              provider.updateSparePartHelperModel(model);
-            }
-          },
-        ),
-        if (model?.sparePart?.id != null) ...[
-          12.height,
-          SizedBox(
-            height: 30.toScreenHeight,
-            child: Text(
-              'View Parts Availability',
-              style: TextStyle(
-                fontSize: 12.toScreenWidth,
-                fontWeight: FontWeight.w500,
-                color: AppColor.primary10,
-                decorationColor: AppColor.primary10,
-                decoration: TextDecoration.underline,
-              ),
-            ).onPress(() {
-              provider.getStoreAvailabilityById(partId: model?.sparePart?.id);
-              showModalBottomSheet(
-                context: context,
-                useSafeArea: true,
-                isScrollControlled: true,
-                isDismissible: true,
-                backgroundColor: AppColor.bottomSheetColor(context),
-                builder: (ctx) => PartDetailBottomSheetSheet(provider: provider).bottomSheetContainer(ctx),
-              );
-            }),
-          ),
-        ],
-
-        12.height,
-        AppTextFormField(
-          key: ValueKey('quantity_${model?.quantity}'),
-          initialValue: model?.quantity?.round().toString() ?? '',
-          labelText: context.translation.quantity,
-          textInputType: TextInputType.number,
-          labelStyle: AppTextStyles.textFieldLabelStyle,
-          enable: model?.sparePart?.id != null,
-          validator: (value) => value == null || value.isEmpty
-              ? context.translation.requiredField
-              : Validator.isNumeric(value)
-                  ? null
-                  : context.translation.onlyNumbers,
-          onChange: (value) {
-            model?.quantity = num.tryParse(value);
-          },
-          onSaved: (text) {
-            model?.quantity = num.tryParse(text ?? '');
-          },
-        ),
-
-        12.height,
-
-        if (showInstallAndReturnQty) ...[
-          AppTextFormField(
-            key: ValueKey('installQty_${model?.installQty}'),
-            initialValue: model?.installQty?.round().toString() ?? '',
-            labelText: context.translation.installedQty,
-            textInputType: const TextInputType.numberWithOptions(decimal: true),
-            labelStyle: AppTextStyles.textFieldLabelStyle,
-            enable: model?.sparePart?.id != null,
-            validator: (value) => value == null || value.isEmpty
-                ? context.translation.requiredField
-                : Validator.isNumeric(value)
-                    ? null
-                    : context.translation.onlyNumbers,
-            onChange: (value) {
-              model?.installQty = num.tryParse(value);
-            },
-            onSaved: (text) {
-              model?.installQty = num.tryParse(text ?? '');
-            },
-          ),
-          12.height,
-          AppTextFormField(
-            key: ValueKey('returnQty_${model?.returnQty}'),
-            initialValue: model?.returnQty?.round().toString() ?? '',
-            labelText: context.translation.returnQty,
-            textInputType: TextInputType.number,
-            labelStyle: AppTextStyles.textFieldLabelStyle,
-            enable: model?.sparePart?.id != null,
-            validator: (value) => value == null || value.isEmpty
-                ? context.translation.requiredField
-                : Validator.isNumeric(value)
-                    ? null
-                    : context.translation.onlyNumbers,
-            onChange: (value) {
-              model?.returnQty = num.tryParse(value);
-            },
-            onSaved: (text) {
-              model?.returnQty = num.tryParse(text ?? '');
-            },
           ),
-          12.height,
+        );
-        ],
+      }),
-        AppTextFormField(
-          key: ValueKey('oracle_${model?.sparePart?.oracleCode}'),
-          initialValue: model?.sparePart?.oracleCode ?? '',
-          labelStyle: AppTextStyles.textFieldLabelStyle,
-          labelText: context.translation.oracleNo,
-          textInputType: TextInputType.number,
-          backgroundColor: AppColor.disableFieldBackground(context),
-          enable: false,
-        ),
-
-        12.height,
-        AppTextFormField(
-          key: ValueKey('comment_${model?.comment}'),
-          initialValue: model?.comment ?? '',
-          labelStyle: AppTextStyles.textFieldLabelStyle,
-          showSpeechToText: true,
-          labelText: "Engineer Comment",
-          alignLabelWithHint: true,
-          textInputType: TextInputType.multiline,
-          onChange: (value) {
-            model?.comment = value;
-          },
-          onSaved: (value) {
-            model?.comment = value;
-          },
-        ),
-
-        12.height,
-        AttachmentPicker(
-          label: context.translation.attachQuotation,
-          attachment: _attachments,
-          buttonIcon: 'quotation_icon'.toSvgAsset(color: AppColor.primary10),
-          buttonColor: AppColor.primary10,
-        ),
-      ],
-    ).toShadowContainer(context);
-  }
-
-  Widget _buildSubmitButton(BuildContext context, dynamic provider) {
-    return FooterActionButton.footerContainer(
-      context: context,
-      child: AppFilledButton(
-        label: provider.sparePartHelperModel?.id == 0 ? context.translation.addSparePartActivity : context.translation.updateSparePartActivity,
-        buttonColor: AppColor.green70,
-        onPressed: () => _onSubmit(provider),
-      ),
     );
   }
 
-  Future<void> _onSubmit(dynamic provider) async {
+  _onSubmit({required CMDetailProvider requestDetailProvider}) async {
-    final model = provider.sparePartHelperModel;
+    if (requestDetailProvider.sparePartHelperModel?.sparePart?.id == null) {
-
-    if (model?.sparePart?.id == null) {
       "Please select spare part".showToast;
       return;
-    } else if (model?.quantity == null) {
+    } else if (requestDetailProvider.sparePartHelperModel?.quantity == null) {
       "Please enter quantity".showToast;
       return;
     }
 
-    model?.sparePartAttachments?.clear();
+    requestDetailProvider.sparePartHelperModel?.sparePartAttachments?.clear();
-    for (var item in _attachments) {
-      String fileName = CMRequestUtils.isLocalUrl(item.name ?? '') ? ("${item.name ?? ''.split("/").last}|${base64Encode(File(item.name ?? '').readAsBytesSync())}") : item.name ?? '';
 
-      model?.sparePartAttachments?.add(
+    for (var item in attachments) {
+      String fileName = CMRequestUtils.isLocalUrl(item.name ?? '') ? ("${item.name ?? ''.split("/").last}|${base64Encode(File(item.name ?? '').readAsBytesSync())}") : item.name ?? '';
+      requestDetailProvider.sparePartHelperModel?.sparePartAttachments?.add(
         SparePartAttachments(id: item.id, name: fileName),
       );
     }
 
-    // Show loading
+    // Show loading dialog
     showDialog(
       context: context,
       barrierDismissible: false,
       builder: (context) => const AppLazyLoading(),
     );
-
-    // Submit
     bool success = false;
-    if (model?.id == 0) {
+    if (_requestDetailProvider?.sparePartHelperModel?.id == 0) {
-      success = await provider.createActivitySparePart();
+      success = await requestDetailProvider.createActivitySparePart();
     } else {
-      success = await provider.updateActivitySparePart();
+      success = await requestDetailProvider.updateActivitySparePart();
     }
-
+    if (mounted) Navigator.pop(context);
-    if (mounted) Navigator.pop(context); // Close loading
-
     if (success) {
-      if (widget.fromCm) {
+      requestDetailProvider.getWorkOrderById(
-        provider.getWorkOrderById(
+        id: requestDetailProvider.currentWorkOrder!.data!.requestId!,
-          id: provider.currentWorkOrder!.data!.requestId!,
+      );
-        );
+      if (mounted) Navigator.pop(context);
-      }
+      if (_requestDetailProvider?.sparePartHelperModel?.id == 0) {
-      else{
+        ServiceRequestBottomSheet.addAnotherSpareRequestBottomSheet(context: context);
-        provider.getPlanPreventiveVisitById(
-         int.tryParse(provider.planPreventiveVisit?.id ?? ''),
-        );
-      }
-
-      if (mounted) Navigator.pop(context); // Close form
-
-      if (model?.id == 0) {
-        ServiceRequestBottomSheet.addAnotherSpareRequestBottomSheet(
-          context: context,
-          fromCm: widget.fromCm
-        );
         const SizedBox().flushBar(
           context: context,
           title: context.translation.sparePartActivitySuccess,
@@ -408,14 +368,8 @@ class _SparePartRequestState extends State<SparePartRequest> {
   }
 }
 
-/// Bottom Sheet for showing parts availability
 class PartDetailBottomSheetSheet extends StatelessWidget {
-  final dynamic provider;
+  PartDetailBottomSheetSheet({Key? key}) : super(key: key);
-
-  const PartDetailBottomSheetSheet({
-    Key? key,
-    required this.provider,
-  }) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
@@ -428,61 +382,31 @@ class PartDetailBottomSheetSheet extends StatelessWidget {
         children: [
           8.height,
           'Parts Availability'.heading6(context).paddingOnly(top: 12, start: 12),
-          Expanded(
+          Consumer<CMDetailProvider>(builder: (context, requestDetailProvider, child) {
-            child: ListenableBuilder(
+            return requestDetailProvider.isLoading
-              listenable: provider,
+                ? CircularProgressIndicator(color: AppColor.loadingColor(context)).center
-              builder: (context, _) {
+                : requestDetailProvider.storeAvailability.isEmpty
-                return provider.isLoading
+                    ? const NoDataFound().center
-                    ? CircularProgressIndicator(
+                    : ListView.separated(
-                        color: AppColor.loadingColor(context),
+                        padding: const EdgeInsets.only(top: 12),
-                      ).center
+                        itemCount: requestDetailProvider.storeAvailability.length,
-                    : provider.storeAvailability.isEmpty
+                        separatorBuilder: (czt, index) => 12.height,
-                        ? const NoDataFound().center
+                        itemBuilder: (context, index) {
-                        : ListView.separated(
+                          StoreAvailability model = requestDetailProvider.storeAvailability[index];
-                            padding: const EdgeInsets.only(top: 12),
+                          return partAvailableQuantityCard(context: context, model: model);
-                            itemCount: provider.storeAvailability.length,
+                        },
-                            separatorBuilder: (czt, index) => 12.height,
+                      );
-                            itemBuilder: (context, index) {
+          }).expanded,
-                              StoreAvailability model = provider.storeAvailability[index];
-                              return _partAvailableQuantityCard(
-                                context: context,
-                                model: model,
-                              );
-                            },
-                          );
-              },
-            ),
-          ),
         ],
       ),
     );
   }
 
-  Widget _partAvailableQuantityCard({
+  Widget partAvailableQuantityCard({required StoreAvailability model, required BuildContext context}) {
-    required StoreAvailability model,
+    return Column(mainAxisSize: MainAxisSize.min, crossAxisAlignment: CrossAxisAlignment.start, children: [
-    required BuildContext context,
+      InfoTextWidget(label: "Site Name:".addTranslation, value: model.siteName ?? ''),
-  }) {
+      InfoTextWidget(label: "Store Name:".addTranslation, value: model.storeName ?? ''),
-    return Column(
+      InfoTextWidget(label: "Available Quantity:".addTranslation, value: model.availablityQty != null ? model.availablityQty.toString() : ''),
-      mainAxisSize: MainAxisSize.min,
+    ]).toShadowContainer(context, padding: 12, showShadow: false,);
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        InfoTextWidget(
-          label: "Site Name:".addTranslation,
-          value: model.siteName ?? '',
-        ),
-        InfoTextWidget(
-          label: "Store Name:".addTranslation,
-          value: model.storeName ?? '',
-        ),
-        InfoTextWidget(
-          label: "Available Quantity:".addTranslation,
-          value: model.availablityQty?.toString() ?? '',
-        ),
-      ],
-    ).toShadowContainer(
-      context,
-      padding: 12,
-      showShadow: false,
-    );
   }
 }

lib/modules/pm_module/ppm_wo/activities/pm_activities_list_view.dart

@@ -1,214 +0,0 @@
-
-import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
-import 'package:test_sa/controllers/api_routes/urls.dart';
-import 'package:test_sa/controllers/providers/api/ppm_provider.dart';
-import 'package:test_sa/controllers/providers/api/user_provider.dart';
-import 'package:test_sa/extensions/context_extension.dart';
-import 'package:test_sa/extensions/int_extensions.dart';
-import 'package:test_sa/extensions/text_extensions.dart';
-import 'package:test_sa/extensions/widget_extensions.dart';
-import 'package:test_sa/models/enums/user_types.dart';
-import 'package:test_sa/models/helper_data_models/spare_part/activity_spare_part_model.dart';
-import 'package:test_sa/models/plan_preventive_visit/plan_preventive_visit_model.dart';
-import 'package:test_sa/models/service_request/spare_parts.dart';
-import 'package:test_sa/modules/cm_module/views/components/action_button/footer_action_button.dart';
-import 'package:test_sa/modules/cm_module/views/forms/spare_part/spare_part_request.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/default_app_bar.dart';
-import 'package:test_sa/views/widgets/images/files_list.dart';
-import 'package:test_sa/views/widgets/item_views/info_text_widget.dart';
-import 'package:test_sa/views/widgets/loaders/no_data_found.dart';
-import 'package:test_sa/views/widgets/requests/request_status.dart';
-
-class PmActivitiesListView extends StatefulWidget {
-  static const String id = "/activities-list";
-
-  const PmActivitiesListView({Key? key}) : super(key: key);
-
-  @override
-  _PmActivitiesListViewState createState() {
-    return _PmActivitiesListViewState();
-  }
-}
-
-class _PmActivitiesListViewState extends State<PmActivitiesListView> {
-  @override
-  void initState() {
-    super.initState();
-  }
-
-  @override
-  void dispose() {
-    super.dispose();
-  }
-
-  List<PMSparePartActivityModel> activities = [];
-
-  bool disableNewActivity = false;
-
-  @override
-  Widget build(BuildContext context) {
-    UserProvider userProvider = Provider.of<UserProvider>(context);
-    return Scaffold(
-      appBar: DefaultAppBar(
-        showHomeActionButton: true,
-        title: context.translation.activities,
-      ),
-      body: Consumer<PpmProvider>(builder: (context, PpmProvider pmProvider, child) {
-        activities = pmProvider.planPreventiveVisit?.activities ?? [];
-        if (activities.isNotEmpty && (activities.last.activityStatus!.value == 14 || activities.last.activityStatus!.value == 19)) {
-          disableNewActivity = true;
-        } else {
-          disableNewActivity = false;
-        }
-
-        return Column(
-          children: [
-            (activities.isEmpty)
-                ? NoDataFound(message: context.translation.noDataFound).center.expanded
-                : ListView.separated(
-                    padding: const EdgeInsets.all(16),
-                    itemCount: activities.length,
-                    separatorBuilder: (czt, index) => 12.height,
-                    itemBuilder: (context, index) {
-                      return sparePartActivityCard(pmProvider: pmProvider, userProvider: userProvider, context: context, activity: activities[index]);
-                    },
-                  ).expanded,
-            if (userProvider.user!.type == UsersTypes.engineer &&
-                (pmProvider.planPreventiveVisit?.visitStatus?.value != 5 && pmProvider.planPreventiveVisit?.visitStatus?.value != 3))
-              FooterActionButton.footerContainer(
-                  context: context,
-                  child: AppFilledButton(
-                    label: context.translation.createNewActivity,
-                    maxWidth: true,
-                    buttonColor: AppColor.primary10,
-                    loading: pmProvider.isLoading,
-                    disableButton: disableNewActivity,
-                    onPressed: () async {
-                      final model = SparePartHelperModel(
-                        id: 0,
-                        pmVisitId: pmProvider.planPreventiveVisit?.id,
-                      );
-
-                      Navigator.push(
-                        context,
-                        MaterialPageRoute(
-                          builder: (context) => SparePartRequest(
-                            model: model,
-                            provider: pmProvider,
-                            fromCm: false,
-                          ),
-                        ),
-                      );
-                    },
-                  ))
-          ],
-        );
-      }),
-    );
-  }
-
-  Widget sparePartActivityCard({required PpmProvider pmProvider, required UserProvider userProvider, required BuildContext context, required PMSparePartActivityModel activity}) {
-    bool showActionButtons = userProvider.user!.userID == pmProvider.planPreventiveVisit?.assignedEmployee?.userId &&
-        userProvider.user!.type == UsersTypes.engineer &&
-        pmProvider.planPreventiveVisit?.visitStatus?.value != 5 &&
-        pmProvider.planPreventiveVisit?.visitStatus?.value != 3;
-
-    return Column(
-      mainAxisSize: MainAxisSize.min,
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        Row(
-          mainAxisAlignment: MainAxisAlignment.spaceBetween,
-          children: [
-            StatusLabel(
-              label: activity.activityStatus?.name,
-              textColor: AppColor.white10,
-              backgroundColor: AppColor.primary10,
-            ),
-            if (showActionButtons)
-              Row(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                children: [
-                  "edit_icon".toSvgAsset(height: 24, width: 24, color: AppColor.icon2Color(context)).onPress(() {
-                    editSparePartRequest(context: context, pmProvider: pmProvider, activity: activity);
-                  }),
-                  12.width,
-                  "delete_icon".toSvgAsset(height: 24, width: 24).onPress(() async {
-                    showDialog(context: context, barrierDismissible: false, builder: (context) => const AppLazyLoading());
-                    int status = await pmProvider.deleteActivitySparePart(id: activity.id!);
-                    if (status == 200) {
-                      await pmProvider.getPlanPreventiveVisitById((int.tryParse(pmProvider.planPreventiveVisit?.id ?? '')) as int);
-                      Navigator.pop(context);
-                    } else {
-                      Navigator.pop(context);
-                    }
-                  }),
-                ],
-              )
-          ],
-        ),
-        6.height,
-        InfoTextWidget(
-          label: context.translation.partName,
-          value: activity.partCatalogItem?.partName,
-        ),
-        InfoTextWidget(
-          label: context.translation.partNo,
-          value: activity.partCatalogItem?.partNumber,
-        ),
-        InfoTextWidget(
-          label: context.translation.oracleCode,
-          value: activity.partCatalogItem?.oracleCode,
-        ),
-        if (activity.comment?.isNotEmpty ?? false) ...[
-          const Divider().defaultStyle(context),
-          InfoTextLabelWidget(label: activity.comment ?? ""),
-        ],
-        if (activity.activitySparePartPPMAttachments.isNotEmpty) ...[
-          const Divider().defaultStyle(context),
-          FilesList(images: activity.activitySparePartPPMAttachments.map((toElement) => URLs.getFileUrl(toElement.name??'')??'').toList()),
-        ],
-      ],
-    ).toShadowContainer(context, showShadow: false).onPress(() {
-      if (showActionButtons) return;
-      if (pmProvider.isReadOnlyRequest) {
-        editSparePartRequest(context: context, pmProvider: pmProvider, activity: activity);
-      } else if (userProvider.user!.userID == pmProvider.planPreventiveVisit?.assignedEmployee?.userId) {
-        pmProvider.isReadOnlyRequest = true;
-        editSparePartRequest(context: context, pmProvider: pmProvider, activity: activity);
-      }
-    });
-  }
-
-  void editSparePartRequest({required BuildContext context, required PpmProvider pmProvider, required PMSparePartActivityModel activity}) async {
-    final model = SparePartHelperModel(
-      id: activity.id,
-      pmVisitId: pmProvider.planPreventiveVisit?.id,
-      comment: activity.comment,
-      sparePartAttachments: activity.activitySparePartPPMAttachments,
-      activityStatus: activity.activityStatus,
-      sparePart: SparePart(
-        id: activity.partCatalogItem?.id,
-        partName: activity.partCatalogItem?.partName,
-        partNo: activity.partCatalogItem?.partNumber,
-        oracleCode: activity.partCatalogItem?.oracleCode,
-      ),
-      quantity: activity.quantity,
-      installQty: activity.installQty,
-      returnQty: activity.returnQty,
-      activityStatusId: activity.activityStatus?.id,
-    );
-    Navigator.of(context).push(MaterialPageRoute(
-      builder: (_) => SparePartRequest(
-        model: model,
-        provider: pmProvider,
-        fromCm: false, // This is PM, not CM
-      ),
-    ));
-  }
-}

lib/modules/pm_module/ppm_wo/ppm_details_page.dart

@@ -8,7 +8,6 @@ import 'package:test_sa/extensions/text_extensions.dart';
 import 'package:test_sa/extensions/widget_extensions.dart';
 import 'package:test_sa/models/plan_preventive_visit/plan_preventive_visit_model.dart';
 import 'package:test_sa/modules/cm_module/views/components/action_button/footer_action_button.dart';
-import 'package:test_sa/modules/pm_module/ppm_wo/activities/pm_activities_list_view.dart';
 import 'package:test_sa/new_views/common_widgets/default_app_bar.dart';
 import 'package:test_sa/views/widgets/item_views/info_header_widget.dart';
 import 'package:test_sa/views/widgets/item_views/info_text_widget.dart';
@@ -83,20 +82,6 @@ class _PpmDetailsPageState extends State<PpmDetailsPage> {
                                 textColor: AppColor.getRequestStatusTextColorByName(context, planPreventiveVisit.visitStatus!.name!),
                                 backgroundColor: AppColor.getRequestStatusColorByName(context, planPreventiveVisit.visitStatus!.name!),
                               ),
-                              // "edit_icon".toSvgAsset(height: 24, width: 24, color: AppColor.icon2Color(context)).onPress(() {
-                              //   if(userProvider!.user!.type == UsersTypes.engineer && (!ppmProvider.isReadOnly)){
-                              //     FooterActionButton.footerContainer(
-                              //       child: AppFilledButton(
-                              //         onPressed: () async {
-                              //           await Navigator.of(context).push(MaterialPageRoute(builder: (_) => UpdatePpm(ppm: null, planPreventiveVisit: planPreventiveVisit)));
-                              //           getVisitData();
-                              //         },
-                              //         label: context.translation.updateWorkOrder,
-                              //       ),
-                              //       context: context,
-                              //     );
-                              //   }
-                              // })
                             ],
                           ),
                           InfoHeader16Widget(planPreventiveVisit.assetName?.cleanupWhitespace.capitalizeFirstOfEach ?? ''),
@@ -117,23 +102,29 @@ class _PpmDetailsPageState extends State<PpmDetailsPage> {
                         ],
                       ).toShadowContainer(context),
                     ).expanded,
-                    // if (userProvider!.user!.type == UsersTypes.engineer && (!ppmProvider.isReadOnly)) ...[
+                    if (userProvider!.user!.type == UsersTypes.engineer && (!ppmProvider.isReadOnly)) ...[
                       FooterActionButton.footerContainer(
-                        child: Column(
+                        child: AppFilledButton(
-                          children: [
+                          onPressed: () async {
-                            AppFilledButton(
+                            await Navigator.of(context).push(MaterialPageRoute(builder: (_) => UpdatePpm(ppm: null, planPreventiveVisit: planPreventiveVisit)));
-                              onPressed: () async {
+                            getVisitData();
-                                await Navigator.of(context).push(MaterialPageRoute(builder: (_) => UpdatePpm(ppm: null, planPreventiveVisit: planPreventiveVisit)));
+                          },
-                                getVisitData();
+                          label: context.translation.updateWorkOrder,
-                              },
-                              label: userProvider!.user!.type == UsersTypes.engineer && (!ppmProvider.isReadOnly)? context.translation.updateWorkOrder:context.translation.viewDetails,
-                            ),
-
-                          ],
                         ),
                         context: context,
                       )
-                    // ]
+                    ] else ...[
+                      // FooterActionButton.footerContainer(
+                      //   context: context,
+                      //   child: AppFilledButton(
+                      //     onPressed: () async {
+                      //       await Navigator.of(context).push(MaterialPageRoute(builder: (_) => UpdatePpm(ppm: null, planPreventiveVisit: planPreventiveVisit)));
+                      //       getVisitData();
+                      //     },
+                      //     label: context.translation.viewDetails,
+                      //   ),
+                      // )
+                    ]
                   ])
                 : const Center(child: NoDataFound());
       }),

lib/modules/pm_module/ppm_wo/update_ppm/update_ppm.dart

@@ -14,7 +14,6 @@ import 'package:test_sa/models/plan_preventive_visit/plan_preventive_visit_model
 import 'package:test_sa/models/ppm/ppm.dart';
 import 'package:test_sa/modules/cm_module/cm_request_utils.dart';
 import 'package:test_sa/modules/cm_module/views/components/action_button/footer_action_button.dart';
-import 'package:test_sa/modules/pm_module/ppm_wo/activities/pm_activities_list_view.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';
@@ -95,36 +94,27 @@ class _UpdatePpmState extends State<UpdatePpm> with TickerProviderStateMixin {
 
   @override
   void initState() {
-    super.initState();
     ppmProvider = Provider.of<PpmProvider>(context, listen: false);
     _planPreventiveVisit = widget.planPreventiveVisit;
-    int initialTabs = (_planPreventiveVisit.typeOfService?.value == 2) ? 4 : 3;
+    // WidgetsBinding.instance.addPostFrameCallback((_) {
-    _tabController = TabController(length: initialTabs, vsync: this);
+    initTabs(_planPreventiveVisit.typeOfService);
-    WidgetsBinding.instance.addPostFrameCallback((_) {
+    // });
-      ppmProvider.totalTabs = initialTabs;
+    super.initState();
-    });
   }
 
 
 
-
   void initTabs(typeOfService) {
     if (typeOfService == null) {
       return;
     }
-
+    if (typeOfService?.value == 2) {
-    int newTabCount = (typeOfService?.value == 2) ? 4 : 3;
+      ppmProvider.totalTabs = 4;
-
+    } else {
-    // Only recreate TabController if tab count has changed
+      ppmProvider.totalTabs = 3;
-    if (_tabController?.length != newTabCount) {
-      _tabController?.dispose();
-      _tabController = TabController(length: newTabCount, vsync: this);
-
-      // Update provider safely after current build
-      WidgetsBinding.instance.addPostFrameCallback((_) {
-        ppmProvider.totalTabs = newTabCount;
-      });
     }
+    _tabController?.dispose;
+    _tabController = TabController(length: ppmProvider.totalTabs, vsync: this);
   }
 
   int tabIndex = 0;
@@ -218,84 +208,70 @@ class _UpdatePpmState extends State<UpdatePpm> with TickerProviderStateMixin {
           ).expanded,
           FooterActionButton.footerContainer(
             context: context,
-            child: Column(
+            child: Row(
               children: [
-                Row(
+                if (tabIndex == 1) ...[
-                  children: [
+                  AppFilledButton(
-                    if (tabIndex == 1) ...[
+                    buttonColor: _tabController!.index == 0 ? null : AppColor.background(context),
-                      AppFilledButton(
+                    // buttonColor: _tabController!.index == 0 ? null : AppColor.background(context),
-                        buttonColor: _tabController!.index == 0 ? null : AppColor.background(context),
+                    textColor: _tabController!.index == 0 ? null : AppColor.blueStatus(context),
-                        // buttonColor: _tabController!.index == 0 ? null : AppColor.background(context),
+                    showBorder: true,
-                        textColor: _tabController!.index == 0 ? null : AppColor.blueStatus(context),
+                    disableButton: _tabController!.index == 0,
-                        showBorder: true,
+                    onPressed: () {
-                        disableButton: _tabController!.index == 0,
+                      if (_tabController!.index == 0) {
-                        onPressed: () {
+                        return;
-                          if (_tabController!.index == 0) {
+                      }
-                            return;
+                      _tabController?.animateTo(_tabController!.index - 1);
-                          }
+                      setState(() {});
-                          _tabController?.animateTo(_tabController!.index - 1);
+                      return;
-                          setState(() {});
+                    },
+                    label: context.translation.back,
+                  ).expanded,
+                  8.width,
+                ],
+                if (!ppmProvider.isReadOnly) ...[
+                  AppFilledButton(
+                    // buttonColor: AppColor.white60,
+                    // textColor: AppColor.neutral50,
+                    buttonColor: context.isDark ? AppColor.neutral50 : AppColor.white60,
+                    textColor: context.isDark ? Colors.white : AppColor.neutral50,
+                    onPressed: () {
+                      _onSubmit(status: 0);
+                    },
+                    label: context.translation.save,
+                  ).expanded,
+                  8.width,
+                  AppFilledButton(
+                    onPressed: () {
+                      if (tabIndex == 0) {
+                        _onSubmit(status: 1);
+                        return;
+                      }
+                      if (ppmProvider.totalTabs == _tabController!.index + 1) {
+                        _onSubmit(status: 1);
+                      } else {
+                        _tabController?.animateTo(_tabController!.index + 1);
+                        setState(() {});
+                      }
+                    },
+                    label: tabIndex == 0 ? "Complete".addTranslation : ((ppmProvider.totalTabs == _tabController!.index + 1) ? "Complete".addTranslation : context.translation.next),
+                  ).expanded,
+                ] else ...[
+                  Visibility(
+                    visible: tabIndex != 0,
+                    child: AppFilledButton(
+                      onPressed: () {
+                        if (ppmProvider.totalTabs == _tabController!.index + 1) {
+                          Navigator.pop(context);
                           return;
-                        },
+                        }
-                        label: context.translation.back,
+                        _tabController?.animateTo(_tabController!.index + 1);
-                      ).expanded,
+                        setState(() {});
-                      8.width,
+                      },
-                    ],
+                      label: ppmProvider.totalTabs == _tabController!.index + 1 ? context.translation.close : context.translation.next,
-                    if (!ppmProvider.isReadOnly) ...[
+                    ).expanded,
-                      AppFilledButton(
+                  ),
-                        // buttonColor: AppColor.white60,
+                ]
-                        // textColor: AppColor.neutral50,
-                        buttonColor: context.isDark ? AppColor.neutral50 : AppColor.white60,
-                        textColor: context.isDark ? Colors.white : AppColor.neutral50,
-                        onPressed: () {
-                          _onSubmit(status: 0);
-                        },
-                        label: context.translation.save,
-                      ).expanded,
-                      8.width,
-                      AppFilledButton(
-                        onPressed: () {
-                          if (tabIndex == 0) {
-                            _onSubmit(status: 1);
-                            return;
-                          }
-                          if (ppmProvider.totalTabs == _tabController!.index + 1) {
-                            _onSubmit(status: 1);
-                          } else {
-                            _tabController?.animateTo(_tabController!.index + 1);
-                            setState(() {});
-                          }
-                        },
-                        label: tabIndex == 0 ? "Complete".addTranslation : ((ppmProvider.totalTabs == _tabController!.index + 1) ? "Complete".addTranslation : context.translation.next),
-                      ).expanded,
-                    ] else ...[
-                      Visibility(
-                        visible: tabIndex != 0,
-                        child: AppFilledButton(
-                          onPressed: () {
-                            if (ppmProvider.totalTabs == _tabController!.index + 1) {
-                              Navigator.pop(context);
-                              return;
-                            }
-                            _tabController?.animateTo(_tabController!.index + 1);
-                            setState(() {});
-                          },
-                          label: ppmProvider.totalTabs == _tabController!.index + 1 ? context.translation.close : context.translation.next,
-                        ).expanded,
-                      ),
-                    ]
-                  ],
-                ),
-
-                12.height,
-                AppFilledButton(
-                  onPressed: () async {
-                     Navigator.of(context).push(MaterialPageRoute(builder: (_) => const PmActivitiesListView()));
-                    // getVisitData();
-                  },
-                  buttonColor: AppColor.neutral50,
-                  label: context.translation.activities,
-                ),
               ],
             ),
           ),

lib/modules/pm_module/ppm_wo/update_ppm/wo_info_form.dart

@@ -13,7 +13,6 @@ import 'package:test_sa/models/device/asset.dart';
 import 'package:test_sa/models/device/model_definition.dart';
 import 'package:test_sa/models/device/supplier.dart';
 import 'package:test_sa/models/generic_attachment_model.dart';
-import 'package:test_sa/models/helper_data_models/workorder/work_order_helper_models.dart';
 import 'package:test_sa/models/lookup.dart';
 import 'package:test_sa/models/new_models/building.dart';
 import 'package:test_sa/models/new_models/department.dart';
@@ -22,7 +21,6 @@ import 'package:test_sa/models/new_models/room_model.dart';
 import 'package:test_sa/models/new_models/site.dart';
 import 'package:test_sa/models/plan_preventive_visit/plan_preventive_visit_model.dart';
 import 'package:test_sa/modules/cm_module/cm_request_utils.dart';
-import 'package:test_sa/modules/cm_module/views/forms/cost/cost_detail_form_screen.dart';
 import 'package:test_sa/new_views/app_style/app_color.dart';
 import 'package:test_sa/new_views/common_widgets/app_text_form_field.dart';
 import 'package:test_sa/new_views/common_widgets/single_item_drop_down_menu.dart';
@@ -359,8 +357,6 @@ class _WoInfoFormState extends State<WoInfoForm> {
                     ),
                   ],
                 ).toShadowContainer(context),
-                16.height,
-                costCard(context, ppmProvider),
               ],
             ),
           ),
@@ -458,79 +454,6 @@ class _WoInfoFormState extends State<WoInfoForm> {
     );
   }
 
-  Widget costCard(BuildContext context, PpmProvider provider) {
-    ///Need to update this when actual flow decided...
-    PlanPreventiveVisit? model = provider.planPreventiveVisit;
-    final costModel = WorkOrderCostModel(
-      workOrderId: int.tryParse(model?.id ?? ''),
-      labourCost: model?.labourCost,
-      sparePartCost: model?.sparePartCost,
-      travelCost: model?.travelCost,
-      qAmount: model?.qAmount,
-      prNo: model?.prNo,
-      poNo: model?.poNo,
-      mrNo: model?.mrNo,
-      exchangeCost: model?.exchangeCost,
-    );
-    return Column(
-      mainAxisSize: MainAxisSize.min,
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        Row(
-          children: [
-            InfoHeader16Widget("Cost"),
-            const Spacer(),
-            if (!provider.isReadOnlyRequest)
-              "edit_icon".toSvgAsset(height: 24, width: 24, color: AppColor.icon2Color(context)).onPress(() async {
-                provider.workOrderCostModel = costModel;
-                await Navigator.push(
-                  context,
-                  MaterialPageRoute(
-                    builder: (context) => CostDetailFormScreen(
-                      model: provider.workOrderCostModel,
-                      provider: provider,
-                    ),
-                  ),
-                );
-              }),
-          ],
-        ),
-        InfoTextWidget(
-          label: 'Spare Part Cost'.addTranslation,
-          value: costModel.sparePartCost?.toString() ?? '-',
-        ),
-        InfoTextWidget(
-          label: 'Labor Cost'.addTranslation,
-          value: costModel.labourCost?.toString() ?? '-',
-        ),
-        InfoTextWidget(
-          label: 'Travel Cost'.addTranslation,
-          value: costModel.travelCost?.toString() ?? '-',
-        ),
-        InfoTextWidget(
-          label: 'Quot Amount'.addTranslation,
-          value: costModel.qAmount?.toString() ?? '-',
-        ),
-        InfoTextWidget(
-          label: 'PR No'.addTranslation,
-          value: costModel.prNo?.toString() ?? '-',
-        ),
-        InfoTextWidget(
-          label: 'PO No'.addTranslation,
-          value: costModel.poNo?.toString() ?? '-',
-        ),
-        InfoTextWidget(
-          label: 'MR No'.addTranslation,
-          value: costModel.mrNo?.toString() ?? '-',
-        ),
-        InfoTextWidget(
-          label: 'Exchange Cost'.addTranslation,
-          value: costModel.exchangeCost?.toString() ?? '-',
-        ),
-      ],
-    ).toShadowContainer(context);
-  }
-
 // String formatDuration1(int seconds) {
 //   int hours = seconds ~/ 3600;
 //   int minutes = (seconds % 3600) ~/ 60;