Haroon6138
/
mohemm-flutter-app
1
0
Fork 0
Code Issues Pull Requests 3 Packages Projects Releases Wiki Activity

Merge branch 'master' into development_sikander

Browse Source
merge-requests/6/head
Sikander Saleem 3 years ago
parent 95b60181b1 36629ea360
commit ef96f9703f
15 changed files with 132 additions and 104 deletions
Show Stats Download Patch File Download Diff File

18
lib/models/get_po_notification_body_list_model.dart
Unescape Escape View File

@ -44,22 +44,22 @@ class POHeader {
String? cOMMENTS; String? cOMMENTS;
String? cREATIONDATE; String? cREATIONDATE;
String? cURRENCYNAME; String? cURRENCYNAME;
int? cUSTOMDUTY; num? cUSTOMDUTY;
int? dISCOUNTAMOUNT; num? dISCOUNTAMOUNT;
int? gROSSAMOUNT; num? gROSSAMOUNT;
String? lOCCUR; String? lOCCUR;
int? lOCCURTOTPOAMT; num? lOCCURTOTPOAMT;
int? oTHERCHARGES; num? oTHERCHARGES;
String? pAYMENTTERMS; String? pAYMENTTERMS;
String? pONUMBER; String? pONUMBER;
String? pREPARER; String? pREPARER;
String? qUOTATIONDATE; String? qUOTATIONDATE;
String? qUOTATIONNUMBER; String? qUOTATIONNUMBER;
int? sALESTAX; num? sALESTAX;
int? sHIPHANDLE; num? sHIPHANDLE;
String? sHIPTOLOCATIONNAME; String? sHIPTOLOCATIONNAME;
int? tOTALPODISCOUNT; num? tOTALPODISCOUNT;
int? tOTPOAMT; num? tOTPOAMT;
String? tOTPOAMTWORD; String? tOTPOAMTWORD;
String? vENDORNAME; String? vENDORNAME;
String? vENDORSITECODE; String? vENDORSITECODE;

2
lib/models/itg_forms_models/itg_request_model.dart
Unescape Escape View File

@ -4,7 +4,7 @@ import 'package:mohem_flutter_app/models/itg_forms_models/wf_history_model.dart'
class ITGRequest { class ITGRequest {
List<AllowedActions>? allowedActions; List<AllowedActions>? allowedActions;
Null? attachments; List<dynamic>? attachments;
List<FieldGoups>? fieldGoups; List<FieldGoups>? fieldGoups;
Null? grantFields; Null? grantFields;
List<WFHistory>? wFHistory; List<WFHistory>? wFHistory;

10
lib/models/monthly_pay_slip/get_deductions_List_model.dart
Unescape Escape View File

@ -1,10 +1,10 @@
class GetDeductionsList { class GetDeductionsList {
int? aMOUNT; num? aMOUNT;
String? eLEMENTNAME; String? eLEMENTNAME;
int? fROMROWNUM; num? fROMROWNUM;
int? nOOFROWS; num? nOOFROWS;
int? rOWNUM; num? rOWNUM;
int? tOROWNUM; num? tOROWNUM;
GetDeductionsList( GetDeductionsList(
{this.aMOUNT, {this.aMOUNT,

10
lib/models/monthly_pay_slip/get_earnings_list_model.dart
Unescape Escape View File

@ -1,10 +1,10 @@
class GetEarningsList { class GetEarningsList {
int? aMOUNT; num? aMOUNT;
String? eLEMENTNAME; String? eLEMENTNAME;
int? fROMROWNUM; num? fROMROWNUM;
int? nOOFROWS; num? nOOFROWS;
int? rOWNUM; num? rOWNUM;
int? tOROWNUM; num? tOROWNUM;
GetEarningsList( GetEarningsList(
{this.aMOUNT, {this.aMOUNT,

12
lib/models/monthly_pay_slip/get_summary_of_payment_list_model.dart
Unescape Escape View File

@ -1,10 +1,10 @@
class GetSummaryOfPaymentList { class GetSummaryOfPaymentList {
int? tOTALDEDUCTIONSAMOUNT; num? tOTALDEDUCTIONSAMOUNT;
int? tOTALDEDUCTIONSPERCENTAGE; num? tOTALDEDUCTIONSPERCENTAGE;
int? tOTALEARNINGSAMOUNT; num? tOTALEARNINGSAMOUNT;
int? tOTALEARNINGSPERCENTAGE; num? tOTALEARNINGSPERCENTAGE;
int? tOTALPAYAMOUNT; num? tOTALPAYAMOUNT;
int? tOTALPAYPERCENTAGE; num? tOTALPAYPERCENTAGE;
GetSummaryOfPaymentList( GetSummaryOfPaymentList(
{this.tOTALDEDUCTIONSAMOUNT, {this.tOTALDEDUCTIONSAMOUNT,

2
lib/ui/landing/widget/services_widget.dart
Unescape Escape View File

@ -74,7 +74,7 @@ class ServicesWidget extends StatelessWidget {
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!.toText10(isBold: true),
), ),
RotatedBox( RotatedBox(
quarterTurns: AppState().isArabic(context) ? 2:4, quarterTurns: AppState().isArabic(context) ? 2:4,

10
lib/ui/misc/request_submit_screen.dart
Unescape Escape View File

@ -67,7 +67,7 @@ class _RequestSubmitScreenState extends State<RequestSubmitScreen> {
} }
void submitRequest() async { void submitRequest() async {
try { // try {
Utils.showLoading(context); Utils.showLoading(context);
List<Map<String, dynamic>> list = []; List<Map<String, dynamic>> list = [];
if (attachmentFiles.isNotEmpty) { if (attachmentFiles.isNotEmpty) {
@ -134,10 +134,10 @@ class _RequestSubmitScreenState extends State<RequestSubmitScreen> {
Utils.showToast(LocaleKeys.yourRequestHasBeenSubmittedForApprovals.tr(), longDuration: true); Utils.showToast(LocaleKeys.yourRequestHasBeenSubmittedForApprovals.tr(), longDuration: true);
Navigator.of(context).popUntil((route) => route.settings.name == AppRoutes.dashboard); Navigator.of(context).popUntil((route) => route.settings.name == AppRoutes.dashboard);
Navigator.pushNamed(context, AppRoutes.workList); Navigator.pushNamed(context, AppRoutes.workList);
} catch (ex) { // } catch (ex) {
Utils.hideLoading(context); // Utils.hideLoading(context);
Utils.handleException(ex, context, null); // Utils.handleException(ex, context, null);
} // }
} }
@override @override

24
lib/ui/payslip/monthly_pay_slip_screen.dart
Unescape Escape View File

@ -40,7 +40,7 @@ class _MonthlyPaySlipScreenState extends State<MonthlyPaySlipScreen> {
} }
void getData() async { void getData() async {
try { // try {
Utils.showLoading(context); Utils.showLoading(context);
paySlipList = await MonthlyPaySlipApiClient().getPaySlip(); paySlipList = await MonthlyPaySlipApiClient().getPaySlip();
if (paySlipList.isNotEmpty) { if (paySlipList.isNotEmpty) {
@ -49,14 +49,14 @@ class _MonthlyPaySlipScreenState extends State<MonthlyPaySlipScreen> {
} }
Utils.hideLoading(context); Utils.hideLoading(context);
setState(() {}); setState(() {});
} catch (ex) { // } catch (ex) {
Utils.hideLoading(context); // Utils.hideLoading(context);
Utils.handleException(ex, context, null); // Utils.handleException(ex, context, null);
} // }
} }
Future getDataByActionContextID(int actionContextID, {bool showLoading = false}) async { Future getDataByActionContextID(int actionContextID, {bool showLoading = false}) async {
try { // try {
if (showLoading) { if (showLoading) {
Utils.showLoading(context); Utils.showLoading(context);
} }
@ -74,12 +74,12 @@ class _MonthlyPaySlipScreenState extends State<MonthlyPaySlipScreen> {
Utils.hideLoading(context); Utils.hideLoading(context);
setState(() {}); setState(() {});
} }
} catch (ex) { // } catch (ex) {
if (showLoading) { // if (showLoading) {
Utils.hideLoading(context); // Utils.hideLoading(context);
} // }
Utils.handleException(ex, context, null); // Utils.handleException(ex, context, null);
} // }
} }
@override @override

57
lib/ui/screens/items_for_sale/fragments/add_details_fragment.dart
Unescape Escape View File

@ -190,9 +190,10 @@ class _AddItemDetailsFragmentState extends State<AddItemDetailsFragment> {
6.width, 6.width,
SimpleButton(LocaleKeys.add.tr(), () { SimpleButton(LocaleKeys.add.tr(), () {
ImageOptions.showImageOptionsNew(context, (String image, File file) { ImageOptions.showImageOptionsNew(context, (String image, File file) {
// setState(() { setState(() {
// images.add(image); images.add(image);
// }); Navigator.of(context).pop();
});
}); });
}, fontSize: 14), }, fontSize: 14),
], ],
@ -243,41 +244,43 @@ class _AddItemDetailsFragmentState extends State<AddItemDetailsFragment> {
Future<void> getAdDetails() async { Future<void> getAdDetails() async {
// todo need to change this method later , its not a good approach to do it like this. // 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); if(details.isNotEmpty) {
var body = json.decode(details);
GetRegionsList selectedRegionAd = GetRegionsList(); GetRegionsList selectedRegionAd = GetRegionsList();
GetSaleCategoriesList selectedSaleCategoryAd = GetSaleCategoriesList(); GetSaleCategoriesList selectedSaleCategoryAd = GetSaleCategoriesList();
itemTitle = body["itemTitle"]; itemTitle = body["itemTitle"];
itemDescription = body["itemDescription"]; itemDescription = body["itemDescription"];
selectedItemCondition = body["itemCondition"].toString().toLowerCase(); selectedItemCondition = body["itemCondition"].toString().toLowerCase();
selectedRegionAd.regionID = body["selectedRegion"]["regionID"]; selectedRegionAd.regionID = body["selectedRegion"]["regionID"];
selectedRegionAd.regionName = body["selectedRegion"]["regionName"]; selectedRegionAd.regionName = body["selectedRegion"]["regionName"];
selectedRegion = selectedRegionAd; selectedRegion = selectedRegionAd;
itemPrice = body["itemPrice"]; itemPrice = body["itemPrice"];
selectedSaleCategoryAd.categoryID = body["selectedSaleCategory"]["categoryID"]; selectedSaleCategoryAd.categoryID = body["selectedSaleCategory"]["categoryID"];
selectedSaleCategoryAd.title = body["selectedSaleCategory"]["title"]; selectedSaleCategoryAd.title = body["selectedSaleCategory"]["title"];
if (body["itemPhotos"].length != 0) { if (body["itemPhotos"].length != 0) {
images.add(body["itemPhotos"][0]); images.add(body["itemPhotos"][0]);
} }
ItemReviewModel itemReviewModel = ItemReviewModel itemReviewModel =
ItemReviewModel(body["itemTitle"], body["itemDescription"], body["itemCondition"].toString().toLowerCase(), selectedRegionAd, body["itemPrice"], images, selectedSaleCategoryAd); ItemReviewModel(body["itemTitle"], body["itemDescription"], body["itemCondition"].toString().toLowerCase(), selectedRegionAd, body["itemPrice"], images, selectedSaleCategoryAd);
AddItemDetailsFragment.itemReviewModel = itemReviewModel; AddItemDetailsFragment.itemReviewModel = itemReviewModel;
SelectCategoryFragment.selectedSaleCategory = selectedSaleCategoryAd; SelectCategoryFragment.selectedSaleCategory = selectedSaleCategoryAd;
}
} }
void getRegions() async { void getRegions() async {
try { // try {
Utils.showLoading(context); Utils.showLoading(context);
getRegionsList = await ItemsForSaleApiClient().getRegions(); getRegionsList = await ItemsForSaleApiClient().getRegions();
await getAdDetails(); await getAdDetails();
Utils.hideLoading(context); Utils.hideLoading(context);
setState(() {}); setState(() {});
} catch (ex) { // } catch (ex) {
Utils.hideLoading(context); // Utils.hideLoading(context);
Utils.handleException(ex, context, null); // Utils.handleException(ex, context, null);
} // }
} }
} }

10
lib/ui/work_list/itg_detail_screen.dart
Unescape Escape View File

@ -56,7 +56,7 @@ class _ItgDetailScreenState extends State<ItgDetailScreen> {
ITGRequest? itgRequest; ITGRequest? itgRequest;
void getItgData() async { void getItgData() async {
try { // try {
Utils.showLoading(context); Utils.showLoading(context);
itgRequest = await WorkListApiClient().getITGFormDetails(requestDetails!.requestType!, requestDetails!.iD!, requestDetails!.itemID!, ""); itgRequest = await WorkListApiClient().getITGFormDetails(requestDetails!.requestType!, requestDetails!.iD!, requestDetails!.itemID!, "");
allowedActionList = itgRequest?.allowedActions ?? []; allowedActionList = itgRequest?.allowedActions ?? [];
@ -68,10 +68,10 @@ class _ItgDetailScreenState extends State<ItgDetailScreen> {
} }
Utils.hideLoading(context); Utils.hideLoading(context);
setState(() {}); setState(() {});
} catch (ex) { // } catch (ex) {
Utils.hideLoading(context); // Utils.hideLoading(context);
Utils.handleException(ex, context, null); // Utils.handleException(ex, context, null);
} // }
} }
void getDataFromState() { void getDataFromState() {

6
lib/ui/work_list/worklist_fragments/attachments_fragment.dart
Unescape Escape View File

@ -28,9 +28,9 @@ class AttachmentsFragment extends StatelessWidget {
(getAttachmentList[index].fILENAME?.capitalizeFirstofEach ?? "").toText16().expanded, (getAttachmentList[index].fILENAME?.capitalizeFirstofEach ?? "").toText16().expanded,
], ],
).objectContainerView().onPress(() async { ).objectContainerView().onPress(() async {
print("calling"); // print("calling");
String path = await _createFileFromString(getAttachmentList[index].fILEDATA ?? "", getAttachmentList[index].fILECONTENTTYPE ?? ""); // String path = await _createFileFromString(getAttachmentList[index].fILEDATA ?? "", getAttachmentList[index].fILECONTENTTYPE ?? "");
OpenFile.open(path); // OpenFile.open(path);
}); });
}, },
separatorBuilder: (BuildContext context, int index) => 12.height, separatorBuilder: (BuildContext context, int index) => 12.height,

4
lib/ui/work_list/worklist_fragments/detail_fragment.dart
Unescape Escape View File

@ -43,12 +43,12 @@ class _DetailFragmentState extends State<DetailFragment> {
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [
ItemDetailView(LocaleKeys.employeeNumber.tr(), widget.memberInformationListModel!.eMPLOYEENUMBER ?? ""), ItemDetailView(LocaleKeys.employeeNumber.tr(), widget.memberInformationListModel!.eMPLOYEENUMBER ?? ""),
ItemDetailView(LocaleKeys.employeeName.tr(), (AppState().isArabic(context) ? widget.memberInformationListModel!.eMPLOYEENAMEAr : widget.memberInformationListModel!.eMPLOYEENAMEEn) ?? ""), ItemDetailView(LocaleKeys.name.tr(), (AppState().isArabic(context) ? widget.memberInformationListModel!.eMPLOYEENAMEAr : widget.memberInformationListModel!.eMPLOYEENAMEEn) ?? ""),
ItemDetailView(LocaleKeys.jobTitle.tr(), makePositionName(widget.memberInformationListModel!.pOSITIONNAME ?? "")), ItemDetailView(LocaleKeys.jobTitle.tr(), makePositionName(widget.memberInformationListModel!.pOSITIONNAME ?? "")),
ItemDetailView(LocaleKeys.grade.tr(), widget.memberInformationListModel!.gRADENAME ?? ""), ItemDetailView(LocaleKeys.grade.tr(), widget.memberInformationListModel!.gRADENAME ?? ""),
ItemDetailView(LocaleKeys.jobCategory.tr(), makePositionName(widget.memberInformationListModel!.pOSITIONNAME ?? "")), ItemDetailView(LocaleKeys.jobCategory.tr(), makePositionName(widget.memberInformationListModel!.pOSITIONNAME ?? "")),
ItemDetailView(LocaleKeys.category.tr(), widget.memberInformationListModel!.eMPLOYMENTCATEGORYMEANING ?? ""), ItemDetailView(LocaleKeys.category.tr(), widget.memberInformationListModel!.eMPLOYMENTCATEGORYMEANING ?? ""),
ItemDetailView(LocaleKeys.employeeEmailAddress.tr(), widget.memberInformationListModel!.eMPLOYEEEMAILADDRESS ?? ""), ItemDetailView(LocaleKeys.email.tr(), widget.memberInformationListModel!.eMPLOYEEEMAILADDRESS ?? ""),
ItemDetailView(LocaleKeys.payrollBranch.tr(), widget.memberInformationListModel!.pAYROLLNAME ?? ""), ItemDetailView(LocaleKeys.payrollBranch.tr(), widget.memberInformationListModel!.pAYROLLNAME ?? ""),
], ],
).objectContainerView(), ).objectContainerView(),

8
lib/ui/work_list/worklist_fragments/info_fragments.dart
Unescape Escape View File

@ -114,7 +114,7 @@ class InfoFragment extends StatelessWidget {
ItemDetailView(LocaleKeys.totalPOAmountInWords.tr(), poHeaderList[index].tOTPOAMTWORD ?? ""), ItemDetailView(LocaleKeys.totalPOAmountInWords.tr(), poHeaderList[index].tOTPOAMTWORD ?? ""),
], ],
).objectContainerView(), ).objectContainerView(),
separatorBuilder: (cxt, index) => 4.height, separatorBuilder: (cxt, index) => 1.divider,
itemCount: poHeaderList.length); itemCount: poHeaderList.length);
} }
@ -150,7 +150,7 @@ class InfoFragment extends StatelessWidget {
ItemDetailView(LocaleKeys.approvedSwipeEndReason.tr(), list[index].aPPROVEDENDREASONDESC.toString()), ItemDetailView(LocaleKeys.approvedSwipeEndReason.tr(), list[index].aPPROVEDENDREASONDESC.toString()),
], ],
), ),
separatorBuilder: (cxt, index) => 18.height, separatorBuilder: (cxt, index) => 1.divider.paddingOnly(top: 8, bottom: 8),
itemCount: list.length); itemCount: list.length);
} }
@ -163,11 +163,11 @@ class InfoFragment extends StatelessWidget {
children: [ children: [
ItemDetailView(LocaleKeys.employeeNumber.tr(), list[index].eMPLOYEENUMBER.toString()), ItemDetailView(LocaleKeys.employeeNumber.tr(), list[index].eMPLOYEENUMBER.toString()),
ItemDetailView(LocaleKeys.assignmentNumber.tr(), list[index].aSSIGNMENTNUMBER.toString()), ItemDetailView(LocaleKeys.assignmentNumber.tr(), list[index].aSSIGNMENTNUMBER.toString()),
ItemDetailView(LocaleKeys.employeeName.tr(), list[index].eMPLOYEENAME.toString()), ItemDetailView(LocaleKeys.name.tr(), list[index].eMPLOYEENAME.toString()),
ItemDetailView(LocaleKeys.scheduleDate.tr(), DateUtil.formatDateToDate(DateUtil.convertStringToDate(list[index].sCHEDULEDATE.toString()), false)), ItemDetailView(LocaleKeys.scheduleDate.tr(), DateUtil.formatDateToDate(DateUtil.convertStringToDate(list[index].sCHEDULEDATE.toString()), false)),
], ],
), ),
separatorBuilder: (cxt, index) => 18.height, separatorBuilder: (cxt, index) => 1.divider.paddingOnly(top: 8, bottom: 8),
itemCount: list.length); itemCount: list.length);
} }

37
lib/widgets/bottom_sheets/attachment_options.dart
Unescape Escape View File

@ -26,9 +26,9 @@ class AttachmentOptions extends StatelessWidget {
padding: const EdgeInsets.only(top: 21, bottom: 14), padding: const EdgeInsets.only(top: 21, bottom: 14),
shrinkWrap: true, shrinkWrap: true,
children: [ children: [
itemView("open_camera.svg", "Open\nCamera"), itemView("open_camera.svg", "Open\nCamera", onCameraTap),
itemView("gallery.svg", "Upload from\nGallery"), itemView("gallery.svg", "Upload from\nGallery", onGalleryTap),
itemView("files.svg", "Upload from\nFiles"), itemView("files.svg", "Upload from\nFiles", onFilesTap),
], ],
) )
], ],
@ -36,19 +36,22 @@ class AttachmentOptions extends StatelessWidget {
); );
} }
Widget itemView(String icon, String title) { Widget itemView(String icon, String title, VoidCallback onTap) {
return Column( return InkWell(
crossAxisAlignment: CrossAxisAlignment.start, onTap: onTap,
mainAxisAlignment: MainAxisAlignment.spaceBetween, child: Column(
children: [ crossAxisAlignment: CrossAxisAlignment.start,
SvgPicture.asset("assets/images/$icon"), mainAxisAlignment: MainAxisAlignment.spaceBetween,
title.toText11(isBold: true), children: [
], SvgPicture.asset("assets/images/$icon"),
).paddingOnly(left: 13, right: 13, top: 16, bottom: 12).expanded.objectContainerBorderView( title.toText11(isBold: true),
disablePadding: true, ],
radius: 10, ).paddingOnly(left: 13, right: 13, top: 16, bottom: 12).expanded.objectContainerBorderView(
color: MyColors.greyF7Color.withOpacity(.48), disablePadding: true,
borderColor: MyColors.lightGreyE5Color.withOpacity(.48), radius: 10,
); color: MyColors.greyF7Color.withOpacity(.48),
borderColor: MyColors.lightGreyE5Color.withOpacity(.48),
),
);
} }
} }

26
lib/widgets/image_picker.dart
Unescape Escape View File

@ -15,9 +15,31 @@ class ImageOptions {
context, context,
child: AttachmentOptions( child: AttachmentOptions(
onCameraTap: () async { onCameraTap: () async {
PickedFile? path = await ImagePicker.platform.pickImage(source: ImageSource.camera, imageQuality: 20); if (Platform.isAndroid) {
cameraImageAndroid(image);
} else {
File _image = File((await ImagePicker.platform.pickImage(source: ImageSource.camera, imageQuality: 20))?.path ?? "");
String fileName = _image.path;
var bytes = File(fileName).readAsBytesSync();
String base64Encode = base64.encode(bytes);
if (base64Encode != null) {
image(base64Encode, _image);
}
}
},
onGalleryTap: () async {
if (Platform.isAndroid) {
galleryImageAndroid(image);
} else {
File _image = File((await ImagePicker.platform.pickImage(source: ImageSource.gallery, imageQuality: 20))?.path ?? "");
String fileName = _image.path;
var bytes = File(fileName).readAsBytesSync();
String base64Encode = base64.encode(bytes);
if (base64Encode != null) {
image(base64Encode, _image);
}
}
}, },
onGalleryTap: () {},
onFilesTap: () async { onFilesTap: () async {
FilePickerResult? result = await FilePicker.platform.pickFiles(); FilePickerResult? result = await FilePicker.platform.pickFiles();
}, },

Write Preview
Loading…
Cancel
Save