fix the design issues

merge-requests/457/head
Mohammad Aljammal 5 years ago
parent 887eac5401
commit 4bf9650b4f

@ -160,7 +160,8 @@ class _InsuranceApprovalsDetailsState extends State<InsuranceApprovalsDetails> {
), ),
], ],
), ),
Padding( Expanded(
child: Padding(
padding: const EdgeInsets.symmetric( padding: const EdgeInsets.symmetric(
horizontal: 8.0), horizontal: 8.0),
child: Column( child: Column(
@ -176,12 +177,16 @@ class _InsuranceApprovalsDetailsState extends State<InsuranceApprovalsDetails> {
Texts( Texts(
'Clinic: ', 'Clinic: ',
color: Colors.grey[500], color: Colors.grey[500],
fontSize: 14,
), ),
Texts( Expanded(
child: Texts(
model model
.insuranceApproval[ .insuranceApproval[
indexInsurance] indexInsurance]
.clinicName, .clinicName,
fontSize: 14,
),
) )
], ],
), ),
@ -190,6 +195,7 @@ class _InsuranceApprovalsDetailsState extends State<InsuranceApprovalsDetails> {
Texts( Texts(
'Approval No: ', 'Approval No: ',
color: Colors.grey[500], color: Colors.grey[500],
fontSize: 14,
), ),
Texts( Texts(
model model
@ -197,6 +203,7 @@ class _InsuranceApprovalsDetailsState extends State<InsuranceApprovalsDetails> {
indexInsurance] indexInsurance]
.approvalNo .approvalNo
.toString(), .toString(),
fontSize: 14,
) )
], ],
), ),
@ -205,12 +212,16 @@ class _InsuranceApprovalsDetailsState extends State<InsuranceApprovalsDetails> {
Texts( Texts(
'Unused Count:', 'Unused Count:',
color: Colors.grey[500], color: Colors.grey[500],
fontSize: 14,
), ),
Texts(model Texts(model
.insuranceApproval[ .insuranceApproval[
indexInsurance] indexInsurance]
.unUsedCount .unUsedCount
.toString()) .toString(),
fontSize: 14,
)
], ],
), ),
Row( Row(
@ -228,11 +239,13 @@ class _InsuranceApprovalsDetailsState extends State<InsuranceApprovalsDetails> {
'Receipt on: ', 'Receipt on: ',
color: Colors.grey[500], color: Colors.grey[500],
), ),
Texts( Expanded(
child: 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,
), ),
),
], ],
), ),
Row( Row(
@ -251,6 +264,7 @@ class _InsuranceApprovalsDetailsState extends State<InsuranceApprovalsDetails> {
], ],
), ),
), ),
),
], ],
), ),
), ),
@ -264,34 +278,20 @@ class _InsuranceApprovalsDetailsState extends State<InsuranceApprovalsDetails> {
padding: const EdgeInsets.symmetric( padding: const EdgeInsets.symmetric(
horizontal: 8.0), horizontal: 8.0),
child: Row( child: Row(
mainAxisAlignment:
MainAxisAlignment.spaceAround,
children: [ children: [
Container( Expanded(
width: MediaQuery.of(context)
.size
.width *
0.33,
child: Texts( child: Texts(
'Procedure', 'Procedure',
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
), ),
), ),
Container( Expanded(
width: MediaQuery.of(context)
.size
.width *
0.33,
child: Texts( child: Texts(
'Status', 'Status',
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
), ),
), ),
Container( Expanded(
width: MediaQuery.of(context)
.size
.width *
0.21,
child: Texts( child: Texts(
'Usage Status', 'Usage Status',
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
@ -316,78 +316,58 @@ class _InsuranceApprovalsDetailsState extends State<InsuranceApprovalsDetails> {
itemBuilder: (BuildContext context, itemBuilder: (BuildContext context,
int index) { int index) {
return Container( return Container(
child: Row( child: Column(
mainAxisAlignment:
MainAxisAlignment
.spaceAround,
crossAxisAlignment:
CrossAxisAlignment.start,
children: [ children: [
Container( Row(
height:
MediaQuery.of(context) children: [
.size Expanded(
.height * child: Container(
0.15, //130.0,
width:
MediaQuery.of(context)
.size
.width *
0.33,
child: Texts(model child: Texts(model
.insuranceApproval[ .insuranceApproval[
indexInsurance] indexInsurance]
?.apporvalDetails[ ?.apporvalDetails[
index] index]
?.procedureName ?? ?.procedureName ??
""), "",textAlign: TextAlign.start,),
), ),
Container( ),
height: Expanded(
MediaQuery.of(context) child: Container(
.size
.height *
0.15,
width:
MediaQuery.of(context)
.size
.width *
0.33,
child: Texts(model child: Texts(model
.insuranceApproval[ .insuranceApproval[
indexInsurance] indexInsurance]
?.apporvalDetails[ ?.apporvalDetails[
index] index]
?.status ?? ?.status ??
""), "",textAlign: TextAlign.center,),
), ),
Container( ),
height: Expanded(
MediaQuery.of(context) child: Container(
.size
.height *
0.15,
width:
MediaQuery.of(context)
.size
.width *
0.21,
child: Texts(model child: Texts(model
.insuranceApproval[ .insuranceApproval[
indexInsurance] indexInsurance]
?.apporvalDetails[ ?.apporvalDetails[
index] index]
?.isInvoicedDesc ?? ?.isInvoicedDesc ??
""), "",textAlign: TextAlign.center,),
),
),
],
),
SizedBox(width: 5,),
Divider(
color: Colors.black38,
), ),
], ],
), ),
); );
}), }),
), ),
Divider(
color: Colors.black45,
),
], ],
), ),
), ),

@ -677,17 +677,18 @@ class _AddAssessmentDetailsState extends State<AddAssessmentDetails> {
height: 16, height: 16,
), ),
Row( Row(
children: [ children: [
AppText( Expanded(
child: AppText(
TranslationBase.of(context) TranslationBase.of(context)
.addAssessmentDetails .addAssessmentDetails
.toUpperCase(), .toUpperCase(),
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
fontSize: 13, fontSize: 13,
), ),
SizedBox(
width: MediaQuery.of(context).size.width * 0.42,
), ),
InkWell( InkWell(
child: Icon( child: Icon(
Icons.close, Icons.close,

Loading…
Cancel
Save