From 0fdbe8722ed68633d421ac1f5769d642bfb3c716 Mon Sep 17 00:00:00 2001
From: WaseemAbbasi22 <muhammad.abbasi@cloudsolutions.com.sa>
Date: Sun, 20 Apr 2025 09:09:15 +0300
Subject: [PATCH] task request item view api integrated

---
 .../land_page/my_request/my_requests_page.dart   |  5 -----
 .../tasks_request/task_request_item_view.dart    | 16 ++++++++--------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/lib/new_views/pages/land_page/my_request/my_requests_page.dart b/lib/new_views/pages/land_page/my_request/my_requests_page.dart
index df80d66b..980d3bec 100644
--- a/lib/new_views/pages/land_page/my_request/my_requests_page.dart
+++ b/lib/new_views/pages/land_page/my_request/my_requests_page.dart
@@ -135,13 +135,8 @@ class _MyRequestsPageState extends State<MyRequestsPage> {
                                 selectedRequest = index;
                               });
                               _provider!.reset();
-                              //TODO need to remove this after testing and getting api ...
-                              if(index==6){
-                                _provider!.getAllRequests(context, typeTransaction: 5);
-                              }else{
                                 _provider!.getAllRequests(context, typeTransaction: selectedRequest == 0 ? null : selectedRequest);
 
-                              }
                             }
                           }),
                       separatorBuilder: (cxt, index) => 8.width,
diff --git a/lib/views/pages/user/tasks_request/task_request_item_view.dart b/lib/views/pages/user/tasks_request/task_request_item_view.dart
index 5f0bed47..eca68f6a 100644
--- a/lib/views/pages/user/tasks_request/task_request_item_view.dart
+++ b/lib/views/pages/user/tasks_request/task_request_item_view.dart
@@ -31,14 +31,14 @@ class TaskRequestItemView extends StatelessWidget {
             children: [
               StatusLabel(
                 label: requestDetails!.priority!,
-                textColor: AppColor.getRequestStatusTextColorByName(context, requestDetails!.priority!),
-                backgroundColor: AppColor.getRequestStatusColorByName(context, requestDetails!.priority!),
+                textColor: AppColor.getRequestStatusTextColorByName(context, requestDetails?.priority!),
+                backgroundColor: AppColor.getRequestStatusColorByName(context, requestDetails?.priority!),
               ),
               8.width,
               StatusLabel(
                 label: requestDetails!.status!,
-                textColor: AppColor.getRequestStatusTextColorByName(context, requestDetails!.status!),
-                backgroundColor: AppColor.getRequestStatusColorByName(context, requestDetails!.status!),
+                textColor: AppColor.getRequestStatusTextColorByName(context, requestDetails?.status!),
+                backgroundColor: AppColor.getRequestStatusColorByName(context, requestDetails?.status!),
               ),
               1.width.expanded,
               Text(
@@ -51,10 +51,10 @@ class TaskRequestItemView extends StatelessWidget {
           8.height,
           (requestDetails?.nameOfType ?? context.translation.taskRequest).heading5(context),
           8.height,
-          // '${context.translation.taskNo}:  ${requestDetails!.id}'.bodyText(context),
-          '${context.translation.taskType}: ${'Task Type.'}'.bodyText(context),
-          // '${context.translation.code}: ${request.code}'.bodyText(context),
-          '${context.translation.taskNo}: ${'Task number'}'.bodyText(context),
+          '${context.translation.requestNo}:  ${requestDetails!.requestNo}'.bodyText(context),
+          '${context.translation.assetName}:  ${requestDetails!.assetName}'.bodyText(context),
+          '${context.translation.assetNo}:  ${requestDetails!.assetNo}'.bodyText(context),
+          '${context.translation.assetSN}:  ${requestDetails!.assetSN}'.bodyText(context),
           16.height,
           Row(
             mainAxisSize: MainAxisSize.min,