Worklist fixes

assets/langs/en-US.json

@@ -420,7 +420,7 @@
   "updateMember": "Are You Sure You Want to Update this Member?",
   "fieldIsEmpty": "'{data}' Field is empty. Please select",
   "pleaseEnterComments": "Please enter comments",
-  "skip": "skip",
+  "skip": "Skip",
   "typeCurrentPasswordBelow": "Type Your Current password below",
   "currentPassword": "Current password",
   "profile": {

lib/api/api_client.dart

@@ -81,8 +81,8 @@ class ApiClient {
     }
     if (!kReleaseMode) {
       print("Url:$url");
-      // var bodyJson = json.encode(jsonObject);
-      // print("body:$bodyJson");
+      var bodyJson = json.encode(jsonObject);
+      print("body:$bodyJson");
     }
     var response = await postJsonForResponse(url, jsonObject,
         token: token,

lib/generated/codegen_loader.g.dart

@@ -435,6 +435,8 @@ class CodegenLoader extends AssetLoader{
   "adult": "بالغ",
   "updateMember": "هل انت متأكد تريد تحديث بيانات هذا العضو؟",
   "fieldIsEmpty": "'{data}' الحقل فارغ. الرجاء التحديد",
+  "pleaseEnterComments": "الرجاء إدخال التعليقات",
+  "skip": "يتخطى",
   "typeCurrentPasswordBelow": "اكتب كلمة المرور الحاليه",
   "currentPassword": "كلمة المرور الحاليه",
   "profile": {
@@ -906,6 +908,8 @@ static const Map<String,dynamic> en_US = {
   "adult": "Adult",
   "updateMember": "Are You Sure You Want to Update this Member?",
   "fieldIsEmpty": "'{data}' Field is empty. Please select",
+  "pleaseEnterComments": "Please enter comments",
+  "skip": "Skip",
   "typeCurrentPasswordBelow": "Type Your Current password below",
   "currentPassword": "Current password",
   "profile": {

lib/ui/work_list/sheets/delegate_sheet.dart

@@ -407,10 +407,10 @@ class _DelegateSheetState extends State<DelegateSheet> {
       child: Row(
         children: [
           CircularAvatar(
-            url: actionHistory.employeeImage ?? "",
+            url: actionHistory.employeeImage,
             height: 30,
             width: 30,
-            isImageBase64: true,
+            isImageBase64: (actionHistory.employeeImage != null || actionHistory.employeeImage!.isNotEmpty) ? true : false,
           ),
           16.width,
           Expanded(
@@ -452,10 +452,10 @@ class _DelegateSheetState extends State<DelegateSheet> {
       child: Row(
         children: [
           CircularAvatar(
-            url: actionHistory.employeeImage ?? "",
+            url: actionHistory.employeeImage,
             height: 30,
             width: 30,
-            isImageBase64: true,
+            isImageBase64: actionHistory.employeeImage != null ? true : false,
           ),
           16.width,
           Expanded(

lib/ui/work_list/sheets/selected_item_sheet.dart

@@ -142,10 +142,17 @@ class SelectedItemSheet extends StatelessWidget {
       padding: EdgeInsets.only(top: 16, bottom: 16, left: 21, right: 21),
       child: Row(
         children: [
-          CircularAvatar(
-            height: 30,
-            width: 30,
-          ),
+          actionHistoryList != null
+              ? CircularAvatar(
+                  height: 30,
+                  width: 30,
+                  url: actionHistoryList!.eMPLOYEEIMAGE,
+                  isImageBase64: true,
+                )
+              : CircularAvatar(
+                  height: 30,
+                  width: 30,
+                ),
           16.width,
           Expanded(
             child: (name ?? "").toText12(),

lib/ui/work_list/worklist_detail_screen.dart

@@ -307,7 +307,7 @@ class _WorkListDetailScreenState extends State<WorkListDetailScreen> {
                   mainAxisSize: MainAxisSize.min,
                   crossAxisAlignment: CrossAxisAlignment.end,
                   children: [
-                    myFab(LocaleKeys.pleaseEnterComments.tr(), "assets/images/skip.svg").onPress(() {
+                    myFab(LocaleKeys.skip.tr(), "assets/images/skip.svg").onPress(() {
                       if (AppState().workList!.length - 1 > AppState().workListIndex!) {
                         AppState().setWorkListIndex = AppState().workListIndex! + 1;
                         workListData = null;
@@ -354,7 +354,8 @@ class _WorkListDetailScreenState extends State<WorkListDetailScreen> {
       if (notificationButtonsList[i].bUTTONACTION! == "REJECTED" || notificationButtonsList[i].bUTTONACTION! == "APPROVED" || notificationButtonsList[i].bUTTONACTION! == "CLOSE") {
         continue;
       }
-      fabs.add(myFab(notificationButtonsList[i].bUTTONLABEL!, notificationButtonsList[i].bUTTONICON ?? "", isIconAsset: false)
+      fabs.add(myFab(notificationButtonsList[i].bUTTONLABEL!, notificationButtonsList[i].bUTTONACTION == "DELEGATE" ? "assets/images/delegate.svg" : notificationButtonsList[i].bUTTONICON ?? "",
+              isIconAsset: notificationButtonsList[i].bUTTONACTION == "DELEGATE" ? true : false,)
           .paddingOnly(bottom: 12)
           .onPress(() => handleFabAction(notificationButtonsList[i])));
     }
@@ -778,7 +779,7 @@ class _WorkListDetailScreenState extends State<WorkListDetailScreen> {
       // apiCallCount--;
       // if (apiCallCount == 0) {
       //   Utils.hideLoading(context);
-        setState(() {});
+      setState(() {});
       // }
     } catch (ex) {
       // apiCallCount--;

lib/ui/work_list/worklist_fragments/info_fragments.dart

@@ -440,7 +440,7 @@ class InfoFragment extends StatelessWidget {
   Widget getPRNotificationBodyListWidget(GetPrNotificationBodyList getPrNotificationBodyList) {
     return Column(
       children: [
-        getPrNotificationBodyList.pINFORMATION.toString().toText14(color: MyColors.textMixColor).objectContainerView(),
+        getPrNotificationBodyList.pINFORMATION != null ? getPrNotificationBodyList.pINFORMATION.toString().toText14(color: MyColors.textMixColor).objectContainerView() : Container(),
         12.height,
         Column(
           children: [
@@ -459,15 +459,6 @@ class InfoFragment extends StatelessWidget {
             Column(
               children: getPRHeaderValues(),
             )
-            // ItemDetailGrid(
-            //   ItemDetailViewCol(getPrNotificationBodyList.pRHeader![2].hDRATTRIBUTENAME ?? "", getPrNotificationBodyList.pRHeader![2].hDRATTRIBUTEVALUE ?? ""),
-            //   ItemDetailViewCol(getPrNotificationBodyList.pRHeader![0].hDRATTRIBUTENAME!, getPrNotificationBodyList.pRHeader![0].hDRATTRIBUTEVALUE ?? ""),
-            // ),
-            // ItemDetailGrid(
-            //   ItemDetailViewCol(getPrNotificationBodyList.pRHeader![1].hDRATTRIBUTENAME!, getPrNotificationBodyList.pRHeader![1].hDRATTRIBUTEVALUE ?? ""),
-            //   Container(),
-            //   isItLast: true,
-            // ),
           ],
         ).objectContainerView(),
       ],