Merge branch 'master' into development_sikander

lib/api/worklist/worklist_api_client.dart

@@ -14,6 +14,7 @@ import 'package:mohem_flutter_app/models/get_mo_notification_body_list_model.dar
 import 'package:mohem_flutter_app/models/get_notification_buttons_list_model.dart';
 import 'package:mohem_flutter_app/models/get_po_Item_history_list_model.dart';
 import 'package:mohem_flutter_app/models/get_po_notification_body_list_model.dart';
+import 'package:mohem_flutter_app/models/get_pr_action_history_list_model.dart';
 import 'package:mohem_flutter_app/models/get_pr_information_list.dart';
 import 'package:mohem_flutter_app/models/get_pr_notification_body_list_model.dart';
 import 'package:mohem_flutter_app/models/get_quotation_analysis_list_model.dart';
@@ -91,6 +92,16 @@ class WorkListApiClient {
     }, url, postParams);
   }
 
+  Future<List<GetAttachementList>> getPRAttachments(String pOLineID) async {
+    String url = "${ApiConsts.erpRest}GET_PR_ATTACHMENTS";
+    Map<String, dynamic> postParams = {"P_PO_LINE_ID": pOLineID};
+    postParams.addAll(AppState().postParamsJson);
+    return await ApiClient().postJsonForObject((json) {
+      GenericResponseModel responseData = GenericResponseModel.fromJson(json);
+      return responseData.getPRAttachmentList ?? [];
+    }, url, postParams);
+  }
+
   Future<List<GetRFCEmployeeList>> getRFCEmployeeeList(int pNotificationID) async {
     String url = "${ApiConsts.erpRest}GET_RFC_EMPLOYEE_LIST";
     Map<String, dynamic> postParams = {"P_NOTIFICATION_ID": pNotificationID, "P_PAGE_NUM": 1, "P_PAGE_LIMIT": 10};
@@ -115,6 +126,20 @@ class WorkListApiClient {
     }, url, postParams);
   }
 
+  Future<List<GetPRActionHistoryList>> getActionHistoryForPR(String pOLineID) async {
+    String url = "${ApiConsts.erpRest}GET_PR_ACTION_HISTORY";
+    Map<String, dynamic> postParams = {
+      "P_PO_LINE_ID": pOLineID,
+      "P_PAGE_LIMIT": 100,
+      "P_PAGE_NUM": 1,
+    };
+    postParams.addAll(AppState().postParamsJson);
+    return await ApiClient().postJsonForObject((json) {
+      GenericResponseModel responseData = GenericResponseModel.fromJson(json);
+      return responseData.getPRActionHistoryList?.reversed.toList() ?? [];
+    }, url, postParams);
+  }
+
   Future<List<GetNotificationButtonsList>> getNotificationButtons(int pNotificationID) async {
     String url = "${ApiConsts.erpRest}GET_NOTIFICATION_BUTTONS";
     Map<String, dynamic> postParams = {"P_NOTIFICATION_ID": pNotificationID};

lib/classes/notifications.dart

@@ -4,6 +4,7 @@ import 'package:firebase_core/firebase_core.dart';
 import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter_local_notifications/flutter_local_notifications.dart';
+
 // import 'package:huawei_hmsavailability/huawei_hmsavailability.dart';
 import 'package:huawei_push/huawei_push.dart' as huawei_push;
 import 'package:mohem_flutter_app/app_state/app_state.dart';
@@ -70,18 +71,17 @@ class AppNotifications {
     if (Platform.isAndroid) {
       // await hmsApiAvailability.isHMSAvailable().then((value) async {
       if (!(await Utils.isGoogleServicesAvailable())) {
-
         huawei_push.Push.enableLogger();
-          var result = await huawei_push.Push.setAutoInitEnabled(true);
+        var result = await huawei_push.Push.setAutoInitEnabled(true);
 
-          huawei_push.Push.onNotificationOpenedApp.listen((message) {
-            // newMessage(toFirebaseRemoteMessage(message));
-          }, onError: (e) => print(e.toString()));
+        huawei_push.Push.onNotificationOpenedApp.listen((message) {
+          // newMessage(toFirebaseRemoteMessage(message));
+        }, onError: (e) => print(e.toString()));
 
-          huawei_push.Push.onMessageReceivedStream.listen((message) {
-            // newMessage(toFirebaseRemoteMessage(message));
-          }, onError: (e) => print(e.toString()));
-        }
+        huawei_push.Push.onMessageReceivedStream.listen((message) {
+          // newMessage(toFirebaseRemoteMessage(message));
+        }, onError: (e) => print(e.toString()));
+      }
       // }).catchError((err) {
       //   print(err);
       // });
@@ -116,8 +116,10 @@ class AppNotifications {
   }
 
   void _handleOpenApp(RemoteMessage message) {
-    Utils.saveStringFromPrefs("isAppOpendByChat", "true");
-    Utils.saveStringFromPrefs("notificationData", message.data["user_chat_history_response"].toString());
+    if (message.data.isNotEmpty && message.data["type"] == 'chat') {
+      Utils.saveStringFromPrefs("isAppOpendByChat", "true");
+      Utils.saveStringFromPrefs("notificationData", message.data["user_chat_history_response"].toString());
+    }
   }
 }
 
@@ -131,4 +133,7 @@ Future<dynamic> backgroundMessageHandler(RemoteMessage message) async {
   await Firebase.initializeApp();
   Utils.saveStringFromPrefs("isAppOpendByChat", "false");
   Utils.saveStringFromPrefs("notificationData", message.data["user_chat_history_response"].toString());
+  if (message.data.isNotEmpty && message.data["type"] == 'call') {
+    // ChatVoipCall().showCallkitIncoming(uuid: const Uuid().v4(), data: message);
+  }
 }

lib/models/generic_response_model.dart

@@ -28,6 +28,7 @@ import 'package:mohem_flutter_app/models/get_mobile_login_info_list_model.dart';
 import 'package:mohem_flutter_app/models/get_notification_buttons_list_model.dart';
 import 'package:mohem_flutter_app/models/get_po_Item_history_list_model.dart';
 import 'package:mohem_flutter_app/models/get_po_notification_body_list_model.dart';
+import 'package:mohem_flutter_app/models/get_pr_action_history_list_model.dart';
 import 'package:mohem_flutter_app/models/get_pr_information_list.dart';
 import 'package:mohem_flutter_app/models/get_pr_notification_body_list_model.dart';
 import 'package:mohem_flutter_app/models/get_quotation_analysis_list_model.dart';
@@ -170,9 +171,11 @@ class GenericResponseModel {
   List<GetAbsenceTransactionList>? getAbsenceTransactionList;
   List<GetAccrualBalancesList>? getAccrualBalancesList;
   List<GetActionHistoryList>? getActionHistoryList;
+  List<GetPRActionHistoryList>? getPRActionHistoryList;
   List<GetAddressDffStructureList>? getAddressDffStructureList;
   List<GetApprovesList>? getApprovesList;
   List<GetAttachementList>? getAttachementList;
+  List<GetAttachementList>? getPRAttachmentList;
   GetAttendanceTracking? getAttendanceTrackingList;
   List<GetBasicDetColsStructureList>? getBasicDetColsStructureList;
   List<GetBasicDetDffStructureList>? getBasicDetDffStructureList;
@@ -436,10 +439,12 @@ class GenericResponseModel {
       this.getAbsenceTransactionList,
       this.getAccrualBalancesList,
       this.getActionHistoryList,
+      this.getPRActionHistoryList,
       this.getAddressDffStructureList,
       this.getAddressNotificationBodyList,
       this.getApprovesList,
       this.getAttachementList,
+      this.getPRAttachmentList,
       this.getAttendanceTrackingList,
       this.getBasicDetColsStructureList,
       this.getBasicDetDffStructureList,
@@ -751,6 +756,13 @@ class GenericResponseModel {
       });
     }
 
+    if (json['PR_Action_History_List'] != null) {
+      getPRActionHistoryList = <GetPRActionHistoryList>[];
+      json['PR_Action_History_List'].forEach((v) {
+        getPRActionHistoryList!.add(GetPRActionHistoryList.fromJson(v));
+      });
+    }
+
     if (json['GetAddressDffStructureList'] != null) {
       getAddressDffStructureList = <GetAddressDffStructureList>[];
       json['GetAddressDffStructureList'].forEach((v) {
@@ -772,6 +784,14 @@ class GenericResponseModel {
         getAttachementList!.add(GetAttachementList.fromJson(v));
       });
     }
+
+    if (json['PR_Attachments_List'] != null) {
+      getPRAttachmentList = <GetAttachementList>[];
+      json['PR_Attachments_List'].forEach((v) {
+        getPRAttachmentList!.add(GetAttachementList.fromJson(v));
+      });
+    }
+
     getAttendanceTrackingList = json["GetAttendanceTrackingList"] == null ? null : GetAttendanceTracking.fromMap(json["GetAttendanceTrackingList"]);
     if (json['GetBasicDetColsStructureList'] != null) {
       getBasicDetColsStructureList = <GetBasicDetColsStructureList>[];

lib/models/get_pr_action_history_list_model.dart

@@ -0,0 +1,68 @@
+class GetPRActionHistoryList {
+  String? aCTION;
+  String? aCTIONCODE;
+  String? aPPROVALDATE;
+  String? eMAILADDRESS;
+  String? eMPLOYEEIMAGE;
+  int? fROMROWNUM;
+  String? nAME;
+  String? nOTE;
+  int? nOOFROWS;
+  String? pOSITIONTITLE;
+  int? rOWNUM;
+  int? sEQUENCE;
+  int? tOROWNUM;
+  Null? uSERNAME;
+
+  GetPRActionHistoryList(
+      {this.aCTION,
+        this.aCTIONCODE,
+        this.aPPROVALDATE,
+        this.eMAILADDRESS,
+        this.eMPLOYEEIMAGE,
+        this.fROMROWNUM,
+        this.nAME,
+        this.nOTE,
+        this.nOOFROWS,
+        this.pOSITIONTITLE,
+        this.rOWNUM,
+        this.sEQUENCE,
+        this.tOROWNUM,
+        this.uSERNAME});
+
+  GetPRActionHistoryList.fromJson(Map<String, dynamic> json) {
+    aCTION = json['ACTION'];
+    aCTIONCODE = json['ACTION_CODE'];
+    aPPROVALDATE = json['APPROVAL_DATE'];
+    eMAILADDRESS = json['EMAIL_ADDRESS'];
+    eMPLOYEEIMAGE = json['EMPLOYEE_IMAGE'];
+    fROMROWNUM = json['FROM_ROW_NUM'];
+    nAME = json['NAME'];
+    nOTE = json['NOTE'];
+    nOOFROWS = json['NO_OF_ROWS'];
+    pOSITIONTITLE = json['POSITION_TITLE'];
+    rOWNUM = json['ROW_NUM'];
+    sEQUENCE = json['SEQUENCE'];
+    tOROWNUM = json['TO_ROW_NUM'];
+    uSERNAME = json['USER_NAME'];
+  }
+
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> data = new Map<String, dynamic>();
+    data['ACTION'] = this.aCTION;
+    data['ACTION_CODE'] = this.aCTIONCODE;
+    data['APPROVAL_DATE'] = this.aPPROVALDATE;
+    data['EMAIL_ADDRESS'] = this.eMAILADDRESS;
+    data['EMPLOYEE_IMAGE'] = this.eMPLOYEEIMAGE;
+    data['FROM_ROW_NUM'] = this.fROMROWNUM;
+    data['NAME'] = this.nAME;
+    data['NOTE'] = this.nOTE;
+    data['NO_OF_ROWS'] = this.nOOFROWS;
+    data['POSITION_TITLE'] = this.pOSITIONTITLE;
+    data['ROW_NUM'] = this.rOWNUM;
+    data['SEQUENCE'] = this.sEQUENCE;
+    data['TO_ROW_NUM'] = this.tOROWNUM;
+    data['USER_NAME'] = this.uSERNAME;
+    return data;
+  }
+}

lib/ui/landing/dashboard_screen.dart

@@ -26,7 +26,6 @@ import 'package:mohem_flutter_app/ui/landing/widget/services_widget.dart';
 import 'package:mohem_flutter_app/ui/marathon/marathon_provider.dart';
 import 'package:mohem_flutter_app/ui/marathon/widgets/marathon_banner.dart';
 import 'package:mohem_flutter_app/widgets/bottom_sheet.dart';
-import 'package:mohem_flutter_app/widgets/dialogs/dialogs.dart';
 import 'package:mohem_flutter_app/widgets/mark_attendance_widget.dart';
 import 'package:mohem_flutter_app/widgets/shimmer/dashboard_shimmer_widget.dart';
 import 'package:mohem_flutter_app/widgets/shimmer/offers_shimmer_widget.dart';
@@ -98,7 +97,7 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
     cProvider.getUserAutoLoginToken().whenComplete(() async {
       if (!cProvider.disbaleChatForThisUser) {
         String isAppOpendByChat = await Utils.getStringFromPrefs("isAppOpendByChat");
-        if (isAppOpendByChat != null && isAppOpendByChat == "true") {
+        if (isAppOpendByChat != "null" && isAppOpendByChat == "true") {
           Utils.showLoading(context);
           cProvider.buildHubConnection();
           Future.delayed(const Duration(seconds: 2), () async {
@@ -128,6 +127,11 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
     if (chatHubConnection.state == HubConnectionState.Connected) {
       Utils.hideLoading(context);
       Navigator.pushNamed(context, AppRoutes.chat);
+      String isAppOpendByChat = await Utils.getStringFromPrefs("isAppOpendByChat");
+      if (isAppOpendByChat != "null" || isAppOpendByChat == "true") {
+        Utils.saveStringFromPrefs("isAppOpendByChat", "false");
+        Utils.saveStringFromPrefs("notificationData", "null");
+      }
     }
   }
 

lib/ui/screens/items_for_sale/item_for_sale_detail.dart

@@ -142,6 +142,7 @@ class _ItemForSaleDetailPageState extends State<ItemForSaleDetailPage> {
   }
 
   List<Widget> getItemImages() {
+    int index = 0;
     List<Widget> itemImages = [];
     getItemsForSaleList.itemAttachments!.forEach((element) {
       itemImages.add(
@@ -150,12 +151,13 @@ class _ItemForSaleDetailPageState extends State<ItemForSaleDetailPage> {
           child: ClipRRect(
             borderRadius: BorderRadius.circular(6),
             child: Image.network(
-              getItemsForSaleList.itemAttachments![0].filePath!,
+              getItemsForSaleList.itemAttachments![index].filePath!,
               fit: BoxFit.cover,
             ),
           ),
         ),
       );
+      index++;
     });
     return itemImages;
   }

lib/ui/work_list/item_history_screen.dart

@@ -1,16 +1,29 @@
+import 'dart:convert';
+import 'dart:io';
+import 'dart:typed_data';
+
 import 'package:easy_localization/src/public_ext.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_svg/flutter_svg.dart';
 import 'package:mohem_flutter_app/api/worklist/worklist_api_client.dart';
+import 'package:mohem_flutter_app/classes/colors.dart';
+import 'package:mohem_flutter_app/classes/date_uitl.dart';
 import 'package:mohem_flutter_app/classes/utils.dart';
 import 'package:mohem_flutter_app/extensions/int_extensions.dart';
+import 'package:mohem_flutter_app/extensions/string_extensions.dart';
 import 'package:mohem_flutter_app/extensions/widget_extensions.dart';
 import 'package:mohem_flutter_app/generated/locale_keys.g.dart';
+import 'package:mohem_flutter_app/models/get_attachement_list_model.dart';
 import 'package:mohem_flutter_app/models/get_mo_Item_history_list_model.dart';
 import 'package:mohem_flutter_app/models/get_po_Item_history_list_model.dart';
+import 'package:mohem_flutter_app/models/get_pr_action_history_list_model.dart';
 import 'package:mohem_flutter_app/models/get_pr_information_list.dart';
 import 'package:mohem_flutter_app/models/get_quotation_analysis_list_model.dart';
 import 'package:mohem_flutter_app/widgets/app_bar_widget.dart';
+import 'package:mohem_flutter_app/widgets/circular_avatar.dart';
 import 'package:mohem_flutter_app/widgets/item_detail_view_widget.dart';
+import 'package:open_file/open_file.dart';
+import 'package:path_provider/path_provider.dart';
 
 class ItemHistoryScreenParams {
   String? title;
@@ -21,8 +34,10 @@ class ItemHistoryScreenParams {
   int? pOrgId;
   bool isPRInfo;
   GetPRInformationList? getPRInformationList;
+  String pOLineID;
 
-  ItemHistoryScreenParams({@required this.title, this.isItemHistory = true, this.isMO = true, this.isPRInfo = false, this.getPRInformationList, this.pItemId, this.pPoHeaderId, this.pOrgId});
+  ItemHistoryScreenParams(
+      {@required this.title, this.isItemHistory = true, this.isMO = true, this.isPRInfo = false, this.getPRInformationList, this.pItemId, this.pPoHeaderId, this.pOrgId, this.pOLineID = ""});
 }
 
 class ItemHistoryScreen extends StatefulWidget {
@@ -40,6 +55,9 @@ class _ItemHistoryScreenState extends State<ItemHistoryScreen> {
   List<GetMoItemHistoryList> moItemHistoryList = [];
   List<GetPoItemHistoryList> poItemHistoryList = [];
   List<GetQuotationAnalysisList> quotationAnalysisList = [];
+  List<GetPRActionHistoryList> actionHistoryList = [];
+  List<GetAttachementList> getAttachmentList = [];
+  int tabIndex = 0;
 
   @override
   void initState() {
@@ -49,6 +67,7 @@ class _ItemHistoryScreenState extends State<ItemHistoryScreen> {
   @override
   void dispose() {
     super.dispose();
+    actionHistoryList.clear();
   }
 
   void loadData() {
@@ -60,6 +79,34 @@ class _ItemHistoryScreenState extends State<ItemHistoryScreen> {
     }
   }
 
+  void getActionsDataFromApi() async {
+    if (actionHistoryList.isEmpty) {
+      try {
+        Utils.showLoading(context);
+        actionHistoryList = await WorkListApiClient().getActionHistoryForPR(_screenParams!.pOLineID);
+        Utils.hideLoading(context);
+        setState(() {});
+      } catch (ex) {
+        Utils.hideLoading(context);
+        Utils.handleException(ex, context, null);
+      }
+    }
+  }
+
+  void getAttachmentsDataFromApi() async {
+    if (getAttachmentList.isEmpty) {
+      try {
+        Utils.showLoading(context);
+        getAttachmentList = await WorkListApiClient().getPRAttachments(_screenParams!.pOLineID!);
+        Utils.hideLoading(context);
+        setState(() {});
+      } catch (ex) {
+        Utils.hideLoading(context);
+        Utils.handleException(ex, context, null);
+      }
+    }
+  }
+
   void getDataFromApi() async {
     try {
       Utils.showLoading(context);
@@ -88,7 +135,7 @@ class _ItemHistoryScreenState extends State<ItemHistoryScreen> {
       appBar: AppBarWidget(context, title: _screenParams?.title ?? ""),
       backgroundColor: Colors.white,
       body: ListView(
-        padding: const EdgeInsets.all(21),
+        padding: _screenParams!.isPRInfo ? const EdgeInsets.all(0) : const EdgeInsets.all(21),
         physics: const BouncingScrollPhysics(),
         children: [
           if (_screenParams!.isPRInfo) prLinesDataView(),
@@ -102,32 +149,232 @@ class _ItemHistoryScreenState extends State<ItemHistoryScreen> {
   }
 
   Widget prLinesDataView() {
+    return Column(
+      children: [
+        Container(
+          padding: const EdgeInsets.only(left: 21, right: 21, top: 16, bottom: 16),
+          decoration: const BoxDecoration(
+            borderRadius: BorderRadius.only(
+              bottomLeft: Radius.circular(25),
+              bottomRight: Radius.circular(25),
+            ),
+            gradient: LinearGradient(
+              transform: GradientRotation(.83),
+              begin: Alignment.topRight,
+              end: Alignment.bottomLeft,
+              colors: [
+                MyColors.gradiantEndColor,
+                MyColors.gradiantStartColor,
+              ],
+            ),
+          ),
+          child: Row(
+            children: [
+              myTab(LocaleKeys.info.tr(), 0),
+              myTab(LocaleKeys.actions.tr(), 1),
+              myTab(LocaleKeys.attachments.tr(), 2),
+            ],
+          ),
+        ),
+        if (tabIndex == 0) _screenParams!.getPRInformationList!.pRHeader![0].dESCRIPTION!.toText14().paddingOnly(top: 20, right: 21, left: 21),
+        if (tabIndex == 0)
+          ListView.separated(
+              padding: const EdgeInsets.all(21),
+              shrinkWrap: true,
+              physics: const NeverScrollableScrollPhysics(),
+              itemBuilder: (cxt, index) => Column(
+                    children: [
+                      ItemDetailGrid(
+                        ItemDetailViewCol("Cost Center", _screenParams!.getPRInformationList!.pRLines![index].cOSTCENTER ?? ""),
+                        ItemDetailViewCol("Code", _screenParams!.getPRInformationList!.pRLines![index].iTEMCODE ?? ""),
+                      ),
+                      ItemDetailGrid(
+                        ItemDetailViewCol("Unit", _screenParams!.getPRInformationList!.pRLines![index].uOM ?? ""),
+                        ItemDetailViewCol("Price (SAR)", _screenParams!.getPRInformationList!.pRLines![index].uNITPRICE.toString() ?? ""),
+                      ),
+                      ItemDetailGrid(
+                        ItemDetailViewCol("Amount (SAR)", _screenParams!.getPRInformationList!.pRLines![index].lINEAMOUNT.toString() ?? ""),
+                        ItemDetailViewCol("Quantity", _screenParams!.getPRInformationList!.pRLines![index].qUANTITY.toString() ?? ""),
+                      ),
+                      ItemDetailGrid(
+                        ItemDetailViewCol("AMU (Last 3 months)", _screenParams!.getPRInformationList!.pRLines![index].iTEMAMU.toString() ?? ""),
+                        ItemDetailViewCol("PR Number", _screenParams!.getPRInformationList!.pRHeader![0].pRNUMBER!.toString() ?? ""),
+                        isItLast: true,
+                      ),
+                    ],
+                  ).objectContainerView(),
+              separatorBuilder: (cxt, index) => 12.height,
+              itemCount: _screenParams!.getPRInformationList!.pRLines!.length),
+        if (tabIndex == 1) getPRActionsHistory(), //"ACTIONS".toText14().paddingOnly(top: 20, right: 21, left: 21),
+        if (tabIndex == 2) getPRAttachments(),
+      ],
+    );
+  }
+
+  String determineFileIcon(String fileContentType) {
+    String icon = "";
+    switch (fileContentType) {
+      case "pdf":
+        icon = "assets/images/pdf.svg";
+        break;
+      case "xls":
+        icon = "assets/images/xls.svg";
+        break;
+      case "xlsx":
+        icon = "assets/images/xls.svg";
+        break;
+      case "png":
+        icon = "assets/images/png.svg";
+        break;
+      case "jpg":
+        icon = "assets/images/jpg.svg";
+        break;
+      case "jpeg":
+        icon = "assets/images/jpg.svg";
+        break;
+    }
+    return icon;
+  }
+
+  Future<String> _createFileFromString(String encodedStr, String ext) async {
+    Uint8List bytes = base64.decode(encodedStr);
+    String dir = (await getApplicationDocumentsDirectory()).path;
+    File file = File("$dir/" + DateTime.now().millisecondsSinceEpoch.toString() + "." + ext);
+    await file.writeAsBytes(bytes);
+    return file.path;
+  }
+
+  Widget getPRAttachments() {
     return ListView.separated(
+      itemCount: getAttachmentList.length,
+      shrinkWrap: true,
+      itemBuilder: (context, index) {
+        return Row(
+          children: [
+            SvgPicture.asset(determineFileIcon(getAttachmentList[index].fILECONTENTTYPE ?? "")),
+            12.width,
+            (getAttachmentList[index].fILENAME ?? "").toText16().expanded,
+          ],
+        ).objectContainerView().onPress(() async {
+          try {
+            String path = await _createFileFromString(getAttachmentList[index].fILEDATA ?? "", getAttachmentList[index].fILECONTENTTYPE ?? "");
+            OpenFile.open(path);
+          } catch (ex) {
+            Utils.showToast("Cannot open file.");
+          }
+        });
+      },
+      separatorBuilder: (BuildContext context, int index) => 12.height,
+    ).paddingAll(21);
+  }
+
+  Widget getPRActionsHistory() {
+    return SingleChildScrollView(
+      child: ListView.separated(
         shrinkWrap: true,
         physics: const NeverScrollableScrollPhysics(),
-        itemBuilder: (cxt, index) => Column(
-              children: [
-                ItemDetailGrid(
-                  ItemDetailViewCol("Cost Center", _screenParams!.getPRInformationList!.pRLines![index].cOSTCENTER ?? ""),
-                  ItemDetailViewCol("Code", _screenParams!.getPRInformationList!.pRLines![index].iTEMCODE ?? ""),
-                ),
-                ItemDetailGrid(
-                  ItemDetailViewCol("Unit", _screenParams!.getPRInformationList!.pRLines![index].uOM ?? ""),
-                  ItemDetailViewCol("Price (SAR)", _screenParams!.getPRInformationList!.pRLines![index].uNITPRICE.toString() ?? ""),
-                ),
-                ItemDetailGrid(
-                  ItemDetailViewCol("Amount (SAR)", _screenParams!.getPRInformationList!.pRLines![index].lINEAMOUNT.toString() ?? ""),
-                  ItemDetailViewCol("Quantity", _screenParams!.getPRInformationList!.pRLines![index].qUANTITY.toString() ?? ""),
-                ),
-                ItemDetailGrid(
-                  ItemDetailViewCol("AMU (Last 3 months)", _screenParams!.getPRInformationList!.pRLines![index].iTEMAMU.toString() ?? ""),
-                  Container(),
-                  isItLast: true,
-                ),
-              ],
-            ).objectContainerView(),
-        separatorBuilder: (cxt, index) => 12.height,
-        itemCount: _screenParams!.getPRInformationList!.pRLines!.length);
+        itemCount: actionHistoryList.length,
+        padding: EdgeInsets.all(21),
+        itemBuilder: (context, index) {
+          return showItem(context, actionHistoryList[index], index);
+        },
+        separatorBuilder: (BuildContext context, int index) {
+          return 12.height;
+        },
+      ),
+    );
+  }
+
+  Widget showItem(BuildContext context, GetPRActionHistoryList actionHistory, int index) {
+    return Container(
+      width: double.infinity,
+      decoration: BoxDecoration(
+        color: Colors.white,
+        borderRadius: BorderRadius.circular(10),
+        boxShadow: [
+          BoxShadow(
+            color: const Color(0xff000000).withOpacity(.05),
+            blurRadius: 26,
+            offset: const Offset(0, -3),
+          ),
+        ],
+      ),
+      clipBehavior: Clip.antiAlias,
+      child: Stack(
+        clipBehavior: Clip.antiAlias,
+        children: [
+          Positioned(
+            left: -20,
+            top: -10,
+            child: Transform.rotate(
+              angle: 15,
+              child: Container(
+                width: 50,
+                height: 30,
+                color: getStatusColor(actionHistory.aCTIONCODE!),
+              ),
+            ),
+          ),
+          Column(
+            children: [
+              Row(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  actionHistory.eMPLOYEEIMAGE != null
+                      ? CircularAvatar(url: actionHistory.eMPLOYEEIMAGE ?? "", isImageBase64: true, height: 34, width: 34)
+                      : CircularAvatar(url: "https://cdn4.iconfinder.com/data/icons/professions-2-2/151/89-512.png", isImageBase64: false, height: 34, width: 34),
+                  9.width,
+                  Expanded(
+                    child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        actionHistory.nAME!.toText16(),
+                        if ((actionHistory.nOTE ?? "").isNotEmpty) "Note: ${actionHistory.nOTE!}".toText12(color: MyColors.grey57Color),
+                        4.height,
+                        Row(
+                          children: [
+                            actionHistory.aCTION!.toText10(color: getStatusColor(actionHistory.aCTIONCODE!)),
+                            8.width,
+                            if (actionHistory.aPPROVALDATE!.isNotEmpty)
+                              DateUtil.formatDateToDate(DateUtil.convertSimpleStringDateToDateddMMyyyy(actionHistory.aPPROVALDATE!), false).toText12(color: MyColors.lightTextColor),
+                          ],
+                        ),
+                        10.height,
+                        // getActionDuration(index).toText11(maxLine: 1, color: const Color(0xff1FA269))
+                      ],
+                    ),
+                  )
+                ],
+              ).paddingOnly(top: 19, left: 16, right: 16, bottom: 12),
+            ],
+          ),
+        ],
+      ),
+    );
+  }
+
+  Color getStatusColor(String code) {
+    if (code == "SUBMIT") {
+      return const Color(0xff2E303A);
+    } else if (code == "REJECTED") {
+      return MyColors.redColor;
+    } else if (code == "REJECT") {
+      return MyColors.redColor;
+    } else if (code == "PENDING") {
+      return MyColors.orange;
+    } else if (code == "APPROVED" || code == "APPROVE" || code == "ANSWER_INFO") {
+      return const Color(0xff1FA269);
+    } else if (code == "REQUEST_INFO" || code == "FORWARD") {
+      return const Color(0xff2E303A);
+    } else if (code != "SUBMIT" && code != "REJECT" && code != "PENDING") {
+      return MyColors.orange;
+    } else {
+      return const Color(0xff2E303A);
+    }
+  }
+
+  Widget getActionHistory() {
+    return Container();
   }
 
   Widget loadMoItemHistoryData() {
@@ -266,4 +513,34 @@ class _ItemHistoryScreenState extends State<ItemHistoryScreen> {
         separatorBuilder: (cxt, index) => 12.height,
         itemCount: quotationAnalysisList.length);
   }
+
+  Widget myTab(String title, int index) {
+    bool isSelected = (index == tabIndex);
+    return Column(
+      mainAxisSize: MainAxisSize.min,
+      crossAxisAlignment: CrossAxisAlignment.center,
+      children: [
+        title.toText12(color: isSelected ? Colors.white : Colors.white.withOpacity(.74), isCenter: true),
+        4.height,
+        Container(
+          height: 8,
+          width: 8,
+          decoration: BoxDecoration(
+            shape: BoxShape.circle,
+            color: isSelected ? Colors.white : Colors.transparent,
+          ),
+        )
+      ],
+    ).onPress(() {
+      setState(() {
+        if (index == 1) {
+          getActionsDataFromApi();
+        }
+        if (index == 2) {
+          getAttachmentsDataFromApi();
+        }
+        tabIndex = index;
+      });
+    }).expanded;
+  }
 }

lib/ui/work_list/worklist_detail_screen.dart

@@ -148,9 +148,6 @@ class _WorkListDetailScreenState extends State<WorkListDetailScreen> {
       } else if (workListData!.rEQUESTTYPE == "ADDRESS") {
         getAddressNotificationBody();
       }
-      // getBasicNTFBody = await WorkListApiClient().getBasicDetNTFBody(workListData!.nOTIFICATIONID!, -999);
-      // getAbsenceCollectionNotifications = await WorkListApiClient().getAbsenceNotificationBody(workListData!.nOTIFICATIONID!, -999);
-      // subordinatesLeavesModel = await WorkListApiClient().getSubordinatesLeaves("", "");
     }
     if (workListData!.iTEMTYPE == "STAMP") {
       getStampNotificationBody();

lib/ui/work_list/worklist_fragments/attachments_fragment.dart

@@ -22,7 +22,6 @@ class AttachmentsFragment extends StatelessWidget {
     return ListView.separated(
       itemCount: getAttachmentList.length,
       itemBuilder: (context, index) {
-
         return Row(
           children: [
             SvgPicture.asset(determineFileIcon(getAttachmentList[index].fILECONTENTTYPE ?? "")),

lib/ui/work_list/worklist_fragments/request_fragment.dart

@@ -294,7 +294,7 @@ class RequestFragment extends StatelessWidget {
         context,
         AppRoutes.itemHistory,
         arguments: ItemHistoryScreenParams(
-            isItemHistory: false, isMO: false, isPRInfo: true, getPRInformationList: getPRInformationList, title: "PR Details", pItemId: 0, pPoHeaderId: 0),
+            isItemHistory: false, isMO: false, isPRInfo: true, getPRInformationList: getPRInformationList, title: "PR Details", pItemId: 0, pPoHeaderId: 0, pOLineID: poLineID),
       );
     } catch (ex) {
       Utils.hideLoading(context);