history log improvement added.

lib/models/new_models/work_order_detail_model.dart

@@ -555,7 +555,7 @@ class WorkOrderHistory {
   int? id;
   Lookup? workorderStatus;
   Lookup? assetVerificationType;
-  dynamic activityStatus;
+  Lookup? activityStatus;
   DateTime? date;
   String timeDifference = '';
   String? photoVerfication;
@@ -572,7 +572,7 @@ class WorkOrderHistory {
       id: json["id"],
       workorderStatus: json["workorderStatus"] == null ? null : Lookup.fromJson(json["workorderStatus"]),
       assetVerificationType: json["assetVerificationType"] == null ? null : Lookup.fromJson(json["assetVerificationType"]),
-      activityStatus: json["activityStatus"],
+      activityStatus: json["activityStatus"] == null ? null : Lookup.fromJson(json["activityStatus"]),
       photoVerfication: json["photoVerfication"],
       date: DateTime.tryParse(json["date"] ?? ""),
       user: json["user"] == null ? null : WorkOrderAssignedEmployee.fromJson(json["user"]),
@@ -591,7 +591,7 @@ class WorkOrderHistory {
         "workorderStatus": workorderStatus?.toJson(),
         "assetVerificationType": assetVerificationType?.toJson(),
         "photoVerfication": photoVerfication,
-        "activityStatus": activityStatus,
+        "activityStatus": activityStatus?.toJson(),
         "date": date?.toIso8601String(),
         "user": user?.toJson(),
         "step": step?.toJson(),

lib/service_request_latest/views/components/history_log_view.dart

@@ -87,6 +87,12 @@ class HistoryLogView extends StatelessWidget {
   }
 
   Widget historyLogCard(BuildContext context, WorkOrderHistory object) {
+    String title =object.step!.name!;
+
+    if(object.step!.value == 18 || object.step!.value == 27 || object.step!.value == 28) {
+      title = object.activityStatus?.name ?? "";
+    }
+
     return Row(
       crossAxisAlignment: CrossAxisAlignment.center,
       mainAxisAlignment: MainAxisAlignment.start,
@@ -127,7 +133,7 @@ class HistoryLogView extends StatelessWidget {
                   );
                 }),
               ],
-              object.step!.name!.bodyText(context).custom(color: AppColor.black10),
+              title.bodyText(context).custom(color: AppColor.black10),
               object.timeDifference.isNotEmpty ? object.timeDifference.tinyFont(context).custom(color: context.isDark ? AppColor.neutral30 : AppColor.neutral120) : const SizedBox(),
 
             ],