improvements

lib/controllers/api_routes/urls.dart

@@ -4,12 +4,12 @@ class URLs {
   static const String appReleaseBuildNumber = "26";
 
   // static const host1 = "https://atomsm.hmg.com"; // production url
-  static const host1 = "https://atomsmdev.hmg.com"; // local DEV 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 String _baseUrl = "$_host/mobile";
-  static final String _baseUrl = "$_host/v3/mobile"; // new V3 apis
+  // static final String _baseUrl = "$_host/v3/mobile"; // new V3 apis
-  // static final String _baseUrl = "$_host/v4/mobile"; // for asset inventory on UAT
+  static final String _baseUrl = "$_host/v4/mobile"; // for asset inventory on UAT
   // static final String _baseUrl = "$_host/mobile"; // host local UAT
   // static final String _baseUrl = "$_host/v3/mobile"; // v3 for production CM,PM,TM
 

lib/dashboard_latest/widgets/request_category_list.dart

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:test_sa/extensions/int_extensions.dart';
 import 'package:test_sa/extensions/widget_extensions.dart';
 import 'package:test_sa/models/new_models/dashboard_detail.dart';
-import 'package:test_sa/modules/asset_inventory_module/pages/inventory_seession_card.dart';
+import 'package:test_sa/modules/asset_inventory_module/pages/inventory_session_item_view.dart';
 import 'package:test_sa/modules/tm_module/tasks_wo/task_request_item_view.dart';
 import 'package:test_sa/new_views/app_style/app_color.dart';
 import 'package:test_sa/new_views/pages/land_page/requests/device_item_view.dart';
@@ -52,7 +52,7 @@ class RequestCategoryList extends StatelessWidget {
         case 7:
         return TaskRequestItemView(requestData: request);
         case 8:
-        return InventorySessionCard(requestData: request);
+        return InventorySessionItemView(requestData: request);
       default:
         return Container(
           height: 100,

lib/modules/asset_inventory_module/pages/asset_inventory_detail_view.dart

@@ -72,18 +72,16 @@ class _AssetInventoryDetailViewState extends State<AssetInventoryDetailView> {
           '${'Session Name'.addTranslation}: ${sessionModel.sessionName?.cleanupWhitespace.capitalizeFirstOfEach}',
           style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral120),
         ),
-
-        // 8.height,
         Text(
-          '${'Session Typ'.addTranslation}:  ${sessionModel.sessionTypeName}',
+          '${'Session Typ'.addTranslation}: ${sessionModel.sessionTypeName}',
           style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral120),
         ),
         Text(
-          '${'Start Date:'.addTranslation}:  ${sessionModel.startDate}',
+          '${'Start Date'.addTranslation}: ${sessionModel.startDate?.toServiceRequestDetailsFormat ?? ""}',
           style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral120),
         ),
         Text(
-          '${'End Date:'.addTranslation}:  ${sessionModel.endDate}',
+          '${'End Date'.addTranslation}: ${sessionModel.endDate?.toServiceRequestDetailsFormat ?? ""}',
           style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral120),
         ),
       ],
@@ -97,6 +95,11 @@ class _AssetInventoryDetailViewState extends State<AssetInventoryDetailView> {
       mainAxisSize: MainAxisSize.min,
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
+        Text(
+          "Sites Information",
+          style: AppTextStyles.heading4.copyWith(color: context.isDark ? AppColor.neutral30 : AppColor.neutral50),
+        ),
+        8.height,
         ListView.separated(
           physics: const NeverScrollableScrollPhysics(),
           shrinkWrap: true,

lib/modules/asset_inventory_module/pages/inventory_session_item_view.dart

@@ -10,12 +10,12 @@ import 'package:test_sa/modules/asset_inventory_module/pages/asset_inventory_pag
 import 'package:test_sa/new_views/app_style/app_color.dart';
 import 'package:test_sa/views/widgets/requests/request_status.dart';
 
-class InventorySessionCard extends StatelessWidget {
+class InventorySessionItemView extends StatelessWidget {
   final Data? requestData;
   final RequestsDetails? requestDetails;
   final bool showShadow;
 
-  const InventorySessionCard({Key? key, this.requestData, this.requestDetails, this.showShadow = true}) : super(key: key);
+  const InventorySessionItemView({Key? key, this.requestData, this.requestDetails, this.showShadow = true}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
@@ -47,9 +47,9 @@ class InventorySessionCard extends StatelessWidget {
           ),
           8.height,
           (requestData?.typeTransaction ?? context.translation.taskRequest).heading5(context),
-          infoWidget(label: 'Type'.addTranslation, value: requestData?.sessionType, context: context),
+          infoWidget(label: context.translation.requestType, value: requestData?.sessionType, context: context),
-          infoWidget(label: 'Assets'.addTranslation, value: requestData?.numberOfAssets!=null? requestData?.numberOfAssets.toString():'-', context: context),
+          infoWidget(label: 'No of Assets'.addTranslation, value: requestData?.numberOfAssets != null ? requestData?.numberOfAssets.toString() : '-', context: context),
-          infoWidget(label: 'Sites'.addTranslation, value: requestData?.numberOfSites!=null? requestData?.numberOfSites.toString():'-', context: context),
+          infoWidget(label: 'No of Sites'.addTranslation, value: requestData?.numberOfSites != null ? requestData?.numberOfSites.toString() : '-', context: context),
           8.height,
           Row(
             mainAxisSize: MainAxisSize.min,
@@ -64,10 +64,7 @@ class InventorySessionCard extends StatelessWidget {
           ),
         ],
       ).toShadowContainer(context, withShadow: showShadow).onPress(() async {
-        Navigator.of(context).push(MaterialPageRoute(
+        Navigator.of(context).push(MaterialPageRoute(builder: (_) => AssetInventoryPage(sessionId: requestData!.id!)));
-            builder: (_) => AssetInventoryPage(
-                  sessionId: requestData!.id!,
-                )));
       });
     }
     return Column(
@@ -97,9 +94,9 @@ class InventorySessionCard extends StatelessWidget {
         ),
         8.height,
         (requestDetails?.nameOfType ?? context.translation.taskRequest).heading5(context),
-        infoWidget(label: 'Type'.addTranslation, value: requestDetails?.sessionType, context: context),
+        infoWidget(label: context.translation.requestType, value: requestDetails?.sessionType, context: context),
-        infoWidget(label: 'Assets'.addTranslation, value: requestDetails?.numberOfAssets!=null? requestDetails?.numberOfAssets.toString():'-', context: context),
+        infoWidget(label: 'No of Assets'.addTranslation, value: requestDetails?.numberOfAssets != null ? requestDetails?.numberOfAssets.toString() : '-', context: context),
-        infoWidget(label: 'Sites'.addTranslation, value: requestDetails?.numberOfSites!=null? requestDetails?.numberOfSites.toString():'-', context: context),
+        infoWidget(label: 'No of Sites'.addTranslation, value: requestDetails?.numberOfSites != null ? requestDetails?.numberOfSites.toString() : '-', context: context),
         8.height,
         Row(
           mainAxisSize: MainAxisSize.min,
@@ -114,10 +111,7 @@ class InventorySessionCard extends StatelessWidget {
         ),
       ],
     ).toShadowContainer(context, withShadow: showShadow).onPress(() async {
-      Navigator.of(context).push(MaterialPageRoute(
+      Navigator.of(context).push(MaterialPageRoute(builder: (_) => AssetInventoryPage(sessionId: requestDetails!.id!)));
-          builder: (_) => AssetInventoryPage(
-                sessionId: requestDetails!.id!,
-              )));
     });
   }
 

lib/new_views/pages/land_page/requests/request_paginated_listview.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:test_sa/extensions/int_extensions.dart';
 import 'package:test_sa/models/new_models/dashboard_detail.dart';
-import 'package:test_sa/modules/asset_inventory_module/pages/inventory_seession_card.dart';
+import 'package:test_sa/modules/asset_inventory_module/pages/inventory_session_item_view.dart';
 import 'package:test_sa/modules/tm_module/tasks_wo/task_request_item_view.dart';
 import 'package:test_sa/new_views/app_style/app_color.dart';
 import 'package:test_sa/new_views/pages/land_page/requests/device_item_view.dart';
@@ -62,7 +62,7 @@ class RequestPaginatedListview extends StatelessWidget {
       case 7:
         return TaskRequestItemView(requestData: request);
       case 8:
-        return InventorySessionCard(requestData: request);
+        return InventorySessionItemView(requestData: request);
       default:
         return Container(
           height: 100,

lib/new_views/pages/land_page/widgets/request_item_view_list.dart

@@ -4,7 +4,7 @@ import 'package:test_sa/extensions/context_extension.dart';
 import 'package:test_sa/extensions/int_extensions.dart';
 import 'package:test_sa/extensions/widget_extensions.dart';
 import 'package:test_sa/models/all_requests_and_count_model.dart';
-import 'package:test_sa/modules/asset_inventory_module/pages/inventory_seession_card.dart';
+import 'package:test_sa/modules/asset_inventory_module/pages/inventory_session_item_view.dart';
 import 'package:test_sa/modules/tm_module/tasks_wo/task_request_item_view.dart';
 import 'package:test_sa/new_views/pages/land_page/requests/device_item_view.dart';
 import 'package:test_sa/new_views/pages/land_page/requests/gas_refill_item_view.dart';
@@ -44,7 +44,7 @@ class RequestItemViewList extends StatelessWidget {
                 case 7:
                   return TaskRequestItemView(requestDetails: list[index]);
                   case 8:
-                  return InventorySessionCard(requestDetails: list[index]);
+                  return InventorySessionItemView(requestDetails: list[index]);
                 default:
                   Container(
                     height: 100,