From 11881b0ba1a8792b6a7e270b20c44d0641ba7ac2 Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Wed, 16 Oct 2024 18:07:00 +0300 Subject: [PATCH] hotfix for payment request WL --- assets/langs/ar-SA.json | 17 +- assets/langs/en-US.json | 17 +- lib/generated/codegen_loader.g.dart | 25 +- lib/generated/locale_keys.g.dart | 14 + lib/ui/work_list/itg_detail_screen.dart | 1 + .../worklist_fragments/info_fragments.dart | 656 ++++++++++-------- 6 files changed, 429 insertions(+), 301 deletions(-) diff --git a/assets/langs/ar-SA.json b/assets/langs/ar-SA.json index c59641b..6370baf 100644 --- a/assets/langs/ar-SA.json +++ b/assets/langs/ar-SA.json @@ -544,5 +544,20 @@ "addAtLeastOneAttachment": "الرجاء إضافة مرفق واحد على الأقل.", "pleaseClickButtonToJoinMarathon": "الرجاء الضغط على الزر أدناه للانضمام إلى الماراثون", "youCannotJoinTheMarathon": "لا يمكنك الانضمام إلى الماراثون لأنك تجاوزت الحد الزمني", - "open": "يفتح" + "open": "يفتح", + "requesterOperatingUnit":"وحدة تشغيل مقدم الطلب", + "prepareEmpNum":"إعداد رقم الموظف", + "supplierInfo" : "معلومات المورد", + "supplierAcNo": "رقم حساب المورد", + "supplierAcName": "اسم حساب المورد", + "supplierIBAN" : "رقم IBAN للمورد", + "supplierCRNo" :"رقم السجل التجاري", + "suppliedAcNo" : "رقم الحساب المقدم", + "patientRefundInvoice" : "فاتورة استرداد الأموال للمريض", + "patientNumber" : "رقم المريض", + "patientName" : "اسم المريض", + "invoiceDate" : "تاريخ الفاتورة", + "refundInvoice" :"فاتورة الاسترجاع", + "hospitalClinic" : "عيادة المستشفى" + } \ No newline at end of file diff --git a/assets/langs/en-US.json b/assets/langs/en-US.json index 275864f..61bba1d 100644 --- a/assets/langs/en-US.json +++ b/assets/langs/en-US.json @@ -563,5 +563,20 @@ "open": "open", "addAtLeastOneAttachment": "Please add at least one attachment.", "pleaseClickButtonToJoinMarathon": "Press the button below to join the Marathon.", - "youCannotJoinTheMarathon": "You cannot join the Marathon because you have exceeded the time limit." + "youCannotJoinTheMarathon": "You cannot join the Marathon because you have exceeded the time limit.", + "requesterOperatingUnit":"Requester Operating Unit", + "prepareEmpNum":"Prepare Employee Num", + "supplierInfo" : "Supplier Information", + "supplierAcNo": "Supplier Account No", + "supplierAcName":"Supplier Account Name", + "supplierIBAN" : "Supplier IBAN", + "supplierCRNo" : "CR Number", + "suppliedAcNo" : "Supplied Account No.", + "patientRefundInvoice" : "Patient Refund Invoice", + "patientNumber" : "Patient Number", + "patientName" : "Patient Name", + "invoiceDate" : "Invoice Date", + "refundInvoice" :"Refund Invoice", + "hospitalClinic" : "Hospital Clinic" + } \ No newline at end of file diff --git a/lib/generated/codegen_loader.g.dart b/lib/generated/codegen_loader.g.dart index 4a0d665..357d6eb 100644 --- a/lib/generated/codegen_loader.g.dart +++ b/lib/generated/codegen_loader.g.dart @@ -575,7 +575,10 @@ class CodegenLoader extends AssetLoader { "pOAmount":"مبلغ الطلب", "versionStatus":"حالة الإصدار", "supplierNo":"رقم المورد", - "general":"عام" + "general":"عام", + "requesterOperatingUnit":"وحدة تشغيل مقدم الطلب", + "prepareEmpNum":"إعداد رقم الموظف", + }; static const Map en_US = { "mohemm": "Mohemm", @@ -1157,7 +1160,25 @@ class CodegenLoader extends AssetLoader { "pOAmount":"PO Amount", "versionStatus":"Version Status", "supplierNo":"Supplier No", - "general":"General" + "general":"General", + "prepareEmpNum":"Prepare Employee Num", + "requesterOperatingUnit":"Requester Operating Unit", + "supplierInfo" : "Supplier Information", + "supplierNum": "Supplier Number", + "supplierAcNo": "Supplier Account Number", + "supplierAcName" : 'Supplier Account Name', + "supplierIBAN" : 'Supplier IBAN', + "supplierCRNo" : 'CR Number', + "suppliedAcNo" : 'Supplied Account No.', + "patientRefundInvoice" : 'Patient Refund Invoice', + "patientNumber" : 'Patient Number', + "patientName" : 'Patient Name', + "invoiceDate" : 'Invoice Date', + "refundInvoice" : 'Refund Invoice', + "hospitalClinic" : 'Hospital Clinic', + + + }; static const Map> mapLocales = {"ar_SA": ar_SA, "en_US": en_US}; } diff --git a/lib/generated/locale_keys.g.dart b/lib/generated/locale_keys.g.dart index 0ec89e4..9faea5a 100644 --- a/lib/generated/locale_keys.g.dart +++ b/lib/generated/locale_keys.g.dart @@ -575,5 +575,19 @@ abstract class LocaleKeys { static const versionStatus ='versionStatus'; static const supplierNo ='supplierNo'; static const general ="general"; + static const supplierInfo = 'supplierInfo'; + static const supplierAcNo = 'supplierAcNo'; + static const supplierAcName = 'supplierAcName'; + static const supplierIBAN = 'Supplier IBAN'; + static const supplierCRNo = 'CR Number'; + static const suppliedAcNo = 'Supplied Account No.'; + static const patientRefundInvoice = "patientRefundInvoice"; + static const patientNumber = 'Patient Number'; + static const patientName = 'Patient Name'; + static const invoiceDate = 'Invoice Date'; + static const refundInvoice = 'Refund Invoice'; + static const hospitalClinic = 'Hospital Clinic'; + static const requesterOperatingUnit ='requesterOperatingUnit'; + static const prepareEmpNum ='prepareEmpNum'; } diff --git a/lib/ui/work_list/itg_detail_screen.dart b/lib/ui/work_list/itg_detail_screen.dart index 2381b70..8cb7944 100644 --- a/lib/ui/work_list/itg_detail_screen.dart +++ b/lib/ui/work_list/itg_detail_screen.dart @@ -95,6 +95,7 @@ class _ItgDetailScreenState extends State { requestDetails = AppState().requestAllList![AppState().itgWorkListIndex!]; // ModalRoute.of(context)!.settings.arguments as WorkListResponseModel; providerData.itgFormsModel!.totalCount = providerData.itgFormsModel!.totalCount! - 1; getItgData(); + Utils.hideLoading(context); getItgRequestAttachments(); } } diff --git a/lib/ui/work_list/worklist_fragments/info_fragments.dart b/lib/ui/work_list/worklist_fragments/info_fragments.dart index 1351126..76f2ace 100644 --- a/lib/ui/work_list/worklist_fragments/info_fragments.dart +++ b/lib/ui/work_list/worklist_fragments/info_fragments.dart @@ -29,11 +29,11 @@ class InfoFragment extends StatelessWidget { List? getStampNsNotifications; List itemCreationHeader; List? - getEitCollectionNotificationBodyList; + getEitCollectionNotificationBodyList; List? getPhonesNotificationBodyList; List? getBasicDetNtfBodyList; List? - getAbsenceCollectionNotificationBodyList; + getAbsenceCollectionNotificationBodyList; GetContactNotificationBodyList? getContactNotificationBodyList; GetPrNotificationBodyList? getPrNotificationBodyList; List? getAddressNotificationBodyList = []; @@ -42,19 +42,19 @@ class InfoFragment extends StatelessWidget { InfoFragment( {this.workListData, - this.poHeaderList = const [], - this.itemCreationHeader = const [], - this.getStampMsNotifications, - this.getStampNsNotifications, - this.getEitCollectionNotificationBodyList, - this.getPhonesNotificationBodyList, - this.getBasicDetNtfBodyList, - this.getAbsenceCollectionNotificationBodyList, - this.getContactNotificationBodyList, - this.getPrNotificationBodyList, - this.getAddressNotificationBodyList, - this.getTerminationNotificationBodyList, - this.getPaymentNotificationBodyList}); + this.poHeaderList = const [], + this.itemCreationHeader = const [], + this.getStampMsNotifications, + this.getStampNsNotifications, + this.getEitCollectionNotificationBodyList, + this.getPhonesNotificationBodyList, + this.getBasicDetNtfBodyList, + this.getAbsenceCollectionNotificationBodyList, + this.getContactNotificationBodyList, + this.getPrNotificationBodyList, + this.getAddressNotificationBodyList, + this.getTerminationNotificationBodyList, + this.getPaymentNotificationBodyList}); double itemHeight = 0; double itemWidth = 0; @@ -120,7 +120,7 @@ class InfoFragment extends StatelessWidget { getAbsenceCollectionNotificationBodyList ?? []), if (getContactNotificationBodyList != null) getContactNotificationBodyListWidget(getContactNotificationBodyList ?? - GetContactNotificationBodyList()) + GetContactNotificationBodyList()) .objectContainerView(), if (getAddressNotificationBodyList?.isNotEmpty ?? false) getAddressNotificationBodyListWidget(getAddressNotificationBodyList!), @@ -129,7 +129,7 @@ class InfoFragment extends StatelessWidget { getTerminationNotificationBodyList!), if (getPaymentNotificationBodyList != null) getPaymentNotificationBodyListWidget(getPaymentNotificationBodyList ?? - GetPaymentNotificationBodyList()) + GetPaymentNotificationBodyList()) .objectContainerView(), ]; return Container( @@ -138,9 +138,9 @@ class InfoFragment extends StatelessWidget { child: uiList.isEmpty ? LocaleKeys.noDataAvailable.tr().toText16().center : ListView( - padding: const EdgeInsets.all(21), - children: uiList, - ), + padding: const EdgeInsets.all(21), + children: uiList, + ), ); } @@ -149,93 +149,93 @@ class InfoFragment extends StatelessWidget { shrinkWrap: true, physics: const NeverScrollableScrollPhysics(), itemBuilder: (BuildContext cxt, int index) => Column( - crossAxisAlignment: CrossAxisAlignment.start, - mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + Column( + children: [ + ItemDetailGrid( + ItemDetailViewCol(LocaleKeys.description.tr(), + workListData!.fROMUSER ?? ""), + ItemDetailViewCol( + LocaleKeys.from.tr(), workListData!.fROMUSER ?? ""), + ), + ItemDetailGrid( + ItemDetailViewCol( + LocaleKeys.to.tr(), workListData!.tOUSER ?? ""), + ItemDetailViewCol( + LocaleKeys.sent.tr(), workListData!.bEGINDATE ?? ""), + ), + ItemDetailGrid( + ItemDetailViewCol( + LocaleKeys.closed.tr(), workListData!.eNDDATE ?? ""), + ItemDetailViewCol(LocaleKeys.id.tr(), + workListData!.nOTIFICATIONID?.toString() ?? ""), + ), + ItemDetailGrid( + ItemDetailViewCol(LocaleKeys.supplier.tr(), + poHeaderList[index].vENDORNAME ?? ""), + ItemDetailViewCol(LocaleKeys.site.tr(), + poHeaderList[index].vENDORSITECODE ?? ""), + ), + ItemDetailGrid( + ItemDetailViewCol(LocaleKeys.buyer.tr(), + poHeaderList[index].bUYER ?? ""), + ItemDetailViewCol(LocaleKeys.preparer.tr(), + poHeaderList[index].pREPARER ?? ""), + ), + ItemDetailGrid( + ItemDetailViewCol(LocaleKeys.creationDate.tr(), + poHeaderList[index].cREATIONDATE ?? ""), + ItemDetailViewCol(LocaleKeys.shipToLocation.tr(), + poHeaderList[index].sHIPTOLOCATIONNAME ?? ""), + ), + ItemDetailGrid( + ItemDetailViewCol(LocaleKeys.quotationNumber.tr(), + poHeaderList[index].qUOTATIONNUMBER ?? ""), + ItemDetailViewCol(LocaleKeys.quotationDate.tr(), + poHeaderList[index].qUOTATIONDATE ?? ""), + ), + ItemDetailGrid( + ItemDetailViewCol(LocaleKeys.paymentTerms.tr(), + poHeaderList[index].pAYMENTTERMS ?? ""), + ItemDetailViewCol(LocaleKeys.currency.tr(), + poHeaderList[index].cURRENCYNAME ?? ""), + isItLast: true, + ), + ], + ).objectContainerView(title: LocaleKeys.infoDetail.tr()), + 12.height, + Column( children: [ - Column( - children: [ - ItemDetailGrid( - ItemDetailViewCol(LocaleKeys.description.tr(), - workListData!.fROMUSER ?? ""), - ItemDetailViewCol( - LocaleKeys.from.tr(), workListData!.fROMUSER ?? ""), - ), - ItemDetailGrid( - ItemDetailViewCol( - LocaleKeys.to.tr(), workListData!.tOUSER ?? ""), - ItemDetailViewCol( - LocaleKeys.sent.tr(), workListData!.bEGINDATE ?? ""), - ), - ItemDetailGrid( - ItemDetailViewCol( - LocaleKeys.closed.tr(), workListData!.eNDDATE ?? ""), - ItemDetailViewCol(LocaleKeys.id.tr(), - workListData!.nOTIFICATIONID?.toString() ?? ""), - ), - ItemDetailGrid( - ItemDetailViewCol(LocaleKeys.supplier.tr(), - poHeaderList[index].vENDORNAME ?? ""), - ItemDetailViewCol(LocaleKeys.site.tr(), - poHeaderList[index].vENDORSITECODE ?? ""), - ), - ItemDetailGrid( - ItemDetailViewCol(LocaleKeys.buyer.tr(), - poHeaderList[index].bUYER ?? ""), - ItemDetailViewCol(LocaleKeys.preparer.tr(), - poHeaderList[index].pREPARER ?? ""), - ), - ItemDetailGrid( - ItemDetailViewCol(LocaleKeys.creationDate.tr(), - poHeaderList[index].cREATIONDATE ?? ""), - ItemDetailViewCol(LocaleKeys.shipToLocation.tr(), - poHeaderList[index].sHIPTOLOCATIONNAME ?? ""), - ), - ItemDetailGrid( - ItemDetailViewCol(LocaleKeys.quotationNumber.tr(), - poHeaderList[index].qUOTATIONNUMBER ?? ""), - ItemDetailViewCol(LocaleKeys.quotationDate.tr(), - poHeaderList[index].qUOTATIONDATE ?? ""), - ), - ItemDetailGrid( - ItemDetailViewCol(LocaleKeys.paymentTerms.tr(), - poHeaderList[index].pAYMENTTERMS ?? ""), - ItemDetailViewCol(LocaleKeys.currency.tr(), - poHeaderList[index].cURRENCYNAME ?? ""), - isItLast: true, - ), - ], - ).objectContainerView(title: LocaleKeys.infoDetail.tr()), - 12.height, - Column( - children: [ - ItemDetailGrid( - ItemDetailViewCol(LocaleKeys.grossAmount.tr(), - poHeaderList[index].gROSSAMOUNT?.toString() ?? ""), - ItemDetailViewCol(LocaleKeys.discountAmount.tr(), - poHeaderList[index].dISCOUNTAMOUNT?.toString() ?? ""), - ), - ItemDetailGrid( - ItemDetailViewCol(LocaleKeys.customDuty.tr(), - poHeaderList[index].cUSTOMDUTY?.toString() ?? ""), - ItemDetailViewCol(LocaleKeys.shipHandle.tr(), - poHeaderList[index].sHIPHANDLE?.toString() ?? ""), - ), - ItemDetailGrid( - ItemDetailViewCol(LocaleKeys.otherCharges.tr(), - poHeaderList[index].oTHERCHARGES?.toString() ?? ""), - ItemDetailViewCol(LocaleKeys.totalPOAmountWithVAT.tr(), - poHeaderList[index].lOCCURTOTPOAMT.toString() ?? ""), - ), - ItemDetailGrid( - ItemDetailViewCol(LocaleKeys.totalPOAmountInWords.tr(), - poHeaderList[index].tOTPOAMTWORD ?? ""), - Container(), - isItLast: true, - ), - ], - ).objectContainerView(title: LocaleKeys.amount_detail.tr()), + ItemDetailGrid( + ItemDetailViewCol(LocaleKeys.grossAmount.tr(), + poHeaderList[index].gROSSAMOUNT?.toString() ?? ""), + ItemDetailViewCol(LocaleKeys.discountAmount.tr(), + poHeaderList[index].dISCOUNTAMOUNT?.toString() ?? ""), + ), + ItemDetailGrid( + ItemDetailViewCol(LocaleKeys.customDuty.tr(), + poHeaderList[index].cUSTOMDUTY?.toString() ?? ""), + ItemDetailViewCol(LocaleKeys.shipHandle.tr(), + poHeaderList[index].sHIPHANDLE?.toString() ?? ""), + ), + ItemDetailGrid( + ItemDetailViewCol(LocaleKeys.otherCharges.tr(), + poHeaderList[index].oTHERCHARGES?.toString() ?? ""), + ItemDetailViewCol(LocaleKeys.totalPOAmountWithVAT.tr(), + poHeaderList[index].lOCCURTOTPOAMT.toString() ?? ""), + ), + ItemDetailGrid( + ItemDetailViewCol(LocaleKeys.totalPOAmountInWords.tr(), + poHeaderList[index].tOTPOAMTWORD ?? ""), + Container(), + isItLast: true, + ), ], - ), + ).objectContainerView(title: LocaleKeys.amount_detail.tr()), + ], + ), separatorBuilder: (BuildContext cxt, int index) => 4.height, itemCount: poHeaderList.length); } @@ -256,55 +256,55 @@ class InfoFragment extends StatelessWidget { shrinkWrap: true, physics: const NeverScrollableScrollPhysics(), itemBuilder: (BuildContext cxt, int index) => Column( - mainAxisSize: MainAxisSize.min, - children: [ - ItemDetailGrid( - ItemDetailViewCol(LocaleKeys.employeeNumber.tr(), - list[index].eMPLOYEENUMBER.toString()), - ItemDetailViewCol(LocaleKeys.assignmentNumber.tr(), - list[index].aSSIGNMENTNUMBER.toString()), - ), - ItemDetailGrid( - ItemDetailViewCol(LocaleKeys.employeeName.tr(), - list[index].eMPLOYEENAME.toString()), - ItemDetailViewCol( - LocaleKeys.scheduleDate.tr(), - DateUtil.formatDateToDate( - DateUtil.convertStringToDate( - list[index].sCHEDULEDATE.toString()), - false)), - ), - ItemDetailGrid( - ItemDetailViewCol(LocaleKeys.shiftType.tr(), - list[index].sHTTYPEDESC.toString()), - ItemDetailViewCol( - LocaleKeys.shift.tr(), list[index].sHTNAME.toString()), - ), - ItemDetailGrid( - ItemDetailViewCol(LocaleKeys.breakText.tr(), - list[index].bREAKNAME.toString()), - ItemDetailViewCol(LocaleKeys.actualSwipeStart.tr(), - list[index].sHTACTUALSTARTTIME.toString()), - ), - ItemDetailGrid( - ItemDetailViewCol(LocaleKeys.actualSwipeEnd.tr(), - list[index].sHTACTUALENDTIME.toString()), - ItemDetailViewCol(LocaleKeys.approvedSwipeStart.tr(), - list[index].aPPROVEDSTARTTIME.toString()), - ), - ItemDetailGrid( - ItemDetailViewCol(LocaleKeys.approvedSwipeStartReason.tr(), - list[index].aPPROVEDSTARTREASON.toString()), - ItemDetailViewCol(LocaleKeys.approvedSwipeEnd.tr(), ""), - ), - ItemDetailGrid( - ItemDetailViewCol(LocaleKeys.approvedSwipeEndReason.tr(), - list[index].aPPROVEDENDREASONDESC.toString()), - Container(), - isItLast: true, - ), - ], - ).objectContainerView(), + mainAxisSize: MainAxisSize.min, + children: [ + ItemDetailGrid( + ItemDetailViewCol(LocaleKeys.employeeNumber.tr(), + list[index].eMPLOYEENUMBER.toString()), + ItemDetailViewCol(LocaleKeys.assignmentNumber.tr(), + list[index].aSSIGNMENTNUMBER.toString()), + ), + ItemDetailGrid( + ItemDetailViewCol(LocaleKeys.employeeName.tr(), + list[index].eMPLOYEENAME.toString()), + ItemDetailViewCol( + LocaleKeys.scheduleDate.tr(), + DateUtil.formatDateToDate( + DateUtil.convertStringToDate( + list[index].sCHEDULEDATE.toString()), + false)), + ), + ItemDetailGrid( + ItemDetailViewCol(LocaleKeys.shiftType.tr(), + list[index].sHTTYPEDESC.toString()), + ItemDetailViewCol( + LocaleKeys.shift.tr(), list[index].sHTNAME.toString()), + ), + ItemDetailGrid( + ItemDetailViewCol(LocaleKeys.breakText.tr(), + list[index].bREAKNAME.toString()), + ItemDetailViewCol(LocaleKeys.actualSwipeStart.tr(), + list[index].sHTACTUALSTARTTIME.toString()), + ), + ItemDetailGrid( + ItemDetailViewCol(LocaleKeys.actualSwipeEnd.tr(), + list[index].sHTACTUALENDTIME.toString()), + ItemDetailViewCol(LocaleKeys.approvedSwipeStart.tr(), + list[index].aPPROVEDSTARTTIME.toString()), + ), + ItemDetailGrid( + ItemDetailViewCol(LocaleKeys.approvedSwipeStartReason.tr(), + list[index].aPPROVEDSTARTREASON.toString()), + ItemDetailViewCol(LocaleKeys.approvedSwipeEnd.tr(), ""), + ), + ItemDetailGrid( + ItemDetailViewCol(LocaleKeys.approvedSwipeEndReason.tr(), + list[index].aPPROVEDENDREASONDESC.toString()), + Container(), + isItLast: true, + ), + ], + ).objectContainerView(), separatorBuilder: (BuildContext cxt, int index) => 1.height.paddingOnly(top: 8, bottom: 8), itemCount: list.length); @@ -316,27 +316,27 @@ class InfoFragment extends StatelessWidget { shrinkWrap: true, physics: const NeverScrollableScrollPhysics(), itemBuilder: (BuildContext cxt, int index) => Column( - mainAxisSize: MainAxisSize.min, - children: [ - ItemDetailGrid( - ItemDetailViewCol(LocaleKeys.employeeNumber.tr(), - list[index].eMPLOYEENUMBER.toString()), - ItemDetailViewCol(LocaleKeys.assignmentNumber.tr(), - list[index].aSSIGNMENTNUMBER.toString()), - ), - ItemDetailGrid( - ItemDetailViewCol(LocaleKeys.employeeName.tr(), - list[index].eMPLOYEENAME.toString()), - ItemDetailViewCol( - LocaleKeys.scheduleDate.tr(), - DateUtil.formatDateToDate( - DateUtil.convertStringToDate( - list[index].sCHEDULEDATE.toString()), - false)), - isItLast: true, - ), - ], - ).objectContainerView(), + mainAxisSize: MainAxisSize.min, + children: [ + ItemDetailGrid( + ItemDetailViewCol(LocaleKeys.employeeNumber.tr(), + list[index].eMPLOYEENUMBER.toString()), + ItemDetailViewCol(LocaleKeys.assignmentNumber.tr(), + list[index].aSSIGNMENTNUMBER.toString()), + ), + ItemDetailGrid( + ItemDetailViewCol(LocaleKeys.employeeName.tr(), + list[index].eMPLOYEENAME.toString()), + ItemDetailViewCol( + LocaleKeys.scheduleDate.tr(), + DateUtil.formatDateToDate( + DateUtil.convertStringToDate( + list[index].sCHEDULEDATE.toString()), + false)), + isItLast: true, + ), + ], + ).objectContainerView(), separatorBuilder: (BuildContext cxt, int index) => 1.height.paddingOnly(top: 8, bottom: 8), itemCount: list.length); @@ -347,48 +347,48 @@ class InfoFragment extends StatelessWidget { shrinkWrap: true, physics: const NeverScrollableScrollPhysics(), itemBuilder: (BuildContext cxt, int index) => Column( - mainAxisSize: MainAxisSize.min, - children: [ - ItemDetailGrid( - ItemDetailViewCol( - LocaleKeys.operatingUnit.tr(), - itemCreationHeader[index].oPERATINGUNIT?.toString() ?? - ""), - ItemDetailViewCol(LocaleKeys.category.tr(), - itemCreationHeader[index].cATEGORY?.toString() ?? ""), - ), - ItemDetailGrid( - ItemDetailViewCol(LocaleKeys.requester.tr(), - itemCreationHeader[index].rEQUESTER?.toString() ?? ""), - ItemDetailViewCol(LocaleKeys.analyzedBy.tr(), - itemCreationHeader[index].aNALYZEDBY?.toString() ?? ""), - ), - ItemDetailGrid( - ItemDetailViewCol(LocaleKeys.approvedDate.tr(), - itemCreationHeader[index].aPPROVEDDATE?.toString() ?? ""), - ItemDetailViewCol(LocaleKeys.itemType.tr(), - itemCreationHeader[index].iTEMTYPE?.toString() ?? ""), - ), - ItemDetailGrid( - ItemDetailViewCol(LocaleKeys.relatedTo.tr(), - itemCreationHeader[index].rELATEDTO?.toString() ?? ""), - ItemDetailViewCol( - LocaleKeys.requestDate.tr(), - DateUtil.formatDateToDate( - DateUtil.convertStringToDate( - itemCreationHeader[index].rEQUESTDATE.toString()), - false)), - ), - ItemDetailGrid( - ItemDetailViewCol(LocaleKeys.analyzedDate.tr(), - itemCreationHeader[index].aNALYZEDDATE?.toString() ?? ""), - ItemDetailViewCol( - LocaleKeys.urgent.tr(), - itemCreationHeader[index].uRGENTFLAGDISP?.toString() ?? - ""), - ), - ], - ).objectContainerView(), + mainAxisSize: MainAxisSize.min, + children: [ + ItemDetailGrid( + ItemDetailViewCol( + LocaleKeys.operatingUnit.tr(), + itemCreationHeader[index].oPERATINGUNIT?.toString() ?? + ""), + ItemDetailViewCol(LocaleKeys.category.tr(), + itemCreationHeader[index].cATEGORY?.toString() ?? ""), + ), + ItemDetailGrid( + ItemDetailViewCol(LocaleKeys.requester.tr(), + itemCreationHeader[index].rEQUESTER?.toString() ?? ""), + ItemDetailViewCol(LocaleKeys.analyzedBy.tr(), + itemCreationHeader[index].aNALYZEDBY?.toString() ?? ""), + ), + ItemDetailGrid( + ItemDetailViewCol(LocaleKeys.approvedDate.tr(), + itemCreationHeader[index].aPPROVEDDATE?.toString() ?? ""), + ItemDetailViewCol(LocaleKeys.itemType.tr(), + itemCreationHeader[index].iTEMTYPE?.toString() ?? ""), + ), + ItemDetailGrid( + ItemDetailViewCol(LocaleKeys.relatedTo.tr(), + itemCreationHeader[index].rELATEDTO?.toString() ?? ""), + ItemDetailViewCol( + LocaleKeys.requestDate.tr(), + DateUtil.formatDateToDate( + DateUtil.convertStringToDate( + itemCreationHeader[index].rEQUESTDATE.toString()), + false)), + ), + ItemDetailGrid( + ItemDetailViewCol(LocaleKeys.analyzedDate.tr(), + itemCreationHeader[index].aNALYZEDDATE?.toString() ?? ""), + ItemDetailViewCol( + LocaleKeys.urgent.tr(), + itemCreationHeader[index].uRGENTFLAGDISP?.toString() ?? + ""), + ), + ], + ).objectContainerView(), separatorBuilder: (BuildContext cxt, int index) => 18.height, itemCount: itemCreationHeader.length); } @@ -401,7 +401,7 @@ class InfoFragment extends StatelessWidget { physics: const NeverScrollableScrollPhysics(), itemBuilder: (BuildContext cxt, int index) { List dataList = - list.isEmpty ? [] : (list[index].collectionNotification ?? []); + list.isEmpty ? [] : (list[index].collectionNotification ?? []); dataList = dataList .where((CollectionNotificationEit o) => o.displayFlag == "Y") .toList(); @@ -416,15 +416,15 @@ class InfoFragment extends StatelessWidget { physics: const NeverScrollableScrollPhysics(), itemBuilder: (BuildContext context, int index) => ItemDetailViewGridItem( - index, - dataList[index].segmentPrompt, - dataList[index].segmentValueDsp, - isNeedToShowEmptyDivider: (dataList.length == index + 1) - ? isOdd + index, + dataList[index].segmentPrompt, + dataList[index].segmentValueDsp, + isNeedToShowEmptyDivider: (dataList.length == index + 1) + ? isOdd ? true : false - : false, - ), + : false, + ), gridDelegate: SliverGridDelegateWithFixedCrossAxisCount( crossAxisCount: 2, childAspectRatio: (itemWidth / itemHeight), @@ -453,8 +453,8 @@ class InfoFragment extends StatelessWidget { list[index].proposedPhoneNumber ?? "", isNeedToShowEmptyDivider: (list.length == index + 1) ? isOdd - ? true - : false + ? true + : false : false, ), gridDelegate: SliverGridDelegateWithFixedCrossAxisCount( @@ -490,8 +490,8 @@ class InfoFragment extends StatelessWidget { list[index].segmentValueDsp, isNeedToShowEmptyDivider: (list.length == index + 1) ? isOdd - ? true - : false + ? true + : false : false, ), gridDelegate: SliverGridDelegateWithFixedCrossAxisCount( @@ -518,7 +518,7 @@ class InfoFragment extends StatelessWidget { physics: const NeverScrollableScrollPhysics(), itemBuilder: (BuildContext cxt, int index) { List dataList = - list.isEmpty ? [] : (list[index].collectionNotification ?? []); + list.isEmpty ? [] : (list[index].collectionNotification ?? []); dataList = dataList .where((CollectionNotificationAbsence o) => o.dISPLAYFLAG == "Y") .toList(); @@ -534,31 +534,31 @@ class InfoFragment extends StatelessWidget { physics: const NeverScrollableScrollPhysics(), itemBuilder: (BuildContext context, int index) => ItemDetailViewGridItem( - index, - dataList[index].sEGMENTPROMPT, - dataList[index].sEGMENTVALUEDSP, - isNeedToShowEmptyDivider: (dataList.length == index + 1) - ? isOdd + index, + dataList[index].sEGMENTPROMPT, + dataList[index].sEGMENTVALUEDSP, + isNeedToShowEmptyDivider: (dataList.length == index + 1) + ? isOdd ? true : false - : false, - ), + : false, + ), gridDelegate: SliverGridDelegateWithFixedCrossAxisCount( crossAxisCount: 2, childAspectRatio: (itemWidth / itemHeight), ), ).objectContainerView(); return ListView.separated( - shrinkWrap: true, - physics: const NeverScrollableScrollPhysics(), - itemBuilder: (BuildContext cxt, int index) => - dataList[index].dISPLAYFLAG == "Y" - ? ItemDetailViewCol(dataList[index].sEGMENTPROMPT!, - dataList[index].sEGMENTVALUEDSP!) - : Container(), - separatorBuilder: (BuildContext cxt, int index) => - dataList[index].dISPLAYFLAG == "Y" ? 4.height : 0.height, - itemCount: dataList.length) + shrinkWrap: true, + physics: const NeverScrollableScrollPhysics(), + itemBuilder: (BuildContext cxt, int index) => + dataList[index].dISPLAYFLAG == "Y" + ? ItemDetailViewCol(dataList[index].sEGMENTPROMPT!, + dataList[index].sEGMENTVALUEDSP!) + : Container(), + separatorBuilder: (BuildContext cxt, int index) => + dataList[index].dISPLAYFLAG == "Y" ? 4.height : 0.height, + itemCount: dataList.length) .objectContainerView(); }, separatorBuilder: (BuildContext cxt, int index) => 12.height, @@ -572,9 +572,9 @@ class InfoFragment extends StatelessWidget { children: [ getPrNotificationBodyList.pINFORMATION != null ? getPrNotificationBodyList.pINFORMATION - .toString() - .toText14(color: MyColors.textMixColor) - .objectContainerView() + .toString() + .toText14(color: MyColors.textMixColor) + .objectContainerView() : Container(), 12.height, Column( @@ -625,11 +625,11 @@ class InfoFragment extends StatelessWidget { getAddressNotificationBodyList[index].sEGMENTPROMPT, getAddressNotificationBodyList[index].sEGMENTVALUEDSP, isNeedToShowEmptyDivider: - (getAddressNotificationBodyList.length == index + 1) - ? isOdd - ? true - : false - : false, + (getAddressNotificationBodyList.length == index + 1) + ? isOdd + ? true + : false + : false, ), gridDelegate: SliverGridDelegateWithFixedCrossAxisCount( crossAxisCount: 2, @@ -658,11 +658,11 @@ class InfoFragment extends StatelessWidget { getterminationNotificationBodyList[index].sEGMENTPROMPT, getterminationNotificationBodyList[index].sEGMENTVALUEDSP, isNeedToShowEmptyDivider: - (getterminationNotificationBodyList.length == index + 1) - ? isOdd - ? true - : false - : false, + (getterminationNotificationBodyList.length == index + 1) + ? isOdd + ? true + : false + : false, ), gridDelegate: SliverGridDelegateWithFixedCrossAxisCount( crossAxisCount: 2, @@ -702,11 +702,11 @@ class InfoFragment extends StatelessWidget { data.contactNotificationBody![index].segmentPrompt, data.contactNotificationBody![index].segmentValueDsp, isNeedToShowEmptyDivider: - (data.contactNotificationBody!.length == index + 1) - ? isOdd - ? true - : false - : false, + (data.contactNotificationBody!.length == index + 1) + ? isOdd + ? true + : false + : false, ), gridDelegate: SliverGridDelegateWithFixedCrossAxisCount( crossAxisCount: 2, @@ -730,7 +730,7 @@ class InfoFragment extends StatelessWidget { GetPaymentNotificationBodyList? data) { return Column( children: [ - 12.height, + 12.height, if (data!.paymentDetailsList!.isNotEmpty) Column( children: [ @@ -739,54 +739,61 @@ class InfoFragment extends StatelessWidget { ItemDetailViewCol( LocaleKeys.requestNumber.tr(), data.paymentDetailsList![0].requestNumber ?? ""), ItemDetailViewCol( LocaleKeys.requesterEmpNum.tr(), - data.paymentDetailsList![0].requesterEmployeeName ?? ""), + data.paymentDetailsList![0].requesterEmployeeNumber ?? ""), ), ItemDetailGrid( ItemDetailViewCol( LocaleKeys.requestDate.tr(), - DateUtil.formatDateToDate( - DateUtil.convertStringToDate(data.paymentDetailsList![0].requestDate!), false) ?? ""), + DateUtil.formatDateToDate( + DateUtil.convertStringToDate(data.paymentDetailsList![0].requestDate!), false) ?? ""), ItemDetailViewCol( LocaleKeys.requesterEmpName.tr(), data.paymentDetailsList![0].requesterEmployeeName ?? ""), ), ItemDetailGrid( - ItemDetailViewCol( LocaleKeys.prepareEmpName.tr(), - data.paymentDetailsList![0].prepareEmployeeName ?? ""), + ItemDetailViewCol( LocaleKeys.prepareEmpNum.tr(), + data.paymentDetailsList![0].prepareEmployeeNumber ?? ""), ItemDetailViewCol( LocaleKeys.requesterPositionName.tr(), data.paymentDetailsList![0].requesterPositionName ?? ""), ), ItemDetailGrid( - ItemDetailViewCol( LocaleKeys.preparePositionName.tr(), - data.paymentDetailsList![0].preparePositionName ?? ""), + ItemDetailViewCol( LocaleKeys.prepareEmpName.tr(), + data.paymentDetailsList![0].prepareEmployeeName ?? ""), ItemDetailViewCol( LocaleKeys.requesterPayrollName.tr(), data.paymentDetailsList![0].requesterPayrollName ?? ""), ), + ItemDetailGrid( + ItemDetailViewCol( LocaleKeys.preparePositionName.tr(), + data.paymentDetailsList![0].preparePositionName ?? ""), + ItemDetailViewCol( LocaleKeys.requesterOperatingUnit.tr(), + data.paymentDetailsList![0].requesterOperatingUnits ?? "") + ), + ], ).objectContainerView(), if (data!.paymentDetailsList!.isNotEmpty) - Column( - children: [ - LocaleKeys.general.tr().toText14(color: MyColors.textMixColor), - ItemDetailGrid( - ItemDetailViewCol( - LocaleKeys.payingORGName.tr(), data.paymentDetailsList![0].payingOrganizationName ?? ""), - ItemDetailViewCol(LocaleKeys.requestAmount.tr(), - data.paymentDetailsList![0].requestAmount ?? ""), - ), - ItemDetailGrid( - ItemDetailViewCol(LocaleKeys.paymentMethodName.tr(), - data.paymentDetailsList![0].paymentMethodName ?? ""), - ItemDetailViewCol( - LocaleKeys.currency.tr(), data.paymentDetailsList![0].currency ?? ""), - ), - ItemDetailGrid( - ItemDetailViewCol(LocaleKeys.typeofPayment.tr(), - data.paymentDetailsList![0].typeOfPayment ?? ""), - ItemDetailViewCol( - LocaleKeys.paymentDetails.tr(), data.paymentDetailsList![0].paymentDetails ?? ""), - ), + Column( + children: [ + LocaleKeys.general.tr().toText14(color: MyColors.textMixColor), + ItemDetailGrid( + ItemDetailViewCol( + LocaleKeys.payingORGName.tr(), data.paymentDetailsList![0].payingOrganizationName ?? ""), + ItemDetailViewCol(LocaleKeys.requestAmount.tr(), + data.paymentDetailsList![0].requestAmount ?? ""), + ), + ItemDetailGrid( + ItemDetailViewCol(LocaleKeys.paymentMethodName.tr(), + data.paymentDetailsList![0].paymentMethodName ?? ""), + ItemDetailViewCol( + LocaleKeys.currency.tr(), data.paymentDetailsList![0].currency ?? ""), + ), + ItemDetailGrid( + ItemDetailViewCol(LocaleKeys.typeofPayment.tr(), + data.paymentDetailsList![0].typeOfPayment ?? ""), + ItemDetailViewCol( + LocaleKeys.paymentDetails.tr(), data.paymentDetailsList![0].paymentDetails ?? ""), + ), - ], - ).objectContainerView(), + ], + ).objectContainerView(), if (data!.beneficieryList!.isNotEmpty) Column( @@ -839,10 +846,65 @@ class InfoFragment extends StatelessWidget { ItemDetailGrid( ItemDetailViewCol(LocaleKeys.supplierNo.tr(), data.purchaseOrdersList![0].supplierNumber?? ""), - Container(), + Container(), ), ], ).objectContainerView(), + + if (data!.supplierInformationList!.isNotEmpty && data.supplierInformationList![0].supplierNumber !="") + Column( + children: [ + LocaleKeys.supplierInfo.tr().toText14(color: MyColors.textMixColor), + ItemDetailGrid( + ItemDetailViewCol( + LocaleKeys.supplierNo.tr(), data.supplierInformationList![0].supplierNumber ?? ""), + ItemDetailViewCol(LocaleKeys.supplierName.tr(), + data.supplierInformationList![0].supplierName.toString() ?? ""), + ), + ItemDetailGrid( + ItemDetailViewCol(LocaleKeys.supplierAcNo.tr(), + data.supplierInformationList![0].supplierBankAccountNumber ?? ""), + ItemDetailViewCol( + LocaleKeys.supplierAcName.tr(), data.supplierInformationList![0].supplierBankAccountName ?? + "" ), + ), + ItemDetailGrid( + ItemDetailViewCol(LocaleKeys.supplierCRNo.tr(), + data.supplierInformationList![0].crNumber?? ""), + ItemDetailViewCol( LocaleKeys.supplierIBAN.tr(), data.supplierInformationList![0].supplierBankIban ?? + "" ), + ), + + ], + ).objectContainerView(), + // + if (data!.refundInvoiceList!.isNotEmpty && data.refundInvoiceList![0].patientNumber !="" ) + Column( + children: [ + LocaleKeys.patientRefundInvoice.tr().toText14(color: MyColors.textMixColor), + ItemDetailGrid( + ItemDetailViewCol( + LocaleKeys.patientNumber.tr(), data.refundInvoiceList![0].patientNumber?? ""), + ItemDetailViewCol(LocaleKeys.hospitalClinic.tr(), + data.refundInvoiceList![0].hospitalClinic.toString() ?? ""), + ), + ItemDetailGrid( + ItemDetailViewCol(LocaleKeys.patientName.tr(), + data.refundInvoiceList![0].patientName ?? ""), + ItemDetailViewCol( + LocaleKeys.amount.tr(), data.refundInvoiceList![0].amount.toString() ?? + "" ), + ), + ItemDetailGrid( + ItemDetailViewCol(LocaleKeys.invoiceDate.tr(), + DateUtil.formatDateToDate( + DateUtil.convertStringToDate( data.refundInvoiceList![0].invoicedDate), false)?? ""), + ItemDetailViewCol( LocaleKeys.refundInvoice.tr(), data.refundInvoiceList![0].invoiceNumber ?? + "" ), + ), + + ], + ).objectContainerView(), ], ); }