From 8ca13c52da24fcbd160f60145ad0d90c145fe144 Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Thu, 16 Feb 2023 15:46:37 +0300 Subject: [PATCH] HMG Flutter updates --- .../items_for_sale_api_client.dart | 2 +- lib/api/login_api_client.dart | 2 +- lib/api/marathon/marathon_api_client.dart | 2 +- lib/api/profile_api_client.dart | 2 +- lib/app_state/app_state.dart | 2 +- lib/ui/dialogs/id/business_card_dialog.dart | 6 +++--- lib/ui/landing/dashboard_screen.dart | 18 +++++++++++++++--- lib/ui/login/forgot_password_screen.dart | 2 +- .../fragments/my_posted_ads_fragment.dart | 2 +- 9 files changed, 25 insertions(+), 13 deletions(-) diff --git a/lib/api/items_for_sale/items_for_sale_api_client.dart b/lib/api/items_for_sale/items_for_sale_api_client.dart index a04651e..17db9f8 100644 --- a/lib/api/items_for_sale/items_for_sale_api_client.dart +++ b/lib/api/items_for_sale/items_for_sale_api_client.dart @@ -85,7 +85,7 @@ class ItemsForSaleApiClient { "employeeNumber": AppState().memberInformationList?.eMPLOYEENUMBER, "MobileNo": AppState().memberInformationList?.eMPLOYEEMOBILENUMBER, "itemSaleID": itemSaleID.toString(), - "Channel": "31", + "Channel": "33", "isActive": "false", "Token": AppState().postParamsObject?.tokenID }; diff --git a/lib/api/login_api_client.dart b/lib/api/login_api_client.dart index 7da7754..e7e160f 100644 --- a/lib/api/login_api_client.dart +++ b/lib/api/login_api_client.dart @@ -60,7 +60,7 @@ class LoginApiClient { Future memberLogin(String username, String password) async { String url = "${ApiConsts.erpRest}MemberLogin"; - Map postParams = {"P_APP_VERSION": "CS", "P_LANGUAGE": "US", "P_PASSWORD": password, "P_USER_NAME": username}; + Map postParams = {"P_APP_VERSION": "HMG", "P_LANGUAGE": "US", "P_PASSWORD": password, "P_USER_NAME": username}; postParams.addAll(AppState().postParamsJson); return await ApiClient().postJsonForObject((json) { GenericResponseModel responseData = GenericResponseModel.fromJson(json); diff --git a/lib/api/marathon/marathon_api_client.dart b/lib/api/marathon/marathon_api_client.dart index 9497b48..132e7c0 100644 --- a/lib/api/marathon/marathon_api_client.dart +++ b/lib/api/marathon/marathon_api_client.dart @@ -61,7 +61,7 @@ class MarathonApiClient { } Future getMarathonDetails() async { - String payrollString = AppState().postParamsObject?.payrollCodeStr.toString() ?? "CS"; + String payrollString = AppState().postParamsObject?.payrollCodeStr.toString() ?? "HMG"; Response response = await ApiClient().getJsonForResponse( ApiConsts.marathonUpcomingUrl + payrollString, diff --git a/lib/api/profile_api_client.dart b/lib/api/profile_api_client.dart index 6a8cfb0..2a5f049 100644 --- a/lib/api/profile_api_client.dart +++ b/lib/api/profile_api_client.dart @@ -166,7 +166,7 @@ class ProfileApiClient { ], "P_CONTACT_RELATIONSHIP_ID": contactRelationId, "P_ACTION": actionType, - "PayrollCodeStr": "CS", + "PayrollCodeStr": "HMG", "LegislationCodeStr": "SA", }; postParams.addAll(AppState().postParamsJson); diff --git a/lib/app_state/app_state.dart b/lib/app_state/app_state.dart index 2395bc1..33993f6 100644 --- a/lib/app_state/app_state.dart +++ b/lib/app_state/app_state.dart @@ -88,7 +88,7 @@ class AppState { String get getHuaweiPushToken => _huaweiPushToken; - final PostParamsModel _postParamsInitConfig = PostParamsModel(channel: 31, versionID: 4.3, mobileType: Platform.isAndroid ? "android" : "ios"); + final PostParamsModel _postParamsInitConfig = PostParamsModel(channel: 33, versionID: 4.3, mobileType: Platform.isAndroid ? "android" : "ios"); void setPostParamsInitConfig() { isAuthenticated = false; diff --git a/lib/ui/dialogs/id/business_card_dialog.dart b/lib/ui/dialogs/id/business_card_dialog.dart index 141abbd..b786bf6 100644 --- a/lib/ui/dialogs/id/business_card_dialog.dart +++ b/lib/ui/dialogs/id/business_card_dialog.dart @@ -30,9 +30,9 @@ class BusinessCardDialog extends StatelessWidget { mainAxisAlignment: MainAxisAlignment.start, children: [ Image.asset( - "assets/images/logos/bn_cloud_soloution.jpg", - width: 80, - height: 80, + "assets/images/logos/bn_hmg_logo.png", + width: 120, + height: 120, ), 12.height, (AppState().memberInformationList!.eMPLOYEENAME ?? "").toText20(isBold: true), diff --git a/lib/ui/landing/dashboard_screen.dart b/lib/ui/landing/dashboard_screen.dart index ed064ac..db57e9a 100644 --- a/lib/ui/landing/dashboard_screen.dart +++ b/lib/ui/landing/dashboard_screen.dart @@ -18,6 +18,7 @@ import 'package:mohem_flutter_app/extensions/widget_extensions.dart'; import 'package:mohem_flutter_app/generated/locale_keys.g.dart'; import 'package:mohem_flutter_app/main.dart'; import 'package:mohem_flutter_app/models/offers_and_discounts/get_offers_list.dart'; +import 'package:mohem_flutter_app/models/privilege_list_model.dart'; import 'package:mohem_flutter_app/provider/chat_provider_model.dart'; import 'package:mohem_flutter_app/provider/dashboard_provider_model.dart'; import 'package:mohem_flutter_app/ui/landing/widget/app_drawer.dart'; @@ -559,7 +560,7 @@ class _DashboardScreenState extends State with WidgetsBindingOb children: [ SvgPicture.asset( "assets/icons/chat/chat.svg", - color: currentIndex == 4 + color: !checkIfPrivilegedForChat() ? MyColors.lightGreyE3Color : currentIndex == 4 ? MyColors.grey3AColor : cProvider.disbaleChatForThisUser ? MyColors.lightGreyE3Color @@ -567,7 +568,7 @@ class _DashboardScreenState extends State with WidgetsBindingOb ).paddingAll(4), Consumer( builder: (BuildContext cxt, ChatProviderModel data, Widget? child) { - return Positioned( + return !checkIfPrivilegedForChat() ? const SizedBox() : Positioned( right: 0, top: 0, child: Container( @@ -600,7 +601,7 @@ class _DashboardScreenState extends State with WidgetsBindingOb } else if (index == 3) { Navigator.pushNamed(context, AppRoutes.itemsForSale); } else if (index == 4) { - if (!cProvider.disbaleChatForThisUser) { + if (!cProvider.disbaleChatForThisUser && checkIfPrivilegedForChat()) { Navigator.pushNamed(context, AppRoutes.chat); } } @@ -610,6 +611,17 @@ class _DashboardScreenState extends State with WidgetsBindingOb ); } + bool checkIfPrivilegedForChat() { + for (PrivilegeListModel element in AppState().privilegeListModel!) { + if (element.serviceName?.toLowerCase() == "chat") { + if (element.previlege != null) { + return element.previlege!; + } + } + } + return false; + } + void navigateToDetails(OffersListModel offersListModelObj) { List getOffersDetailList = []; getOffersDetailList.clear(); diff --git a/lib/ui/login/forgot_password_screen.dart b/lib/ui/login/forgot_password_screen.dart index b2d5c92..97c1d88 100644 --- a/lib/ui/login/forgot_password_screen.dart +++ b/lib/ui/login/forgot_password_screen.dart @@ -43,7 +43,7 @@ class _ForgotPasswordScreenState extends State { } Utils.showLoading(context); try { - _basicMemberInformation = await LoginApiClient().getBasicUserInformation("CS", employeeId.text); + _basicMemberInformation = await LoginApiClient().getBasicUserInformation("HMG", employeeId.text); genericResponseModel = await LoginApiClient().sendPublicActivationCode(_basicMemberInformation?.pMOBILENUMBER, employeeId.text); Utils.hideLoading(context); OtpDialog( diff --git a/lib/ui/screens/items_for_sale/fragments/my_posted_ads_fragment.dart b/lib/ui/screens/items_for_sale/fragments/my_posted_ads_fragment.dart index ffce243..eac8c01 100644 --- a/lib/ui/screens/items_for_sale/fragments/my_posted_ads_fragment.dart +++ b/lib/ui/screens/items_for_sale/fragments/my_posted_ads_fragment.dart @@ -189,7 +189,7 @@ class _MyPostedAdsFragmentState extends State { request.fields['RegionID'] = employeePostedAds.regionID.toString(); request.fields['Itg_EndDate'] = employeePostedAds.endDate.toString(); request.fields['endDate'] = employeePostedAds.endDate.toString(); - request.fields['Channel'] = "31"; + request.fields['Channel'] = "33"; request.fields['ItgIsActive'] = "false"; request.fields['LogInToken'] = loginTokenID!; request.fields['Token'] = tokenID!;