Merge branch 'development_sikander' into 'master'

Development sikander

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

lib/ui/work_list/itg_fragments/approval_level_fragment.dart

@@ -1,11 +1,13 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
+import 'package:mohem_flutter_app/app_state/app_state.dart';
 import 'package:mohem_flutter_app/classes/colors.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/itg_forms_models/wf_history_model.dart';
+import 'package:mohem_flutter_app/ui/work_list/sheets/delegate_sheet.dart';
 import 'package:mohem_flutter_app/ui/work_list/sheets/selected_itg_item_sheet.dart';
 import 'package:mohem_flutter_app/widgets/bottom_sheet.dart';
 import 'package:mohem_flutter_app/widgets/circular_avatar.dart';
@@ -109,6 +111,19 @@ class ApprovalLevelfragment extends StatelessWidget {
                   }).expanded,
                   Container(width: 1, height: 30, color: MyColors.lightGreyEFColor),
                   LocaleKeys.delegate.tr().toText12(color: MyColors.gradiantEndColor).center.paddingOnly(top: 6, bottom: 6).onPress(() {
+                    if (history.employeeID == AppState().memberInformationList?.eMPLOYEENUMBER) {
+                      showMyBottomSheet(context,
+                          callBackFunc: voidCallback,
+                          child: DelegateSheet(
+                            title: LocaleKeys.delegate.tr(),
+                            apiMode: "Delegate",
+                            notificationID: null,
+                            actionHistoryList: null,
+                            wFHistory: wFHistory,
+                            callBackFunc: voidCallback,
+                          ));
+                      return;
+                    }
                     showMyBottomSheet(
                       context,
                       callBackFunc: voidCallback,
@@ -135,11 +150,7 @@ class ApprovalLevelfragment extends StatelessWidget {
       return MyColors.yellowColor;
     } else if (code.toLowerCase() == "not doable" || code.toLowerCase() == "rejected") {
       return MyColors.redColor;
-    } else if (code.toLowerCase() == "approved" ||
-        code.toLowerCase() == "auto-approve" ||
-        code.toLowerCase() == "auto-approved" ||
-        code.toLowerCase() == "doable" ||
-        code.toLowerCase() == "answer") {
+    } else if (code.toLowerCase() == "approved" || code.toLowerCase() == "auto-approve" || code.toLowerCase() == "auto-approved" || code.toLowerCase() == "doable" || code.toLowerCase() == "answer") {
       return MyColors.greenColor;
     } else if (code.toLowerCase() == "requested information" || code.toLowerCase() == "assign" || code.toLowerCase() == "reassign") {
       return MyColors.orange;

lib/ui/work_list/worklist_fragments/actions_fragment.dart

@@ -1,5 +1,6 @@
 import 'package:easy_localization/src/public_ext.dart';
 import 'package:flutter/material.dart';
+import 'package:mohem_flutter_app/app_state/app_state.dart';
 import 'package:mohem_flutter_app/classes/colors.dart';
 import 'package:mohem_flutter_app/classes/date_uitl.dart';
 import 'package:mohem_flutter_app/extensions/int_extensions.dart';
@@ -7,6 +8,7 @@ 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/ui/work_list/sheets/delegate_sheet.dart';
 import 'package:mohem_flutter_app/ui/work_list/sheets/selected_item_sheet.dart';
 import 'package:mohem_flutter_app/widgets/bottom_sheet.dart';
 import 'package:mohem_flutter_app/widgets/circular_avatar.dart';
@@ -109,6 +111,18 @@ class ActionsFragment extends StatelessWidget {
                   }).expanded,
                   Container(width: 1, height: 30, color: MyColors.lightGreyEFColor),
                   LocaleKeys.delegate.tr().toText12(color: MyColors.gradiantEndColor).center.paddingOnly(top: 6, bottom: 6).onPress(() {
+                    if (actionHistory.uSERNAME == AppState().memberInformationList?.eMPLOYEENUMBER) {
+                      showMyBottomSheet(context,
+                          callBackFunc: voidCallback,
+                          child: DelegateSheet(
+                            title: LocaleKeys.delegate.tr(),
+                            apiMode: "DELEGATE",
+                            notificationID: notificationID,
+                            actionHistoryList: actionHistoryList,
+                            callBackFunc: voidCallback,
+                          ));
+                      return;
+                    }
                     showMyBottomSheet(
                       context,
                       callBackFunc: voidCallback,
@@ -132,7 +146,10 @@ class ActionsFragment extends StatelessWidget {
   String getActionDuration(int index) {
     if (actionHistoryList[index].aCTIONCODE == "SUBMIT") {
       return "";
-    } else if(actionHistoryList[index].aCTIONCODE == "PENDING") {
+    } else if (actionHistoryList[index].aCTIONCODE == "PENDING") {
+      if (actionHistoryList[++index].nOTIFICATIONDATE!.isEmpty) {
+        return "";
+      }
       DateTime dateTimeFrom = DateUtil.convertSimpleStringDateToDate(actionHistoryList[++index].nOTIFICATIONDATE!);
       Duration duration = DateTime.now().difference(dateTimeFrom);
       return "Action duration: " + DateUtil.formatDuration(duration);