From 2abe98726e36ab1e3a65d4d51efc2b4d0569891a Mon Sep 17 00:00:00 2001
From: Sikander Saleem <sikandersaleem.cloudsolutions@gmail.com>
Date: Thu, 24 Apr 2025 11:57:45 +0300
Subject: [PATCH] code improvements.

---
 .../task_request_detail_view.dart             | 29 ++++++++++++++-----
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/lib/views/pages/user/tasks_request/task_request_detail_view.dart b/lib/views/pages/user/tasks_request/task_request_detail_view.dart
index 6445b67b..5c0dae3c 100644
--- a/lib/views/pages/user/tasks_request/task_request_detail_view.dart
+++ b/lib/views/pages/user/tasks_request/task_request_detail_view.dart
@@ -92,8 +92,13 @@ class _TaskRequestDetailsViewState extends State<TaskRequestDetailsView> {
                           ],
                         ),
                         8.height,
+                        Text(
+                          "Task Details".addTranslation,
+                          style: AppTextStyles.heading4.copyWith(color: context.isDark ? AppColor.neutral30 : AppColor.neutral50),
+                        ),
+                        8.height,
                         '${context.translation.taskType}:  ${widget.requestDetails?.nameOfType ?? "-"}'.bodyText(context),
-                        '${context.translation.requestNo}:  ${widget.requestDetails?.requestNo ?? "-"}'.bodyText(context),
+                        '${context.translation.taskNo}:  ${widget.requestDetails?.requestNo ?? "-"}'.bodyText(context),
                         if (taskProvider.taskRequestModel?.taskType?.isInstallation == true) ...[installationWidget(taskModel: taskProvider.taskRequestModel!)],
                         if (taskProvider.taskRequestModel?.taskType?.isRecallAndAlert == true) ...[
                           recallAlertTypeWidget(taskModel: taskProvider.taskRequestModel!),
@@ -104,6 +109,15 @@ class _TaskRequestDetailsViewState extends State<TaskRequestDetailsView> {
                         if (taskProvider.taskRequestModel?.taskType?.relatedTo?.value == 1) ...[
                           linkWithAssetWidget(taskModel: taskProvider.taskRequestModel!),
                         ],
+                        if (taskProvider.taskRequestModel?.callComment != null) ...[
+                          const Divider().defaultStyle(context),
+                          Text(
+                            context.translation.comment,
+                            style: AppTextStyles.heading4.copyWith(color: context.isDark ? AppColor.neutral30 : AppColor.neutral50),
+                          ),
+                          2.height,
+                          taskProvider.taskRequestModel!.callComment!.bodyText(context),
+                        ]
                       ],
                     ).toShadowContainer(context).paddingAll(16),
                   ).expanded,
@@ -149,22 +163,21 @@ class _TaskRequestDetailsViewState extends State<TaskRequestDetailsView> {
   }
 
   Widget linkWithLocationWidget({required TaskData taskModel}) {
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        '${context.translation.site}:  ${widget.requestDetails?.site?.cleanupWhitespace.capitalizeFirstOfEach ?? "-"}'.bodyText(context),
-      ],
-    );
+    return '${context.translation.site}:  ${widget.requestDetails?.site?.cleanupWhitespace.capitalizeFirstOfEach ?? "-"}'.bodyText(context);
   }
 
   Widget assetDetails() {
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
+      mainAxisSize: MainAxisSize.min,
       children: [
+        Text(
+          context.translation.assetDetails,
+          style: AppTextStyles.heading4.copyWith(color: context.isDark ? AppColor.neutral30 : AppColor.neutral50),
+        ),
         '${context.translation.assetName}:  ${widget.requestDetails?.assetName?.cleanupWhitespace.capitalizeFirstOfEach ?? "-"}'.bodyText(context),
         '${context.translation.assetNo}:  ${widget.requestDetails?.assetNo ?? "-"}'.bodyText(context),
         '${context.translation.assetSN}:  ${widget.requestDetails?.assetSN ?? "-"}'.bodyText(context),
-        const Divider().defaultStyle(context),
       ],
     );
   }