Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services

 Conflicts:
	lib/widgets/shared/doctor_card_insurance.dart
merge-requests/424/head
Mohammad Aljammal 5 years ago
commit 0ddc349eda

@ -216,28 +216,26 @@ class _InsuranceApprovalsDetailsState extends State<InsuranceApprovalsDetails> {
Row( Row(
children: [ children: [
Texts( Texts(
'Receipt on :', 'Receipt on: ',
color: Colors.grey[500], color: Colors.grey[500],
), ),
Texts( Texts(
'${DateUtils.getDayMonthYearDateFormatted(DateUtils.getDateTimeFromServerFormat(model.insuranceApproval[indexInsurance].rceiptOn), isArabic: projectViewModel.isArabic)}', '${DateUtils.getDayMonthYearDateFormatted(DateUtils.getDateTimeFromServerFormat(model.insuranceApproval[indexInsurance].rceiptOn), isArabic: projectViewModel.isArabic)}',
color: Colors.black, color: Colors.black,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
fontSize: 14,
), ),
], ],
), ),
Row( Row(
children: [ children: [
Texts( Texts(
'Exp on:', 'Exp on: ',
color: Colors.grey[500], color: Colors.grey[500],
), ),
Texts( Texts(
'${DateUtils.getDayMonthYearDateFormatted(DateUtils.getDateTimeFromServerFormat(model.insuranceApproval[indexInsurance].expiryDate), isArabic: projectViewModel.isArabic)}', '${DateUtils.getDayMonthYearDateFormatted(DateUtils.getDateTimeFromServerFormat(model.insuranceApproval[indexInsurance].expiryDate), isArabic: projectViewModel.isArabic)}',
color: Colors.black, color: Colors.black,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
fontSize: 14,
), ),
], ],
), ),
@ -253,33 +251,70 @@ class _InsuranceApprovalsDetailsState extends State<InsuranceApprovalsDetails> {
Container( Container(
child: Column( child: Column(
children: [ children: [
Row( Padding(
padding: const EdgeInsets.symmetric(
horizontal: 8.0),
child: Row(
mainAxisAlignment: mainAxisAlignment:
MainAxisAlignment.spaceAround, MainAxisAlignment.spaceAround,
children: [ children: [
Texts('Procedure'), Container(
Texts('Status'), width: MediaQuery.of(context)
Texts('Usage Status') .size
.width *
0.33,
child: Texts(
'Procedure',
fontWeight: FontWeight.w700,
),
),
Container(
width: MediaQuery.of(context)
.size
.width *
0.33,
child: Texts(
'Status',
fontWeight: FontWeight.w700,
),
),
Container(
width: MediaQuery.of(context)
.size
.width *
0.21,
child: Texts(
'Usage Status',
fontWeight: FontWeight.w700,
),
)
], ],
), ),
),
Divider( Divider(
color: Colors.black45, color: Colors.black,
), ),
Row( Padding(
padding: const EdgeInsets.symmetric(
horizontal: 8.0),
child: Row(
mainAxisAlignment: mainAxisAlignment:
MainAxisAlignment.spaceAround, MainAxisAlignment.spaceAround,
crossAxisAlignment:
CrossAxisAlignment.start,
children: [ children: [
Container( Container(
height: MediaQuery.of(context) height: MediaQuery.of(context)
.size .size
.height * .height *
0.2, //130.0, 0.15, //130.0,
width: MediaQuery.of(context) width: MediaQuery.of(context)
.size .size
.width * .width *
0.33, 0.33,
child: Texts(model child: Texts(model
.insuranceApproval[indexInsurance] .insuranceApproval[
indexInsurance]
.approvalDetails .approvalDetails
.procedureName), .procedureName),
), ),
@ -287,13 +322,14 @@ class _InsuranceApprovalsDetailsState extends State<InsuranceApprovalsDetails> {
height: MediaQuery.of(context) height: MediaQuery.of(context)
.size .size
.height * .height *
0.2, 0.15,
width: MediaQuery.of(context) width: MediaQuery.of(context)
.size .size
.width * .width *
0.33, 0.33,
child: Texts(model child: Texts(model
.insuranceApproval[indexInsurance] .insuranceApproval[
indexInsurance]
.approvalDetails .approvalDetails
.status), .status),
), ),
@ -301,18 +337,23 @@ class _InsuranceApprovalsDetailsState extends State<InsuranceApprovalsDetails> {
height: MediaQuery.of(context) height: MediaQuery.of(context)
.size .size
.height * .height *
0.2, 0.15,
width: MediaQuery.of(context) width: MediaQuery.of(context)
.size .size
.width * .width *
0.25, 0.21,
child: Texts(model child: Texts(model
.insuranceApproval[indexInsurance] .insuranceApproval[
indexInsurance]
.approvalDetails .approvalDetails
.isInvoicedDesc), .isInvoicedDesc),
), ),
], ],
) ),
),
Divider(
color: Colors.black45,
),
], ],
), ),
), ),

@ -192,7 +192,3 @@ class DoctorCardInsurance extends StatelessWidget {
); );
} }
} }

Loading…
Cancel
Save