Insurance Approval design fix

doctor-app-design
hussam al-habibeh 4 years ago
parent 75a10939fb
commit 6f1790d71e

@ -100,11 +100,11 @@ class _InsuranceApprovalScreenNewState
doctorName: model
.insuranceApprovalInPatient[index]
.doctorName,
branch: model
approvalNo: model
.insuranceApprovalInPatient[index]
.approvalNo
.toString(),
isPrescriptions: true,
isInsurance: true,
approvalStatus: model
.insuranceApprovalInPatient[index]
.approvalStatusDescption ??
@ -149,33 +149,10 @@ class _InsuranceApprovalScreenNewState
child: model.insuranceApproval.length != 0
? Column(
children: <Widget>[
Padding(
padding: const EdgeInsets.all(8.0),
child: Column(
children: [
Row(
children: [
AppText(
TranslationBase.of(context)
.insurance22,
fontSize: 15.0,
fontWeight: FontWeight.w600,
fontFamily: 'Poppins',
),
],
),
Row(
children: [
AppText(
TranslationBase.of(context)
.approvals22,
fontSize: 30.0,
fontWeight: FontWeight.w700,
),
],
),
],
),
ServiceTitle(
title: TranslationBase.of(context).insurance22,
subTitle:
TranslationBase.of(context).approvals22,
),
...List.generate(
model.insuranceApproval.length,
@ -213,10 +190,10 @@ class _InsuranceApprovalScreenNewState
.insuranceApproval[index].clinicName,
doctorName: model
.insuranceApproval[index].doctorName,
branch: model
approvalNo: model
.insuranceApproval[index].approvalNo
.toString(),
isPrescriptions: true,
isInsurance: true,
approvalStatus: model
.insuranceApproval[index]
.approvalStatusDescption ??

@ -5,9 +5,11 @@ import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart';
import 'package:doctor_app_flutter/screens/base/base_view.dart';
import 'package:doctor_app_flutter/util/date-utils.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/patients/patient_service_title.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-app-bar.dart';
import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/user-guid/CusomRow.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
@ -54,38 +56,16 @@ class _InsuranceApprovalsDetailsState extends State<InsuranceApprovalsDetails> {
AppScaffold(
isShowAppBar: true,
baseViewModel: model,
appBar: PatientProfileAppBar(
patient),
appBar: PatientProfileAppBar(patient),
body: patient.admissionNo != null
? SingleChildScrollView(
child: Container(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Padding(
padding: const EdgeInsets.all(8.0),
child: Column(
children: [
Row(
children: [
AppText(
TranslationBase.of(context).insurance22,
fontSize: 15.0,
fontWeight: FontWeight.w600,
fontFamily: 'Poppins',
),
],
),
Row(
children: [
AppText(
TranslationBase.of(context).approvals22,
fontSize: 30.0,
fontWeight: FontWeight.w700,
),
],
),
],
),
ServiceTitle(
title: TranslationBase.of(context).insurance22,
subTitle: TranslationBase.of(context).approvals22,
),
Container(
margin: EdgeInsets.all(10),
@ -128,6 +108,11 @@ class _InsuranceApprovalsDetailsState extends State<InsuranceApprovalsDetails> {
? Color(0xff359846)
: Color(0xffD02127)
: Color(0xffD02127),
letterSpacing: -0.4,
fontWeight: FontWeight.w600,
fontSize: SizeConfig
.getTextMultiplierBasedOnWidth() *
2.7,
),
],
),
@ -139,9 +124,10 @@ class _InsuranceApprovalsDetailsState extends State<InsuranceApprovalsDetails> {
indexInsurance]
.doctorName
.toUpperCase(),
color: Colors.black,
fontSize: 18,
fontWeight: FontWeight.bold,
color: Color(0xff2E303A),
fontSize: 16,
letterSpacing: -0.64,
fontWeight: FontWeight.w600,
)
],
),
@ -153,8 +139,14 @@ class _InsuranceApprovalsDetailsState extends State<InsuranceApprovalsDetails> {
Column(
children: [
Container(
height: 85.0,
width: 85.0,
height: MediaQuery.of(context)
.size
.height *
0.065,
width: MediaQuery.of(context)
.size
.height *
0.065,
child: CircleAvatar(
radius: SizeConfig
.imageSizeMultiplier *
@ -192,112 +184,55 @@ class _InsuranceApprovalsDetailsState extends State<InsuranceApprovalsDetails> {
SizedBox(
height: 25.0,
),
Row(
children: [
AppText(
TranslationBase.of(
context)
.clinic +
": ",
color: Colors.grey[500],
fontSize: 14,
),
Expanded(
child: AppText(
model
.insuranceApprovalInPatient[
indexInsurance]
.clinicName,
fontSize: 14,
),
)
],
CustomRow(
label: TranslationBase.of(
context)
.clinic +
": ",
value: model
.insuranceApprovalInPatient[
indexInsurance]
.clinicName,
),
Row(
children: <Widget>[
AppText(
TranslationBase.of(
context)
.approvalNo +
": ",
color: Colors.grey[500],
fontSize: 14,
),
AppText(
model
.insuranceApprovalInPatient[
indexInsurance]
.approvalNo
.toString(),
fontSize: 14,
)
],
),
Row(
children: <Widget>[
AppText(
'Unused Count:',
color: Colors.grey[500],
fontSize: 14,
),
AppText(
model
.insuranceApprovalInPatient[
indexInsurance]
.unUsedCount
.toString(),
fontSize: 14,
)
],
),
Row(
children: <Widget>[
AppText(
TranslationBase.of(
context)
.companyName +
": ",
color: Colors.grey[500],
),
AppText('Sample')
],
),
Row(
children: [
AppText(
TranslationBase.of(
context)
.receiptOn +
": ",
color: Colors.grey[500],
),
Expanded(
child: AppText(
'${AppDateUtils.getDayMonthYearDateFormatted(AppDateUtils.getDateTimeFromServerFormat(model.insuranceApprovalInPatient[indexInsurance].receiptOn), isArabic: projectViewModel.isArabic)}',
color: Colors.black,
fontWeight:
FontWeight.w600,
),
),
],
CustomRow(
label: TranslationBase.of(
context)
.approvalNo +
": ",
value: model
.insuranceApprovalInPatient[
indexInsurance]
.approvalNo
.toString(),
),
Row(
children: [
AppText(
TranslationBase.of(
context)
.expiryDate +
": ",
color: Colors.grey[500],
),
AppText(
'${AppDateUtils.getDayMonthYearDateFormatted(AppDateUtils.getDateTimeFromServerFormat(model.insuranceApprovalInPatient[indexInsurance].expiryDate), isArabic: projectViewModel.isArabic)}',
color: Colors.black,
fontWeight:
FontWeight.w600,
),
],
CustomRow(
label: 'Unused Count:',
value: model
.insuranceApprovalInPatient[
indexInsurance]
.unUsedCount
.toString(),
),
CustomRow(
label: TranslationBase.of(
context)
.companyName +
": ",
value: 'Sample'),
CustomRow(
label: TranslationBase.of(
context)
.receiptOn +
": ",
value:
'${AppDateUtils.getDayMonthYearDateFormatted(AppDateUtils.getDateTimeFromServerFormat(model.insuranceApprovalInPatient[indexInsurance].receiptOn ?? ""), isArabic: projectViewModel.isArabic)}'),
CustomRow(
label: TranslationBase.of(
context)
.expiryDate +
": ",
value:
'${AppDateUtils.getDayMonthYearDateFormatted(AppDateUtils.getDateTimeFromServerFormat(model.insuranceApprovalInPatient[indexInsurance].expiryDate ?? ""), isArabic: projectViewModel.isArabic)}'),
],
),
),
@ -320,21 +255,36 @@ class _InsuranceApprovalsDetailsState extends State<InsuranceApprovalsDetails> {
child: AppText(
TranslationBase.of(context)
.procedure,
fontWeight: FontWeight.w700,
fontWeight: FontWeight.w600,
color: Color(0xff2E303A),
letterSpacing: -0.48,
fontSize: SizeConfig
.getTextMultiplierBasedOnWidth() *
2.9,
),
),
Expanded(
child: AppText(
TranslationBase.of(context)
.status,
fontWeight: FontWeight.w700,
fontWeight: FontWeight.w600,
color: Color(0xff2E303A),
letterSpacing: -0.48,
fontSize: SizeConfig
.getTextMultiplierBasedOnWidth() *
2.9,
),
),
Expanded(
child: AppText(
TranslationBase.of(context)
.usageStatus,
fontWeight: FontWeight.w700,
fontWeight: FontWeight.w600,
color: Color(0xff2E303A),
letterSpacing: -0.48,
fontSize: SizeConfig
.getTextMultiplierBasedOnWidth() *
2.9,
),
)
],
@ -374,7 +324,18 @@ class _InsuranceApprovalsDetailsState extends State<InsuranceApprovalsDetails> {
"",
textAlign:
TextAlign
.start,
.center,
fontSize:
SizeConfig
.getTextMultiplierBasedOnWidth() *
2.7,
letterSpacing:
-0.4,
color: Color(
0xff575757),
fontWeight:
FontWeight
.w500,
),
),
),
@ -391,6 +352,17 @@ class _InsuranceApprovalsDetailsState extends State<InsuranceApprovalsDetails> {
textAlign:
TextAlign
.center,
fontSize:
SizeConfig
.getTextMultiplierBasedOnWidth() *
2.7,
letterSpacing:
-0.4,
color: Color(
0xff575757),
fontWeight:
FontWeight
.w500,
),
),
),
@ -407,6 +379,17 @@ class _InsuranceApprovalsDetailsState extends State<InsuranceApprovalsDetails> {
textAlign:
TextAlign
.center,
fontSize:
SizeConfig
.getTextMultiplierBasedOnWidth() *
2.7,
letterSpacing:
-0.4,
color: Color(
0xff575757),
fontWeight:
FontWeight
.w500,
),
),
),

@ -1,7 +1,9 @@
import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/large_avatar.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/user-guid/CusomRow.dart';
import 'package:eva_icons_flutter/eva_icons_flutter.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
@ -9,13 +11,13 @@ import 'package:provider/provider.dart';
class DoctorCardInsurance extends StatelessWidget {
final String doctorName;
final String branch;
final String approvalNo;
final DateTime appointmentDate;
final String profileUrl;
final String invoiceNO;
final String orderNo;
final Function onTap;
final bool isPrescriptions;
final bool isInsurance;
final String clinic;
final String approvalStatus;
final String patientOut;
@ -23,13 +25,13 @@ class DoctorCardInsurance extends StatelessWidget {
DoctorCardInsurance(
{this.doctorName,
this.branch,
this.approvalNo,
this.profileUrl,
this.invoiceNO,
this.onTap,
this.appointmentDate,
this.orderNo,
this.isPrescriptions = false,
this.isInsurance = false,
this.clinic,
this.approvalStatus,
this.patientOut,
@ -59,7 +61,8 @@ class DoctorCardInsurance extends StatelessWidget {
topLeft: Radius.circular(10),
bottomLeft: Radius.circular(10),
),
color: approvalStatus == "Approved" || approvalStatus == "تمت الموافقة"
color: approvalStatus == "Approved" ||
approvalStatus == "تمت الموافقة"
? Color(0xff359846)
: Color(0xffD02127),
),
@ -67,7 +70,8 @@ class DoctorCardInsurance extends StatelessWidget {
Expanded(
child: Container(
padding: EdgeInsets.only(
left: projectViewModel.isArabic ? 0 : 15, right: projectViewModel.isArabic ? 15 : 0),
left: projectViewModel.isArabic ? 0 : 15,
right: projectViewModel.isArabic ? 15 : 0),
child: InkWell(
onTap: onTap,
child: Column(
@ -78,22 +82,32 @@ class DoctorCardInsurance extends StatelessWidget {
children: [
AppText(
"$approvalStatus",
color: approvalStatus == "Approved" || approvalStatus == "تمت الموافقة"
color: approvalStatus == "Approved" ||
approvalStatus == "تمت الموافقة"
? Color(0xff359846)
: Color(0xffD02127),
letterSpacing: -0.4,
fontSize:
SizeConfig.getTextMultiplierBasedOnWidth() *
2.7,
),
Container(
decoration: BoxDecoration(
borderRadius: BorderRadius.all(
Radius.circular(25.0),
Radius.circular(20.0),
),
color: Color(0xff2E303A)),
child: Padding(
padding: const EdgeInsets.all(12.0),
padding: const EdgeInsets.symmetric(
vertical: 6.5, horizontal: 11.5),
child: AppText(
'$patientOut'.replaceAll(" ", ""),
color: Colors.white,
fontSize: 13.0,
fontSize:
SizeConfig.getTextMultiplierBasedOnWidth() *
2.7,
letterSpacing: -0.4,
fontWeight: FontWeight.w600,
),
),
)
@ -104,7 +118,9 @@ class DoctorCardInsurance extends StatelessWidget {
Expanded(
child: AppText(
doctorName,
bold: true,
fontSize: 16.0,
letterSpacing: -0.64,
fontWeight: FontWeight.w600,
)),
],
),
@ -123,86 +139,54 @@ class DoctorCardInsurance extends StatelessWidget {
flex: 4,
child: Container(
margin: EdgeInsets.all(10),
child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: <Widget>[
if (orderNo != null && !isPrescriptions)
Row(
children: <Widget>[
AppText(
'order No:',
color: Colors.grey[500],
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
if (orderNo != null && !isInsurance)
CustomRow(
label: 'Invoice:',
value: invoiceNO,
),
AppText(
orderNo ?? '',
)
],
),
if (invoiceNO != null && !isPrescriptions)
Row(
children: <Widget>[
AppText(
'Invoice:',
color: Colors.grey[500],
if (invoiceNO != null && !isInsurance)
CustomRow(
label: 'Invoice:',
value: invoiceNO,
),
AppText(
invoiceNO,
)
],
),
if (isPrescriptions)
Row(
children: <Widget>[
AppText(
TranslationBase.of(context).clinic + ": ",
color: Colors.grey[500],
fontSize: 14,
//fontWeight: FontWeight.w600,
//color: Colors.grey[500],
if (isInsurance)
CustomRow(
label:
TranslationBase.of(context).clinic +
": ",
value: clinic,
),
Expanded(
child: AppText(
clinic,
//fontWeight: FontWeight.w700,
fontSize: 14.0,
),
)
],
),
if (branch2 != null)
Row(
children: <Widget>[
AppText(
TranslationBase.of(context).branch + ": ",
fontSize: 14,
color: Colors.grey[500],
if (branch2 != null)
CustomRow(
label:
TranslationBase.of(context).branch +
": ",
value: branch2,
),
AppText(
branch2,
fontSize: 14.0,
)
],
),
Row(
children: <Widget>[
AppText(
TranslationBase.of(context).approvalNo + ": ",
fontSize: 14,
color: Colors.grey[500],
//color: Colors.grey[500],
),
AppText(
branch,
fontSize: 14.0,
)
],
),
]),
if (approvalNo != null)
CustomRow(
label: TranslationBase.of(context)
.approvalNo +
": ",
value: approvalNo,
),
]),
),
),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 15.0),
child: Icon(
EvaIcons.eye,
),
Column(
children: [
Padding(
padding: const EdgeInsets.symmetric(
horizontal: 15.0),
child: Icon(
EvaIcons.eye,
color: Color(0xff2E303A),
),
),
],
)
],
),

@ -135,7 +135,7 @@ class _AppTextFieldCustomState extends State<AppTextFieldCustom> {
// SizeConfig.getHeightMultiplier() *
// (SizeConfig.isWidthLarge ? 1.1 : 1.3)
: 0,
fontWeight: FontWeight.w500,
fontWeight: FontWeight.w600,
letterSpacing: -0.44,
fontFamily: 'Poppins',
),

@ -7,7 +7,11 @@ class CustomRow extends StatelessWidget {
const CustomRow({
Key key,
this.label,
this.value, this.labelSize, this.valueSize, this.width, this.isCopyable= true,
this.value,
this.labelSize,
this.valueSize,
this.width,
this.isCopyable = true,
}) : super(key: key);
final String label;
@ -24,7 +28,8 @@ class CustomRow extends StatelessWidget {
children: [
AppText(
label,
fontSize: labelSize??SizeConfig.getTextMultiplierBasedOnWidth() * 2.7,
fontSize:
labelSize ?? SizeConfig.getTextMultiplierBasedOnWidth() * 2.7,
color: Color(0xFF575757),
fontWeight: FontWeight.w600,
letterSpacing: -0.4,
@ -32,15 +37,18 @@ class CustomRow extends StatelessWidget {
SizedBox(
width: 1,
),
AppText(
value,
fontSize: valueSize??SizeConfig.getTextMultiplierBasedOnWidth() * 2.9,
color: Color(0xFF2B353E),
fontWeight: FontWeight.w700,
letterSpacing: -0.48,
isCopyable: isCopyable,
Expanded(
child: AppText(
value,
fontSize:
valueSize ?? SizeConfig.getTextMultiplierBasedOnWidth() * 2.9,
color: Color(0xFF2B353E),
fontWeight: FontWeight.w700,
letterSpacing: -0.48,
isCopyable: isCopyable,
),
),
],
);
}
}
}

Loading…
Cancel
Save