Merge branch 'master' into Fatima

merge-requests/1/merge
Fatimah Alshammari 3 years ago
commit 6a1f655b1f

@ -268,6 +268,10 @@
"summaryOfInformation": "ملخص المعلومات", "summaryOfInformation": "ملخص المعلومات",
"totalPayAmount": "المبلغ الإجمالي للدفع", "totalPayAmount": "المبلغ الإجمالي للدفع",
"paymentInformation": "معلومات الدفع", "paymentInformation": "معلومات الدفع",
"performance": "تقييم الاداء",
"performanceEvaluation": "تقييم الأداء في",
"performanceEvaluationIn": "تقييم أدائك في",
"valuationIn": "تقييم الأداء في",
"amount": "مقدار", "amount": "مقدار",
"correctCurrentDatails": "تعديل او اكمال التفاصيل الحالية", "correctCurrentDatails": "تعديل او اكمال التفاصيل الحالية",
"selectType": " حدد نوع التغيير الذي تريد القيام به", "selectType": " حدد نوع التغيير الذي تريد القيام به",
@ -313,7 +317,6 @@
"employeeDigitalID": "هويةالموظف الرقمية", "employeeDigitalID": "هويةالموظف الرقمية",
"businessCard": "بطاقة العمل", "businessCard": "بطاقة العمل",
"viewBusinessCard": "عرض بطاقة العمل", "viewBusinessCard": "عرض بطاقة العمل",
"performanceEvaluation": "تقييم الأداء",
"logout": "تسجيل خروج", "logout": "تسجيل خروج",
"checkOut": "وقت الخروج", "checkOut": "وقت الخروج",
"regular": "منتظم", "regular": "منتظم",
@ -363,6 +366,27 @@
"numberDays": "عدد الأيام", "numberDays": "عدد الأيام",
"poweredBy": "مشغل بواسطة", "poweredBy": "مشغل بواسطة",
"cloudSolutions": "حلول السحابة", "cloudSolutions": "حلول السحابة",
"selectTemplate": "حدد قالب",
"myPostedAds": "إعلاناتي المنشورة",
"browseCategories": "تصفح الفئات",
"searchItems": "عناصر البحث",
"offerAndDiscounts": "العروض والخصومات",
"offerValid": "العرض صالح",
"offerExpired": "انتهى العرض",
"whatAreYouOffering": "ما الذي تعرضه؟",
"selectCategory": "اختر الفئة",
"inProgress": "في تَقَدم",
"locked": "مقفل",
"addDetails": "أضف التفاصيل",
"reviewAndSell": "مراجعة وبيع",
"itemTitle": "عنوان البند",
"itemCondition": "حالة السلعة",
"used": "تستخدم",
"region": "منطقة",
"selectRegion": "اختر المنطقة",
"itemPrice": "سعر السلعة",
"itemPhotos": "صور البند",
"itemInfo": "معلومات العنصر",
"profile": { "profile": {
"reset_password": { "reset_password": {
"label": "Reset Password", "label": "Reset Password",

@ -312,12 +312,15 @@
"wantToReject": "Are you sure want to reject?", "wantToReject": "Are you sure want to reject?",
"employeeDigitalID": "Employee Digital ID", "employeeDigitalID": "Employee Digital ID",
"businessCard": "Business Card", "businessCard": "Business Card",
"viewBusinessCard": "View Business Card",
"performanceEvaluation": "Performance Evaluation",
"logout": "Logout",
"checkOut": "Check Out", "checkOut": "Check Out",
"regular": "Regular", "regular": "Regular",
"mark": "Mark", "mark": "Mark",
"performance": "Performance Evaluation",
"performanceEvaluationIn": "Your performance Evaluation in",
"valuationIn": "Performance Evaluation in",
"viewBusinessCard": "View Business Card",
"performanceEvaluation": "Performance Evaluation",
"logout": "Logout",
"selectMethodOfAttendance": "Select the method to mark the attendance", "selectMethodOfAttendance": "Select the method to mark the attendance",
"comeNearHMGWifi": "Please come near to HMG wifi", "comeNearHMGWifi": "Please come near to HMG wifi",
"deliverNotificationToMeRegardless": "Deliver notifications to me regardless of any general rules", "deliverNotificationToMeRegardless": "Deliver notifications to me regardless of any general rules",
@ -363,6 +366,27 @@
"cloudSolutions": "Cloud Solutions", "cloudSolutions": "Cloud Solutions",
"subordinateLeave": "Subordinate Leave", "subordinateLeave": "Subordinate Leave",
"numberDays": "Number of days", "numberDays": "Number of days",
"selectTemplate": "Select Template",
"myPostedAds": "My posted ads",
"browseCategories": "Browse Categories",
"searchItems": "Search Items",
"offerAndDiscounts": "Offer & Discounts",
"offerValid": "Offer Valid",
"offerExpired": "Offer Expired",
"whatAreYouOffering": "What are you offering?",
"selectCategory": "Select Category",
"inProgress": "InProgress",
"locked": "Locked",
"addDetails": "Add Details",
"reviewAndSell": "Review & Sell",
"itemTitle": "Item Title",
"itemCondition": "Item Condition",
"used": "Used",
"region": "Region",
"selectRegion": "Select Region",
"itemPrice": "Item Price",
"itemPhotos": "Item Photos",
"itemInfo": "Item Info",
"profile": { "profile": {
"reset_password": { "reset_password": {
"label": "Reset Password", "label": "Reset Password",

@ -1,5 +1,6 @@
import 'dart:async'; import 'dart:async';
import 'package:mohem_flutter_app/api/api_client.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/consts.dart'; import 'package:mohem_flutter_app/classes/consts.dart';
import 'package:mohem_flutter_app/models/generic_response_model.dart'; import 'package:mohem_flutter_app/models/generic_response_model.dart';
@ -10,21 +11,18 @@ import 'package:mohem_flutter_app/models/get_employee_address_model.dart';
import 'package:mohem_flutter_app/models/get_employee_basic_details.model.dart'; import 'package:mohem_flutter_app/models/get_employee_basic_details.model.dart';
import 'package:mohem_flutter_app/models/get_employee_contacts.model.dart'; import 'package:mohem_flutter_app/models/get_employee_contacts.model.dart';
import 'package:mohem_flutter_app/models/get_employee_phones_model.dart'; import 'package:mohem_flutter_app/models/get_employee_phones_model.dart';
import 'package:mohem_flutter_app/models/performance.dart';
import 'package:mohem_flutter_app/models/profile/basic_details_dff_structure.dart';
import 'package:mohem_flutter_app/models/profile/get_contact_clos_structure_list.dart';
import 'package:mohem_flutter_app/models/profile/get_contact_details_list.dart';
import 'package:mohem_flutter_app/models/profile/get_countries_list_model.dart'; import 'package:mohem_flutter_app/models/profile/get_countries_list_model.dart';
import 'package:mohem_flutter_app/models/profile/phone_number_types_model.dart'; import 'package:mohem_flutter_app/models/profile/phone_number_types_model.dart';
import 'package:mohem_flutter_app/models/profile/start_address_approval_process_model.dart'; import 'package:mohem_flutter_app/models/profile/start_address_approval_process_model.dart';
import 'package:mohem_flutter_app/models/profile/submit_address_transaction.dart'; import 'package:mohem_flutter_app/models/profile/submit_address_transaction.dart';
import 'package:mohem_flutter_app/models/profile/basic_details_dff_structure.dart';
import 'package:mohem_flutter_app/models/profile/get_contact_clos_structure_list.dart';
import 'package:mohem_flutter_app/models/profile/get_contact_details_list.dart';
import 'package:mohem_flutter_app/models/profile/submit_basic_details_transaction_model.dart'; import 'package:mohem_flutter_app/models/profile/submit_basic_details_transaction_model.dart';
import 'package:mohem_flutter_app/models/profile/submit_contact_transaction_list_model.dart'; import 'package:mohem_flutter_app/models/profile/submit_contact_transaction_list_model.dart';
import 'package:mohem_flutter_app/models/profile/submit_phone_transactions.dart'; import 'package:mohem_flutter_app/models/profile/submit_phone_transactions.dart';
import 'package:mohem_flutter_app/models/start_phone_approval_process_model.dart'; import 'package:mohem_flutter_app/models/start_phone_approval_process_model.dart';
import 'package:mohem_flutter_app/models/profile/submit_contact_transaction_list_model.dart';
import 'package:mohem_flutter_app/models/profile/submit_phone_transactions.dart';
import 'package:mohem_flutter_app/models/start_eit_approval_process_model.dart';
import 'package:mohem_flutter_app/api/api_client.dart';
class ProfileApiClient { class ProfileApiClient {
static final ProfileApiClient _instance = ProfileApiClient._internal(); static final ProfileApiClient _instance = ProfileApiClient._internal();
@ -379,7 +377,7 @@ class ProfileApiClient {
}, url, postParams); }, url, postParams);
} }
Future<SubmitContactTransactionList?> submetConatctTransactionAddAndUpdate(String actionType, int relationId, List<Map<String, dynamic>> list) async { Future<SubmitContactTransactionList?> submitContactTransactionAddAndUpdate(String actionType, int relationId, List<Map<String, dynamic>> list) async {
String url = "${ApiConsts.erpRest}SUBMIT_CONTACT_TRANSACTION"; String url = "${ApiConsts.erpRest}SUBMIT_CONTACT_TRANSACTION";
Map<String, dynamic> postParams = { Map<String, dynamic> postParams = {
"P_MENU_TYPE": "E", "P_MENU_TYPE": "E",
@ -395,4 +393,15 @@ class ProfileApiClient {
return responseData.submitContactTransactionList; return responseData.submitContactTransactionList;
}, url, postParams); }, url, postParams);
} }
Future<List<GetPerformanceAppraisalList>> getPerformanceAppraisal() async {
String url = "${ApiConsts.erpRest}GET_Performance_Appraisal";
Map<String, dynamic> postParams = {};
postParams.addAll(AppState().postParamsJson);
return await ApiClient().postJsonForObject((json) {
GenericResponseModel? responseData = GenericResponseModel.fromJson(json);
return responseData.getPerformanceAppraisalList ?? [];
}, url, postParams);
}
} }

@ -18,6 +18,8 @@ class MyColors {
static const Color grey98Color = Color(0xff989898); static const Color grey98Color = Color(0xff989898);
static const Color lightGreyEFColor = Color(0xffEFEFEF); static const Color lightGreyEFColor = Color(0xffEFEFEF);
static const Color lightGreyEDColor = Color(0xffEDEDED); static const Color lightGreyEDColor = Color(0xffEDEDED);
static const Color lightGreyDeColor = Color(0xffDEDEDE);
static const Color lightGreyE3Color = Color(0xffE3E3E3);
static const Color lightGreyE6Color = Color(0xffE6E6E6); static const Color lightGreyE6Color = Color(0xffE6E6E6);
static const Color lightGreyEAColor = Color(0xffEAEAEA); static const Color lightGreyEAColor = Color(0xffEAEAEA);
static const Color darkWhiteColor = Color(0xffE0E0E0); static const Color darkWhiteColor = Color(0xffE0E0E0);
@ -28,7 +30,6 @@ class MyColors {
static const Color backgroundBlackColor = Color(0xff202529); static const Color backgroundBlackColor = Color(0xff202529);
static const Color black = Color(0xff000000); static const Color black = Color(0xff000000);
static const Color white = Color(0xffffffff); static const Color white = Color(0xffffffff);
static const Color green = Color(0xffffffff);
static const Color borderColor = Color(0xffE8E8E8); static const Color borderColor = Color(0xffE8E8E8);
static const Color borderE3Color = Color(0xffE3E3E3); static const Color borderE3Color = Color(0xffE3E3E3);
static const Color borderCEColor = Color(0xffCECECE); static const Color borderCEColor = Color(0xffCECECE);

@ -25,6 +25,7 @@ import 'package:mohem_flutter_app/ui/my_team/subordinate_leave.dart';
import 'package:mohem_flutter_app/ui/my_team/team_members.dart'; import 'package:mohem_flutter_app/ui/my_team/team_members.dart';
import 'package:mohem_flutter_app/ui/my_team/view_attendance.dart'; import 'package:mohem_flutter_app/ui/my_team/view_attendance.dart';
import 'package:mohem_flutter_app/ui/payslip/monthly_pay_slip_screen.dart'; import 'package:mohem_flutter_app/ui/payslip/monthly_pay_slip_screen.dart';
import 'package:mohem_flutter_app/ui/performance/performance_appraisal_screen.dart';
import 'package:mohem_flutter_app/ui/profile/add_update_family_member.dart'; import 'package:mohem_flutter_app/ui/profile/add_update_family_member.dart';
import 'package:mohem_flutter_app/ui/profile/basic_details.dart'; import 'package:mohem_flutter_app/ui/profile/basic_details.dart';
import 'package:mohem_flutter_app/ui/profile/contact_details.dart'; import 'package:mohem_flutter_app/ui/profile/contact_details.dart';
@ -144,6 +145,9 @@ class AppRoutes {
//Pay slip //Pay slip
static const String monthlyPaySlip = "/monthlyPaySlip"; static const String monthlyPaySlip = "/monthlyPaySlip";
//performance evaluation
static const String performanceEvaluation = "/performanceEvaluation";
//My Team //My Team
static const String myTeam = "/myTeam"; static const String myTeam = "/myTeam";
static const String employeeDetails = "/employeeDetails"; static const String employeeDetails = "/employeeDetails";
@ -153,7 +157,6 @@ class AppRoutes {
static const String createRequest = "/createRequest"; static const String createRequest = "/createRequest";
static const String subordinateLeave = "/subordinateLeave"; static const String subordinateLeave = "/subordinateLeave";
static final Map<String, WidgetBuilder> routes = { static final Map<String, WidgetBuilder> routes = {
login: (context) => LoginScreen(), login: (context) => LoginScreen(),
verifyLogin: (context) => VerifyLoginScreen(), verifyLogin: (context) => VerifyLoginScreen(),
@ -234,6 +237,7 @@ class AppRoutes {
//pay slip //pay slip
monthlyPaySlip: (context) => MonthlyPaySlipScreen(), monthlyPaySlip: (context) => MonthlyPaySlipScreen(),
performanceEvaluation: (context) => PerformanceAppraisal(),
//My Team //My Team
myTeam: (context) => MyTeam(), myTeam: (context) => MyTeam(),
@ -243,9 +247,5 @@ class AppRoutes {
teamMembers: (context) => TeamMembers(), teamMembers: (context) => TeamMembers(),
createRequest: (context) => CreateRequest(), createRequest: (context) => CreateRequest(),
subordinateLeave: (context) => SubordinateLeave(), subordinateLeave: (context) => SubordinateLeave(),
}; };
} }

@ -1,9 +1,13 @@
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:mohem_flutter_app/classes/colors.dart';
extension IntExtensions on int { extension IntExtensions on int {
Widget get height => SizedBox(height: toDouble()); Widget get height => SizedBox(height: toDouble());
Widget get width => SizedBox(width: toDouble()); Widget get width => SizedBox(width: toDouble());
Widget get divider => Divider(height: toDouble(), thickness: toDouble(), color: MyColors.lightGreyEFColor);
Widget get makeItSquare => SizedBox(width: toDouble(), height: toDouble()); Widget get makeItSquare => SizedBox(width: toDouble(), height: toDouble());
} }

@ -15,7 +15,7 @@ extension CapExtension on String {
extension EmailValidator on String { extension EmailValidator on String {
Widget get toWidget => Text(this); Widget get toWidget => Text(this);
Widget toText10({Color? color, bool isBold = false, int? maxLine}) => Text( Widget toText10({Color? color, bool isBold = false, int? maxlines}) => Text(
this, this,
//maxLines: maxlines, //maxLines: maxlines,
style: TextStyle(fontSize: 10, fontWeight: isBold ? FontWeight.bold : FontWeight.w600, color: color ?? MyColors.darkTextColor, letterSpacing: -0.4), style: TextStyle(fontSize: 10, fontWeight: isBold ? FontWeight.bold : FontWeight.w600, color: color ?? MyColors.darkTextColor, letterSpacing: -0.4),

@ -42,12 +42,12 @@ extension WidgetExtensions on Widget {
child: this, child: this,
); );
Widget objectContainerView({String title = "", String note = ""}) { Widget objectContainerView({String title = "", String note = "", bool disablePadding = false,double radius =15}) {
return Container( return Container(
padding: const EdgeInsets.only(top: 15, bottom: 15, left: 14, right: 14), padding: disablePadding ? EdgeInsets.zero : const EdgeInsets.only(top: 15, bottom: 15, left: 14, right: 14),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.white, color: Colors.white,
borderRadius: BorderRadius.circular(15), borderRadius: BorderRadius.circular(radius),
boxShadow: [ boxShadow: [
BoxShadow( BoxShadow(
color: const Color(0xff000000).withOpacity(.05), color: const Color(0xff000000).withOpacity(.05),

@ -284,6 +284,10 @@ class CodegenLoader extends AssetLoader{
"summaryOfInformation": "ملخص المعلومات", "summaryOfInformation": "ملخص المعلومات",
"totalPayAmount": "المبلغ الإجمالي للدفع", "totalPayAmount": "المبلغ الإجمالي للدفع",
"paymentInformation": "معلومات الدفع", "paymentInformation": "معلومات الدفع",
"performance": "تقييم الاداء",
"performanceEvaluation": "تقييم الأداء في",
"performanceEvaluationIn": "تقييم أدائك في",
"valuationIn": "تقييم الأداء في",
"amount": "مقدار", "amount": "مقدار",
"correctCurrentDatails": "تعديل او اكمال التفاصيل الحالية", "correctCurrentDatails": "تعديل او اكمال التفاصيل الحالية",
"selectType": " حدد نوع التغيير الذي تريد القيام به", "selectType": " حدد نوع التغيير الذي تريد القيام به",
@ -329,7 +333,6 @@ class CodegenLoader extends AssetLoader{
"employeeDigitalID": "هويةالموظف الرقمية", "employeeDigitalID": "هويةالموظف الرقمية",
"businessCard": "بطاقة العمل", "businessCard": "بطاقة العمل",
"viewBusinessCard": "عرض بطاقة العمل", "viewBusinessCard": "عرض بطاقة العمل",
"performanceEvaluation": "تقييم الأداء",
"logout": "تسجيل خروج", "logout": "تسجيل خروج",
"checkOut": "وقت الخروج", "checkOut": "وقت الخروج",
"regular": "منتظم", "regular": "منتظم",
@ -379,6 +382,27 @@ class CodegenLoader extends AssetLoader{
"numberDays": "عدد الأيام", "numberDays": "عدد الأيام",
"poweredBy": "مشغل بواسطة", "poweredBy": "مشغل بواسطة",
"cloudSolutions": "حلول السحابة", "cloudSolutions": "حلول السحابة",
"selectTemplate": "حدد قالب",
"myPostedAds": "إعلاناتي المنشورة",
"browseCategories": "تصفح الفئات",
"searchItems": "عناصر البحث",
"offerAndDiscounts": "العروض والخصومات",
"offerValid": "العرض صالح",
"offerExpired": "انتهى العرض",
"whatAreYouOffering": "ما الذي تعرضه؟",
"selectCategory": "اختر الفئة",
"inProgress": "في تَقَدم",
"locked": "مقفل",
"addDetails": "أضف التفاصيل",
"reviewAndSell": "مراجعة وبيع",
"itemTitle": "عنوان البند",
"itemCondition": "حالة السلعة",
"used": "تستخدم",
"region": "منطقة",
"selectRegion": "اختر المنطقة",
"itemPrice": "سعر السلعة",
"itemPhotos": "صور البند",
"itemInfo": "معلومات العنصر",
"profile": { "profile": {
"reset_password": { "reset_password": {
"label": "Reset Password", "label": "Reset Password",
@ -727,12 +751,15 @@ static const Map<String,dynamic> en_US = {
"wantToReject": "Are you sure want to reject?", "wantToReject": "Are you sure want to reject?",
"employeeDigitalID": "Employee Digital ID", "employeeDigitalID": "Employee Digital ID",
"businessCard": "Business Card", "businessCard": "Business Card",
"viewBusinessCard": "View Business Card",
"performanceEvaluation": "Performance Evaluation",
"logout": "Logout",
"checkOut": "Check Out", "checkOut": "Check Out",
"regular": "Regular", "regular": "Regular",
"mark": "Mark", "mark": "Mark",
"performance": "Performance Evaluation",
"performanceEvaluationIn": "Your performance Evaluation in",
"valuationIn": "Performance Evaluation in",
"viewBusinessCard": "View Business Card",
"performanceEvaluation": "Performance Evaluation",
"logout": "Logout",
"selectMethodOfAttendance": "Select the method to mark the attendance", "selectMethodOfAttendance": "Select the method to mark the attendance",
"comeNearHMGWifi": "Please come near to HMG wifi", "comeNearHMGWifi": "Please come near to HMG wifi",
"deliverNotificationToMeRegardless": "Deliver notifications to me regardless of any general rules", "deliverNotificationToMeRegardless": "Deliver notifications to me regardless of any general rules",
@ -774,10 +801,31 @@ static const Map<String,dynamic> en_US = {
"hours": "Hours", "hours": "Hours",
"approvalStatus": "Approval Status", "approvalStatus": "Approval Status",
"absenceStatus": "Absence Status", "absenceStatus": "Absence Status",
"subordinateLeave": "Subordinate Leave",
"numberDays": "Number of days",
"poweredBy": "Powered By", "poweredBy": "Powered By",
"cloudSolutions": "Cloud Solutions", "cloudSolutions": "Cloud Solutions",
"subordinateLeave": "Subordinate Leave",
"numberDays": "Number of days",
"selectTemplate": "Select Template",
"myPostedAds": "My posted ads",
"browseCategories": "Browse Categories",
"searchItems": "Search Items",
"offerAndDiscounts": "Offer & Discounts",
"offerValid": "Offer Valid",
"offerExpired": "Offer Expired",
"whatAreYouOffering": "What are you offering?",
"selectCategory": "Select Category",
"inProgress": "InProgress",
"locked": "Locked",
"addDetails": "Add Details",
"reviewAndSell": "Review & Sell",
"itemTitle": "Item Title",
"itemCondition": "Item Condition",
"used": "Used",
"region": "Region",
"selectRegion": "Select Region",
"itemPrice": "Item Price",
"itemPhotos": "Item Photos",
"itemInfo": "Item Info",
"profile": { "profile": {
"reset_password": { "reset_password": {
"label": "Reset Password", "label": "Reset Password",

@ -269,6 +269,10 @@ abstract class LocaleKeys {
static const summaryOfInformation = 'summaryOfInformation'; static const summaryOfInformation = 'summaryOfInformation';
static const totalPayAmount = 'totalPayAmount'; static const totalPayAmount = 'totalPayAmount';
static const paymentInformation = 'paymentInformation'; static const paymentInformation = 'paymentInformation';
static const performance = 'performance';
static const performanceEvaluation = 'performanceEvaluation';
static const performanceEvaluationIn = 'performanceEvaluationIn';
static const valuationIn = 'valuationIn';
static const amount = 'amount'; static const amount = 'amount';
static const correctCurrentDatails = 'correctCurrentDatails'; static const correctCurrentDatails = 'correctCurrentDatails';
static const selectType = 'selectType'; static const selectType = 'selectType';
@ -314,7 +318,6 @@ abstract class LocaleKeys {
static const employeeDigitalID = 'employeeDigitalID'; static const employeeDigitalID = 'employeeDigitalID';
static const businessCard = 'businessCard'; static const businessCard = 'businessCard';
static const viewBusinessCard = 'viewBusinessCard'; static const viewBusinessCard = 'viewBusinessCard';
static const performanceEvaluation = 'performanceEvaluation';
static const logout = 'logout'; static const logout = 'logout';
static const checkOut = 'checkOut'; static const checkOut = 'checkOut';
static const regular = 'regular'; static const regular = 'regular';
@ -360,10 +363,31 @@ abstract class LocaleKeys {
static const hours = 'hours'; static const hours = 'hours';
static const approvalStatus = 'approvalStatus'; static const approvalStatus = 'approvalStatus';
static const absenceStatus = 'absenceStatus'; static const absenceStatus = 'absenceStatus';
static const poweredBy = 'poweredBy';
static const cloudSolutions = 'cloudSolutions';
static const subordinateLeave = 'subordinateLeave'; static const subordinateLeave = 'subordinateLeave';
static const numberDays = 'numberDays'; static const numberDays = 'numberDays';
static const poweredBy = 'poweredBy';
static const cloudSolutions = 'cloudSolutions';
static const selectTemplate = 'selectTemplate';
static const myPostedAds = 'myPostedAds';
static const browseCategories = 'browseCategories';
static const searchItems = 'searchItems';
static const offerAndDiscounts = 'offerAndDiscounts';
static const offerValid = 'offerValid';
static const offerExpired = 'offerExpired';
static const whatAreYouOffering = 'whatAreYouOffering';
static const selectCategory = 'selectCategory';
static const inProgress = 'inProgress';
static const locked = 'locked';
static const addDetails = 'addDetails';
static const reviewAndSell = 'reviewAndSell';
static const itemTitle = 'itemTitle';
static const itemCondition = 'itemCondition';
static const used = 'used';
static const region = 'region';
static const selectRegion = 'selectRegion';
static const itemPrice = 'itemPrice';
static const itemPhotos = 'itemPhotos';
static const itemInfo = 'itemInfo';
static const profile_reset_password_label = 'profile.reset_password.label'; static const profile_reset_password_label = 'profile.reset_password.label';
static const profile_reset_password_username = 'profile.reset_password.username'; static const profile_reset_password_username = 'profile.reset_password.username';
static const profile_reset_password_password = 'profile.reset_password.password'; static const profile_reset_password_password = 'profile.reset_password.password';

@ -66,6 +66,7 @@ import 'package:mohem_flutter_app/models/notification_action_model.dart';
import 'package:mohem_flutter_app/models/notification_get_respond_attributes_list_model.dart'; import 'package:mohem_flutter_app/models/notification_get_respond_attributes_list_model.dart';
import 'package:mohem_flutter_app/models/pending_transactions/get_pending_transactions_details.dart'; import 'package:mohem_flutter_app/models/pending_transactions/get_pending_transactions_details.dart';
import 'package:mohem_flutter_app/models/pending_transactions/get_req_functions.dart'; import 'package:mohem_flutter_app/models/pending_transactions/get_req_functions.dart';
import 'package:mohem_flutter_app/models/performance.dart';
import 'package:mohem_flutter_app/models/privilege_list_model.dart'; import 'package:mohem_flutter_app/models/privilege_list_model.dart';
import 'package:mohem_flutter_app/models/profile/basic_details_cols_structions.dart'; import 'package:mohem_flutter_app/models/profile/basic_details_cols_structions.dart';
import 'package:mohem_flutter_app/models/profile/basic_details_dff_structure.dart'; import 'package:mohem_flutter_app/models/profile/basic_details_dff_structure.dart';
@ -206,7 +207,11 @@ class GenericResponseModel {
List<String>? getOrganizationsSalariesList; List<String>? getOrganizationsSalariesList;
List<GetPaymentInformationList>? getPaymentInformationList; List<GetPaymentInformationList>? getPaymentInformationList;
List<GetPayslipList>? getPayslipList; List<GetPayslipList>? getPayslipList;
List<String>? getPerformanceAppraisalList;
// List<String>? getPendingReqDetailsList;
// List<String>? getPendingReqFunctionsList;
List<GetPerformanceAppraisalList>? getPerformanceAppraisalList;
List<GetPhonesNotificationBodyList>? getPhonesNotificationBodyList; List<GetPhonesNotificationBodyList>? getPhonesNotificationBodyList;
List<GetPoItemHistoryList>? getPoItemHistoryList; List<GetPoItemHistoryList>? getPoItemHistoryList;
GetPoNotificationBodyList? getPoNotificationBodyList; GetPoNotificationBodyList? getPoNotificationBodyList;
@ -227,7 +232,7 @@ class GenericResponseModel {
List<GetCCPDFFStructureModel>? getCCPDFFStructureModel; List<GetCCPDFFStructureModel>? getCCPDFFStructureModel;
List<String>? getSubordinatesAttdStatusList; List<String>? getSubordinatesAttdStatusList;
List<SubordinatesLeavesList>? getSubordinatesLeavesList; List<SubordinatesLeavesList>? getSubordinatesLeavesList;
List<GetSubordinatesLeavesTotalVacationsList>?getSubordinatesLeavesTotalVacationsList; List<GetSubordinatesLeavesTotalVacationsList>? getSubordinatesLeavesTotalVacationsList;
List<GetSummaryOfPaymentList>? getSummaryOfPaymentList; List<GetSummaryOfPaymentList>? getSummaryOfPaymentList;
List<String>? getSwipesList; List<String>? getSwipesList;
List<String>? getTermColsStructureList; List<String>? getTermColsStructureList;
@ -940,7 +945,8 @@ class GenericResponseModel {
} }
// getPendingReqDetailsList = json['GetPendingReqDetailsList']; // getPendingReqDetailsList = json['GetPendingReqDetailsList'];
// getPendingReqFunctionsList = json['GetPendingReqFunctionsList']; // getPendingReqFunctionsList = json['GetPendingReqFunctionsList'];
getPerformanceAppraisalList = json['GetPerformanceAppraisalList']; getPerformanceAppraisalList =
json['GetPerformanceAppraisalList'] == null ? null : List<GetPerformanceAppraisalList>.from(json["GetPerformanceAppraisalList"].map((x) => GetPerformanceAppraisalList.fromJson(x)));
getPhonesNotificationBodyList = getPhonesNotificationBodyList =
json["GetPhonesNotificationBodyList"] == null ? null : List<GetPhonesNotificationBodyList>.from(json["GetPhonesNotificationBodyList"].map((x) => GetPhonesNotificationBodyList.fromJson(x))); json["GetPhonesNotificationBodyList"] == null ? null : List<GetPhonesNotificationBodyList>.from(json["GetPhonesNotificationBodyList"].map((x) => GetPhonesNotificationBodyList.fromJson(x)));
if (json['GetPoItemHistoryList'] != null) { if (json['GetPoItemHistoryList'] != null) {
@ -993,11 +999,9 @@ class GenericResponseModel {
} }
if (json['GetSubordinatesLeavesTotalVacationsList'] != null) { if (json['GetSubordinatesLeavesTotalVacationsList'] != null) {
getSubordinatesLeavesTotalVacationsList = getSubordinatesLeavesTotalVacationsList = <GetSubordinatesLeavesTotalVacationsList>[];
<GetSubordinatesLeavesTotalVacationsList>[];
json['GetSubordinatesLeavesTotalVacationsList'].forEach((v) { json['GetSubordinatesLeavesTotalVacationsList'].forEach((v) {
getSubordinatesLeavesTotalVacationsList! getSubordinatesLeavesTotalVacationsList!.add(new GetSubordinatesLeavesTotalVacationsList.fromJson(v));
.add(new GetSubordinatesLeavesTotalVacationsList.fromJson(v));
}); });
} }
if (json['GetSummaryOfPaymentList'] != null) { if (json['GetSummaryOfPaymentList'] != null) {
@ -1577,10 +1581,7 @@ class GenericResponseModel {
} }
if (this.getSubordinatesLeavesTotalVacationsList != null) { if (this.getSubordinatesLeavesTotalVacationsList != null) {
data['GetSubordinatesLeavesTotalVacationsList'] = this data['GetSubordinatesLeavesTotalVacationsList'] = this.getSubordinatesLeavesTotalVacationsList!.map((v) => v.toJson()).toList();
.getSubordinatesLeavesTotalVacationsList!
.map((v) => v.toJson())
.toList();
} }
if (this.getSummaryOfPaymentList != null) { if (this.getSummaryOfPaymentList != null) {
data['GetSummaryOfPaymentList'] = this.getSummaryOfPaymentList!.map((v) => v.toJson()).toList(); data['GetSummaryOfPaymentList'] = this.getSummaryOfPaymentList!.map((v) => v.toJson()).toList();

@ -0,0 +1,18 @@
class GetPerformanceAppraisalList {
String? aPPRAISALSCORE;
int? aPPRAISALYEAR;
GetPerformanceAppraisalList({this.aPPRAISALSCORE, this.aPPRAISALYEAR});
GetPerformanceAppraisalList.fromJson(Map<String, dynamic> json) {
aPPRAISALSCORE = json['APPRAISAL_SCORE'];
aPPRAISALYEAR = json['APPRAISAL_YEAR'];
}
Map<String, dynamic> toJson() {
Map<String, dynamic> data = new Map<String, dynamic>();
data['APPRAISAL_SCORE'] = this.aPPRAISALSCORE;
data['APPRAISAL_YEAR'] = this.aPPRAISALYEAR;
return data;
}
}

@ -148,7 +148,7 @@ class DashboardProviderModel with ChangeNotifier, DiagnosticableTreeMixin {
List<DrawerMenuItem> drawerMenuItemList = [ List<DrawerMenuItem> drawerMenuItemList = [
DrawerMenuItem("assets/images/drawer/my_profile.svg", LocaleKeys.myProfile.tr(), AppRoutes.profile), DrawerMenuItem("assets/images/drawer/my_profile.svg", LocaleKeys.myProfile.tr(), AppRoutes.profile),
DrawerMenuItem("assets/images/drawer/performance_evaluation.svg", LocaleKeys.performanceEvaluation.tr(), ""), DrawerMenuItem("assets/images/drawer/performance_evaluation.svg", LocaleKeys.performanceEvaluation.tr(), AppRoutes.performanceEvaluation),
DrawerMenuItem("assets/images/drawer/mowadhafi.svg", LocaleKeys.mowadhafhi.tr(), AppRoutes.mowadhafhi), DrawerMenuItem("assets/images/drawer/mowadhafi.svg", LocaleKeys.mowadhafhi.tr(), AppRoutes.mowadhafhi),
DrawerMenuItem("assets/images/drawer/pending_trasactions.svg", LocaleKeys.pendingTransactions.tr(), AppRoutes.pendingTransactions), DrawerMenuItem("assets/images/drawer/pending_trasactions.svg", LocaleKeys.pendingTransactions.tr(), AppRoutes.pendingTransactions),
DrawerMenuItem("assets/images/drawer/change_password.svg", LocaleKeys.changePassword.tr(), ""), DrawerMenuItem("assets/images/drawer/change_password.svg", LocaleKeys.changePassword.tr(), ""),
@ -159,7 +159,7 @@ class DashboardProviderModel with ChangeNotifier, DiagnosticableTreeMixin {
List<ListMenu> menuList = await DashboardApiClient().getListMenu(); List<ListMenu> menuList = await DashboardApiClient().getListMenu();
List findMyRequest = menuList.where((element) => element.menuName == "My Requests").toList(); List findMyRequest = menuList.where((element) => element.menuName == "My Requests").toList();
if (findMyRequest.isNotEmpty) { if (findMyRequest.isNotEmpty) {
drawerMenuItemList.insert(3, DrawerMenuItem("assets/images/drawer/my_requests.svg", LocaleKeys.myRequest.tr(), AppRoutes.myTeam)); drawerMenuItemList.insert(3, DrawerMenuItem("assets/images/drawer/my_requests.svg", LocaleKeys.myRequest.tr(), AppRoutes.myRequests));
} }
List findMyTeam = menuList.where((element) => element.menuName == "My Team").toList(); List findMyTeam = menuList.where((element) => element.menuName == "My Team").toList();
if (findMyTeam.isNotEmpty) { if (findMyTeam.isNotEmpty) {

@ -240,7 +240,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
], ],
).paddingOnly(left: 21, right: 21, top: 7), ).paddingOnly(left: 21, right: 21, top: 7),
ServicesWidget(), ServicesWidget(),
8.height, // 8.height,
Container( Container(
width: double.infinity, width: double.infinity,
padding: const EdgeInsets.only(top: 31), padding: const EdgeInsets.only(top: 31),
@ -277,11 +277,9 @@ class _DashboardScreenState extends State<DashboardScreen> {
], ],
), ),
), ),
InkWell( LocaleKeys.viewAllOffers.tr().toText12(isUnderLine: true).onPress(() {
onTap: () { Navigator.pushNamed(context, AppRoutes.offersAndDiscounts);
Navigator.pushNamed(context, AppRoutes.offersAndDiscounts); })
},
child: LocaleKeys.viewAllOffers.tr().toText12(isUnderLine: true)),
], ],
).paddingOnly(left: 21, right: 21), ).paddingOnly(left: 21, right: 21),
Consumer<DashboardProviderModel>( Consumer<DashboardProviderModel>(
@ -312,7 +310,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
borderRadius: const BorderRadius.all( borderRadius: const BorderRadius.all(
Radius.circular(100), Radius.circular(100),
), ),
border: Border.all(color: MyColors.lightGreyEDColor, width: 1), border: Border.all(color: MyColors.lightGreyE3Color, width: 1),
), ),
child: ClipRRect( child: ClipRRect(
borderRadius: const BorderRadius.all( borderRadius: const BorderRadius.all(

@ -33,69 +33,68 @@ class ServicesWidget extends StatelessWidget {
return data.isServicesMenusLoading return data.isServicesMenusLoading
? whileLoading() ? whileLoading()
: ListView.separated( : ListView.separated(
padding: const EdgeInsets.only(top: 21),
itemBuilder: (context, parentIndex) { itemBuilder: (context, parentIndex) {
return Container( return Column(
child: Column( crossAxisAlignment: CrossAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start, mainAxisSize: MainAxisSize.min,
mainAxisSize: MainAxisSize.min, children: [
children: [ Row(
Row( crossAxisAlignment: CrossAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center, children: [
children: [ data.homeMenus![parentIndex].menuEntry.prompt!.toSectionHeading().expanded,
data.homeMenus![parentIndex].menuEntry.prompt!.toSectionHeading().expanded, LocaleKeys.viewAllServices.tr().toText12(isUnderLine: true),
LocaleKeys.viewAllServices.tr().toText12(isUnderLine: true), ],
], ).paddingOnly(left: 21, right: 21),
).paddingOnly(left: 21, right: 21), SizedBox(
SizedBox( height: 105 + 26,
height: 105 + 26, 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, bottom: 13),
padding: const EdgeInsets.only(left: 21, right: 21, top: 13, bottom: 13), scrollDirection: Axis.horizontal,
scrollDirection: Axis.horizontal, itemBuilder: (cxt, index) {
itemBuilder: (cxt, index) { return AspectRatio(
return AspectRatio( aspectRatio: 105 / 105,
aspectRatio: 105 / 105, child: data.isServicesMenusLoading
child: data.isServicesMenusLoading ? ServicesMenuShimmer()
? ServicesMenuShimmer() : Container(
: Container( decoration: BoxDecoration(
decoration: BoxDecoration( color: Colors.white,
color: Colors.white, borderRadius: BorderRadius.circular(15),
borderRadius: BorderRadius.circular(15), boxShadow: [
boxShadow: [ BoxShadow(
BoxShadow( color: const Color(0xff000000).withOpacity(.05),
color: const Color(0xff000000).withOpacity(.05), blurRadius: 26,
blurRadius: 26, offset: const Offset(0, -3),
offset: const Offset(0, -3), ),
), ],
], ),
), child: Column(
child: Column( mainAxisAlignment: MainAxisAlignment.spaceBetween,
mainAxisAlignment: MainAxisAlignment.spaceBetween, crossAxisAlignment: CrossAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start, children: [
children: [ SvgPicture.asset(iconT[index]),
SvgPicture.asset(iconT[index]), Row(
Row( crossAxisAlignment: CrossAxisAlignment.end,
crossAxisAlignment: CrossAxisAlignment.end, children: [
children: [ Expanded(
Expanded( child: data.homeMenus![parentIndex].menuEntiesList[index].prompt!.toText11(isBold: true),
child: data.homeMenus![parentIndex].menuEntiesList[index].prompt!.toText11(isBold: true), ),
), SvgPicture.asset("assets/images/arrow_next.svg").paddingOnly(bottom: 4)
SvgPicture.asset("assets/images/arrow_next.svg").paddingOnly(bottom: 4) ],
], )
) ],
], ).paddingOnly(left: 10, right: 10, bottom: 10, top: 12),
).paddingOnly(left: 10, right: 10, bottom: 10, top: 12), ).onPress(() {
).onPress(() { handleOnPress(context, data.homeMenus![parentIndex].menuEntiesList[index]);
handleOnPress(context, data.homeMenus![parentIndex].menuEntiesList[index]); }),
}), );
); },
}, separatorBuilder: (cxt, index) => 9.width,
separatorBuilder: (cxt, index) => 9.width, itemCount: data.homeMenus![parentIndex].menuEntiesList.length),
itemCount: data.homeMenus![parentIndex].menuEntiesList.length), ),
), ],
],
),
); );
}, },
separatorBuilder: (context, index) { separatorBuilder: (context, index) {
@ -116,6 +115,9 @@ class ServicesWidget extends StatelessWidget {
} else if (menuEntry.requestType == "VACATION_RULE") { } else if (menuEntry.requestType == "VACATION_RULE") {
Navigator.pushNamed(context, AppRoutes.vacationRule); Navigator.pushNamed(context, AppRoutes.vacationRule);
return; return;
} else if (menuEntry.menuName == "MBL_PERINFO_SS") {
Navigator.of(context).pushNamed(AppRoutes.profile);
return;
} }
List<GetMenuEntriesList> menuList = pro.getMenuEntriesList?.where((element) => element.parentMenuName == menuEntry.menuName && element.menuEntryType == "FUNCTION").toList() ?? []; List<GetMenuEntriesList> menuList = pro.getMenuEntriesList?.where((element) => element.parentMenuName == menuEntry.menuName && element.menuEntryType == "FUNCTION").toList() ?? [];
menuEntry.icon = ""; menuEntry.icon = "";
@ -149,7 +151,7 @@ class ServicesWidget extends StatelessWidget {
Widget whileLoading() { Widget whileLoading() {
return Column( return Column(
children: [ children: [
ServicesHeaderShimmer().paddingOnly(left: 21, right: 21), ServicesHeaderShimmer().paddingOnly(left: 21, right: 21, top: 21),
SizedBox( SizedBox(
height: 105 + 26, height: 105 + 26,
child: ListView.separated( child: ListView.separated(

@ -0,0 +1,97 @@
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:mohem_flutter_app/api/profile_api_client.dart';
import 'package:mohem_flutter_app/classes/colors.dart';
import 'package:mohem_flutter_app/classes/utils.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/widget_extensions.dart';
import 'package:mohem_flutter_app/generated/locale_keys.g.dart';
import 'package:mohem_flutter_app/models/performance.dart';
import 'package:mohem_flutter_app/widgets/app_bar_widget.dart';
class PerformanceAppraisal extends StatelessWidget {
PerformanceAppraisal({Key? key}) : super(key: key);
Future<List<GetPerformanceAppraisalList>> getPerformanceAppraisal(context) async {
List<GetPerformanceAppraisalList> performance = [];
try {
Utils.showLoading(context);
performance = await ProfileApiClient().getPerformanceAppraisal();
Utils.hideLoading(context);
} catch (ex) {
performance = [];
Utils.hideLoading(context);
Utils.handleException(ex, context, null);
}
return performance;
}
@override
Widget build(BuildContext context) {
return Scaffold(
backgroundColor: MyColors.backgroundColor,
appBar: AppBarWidget(context, title: LocaleKeys.performance.tr()),
body: FutureBuilder(
future: getPerformanceAppraisal(context),
builder: (cxt, snapShot) {
if (snapShot.connectionState == ConnectionState.done) {
if (snapShot.hasData) {
List<GetPerformanceAppraisalList> performance = snapShot.data as List<GetPerformanceAppraisalList>;
if (performance.isNotEmpty) {
return ListView(
padding: const EdgeInsets.all(0),
children: [
getPerformanceCard(performance.first).paddingOnly(left: 21, right: 21, top: 21),
GridView.count(
physics: const NeverScrollableScrollPhysics(),
crossAxisCount: 2,
mainAxisSpacing: 13,
crossAxisSpacing: 13,
shrinkWrap: true,
childAspectRatio: 160 / 125,
padding: const EdgeInsets.only(left: 21, right: 21, bottom: 21, top: 14),
children: performance
.where((GetPerformanceAppraisalList el) => performance.indexOf(el) != 0)
.map(
(GetPerformanceAppraisalList item) => getPerformanceCard(item, isGrid: true),
)
.toList(),
),
],
);
}
}
return Utils.getNoDataWidget(context);
}
return const SizedBox();
},
),
);
}
Widget getPerformanceCard(GetPerformanceAppraisalList performance, {bool isGrid = false}) {
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Container(
padding: const EdgeInsets.only(left: 12, right: 12, top: 2, bottom: 2),
decoration: Utils.containerRadius(MyColors.greenColor, 5),
child: "Excellent".toText10(color: Colors.white),
),
(isGrid ? 8 : 4).height,
isGrid ? "${LocaleKeys.performanceEvaluationIn.tr()} ${performance.aPPRAISALYEAR}".toText13() : "${LocaleKeys.performanceEvaluationIn.tr()} ${performance.aPPRAISALYEAR}".toText18(),
4.height,
LinearProgressIndicator(
minHeight: 4,
backgroundColor: MyColors.lightGreyDeColor,
valueColor: const AlwaysStoppedAnimation<Color>(MyColors.greenColor),
value: double.parse(performance.aPPRAISALSCORE!) / 100,
),
4.height,
isGrid ? "${performance.aPPRAISALSCORE}%".toText13(color: MyColors.greenColor) : "${performance.aPPRAISALSCORE}%".toText20(color: MyColors.greenColor),
],
).objectContainerView(radius: 10);
}
}

@ -448,9 +448,9 @@ class _AddUpdateFamilyMemberState extends State<AddUpdateFamilyMember> {
Utils.showLoading(context); Utils.showLoading(context);
if (args['actionType'] == "ADD") { if (args['actionType'] == "ADD") {
var relationID = null; var relationID = null;
submitContactTransactionList = await ProfileApiClient().submetConatctTransactionAddAndUpdate(args['actionType'], relationID, valuesFinal); submitContactTransactionList = await ProfileApiClient().submitContactTransactionAddAndUpdate(args['actionType'], relationID, valuesFinal);
} else if (args['actionType'] == "UPDATE") { } else if (args['actionType'] == "UPDATE") {
submitContactTransactionList = await ProfileApiClient().submetConatctTransactionAddAndUpdate(args['actionType'], args['relationID'], valuesFinal); submitContactTransactionList = await ProfileApiClient().submitContactTransactionAddAndUpdate(args['actionType'], args['relationID'], valuesFinal);
} }
var transactionId = submitContactTransactionList!.pTRANSACTIONID; var transactionId = submitContactTransactionList!.pTRANSACTIONID;
var itemKey = submitContactTransactionList!.pITEMKEY; var itemKey = submitContactTransactionList!.pITEMKEY;

@ -17,7 +17,6 @@ import 'package:mohem_flutter_app/models/member_information_list_model.dart';
import 'package:mohem_flutter_app/ui/profile/widgets/profile_panel.dart'; import 'package:mohem_flutter_app/ui/profile/widgets/profile_panel.dart';
import 'package:mohem_flutter_app/widgets/bottom_sheet.dart'; import 'package:mohem_flutter_app/widgets/bottom_sheet.dart';
// todo '@sultan' kindly follow structure of code written. use extension methods for widgets and dont hard code strings, use localizations
class ProfileScreen extends StatefulWidget { class ProfileScreen extends StatefulWidget {
const ProfileScreen({Key? key}) : super(key: key); const ProfileScreen({Key? key}) : super(key: key);

@ -1,8 +1,11 @@
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:mohem_flutter_app/api/items_for_sale/items_for_sale_api_client.dart'; import 'package:mohem_flutter_app/api/items_for_sale/items_for_sale_api_client.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/extensions/string_extensions.dart';
import 'package:mohem_flutter_app/extensions/widget_extensions.dart'; import 'package:mohem_flutter_app/extensions/widget_extensions.dart';
import 'package:mohem_flutter_app/generated/locale_keys.g.dart';
import 'package:mohem_flutter_app/models/items_for_sale/get_sale_categories_list.dart'; import 'package:mohem_flutter_app/models/items_for_sale/get_sale_categories_list.dart';
import 'package:mohem_flutter_app/models/items_for_sale/item_review_model.dart'; import 'package:mohem_flutter_app/models/items_for_sale/item_review_model.dart';
import 'package:mohem_flutter_app/ui/screens/items_for_sale/fragments/add_details_fragment.dart'; import 'package:mohem_flutter_app/ui/screens/items_for_sale/fragments/add_details_fragment.dart';
@ -43,91 +46,52 @@ class _AddNewItemForSaleState extends State<AddNewItemForSale> {
getRequestID(); getRequestID();
return Scaffold( return Scaffold(
backgroundColor: Colors.white, backgroundColor: Colors.white,
appBar: AppBarWidget( appBar: AppBarWidget(context, title: LocaleKeys.itemsForSale.tr(), showHomeButton: true),
context,
// title: LocaleKeys.mowadhafhiRequest.tr(),
title: "Items for sale",
showHomeButton: true,
),
body: Column( body: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
AspectRatio( Row(
aspectRatio: 335 / 118, children: [
child: Container( showProgress(
decoration: BoxDecoration( title: LocaleKeys.selectCategory.tr(),
color: Colors.white, status: _currentIndex == 0 ? LocaleKeys.inProgress.tr() : (_currentIndex > 0 ? LocaleKeys.completed.tr() : LocaleKeys.locked.tr()),
borderRadius: BorderRadius.circular(20), color: _currentIndex == 0 ? MyColors.orange : MyColors.greenColor,
boxShadow: [ pageIndex: 0,
BoxShadow( ).expanded,
color: const Color(0xff000000).withOpacity(.05), showProgress(
blurRadius: 26, title: LocaleKeys.addDetails.tr(),
offset: const Offset(0, -3), status: _currentIndex == 1 ? LocaleKeys.inProgress.tr() : (_currentIndex > 1 ? LocaleKeys.completed.tr() : LocaleKeys.locked.tr()),
), color: _currentIndex == 1 ? MyColors.orange : (_currentIndex > 1 ? MyColors.greenColor : MyColors.lightGrayColor),
], pageIndex: 1,
).expanded,
showProgress(
title: LocaleKeys.reviewAndSell.tr(),
status: _currentIndex == 2 ? LocaleKeys.inProgress.tr() : LocaleKeys.locked.tr(),
color: _currentIndex == 2
? MyColors.orange
: _currentIndex > 3
? MyColors.greenColor
: MyColors.lightGrayColor,
isNeedBorder: false,
pageIndex: 2,
), ),
child: Row( ],
children: [ ).paddingAll(21).objectContainerView(disablePadding: true).paddingAll(21),
Expanded( PageView(
child: showProgress( physics: const NeverScrollableScrollPhysics(),
title: "Select Category", controller: _controller,
status: _currentIndex == 0 onPageChanged: (index) {
? "InProgress" setState(() {
: _currentIndex > 0 _currentIndex = index;
? "Completed" });
: "Locked", },
color: _currentIndex == 0 ? MyColors.orange : MyColors.greenColor, scrollDirection: Axis.horizontal,
pageIndex: 0, children: [
), getSaleCategoriesList.isNotEmpty ? SelectCategoryFragment(changePageViewIndex: changePageViewIndex, getSaleCategoriesList: getSaleCategoriesList) : Container(),
), getSaleCategoriesList.isNotEmpty ? AddItemDetailsFragment(changePageViewIndex: changePageViewIndex, selectedSaleCategory: getSaleCategoriesList[0]) : Container(),
Expanded( ItemReviewFragment(changePageViewIndex: changePageViewIndex),
child: showProgress( ],
title: "Add Details", ).expanded,
status: _currentIndex == 1
? "InProgress"
: _currentIndex > 1
? "Completed"
: "Locked",
color: _currentIndex == 1
? MyColors.orange
: _currentIndex > 1
? MyColors.greenColor
: MyColors.lightGrayColor,
pageIndex: 1,
),
),
showProgress(
title: "Review & Sell",
status: _currentIndex == 2 ? "InProgress" : "Locked",
color: _currentIndex == 2
? MyColors.orange
: _currentIndex > 3
? MyColors.greenColor
: MyColors.lightGrayColor,
isNeedBorder: false,
pageIndex: 2,
),
],
).paddingAll(21),
).paddingOnly(left: 21, right: 21, top: 21),
),
Expanded(
child: PageView(
physics: NeverScrollableScrollPhysics(),
controller: _controller,
onPageChanged: (index) {
setState(() {
_currentIndex = index;
});
},
scrollDirection: Axis.horizontal,
children: [
getSaleCategoriesList.isNotEmpty ? SelectCategoryFragment(changePageViewIndex: changePageViewIndex, getSaleCategoriesList: getSaleCategoriesList) : Container(),
getSaleCategoriesList.isNotEmpty ? AddItemDetailsFragment(changePageViewIndex: changePageViewIndex, selectedSaleCategory: getSaleCategoriesList[0]) : Container(),
ItemReviewFragment(changePageViewIndex: changePageViewIndex),
],
),
),
], ],
), ),
); );
@ -141,54 +105,43 @@ class _AddNewItemForSaleState extends State<AddNewItemForSale> {
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Column( Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Row( Container(
children: [ width: 26,
Container( height: 26,
width: 26, decoration: Utils.containerRadius(color!, 200),
height: 26, child: const Icon(
decoration: Utils.containerRadius(color!, 200), Icons.done,
child: const Icon( color: Colors.white,
Icons.done, size: 16,
color: Colors.white,
size: 16,
),
),
if (isNeedBorder)
Expanded(
child: Padding(
padding: const EdgeInsets.all(8.0),
child: Utils.mDivider(Colors.grey),
)),
],
),
Utils.mHeight(8),
Text(
title!,
style: const TextStyle(
fontSize: 11,
fontWeight: FontWeight.w600,
letterSpacing: -0.44,
), ),
), ),
Utils.mHeight(2), if (isNeedBorder)
Container( Expanded(
padding: EdgeInsets.all(5), child: Padding(
decoration: Utils.containerRadius(color.withOpacity(0.2), 4), padding: const EdgeInsets.all(8.0),
child: Text( child: Utils.mDivider(Colors.grey),
status!,
style: TextStyle(
fontSize: 8,
fontWeight: FontWeight.w600,
letterSpacing: -0.32,
color: color,
), ),
), ),
),
], ],
) ),
Utils.mHeight(8),
title!.toText11(),
Utils.mHeight(2),
Container(
padding: const EdgeInsets.only(left: 8, right: 8, top: 4, bottom: 4),
decoration: Utils.containerRadius(color.withOpacity(0.2), 4),
child: Text(
status!,
style: TextStyle(
fontSize: 8,
fontWeight: FontWeight.w600,
letterSpacing: -0.32,
color: color,
),
),
),
], ],
), ),
); );

@ -51,112 +51,116 @@ class _AddItemDetailsFragmentState extends State<AddItemDetailsFragment> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return SingleChildScrollView( return Column(
child: Column( children: [
crossAxisAlignment: CrossAxisAlignment.start, ListView(
children: [ padding: const EdgeInsets.only(left: 21, right: 21, bottom: 21),
"Add details".toText20(isBold: true).paddingOnly(top: 24, left: 21, right: 21), children: [
Column( LocaleKeys.addDetails.tr().toText20(),
crossAxisAlignment: CrossAxisAlignment.start, 12.height,
children: [ Column(
DynamicTextFieldWidget( crossAxisAlignment: CrossAxisAlignment.start,
"Title", children: [
itemTitle.isEmpty ? "Item title" : itemTitle, DynamicTextFieldWidget(
isEnable: true, LocaleKeys.title.tr(),
suffixIconData: Icons.search, itemTitle.isEmpty ? LocaleKeys.itemTitle.tr() : itemTitle,
isPopup: false, isEnable: true,
lines: 1, suffixIconData: Icons.search,
isInputTypeNum: false, isPopup: false,
isReadOnly: false, lines: 1,
onChange: (String value) { isInputTypeNum: false,
itemTitle = value; isReadOnly: false,
}, onChange: (String value) {
).paddingOnly(), itemTitle = value;
DynamicTextFieldWidget( },
"Description", ),
itemDescription.isEmpty ? "Item description" : itemDescription, DynamicTextFieldWidget(
isEnable: true, LocaleKeys.description.tr(),
suffixIconData: Icons.search, itemDescription.isEmpty ? LocaleKeys.itemDescription.tr() : itemDescription,
isPopup: false, isEnable: true,
lines: 4, suffixIconData: Icons.search,
isInputTypeNum: false, isPopup: false,
isReadOnly: false, lines: 4,
onChange: (String value) { isInputTypeNum: false,
itemDescription = value; isReadOnly: false,
}, onChange: (String value) {
).paddingOnly(top: 12), itemDescription = value;
"Item Condition".toText14(isBold: true).paddingOnly(top: 21), },
Row( ).paddingOnly(top: 12),
children: [ LocaleKeys.itemCondition.tr().toText14().paddingOnly(top: 21),
ShowRadio(title: "New", value: "new", groupValue: selectedItemCondition, selectedColor: MyColors.gradiantStartColor).onPress(() { Row(
selectedItemCondition = "new"; children: [
setState(() {}); ShowRadio(title: LocaleKeys.newString.tr(), value: "new", groupValue: selectedItemCondition, selectedColor: MyColors.gradiantStartColor).onPress(() {
}), selectedItemCondition = "new";
12.width, setState(() {});
ShowRadio(title: "Used", value: "used", groupValue: selectedItemCondition, selectedColor: MyColors.gradiantStartColor).onPress(() { }),
selectedItemCondition = "used"; 12.width,
ShowRadio(title: LocaleKeys.used.tr(), value: "used", groupValue: selectedItemCondition, selectedColor: MyColors.gradiantStartColor).onPress(() {
selectedItemCondition = "used";
setState(() {});
}),
],
).paddingOnly(top: 12),
PopupMenuButton(
child: DynamicTextFieldWidget(
LocaleKeys.region.tr(),
selectedRegion.regionName ?? LocaleKeys.selectRegion.tr(),
isEnable: false,
isPopup: true,
isInputTypeNum: true,
isReadOnly: false,
),
itemBuilder: (_) => <PopupMenuItem<int>>[
for (int i = 0; i < getRegionsList!.length; i++) PopupMenuItem<int>(child: Text(getRegionsList[i].regionName!), value: i),
],
onSelected: (int popupIndex) {
selectedRegion = getRegionsList![popupIndex];
setState(() {}); setState(() {});
}), },
], ).paddingOnly(top: 21),
).paddingOnly(top: 12), DynamicTextFieldWidget(
PopupMenuButton( LocaleKeys.itemPrice.tr(),
child: DynamicTextFieldWidget( itemPrice == 0 ? LocaleKeys.price.tr() : itemPrice.toString(),
"Region", isEnable: true,
selectedRegion.regionName ?? "Select Region", suffixIconData: Icons.search,
isEnable: false, isPopup: false,
isPopup: true, lines: 1,
isInputTypeNum: true, isInputTypeNum: true,
isReadOnly: false, isReadOnly: false,
), onChange: (String value) {
itemBuilder: (_) => <PopupMenuItem<int>>[ itemPrice = num.parse(value);
for (int i = 0; i < getRegionsList!.length; i++) PopupMenuItem<int>(child: Text(getRegionsList[i].regionName!), value: i), },
], ).paddingOnly(top: 12),
onSelected: (int popupIndex) { LocaleKeys.itemPhotos.tr().toText14().paddingOnly(top: 21),
selectedRegion = getRegionsList![popupIndex]; attachmentView(LocaleKeys.attachments.tr()).paddingOnly(top: 12),
setState(() {}); ],
}, ).objectContainerView(title: LocaleKeys.itemInfo.tr()),
).paddingOnly(top: 21), ],
DynamicTextFieldWidget( ).expanded,
"Item Price", 1.divider,
itemPrice == 0 ? "Price" : itemPrice.toString(), Row(
isEnable: true, children: [
suffixIconData: Icons.search, DefaultButton(
isPopup: false, LocaleKeys.cancel.tr(),
lines: 1, () async {
isInputTypeNum: true, Navigator.of(context).pop();
isReadOnly: false, },
onChange: (String value) { colors: const [Color(0xffD02127), Color(0xffD02127)],
itemPrice = num.parse(value); ).expanded,
}, 8.width,
).paddingOnly(top: 12), DefaultButton(
"Item Photos".toText14(isBold: true).paddingOnly(top: 16), LocaleKeys.next.tr(),
attachmentView("Attachments").paddingOnly(top: 12), isButtonDisabled()
Row( ? null
children: [ : () async {
DefaultButton( AddItemDetailsFragment.itemReviewModel = getItemReviewObject();
LocaleKeys.cancel.tr(), widget.changePageViewIndex(2);
() async {
Navigator.of(context).pop();
}, },
colors: const [Color(0xffD02127), Color(0xffD02127)], disabledColor: MyColors.lightGrayColor,
).expanded, ).expanded
12.width, ],
DefaultButton( ).insideContainer
LocaleKeys.next.tr(), ],
isButtonDisabled()
? null
: () async {
AddItemDetailsFragment.itemReviewModel = getItemReviewObject();
widget.changePageViewIndex(2);
},
disabledColor: MyColors.lightGrayColor,
).expanded
],
).paddingOnly(top: 21),
],
).objectContainerView(title: "Item Info").paddingAll(21),
],
),
); );
} }
@ -174,82 +178,70 @@ class _AddItemDetailsFragmentState extends State<AddItemDetailsFragment> {
} }
Widget attachmentView(String title) { Widget attachmentView(String title) {
return Container( return Column(
padding: const EdgeInsets.only(top: 15, bottom: 15, left: 14, right: 14), crossAxisAlignment: CrossAxisAlignment.start,
decoration: BoxDecoration( mainAxisSize: MainAxisSize.min,
color: Colors.white, children: [
borderRadius: BorderRadius.circular(15), Row(
boxShadow: [ mainAxisSize: MainAxisSize.min,
BoxShadow( crossAxisAlignment: CrossAxisAlignment.center,
color: const Color(0xff000000).withOpacity(.05), children: [
blurRadius: 26, title.toText16().expanded,
offset: const Offset(0, -3), 6.width,
), SimpleButton(LocaleKeys.add.tr(), () async {
], ImageOptions.showImageOptions(context, (String image, File file) {
), setState(() {
child: Column( images.add(image);
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: [
Row(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
title.toText16().expanded,
6.width,
SimpleButton(LocaleKeys.add.tr(), () async {
ImageOptions.showImageOptions(context, (String image, File file) {
setState(() {
images.add(image);
});
}); });
}, fontSize: 14), });
], }, fontSize: 14),
), ],
if (images.isNotEmpty) 12.height, ),
if (images.isNotEmpty) if (images.isNotEmpty) 12.height,
ListView.separated( if (images.isNotEmpty)
shrinkWrap: true, ListView.separated(
physics: const NeverScrollableScrollPhysics(), shrinkWrap: true,
itemBuilder: (cxt, index) { physics: const NeverScrollableScrollPhysics(),
return Container( itemBuilder: (cxt, index) {
margin: const EdgeInsets.all(10), return Container(
padding: const EdgeInsets.all(8.0), margin: const EdgeInsets.all(10),
child: Row( padding: const EdgeInsets.all(8.0),
mainAxisAlignment: MainAxisAlignment.spaceBetween, child: Row(
children: <Widget>[ mainAxisAlignment: MainAxisAlignment.spaceBetween,
Row( children: <Widget>[
crossAxisAlignment: CrossAxisAlignment.start, Row(
children: <Widget>[ crossAxisAlignment: CrossAxisAlignment.start,
const Icon(Icons.attach_file_sharp), children: <Widget>[
const SizedBox( const Icon(Icons.attach_file_sharp),
width: 8, const SizedBox(
), width: 8,
'image ${index + 1}.png'.toText16(), ),
], 'image ${index + 1}.png'.toText16(),
],
),
InkWell(
onTap: () {
setState(() {
images.remove(images[index]);
});
},
child: Icon(
Icons.delete_sharp,
color: Colors.red[300],
), ),
InkWell( )
onTap: () { ],
setState(() { ),
images.remove(images[index]); );
}); },
}, separatorBuilder: (cxt, index) => 6.height,
child: Icon( itemCount: images.length),
Icons.delete_sharp, ],
color: Colors.red[300], ).objectContainerView();
))
],
),
);
},
separatorBuilder: (cxt, index) => 6.height,
itemCount: images.length),
],
),
);
} }
void getAdDetails() async { Future<void> getAdDetails() async {
// todo need to change this method later , its not a good approach to do it like this.
String details = await Utils.getStringFromPrefs(SharedPrefsConsts.editItemForSale); String details = await Utils.getStringFromPrefs(SharedPrefsConsts.editItemForSale);
var body = json.decode(details); var body = json.decode(details);
@ -274,17 +266,15 @@ class _AddItemDetailsFragmentState extends State<AddItemDetailsFragment> {
AddItemDetailsFragment.itemReviewModel = itemReviewModel; AddItemDetailsFragment.itemReviewModel = itemReviewModel;
SelectCategoryFragment.selectedSaleCategory = selectedSaleCategoryAd; SelectCategoryFragment.selectedSaleCategory = selectedSaleCategoryAd;
setState(() {});
} }
void getRegions() async { void getRegions() async {
try { try {
Utils.showLoading(context); Utils.showLoading(context);
getRegionsList = await ItemsForSaleApiClient().getRegions(); getRegionsList = await ItemsForSaleApiClient().getRegions();
await getAdDetails();
Utils.hideLoading(context); Utils.hideLoading(context);
setState(() {}); setState(() {});
getAdDetails();
} catch (ex) { } catch (ex) {
Utils.hideLoading(context); Utils.hideLoading(context);
Utils.handleException(ex, context, null); Utils.handleException(ex, context, null);

@ -1,5 +1,6 @@
import 'dart:convert'; import 'dart:convert';
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart'; import 'package:flutter_svg/flutter_svg.dart';
import 'package:mohem_flutter_app/api/items_for_sale/items_for_sale_api_client.dart'; import 'package:mohem_flutter_app/api/items_for_sale/items_for_sale_api_client.dart';
@ -9,9 +10,9 @@ 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';
import 'package:mohem_flutter_app/extensions/widget_extensions.dart'; import 'package:mohem_flutter_app/extensions/widget_extensions.dart';
import 'package:mohem_flutter_app/generated/locale_keys.g.dart';
import 'package:mohem_flutter_app/models/items_for_sale/get_items_for_sale_list.dart'; import 'package:mohem_flutter_app/models/items_for_sale/get_items_for_sale_list.dart';
import 'package:mohem_flutter_app/models/items_for_sale/get_sale_categories_list.dart'; import 'package:mohem_flutter_app/models/items_for_sale/get_sale_categories_list.dart';
import 'package:mohem_flutter_app/ui/screens/items_for_sale/items_for_sale_home.dart';
import 'package:mohem_flutter_app/widgets/dynamic_forms/dynamic_textfield_widget.dart'; import 'package:mohem_flutter_app/widgets/dynamic_forms/dynamic_textfield_widget.dart';
class ItemsForSaleFragment extends StatefulWidget { class ItemsForSaleFragment extends StatefulWidget {
@ -35,7 +36,7 @@ class _ItemsForSaleFragmentState extends State<ItemsForSaleFragment> {
gridScrollController.addListener(() { gridScrollController.addListener(() {
if (gridScrollController.position.atEdge) { if (gridScrollController.position.atEdge) {
bool isTop = gridScrollController.position.pixels == 0; bool isTop = gridScrollController.position.pixels == 0;
if (!isTop) { if (!isTop && getItemsForSaleList.length == currentPageNo * 10) {
print('At the bottom'); print('At the bottom');
currentPageNo++; currentPageNo++;
getItemsForSale(currentPageNo, currentCategoryID); getItemsForSale(currentPageNo, currentCategoryID);
@ -47,103 +48,87 @@ class _ItemsForSaleFragmentState extends State<ItemsForSaleFragment> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return SingleChildScrollView( return ListView(
controller: gridScrollController, controller: gridScrollController,
child: Column( children: [
crossAxisAlignment: CrossAxisAlignment.start, DynamicTextFieldWidget(
mainAxisSize: MainAxisSize.min, LocaleKeys.search.tr(),
children: [ LocaleKeys.searchItems.tr(),
DynamicTextFieldWidget( isEnable: true,
"Search", suffixIconData: Icons.search,
"Search Items", isPopup: false,
isEnable: true, lines: 1,
suffixIconData: Icons.search, isInputTypeNum: false,
isPopup: false, isReadOnly: false,
lines: 1, onChange: (String value) {
isInputTypeNum: false, // _runFilter(value);
isReadOnly: false, },
onChange: (String value) { ).paddingOnly(left: 21, right: 21, top: 21),
// _runFilter(value); Row(
}, mainAxisAlignment: MainAxisAlignment.spaceBetween,
).paddingOnly(left: 21, right: 21, top: 21, bottom: 18), children: [
Row( LocaleKeys.browseCategories.tr().toText17(),
mainAxisAlignment: MainAxisAlignment.spaceBetween, // todo @haroon define the purpose of this icon button
children: [ IconButton(
"Browse Categories".toText17(), icon: const Icon(Icons.filter_alt_sharp, color: MyColors.darkIconColor, size: 28.0),
IconButton( onPressed: () => Navigator.pop(context),
icon: const Icon(Icons.filter_alt_sharp, color: MyColors.darkIconColor, size: 28.0), ),
onPressed: () => Navigator.pop(context), ],
), ).paddingOnly(left: 21, right: 21),
], SizedBox(
).paddingOnly(left: 21, right: 21), height: 105.0,
SizedBox( child: getSaleCategoriesList.isNotEmpty
height: 105.0, ? ListView.separated(
child: getSaleCategoriesList.isNotEmpty shrinkWrap: true,
? ListView.separated( physics: const BouncingScrollPhysics(),
shrinkWrap: true, padding: const EdgeInsets.only(left: 21, right: 21, top: 13, bottom: 13),
physics: const BouncingScrollPhysics(), scrollDirection: Axis.horizontal,
padding: const EdgeInsets.only(left: 21, right: 21, top: 13, bottom: 13), itemBuilder: (cxt, index) {
scrollDirection: Axis.horizontal, return AspectRatio(
itemBuilder: (cxt, index) { aspectRatio: 1 / 1,
return AspectRatio( child: InkWell(
aspectRatio: 1 / 1, onTap: () {
child: InkWell( setState(() {
onTap: () { currentCategoryID = getSaleCategoriesList[index].categoryID!;
setState(() { getItemsForSaleList.clear();
currentCategoryID = getSaleCategoriesList[index].categoryID!; currentPageNo = 1;
getItemsForSaleList.clear(); getItemsForSale(currentPageNo, currentCategoryID);
currentPageNo = 1; });
getItemsForSale(currentPageNo, currentCategoryID); },
}); child: Column(
}, mainAxisAlignment: MainAxisAlignment.spaceBetween,
child: Container( crossAxisAlignment: CrossAxisAlignment.start,
decoration: BoxDecoration( children: [
color: Colors.white, Row(
borderRadius: BorderRadius.circular(15),
boxShadow: [
BoxShadow(
color: const Color(0xff000000).withOpacity(.05),
blurRadius: 26,
offset: const Offset(0, -3),
),
],
),
child: Column(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Row( SvgPicture.string(getSaleCategoriesList[index].content!, fit: BoxFit.contain),
mainAxisAlignment: MainAxisAlignment.spaceBetween, currentCategoryID == getSaleCategoriesList[index].categoryID ? const Icon(Icons.check_circle_rounded, color: MyColors.greenColor, size: 16.0) : Container(),
crossAxisAlignment: CrossAxisAlignment.start,
children: [
SvgPicture.string(getSaleCategoriesList[index].content!, fit: BoxFit.contain),
currentCategoryID == getSaleCategoriesList[index].categoryID ? const Icon(Icons.check_circle_rounded, color: MyColors.greenColor, size: 16.0) : Container(),
],
).expanded,
getSaleCategoriesList[index].title!.toText10()
], ],
).paddingOnly(left: 10, right: 10, bottom: 10, top: 12), ).expanded,
), getSaleCategoriesList[index].title!.toText10()
), ],
); ).paddingOnly(left: 10, right: 10, bottom: 10, top: 12).expanded.objectContainerView(disablePadding: true),
}, ),
separatorBuilder: (cxt, index) => 12.width, );
itemCount: getSaleCategoriesList.length) },
: Container(), separatorBuilder: (cxt, index) => 12.width,
), itemCount: getSaleCategoriesList.length)
getItemsForSaleList.isNotEmpty : Container(),
? GridView( ),
gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(crossAxisCount: 2, childAspectRatio: 162 / 266, crossAxisSpacing: 12, mainAxisSpacing: 12), getItemsForSaleList.isNotEmpty
padding: const EdgeInsets.only(left: 21, right: 21, bottom: 21, top: 21), ? GridView(
shrinkWrap: true, gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(crossAxisCount: 2, childAspectRatio: 162 / 266, crossAxisSpacing: 12, mainAxisSpacing: 12),
primary: false, padding: const EdgeInsets.only(left: 21, right: 21, bottom: 21, top: 12),
physics: const ScrollPhysics(), shrinkWrap: true,
children: getItemsForSaleWidgets(), primary: false,
) physics: const ScrollPhysics(),
: Utils.getNoDataWidget(context).paddingOnly(top: 50), children: getItemsForSaleWidgets(),
// 32.height, )
], : Utils.getNoDataWidget(context).paddingOnly(top: 50),
), // 32.height,
],
); );
} }
@ -162,49 +147,36 @@ class _ItemsForSaleFragmentState extends State<ItemsForSaleFragment> {
onTap: () { onTap: () {
Navigator.pushNamed(context, AppRoutes.itemsForSaleDetail, arguments: getItemsForSaleList); Navigator.pushNamed(context, AppRoutes.itemsForSaleDetail, arguments: getItemsForSaleList);
}, },
child: Container( child: Column(
padding: const EdgeInsets.all(10.0), crossAxisAlignment: CrossAxisAlignment.start,
decoration: BoxDecoration( // mainAxisSize: MainAxisSize.min,
color: Colors.white, children: [
borderRadius: BorderRadius.circular(10), Hero(
boxShadow: [ tag: "ItemImage" + getItemsForSaleList.itemSaleID.toString(),
BoxShadow( transitionOnUserGestures: true,
color: const Color(0xff000000).withOpacity(.05), child: AspectRatio(
blurRadius: 26, aspectRatio: 148 / 127,
offset: const Offset(0, -3), child: ClipRRect(
), borderRadius: BorderRadius.circular(6),
], child: Image.memory(
), base64Decode(getItemsForSaleList.itemAttachments![0].content!),
child: Column( fit: BoxFit.cover,
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: [
Hero(
tag: "ItemImage" + getItemsForSaleList.itemSaleID.toString(),
transitionOnUserGestures: true,
child: AspectRatio(
aspectRatio: 148 / 127,
child: ClipRRect(
borderRadius: BorderRadius.circular(6),
child: Image.memory(
base64Decode(getItemsForSaleList.itemAttachments![0].content!),
fit: BoxFit.cover,
),
), ),
), ),
), ),
10.height, ),
getItemsForSaleList.title!.toText16(isBold: true, color: const Color(0xff2B353E), maxlines: 1), 10.height,
getItemsForSaleList.description!.toText12(maxLine: 2, color: const Color(0xff535353)), getItemsForSaleList.title!.toText16(maxlines: 1),
16.height, getItemsForSaleList.description!.toText12(maxLine: 3, color: MyColors.grey57Color).expanded,
getItemsForSaleList.status!.toText14(isBold: true, color: getItemsForSaleList.status == 'Approved' ? MyColors.greenColor : MyColors.yellowColor), // 8.height,
Row( getItemsForSaleList.status!.toText14(color: getItemsForSaleList.status == 'Approved' ? MyColors.greenColor : MyColors.yellowColor),
mainAxisAlignment: MainAxisAlignment.spaceBetween, Row(
children: ["${getItemsForSaleList.quotePrice} ${getItemsForSaleList.currencyCode!}".toText14(isBold: true), SvgPicture.asset("assets/images/arrow_next.svg").paddingOnly(bottom: 4)], mainAxisAlignment: MainAxisAlignment.spaceBetween,
), children: ["${getItemsForSaleList.quotePrice} ${getItemsForSaleList.currencyCode!}".toText16(isBold: true), SvgPicture.asset("assets/images/arrow_next.svg").paddingOnly(bottom: 4)],
], ),
), 6.height
), ],
).paddingAll(8).expanded.objectContainerView(disablePadding: true),
); );
} }

@ -1,7 +1,9 @@
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart'; import 'package:flutter_svg/flutter_svg.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';
import 'package:mohem_flutter_app/generated/locale_keys.g.dart';
import 'package:mohem_flutter_app/models/items_for_sale/get_sale_categories_list.dart'; import 'package:mohem_flutter_app/models/items_for_sale/get_sale_categories_list.dart';
class SelectCategoryFragment extends StatelessWidget { class SelectCategoryFragment extends StatelessWidget {
@ -18,11 +20,11 @@ class SelectCategoryFragment extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [
"What are you offering".toText20(isBold: true).paddingOnly(top: 24, left: 21, right: 21), LocaleKeys.whatAreYouOffering.tr().toText20().paddingOnly(top: 0, left: 21, right: 21),
getSaleCategoriesList.isNotEmpty getSaleCategoriesList.isNotEmpty
? GridView( ? GridView(
gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(crossAxisCount: 3, childAspectRatio: 105 / 105, crossAxisSpacing: 12, mainAxisSpacing: 12), gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(crossAxisCount: 3, childAspectRatio: 105 / 105, crossAxisSpacing: 12, mainAxisSpacing: 12),
padding: const EdgeInsets.only(top: 15, bottom: 15, left: 21, right: 21), padding: const EdgeInsets.only(top: 15, bottom: 21, left: 21, right: 21),
shrinkWrap: true, shrinkWrap: true,
primary: false, primary: false,
physics: const ScrollPhysics(), physics: const ScrollPhysics(),
@ -37,41 +39,32 @@ class SelectCategoryFragment extends StatelessWidget {
List<Widget> getItemsForSaleWidgets() { List<Widget> getItemsForSaleWidgets() {
List<Widget> itemsList = []; List<Widget> itemsList = [];
getSaleCategoriesList.forEach((element) { getSaleCategoriesList.forEach(
itemsList.add(InkWell( (element) {
onTap: () { itemsList.add(
selectedSaleCategory = element; InkWell(
changePageViewIndex(1); onTap: () {
}, selectedSaleCategory = element;
child: Container( changePageViewIndex(1);
decoration: BoxDecoration( },
color: Colors.white, child: Column(
borderRadius: BorderRadius.circular(15), mainAxisAlignment: MainAxisAlignment.spaceBetween,
boxShadow: [ crossAxisAlignment: CrossAxisAlignment.start,
BoxShadow( children: [
color: const Color(0xff000000).withOpacity(.05), Row(
blurRadius: 26, mainAxisAlignment: MainAxisAlignment.spaceBetween,
offset: const Offset(0, -3), crossAxisAlignment: CrossAxisAlignment.start,
), children: [
], SvgPicture.string(element.content!, fit: BoxFit.contain, width: 32, height: 32),
],
).expanded,
element.title!.toText12()
],
).paddingOnly(left: 10, right: 10, bottom: 10, top: 16).expanded.objectContainerView(disablePadding: true),
), ),
child: Column( );
mainAxisAlignment: MainAxisAlignment.spaceBetween, },
crossAxisAlignment: CrossAxisAlignment.start, );
children: [
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
SvgPicture.string(element.content!, fit: BoxFit.contain, width: 32, height: 32),
],
).expanded,
element.title!.toText12()
],
).paddingOnly(left: 10, right: 10, bottom: 10, top: 12),
),
));
});
return itemsList; return itemsList;
} }

@ -1,14 +1,18 @@
import 'dart:convert'; import 'dart:convert';
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:mohem_flutter_app/classes/colors.dart'; import 'package:mohem_flutter_app/classes/colors.dart';
import 'package:mohem_flutter_app/classes/date_uitl.dart'; import 'package:mohem_flutter_app/classes/date_uitl.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';
import 'package:mohem_flutter_app/extensions/widget_extensions.dart'; import 'package:mohem_flutter_app/extensions/widget_extensions.dart';
import 'package:mohem_flutter_app/generated/locale_keys.g.dart';
import 'package:mohem_flutter_app/models/items_for_sale/get_items_for_sale_list.dart'; import 'package:mohem_flutter_app/models/items_for_sale/get_items_for_sale_list.dart';
import 'package:mohem_flutter_app/widgets/app_bar_widget.dart'; import 'package:mohem_flutter_app/widgets/app_bar_widget.dart';
import 'package:mohem_flutter_app/widgets/button/default_button.dart'; import 'package:mohem_flutter_app/widgets/button/default_button.dart';
import 'package:mohem_flutter_app/widgets/circular_avatar.dart'; import 'package:mohem_flutter_app/widgets/circular_avatar.dart';
import 'package:mohem_flutter_app/widgets/item_detail_view_widget.dart';
import 'package:url_launcher/url_launcher.dart'; import 'package:url_launcher/url_launcher.dart';
class ItemForSaleDetailPage extends StatefulWidget { class ItemForSaleDetailPage extends StatefulWidget {
@ -24,116 +28,86 @@ class _ItemForSaleDetailPageState extends State<ItemForSaleDetailPage> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
getItemsForSaleList = ModalRoute.of(context)?.settings.arguments as GetItemsForSaleList; getItemsForSaleList = ModalRoute.of(context)?.settings.arguments as GetItemsForSaleList;
return Scaffold( return Scaffold(
backgroundColor: Colors.white, backgroundColor: Colors.white,
appBar: AppBarWidget(context, appBar: AppBarWidget(context, title: LocaleKeys.itemsForSale.tr(), showHomeButton: true),
// title: LocaleKeys.mowadhafhiRequest.tr(), body: Column(
title: "Items for sale", children: [
showHomeButton: true,), ListView(
body: SingleChildScrollView( padding: const EdgeInsets.all(21),
child: Column( children: [
children: [ Column(
AspectRatio( crossAxisAlignment: CrossAxisAlignment.start,
aspectRatio: 336 / 554, mainAxisSize: MainAxisSize.min,
child: Container( children: [
decoration: BoxDecoration( Hero(
color: Colors.white, tag: "ItemImage" + getItemsForSaleList.itemSaleID.toString(),
borderRadius: BorderRadius.circular(10), transitionOnUserGestures: true,
boxShadow: [ child: AspectRatio(
BoxShadow( aspectRatio: 322 / 261,
color: const Color(0xff000000).withOpacity(.05), child: ClipRRect(
blurRadius: 26, borderRadius: BorderRadius.circular(6),
offset: const Offset(0, -3), child: Image.memory(
base64Decode(getItemsForSaleList.itemAttachments![0].content!),
fit: BoxFit.cover,
),
),
), ),
], ).paddingAll(8),
), Column(
// color: Colors.red, mainAxisSize: MainAxisSize.min,
child: Column( crossAxisAlignment: CrossAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start, children: [
mainAxisSize: MainAxisSize.min, getItemsForSaleList.title!.toText20(),
children: [ getItemsForSaleList.description!.toText12(maxLine: 5, color: MyColors.grey57Color),
Container( 21.height,
decoration: BoxDecoration( getItemsForSaleList.status!.toText16(color: getItemsForSaleList.status == 'Approved' ? MyColors.greenColor : MyColors.yellowColor),
boxShadow: [ "${getItemsForSaleList.quotePrice} ${getItemsForSaleList.currencyCode!}".toText20(isBold: true),
BoxShadow( 1.divider.paddingOnly(top: 16, bottom: 16),
color: const Color(0xffEBEBEB).withOpacity(1.0), Row(
blurRadius: 26, children: [
offset: const Offset(0, -3), CircularAvatar(
url: getItemsForSaleList.profilePicture,
height: 34,
width: 34,
), ),
7.width,
Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: [getItemsForSaleList.fullName!.toText14(), ItemDetailView("Posted on", DateUtil.formatDateToDate(DateTime.parse(getItemsForSaleList.created!), false))],
).expanded,
], ],
), ),
child: Hero( ],
tag: "ItemImage" + getItemsForSaleList.itemSaleID.toString(), ).paddingOnly(right: 16, left: 16, top: 6, bottom: 16)
transitionOnUserGestures: true,
child: AspectRatio(
aspectRatio: 148 / 127,
child: ClipRRect(
borderRadius: BorderRadius.circular(6),
child: Image.memory(
base64Decode(getItemsForSaleList.itemAttachments![0].content!),
fit: BoxFit.cover,
),
),
).paddingAll(8),
),
),
getItemsForSaleList.title!.toText20(isBold: true, color: const Color(0xff2B353E)).paddingOnly(left: 21, right: 21),
getItemsForSaleList.description!.toText12(maxLine: 5, color: const Color(0xff535353)).paddingOnly(left: 21, right: 21, bottom: 21),
getItemsForSaleList.status!.toText16(isBold: true, color: getItemsForSaleList.status == 'Approved' ? MyColors.greenColor : MyColors.yellowColor).paddingOnly(left: 21, right: 21),
"${getItemsForSaleList.quotePrice} ${getItemsForSaleList.currencyCode!}".toText20(isBold: true).paddingOnly(left: 21, right: 21, bottom: 15),
const Divider().paddingOnly(left: 21, right: 21),
Row(
children: [
CircularAvatar(
height: 40,
width: 40,
).paddingOnly(left: 21, top: 21),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: [
getItemsForSaleList.fullName!.toText14(isBold: true).paddingOnly(left: 7, right: 7),
"Posted on: ${DateUtil.formatDateToDate(DateTime.parse(getItemsForSaleList.created!), false)}".toText12().paddingOnly(left: 7, right: 7),
],
).paddingOnly(top: 18),
],
),
],
),
).paddingAll(21),
),
Container(
decoration: const BoxDecoration(
color: MyColors.white,
boxShadow: [
BoxShadow(color: MyColors.lightGreyEFColor, spreadRadius: 1),
],
),
child: Row(
children: [
DefaultButton("Email", () async {
Uri emailLaunchUri = Uri(
scheme: 'mailto',
path: getItemsForSaleList.emailAddress,
);
launchUrl(emailLaunchUri);
}, iconData: Icons.email_sharp, isTextExpanded: false)
.insideContainer
.expanded,
DefaultButton("Call", () async {
Uri callLaunchUri = Uri(
scheme: 'tel',
path: getItemsForSaleList.mobileNumber,
);
launchUrl(callLaunchUri);
}, iconData: Icons.call_sharp, isTextExpanded: false)
.insideContainer
.expanded,
], ],
), ).objectContainerView(disablePadding: true),
), ],
], ).expanded,
), Row(
children: [
DefaultButton("Email", () async {
Uri emailLaunchUri = Uri(
scheme: 'mailto',
path: getItemsForSaleList.emailAddress,
);
launchUrl(emailLaunchUri);
}, iconData: Icons.email_sharp, isTextExpanded: false)
.expanded,
8.width,
DefaultButton("Call", () async {
Uri callLaunchUri = Uri(
scheme: 'tel',
path: getItemsForSaleList.mobileNumber,
);
launchUrl(callLaunchUri);
}, iconData: Icons.call_sharp, isTextExpanded: false)
.expanded,
],
).insideContainer,
],
), ),
); );
} }

@ -1,10 +1,11 @@
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:mohem_flutter_app/classes/colors.dart'; import 'package:mohem_flutter_app/classes/colors.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';
import 'package:mohem_flutter_app/extensions/widget_extensions.dart'; import 'package:mohem_flutter_app/extensions/widget_extensions.dart';
import 'package:mohem_flutter_app/models/items_for_sale/get_sale_categories_list.dart'; import 'package:mohem_flutter_app/generated/locale_keys.g.dart';
import 'package:mohem_flutter_app/ui/screens/items_for_sale/fragments/items_for_sale.dart'; import 'package:mohem_flutter_app/ui/screens/items_for_sale/fragments/items_for_sale.dart';
import 'package:mohem_flutter_app/ui/screens/items_for_sale/fragments/my_posted_ads_fragment.dart'; import 'package:mohem_flutter_app/ui/screens/items_for_sale/fragments/my_posted_ads_fragment.dart';
import 'package:mohem_flutter_app/widgets/app_bar_widget.dart'; import 'package:mohem_flutter_app/widgets/app_bar_widget.dart';
@ -24,10 +25,7 @@ class _ItemsForSaleState extends State<ItemsForSale> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
backgroundColor: Colors.white, backgroundColor: Colors.white,
appBar: AppBarWidget(context, appBar: AppBarWidget(context, title: LocaleKeys.itemsForSale.tr(), showHomeButton: true),
// title: LocaleKeys.mowadhafhiRequest.tr(),
title: "Items for sale",
showHomeButton: true),
body: Column( body: Column(
children: [ children: [
Container( Container(
@ -48,7 +46,7 @@ class _ItemsForSaleState extends State<ItemsForSale> {
), ),
), ),
child: Row( child: Row(
children: [myTab("Items for sale", 0), myTab("My posted ads", 1)], children: [myTab(LocaleKeys.itemsForSale.tr(), 0), myTab(LocaleKeys.myPostedAds.tr(), 1)],
), ),
), ),
PageView( PageView(
@ -59,10 +57,7 @@ class _ItemsForSaleState extends State<ItemsForSale> {
tabIndex = pageIndex; tabIndex = pageIndex;
}); });
}, },
children: [ children: [ItemsForSaleFragment(), MyPostedAdsFragment()],
ItemsForSaleFragment(),
MyPostedAdsFragment()
],
).expanded, ).expanded,
], ],
), ),
@ -77,9 +72,11 @@ class _ItemsForSaleState extends State<ItemsForSale> {
]), ]),
), ),
child: const Icon(Icons.add, color: Colors.white, size: 30), child: const Icon(Icons.add, color: Colors.white, size: 30),
).onPress(() { ).onPress(
Navigator.pushNamed(context, AppRoutes.addNewItemForSale); () {
}) Navigator.pushNamed(context, AppRoutes.addNewItemForSale);
},
),
); );
} }

@ -49,45 +49,36 @@ class _MyRequestsState extends State<MyRequests> {
context, context,
title: "Concurrent Reports", title: "Concurrent Reports",
), ),
body: Container( body: Column(
width: double.infinity, children: [
decoration: BoxDecoration( ListView(
color: Colors.white, physics: const BouncingScrollPhysics(),
borderRadius: BorderRadius.circular(10), children: [
boxShadow: [ Container(
BoxShadow( padding: const EdgeInsets.only(left: 12, right: 12, top: 10, bottom: 0),
color: const Color(0xff000000).withOpacity(.05), margin: const EdgeInsets.only(left: 12, right: 12, top: 0, bottom: 0),
blurRadius: 26, child: PopupMenuButton(
offset: const Offset(0, -3), child: DynamicTextFieldWidget(
), LocaleKeys.templateName.tr(),
], selectedConcurrentProgramList?.uSERCONCURRENTPROGRAMNAME ?? LocaleKeys.selectTemplate.tr(),
), isEnable: false,
child: Column( isPopup: true,
children: [ isInputTypeNum: true,
12.height, isReadOnly: false,
Container( ).paddingOnly(bottom: 12),
padding: const EdgeInsets.only(left: 12, right: 12, top: 10, bottom: 0), itemBuilder: (_) => <PopupMenuItem<int>>[
margin: const EdgeInsets.only(left: 12, right: 12, top: 0, bottom: 0), for (int i = 0; i < getConcurrentProgramsList!.length; i++) PopupMenuItem<int>(child: Text(getConcurrentProgramsList![i].uSERCONCURRENTPROGRAMNAME!), value: i),
child: PopupMenuButton( ],
child: DynamicTextFieldWidget( onSelected: (int popupIndex) {
"Template Name", selectedConcurrentProgramList = getConcurrentProgramsList![popupIndex];
selectedConcurrentProgramList?.uSERCONCURRENTPROGRAMNAME ?? "", getCCPTransactions(selectedConcurrentProgramList?.cONCURRENTPROGRAMNAME);
isEnable: false, setState(() {});
isPopup: true, }),
isInputTypeNum: true, ),
isReadOnly: false, 12.height,
).paddingOnly(bottom: 12), Expanded(
itemBuilder: (_) => <PopupMenuItem<int>>[ // todo list don't have data, need to confirm later , because have issues, need fixes
for (int i = 0; i < getConcurrentProgramsList!.length; i++) PopupMenuItem<int>(child: Text(getConcurrentProgramsList![i].uSERCONCURRENTPROGRAMNAME!), value: i),
],
onSelected: (int popupIndex) {
selectedConcurrentProgramList = getConcurrentProgramsList![popupIndex];
getCCPTransactions(selectedConcurrentProgramList?.cONCURRENTPROGRAMNAME);
setState(() {});
}),
),
12.height,
Expanded(
child: ListView.separated( child: ListView.separated(
physics: const BouncingScrollPhysics(), physics: const BouncingScrollPhysics(),
shrinkWrap: true, shrinkWrap: true,
@ -149,21 +140,15 @@ class _MyRequestsState extends State<MyRequests> {
); );
}, },
separatorBuilder: (BuildContext context, int index) => 12.height, separatorBuilder: (BuildContext context, int index) => 12.height,
itemCount: getCCPTransactionsList.length ?? 0)), itemCount: getCCPTransactionsList.length),
80.height,
Container(
decoration: const BoxDecoration(
color: MyColors.white,
boxShadow: [
BoxShadow(color: MyColors.lightGreyEFColor, spreadRadius: 3),
],
), ),
child: DefaultButton(LocaleKeys.createRequest.tr(), () async { ],
openNewRequest(); ).expanded,
}).insideContainer, 1.divider,
) DefaultButton(LocaleKeys.createRequest.tr(), () async {
], openNewRequest();
), }).insideContainer,
],
), ),
); );
} }

@ -4,7 +4,6 @@ import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:mohem_flutter_app/api/my_requests_api_client.dart'; import 'package:mohem_flutter_app/api/my_requests_api_client.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/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';
@ -27,7 +26,7 @@ class _NewRequestState extends State<NewRequest> {
List<GetConcurrentProgramsModel> getConcurrentProgramsList = []; List<GetConcurrentProgramsModel> getConcurrentProgramsList = [];
GetConcurrentProgramsModel? selectedConcurrentProgramList; GetConcurrentProgramsModel? selectedConcurrentProgramList;
List<GetEITDFFStructureList> getCCPDFFStructureModelList = []; List<GetEITDFFStructureList>? getCCPDFFStructureModelList;
DateTime selectedDate = DateTime.now(); DateTime selectedDate = DateTime.now();
@ -45,17 +44,16 @@ class _NewRequestState extends State<NewRequest> {
context, context,
title: "Concurrent Reports", title: "Concurrent Reports",
), ),
body: Container( body: Column(
child: Column( children: [
children: [ ListView(
12.height, padding: const EdgeInsets.all(21),
Container( physics: const BouncingScrollPhysics(),
padding: const EdgeInsets.only(left: 12, right: 12, top: 10, bottom: 0), children: [
margin: const EdgeInsets.only(left: 12, right: 12, top: 0, bottom: 0), PopupMenuButton(
child: PopupMenuButton(
child: DynamicTextFieldWidget( child: DynamicTextFieldWidget(
"Template Name", LocaleKeys.templateName.tr(),
selectedConcurrentProgramList?.uSERCONCURRENTPROGRAMNAME ?? "", selectedConcurrentProgramList?.uSERCONCURRENTPROGRAMNAME ?? LocaleKeys.selectTemplate.tr(),
isEnable: false, isEnable: false,
isPopup: true, isPopup: true,
isInputTypeNum: true, isInputTypeNum: true,
@ -69,32 +67,28 @@ class _NewRequestState extends State<NewRequest> {
getCCPDFFStructure(selectedConcurrentProgramList?.cONCURRENTPROGRAMNAME); getCCPDFFStructure(selectedConcurrentProgramList?.cONCURRENTPROGRAMNAME);
setState(() {}); setState(() {});
}), }),
), getCCPDFFStructureModelList == null
(getCCPDFFStructureModelList.isEmpty ? const SizedBox()
? LocaleKeys.noDataAvailable.tr().toText16().center : (getCCPDFFStructureModelList!.isEmpty
: ListView.separated( ? LocaleKeys.noDataAvailable.tr().toText16().center
physics: const BouncingScrollPhysics(), : ListView.separated(
padding: const EdgeInsets.all(21), physics: const NeverScrollableScrollPhysics(),
itemBuilder: (cxt, int parentIndex) => parseDynamicFormatType(getCCPDFFStructureModelList[parentIndex], parentIndex), shrinkWrap: true,
separatorBuilder: (cxt, index) => 0.height, padding: const EdgeInsets.all(0),
itemCount: getCCPDFFStructureModelList.length)) itemBuilder: (cxt, int parentIndex) => parseDynamicFormatType(getCCPDFFStructureModelList![parentIndex], parentIndex),
.expanded, separatorBuilder: (cxt, index) => 0.height,
Container( itemCount: getCCPDFFStructureModelList!.length,
decoration: const BoxDecoration( )),
color: MyColors.white, ],
boxShadow: [ ).expanded,
BoxShadow(color: MyColors.lightGreyEFColor, spreadRadius: 3), 1.divider,
], DefaultButton(LocaleKeys.submit.tr(), () {
), // todo need to add submit method
child: DefaultButton(LocaleKeys.submit.tr(), () async { // openNewRequest();
// openNewRequest(); })
}) .insideContainer,
.insideContainer, ],
)
],
),
), ),
// bottomSheet:
); );
} }
@ -132,9 +126,7 @@ class _NewRequestState extends State<NewRequest> {
isReadOnly: model.rEADONLY == "Y", isReadOnly: model.rEADONLY == "Y",
onChange: (text) { onChange: (text) {
model.fieldAnswer = text; model.fieldAnswer = text;
if (model.eSERVICESDV == null) { model.eSERVICESDV ??= ESERVICESDV();
model.eSERVICESDV = ESERVICESDV();
}
model.eSERVICESDV!.pIDCOLUMNNAME = text; model.eSERVICESDV!.pIDCOLUMNNAME = text;
}, },
).paddingOnly(bottom: 12); ).paddingOnly(bottom: 12);
@ -146,9 +138,7 @@ class _NewRequestState extends State<NewRequest> {
isInputTypeNum: true, isInputTypeNum: true,
onChange: (text) { onChange: (text) {
model.fieldAnswer = text; model.fieldAnswer = text;
if (model.eSERVICESDV == null) { model.eSERVICESDV ??= ESERVICESDV();
model.eSERVICESDV = ESERVICESDV();
}
model.eSERVICESDV!.pIDCOLUMNNAME = text; model.eSERVICESDV!.pIDCOLUMNNAME = text;
}, },
).paddingOnly(bottom: 12); ).paddingOnly(bottom: 12);
@ -164,7 +154,7 @@ class _NewRequestState extends State<NewRequest> {
} }
return DynamicTextFieldWidget( return DynamicTextFieldWidget(
(model.sEGMENTPROMPT ?? "") + (model.rEQUIREDFLAG == "Y" ? "*" : ""), (model.sEGMENTPROMPT ?? "") + (model.rEQUIREDFLAG == "Y" ? "*" : ""),
displayText, displayText.isEmpty ? LocaleKeys.pleaseSelectDate.tr() : displayText,
suffixIconData: Icons.calendar_today, suffixIconData: Icons.calendar_today,
isEnable: false, isEnable: false,
onTap: () async { onTap: () async {
@ -331,7 +321,7 @@ class _NewRequestState extends State<NewRequest> {
} }
return DynamicTextFieldWidget( return DynamicTextFieldWidget(
(model.sEGMENTPROMPT ?? "") + (model.rEQUIREDFLAG == "Y" ? "*" : ""), (model.sEGMENTPROMPT ?? "") + (model.rEQUIREDFLAG == "Y" ? "*" : ""),
displayText, displayText.isEmpty ? LocaleKeys.pleaseSelectDate.tr() : displayText,
suffixIconData: Icons.calendar_today, suffixIconData: Icons.calendar_today,
isEnable: false, isEnable: false,
onTap: () async { onTap: () async {

@ -50,86 +50,69 @@ class _OffersAndDiscountsDetailsState extends State<OffersAndDiscountsDetails> {
title: "Offers & Discounts", title: "Offers & Discounts",
showHomeButton: true, showHomeButton: true,
), ),
body: SingleChildScrollView( body: ListView(
controller: _scrollController, controller: _scrollController,
child: Column( children: [
crossAxisAlignment: CrossAxisAlignment.start, Column(
children: [ crossAxisAlignment: CrossAxisAlignment.start,
Container( children: [
decoration: BoxDecoration( Hero(
color: Colors.white, tag: "ItemImage" + getOffersList[0].rowID!,
borderRadius: BorderRadius.circular(10), // transitionOnUserGestures: true,
boxShadow: [ child: RepaintBoundary(
BoxShadow( key: _globalKey,
color: const Color(0xff000000).withOpacity(.05), child: ClipRRect(
blurRadius: 26, borderRadius: BorderRadius.circular(6),
offset: const Offset(0, -3), child: Image.network(
), getOffersList[0].bannerImage!,
], fit: BoxFit.contain,
),
).paddingAll(12),
),
), ),
child: Column( 8.height,
crossAxisAlignment: CrossAxisAlignment.start, AppState().isArabic(context)
? getOffersList[0].titleAR!.toText22(isBold: true, color: const Color(0xff2B353E)).center
: getOffersList[0].title!.toText22(isBold: true, color: const Color(0xff2B353E)).center,
Html(
data: AppState().isArabic(context) ? getOffersList[0].descriptionAR! : getOffersList[0].description ?? "",
onLinkTap: (String? url, RenderContext context, Map<String, String> attributes, _) {
launchUrl(Uri.parse(url!));
},
),
checkDate(getOffersList[0].endDate!).paddingOnly(left: 8),
10.height,
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
Hero( getOffersList[0].discount!.toText16(isBold: true),
tag: "ItemImage" + getOffersList[0].rowID!, InkWell(
// transitionOnUserGestures: true, onTap: () {
child: RepaintBoundary( _shareOfferAsImage();
key: _globalKey, },
child: ClipRRect( child: const Icon(Icons.share, color: MyColors.darkIconColor).paddingOnly(bottom: 4))
borderRadius: BorderRadius.circular(6),
child: Image.network(
getOffersList[0].bannerImage!,
fit: BoxFit.contain,
),
).paddingAll(12),
),
),
8.height,
AppState().isArabic(context)
? getOffersList[0].titleAR!.toText22(isBold: true, color: const Color(0xff2B353E)).center
: getOffersList[0].title!.toText22(isBold: true, color: const Color(0xff2B353E)).center,
Html(
data: AppState().isArabic(context) ? getOffersList[0].descriptionAR! : getOffersList[0].description ?? "",
onLinkTap: (String? url, RenderContext context, Map<String, String> attributes, _) {
launchUrl(Uri.parse(url!));
},
),
checkDate(getOffersList[0].endDate!).paddingOnly(left: 8),
10.height,
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
getOffersList[0].discount!.toText16(isBold: true),
InkWell(
onTap: () {
_shareOfferAsImage();
},
child: const Icon(Icons.share, color: MyColors.darkIconColor).paddingOnly(bottom: 4))
],
).paddingOnly(left: 8, right: 8),
getOffersList[0].isHasLocation == "true"
? InkWell(
onTap: () {},
child: Row(
children: [const Icon(Icons.map_sharp, color: MyColors.darkIconColor).paddingOnly(bottom: 4), "Offer Location".toText16(isUnderLine: true).paddingOnly(left: 8)],
).paddingOnly(left: 8, right: 8, top: 8),
)
: 12.height,
], ],
), ).paddingOnly(left: 8, right: 8),
).paddingOnly(left: 21, right: 21, top: 21), getOffersList[0].isHasLocation == "true"
"Related Offers".toText22(isBold: true, color: const Color(0xff2B353E)).paddingAll(21.0), ? InkWell(
GridView( onTap: () {},
gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(crossAxisCount: 2, childAspectRatio: 162 / 266, crossAxisSpacing: 12, mainAxisSpacing: 12), child: Row(
padding: const EdgeInsets.only(left: 21, right: 21, bottom: 21, top: 21), children: [const Icon(Icons.map_sharp, color: MyColors.darkIconColor).paddingOnly(bottom: 4), "Offer Location".toText16(isUnderLine: true).paddingOnly(left: 8)],
shrinkWrap: true, ).paddingOnly(left: 8, right: 8, top: 8),
primary: false, )
physics: const ScrollPhysics(), : 12.height,
children: getItemsForSaleWidgets(), ],
), ).objectContainerView().paddingOnly(left: 21, right: 21, top: 21),
50.height, "Related Offers".toText22(isBold: true, color: const Color(0xff2B353E)).paddingOnly(left: 21, right: 21, top: 21),
], GridView(
), gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(crossAxisCount: 2, childAspectRatio: 162 / 266, crossAxisSpacing: 12, mainAxisSpacing: 12),
padding: const EdgeInsets.all(21),
shrinkWrap: true,
primary: false,
physics: const ScrollPhysics(),
children: getItemsForSaleWidgets(),
),
],
), ),
); );
} }

@ -9,6 +9,7 @@ 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';
import 'package:mohem_flutter_app/extensions/widget_extensions.dart'; import 'package:mohem_flutter_app/extensions/widget_extensions.dart';
import 'package:mohem_flutter_app/generated/locale_keys.g.dart';
import 'package:mohem_flutter_app/models/offers_and_discounts/get_categories_list.dart'; import 'package:mohem_flutter_app/models/offers_and_discounts/get_categories_list.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/widgets/app_bar_widget.dart'; import 'package:mohem_flutter_app/widgets/app_bar_widget.dart';
@ -37,20 +38,15 @@ class _OffersAndDiscountsHomeState extends State<OffersAndDiscountsHome> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
backgroundColor: Colors.white, backgroundColor: Colors.white,
appBar: AppBarWidget( appBar: AppBarWidget(context, title: LocaleKeys.offerAndDiscounts.tr(), showHomeButton: true),
context,
// title: LocaleKeys.mowadhafhiRequest.tr(),
title: "Offers & Discounts",
showHomeButton: true,
),
body: SingleChildScrollView( body: SingleChildScrollView(
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [
DynamicTextFieldWidget( DynamicTextFieldWidget(
"Search", LocaleKeys.search.tr(),
"Search Items", LocaleKeys.searchItems.tr(),
isEnable: true, isEnable: true,
suffixIconData: Icons.search, suffixIconData: Icons.search,
isPopup: false, isPopup: false,
@ -60,17 +56,16 @@ class _OffersAndDiscountsHomeState extends State<OffersAndDiscountsHome> {
onChange: (String value) { onChange: (String value) {
// _runFilter(value); // _runFilter(value);
}, },
).paddingOnly(left: 21, right: 21, top: 21, bottom: 18), ).paddingOnly(left: 21, right: 21, top: 21),
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
"Browse Categories".toText17(), LocaleKeys.browseCategories.tr().toText17(),
IconButton( const Icon(Icons.filter_alt_sharp, color: MyColors.darkIconColor, size: 28.0).onPress(() {
icon: const Icon(Icons.filter_alt_sharp, color: MyColors.darkIconColor, size: 28.0), Navigator.pop(context);
onPressed: () => Navigator.pop(context), }),
),
], ],
).paddingOnly(left: 21, right: 21), ).paddingOnly(left: 21, right: 21, top: 21),
SizedBox( SizedBox(
height: 110.0, height: 110.0,
child: getCategoriesList.isNotEmpty child: getCategoriesList.isNotEmpty
@ -120,7 +115,7 @@ class _OffersAndDiscountsHomeState extends State<OffersAndDiscountsHome> {
currentCategoryID == getCategoriesList[index].id ? const Icon(Icons.check_circle_rounded, color: MyColors.greenColor, size: 16.0) : Container(), currentCategoryID == getCategoriesList[index].id ? const Icon(Icons.check_circle_rounded, color: MyColors.greenColor, size: 16.0) : Container(),
], ],
).expanded, ).expanded,
AppState().isArabic(context) ? getCategoriesList[index].categoryNameAr!.toText10(maxLine: 1) : getCategoriesList[index].categoryNameEn!.toText10(maxLine: 1) AppState().isArabic(context) ? getCategoriesList[index].categoryNameAr!.toText10(maxlines: 1) : getCategoriesList[index].categoryNameEn!.toText10(maxlines: 1)
], ],
).paddingOnly(left: 10, right: 10, bottom: 10, top: 12), ).paddingOnly(left: 10, right: 10, bottom: 10, top: 12),
), ),
@ -195,7 +190,9 @@ class _OffersAndDiscountsHomeState extends State<OffersAndDiscountsHome> {
), ),
), ),
10.height, 10.height,
AppState().isArabic(context) ? getOffersList.titleAR!.toText16(isBold: true, color: const Color(0xff2B353E), maxlines: 1) : getOffersList.title!.toText16(isBold: true, color: const Color(0xff2B353E), maxlines: 1), AppState().isArabic(context)
? getOffersList.titleAR!.toText16(isBold: true, color: const Color(0xff2B353E), maxlines: 1)
: getOffersList.title!.toText16(isBold: true, color: const Color(0xff2B353E), maxlines: 1),
// Html( // Html(
// data: AppState().isArabic(context) ? getOffersList.descriptionAR! : getOffersList.description ?? "", // data: AppState().isArabic(context) ? getOffersList.descriptionAR! : getOffersList.description ?? "",
// // onLinkTap: (String? url, RenderContext context, Map<String, String> attributes, _) { // // onLinkTap: (String? url, RenderContext context, Map<String, String> attributes, _) {
@ -224,8 +221,8 @@ class _OffersAndDiscountsHomeState extends State<OffersAndDiscountsHome> {
getOffersDetailList.add(offersListModelObj); getOffersDetailList.add(offersListModelObj);
getOffersList.forEach((element) { getOffersList.forEach((element) {
if(counter <= 4) { if (counter <= 4) {
if(element.rowID != offersListModelObj.rowID) { if (element.rowID != offersListModelObj.rowID) {
getOffersDetailList.add(element); getOffersDetailList.add(element);
counter++; counter++;
} }
@ -238,9 +235,9 @@ class _OffersAndDiscountsHomeState extends State<OffersAndDiscountsHome> {
Widget checkDate(String endDate) { Widget checkDate(String endDate) {
DateTime endDateObj = DateFormat("yyyy-MM-dd").parse(endDate); DateTime endDateObj = DateFormat("yyyy-MM-dd").parse(endDate);
if (endDateObj.isAfter(DateTime.now())) { if (endDateObj.isAfter(DateTime.now())) {
return "Offer Valid".toText14(isBold: true, color: MyColors.greenColor); return LocaleKeys.offerValid.tr().toText14(isBold: true, color: MyColors.greenColor);
} else { } else {
return "Offer Expired".toText14(isBold: true, color: MyColors.redColor); return LocaleKeys.offerExpired.tr().toText14(isBold: true, color: MyColors.redColor);
} }
} }

@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
import 'package:mohem_flutter_app/classes/colors.dart'; import 'package:mohem_flutter_app/classes/colors.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';
import 'package:mohem_flutter_app/extensions/int_extensions.dart';
class ShowRadio extends StatelessWidget { class ShowRadio extends StatelessWidget {
String title, value, groupValue; String title, value, groupValue;
@ -39,7 +38,7 @@ class ShowRadio extends StatelessWidget {
), ),
), ),
12.width, 12.width,
title.toText12(isBold: true, maxLine: 2) title.toText12(maxLine: 2)
], ],
); );
} }

Loading…
Cancel
Save