po number, site, information added in asset details,

lib/controllers/providers/api/all_requests_provider.dart

@@ -4,6 +4,7 @@ import 'package:flutter/widgets.dart';
 import 'package:http/http.dart';
 import 'package:test_sa/controllers/api_routes/api_manager.dart';
 import 'package:test_sa/controllers/api_routes/urls.dart';
+import 'package:test_sa/extensions/context_extension.dart';
 import 'package:test_sa/models/all_requests_and_count_model.dart';
 import 'package:test_sa/models/enums/user_types.dart';
 import 'package:test_sa/models/ppm/recurrent_wo.dart';
@@ -130,6 +131,24 @@ class AllRequestsProvider extends ChangeNotifier {
 
   SearchAllRequestsModel? searchedModel;
 
+  List<int> getStatues(BuildContext context) {
+    List<int> list = [1, 2, 3, 4];
+
+    if (context.userProvider.user!.type != UsersTypes.normal_user) {
+      list.add(5);
+    }
+    list.add(6); // task module
+
+    if (context.settingProvider.isUserFlowMedical && context.userProvider.user!.type != UsersTypes.normal_user) {
+      list.add(7); // task mod
+    }
+    // if (context.userProvider.user!.type != UsersTypes.normal_user) {
+    //   list.add(8); //
+    // }
+
+    return list;
+  }
+
   Future<int> getAllRequests(BuildContext context, {int? typeTransaction, SearchAllRequestsModel? search}) async {
     if (isAllLoading == true) return -2;
     isAllLoading = true;
@@ -143,7 +162,7 @@ class AllRequestsProvider extends ChangeNotifier {
       }
       final type = typeTransaction == null
           ? search?.typeTransaction == null || (search?.typeTransaction?.isEmpty ?? false)
-              ? [1, 2, 3, 4, 5, 6,7]
+              ? getStatues(context)
               : search!.typeTransaction
           : [typeTransaction];
       List<int> status = (search?.statuses == null || (search?.statuses?.isEmpty ?? false)) ? (((search?.isArchived ?? false) ? [3] : [1, 2, 4])) : search!.statuses!;

lib/models/new_models/task_request/task_request_model.dart

@@ -928,6 +928,8 @@ class TaskAsset {
   String? roomName;
   String? supplierName;
   String? assetTypeName;
+  String? poNumber;
+  String? installationDate;
 
   TaskAsset();
 
@@ -946,24 +948,26 @@ class TaskAsset {
     roomName = json['roomName'];
     supplierName = json['supplierName'];
     assetTypeName = json['assetTypeName'];
+    poNumber = json['poNumber'];
+    installationDate = json['installationDate'];
   }
 
-  Map<String, dynamic> toJson() {
+  Map<String, dynamic> toJson() => {
-    return {
+        'id': id,
-      'id': id,
+        'assetNumber': assetNumber,
-      'assetNumber': assetNumber,
+        'serialNo': serialNo,
-      'serialNo': serialNo,
+        'assetName': assetName,
-      'assetName': assetName,
+        'model': model,
-      'model': model,
+        'manufacturer': manufacturer,
-      'manufacturer': manufacturer,
+        'siteName': siteName,
-      'siteName': siteName,
+        'siteId': siteId,
-      'siteId': siteId,
+        'buildingName': buildingName,
-      'buildingName': buildingName,
+        'floorName': floorName,
-      'floorName': floorName,
+        'departmentName': departmentName,
-      'departmentName': departmentName,
+        'roomName': roomName,
-      'roomName': roomName,
+        'supplierName': supplierName,
-      'supplierName': supplierName,
+        'assetTypeName': assetTypeName,
-      'assetTypeName': assetTypeName,
+        'poNumber': poNumber,
-    };
+        'installationDate': installationDate,
-  }
+      };
 }

lib/modules/tm_module/tasks_wo/task_request_detail_view.dart

@@ -61,7 +61,6 @@ class _TaskRequestDetailsViewState extends State<TaskRequestDetailsView> {
   Widget build(BuildContext context) {
     userProvider ??= Provider.of<UserProvider>(context, listen: false);
     return Scaffold(
-      // appBar: DefaultAppBar(title:taskProvider?.taskRequestModel?.taskType?.id==7?'Recall and Alert Details': context.translation.taskRequest),
       appBar: DefaultAppBar(title: context.translation.taskRequest),
       body: Consumer<TaskRequestProvider>(builder: (context, taskProvider, child) {
         TaskData? taskModel = taskProvider.taskRequestModel;
@@ -270,6 +269,16 @@ class _TaskRequestDetailsViewState extends State<TaskRequestDetailsView> {
               '${context.translation.assetNo}:  ${taskModel.asset?.assetNumber ?? "-"}'.bodyText(context),
               '${context.translation.manufacture}:  ${taskModel.asset?.manufacturer ?? "-"}'.bodyText(context),
               '${context.translation.model}:  ${taskModel.asset?.model ?? "-"}'.bodyText(context),
+              '${context.translation.serialNo}:  ${taskModel.asset?.serialNo ?? "-"}'.bodyText(context),
+              '${context.translation.assetType}:  ${taskModel.asset?.assetTypeName ?? "-"}'.bodyText(context),
+              '${context.translation.site}:  ${taskModel.asset?.siteName ?? "-"}'.bodyText(context),
+              '${context.translation.building}:  ${taskModel.asset?.buildingName ?? "-"}'.bodyText(context),
+              '${context.translation.floor}:  ${taskModel.asset?.floorName ?? "-"}'.bodyText(context),
+              '${context.translation.department}:  ${taskModel.asset?.departmentName ?? "-"}'.bodyText(context),
+              '${context.translation.room}:  ${taskModel.asset?.roomName ?? "-"}'.bodyText(context),
+              '${context.translation.supplier}:  ${taskModel.asset?.supplierName ?? "-"}'.bodyText(context),
+              'PO Number:  ${taskModel.asset?.poNumber ?? "-"}'.bodyText(context),
+              '${context.translation.installationDate}:  ${taskModel.asset?.installationDate?.toAssetDetailsFormat ?? "-"}'.bodyText(context),
             ],
           )
         : const SizedBox();

lib/new_views/pages/land_page/my_request/all_requests_filter_page.dart

@@ -72,7 +72,7 @@ class _AllRequestsFilterPageState extends State<AllRequestsFilterPage> {
       types[context.translation.recurrentWo] = 5;
     }
 
-    if (context.settingProvider.isUserFlowMedical) {
+    if (context.settingProvider.isUserFlowMedical && isEngineer) {
       types['Recall and Alert'] = 7;
     }
     final statuses = {

lib/new_views/pages/land_page/my_request/my_requests_page.dart

@@ -47,7 +47,7 @@ class _MyRequestsPageState extends State<MyRequestsPage> {
       //TODO unCommit this to enable task
       requestsList.add(Request(6, context.translation.taskRequest));
       //after confirm name add this to translation...
-      if (context.settingProvider.isUserFlowMedical) {
+      if (context.settingProvider.isUserFlowMedical && Provider.of<UserProvider>(context, listen: false).user!.type != UsersTypes.normal_user) {
         requestsList.add(Request(7, 'Recall and Alert'));
       }