From f77854c79421fac2f047d9184c933343259249e5 Mon Sep 17 00:00:00 2001
From: haroon amjad <amjad.haroon@cloudsolutions.com.sa>
Date: Tue, 12 Mar 2024 17:37:54 +0300
Subject: [PATCH 1/2] update to stores version 5.9

---
 lib/app_state/app_state.dart | 2 +-
 pubspec.yaml                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/app_state/app_state.dart b/lib/app_state/app_state.dart
index 202584b..3ae2097 100644
--- a/lib/app_state/app_state.dart
+++ b/lib/app_state/app_state.dart
@@ -90,7 +90,7 @@ class AppState {
 
   String get getHuaweiPushToken => _huaweiPushToken;
 
-  final PostParamsModel _postParamsInitConfig = PostParamsModel(channel: 31, versionID: 5.8, mobileType: Platform.isAndroid ? "android" : "ios");
+  final PostParamsModel _postParamsInitConfig = PostParamsModel(channel: 31, versionID: 5.9, mobileType: Platform.isAndroid ? "android" : "ios");
 
   void setPostParamsInitConfig() {
     isAuthenticated = false;
diff --git a/pubspec.yaml b/pubspec.yaml
index 0db0731..a8853ce 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -17,7 +17,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 #version: 3.3.01+300040
-version: 3.4.1+300051
+version: 3.7.92+1
 
 environment:
   sdk: ">=2.16.0 <3.0.0"

From 348e4713ec8190b15139d36ad1e13b10fc426064 Mon Sep 17 00:00:00 2001
From: Sultan khan <>
Date: Thu, 14 Mar 2024 15:01:00 +0300
Subject: [PATCH 2/2] worklist-PO-PR issue fixed.

---
 lib/ui/work_list/worklist_detail_screen.dart | 31 +++++++++++---------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/lib/ui/work_list/worklist_detail_screen.dart b/lib/ui/work_list/worklist_detail_screen.dart
index c80f1b4..3bb3b5d 100644
--- a/lib/ui/work_list/worklist_detail_screen.dart
+++ b/lib/ui/work_list/worklist_detail_screen.dart
@@ -245,7 +245,7 @@ class _WorkListDetailScreenState extends State<WorkListDetailScreen> {
                 if ((workListData?.sUBJECT ?? "").isNotEmpty) workListData!.sUBJECT!.toText14().paddingOnly(top: 20, right: 21, left: 21),
                 PageView(
                   controller: controller,
-                  onPageChanged: (pageIndex) {
+                  onPageChanged: (int pageIndex) {
                     setState(() {
                       tabIndex = pageIndex;
                     });
@@ -586,7 +586,7 @@ class _WorkListDetailScreenState extends State<WorkListDetailScreen> {
   Future<void> performNetworkCall(BuildContext context, {String? email, String? userId}) async {
     showDialog(
       context: context,
-      builder: (cxt) => ConfirmDialog(
+      builder: (BuildContext cxt) => ConfirmDialog(
         message: LocaleKeys.wantToReject.tr(),
         okTitle: LocaleKeys.reject.tr(),
         onTap: () async {
@@ -668,25 +668,28 @@ class _WorkListDetailScreenState extends State<WorkListDetailScreen> {
   void performAction(String actionMode, {String? title}) {
     showDialog(
       context: context,
-      builder: (cxt) => AcceptRejectInputDialog(
+      builder: (BuildContext cxt) => AcceptRejectInputDialog(
         message: title != null ? null : LocaleKeys.requestedItems.tr(),
         title: title,
         notificationGetRespond: notificationNoteInput,
         actionMode: actionMode,
-        onTap: (note) {
+        onTap: (String note) {
+         List<Map<String, dynamic>> responseAttribute = [];
+
+         for (var element in getNotificationRespondAttributes!) {
+           responseAttribute.add({
+             "ATTRIBUTE_NAME": element!.attributeName,
+             if (element!.attributeType == "number") "ATTRIBUTE_NUMBER_VALUE": note else if (element!.attributeType == "VARCHAR2") "ATTRIBUTE_TEXT_VALUE": note
+           });
+         }
+
           Map<String, dynamic> payload = {
             "P_ACTION_MODE": actionMode,
             "P_APPROVER_INDEX": null,
             "P_COMMENTS": note,
             "P_FORWARD_TO_USER_NAME": "",
             "P_NOTIFICATION_ID": workListData!.nOTIFICATIONID,
-            "RespondAttributeList": [
-              if (notificationNoteInput != null)
-                {
-                  "ATTRIBUTE_NAME": notificationNoteInput!.attributeName,
-                  if (notificationNoteInput!.attributeType == "number") "ATTRIBUTE_NUMBER_VALUE": note else if (notificationNoteInput!.attributeType == "VARCHAR2") "ATTRIBUTE_TEXT_VALUE": note
-                }
-            ],
+            "RespondAttributeList":responseAttribute,
           };
           if (actionMode == "APPROVED" || actionMode == "APPROVE" || actionMode == "CLOSE" || actionMode == "ANSWER_INFO" || actionMode == "RFC") {
             performNotificationAction(payload);
@@ -999,15 +1002,15 @@ class _WorkListDetailScreenState extends State<WorkListDetailScreen> {
       notificationButtonsList.clear();
       notificationButtonsList = await WorkListApiClient().getNotificationButtons(workListData!.nOTIFICATIONID!);
       if (notificationButtonsList.isNotEmpty) {
-        isCloseAvailable = notificationButtonsList.any((element) => element.bUTTONACTION == "CLOSE");
-        isApproveAvailable = notificationButtonsList.any((element) {
+        isCloseAvailable = notificationButtonsList.any((GetNotificationButtonsList element) => element.bUTTONACTION == "CLOSE");
+        isApproveAvailable = notificationButtonsList.any((GetNotificationButtonsList element) {
           if (element.bUTTONACTION == "APPROVED" || element.bUTTONACTION == "APPROVE") {
             approveAction = element.bUTTONACTION!;
             return true;
           }
           return false;
         });
-        isRejectAvailable = notificationButtonsList.any((element) {
+        isRejectAvailable = notificationButtonsList.any((GetNotificationButtonsList element) {
           if (element.bUTTONACTION == "REJECTED" || element.bUTTONACTION == "REJECT") {
             rejectAction = element.bUTTONACTION!;
             return true;