diff --git a/lib/screens/patients/insurance_approvals_details.dart b/lib/screens/patients/insurance_approvals_details.dart index add08730..c5331910 100644 --- a/lib/screens/patients/insurance_approvals_details.dart +++ b/lib/screens/patients/insurance_approvals_details.dart @@ -160,95 +160,109 @@ class _InsuranceApprovalsDetailsState extends State { ), ], ), - Padding( - padding: const EdgeInsets.symmetric( - horizontal: 8.0), - child: Column( - crossAxisAlignment: - CrossAxisAlignment.start, - //mainAxisAlignment: MainAxisAlignment.center, - children: [ - SizedBox( - height: 25.0, - ), - Row( - children: [ - Texts( - 'Clinic: ', - color: Colors.grey[500], - ), - Texts( - model - .insuranceApproval[ - indexInsurance] - .clinicName, - ) - ], - ), - Row( - children: [ - Texts( - 'Approval No: ', - color: Colors.grey[500], - ), - Texts( - model + Expanded( + child: Padding( + padding: const EdgeInsets.symmetric( + horizontal: 8.0), + child: Column( + crossAxisAlignment: + CrossAxisAlignment.start, + //mainAxisAlignment: MainAxisAlignment.center, + children: [ + SizedBox( + height: 25.0, + ), + Row( + children: [ + Texts( + 'Clinic: ', + color: Colors.grey[500], + fontSize: 14, + ), + Expanded( + child: Texts( + model + .insuranceApproval[ + indexInsurance] + .clinicName, + fontSize: 14, + ), + ) + ], + ), + Row( + children: [ + Texts( + 'Approval No: ', + color: Colors.grey[500], + fontSize: 14, + ), + Texts( + model + .insuranceApproval[ + indexInsurance] + .approvalNo + .toString(), + fontSize: 14, + ) + ], + ), + Row( + children: [ + Texts( + 'Unused Count:', + color: Colors.grey[500], + fontSize: 14, + ), + Texts(model .insuranceApproval[ indexInsurance] - .approvalNo + .unUsedCount .toString(), - ) - ], - ), - Row( - children: [ - Texts( - 'Unused Count:', - color: Colors.grey[500], - ), - Texts(model - .insuranceApproval[ - indexInsurance] - .unUsedCount - .toString()) - ], - ), - Row( - children: [ - Texts( - 'Company Name :', - color: Colors.grey[500], - ), - Texts('Sample') - ], - ), - Row( - children: [ - Texts( - 'Receipt on: ', - color: Colors.grey[500], - ), - Texts( - '${DateUtils.getDayMonthYearDateFormatted(DateUtils.getDateTimeFromServerFormat(model.insuranceApproval[indexInsurance].rceiptOn), isArabic: projectViewModel.isArabic)}', - color: Colors.black, - fontWeight: FontWeight.w600, - ), - ], - ), - Row( - children: [ - Texts( - 'Exp on: ', - color: Colors.grey[500], - ), - Texts( - '${DateUtils.getDayMonthYearDateFormatted(DateUtils.getDateTimeFromServerFormat(model.insuranceApproval[indexInsurance].expiryDate), isArabic: projectViewModel.isArabic)}', - color: Colors.black, - fontWeight: FontWeight.w600, - ), - ], - ), - ], + fontSize: 14, + ) + + ], + ), + Row( + children: [ + Texts( + 'Company Name :', + color: Colors.grey[500], + ), + Texts('Sample') + ], + ), + Row( + children: [ + Texts( + 'Receipt on: ', + color: Colors.grey[500], + ), + Expanded( + child: Texts( + '${DateUtils.getDayMonthYearDateFormatted(DateUtils.getDateTimeFromServerFormat(model.insuranceApproval[indexInsurance].rceiptOn), isArabic: projectViewModel.isArabic)}', + color: Colors.black, + fontWeight: FontWeight.w600, + ), + ), + ], + ), + Row( + children: [ + Texts( + 'Exp on: ', + color: Colors.grey[500], + ), + Texts( + '${DateUtils.getDayMonthYearDateFormatted(DateUtils.getDateTimeFromServerFormat(model.insuranceApproval[indexInsurance].expiryDate), isArabic: projectViewModel.isArabic)}', + color: Colors.black, + fontWeight: FontWeight.w600, + ), + ], + ), + ], + ), ), ), ], @@ -264,34 +278,20 @@ class _InsuranceApprovalsDetailsState extends State { padding: const EdgeInsets.symmetric( horizontal: 8.0), child: Row( - mainAxisAlignment: - MainAxisAlignment.spaceAround, children: [ - Container( - width: MediaQuery.of(context) - .size - .width * - 0.33, + Expanded( child: Texts( 'Procedure', fontWeight: FontWeight.w700, ), ), - Container( - width: MediaQuery.of(context) - .size - .width * - 0.33, + Expanded( child: Texts( 'Status', fontWeight: FontWeight.w700, ), ), - Container( - width: MediaQuery.of(context) - .size - .width * - 0.21, + Expanded( child: Texts( 'Usage Status', fontWeight: FontWeight.w700, @@ -316,78 +316,58 @@ class _InsuranceApprovalsDetailsState extends State { itemBuilder: (BuildContext context, int index) { return Container( - child: Row( - mainAxisAlignment: - MainAxisAlignment - .spaceAround, - crossAxisAlignment: - CrossAxisAlignment.start, + child: Column( children: [ - Container( - height: - MediaQuery.of(context) - .size - .height * - 0.15, //130.0, - width: - MediaQuery.of(context) - .size - .width * - 0.33, - child: Texts(model - .insuranceApproval[ - indexInsurance] - ?.apporvalDetails[ - index] - ?.procedureName ?? - ""), - ), - Container( - height: - MediaQuery.of(context) - .size - .height * - 0.15, - width: - MediaQuery.of(context) - .size - .width * - 0.33, - child: Texts(model - .insuranceApproval[ - indexInsurance] - ?.apporvalDetails[ - index] - ?.status ?? - ""), + Row( + + children: [ + Expanded( + child: Container( + + child: Texts(model + .insuranceApproval[ + indexInsurance] + ?.apporvalDetails[ + index] + ?.procedureName ?? + "",textAlign: TextAlign.start,), + ), + ), + Expanded( + child: Container( + + child: Texts(model + .insuranceApproval[ + indexInsurance] + ?.apporvalDetails[ + index] + ?.status ?? + "",textAlign: TextAlign.center,), + ), + ), + Expanded( + child: Container( + child: Texts(model + .insuranceApproval[ + indexInsurance] + ?.apporvalDetails[ + index] + ?.isInvoicedDesc ?? + "",textAlign: TextAlign.center,), + ), + ), + ], ), - Container( - height: - MediaQuery.of(context) - .size - .height * - 0.15, - width: - MediaQuery.of(context) - .size - .width * - 0.21, - child: Texts(model - .insuranceApproval[ - indexInsurance] - ?.apporvalDetails[ - index] - ?.isInvoicedDesc ?? - ""), + SizedBox(width: 5,), + Divider( + color: Colors.black38, ), ], ), ); }), ), - Divider( - color: Colors.black45, - ), + ], ), ), diff --git a/lib/widgets/patients/profile/soap_update/update_assessment_page.dart b/lib/widgets/patients/profile/soap_update/update_assessment_page.dart index 86016be9..db791416 100644 --- a/lib/widgets/patients/profile/soap_update/update_assessment_page.dart +++ b/lib/widgets/patients/profile/soap_update/update_assessment_page.dart @@ -677,17 +677,18 @@ class _AddAssessmentDetailsState extends State { height: 16, ), Row( + children: [ - AppText( - TranslationBase.of(context) - .addAssessmentDetails - .toUpperCase(), - fontWeight: FontWeight.bold, - fontSize: 13, - ), - SizedBox( - width: MediaQuery.of(context).size.width * 0.42, + Expanded( + child: AppText( + TranslationBase.of(context) + .addAssessmentDetails + .toUpperCase(), + fontWeight: FontWeight.bold, + fontSize: 13, + ), ), + InkWell( child: Icon( Icons.close,