Merge branch 'development_haroon' into 'master'

Development haroon

See merge request Cloud_Solution/mohemm-flutter-app!186

lib/ui/work_list/sheets/selected_item_sheet.dart

@@ -6,7 +6,6 @@ import 'package:mohem_flutter_app/classes/colors.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_action_history_list_model.dart';
 import 'package:mohem_flutter_app/models/member_information_list_model.dart';
@@ -144,26 +143,30 @@ class SelectedItemSheet extends StatelessWidget {
       forwardToUser = filtered.first;
     }
 
-    showDialog(
+    if (notificationNoteInput == null) {
-      context: context,
+      performNetworkCall(context, email: email ?? "", userId: userId ?? "", attributeData: []);
-      builder: (cxt) => AcceptRejectInputDialog(
+    } else {
-        message: title != null ? null : LocaleKeys.requestedItems.tr(),
+      showDialog(
-        // title: title,
+        context: context,
-        notificationGetRespond: notificationNoteInput,
+        builder: (cxt) => AcceptRejectInputDialog(
-        actionMode: apiMode,
+          message: title != null ? null : LocaleKeys.requestedItems.tr(),
-        onTap: (note) {
+          // title: title,
-          performNetworkCall(context, email: email ?? "", userId: userId ?? "", attributeData: [
+          notificationGetRespond: notificationNoteInput,
-            if ((apiMode == "FORWARD" || apiMode == "APPROVE_AND_FORWARD") && forwardToUser != null)
+          actionMode: apiMode,
-              {"ATTRIBUTE_NAME": "FORWARD_TO_USERNAME_RESPONSE", "ATTRIBUTE_TEXT_VALUE": actionHistoryList?.uSERNAME},
+          onTap: (note) {
-            if (notificationNoteInput != null)
+            performNetworkCall(context, email: email ?? "", userId: userId ?? "", attributeData: [
-              {
+              if ((apiMode == "FORWARD" || apiMode == "APPROVE_AND_FORWARD") && forwardToUser != null)
-                "ATTRIBUTE_NAME": notificationNoteInput.attributeName,
+                {"ATTRIBUTE_NAME": "FORWARD_TO_USERNAME_RESPONSE", "ATTRIBUTE_TEXT_VALUE": actionHistoryList?.uSERNAME},
-                if (notificationNoteInput.attributeType == "number") "ATTRIBUTE_NUMBER_VALUE": note else if (notificationNoteInput.attributeType == "VARCHAR2") "ATTRIBUTE_TEXT_VALUE": note
+              if (notificationNoteInput != null)
-              }
+                {
-          ]);
+                  "ATTRIBUTE_NAME": notificationNoteInput.attributeName,
-        },
+                  if (notificationNoteInput.attributeType == "number") "ATTRIBUTE_NUMBER_VALUE": note else if (notificationNoteInput.attributeType == "VARCHAR2") "ATTRIBUTE_TEXT_VALUE": note
-      ),
+                }
-    );
+            ]);
+          },
+        ),
+      );
+    }
   }
 
   void getUserInformation(BuildContext context) async {