HMG Flutter updates

merge-requests/3/head
haroon amjad 3 years ago
parent 42965713be
commit 8ca13c52da

@ -85,7 +85,7 @@ class ItemsForSaleApiClient {
"employeeNumber": AppState().memberInformationList?.eMPLOYEENUMBER, "employeeNumber": AppState().memberInformationList?.eMPLOYEENUMBER,
"MobileNo": AppState().memberInformationList?.eMPLOYEEMOBILENUMBER, "MobileNo": AppState().memberInformationList?.eMPLOYEEMOBILENUMBER,
"itemSaleID": itemSaleID.toString(), "itemSaleID": itemSaleID.toString(),
"Channel": "31", "Channel": "33",
"isActive": "false", "isActive": "false",
"Token": AppState().postParamsObject?.tokenID "Token": AppState().postParamsObject?.tokenID
}; };

@ -60,7 +60,7 @@ class LoginApiClient {
Future<MemberLoginListModel?> memberLogin(String username, String password) async { Future<MemberLoginListModel?> memberLogin(String username, String password) async {
String url = "${ApiConsts.erpRest}MemberLogin"; String url = "${ApiConsts.erpRest}MemberLogin";
Map<String, dynamic> postParams = {"P_APP_VERSION": "CS", "P_LANGUAGE": "US", "P_PASSWORD": password, "P_USER_NAME": username}; Map<String, dynamic> postParams = {"P_APP_VERSION": "HMG", "P_LANGUAGE": "US", "P_PASSWORD": password, "P_USER_NAME": username};
postParams.addAll(AppState().postParamsJson); postParams.addAll(AppState().postParamsJson);
return await ApiClient().postJsonForObject((json) { return await ApiClient().postJsonForObject((json) {
GenericResponseModel responseData = GenericResponseModel.fromJson(json); GenericResponseModel responseData = GenericResponseModel.fromJson(json);

@ -61,7 +61,7 @@ class MarathonApiClient {
} }
Future<MarathonDetailModel> getMarathonDetails() async { Future<MarathonDetailModel> getMarathonDetails() async {
String payrollString = AppState().postParamsObject?.payrollCodeStr.toString() ?? "CS"; String payrollString = AppState().postParamsObject?.payrollCodeStr.toString() ?? "HMG";
Response response = await ApiClient().getJsonForResponse( Response response = await ApiClient().getJsonForResponse(
ApiConsts.marathonUpcomingUrl + payrollString, ApiConsts.marathonUpcomingUrl + payrollString,

@ -166,7 +166,7 @@ class ProfileApiClient {
], ],
"P_CONTACT_RELATIONSHIP_ID": contactRelationId, "P_CONTACT_RELATIONSHIP_ID": contactRelationId,
"P_ACTION": actionType, "P_ACTION": actionType,
"PayrollCodeStr": "CS", "PayrollCodeStr": "HMG",
"LegislationCodeStr": "SA", "LegislationCodeStr": "SA",
}; };
postParams.addAll(AppState().postParamsJson); postParams.addAll(AppState().postParamsJson);

@ -88,7 +88,7 @@ class AppState {
String get getHuaweiPushToken => _huaweiPushToken; 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() { void setPostParamsInitConfig() {
isAuthenticated = false; isAuthenticated = false;

@ -30,9 +30,9 @@ class BusinessCardDialog extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
children: [ children: [
Image.asset( Image.asset(
"assets/images/logos/bn_cloud_soloution.jpg", "assets/images/logos/bn_hmg_logo.png",
width: 80, width: 120,
height: 80, height: 120,
), ),
12.height, 12.height,
(AppState().memberInformationList!.eMPLOYEENAME ?? "").toText20(isBold: true), (AppState().memberInformationList!.eMPLOYEENAME ?? "").toText20(isBold: true),

@ -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/generated/locale_keys.g.dart';
import 'package:mohem_flutter_app/main.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/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/chat_provider_model.dart';
import 'package:mohem_flutter_app/provider/dashboard_provider_model.dart'; import 'package:mohem_flutter_app/provider/dashboard_provider_model.dart';
import 'package:mohem_flutter_app/ui/landing/widget/app_drawer.dart'; import 'package:mohem_flutter_app/ui/landing/widget/app_drawer.dart';
@ -559,7 +560,7 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
children: [ children: [
SvgPicture.asset( SvgPicture.asset(
"assets/icons/chat/chat.svg", "assets/icons/chat/chat.svg",
color: currentIndex == 4 color: !checkIfPrivilegedForChat() ? MyColors.lightGreyE3Color : currentIndex == 4
? MyColors.grey3AColor ? MyColors.grey3AColor
: cProvider.disbaleChatForThisUser : cProvider.disbaleChatForThisUser
? MyColors.lightGreyE3Color ? MyColors.lightGreyE3Color
@ -567,7 +568,7 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
).paddingAll(4), ).paddingAll(4),
Consumer<ChatProviderModel>( Consumer<ChatProviderModel>(
builder: (BuildContext cxt, ChatProviderModel data, Widget? child) { builder: (BuildContext cxt, ChatProviderModel data, Widget? child) {
return Positioned( return !checkIfPrivilegedForChat() ? const SizedBox() : Positioned(
right: 0, right: 0,
top: 0, top: 0,
child: Container( child: Container(
@ -600,7 +601,7 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
} else if (index == 3) { } else if (index == 3) {
Navigator.pushNamed(context, AppRoutes.itemsForSale); Navigator.pushNamed(context, AppRoutes.itemsForSale);
} else if (index == 4) { } else if (index == 4) {
if (!cProvider.disbaleChatForThisUser) { if (!cProvider.disbaleChatForThisUser && checkIfPrivilegedForChat()) {
Navigator.pushNamed(context, AppRoutes.chat); Navigator.pushNamed(context, AppRoutes.chat);
} }
} }
@ -610,6 +611,17 @@ class _DashboardScreenState extends State<DashboardScreen> 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) { void navigateToDetails(OffersListModel offersListModelObj) {
List<OffersListModel> getOffersDetailList = []; List<OffersListModel> getOffersDetailList = [];
getOffersDetailList.clear(); getOffersDetailList.clear();

@ -43,7 +43,7 @@ class _ForgotPasswordScreenState extends State<ForgotPasswordScreen> {
} }
Utils.showLoading(context); Utils.showLoading(context);
try { try {
_basicMemberInformation = await LoginApiClient().getBasicUserInformation("CS", employeeId.text); _basicMemberInformation = await LoginApiClient().getBasicUserInformation("HMG", employeeId.text);
genericResponseModel = await LoginApiClient().sendPublicActivationCode(_basicMemberInformation?.pMOBILENUMBER, employeeId.text); genericResponseModel = await LoginApiClient().sendPublicActivationCode(_basicMemberInformation?.pMOBILENUMBER, employeeId.text);
Utils.hideLoading(context); Utils.hideLoading(context);
OtpDialog( OtpDialog(

@ -189,7 +189,7 @@ class _MyPostedAdsFragmentState extends State<MyPostedAdsFragment> {
request.fields['RegionID'] = employeePostedAds.regionID.toString(); request.fields['RegionID'] = employeePostedAds.regionID.toString();
request.fields['Itg_EndDate'] = employeePostedAds.endDate.toString(); request.fields['Itg_EndDate'] = employeePostedAds.endDate.toString();
request.fields['endDate'] = employeePostedAds.endDate.toString(); request.fields['endDate'] = employeePostedAds.endDate.toString();
request.fields['Channel'] = "31"; request.fields['Channel'] = "33";
request.fields['ItgIsActive'] = "false"; request.fields['ItgIsActive'] = "false";
request.fields['LogInToken'] = loginTokenID!; request.fields['LogInToken'] = loginTokenID!;
request.fields['Token'] = tokenID!; request.fields['Token'] = tokenID!;

Loading…
Cancel
Save