fix issues in My Referred Patient widget

merge-requests/96/head
Mohammad ALjammal 6 years ago
parent c8b2604110
commit 05525fd87c

@ -87,144 +87,81 @@ class _MyReferredPatientWidgetState extends State<MyReferredPatientWidget> {
), ),
children: [ children: [
TableRow(children: [ TableRow(children: [
Expanded( Container(
child: Container( margin: EdgeInsets.all(2.5),
margin: EdgeInsets.all(2.5), padding: EdgeInsets.all(5),
padding: EdgeInsets.all(5), decoration: BoxDecoration(),
decoration: BoxDecoration(), child: Column(
child: Column( crossAxisAlignment:
crossAxisAlignment: CrossAxisAlignment.start,
CrossAxisAlignment.start, children: <Widget>[
children: <Widget>[ AppText(
AppText( TranslationBase.of(context).fileNo,
TranslationBase.of(context).fileNo, fontSize:
fontSize: 1.7 * SizeConfig.textMultiplier,
1.7 * SizeConfig.textMultiplier, fontWeight: FontWeight.bold,
fontWeight: FontWeight.bold, ),
), AppText(
AppText( '${widget.myReferredPatientModel.patientId}',
'${widget.myReferredPatientModel.patientId}', fontSize:
fontSize: 1.7 * SizeConfig.textMultiplier,
1.7 * SizeConfig.textMultiplier, fontWeight: FontWeight.w300,
fontWeight: FontWeight.w300, )
) ],
],
),
), ),
), ),
Expanded( Container(
child: Container( margin: EdgeInsets.only(
margin: EdgeInsets.only( left: 4,
left: 4, top: 2.5,
top: 2.5, right: 2.5,
right: 2.5, bottom: 2.5),
bottom: 2.5), padding: EdgeInsets.all(5),
padding: EdgeInsets.all(5), child: Column(
child: Column( crossAxisAlignment:
crossAxisAlignment: CrossAxisAlignment.start,
CrossAxisAlignment.start, children: <Widget>[
children: <Widget>[ AppText(
AppText( TranslationBase.of(context).referralDoctor,
TranslationBase.of(context).referralDoctor, fontSize:
fontSize: 1.7 * SizeConfig.textMultiplier,
1.7 * SizeConfig.textMultiplier, fontWeight: FontWeight.bold,
fontWeight: FontWeight.bold, ),
), Texts(
Texts( widget.myReferredPatientModel
widget.myReferredPatientModel .referralDoctorName,
.referralDoctorName, maxLength: 80,
maxLength: 80, readMore: true,
readMore: true, ),
), ],
],
),
), ),
), ),
]), ]),
TableRow( TableRow(
children: [ children: [
Expanded( Container(
child: Container(
margin: EdgeInsets.all(2.5),
padding: EdgeInsets.all(5),
child: Column(
crossAxisAlignment:
CrossAxisAlignment.start,
children: <Widget>[
AppText(
TranslationBase.of(context).referringClinic,
fontSize: 1.7 *
SizeConfig.textMultiplier,
fontWeight: FontWeight.bold,
),
AppText(
'${widget.myReferredPatientModel.referralClinicDescription}',
fontSize: 1.7 *
SizeConfig.textMultiplier,
fontWeight: FontWeight.w300,
)
],
),
),
),
Expanded(
child: Container(
margin: EdgeInsets.only(
left: 4,
top: 2.5,
right: 2.5,
bottom: 2.5),
padding: EdgeInsets.all(5),
child: Column(
crossAxisAlignment:
CrossAxisAlignment.start,
children: <Widget>[
AppText(
TranslationBase.of(context).frequency,
fontSize: 1.7 *
SizeConfig.textMultiplier,
fontWeight: FontWeight.bold,
),
AppText(
widget.myReferredPatientModel
.frequencyDescription,
fontSize: 1.7 *
SizeConfig.textMultiplier,
fontWeight: FontWeight.w300,
)
],
),
),
)
],
),
TableRow(children: [
Expanded(
child: Container(
margin: EdgeInsets.all(2.5), margin: EdgeInsets.all(2.5),
padding: EdgeInsets.all(5), padding: EdgeInsets.all(5),
child: Column( child: Column(
crossAxisAlignment: crossAxisAlignment:
CrossAxisAlignment.start, CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
AppText( AppText(
TranslationBase.of(context).priority, TranslationBase.of(context).referringClinic,
fontSize: fontSize: 1.7 *
1.7 * SizeConfig.textMultiplier, SizeConfig.textMultiplier,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
AppText( AppText(
'${widget.myReferredPatientModel.priorityDescription}', '${widget.myReferredPatientModel.referralClinicDescription}',
fontSize: fontSize: 1.7 *
1.7 * SizeConfig.textMultiplier, SizeConfig.textMultiplier,
fontWeight: FontWeight.w300, fontWeight: FontWeight.w300,
) )
], ],
), ),
), ),
), Container(
Expanded(
child: Container(
margin: EdgeInsets.only( margin: EdgeInsets.only(
left: 4, left: 4,
top: 2.5, top: 2.5,
@ -233,24 +170,75 @@ class _MyReferredPatientWidgetState extends State<MyReferredPatientWidget> {
padding: EdgeInsets.all(5), padding: EdgeInsets.all(5),
child: Column( child: Column(
crossAxisAlignment: crossAxisAlignment:
CrossAxisAlignment.start, CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
AppText( AppText(
TranslationBase.of(context).maxResponseTime, TranslationBase.of(context).frequency,
fontSize: fontSize: 1.7 *
1.7 * SizeConfig.textMultiplier, SizeConfig.textMultiplier,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
AppText( AppText(
Helpers.getDateFormatted(widget widget.myReferredPatientModel
.myReferredPatientModel .frequencyDescription,
.maxResponseTime), fontSize: 1.7 *
fontSize: SizeConfig.textMultiplier,
1.7 * SizeConfig.textMultiplier,
fontWeight: FontWeight.w300, fontWeight: FontWeight.w300,
) )
], ],
), ),
)
],
),
TableRow(children: [
Container(
margin: EdgeInsets.all(2.5),
padding: EdgeInsets.all(5),
child: Column(
crossAxisAlignment:
CrossAxisAlignment.start,
children: <Widget>[
AppText(
TranslationBase.of(context).priority,
fontSize:
1.7 * SizeConfig.textMultiplier,
fontWeight: FontWeight.bold,
),
AppText(
'${widget.myReferredPatientModel.priorityDescription}',
fontSize:
1.7 * SizeConfig.textMultiplier,
fontWeight: FontWeight.w300,
)
],
),
),
Container(
margin: EdgeInsets.only(
left: 4,
top: 2.5,
right: 2.5,
bottom: 2.5),
padding: EdgeInsets.all(5),
child: Column(
crossAxisAlignment:
CrossAxisAlignment.start,
children: <Widget>[
AppText(
TranslationBase.of(context).maxResponseTime,
fontSize:
1.7 * SizeConfig.textMultiplier,
fontWeight: FontWeight.bold,
),
AppText(
Helpers.getDateFormatted(widget
.myReferredPatientModel
.maxResponseTime),
fontSize:
1.7 * SizeConfig.textMultiplier,
fontWeight: FontWeight.w300,
)
],
), ),
) )
]) ])

Loading…
Cancel
Save