history log improvement added.

design_3.0_latest
Sikander Saleem 1 year ago
parent edd22bf4af
commit 8d9de6ce1a

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

@ -87,6 +87,12 @@ class HistoryLogView extends StatelessWidget {
} }
Widget historyLogCard(BuildContext context, WorkOrderHistory object) { 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( return Row(
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.start, 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(), object.timeDifference.isNotEmpty ? object.timeDifference.tinyFont(context).custom(color: context.isDark ? AppColor.neutral30 : AppColor.neutral120) : const SizedBox(),
], ],

Loading…
Cancel
Save