From c1b23b7c2a00542955c59a72098e0d112bf640b6 Mon Sep 17 00:00:00 2001 From: Sikander Saleem Date: Thu, 30 Sep 2021 12:14:51 +0300 Subject: [PATCH] improvements --- lib/extensions/string_extensions.dart | 2 +- .../insurance_approval_detail_screen.dart | 43 +++++++---------- .../insurance/insurance_approval_screen.dart | 13 +++-- .../prescription_details_page.dart | 47 +++++++++---------- lib/uitl/utils.dart | 4 +- 5 files changed, 47 insertions(+), 62 deletions(-) diff --git a/lib/extensions/string_extensions.dart b/lib/extensions/string_extensions.dart index ffadbb5d..e1700bc5 100644 --- a/lib/extensions/string_extensions.dart +++ b/lib/extensions/string_extensions.dart @@ -2,5 +2,5 @@ extension CapExtension on String { String get toCamelCase => "${this[0].toUpperCase()}${this.substring(1)}"; String get inCaps => '${this[0].toUpperCase()}${this.substring(1)}'; String get allInCaps => this.toUpperCase(); - String get capitalizeFirstofEach => this.length > 0 ? this.split(" ").map((str) => str.inCaps).join(" ") : ""; + String get capitalizeFirstofEach => this.trim().length > 0 ? this.trim().toLowerCase().split(" ").map((str) => str.inCaps).join(" ") : ""; } diff --git a/lib/pages/insurance/insurance_approval_detail_screen.dart b/lib/pages/insurance/insurance_approval_detail_screen.dart index d00f22db..2cc381d4 100644 --- a/lib/pages/insurance/insurance_approval_detail_screen.dart +++ b/lib/pages/insurance/insurance_approval_detail_screen.dart @@ -7,7 +7,6 @@ import 'package:diplomaticquarterapp/widgets/avatar/large_avatar.dart'; import 'package:diplomaticquarterapp/widgets/data_display/medical/doctor_card.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:flutter/cupertino.dart'; -import 'package:diplomaticquarterapp/extensions/string_extensions.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; @@ -72,7 +71,7 @@ class InsuranceApprovalDetail extends StatelessWidget { child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - myRichText(TranslationBase.of(context).clinic + ":", insuranceApprovalModel?.clinicName.toLowerCase().capitalizeFirstofEach ?? "", projectViewModel.isArabic), + myRichText(TranslationBase.of(context).clinic + ":", insuranceApprovalModel?.clinicName ?? "", projectViewModel.isArabic), myRichText(TranslationBase.of(context).approvalNo, insuranceApprovalModel?.approvalNo.toString() ?? "", projectViewModel.isArabic), myRichText(TranslationBase.of(context).unusedCount, insuranceApprovalModel?.unUsedCount.toString() ?? "", projectViewModel.isArabic), myRichText(TranslationBase.of(context).companyName, insuranceApprovalModel?.companyName ?? "", projectViewModel.isArabic), @@ -91,34 +90,26 @@ class InsuranceApprovalDetail extends StatelessWidget { 0: FlexColumnWidth(1.8), 1: FlexColumnWidth(1), 2: FlexColumnWidth(1), - }, children: fullData(context)) + }, children: [ + TableRow( + children: [ + Utils.tableColumnTitle(TranslationBase.of(context).procedure), + Utils.tableColumnTitle(TranslationBase.of(context).status), + Utils.tableColumnTitle(TranslationBase.of(context).usageStatus) + ], + ), + TableRow( + children: [ + Utils.tableColumnValue(insuranceApprovalModel?.apporvalDetails?.procedureName ?? '', isLast: true, mProjectViewModel: projectViewModel), + Utils.tableColumnValue(insuranceApprovalModel?.approvalStatusDescption ?? '', isLast: true, mProjectViewModel: projectViewModel), + Utils.tableColumnValue(insuranceApprovalModel?.apporvalDetails?.isInvoicedDesc.toString() ?? '', isLast: true, mProjectViewModel: projectViewModel), + ], + ), + ]) ], ), ), ), ); } - - List fullData(context) { - List tableRow = []; - tableRow.add( - TableRow( - children: [ - Utils.tableColumnTitle(TranslationBase.of(context).procedure), - Utils.tableColumnTitle(TranslationBase.of(context).status), - Utils.tableColumnTitle(TranslationBase.of(context).usageStatus) - ], - ), - ); - tableRow.add( - TableRow( - children: [ - Utils.tableColumnValue(insuranceApprovalModel?.apporvalDetails?.procedureName ?? '', isLast: true), - Utils.tableColumnValue(insuranceApprovalModel?.approvalStatusDescption ?? '', isLast: true), - Utils.tableColumnValue(insuranceApprovalModel?.apporvalDetails?.isInvoicedDesc.toString() ?? '', isLast: true), - ], - ), - ); - return tableRow; - } } diff --git a/lib/pages/insurance/insurance_approval_screen.dart b/lib/pages/insurance/insurance_approval_screen.dart index 8c443113..41f847e3 100644 --- a/lib/pages/insurance/insurance_approval_screen.dart +++ b/lib/pages/insurance/insurance_approval_screen.dart @@ -1,4 +1,3 @@ -import 'package:diplomaticquarterapp/config/size_config.dart'; import 'package:diplomaticquarterapp/core/model/ImagesInfo.dart'; import 'package:diplomaticquarterapp/core/viewModels/insurance_card_View_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; @@ -8,7 +7,6 @@ import 'package:diplomaticquarterapp/widgets/avatar/large_avatar.dart'; import 'package:diplomaticquarterapp/widgets/data_display/medical/doctor_card.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; -import 'package:diplomaticquarterapp/widgets/others/rounded_container.dart'; import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; @@ -38,7 +36,7 @@ class _InsuranceApprovalState extends State { .add(ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileApp/imges-info/apporvals/en/1.png', imageAr: 'https://hmgwebservices.com/Images/MobileApp/imges-info/apporvals/ar/1.png')); return BaseView( onModelReady: widget.appointmentNo != null ? (model) => model.getInsuranceApproval(appointmentNo: widget.appointmentNo) : (model) => model.getInsuranceApproval(), - builder: (BuildContext context, InsuranceViewModel model, Widget child) => AppScaffold( + builder: (BuildContext _context, InsuranceViewModel model, Widget child) => AppScaffold( isShowAppBar: true, showNewAppBar: true, baseViewModel: model, @@ -49,18 +47,19 @@ class _InsuranceApprovalState extends State { imagesInfo: imagesInfo, body: ListView.separated( padding: EdgeInsets.all(21), - itemBuilder: (context, index) { + physics: BouncingScrollPhysics(), + itemBuilder: (_, index) { Color _patientStatusColor; String _patientStatusString; if (model.insuranceApproval[index].isLiveCareAppointment) { _patientStatusColor = Color(0xff2E303A); - _patientStatusString = TranslationBase.of(context).liveCare.toLowerCase().capitalizeFirstofEach; + _patientStatusString = TranslationBase.of(context).liveCare.capitalizeFirstofEach; } else if (!model.insuranceApproval[index].isInOutPatient) { _patientStatusColor = Color(0xffD02127); - _patientStatusString = TranslationBase.of(context).inPatient.toLowerCase().capitalizeFirstofEach; + _patientStatusString = TranslationBase.of(context).inPatient.capitalizeFirstofEach; } else { - _patientStatusString = TranslationBase.of(context).outpatient.toLowerCase().capitalizeFirstofEach; + _patientStatusString = TranslationBase.of(context).outpatient.capitalizeFirstofEach; _patientStatusColor = Color(0xffa9a089); } return InkWell( diff --git a/lib/pages/medical/prescriptions/prescription_details_page.dart b/lib/pages/medical/prescriptions/prescription_details_page.dart index 4d012cce..a6a2b3cf 100644 --- a/lib/pages/medical/prescriptions/prescription_details_page.dart +++ b/lib/pages/medical/prescriptions/prescription_details_page.dart @@ -1,5 +1,6 @@ import 'package:diplomaticquarterapp/core/model/prescriptions/Prescriptions.dart'; import 'package:diplomaticquarterapp/core/model/prescriptions/prescription_report.dart'; +import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; import 'package:diplomaticquarterapp/extensions/string_extensions.dart'; import 'package:diplomaticquarterapp/models/header_model.dart'; import 'package:diplomaticquarterapp/pages/MyAppointments/widgets/reminder_dialog_prescription.dart'; @@ -13,6 +14,7 @@ import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; class PrescriptionDetailsPage extends StatelessWidget { final PrescriptionReport prescriptionReport; @@ -21,6 +23,7 @@ class PrescriptionDetailsPage extends StatelessWidget { @override Widget build(BuildContext context) { + ProjectViewModel projectViewModel = Provider.of(context); return AppScaffold( isShowAppBar: true, showNewAppBar: true, @@ -97,7 +100,24 @@ class PrescriptionDetailsPage extends StatelessWidget { ], ), SizedBox(height: 12), - Table(children: fullData(context)), + Table(children: [ + TableRow( + children: [ + Utils.tableColumnTitle(TranslationBase.of(context).route), + Utils.tableColumnTitle(TranslationBase.of(context).frequency), + Utils.tableColumnTitle(TranslationBase.of(context).dailyDoses), + Utils.tableColumnTitle(TranslationBase.of(context).duration) + ], + ), + TableRow( + children: [ + Utils.tableColumnValue(prescriptionReport?.routeN ?? '', isLast: true, mProjectViewModel: projectViewModel), + Utils.tableColumnValue(prescriptionReport?.frequencyN ?? '', isLast: true, mProjectViewModel: projectViewModel), + Utils.tableColumnValue(prescriptionReport?.doseDailyQuantity.toString() ?? '', isLast: true, mProjectViewModel: projectViewModel), + Utils.tableColumnValue(prescriptionReport?.days.toString() ?? '', isLast: true, mProjectViewModel: projectViewModel), + ], + ), + ]), Text( TranslationBase.of(context).remarks, style: TextStyle(fontSize: 12, fontWeight: FontWeight.w600, color: Color(0xff2E303A), letterSpacing: -0.48), @@ -183,29 +203,4 @@ class PrescriptionDetailsPage extends StatelessWidget { ), ); } - - List fullData(context) { - List tableRow = []; - tableRow.add( - TableRow( - children: [ - Utils.tableColumnTitle(TranslationBase.of(context).route), - Utils.tableColumnTitle(TranslationBase.of(context).frequency), - Utils.tableColumnTitle(TranslationBase.of(context).dailyDoses), - Utils.tableColumnTitle(TranslationBase.of(context).duration) - ], - ), - ); - tableRow.add( - TableRow( - children: [ - Utils.tableColumnValue(prescriptionReport?.routeN ?? '', isLast: true), - Utils.tableColumnValue(prescriptionReport?.frequencyN ?? '', isLast: true), - Utils.tableColumnValue(prescriptionReport?.doseDailyQuantity.toString() ?? '', isLast: true), - Utils.tableColumnValue(prescriptionReport?.days.toString() ?? '', isLast: true), - ], - ), - ); - return tableRow; - } } diff --git a/lib/uitl/utils.dart b/lib/uitl/utils.dart index 4cc1745b..cf140c17 100644 --- a/lib/uitl/utils.dart +++ b/lib/uitl/utils.dart @@ -865,8 +865,8 @@ class Utils { ); } - static Widget tableColumnValue(String text, {bool isLast = false, bool isCapitable = true}) { - ProjectViewModel projectViewModel = Provider.of(AppGlobal.context); + static Widget tableColumnValue(String text, {bool isLast = false, bool isCapitable = true, ProjectViewModel mProjectViewModel}) { + ProjectViewModel projectViewModel = mProjectViewModel ?? Provider.of(AppGlobal.context); return Column( crossAxisAlignment: CrossAxisAlignment.start, mainAxisSize: MainAxisSize.min,