From daa417a19b179d3762549e300b7809c72c8feac5 Mon Sep 17 00:00:00 2001 From: hussam al-habibeh Date: Mon, 5 Apr 2021 12:12:52 +0300 Subject: [PATCH] Insurance approval new design --- .../patients/insurance_approvals_details.dart | 48 +++++++++++++++---- .../profile_medical_info_widget_search.dart | 10 ---- lib/widgets/shared/doctor_card_insurance.dart | 21 ++++---- 3 files changed, 51 insertions(+), 28 deletions(-) diff --git a/lib/screens/patients/insurance_approvals_details.dart b/lib/screens/patients/insurance_approvals_details.dart index 4f746c3d..ba93b780 100644 --- a/lib/screens/patients/insurance_approvals_details.dart +++ b/lib/screens/patients/insurance_approvals_details.dart @@ -100,7 +100,7 @@ class _InsuranceApprovalsDetailsState extends State { .approvalDetails.status == "Approved" ? Color(0xff359846) - : (0xffD02127), + : Color(0xffD02127), ), ], ), @@ -269,20 +269,48 @@ class _InsuranceApprovalsDetailsState extends State { mainAxisAlignment: MainAxisAlignment.spaceAround, children: [ - Expanded( + Container( + height: MediaQuery.of(context) + .size + .height * + 0.2, //130.0, + width: MediaQuery.of(context) + .size + .width * + 0.33, child: Texts(model .insuranceApproval[indexInsurance] .approvalDetails .procedureName), ), - Texts(model - .insuranceApproval[indexInsurance] - .approvalDetails - .status), - Texts(model - .insuranceApproval[indexInsurance] - .approvalDetails - .isInvoicedDesc), + Container( + height: MediaQuery.of(context) + .size + .height * + 0.2, + width: MediaQuery.of(context) + .size + .width * + 0.33, + child: Texts(model + .insuranceApproval[indexInsurance] + .approvalDetails + .status), + ), + Container( + height: MediaQuery.of(context) + .size + .height * + 0.2, + width: MediaQuery.of(context) + .size + .width * + 0.25, + child: Texts(model + .insuranceApproval[indexInsurance] + .approvalDetails + .isInvoicedDesc), + ), ], ) ], diff --git a/lib/widgets/patients/profile/profile_medical_info_widget_search.dart b/lib/widgets/patients/profile/profile_medical_info_widget_search.dart index b4c445ca..c49c4576 100644 --- a/lib/widgets/patients/profile/profile_medical_info_widget_search.dart +++ b/lib/widgets/patients/profile/profile_medical_info_widget_search.dart @@ -134,16 +134,6 @@ class ProfileMedicalInfoWidgetSearch extends StatelessWidget { nameLine1: TranslationBase.of(context).progress, nameLine2: TranslationBase.of(context).note, icon: 'patient/Progress_notes.png'), - if (int.parse(patientType) == 7 || int.parse(patientType) == 6) - PatientProfileButton( - key: key, - patient: patient, - patientType: patientType, - arrivalType: arrivalType, - route: ORDER_PROCEDURE, - nameLine1: TranslationBase.of(context).orders, - nameLine2: TranslationBase.of(context).procedures, - icon: 'patient/Order_Procedures.png'), ], ), ); diff --git a/lib/widgets/shared/doctor_card_insurance.dart b/lib/widgets/shared/doctor_card_insurance.dart index 1380aef8..4c2bc6d1 100644 --- a/lib/widgets/shared/doctor_card_insurance.dart +++ b/lib/widgets/shared/doctor_card_insurance.dart @@ -43,12 +43,15 @@ class DoctorCardInsurance extends StatelessWidget { return Container( margin: EdgeInsets.all(10), decoration: BoxDecoration( - border: Border.all( - width: 0.5, - color: Colors.white, - ), - borderRadius: BorderRadius.all( - Radius.circular(15.0), + border: Border( + left: BorderSide( + color: approvalStatus == "Approved" + ? Color(0xff359846) + : Color(0xffD02127), + width: 3.5), + top: BorderSide(color: Colors.white, width: 0.5), + bottom: BorderSide(color: Colors.white, width: 0.5), + right: BorderSide(color: Colors.white, width: 0.5), ), color: Colors.white), child: Padding( @@ -142,8 +145,10 @@ class DoctorCardInsurance extends StatelessWidget { 'Clinic: ', color: Colors.grey[500], ), - Texts( - clinic, + Expanded( + child: Texts( + clinic, + ), ) ], ),