moheem env

merge-requests/189/head
mirza.shafique 3 years ago
parent 4bbc7d81fc
commit 5233154a44

@ -72,11 +72,11 @@ class ApiClient {
if (headers != null && headers.isNotEmpty) { if (headers != null && headers.isNotEmpty) {
_headers.addAll(headers); _headers.addAll(headers);
} }
if (!kReleaseMode) {
print("Url:$url"); print("Url:$url");
var bodyJson = json.encode(jsonObject); var bodyJson = json.encode(jsonObject);
print("body:$bodyJson"); print("body:$bodyJson");
}
var response = await postJsonForResponse(url, jsonObject, token: token, queryParameters: queryParameters, headers: _headers, retryTimes: retryTimes, isFormData: isFormData); var response = await postJsonForResponse(url, jsonObject, token: token, queryParameters: queryParameters, headers: _headers, retryTimes: retryTimes, isFormData: isFormData);
// try { // try {
if (!kReleaseMode) { if (!kReleaseMode) {

@ -88,7 +88,9 @@ class LoginApiClient {
AppState().postParamsObject?.pEmailAddress = responseData.basicMemberInformation!.pEMAILADDRESS; AppState().postParamsObject?.pEmailAddress = responseData.basicMemberInformation!.pEMAILADDRESS;
AppState().postParamsObject?.pSessionId = responseData.pSESSIONID; AppState().postParamsObject?.pSessionId = responseData.pSESSIONID;
AppState().postParamsObject?.pUserName = AppState().getUserName; AppState().postParamsObject?.pUserName = AppState().getUserName;
AppState().postParamsObject?.pSelectedEmployeeNumber = AppState().getUserName; //TODO: employee id changed in SRCA instead of username
// AppState().postParamsObject?.pSelectedEmployeeNumber = AppState().getUserName;
AppState().postParamsObject?.pSelectedEmployeeNumber = responseData.memberInformationList!.first.aSSIGNMENTNUMBER;
AppState().postParamsObject?.setPLegislationCode = responseData.basicMemberInformation!.pLEGISLATIONCODE; AppState().postParamsObject?.setPLegislationCode = responseData.basicMemberInformation!.pLEGISLATIONCODE;
AppState().postParamsObject?.setPayrollCodeStr = responseData.memberInformationList!.first.pAYROLLCODE; AppState().postParamsObject?.setPayrollCodeStr = responseData.memberInformationList!.first.pAYROLLCODE;
AppState().setBusinessCardPrivilege = responseData.businessCardPrivilege ?? false; AppState().setBusinessCardPrivilege = responseData.businessCardPrivilege ?? false;

@ -3,7 +3,7 @@ import 'package:mohem_flutter_app/ui/marathon/widgets/question_card.dart';
class ApiConsts { class ApiConsts {
//static String baseUrl = "http://10.200.204.20:2801/"; // Local server //static String baseUrl = "http://10.200.204.20:2801/"; // Local server
// static String baseUrl = "https://erptstapp.srca.org.sa"; // SRCA server // static String baseUrl = "https://erptstapp.srca.org.sa"; // SRCA server
static String baseUrl = "https://uat.hmgwebservices.com"; // UAT server static String baseUrl = "https://hrmsys.moenergy.gov.sa"; // UAT server
// static String baseUrl = "https://hmgwebservices.com"; // Live server // static String baseUrl = "https://hmgwebservices.com"; // Live server
static String baseUrlServices = baseUrl + "/Services/"; // server static String baseUrlServices = baseUrl + "/Services/"; // server
// static String baseUrlServices = "https://api.cssynapses.com/tangheem/"; // Live server // static String baseUrlServices = "https://api.cssynapses.com/tangheem/"; // Live server

@ -0,0 +1,35 @@
// ignore_for_file: prefer_single_quotes, lines_longer_than_80_chars final
Map<String, dynamic> env = {
"appConfig": "lib/config/config_en.json",
// Worklist (Dynamic ListView, Dynamic Forms, Dynamic Submission)
"login": {
"verification": true,
"verificationMethod": {
"whatsapp": false,
},
"forgetPassword": false
},
"bottomBar": false,
"dashboard": {
"attendance": false,
"worklist": true,
"ticketBalance": false,
"leaveBalance": true,
"missingSwipe": false,
"monthlyAttendance": false,
"vocationRules": false,
},
"marathon": false,
"offersDiscount": false,
"myTeams": false,
"modifiy": false,
"myRequest": false,
"pendingTransactions": false,
"myProfile": false,
"itemsForSale": false,
"chat": false,
"monthlyAttendance": false,
"vocationRules": false,
};

@ -20,11 +20,9 @@ import 'package:provider/single_child_widget.dart';
import 'package:sizer/sizer.dart'; import 'package:sizer/sizer.dart';
Logger logger = Logger( Logger logger = Logger(
// filter: null, // Use the default LogFilter (-> only log in debug mode)
printer: PrettyPrinter( printer: PrettyPrinter(
lineLength: 0, lineLength: 0,
), // Use the PrettyPrinter to format and print log ),
// output: null, // U
); );
class MyHttpOverrides extends HttpOverrides { class MyHttpOverrides extends HttpOverrides {
@ -261,3 +259,4 @@ class MyApp extends StatelessWidget {
// } // }
// } // }

@ -4,6 +4,7 @@ import 'package:flutter/material.dart';
import 'package:mohem_flutter_app/api/dashboard_api_client.dart'; import 'package:mohem_flutter_app/api/dashboard_api_client.dart';
import 'package:mohem_flutter_app/api/offers_and_discounts_api_client.dart'; import 'package:mohem_flutter_app/api/offers_and_discounts_api_client.dart';
import 'package:mohem_flutter_app/classes/utils.dart'; import 'package:mohem_flutter_app/classes/utils.dart';
import 'package:mohem_flutter_app/config/env.dart';
import 'package:mohem_flutter_app/config/routes.dart'; import 'package:mohem_flutter_app/config/routes.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';
@ -229,9 +230,14 @@ class DashboardProviderModel with ChangeNotifier, DiagnosticableTreeMixin {
GenericResponseModel? genericResponseModel = await DashboardApiClient().getGetMenuEntries(); GenericResponseModel? genericResponseModel = await DashboardApiClient().getGetMenuEntries();
getMenuEntriesList = genericResponseModel!.getMenuEntriesList; getMenuEntriesList = genericResponseModel!.getMenuEntriesList;
homeMenus = parseMenus(getMenuEntriesList ?? []); homeMenus = parseMenus(getMenuEntriesList ?? []);
if (homeMenus!.isNotEmpty) { if (homeMenus!.isNotEmpty) {
homeMenus!.first.menuEntiesList.insert(0, GetMenuEntriesList(requestType: "MONTHLY_ATTENDANCE", prompt: LocaleKeys.monthlyAttendance.tr())); if(env["dashboard"]["monthlyAttendance"]) {
homeMenus!.first.menuEntiesList.add(GetMenuEntriesList(requestType: "VACATION_RULE", prompt: LocaleKeys.vacationRule.tr())); homeMenus!.first.menuEntiesList.insert(0, GetMenuEntriesList(requestType: "MONTHLY_ATTENDANCE", prompt: LocaleKeys.monthlyAttendance.tr()));
}
if(env["dashboard"]["vocationRules"]) {
homeMenus!.first.menuEntiesList.add(GetMenuEntriesList(requestType: "VACATION_RULE", prompt: LocaleKeys.vacationRule.tr()));
}
} }
isServicesMenusLoading = false; isServicesMenusLoading = false;
notifyListeners(); notifyListeners();

@ -9,6 +9,7 @@ import 'package:flutter_svg/flutter_svg.dart';
import 'package:mohem_flutter_app/app_state/app_state.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/colors.dart';
import 'package:mohem_flutter_app/classes/utils.dart'; import 'package:mohem_flutter_app/classes/utils.dart';
import 'package:mohem_flutter_app/config/env.dart';
import 'package:mohem_flutter_app/config/routes.dart'; import 'package:mohem_flutter_app/config/routes.dart';
import 'package:mohem_flutter_app/extensions/int_extensions.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/string_extensions.dart';
@ -56,9 +57,12 @@ class _DashboardScreenState extends State<DashboardScreen> {
super.initState(); super.initState();
scheduleMicrotask(() { scheduleMicrotask(() {
data = Provider.of<DashboardProviderModel>(context, listen: false); data = Provider.of<DashboardProviderModel>(context, listen: false);
marathonProvider = Provider.of<MarathonProvider>(context, listen: false); if (env["marathon"]) {
cProvider = Provider.of<ChatProviderModel>(context, listen: false); marathonProvider = Provider.of<MarathonProvider>(context, listen: false);
}
if (env["chat"]) {
cProvider = Provider.of<ChatProviderModel>(context, listen: false);
}
_onRefresh(); _onRefresh();
}); });
} }
@ -80,20 +84,28 @@ class _DashboardScreenState extends State<DashboardScreen> {
void _onRefresh() async { void _onRefresh() async {
data.initProvider(); data.initProvider();
_bHubCon(); if (env["chat"]) {
_bHubCon();
}
// data.getITGNotification().then((value) { // data.getITGNotification().then((value) {
// print("--------------------detail_1-----------------"); // print("--------------------detail_1-----------------");
// print(value!.result!.data!.notificationMasterId); // print(value!.result!.data!.notificationMasterId);
// print(value.result!.data!.notificationTitle); // print(value.result!.data!.notificationTitle);
// }); // });
data.fetchListMenu(); data.fetchListMenu();
data.fetchAttendanceTracking(context); if (env["dashboard"]["attendance"]) {
data.fetchAttendanceTracking(context);
}
data.fetchWorkListCounter(context); data.fetchWorkListCounter(context);
data.fetchMissingSwipe(context); if (env["dashboard"]["missingSwipe"]) {
data.fetchMissingSwipe(context);
}
data.fetchLeaveTicketBalance(context, DateTime.now()); data.fetchLeaveTicketBalance(context, DateTime.now());
data.fetchMenuEntries(); data.fetchMenuEntries();
data.getCategoryOffersListAPI(context); data.getCategoryOffersListAPI(context);
marathonProvider.getMarathonDetailsFromApi(); if (env["marathon"]) {
marathonProvider.getMarathonDetailsFromApi();
}
_refreshController.refreshCompleted(); _refreshController.refreshCompleted();
} }
@ -180,9 +192,11 @@ class _DashboardScreenState extends State<DashboardScreen> {
SvgPicture.asset( SvgPicture.asset(
"assets/images/announcements.svg", "assets/images/announcements.svg",
matchTextDirection: true, matchTextDirection: true,
).onPress(() async { ).onPress(
await Navigator.pushNamed(context, AppRoutes.announcements); () async {
}) await Navigator.pushNamed(context, AppRoutes.announcements);
},
)
], ],
).paddingOnly(left: 21, right: 21, top: 48, bottom: 7), ).paddingOnly(left: 21, right: 21, top: 48, bottom: 7),
Expanded( Expanded(
@ -205,118 +219,124 @@ class _DashboardScreenState extends State<DashboardScreen> {
16.height, 16.height,
Row( Row(
children: [ children: [
Expanded( if (env["dashboard"]["attendance"])
child: AspectRatio( Expanded(
aspectRatio: 159 / 159, child: AspectRatio(
child: Consumer<DashboardProviderModel>( aspectRatio: 159 / 159,
builder: (BuildContext context, DashboardProviderModel model, Widget? child) { child: Consumer<DashboardProviderModel>(
return (model.isAttendanceTrackingLoading builder: (BuildContext context, DashboardProviderModel model, Widget? child) {
? GetAttendanceTrackingShimmer() return (model.isAttendanceTrackingLoading
: Container( ? GetAttendanceTrackingShimmer()
decoration: BoxDecoration( : Container(
borderRadius: BorderRadius.circular(15), decoration: BoxDecoration(
gradient: const LinearGradient(transform: GradientRotation(.46), begin: Alignment.topRight, end: Alignment.bottomLeft, colors: [ borderRadius: BorderRadius.circular(15),
MyColors.gradiantEndColor, gradient: const LinearGradient(
MyColors.gradiantStartColor, transform: GradientRotation(.46),
]), begin: Alignment.topRight,
), end: Alignment.bottomLeft,
child: Stack( colors: [
alignment: Alignment.center, MyColors.gradiantEndColor,
children: [ MyColors.gradiantStartColor,
if (model.isTimeRemainingInSeconds == 0) SvgPicture.asset("assets/images/thumb.svg"), ],
Column( ),
crossAxisAlignment: CrossAxisAlignment.start, ),
children: [ child: Stack(
Expanded( alignment: Alignment.center,
child: Column( children: [
mainAxisSize: MainAxisSize.min, if (model.isTimeRemainingInSeconds == 0) SvgPicture.asset("assets/images/thumb.svg"),
crossAxisAlignment: CrossAxisAlignment.start, Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Expanded(
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
LocaleKeys.markAttendance.tr().toText14(color: Colors.white, isBold: true),
if (model.isTimeRemainingInSeconds == 0) DateTime.now().toString().split(" ")[0].toText12(color: Colors.white),
if (model.isTimeRemainingInSeconds != 0)
Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
9.height,
Directionality(
textDirection: ui.TextDirection.ltr,
child: CountdownTimer(
endTime: model.endTime,
onEnd: null,
endWidget: "00:00:00".toText14(color: Colors.white, isBold: true),
textStyle: const TextStyle(color: Colors.white, fontSize: 14, letterSpacing: -0.48, fontWeight: FontWeight.bold),
),
),
LocaleKeys.timeLeftToday.tr().toText12(color: Colors.white),
9.height,
ClipRRect(
borderRadius: const BorderRadius.all(Radius.circular(20)),
child: LinearProgressIndicator(
value: model.progress,
minHeight: 8,
valueColor: const AlwaysStoppedAnimation<Color>(Colors.white),
backgroundColor: const Color(0xff196D73),
),
),
],
),
],
).paddingOnly(top: 12, right: 15, left: 12),
),
Row(
children: [ children: [
LocaleKeys.markAttendance.tr().toText14(color: Colors.white, isBold: true), Expanded(
if (model.isTimeRemainingInSeconds == 0) DateTime.now().toString().split(" ")[0].toText12(color: Colors.white), child: Column(
if (model.isTimeRemainingInSeconds != 0)
Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
9.height, LocaleKeys.checkIn.tr().toText12(color: Colors.white),
Directionality( (model.attendanceTracking!.pSwipeIn == null ? "--:--" : model.attendanceTracking!.pSwipeIn)
textDirection: ui.TextDirection.ltr, .toString()
child: CountdownTimer( .toText14(color: Colors.white, isBold: true),
endTime: model.endTime, 4.height,
onEnd: null,
endWidget: "00:00:00".toText14(color: Colors.white, isBold: true),
textStyle: const TextStyle(color: Colors.white, fontSize: 14, letterSpacing: -0.48, fontWeight: FontWeight.bold),
),
),
LocaleKeys.timeLeftToday.tr().toText12(color: Colors.white),
9.height,
ClipRRect(
borderRadius: const BorderRadius.all(Radius.circular(20)),
child: LinearProgressIndicator(
value: model.progress,
minHeight: 8,
valueColor: const AlwaysStoppedAnimation<Color>(Colors.white),
backgroundColor: const Color(0xff196D73),
),
),
], ],
).paddingOnly(left: 12, right: 12),
),
Container(
margin: EdgeInsets.only(top: AppState().isArabic(context) ? 6 : 0),
width: 45,
height: 45,
padding: const EdgeInsets.only(left: 10, right: 10),
decoration: BoxDecoration(
color: Color(0xff259EA4),
borderRadius: BorderRadius.only(
bottomRight: AppState().isArabic(context) ? Radius.circular(0) : Radius.circular(15),
bottomLeft: AppState().isArabic(context) ? Radius.circular(15) : Radius.circular(0),
),
), ),
child: SvgPicture.asset(model.isTimeRemainingInSeconds == 0 ? "assets/images/attendance.svg" : "assets/images/attendance.svg"),
).onPress(() {
showMyBottomSheet(
context,
callBackFunc: () {},
child: MarkAttendanceWidget(model, isFromDashboard: true),
);
}),
], ],
).paddingOnly(top: 12, right: 15, left: 12), ),
), ],
Row( ),
children: [ ],
Expanded( ),
child: Column( ).onPress(
mainAxisSize: MainAxisSize.min, () {
crossAxisAlignment: CrossAxisAlignment.start, Navigator.pushNamed(context, AppRoutes.todayAttendance);
children: [ },
LocaleKeys.checkIn.tr().toText12(color: Colors.white), ))
(model.attendanceTracking!.pSwipeIn == null ? "--:--" : model.attendanceTracking!.pSwipeIn) .animatedSwither();
.toString() },
.toText14(color: Colors.white, isBold: true), ),
4.height,
],
).paddingOnly(left: 12, right: 12),
),
Container(
margin: EdgeInsets.only(top: AppState().isArabic(context) ? 6 : 0),
width: 45,
height: 45,
padding: const EdgeInsets.only(left: 10, right: 10),
decoration: BoxDecoration(
color: Color(0xff259EA4),
borderRadius: BorderRadius.only(
bottomRight: AppState().isArabic(context) ? Radius.circular(0) : Radius.circular(15),
bottomLeft: AppState().isArabic(context) ? Radius.circular(15) : Radius.circular(0),
),
),
child: SvgPicture.asset(model.isTimeRemainingInSeconds == 0 ? "assets/images/attendance.svg" : "assets/images/attendance.svg"),
).onPress(() {
showMyBottomSheet(
context,
callBackFunc: () {},
child: MarkAttendanceWidget(model, isFromDashboard: true),
);
}),
],
),
],
),
],
),
).onPress(
() {
Navigator.pushNamed(context, AppRoutes.todayAttendance);
},
))
.animatedSwither();
},
), ),
), ),
), if (env["dashboard"]["attendance"]) 9.width,
9.width,
Expanded( Expanded(
child: MenusWidget(), child: MenusWidget(),
), ),
@ -324,116 +344,118 @@ class _DashboardScreenState extends State<DashboardScreen> {
), ),
], ],
).paddingOnly(left: 21, right: 21, top: 7), ).paddingOnly(left: 21, right: 21, top: 7),
context.watch<MarathonProvider>().isLoading if (env["marathon"])
? const MarathonBannerShimmer().paddingAll(20) context.watch<MarathonProvider>().isLoading
: MarathonBanner(isMarathonUpcoming: context.watch<MarathonProvider>().isUpComingMarathon).paddingAll(20), ? const MarathonBannerShimmer().paddingAll(20)
: MarathonBanner(isMarathonUpcoming: context.watch<MarathonProvider>().isUpComingMarathon).paddingAll(20),
ServicesWidget(), ServicesWidget(),
8.height, 8.height,
Container( if (env["offersDiscount"])
width: double.infinity, Container(
padding: const EdgeInsets.only(top: 31), width: double.infinity,
decoration: BoxDecoration( padding: const EdgeInsets.only(top: 31),
color: Colors.white, decoration: BoxDecoration(
borderRadius: const BorderRadius.only(topRight: Radius.circular(50), topLeft: Radius.circular(50)), color: Colors.white,
border: Border.all(color: MyColors.lightGreyEDColor, width: 1), borderRadius: const BorderRadius.only(topRight: Radius.circular(50), topLeft: Radius.circular(50)),
), border: Border.all(color: MyColors.lightGreyEDColor, width: 1),
child: Column( ),
mainAxisSize: MainAxisSize.min, child: Column(
crossAxisAlignment: CrossAxisAlignment.start, mainAxisSize: MainAxisSize.min,
children: [ crossAxisAlignment: CrossAxisAlignment.start,
Row( children: [
crossAxisAlignment: CrossAxisAlignment.center, Row(
children: [ crossAxisAlignment: CrossAxisAlignment.center,
Expanded( children: [
child: Column( Expanded(
crossAxisAlignment: CrossAxisAlignment.start, child: Column(
mainAxisSize: MainAxisSize.min, crossAxisAlignment: CrossAxisAlignment.start,
children: [ mainAxisSize: MainAxisSize.min,
LocaleKeys.offers.tr().toText12(), children: [
Row( LocaleKeys.offers.tr().toText12(),
children: [ Row(
LocaleKeys.discounts.tr().toText24(isBold: true), children: [
6.width, LocaleKeys.discounts.tr().toText24(isBold: true),
Container( 6.width,
padding: const EdgeInsets.only(left: 8, right: 8), Container(
decoration: BoxDecoration( padding: const EdgeInsets.only(left: 8, right: 8),
color: MyColors.yellowColor, decoration: BoxDecoration(
borderRadius: BorderRadius.circular(10), color: MyColors.yellowColor,
), borderRadius: BorderRadius.circular(10),
child: LocaleKeys.newString.tr().toText10(isBold: true)), ),
], child: LocaleKeys.newString.tr().toText10(isBold: true)),
), ],
], ),
],
),
), ),
), LocaleKeys.viewAllOffers.tr().toText12(isUnderLine: true).onPress(() {
LocaleKeys.viewAllOffers.tr().toText12(isUnderLine: true).onPress(() { Navigator.pushNamed(context, AppRoutes.offersAndDiscounts);
Navigator.pushNamed(context, AppRoutes.offersAndDiscounts); })
}) ],
], ).paddingOnly(left: 21, right: 21),
).paddingOnly(left: 21, right: 21), Consumer<DashboardProviderModel>(
Consumer<DashboardProviderModel>( builder: (BuildContext context, DashboardProviderModel model, Widget? child) {
builder: (BuildContext context, DashboardProviderModel model, Widget? child) { return SizedBox(
return SizedBox( height: 103 + 33,
height: 103 + 33, child: ListView.separated(
child: ListView.separated( shrinkWrap: true,
shrinkWrap: true, physics: const BouncingScrollPhysics(),
physics: const BouncingScrollPhysics(), padding: const EdgeInsets.only(left: 21, right: 21, top: 13),
padding: const EdgeInsets.only(left: 21, right: 21, top: 13), scrollDirection: Axis.horizontal,
scrollDirection: Axis.horizontal, itemBuilder: (BuildContext cxt, int index) {
itemBuilder: (BuildContext cxt, int index) { return model.isOffersLoading
return model.isOffersLoading ? const OffersShimmerWidget()
? const OffersShimmerWidget() : InkWell(
: InkWell( onTap: () {
onTap: () { navigateToDetails(data.getOffersList[index]);
navigateToDetails(data.getOffersList[index]); },
}, child: SizedBox(
child: SizedBox( width: 73,
width: 73, child: Column(
child: Column( crossAxisAlignment: CrossAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center, children: [
children: [ Container(
Container( width: 73,
width: 73, height: 73,
height: 73, decoration: BoxDecoration(
decoration: BoxDecoration( borderRadius: const BorderRadius.all(
borderRadius: const BorderRadius.all( Radius.circular(100),
Radius.circular(100), ),
), border: Border.all(color: MyColors.lightGreyE3Color, width: 1),
border: Border.all(color: MyColors.lightGreyE3Color, width: 1),
),
child: ClipRRect(
borderRadius: const BorderRadius.all(
Radius.circular(50),
), ),
child: Hero( child: ClipRRect(
tag: "ItemImage" + data.getOffersList[index].rowID!, borderRadius: const BorderRadius.all(
transitionOnUserGestures: true, Radius.circular(50),
child: Image.network( ),
data.getOffersList[index].bannerImage!, child: Hero(
fit: BoxFit.contain, tag: "ItemImage" + data.getOffersList[index].rowID!,
transitionOnUserGestures: true,
child: Image.network(
data.getOffersList[index].bannerImage!,
fit: BoxFit.contain,
),
), ),
), ),
), ),
), 4.height,
4.height, Expanded(
Expanded( child: AppState().isArabic(context)
child: AppState().isArabic(context) ? data.getOffersList[index].titleAR!.toText12(isCenter: true, maxLine: 1)
? data.getOffersList[index].titleAR!.toText12(isCenter: true, maxLine: 1) : data.getOffersList[index].title!.toText12(isCenter: true, maxLine: 1),
: data.getOffersList[index].title!.toText12(isCenter: true, maxLine: 1), ),
), ],
], ),
), ),
), );
); },
}, separatorBuilder: (BuildContext cxt, int index) => 8.width,
separatorBuilder: (BuildContext cxt, int index) => 8.width, itemCount: 6),
itemCount: 6), );
); },
}, ),
), ],
], ),
), )
)
], ],
), ),
), ),
@ -444,108 +466,110 @@ class _DashboardScreenState extends State<DashboardScreen> {
drawer: SafeArea( drawer: SafeArea(
child: AppDrawer(onLanguageChange: _onRefresh), child: AppDrawer(onLanguageChange: _onRefresh),
), ),
bottomNavigationBar: SizedBox( bottomNavigationBar: !env["bottomBar"]
height: Platform.isAndroid ? 70 : 100, ? null
child: BottomNavigationBar( : SizedBox(
items: <BottomNavigationBarItem>[ height: Platform.isAndroid ? 70 : 100,
BottomNavigationBarItem( child: BottomNavigationBar(
icon: SvgPicture.asset( items: <BottomNavigationBarItem>[
"assets/icons/home.svg", BottomNavigationBarItem(
color: currentIndex == 0 ? MyColors.grey3AColor : MyColors.grey98Color, icon: SvgPicture.asset(
).paddingAll(4), "assets/icons/home.svg",
label: LocaleKeys.home.tr(), color: currentIndex == 0 ? MyColors.grey3AColor : MyColors.grey98Color,
), ).paddingAll(4),
BottomNavigationBarItem( label: LocaleKeys.home.tr(),
icon: SvgPicture.asset( ),
"assets/icons/create_req.svg", BottomNavigationBarItem(
color: currentIndex == 1 ? MyColors.grey3AColor : MyColors.grey98Color, icon: SvgPicture.asset(
).paddingAll(4), "assets/icons/create_req.svg",
label: LocaleKeys.createRequest.tr(), color: currentIndex == 1 ? MyColors.grey3AColor : MyColors.grey98Color,
), ).paddingAll(4),
BottomNavigationBarItem( label: LocaleKeys.createRequest.tr(),
icon: Stack( ),
alignment: Alignment.centerLeft, BottomNavigationBarItem(
children: [ icon: Stack(
SvgPicture.asset( alignment: Alignment.centerLeft,
"assets/icons/work_list.svg", children: [
color: currentIndex == 2 ? MyColors.grey3AColor : MyColors.grey98Color, SvgPicture.asset(
).paddingAll(4), "assets/icons/work_list.svg",
Consumer<DashboardProviderModel>( color: currentIndex == 2 ? MyColors.grey3AColor : MyColors.grey98Color,
builder: (BuildContext cxt, DashboardProviderModel data, Widget? child) { ).paddingAll(4),
if (data.workListCounter == 0) { Consumer<DashboardProviderModel>(
return const SizedBox(); builder: (BuildContext cxt, DashboardProviderModel data, Widget? child) {
} if (data.workListCounter == 0) {
return Positioned( return const SizedBox();
right: 0, }
top: 0, return Positioned(
child: Container( right: 0,
padding: const EdgeInsets.only(left: 4, right: 4), top: 0,
alignment: Alignment.center, child: Container(
decoration: BoxDecoration(color: MyColors.redColor, borderRadius: BorderRadius.circular(17)), padding: const EdgeInsets.only(left: 4, right: 4),
child: data.workListCounter.toString().toText10(color: Colors.white), alignment: Alignment.center,
decoration: BoxDecoration(color: MyColors.redColor, borderRadius: BorderRadius.circular(17)),
child: data.workListCounter.toString().toText10(color: Colors.white),
),
);
},
), ),
); ],
}, ),
label: LocaleKeys.workList.tr(),
), ),
], BottomNavigationBarItem(
), icon: SvgPicture.asset(
label: LocaleKeys.workList.tr(), "assets/icons/item_for_sale.svg",
), color: currentIndex == 3 ? MyColors.grey3AColor : MyColors.grey98Color,
BottomNavigationBarItem( ).paddingAll(4),
icon: SvgPicture.asset( label: LocaleKeys.itemsForSale.tr(),
"assets/icons/item_for_sale.svg", ),
color: currentIndex == 3 ? MyColors.grey3AColor : MyColors.grey98Color, BottomNavigationBarItem(
).paddingAll(4), icon: Stack(
label: LocaleKeys.itemsForSale.tr(), alignment: Alignment.centerLeft,
), children: [
BottomNavigationBarItem( SvgPicture.asset(
icon: Stack( "assets/icons/chat/chat.svg",
alignment: Alignment.centerLeft, color: currentIndex == 4 ? MyColors.grey3AColor : MyColors.grey98Color,
children: [ ).paddingAll(4),
SvgPicture.asset( Consumer<ChatProviderModel>(
"assets/icons/chat/chat.svg", builder: (BuildContext cxt, ChatProviderModel data, Widget? child) {
color: currentIndex == 4 ? MyColors.grey3AColor : MyColors.grey98Color, return Positioned(
).paddingAll(4), right: 0,
Consumer<ChatProviderModel>( top: 0,
builder: (BuildContext cxt, ChatProviderModel data, Widget? child) { child: Container(
return Positioned( padding: const EdgeInsets.only(left: 4, right: 4),
right: 0, alignment: Alignment.center,
top: 0, decoration: BoxDecoration(color: MyColors.redColor, borderRadius: BorderRadius.circular(17)),
child: Container( child: data.chatUConvCounter.toString().toText10(color: Colors.white),
padding: const EdgeInsets.only(left: 4, right: 4), ),
alignment: Alignment.center, );
decoration: BoxDecoration(color: MyColors.redColor, borderRadius: BorderRadius.circular(17)), },
child: data.chatUConvCounter.toString().toText10(color: Colors.white),
), ),
); ],
}, ),
label: LocaleKeys.chat.tr(),
), ),
], ],
currentIndex: currentIndex,
selectedLabelStyle: const TextStyle(fontSize: 10, color: MyColors.grey3AColor, fontWeight: FontWeight.w600),
unselectedLabelStyle: const TextStyle(fontSize: 10, color: MyColors.grey98Color, fontWeight: FontWeight.w600),
type: BottomNavigationBarType.fixed,
selectedItemColor: MyColors.grey3AColor,
backgroundColor: MyColors.backgroundColor,
selectedIconTheme: const IconThemeData(color: MyColors.grey3AColor, size: 28),
unselectedIconTheme: const IconThemeData(color: MyColors.grey98Color, size: 28),
onTap: (int index) {
if (index == 1) {
Navigator.pushNamed(context, AppRoutes.mowadhafhi);
} else if (index == 2) {
Navigator.pushNamed(context, AppRoutes.workList);
} else if (index == 3) {
Navigator.pushNamed(context, AppRoutes.itemsForSale);
} else if (index == 4) {
Navigator.pushNamed(context, AppRoutes.chat);
}
},
), ),
label: LocaleKeys.chat.tr(),
), ),
],
currentIndex: currentIndex,
selectedLabelStyle: const TextStyle(fontSize: 10, color: MyColors.grey3AColor, fontWeight: FontWeight.w600),
unselectedLabelStyle: const TextStyle(fontSize: 10, color: MyColors.grey98Color, fontWeight: FontWeight.w600),
type: BottomNavigationBarType.fixed,
selectedItemColor: MyColors.grey3AColor,
backgroundColor: MyColors.backgroundColor,
selectedIconTheme: const IconThemeData(color: MyColors.grey3AColor, size: 28),
unselectedIconTheme: const IconThemeData(color: MyColors.grey98Color, size: 28),
onTap: (int index) {
if (index == 1) {
Navigator.pushNamed(context, AppRoutes.mowadhafhi);
} else if (index == 2) {
Navigator.pushNamed(context, AppRoutes.workList);
} else if (index == 3) {
Navigator.pushNamed(context, AppRoutes.itemsForSale);
} else if (index == 4) {
Navigator.pushNamed(context, AppRoutes.chat);
}
},
),
),
); );
} }
@ -556,14 +580,14 @@ class _DashboardScreenState extends State<DashboardScreen> {
getOffersDetailList.add(offersListModelObj); getOffersDetailList.add(offersListModelObj);
data.getOffersList.forEach((OffersListModel element) { for (OffersListModel element in data.getOffersList) {
if (counter <= 4) { if (counter <= 4) {
if (element.rowID != offersListModelObj.rowID) { if (element.rowID != offersListModelObj.rowID) {
getOffersDetailList.add(element); getOffersDetailList.add(element);
counter++; counter++;
} }
} }
}); }
Navigator.pushNamed(context, AppRoutes.offersAndDiscountsDetails, arguments: getOffersDetailList); Navigator.pushNamed(context, AppRoutes.offersAndDiscountsDetails, arguments: getOffersDetailList);
} }

@ -2,6 +2,7 @@ import 'package:easy_localization/src/public_ext.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart'; import 'package:flutter_svg/svg.dart';
import 'package:mohem_flutter_app/app_state/app_state.dart'; import 'package:mohem_flutter_app/app_state/app_state.dart';
import 'package:mohem_flutter_app/config/env.dart';
import 'package:mohem_flutter_app/config/routes.dart'; import 'package:mohem_flutter_app/config/routes.dart';
import 'package:mohem_flutter_app/extensions/string_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/extensions/widget_extensions.dart';
@ -52,6 +53,7 @@ class MenusWidget extends StatelessWidget {
).onPress(() { ).onPress(() {
Navigator.pushNamed(context, AppRoutes.workList); Navigator.pushNamed(context, AppRoutes.workList);
}), }),
if(env["dashboard"]["missingSwipe"])
data.isMissingSwipeLoading data.isMissingSwipeLoading
? MenuShimmer().onPress(() { ? MenuShimmer().onPress(() {
data.fetchWorkListCounter(context); data.fetchWorkListCounter(context);
@ -106,6 +108,7 @@ class MenusWidget extends StatelessWidget {
).onPress(() { ).onPress(() {
Navigator.pushNamed(context, AppRoutes.leaveBalance); Navigator.pushNamed(context, AppRoutes.leaveBalance);
}), }),
if(env["dashboard"]["ticketBalance"])
data.isLeaveTicketBalanceLoading data.isLeaveTicketBalanceLoading
? MenuShimmer().onPress(() { ? MenuShimmer().onPress(() {
data.fetchWorkListCounter(context); data.fetchWorkListCounter(context);

@ -30,7 +30,7 @@ class ServicesWidget extends StatelessWidget {
]; ];
return Consumer<DashboardProviderModel>( return Consumer<DashboardProviderModel>(
builder: (context, data, child) { builder: (BuildContext context, DashboardProviderModel data, Widget? child) {
return data.isServicesMenusLoading return data.isServicesMenusLoading
? whileLoading() ? whileLoading()
: ListView.separated( : ListView.separated(

@ -13,6 +13,7 @@ import 'package:mohem_flutter_app/app_state/app_state.dart';
import 'package:mohem_flutter_app/classes/colors.dart'; import 'package:mohem_flutter_app/classes/colors.dart';
import 'package:mohem_flutter_app/classes/consts.dart'; import 'package:mohem_flutter_app/classes/consts.dart';
import 'package:mohem_flutter_app/classes/utils.dart'; import 'package:mohem_flutter_app/classes/utils.dart';
import 'package:mohem_flutter_app/config/env.dart';
import 'package:mohem_flutter_app/config/routes.dart'; import 'package:mohem_flutter_app/config/routes.dart';
import 'package:mohem_flutter_app/extensions/int_extensions.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/string_extensions.dart';
@ -161,8 +162,12 @@ class _LoginScreenState extends State<LoginScreen> {
// username.text = "15153"; // Tamer User // username.text = "15153"; // Tamer User
// password.text = "Abcd@1234"; // password.text = "Abcd@1234";
// username.text = "206535"; // Hashim User
// password.text = "Namira786"; username.text = "SRCA4779T"; // Hashim User
password.text = "a12345";
username.text = "SRCA04101"; // Hashim User
password.text = "a123456";
} }
if (isAppOpenBySystem!) checkFirebaseToken(); if (isAppOpenBySystem!) checkFirebaseToken();
} }
@ -213,12 +218,13 @@ class _LoginScreenState extends State<LoginScreen> {
12.height, 12.height,
InputWidget(LocaleKeys.password.tr(), "xxxxxx", password, isTextIsPassword: true), InputWidget(LocaleKeys.password.tr(), "xxxxxx", password, isTextIsPassword: true),
9.height, 9.height,
Align( if (env["login"]["forgetPassword"])
alignment: Alignment.centerRight, Align(
child: LocaleKeys.forgotPassword.tr().toText12(isUnderLine: true, color: MyColors.textMixColor).onPress(() { alignment: Alignment.centerRight,
Navigator.pushNamed(context, AppRoutes.forgotPassword); child: LocaleKeys.forgotPassword.tr().toText12(isUnderLine: true, color: MyColors.textMixColor).onPress(() {
}), Navigator.pushNamed(context, AppRoutes.forgotPassword);
), }),
),
], ],
), ),
) )

@ -11,6 +11,7 @@ import 'package:mohem_flutter_app/app_state/app_state.dart';
import 'package:mohem_flutter_app/classes/colors.dart'; import 'package:mohem_flutter_app/classes/colors.dart';
import 'package:mohem_flutter_app/classes/consts.dart'; import 'package:mohem_flutter_app/classes/consts.dart';
import 'package:mohem_flutter_app/classes/utils.dart'; import 'package:mohem_flutter_app/classes/utils.dart';
import 'package:mohem_flutter_app/config/env.dart';
import 'package:mohem_flutter_app/config/routes.dart'; import 'package:mohem_flutter_app/config/routes.dart';
import 'package:mohem_flutter_app/dialogs/otp_dialog.dart'; import 'package:mohem_flutter_app/dialogs/otp_dialog.dart';
import 'package:mohem_flutter_app/extensions/int_extensions.dart'; import 'package:mohem_flutter_app/extensions/int_extensions.dart';
@ -78,7 +79,7 @@ class _VerifyLoginScreenState extends State<VerifyLoginScreen> {
children: [ children: [
if (!isNeedVerifyWithFaceIDAndBiometrics) getButton(3), if (!isNeedVerifyWithFaceIDAndBiometrics) getButton(3),
if (!isNeedVerifyWithFaceIDAndBiometrics) getButton(4), if (!isNeedVerifyWithFaceIDAndBiometrics) getButton(4),
getButton(2), if (env["login"]["verificationMethod"]["whatsapp"]) getButton(2),
getButton(1), getButton(1),
], ],
) )
@ -572,7 +573,7 @@ class _VerifyLoginScreenState extends State<VerifyLoginScreen> {
width: 38, width: 38,
color: isDisable ? MyColors.darkTextColor.withOpacity(0.7) : null, color: isDisable ? MyColors.darkTextColor.withOpacity(0.7) : null,
), ),
_title.toText16(height: 20/16) _title.toText16(height: 20 / 16)
], ],
), ),
), ),

Loading…
Cancel
Save