fix the design issues

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

@ -160,95 +160,109 @@ class _InsuranceApprovalsDetailsState extends State<InsuranceApprovalsDetails> {
), ),
], ],
), ),
Padding( Expanded(
padding: const EdgeInsets.symmetric( child: Padding(
horizontal: 8.0), padding: const EdgeInsets.symmetric(
child: Column( horizontal: 8.0),
crossAxisAlignment: child: Column(
CrossAxisAlignment.start, crossAxisAlignment:
//mainAxisAlignment: MainAxisAlignment.center, CrossAxisAlignment.start,
children: [ //mainAxisAlignment: MainAxisAlignment.center,
SizedBox( children: [
height: 25.0, SizedBox(
), height: 25.0,
Row( ),
children: [ Row(
Texts( children: [
'Clinic: ', Texts(
color: Colors.grey[500], 'Clinic: ',
), color: Colors.grey[500],
Texts( fontSize: 14,
model ),
.insuranceApproval[ Expanded(
indexInsurance] child: Texts(
.clinicName, model
) .insuranceApproval[
], indexInsurance]
), .clinicName,
Row( fontSize: 14,
children: <Widget>[ ),
Texts( )
'Approval No: ', ],
color: Colors.grey[500], ),
), Row(
Texts( children: <Widget>[
model Texts(
'Approval No: ',
color: Colors.grey[500],
fontSize: 14,
),
Texts(
model
.insuranceApproval[
indexInsurance]
.approvalNo
.toString(),
fontSize: 14,
)
],
),
Row(
children: <Widget>[
Texts(
'Unused Count:',
color: Colors.grey[500],
fontSize: 14,
),
Texts(model
.insuranceApproval[ .insuranceApproval[
indexInsurance] indexInsurance]
.approvalNo .unUsedCount
.toString(), .toString(),
) fontSize: 14,
], )
),
Row( ],
children: <Widget>[ ),
Texts( Row(
'Unused Count:', children: <Widget>[
color: Colors.grey[500], Texts(
), 'Company Name :',
Texts(model color: Colors.grey[500],
.insuranceApproval[ ),
indexInsurance] Texts('Sample')
.unUsedCount ],
.toString()) ),
], Row(
), children: [
Row( Texts(
children: <Widget>[ 'Receipt on: ',
Texts( color: Colors.grey[500],
'Company Name :', ),
color: Colors.grey[500], Expanded(
), child: Texts(
Texts('Sample') '${DateUtils.getDayMonthYearDateFormatted(DateUtils.getDateTimeFromServerFormat(model.insuranceApproval[indexInsurance].rceiptOn), isArabic: projectViewModel.isArabic)}',
], color: Colors.black,
), fontWeight: FontWeight.w600,
Row( ),
children: [ ),
Texts( ],
'Receipt on: ', ),
color: Colors.grey[500], Row(
), children: [
Texts( Texts(
'${DateUtils.getDayMonthYearDateFormatted(DateUtils.getDateTimeFromServerFormat(model.insuranceApproval[indexInsurance].rceiptOn), isArabic: projectViewModel.isArabic)}', 'Exp on: ',
color: Colors.black, color: Colors.grey[500],
fontWeight: FontWeight.w600, ),
), Texts(
], '${DateUtils.getDayMonthYearDateFormatted(DateUtils.getDateTimeFromServerFormat(model.insuranceApproval[indexInsurance].expiryDate), isArabic: projectViewModel.isArabic)}',
), color: Colors.black,
Row( fontWeight: FontWeight.w600,
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<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: child: Texts(model
MediaQuery.of(context) .insuranceApproval[
.size indexInsurance]
.width * ?.apporvalDetails[
0.33, index]
child: Texts(model ?.procedureName ??
.insuranceApproval[ "",textAlign: TextAlign.start,),
indexInsurance] ),
?.apporvalDetails[ ),
index] Expanded(
?.procedureName ?? child: Container(
""),
), child: Texts(model
Container( .insuranceApproval[
height: indexInsurance]
MediaQuery.of(context) ?.apporvalDetails[
.size index]
.height * ?.status ??
0.15, "",textAlign: TextAlign.center,),
width: ),
MediaQuery.of(context) ),
.size Expanded(
.width * child: Container(
0.33, child: Texts(model
child: Texts(model .insuranceApproval[
.insuranceApproval[ indexInsurance]
indexInsurance] ?.apporvalDetails[
?.apporvalDetails[ index]
index] ?.isInvoicedDesc ??
?.status ?? "",textAlign: TextAlign.center,),
""), ),
),
],
), ),
Container( SizedBox(width: 5,),
height: Divider(
MediaQuery.of(context) color: Colors.black38,
.size
.height *
0.15,
width:
MediaQuery.of(context)
.size
.width *
0.21,
child: Texts(model
.insuranceApproval[
indexInsurance]
?.apporvalDetails[
index]
?.isInvoicedDesc ??
""),
), ),
], ],
), ),
); );
}), }),
), ),
Divider(
color: Colors.black45,
),
], ],
), ),
), ),

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

Loading…
Cancel
Save