Merge branch 'development_haroon' into 'master'

updates & fixes

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

lib/api/dashboard_api_client.dart

@@ -12,6 +12,7 @@ import 'package:mohem_flutter_app/models/dashboard/list_menu.dart';
 import 'package:mohem_flutter_app/models/generic_response_model.dart';
 import 'package:mohem_flutter_app/models/itg/itg_main_response.dart';
 import 'package:mohem_flutter_app/models/itg/itg_response_model.dart';
+import 'package:platform_device_id/platform_device_id.dart';
 import 'package:uuid/uuid.dart';
 
 class DashboardApiClient {
@@ -111,8 +112,8 @@ class DashboardApiClient {
     // Generate a v4 (random) id
 
     Map<String, dynamic> postParams = {
-      // "UID": await PlatformDeviceId.getDeviceId, //uuid.v4(), //Mobile Id
-      "UID": uuid.v4(), //Mobile Id
+      "UID": await PlatformDeviceId.getDeviceId, //uuid.v4(), //Mobile Id
+      // "UID": uuid.v4(), //Mobile Id
       "Latitude": lat,
       "Longitude": long,
       "QRValue": QRValue,

lib/ui/work_list/sheets/selected_item_sheet.dart

@@ -134,7 +134,7 @@ class SelectedItemSheet extends StatelessWidget {
   void askForConfirmation(BuildContext context, {String? email, String? userId}) {
     NotificationGetRespondAttributesList? notificationNoteInput;
     NotificationGetRespondAttributesList? forwardToUser;
-    List<NotificationGetRespondAttributesList> filtered = getNotificationRespondAttributes.where((element) => element.attributeName == "NOTE").toList();
+    List<NotificationGetRespondAttributesList> filtered = getNotificationRespondAttributes.where((element) => element.attributeName == "NOTE" || element.attributeName == "WF_NOTE").toList();
     if (filtered.isNotEmpty) {
       notificationNoteInput = filtered.first;
     }
@@ -148,7 +148,7 @@ class SelectedItemSheet extends StatelessWidget {
       context: context,
       builder: (cxt) => AcceptRejectInputDialog(
         message: title != null ? null : LocaleKeys.requestedItems.tr(),
-        title: title,
+        // title: title,
         notificationGetRespond: notificationNoteInput,
         actionMode: apiMode,
         onTap: (note) {

lib/ui/work_list/worklist_detail_screen.dart

@@ -569,6 +569,7 @@ class _WorkListDetailScreenState extends State<WorkListDetailScreen> {
             actionHistoryList: actionHistoryList.last,
             notificationID: workListData!.nOTIFICATIONID,
             isITGRequest: false,
+            getNotificationRespondAttributes: getNotificationRespondAttributes,
           ));
       setState(() {});
     } catch (ex) {

lib/widgets/mark_attendance_widget.dart

@@ -234,11 +234,10 @@ class _MarkAttendanceWidgetState extends State<MarkAttendanceWidget> {
           // Location service not enabled.
         }
       });
-    } catch(error) {
+    } catch (error) {
       print("HUAWEI LOCATION ERROR!!!!!");
       print(error);
     }
-
   }
 
   Future<void> performNfcAttendance(DashboardProviderModel model, {String lat = "0", String lng = "0"}) async {