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

hotfix for payment request WL

Browse Source
master-Api2.0
haroon amjad 1 year ago
parent 368d109d9f
commit 11881b0ba1
6 changed files with 429 additions and 301 deletions
Show Stats Download Patch File Download Diff File

17
assets/langs/ar-SA.json
Unescape Escape View File

@ -544,5 +544,20 @@
"addAtLeastOneAttachment": "الرجاء إضافة مرفق واحد على الأقل.", "addAtLeastOneAttachment": "الرجاء إضافة مرفق واحد على الأقل.",
"pleaseClickButtonToJoinMarathon": "الرجاء الضغط على الزر أدناه للانضمام إلى الماراثون", "pleaseClickButtonToJoinMarathon": "الرجاء الضغط على الزر أدناه للانضمام إلى الماراثون",
"youCannotJoinTheMarathon": "لا يمكنك الانضمام إلى الماراثون لأنك تجاوزت الحد الزمني", "youCannotJoinTheMarathon": "لا يمكنك الانضمام إلى الماراثون لأنك تجاوزت الحد الزمني",
"open": "يفتح" "open": "يفتح",
"requesterOperatingUnit":"وحدة تشغيل مقدم الطلب",
"prepareEmpNum":"إعداد رقم الموظف",
"supplierInfo" : "معلومات المورد",
"supplierAcNo": "رقم حساب المورد",
"supplierAcName": "اسم حساب المورد",
"supplierIBAN" : "رقم IBAN للمورد",
"supplierCRNo" :"رقم السجل التجاري",
"suppliedAcNo" : "رقم الحساب المقدم",
"patientRefundInvoice" : "فاتورة استرداد الأموال للمريض",
"patientNumber" : "رقم المريض",
"patientName" : "اسم المريض",
"invoiceDate" : "تاريخ الفاتورة",
"refundInvoice" :"فاتورة الاسترجاع",
"hospitalClinic" : "عيادة المستشفى"
} }

17
assets/langs/en-US.json
Unescape Escape View File

@ -563,5 +563,20 @@
"open": "open", "open": "open",
"addAtLeastOneAttachment": "Please add at least one attachment.", "addAtLeastOneAttachment": "Please add at least one attachment.",
"pleaseClickButtonToJoinMarathon": "Press the button below to join the Marathon.", "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"
} }

25
lib/generated/codegen_loader.g.dart
Unescape Escape View File

@ -575,7 +575,10 @@ class CodegenLoader extends AssetLoader {
"pOAmount":"مبلغ الطلب", "pOAmount":"مبلغ الطلب",
"versionStatus":"حالة الإصدار", "versionStatus":"حالة الإصدار",
"supplierNo":"رقم المورد", "supplierNo":"رقم المورد",
"general":"عام" "general":"عام",
"requesterOperatingUnit":"وحدة تشغيل مقدم الطلب",
"prepareEmpNum":"إعداد رقم الموظف",
}; };
static const Map<String, dynamic> en_US = { static const Map<String, dynamic> en_US = {
"mohemm": "Mohemm", "mohemm": "Mohemm",
@ -1157,7 +1160,25 @@ class CodegenLoader extends AssetLoader {
"pOAmount":"PO Amount", "pOAmount":"PO Amount",
"versionStatus":"Version Status", "versionStatus":"Version Status",
"supplierNo":"Supplier No", "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<String, Map<String, dynamic>> mapLocales = {"ar_SA": ar_SA, "en_US": en_US}; static const Map<String, Map<String, dynamic>> mapLocales = {"ar_SA": ar_SA, "en_US": en_US};
} }

14
lib/generated/locale_keys.g.dart
Unescape Escape View File

@ -575,5 +575,19 @@ abstract class LocaleKeys {
static const versionStatus ='versionStatus'; static const versionStatus ='versionStatus';
static const supplierNo ='supplierNo'; static const supplierNo ='supplierNo';
static const general ="general"; 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';
} }

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

@ -95,6 +95,7 @@ class _ItgDetailScreenState extends State<ItgDetailScreen> {
requestDetails = AppState().requestAllList![AppState().itgWorkListIndex!]; // ModalRoute.of(context)!.settings.arguments as WorkListResponseModel; requestDetails = AppState().requestAllList![AppState().itgWorkListIndex!]; // ModalRoute.of(context)!.settings.arguments as WorkListResponseModel;
providerData.itgFormsModel!.totalCount = providerData.itgFormsModel!.totalCount! - 1; providerData.itgFormsModel!.totalCount = providerData.itgFormsModel!.totalCount! - 1;
getItgData(); getItgData();
Utils.hideLoading(context);
getItgRequestAttachments(); getItgRequestAttachments();
} }
} }

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

@ -29,11 +29,11 @@ class InfoFragment extends StatelessWidget {
List<GetStampNsNotificationBodyList>? getStampNsNotifications; List<GetStampNsNotificationBodyList>? getStampNsNotifications;
List<ItemCreationHeader> itemCreationHeader; List<ItemCreationHeader> itemCreationHeader;
List<GetEitCollectionNotificationBodyList>? List<GetEitCollectionNotificationBodyList>?
getEitCollectionNotificationBodyList; getEitCollectionNotificationBodyList;
List<GetPhonesNotificationBodyList>? getPhonesNotificationBodyList; List<GetPhonesNotificationBodyList>? getPhonesNotificationBodyList;
List<GetBasicDetNtfBodyList>? getBasicDetNtfBodyList; List<GetBasicDetNtfBodyList>? getBasicDetNtfBodyList;
List<GetAbsenceCollectionNotificationBodyList>? List<GetAbsenceCollectionNotificationBodyList>?
getAbsenceCollectionNotificationBodyList; getAbsenceCollectionNotificationBodyList;
GetContactNotificationBodyList? getContactNotificationBodyList; GetContactNotificationBodyList? getContactNotificationBodyList;
GetPrNotificationBodyList? getPrNotificationBodyList; GetPrNotificationBodyList? getPrNotificationBodyList;
List<GetAddressNotificationBodyList>? getAddressNotificationBodyList = []; List<GetAddressNotificationBodyList>? getAddressNotificationBodyList = [];
@ -42,19 +42,19 @@ class InfoFragment extends StatelessWidget {
InfoFragment( InfoFragment(
{this.workListData, {this.workListData,
this.poHeaderList = const <POHeader>[], this.poHeaderList = const <POHeader>[],
this.itemCreationHeader = const <ItemCreationHeader>[], this.itemCreationHeader = const <ItemCreationHeader>[],
this.getStampMsNotifications, this.getStampMsNotifications,
this.getStampNsNotifications, this.getStampNsNotifications,
this.getEitCollectionNotificationBodyList, this.getEitCollectionNotificationBodyList,
this.getPhonesNotificationBodyList, this.getPhonesNotificationBodyList,
this.getBasicDetNtfBodyList, this.getBasicDetNtfBodyList,
this.getAbsenceCollectionNotificationBodyList, this.getAbsenceCollectionNotificationBodyList,
this.getContactNotificationBodyList, this.getContactNotificationBodyList,
this.getPrNotificationBodyList, this.getPrNotificationBodyList,
this.getAddressNotificationBodyList, this.getAddressNotificationBodyList,
this.getTerminationNotificationBodyList, this.getTerminationNotificationBodyList,
this.getPaymentNotificationBodyList}); this.getPaymentNotificationBodyList});
double itemHeight = 0; double itemHeight = 0;
double itemWidth = 0; double itemWidth = 0;
@ -120,7 +120,7 @@ class InfoFragment extends StatelessWidget {
getAbsenceCollectionNotificationBodyList ?? []), getAbsenceCollectionNotificationBodyList ?? []),
if (getContactNotificationBodyList != null) if (getContactNotificationBodyList != null)
getContactNotificationBodyListWidget(getContactNotificationBodyList ?? getContactNotificationBodyListWidget(getContactNotificationBodyList ??
GetContactNotificationBodyList()) GetContactNotificationBodyList())
.objectContainerView(), .objectContainerView(),
if (getAddressNotificationBodyList?.isNotEmpty ?? false) if (getAddressNotificationBodyList?.isNotEmpty ?? false)
getAddressNotificationBodyListWidget(getAddressNotificationBodyList!), getAddressNotificationBodyListWidget(getAddressNotificationBodyList!),
@ -129,7 +129,7 @@ class InfoFragment extends StatelessWidget {
getTerminationNotificationBodyList!), getTerminationNotificationBodyList!),
if (getPaymentNotificationBodyList != null) if (getPaymentNotificationBodyList != null)
getPaymentNotificationBodyListWidget(getPaymentNotificationBodyList ?? getPaymentNotificationBodyListWidget(getPaymentNotificationBodyList ??
GetPaymentNotificationBodyList()) GetPaymentNotificationBodyList())
.objectContainerView(), .objectContainerView(),
]; ];
return Container( return Container(
@ -138,9 +138,9 @@ class InfoFragment extends StatelessWidget {
child: uiList.isEmpty child: uiList.isEmpty
? LocaleKeys.noDataAvailable.tr().toText16().center ? LocaleKeys.noDataAvailable.tr().toText16().center
: ListView( : ListView(
padding: const EdgeInsets.all(21), padding: const EdgeInsets.all(21),
children: uiList, children: uiList,
), ),
); );
} }
@ -149,93 +149,93 @@ class InfoFragment extends StatelessWidget {
shrinkWrap: true, shrinkWrap: true,
physics: const NeverScrollableScrollPhysics(), physics: const NeverScrollableScrollPhysics(),
itemBuilder: (BuildContext cxt, int index) => Column( itemBuilder: (BuildContext cxt, int index) => Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min, 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: [ children: [
Column( ItemDetailGrid(
children: [ ItemDetailViewCol(LocaleKeys.grossAmount.tr(),
ItemDetailGrid( poHeaderList[index].gROSSAMOUNT?.toString() ?? ""),
ItemDetailViewCol(LocaleKeys.description.tr(), ItemDetailViewCol(LocaleKeys.discountAmount.tr(),
workListData!.fROMUSER ?? ""), poHeaderList[index].dISCOUNTAMOUNT?.toString() ?? ""),
ItemDetailViewCol( ),
LocaleKeys.from.tr(), workListData!.fROMUSER ?? ""), ItemDetailGrid(
), ItemDetailViewCol(LocaleKeys.customDuty.tr(),
ItemDetailGrid( poHeaderList[index].cUSTOMDUTY?.toString() ?? ""),
ItemDetailViewCol( ItemDetailViewCol(LocaleKeys.shipHandle.tr(),
LocaleKeys.to.tr(), workListData!.tOUSER ?? ""), poHeaderList[index].sHIPHANDLE?.toString() ?? ""),
ItemDetailViewCol( ),
LocaleKeys.sent.tr(), workListData!.bEGINDATE ?? ""), ItemDetailGrid(
), ItemDetailViewCol(LocaleKeys.otherCharges.tr(),
ItemDetailGrid( poHeaderList[index].oTHERCHARGES?.toString() ?? ""),
ItemDetailViewCol( ItemDetailViewCol(LocaleKeys.totalPOAmountWithVAT.tr(),
LocaleKeys.closed.tr(), workListData!.eNDDATE ?? ""), poHeaderList[index].lOCCURTOTPOAMT.toString() ?? ""),
ItemDetailViewCol(LocaleKeys.id.tr(), ),
workListData!.nOTIFICATIONID?.toString() ?? ""), ItemDetailGrid(
), ItemDetailViewCol(LocaleKeys.totalPOAmountInWords.tr(),
ItemDetailGrid( poHeaderList[index].tOTPOAMTWORD ?? ""),
ItemDetailViewCol(LocaleKeys.supplier.tr(), Container(),
poHeaderList[index].vENDORNAME ?? ""), isItLast: true,
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()),
], ],
), ).objectContainerView(title: LocaleKeys.amount_detail.tr()),
],
),
separatorBuilder: (BuildContext cxt, int index) => 4.height, separatorBuilder: (BuildContext cxt, int index) => 4.height,
itemCount: poHeaderList.length); itemCount: poHeaderList.length);
} }
@ -256,55 +256,55 @@ class InfoFragment extends StatelessWidget {
shrinkWrap: true, shrinkWrap: true,
physics: const NeverScrollableScrollPhysics(), physics: const NeverScrollableScrollPhysics(),
itemBuilder: (BuildContext cxt, int index) => Column( itemBuilder: (BuildContext cxt, int index) => Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [
ItemDetailGrid( ItemDetailGrid(
ItemDetailViewCol(LocaleKeys.employeeNumber.tr(), ItemDetailViewCol(LocaleKeys.employeeNumber.tr(),
list[index].eMPLOYEENUMBER.toString()), list[index].eMPLOYEENUMBER.toString()),
ItemDetailViewCol(LocaleKeys.assignmentNumber.tr(), ItemDetailViewCol(LocaleKeys.assignmentNumber.tr(),
list[index].aSSIGNMENTNUMBER.toString()), list[index].aSSIGNMENTNUMBER.toString()),
), ),
ItemDetailGrid( ItemDetailGrid(
ItemDetailViewCol(LocaleKeys.employeeName.tr(), ItemDetailViewCol(LocaleKeys.employeeName.tr(),
list[index].eMPLOYEENAME.toString()), list[index].eMPLOYEENAME.toString()),
ItemDetailViewCol( ItemDetailViewCol(
LocaleKeys.scheduleDate.tr(), LocaleKeys.scheduleDate.tr(),
DateUtil.formatDateToDate( DateUtil.formatDateToDate(
DateUtil.convertStringToDate( DateUtil.convertStringToDate(
list[index].sCHEDULEDATE.toString()), list[index].sCHEDULEDATE.toString()),
false)), false)),
), ),
ItemDetailGrid( ItemDetailGrid(
ItemDetailViewCol(LocaleKeys.shiftType.tr(), ItemDetailViewCol(LocaleKeys.shiftType.tr(),
list[index].sHTTYPEDESC.toString()), list[index].sHTTYPEDESC.toString()),
ItemDetailViewCol( ItemDetailViewCol(
LocaleKeys.shift.tr(), list[index].sHTNAME.toString()), LocaleKeys.shift.tr(), list[index].sHTNAME.toString()),
), ),
ItemDetailGrid( ItemDetailGrid(
ItemDetailViewCol(LocaleKeys.breakText.tr(), ItemDetailViewCol(LocaleKeys.breakText.tr(),
list[index].bREAKNAME.toString()), list[index].bREAKNAME.toString()),
ItemDetailViewCol(LocaleKeys.actualSwipeStart.tr(), ItemDetailViewCol(LocaleKeys.actualSwipeStart.tr(),
list[index].sHTACTUALSTARTTIME.toString()), list[index].sHTACTUALSTARTTIME.toString()),
), ),
ItemDetailGrid( ItemDetailGrid(
ItemDetailViewCol(LocaleKeys.actualSwipeEnd.tr(), ItemDetailViewCol(LocaleKeys.actualSwipeEnd.tr(),
list[index].sHTACTUALENDTIME.toString()), list[index].sHTACTUALENDTIME.toString()),
ItemDetailViewCol(LocaleKeys.approvedSwipeStart.tr(), ItemDetailViewCol(LocaleKeys.approvedSwipeStart.tr(),
list[index].aPPROVEDSTARTTIME.toString()), list[index].aPPROVEDSTARTTIME.toString()),
), ),
ItemDetailGrid( ItemDetailGrid(
ItemDetailViewCol(LocaleKeys.approvedSwipeStartReason.tr(), ItemDetailViewCol(LocaleKeys.approvedSwipeStartReason.tr(),
list[index].aPPROVEDSTARTREASON.toString()), list[index].aPPROVEDSTARTREASON.toString()),
ItemDetailViewCol(LocaleKeys.approvedSwipeEnd.tr(), ""), ItemDetailViewCol(LocaleKeys.approvedSwipeEnd.tr(), ""),
), ),
ItemDetailGrid( ItemDetailGrid(
ItemDetailViewCol(LocaleKeys.approvedSwipeEndReason.tr(), ItemDetailViewCol(LocaleKeys.approvedSwipeEndReason.tr(),
list[index].aPPROVEDENDREASONDESC.toString()), list[index].aPPROVEDENDREASONDESC.toString()),
Container(), Container(),
isItLast: true, isItLast: true,
), ),
], ],
).objectContainerView(), ).objectContainerView(),
separatorBuilder: (BuildContext cxt, int index) => separatorBuilder: (BuildContext cxt, int index) =>
1.height.paddingOnly(top: 8, bottom: 8), 1.height.paddingOnly(top: 8, bottom: 8),
itemCount: list.length); itemCount: list.length);
@ -316,27 +316,27 @@ class InfoFragment extends StatelessWidget {
shrinkWrap: true, shrinkWrap: true,
physics: const NeverScrollableScrollPhysics(), physics: const NeverScrollableScrollPhysics(),
itemBuilder: (BuildContext cxt, int index) => Column( itemBuilder: (BuildContext cxt, int index) => Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [
ItemDetailGrid( ItemDetailGrid(
ItemDetailViewCol(LocaleKeys.employeeNumber.tr(), ItemDetailViewCol(LocaleKeys.employeeNumber.tr(),
list[index].eMPLOYEENUMBER.toString()), list[index].eMPLOYEENUMBER.toString()),
ItemDetailViewCol(LocaleKeys.assignmentNumber.tr(), ItemDetailViewCol(LocaleKeys.assignmentNumber.tr(),
list[index].aSSIGNMENTNUMBER.toString()), list[index].aSSIGNMENTNUMBER.toString()),
), ),
ItemDetailGrid( ItemDetailGrid(
ItemDetailViewCol(LocaleKeys.employeeName.tr(), ItemDetailViewCol(LocaleKeys.employeeName.tr(),
list[index].eMPLOYEENAME.toString()), list[index].eMPLOYEENAME.toString()),
ItemDetailViewCol( ItemDetailViewCol(
LocaleKeys.scheduleDate.tr(), LocaleKeys.scheduleDate.tr(),
DateUtil.formatDateToDate( DateUtil.formatDateToDate(
DateUtil.convertStringToDate( DateUtil.convertStringToDate(
list[index].sCHEDULEDATE.toString()), list[index].sCHEDULEDATE.toString()),
false)), false)),
isItLast: true, isItLast: true,
), ),
], ],
).objectContainerView(), ).objectContainerView(),
separatorBuilder: (BuildContext cxt, int index) => separatorBuilder: (BuildContext cxt, int index) =>
1.height.paddingOnly(top: 8, bottom: 8), 1.height.paddingOnly(top: 8, bottom: 8),
itemCount: list.length); itemCount: list.length);
@ -347,48 +347,48 @@ class InfoFragment extends StatelessWidget {
shrinkWrap: true, shrinkWrap: true,
physics: const NeverScrollableScrollPhysics(), physics: const NeverScrollableScrollPhysics(),
itemBuilder: (BuildContext cxt, int index) => Column( itemBuilder: (BuildContext cxt, int index) => Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [
ItemDetailGrid( ItemDetailGrid(
ItemDetailViewCol( ItemDetailViewCol(
LocaleKeys.operatingUnit.tr(), LocaleKeys.operatingUnit.tr(),
itemCreationHeader[index].oPERATINGUNIT?.toString() ?? itemCreationHeader[index].oPERATINGUNIT?.toString() ??
""), ""),
ItemDetailViewCol(LocaleKeys.category.tr(), ItemDetailViewCol(LocaleKeys.category.tr(),
itemCreationHeader[index].cATEGORY?.toString() ?? ""), itemCreationHeader[index].cATEGORY?.toString() ?? ""),
), ),
ItemDetailGrid( ItemDetailGrid(
ItemDetailViewCol(LocaleKeys.requester.tr(), ItemDetailViewCol(LocaleKeys.requester.tr(),
itemCreationHeader[index].rEQUESTER?.toString() ?? ""), itemCreationHeader[index].rEQUESTER?.toString() ?? ""),
ItemDetailViewCol(LocaleKeys.analyzedBy.tr(), ItemDetailViewCol(LocaleKeys.analyzedBy.tr(),
itemCreationHeader[index].aNALYZEDBY?.toString() ?? ""), itemCreationHeader[index].aNALYZEDBY?.toString() ?? ""),
), ),
ItemDetailGrid( ItemDetailGrid(
ItemDetailViewCol(LocaleKeys.approvedDate.tr(), ItemDetailViewCol(LocaleKeys.approvedDate.tr(),
itemCreationHeader[index].aPPROVEDDATE?.toString() ?? ""), itemCreationHeader[index].aPPROVEDDATE?.toString() ?? ""),
ItemDetailViewCol(LocaleKeys.itemType.tr(), ItemDetailViewCol(LocaleKeys.itemType.tr(),
itemCreationHeader[index].iTEMTYPE?.toString() ?? ""), itemCreationHeader[index].iTEMTYPE?.toString() ?? ""),
), ),
ItemDetailGrid( ItemDetailGrid(
ItemDetailViewCol(LocaleKeys.relatedTo.tr(), ItemDetailViewCol(LocaleKeys.relatedTo.tr(),
itemCreationHeader[index].rELATEDTO?.toString() ?? ""), itemCreationHeader[index].rELATEDTO?.toString() ?? ""),
ItemDetailViewCol( ItemDetailViewCol(
LocaleKeys.requestDate.tr(), LocaleKeys.requestDate.tr(),
DateUtil.formatDateToDate( DateUtil.formatDateToDate(
DateUtil.convertStringToDate( DateUtil.convertStringToDate(
itemCreationHeader[index].rEQUESTDATE.toString()), itemCreationHeader[index].rEQUESTDATE.toString()),
false)), false)),
), ),
ItemDetailGrid( ItemDetailGrid(
ItemDetailViewCol(LocaleKeys.analyzedDate.tr(), ItemDetailViewCol(LocaleKeys.analyzedDate.tr(),
itemCreationHeader[index].aNALYZEDDATE?.toString() ?? ""), itemCreationHeader[index].aNALYZEDDATE?.toString() ?? ""),
ItemDetailViewCol( ItemDetailViewCol(
LocaleKeys.urgent.tr(), LocaleKeys.urgent.tr(),
itemCreationHeader[index].uRGENTFLAGDISP?.toString() ?? itemCreationHeader[index].uRGENTFLAGDISP?.toString() ??
""), ""),
), ),
], ],
).objectContainerView(), ).objectContainerView(),
separatorBuilder: (BuildContext cxt, int index) => 18.height, separatorBuilder: (BuildContext cxt, int index) => 18.height,
itemCount: itemCreationHeader.length); itemCount: itemCreationHeader.length);
} }
@ -401,7 +401,7 @@ class InfoFragment extends StatelessWidget {
physics: const NeverScrollableScrollPhysics(), physics: const NeverScrollableScrollPhysics(),
itemBuilder: (BuildContext cxt, int index) { itemBuilder: (BuildContext cxt, int index) {
List<CollectionNotificationEit> dataList = List<CollectionNotificationEit> dataList =
list.isEmpty ? [] : (list[index].collectionNotification ?? []); list.isEmpty ? [] : (list[index].collectionNotification ?? []);
dataList = dataList dataList = dataList
.where((CollectionNotificationEit o) => o.displayFlag == "Y") .where((CollectionNotificationEit o) => o.displayFlag == "Y")
.toList(); .toList();
@ -416,15 +416,15 @@ class InfoFragment extends StatelessWidget {
physics: const NeverScrollableScrollPhysics(), physics: const NeverScrollableScrollPhysics(),
itemBuilder: (BuildContext context, int index) => itemBuilder: (BuildContext context, int index) =>
ItemDetailViewGridItem( ItemDetailViewGridItem(
index, index,
dataList[index].segmentPrompt, dataList[index].segmentPrompt,
dataList[index].segmentValueDsp, dataList[index].segmentValueDsp,
isNeedToShowEmptyDivider: (dataList.length == index + 1) isNeedToShowEmptyDivider: (dataList.length == index + 1)
? isOdd ? isOdd
? true ? true
: false : false
: false, : false,
), ),
gridDelegate: SliverGridDelegateWithFixedCrossAxisCount( gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount: 2, crossAxisCount: 2,
childAspectRatio: (itemWidth / itemHeight), childAspectRatio: (itemWidth / itemHeight),
@ -453,8 +453,8 @@ class InfoFragment extends StatelessWidget {
list[index].proposedPhoneNumber ?? "", list[index].proposedPhoneNumber ?? "",
isNeedToShowEmptyDivider: (list.length == index + 1) isNeedToShowEmptyDivider: (list.length == index + 1)
? isOdd ? isOdd
? true ? true
: false : false
: false, : false,
), ),
gridDelegate: SliverGridDelegateWithFixedCrossAxisCount( gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
@ -490,8 +490,8 @@ class InfoFragment extends StatelessWidget {
list[index].segmentValueDsp, list[index].segmentValueDsp,
isNeedToShowEmptyDivider: (list.length == index + 1) isNeedToShowEmptyDivider: (list.length == index + 1)
? isOdd ? isOdd
? true ? true
: false : false
: false, : false,
), ),
gridDelegate: SliverGridDelegateWithFixedCrossAxisCount( gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
@ -518,7 +518,7 @@ class InfoFragment extends StatelessWidget {
physics: const NeverScrollableScrollPhysics(), physics: const NeverScrollableScrollPhysics(),
itemBuilder: (BuildContext cxt, int index) { itemBuilder: (BuildContext cxt, int index) {
List<CollectionNotificationAbsence> dataList = List<CollectionNotificationAbsence> dataList =
list.isEmpty ? [] : (list[index].collectionNotification ?? []); list.isEmpty ? [] : (list[index].collectionNotification ?? []);
dataList = dataList dataList = dataList
.where((CollectionNotificationAbsence o) => o.dISPLAYFLAG == "Y") .where((CollectionNotificationAbsence o) => o.dISPLAYFLAG == "Y")
.toList(); .toList();
@ -534,31 +534,31 @@ class InfoFragment extends StatelessWidget {
physics: const NeverScrollableScrollPhysics(), physics: const NeverScrollableScrollPhysics(),
itemBuilder: (BuildContext context, int index) => itemBuilder: (BuildContext context, int index) =>
ItemDetailViewGridItem( ItemDetailViewGridItem(
index, index,
dataList[index].sEGMENTPROMPT, dataList[index].sEGMENTPROMPT,
dataList[index].sEGMENTVALUEDSP, dataList[index].sEGMENTVALUEDSP,
isNeedToShowEmptyDivider: (dataList.length == index + 1) isNeedToShowEmptyDivider: (dataList.length == index + 1)
? isOdd ? isOdd
? true ? true
: false : false
: false, : false,
), ),
gridDelegate: SliverGridDelegateWithFixedCrossAxisCount( gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount: 2, crossAxisCount: 2,
childAspectRatio: (itemWidth / itemHeight), childAspectRatio: (itemWidth / itemHeight),
), ),
).objectContainerView(); ).objectContainerView();
return ListView.separated( return ListView.separated(
shrinkWrap: true, shrinkWrap: true,
physics: const NeverScrollableScrollPhysics(), physics: const NeverScrollableScrollPhysics(),
itemBuilder: (BuildContext cxt, int index) => itemBuilder: (BuildContext cxt, int index) =>
dataList[index].dISPLAYFLAG == "Y" dataList[index].dISPLAYFLAG == "Y"
? ItemDetailViewCol(dataList[index].sEGMENTPROMPT!, ? ItemDetailViewCol(dataList[index].sEGMENTPROMPT!,
dataList[index].sEGMENTVALUEDSP!) dataList[index].sEGMENTVALUEDSP!)
: Container(), : Container(),
separatorBuilder: (BuildContext cxt, int index) => separatorBuilder: (BuildContext cxt, int index) =>
dataList[index].dISPLAYFLAG == "Y" ? 4.height : 0.height, dataList[index].dISPLAYFLAG == "Y" ? 4.height : 0.height,
itemCount: dataList.length) itemCount: dataList.length)
.objectContainerView(); .objectContainerView();
}, },
separatorBuilder: (BuildContext cxt, int index) => 12.height, separatorBuilder: (BuildContext cxt, int index) => 12.height,
@ -572,9 +572,9 @@ class InfoFragment extends StatelessWidget {
children: [ children: [
getPrNotificationBodyList.pINFORMATION != null getPrNotificationBodyList.pINFORMATION != null
? getPrNotificationBodyList.pINFORMATION ? getPrNotificationBodyList.pINFORMATION
.toString() .toString()
.toText14(color: MyColors.textMixColor) .toText14(color: MyColors.textMixColor)
.objectContainerView() .objectContainerView()
: Container(), : Container(),
12.height, 12.height,
Column( Column(
@ -625,11 +625,11 @@ class InfoFragment extends StatelessWidget {
getAddressNotificationBodyList[index].sEGMENTPROMPT, getAddressNotificationBodyList[index].sEGMENTPROMPT,
getAddressNotificationBodyList[index].sEGMENTVALUEDSP, getAddressNotificationBodyList[index].sEGMENTVALUEDSP,
isNeedToShowEmptyDivider: isNeedToShowEmptyDivider:
(getAddressNotificationBodyList.length == index + 1) (getAddressNotificationBodyList.length == index + 1)
? isOdd ? isOdd
? true ? true
: false : false
: false, : false,
), ),
gridDelegate: SliverGridDelegateWithFixedCrossAxisCount( gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount: 2, crossAxisCount: 2,
@ -658,11 +658,11 @@ class InfoFragment extends StatelessWidget {
getterminationNotificationBodyList[index].sEGMENTPROMPT, getterminationNotificationBodyList[index].sEGMENTPROMPT,
getterminationNotificationBodyList[index].sEGMENTVALUEDSP, getterminationNotificationBodyList[index].sEGMENTVALUEDSP,
isNeedToShowEmptyDivider: isNeedToShowEmptyDivider:
(getterminationNotificationBodyList.length == index + 1) (getterminationNotificationBodyList.length == index + 1)
? isOdd ? isOdd
? true ? true
: false : false
: false, : false,
), ),
gridDelegate: SliverGridDelegateWithFixedCrossAxisCount( gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount: 2, crossAxisCount: 2,
@ -702,11 +702,11 @@ class InfoFragment extends StatelessWidget {
data.contactNotificationBody![index].segmentPrompt, data.contactNotificationBody![index].segmentPrompt,
data.contactNotificationBody![index].segmentValueDsp, data.contactNotificationBody![index].segmentValueDsp,
isNeedToShowEmptyDivider: isNeedToShowEmptyDivider:
(data.contactNotificationBody!.length == index + 1) (data.contactNotificationBody!.length == index + 1)
? isOdd ? isOdd
? true ? true
: false : false
: false, : false,
), ),
gridDelegate: SliverGridDelegateWithFixedCrossAxisCount( gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount: 2, crossAxisCount: 2,
@ -730,7 +730,7 @@ class InfoFragment extends StatelessWidget {
GetPaymentNotificationBodyList? data) { GetPaymentNotificationBodyList? data) {
return Column( return Column(
children: [ children: [
12.height, 12.height,
if (data!.paymentDetailsList!.isNotEmpty) if (data!.paymentDetailsList!.isNotEmpty)
Column( Column(
children: [ children: [
@ -739,54 +739,61 @@ class InfoFragment extends StatelessWidget {
ItemDetailViewCol( ItemDetailViewCol(
LocaleKeys.requestNumber.tr(), data.paymentDetailsList![0].requestNumber ?? ""), LocaleKeys.requestNumber.tr(), data.paymentDetailsList![0].requestNumber ?? ""),
ItemDetailViewCol( LocaleKeys.requesterEmpNum.tr(), ItemDetailViewCol( LocaleKeys.requesterEmpNum.tr(),
data.paymentDetailsList![0].requesterEmployeeName ?? ""), data.paymentDetailsList![0].requesterEmployeeNumber ?? ""),
), ),
ItemDetailGrid( ItemDetailGrid(
ItemDetailViewCol( LocaleKeys.requestDate.tr(), ItemDetailViewCol( LocaleKeys.requestDate.tr(),
DateUtil.formatDateToDate( DateUtil.formatDateToDate(
DateUtil.convertStringToDate(data.paymentDetailsList![0].requestDate!), false) ?? ""), DateUtil.convertStringToDate(data.paymentDetailsList![0].requestDate!), false) ?? ""),
ItemDetailViewCol( ItemDetailViewCol(
LocaleKeys.requesterEmpName.tr(), data.paymentDetailsList![0].requesterEmployeeName ?? ""), LocaleKeys.requesterEmpName.tr(), data.paymentDetailsList![0].requesterEmployeeName ?? ""),
), ),
ItemDetailGrid( ItemDetailGrid(
ItemDetailViewCol( LocaleKeys.prepareEmpName.tr(), ItemDetailViewCol( LocaleKeys.prepareEmpNum.tr(),
data.paymentDetailsList![0].prepareEmployeeName ?? ""), data.paymentDetailsList![0].prepareEmployeeNumber ?? ""),
ItemDetailViewCol( ItemDetailViewCol(
LocaleKeys.requesterPositionName.tr(), data.paymentDetailsList![0].requesterPositionName ?? ""), LocaleKeys.requesterPositionName.tr(), data.paymentDetailsList![0].requesterPositionName ?? ""),
), ),
ItemDetailGrid( ItemDetailGrid(
ItemDetailViewCol( LocaleKeys.preparePositionName.tr(), ItemDetailViewCol( LocaleKeys.prepareEmpName.tr(),
data.paymentDetailsList![0].preparePositionName ?? ""), data.paymentDetailsList![0].prepareEmployeeName ?? ""),
ItemDetailViewCol( ItemDetailViewCol(
LocaleKeys.requesterPayrollName.tr(), data.paymentDetailsList![0].requesterPayrollName ?? ""), 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(), ).objectContainerView(),
if (data!.paymentDetailsList!.isNotEmpty) if (data!.paymentDetailsList!.isNotEmpty)
Column( Column(
children: [ children: [
LocaleKeys.general.tr().toText14(color: MyColors.textMixColor), LocaleKeys.general.tr().toText14(color: MyColors.textMixColor),
ItemDetailGrid( ItemDetailGrid(
ItemDetailViewCol( ItemDetailViewCol(
LocaleKeys.payingORGName.tr(), data.paymentDetailsList![0].payingOrganizationName ?? ""), LocaleKeys.payingORGName.tr(), data.paymentDetailsList![0].payingOrganizationName ?? ""),
ItemDetailViewCol(LocaleKeys.requestAmount.tr(), ItemDetailViewCol(LocaleKeys.requestAmount.tr(),
data.paymentDetailsList![0].requestAmount ?? ""), data.paymentDetailsList![0].requestAmount ?? ""),
), ),
ItemDetailGrid( ItemDetailGrid(
ItemDetailViewCol(LocaleKeys.paymentMethodName.tr(), ItemDetailViewCol(LocaleKeys.paymentMethodName.tr(),
data.paymentDetailsList![0].paymentMethodName ?? ""), data.paymentDetailsList![0].paymentMethodName ?? ""),
ItemDetailViewCol( ItemDetailViewCol(
LocaleKeys.currency.tr(), data.paymentDetailsList![0].currency ?? ""), LocaleKeys.currency.tr(), data.paymentDetailsList![0].currency ?? ""),
), ),
ItemDetailGrid( ItemDetailGrid(
ItemDetailViewCol(LocaleKeys.typeofPayment.tr(), ItemDetailViewCol(LocaleKeys.typeofPayment.tr(),
data.paymentDetailsList![0].typeOfPayment ?? ""), data.paymentDetailsList![0].typeOfPayment ?? ""),
ItemDetailViewCol( ItemDetailViewCol(
LocaleKeys.paymentDetails.tr(), data.paymentDetailsList![0].paymentDetails ?? ""), LocaleKeys.paymentDetails.tr(), data.paymentDetailsList![0].paymentDetails ?? ""),
), ),
], ],
).objectContainerView(), ).objectContainerView(),
if (data!.beneficieryList!.isNotEmpty) if (data!.beneficieryList!.isNotEmpty)
Column( Column(
@ -839,10 +846,65 @@ class InfoFragment extends StatelessWidget {
ItemDetailGrid( ItemDetailGrid(
ItemDetailViewCol(LocaleKeys.supplierNo.tr(), ItemDetailViewCol(LocaleKeys.supplierNo.tr(),
data.purchaseOrdersList![0].supplierNumber?? ""), data.purchaseOrdersList![0].supplierNumber?? ""),
Container(), Container(),
), ),
], ],
).objectContainerView(), ).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(),
], ],
); );
} }

Write Preview
Loading…
Cancel
Save