Updates & fixes

lib/api/worklist/worklist_api_client.dart

@@ -481,6 +481,16 @@ class WorkListApiClient {
     }, url, postParams);
   }
 
+  Future<List<GetFavoriteReplacements>?> getFavoriteReplacementWithImageNew(String selectedFavLetter) async {
+    String url = "${ApiConsts.erpRest}Mohemm_GetFavoriteReplacements_Images";
+    Map<String, dynamic> postParams = {"ItgFilter": selectedFavLetter};
+    postParams.addAll(AppState().postParamsJson);
+    return await ApiClient().postJsonForObject((json) {
+      GenericResponseModel responseData = GenericResponseModel.fromJson(json);
+      return responseData.mohemmGetFavoriteReplacementsList;
+    }, url, postParams);
+  }
+
   Future<GenericResponseModel> changeFavoriteReplacements({required String email, required String employeName, required String image, required String userName, bool isFav = false}) async {
     String url = "${ApiConsts.erpRest}Mohemm_ChangeFavoriteReplacements";
     Map<String, dynamic> postParamsObj = {

lib/ui/work_list/sheets/delegate_sheet.dart

@@ -91,6 +91,15 @@ class _DelegateSheetState extends State<DelegateSheet> {
     favUsersList = await WorkListApiClient().getFavoriteReplacementWithImage(selectedFavLetter ?? "");
     if (isNeedLoading) Utils.hideLoading(context);
     setState(() {});
+    fetchFavUsersListNew(isNeedLoading: false);
+    return null;
+  }
+
+  Future fetchFavUsersListNew({bool isNeedLoading = true}) async {
+    if (isNeedLoading) Utils.showLoading(context);
+    favUsersList = await WorkListApiClient().getFavoriteReplacementWithImageNew(selectedFavLetter ?? "");
+    if (isNeedLoading) Utils.hideLoading(context);
+    setState(() {});
     return null;
   }
 
@@ -195,7 +204,7 @@ class _DelegateSheetState extends State<DelegateSheet> {
                               ).onPress(() {
                                 showMyBottomSheet(
                                   context,
-                                  callBackFunc: (){},
+                                  callBackFunc: () {},
                                   child: SearchOptionsSheet(
                                     selectedType,
                                     onSelection: (String value) {
@@ -478,12 +487,24 @@ class _DelegateSheetState extends State<DelegateSheet> {
       },
       child: Row(
         children: [
-          CircularAvatar(
+          actionHistory.employeeImage != ""
-            url: actionHistory.employeeImage,
+              ? CircularAvatar(
-            height: 30,
+                  url: actionHistory.employeeImage,
-            width: 30,
+                  height: 40,
-            isImageBase64: (actionHistory.employeeImage != null || actionHistory.employeeImage!.isNotEmpty) ? true : false,
+                  width: 40,
-          ),
+                  isImageBase64: (actionHistory.employeeImage != null || actionHistory.employeeImage!.isNotEmpty) ? true : false,
+                )
+              : ClipRRect(
+                  borderRadius: const BorderRadius.all(
+                    Radius.circular(50),
+                  ),
+                  child: Image.network(
+                    "https://play-lh.googleusercontent.com/NPo88ojmhah4HDiposucJmfQIop4z4xc8kqJK9ITO9o-yCab2zxIp7PPB_XPj2iUojo",
+                    fit: BoxFit.cover,
+                    height: 40,
+                    width: 40,
+                  ).toShimmer(),
+                ),
           16.width,
           Expanded(
             child: (actionHistory.employeeDisplayName ?? "").toText12(),

lib/ui/work_list/sheets/selected_item_sheet.dart

@@ -133,26 +133,33 @@ class SelectedItemSheet extends StatelessWidget {
     return Container(
       decoration: BoxDecoration(
         borderRadius: BorderRadius.circular(15),
-        color: Color(0xffF7F7F7),
+        color: const Color(0xffF7F7F7),
         border: Border.all(
-          color: Color(0xffefefef),
+          color: const Color(0xffefefef),
           width: 1,
         ),
       ),
-      padding: EdgeInsets.only(top: 16, bottom: 16, left: 21, right: 21),
+      padding: const EdgeInsets.only(top: 16, bottom: 16, left: 21, right: 21),
       child: Row(
         children: [
-          (actionHistoryList != null && actionHistoryList!.eMPLOYEEIMAGE != null)
+          (isFav != null && isFav)
               ? CircularAvatar(
-                  height: 30,
+                  height: 40,
-                  width: 30,
+                  width: 40,
-                  url: actionHistoryList!.eMPLOYEEIMAGE,
+                  url: favoriteReplacements != null ? favoriteReplacements!.employeeImage : actionHistoryList!.eMPLOYEEIMAGE,
                   isImageBase64: true,
                 )
-              : CircularAvatar(
+              : (actionHistoryList != null && actionHistoryList!.eMPLOYEEIMAGE != null)
-                  height: 30,
+                  ? CircularAvatar(
-                  width: 30,
+                      height: 40,
-                ),
+                      width: 40,
+                      url: actionHistoryList!.eMPLOYEEIMAGE,
+                      isImageBase64: true,
+                    )
+                  : CircularAvatar(
+                      height: 40,
+                      width: 40,
+                    ),
           16.width,
           Expanded(
             child: (name ?? "").toText12(),

lib/ui/work_list/worklist_detail_screen.dart

@@ -520,6 +520,7 @@ class _WorkListDetailScreenState extends State<WorkListDetailScreen> {
   }
 
   void performAction(String actionMode, {String? title}) {
+    print(actionMode);
     showDialog(
       context: context,
       builder: (cxt) => AcceptRejectInputDialog(

lib/widgets/dialogs/accept_reject_input_dialog.dart

@@ -91,7 +91,7 @@ class AcceptRejectInputDialog extends StatelessWidget {
                   (actionMode == "REJECTED" || actionMode == "REJECT") ? LocaleKeys.reject.tr() : LocaleKeys.ok.tr(),
                   () {
                     if (note.isEmpty) {
-                      if (actionMode == "APPROVED" || actionMode == "APPROVE") {
+                      if (actionMode != "REJECTED" || actionMode != "REJECT") {
                         Navigator.pop(context);
                         onTap(note);
                       } else {