Merge branch 'lab-orders-enhance' into 'development'

lab orders ui enhancements

See merge request Cloud_Solution/doctor_app_flutter!359
merge-requests/360/merge
Mohammad Aljammal 5 years ago
commit d5815c6432

@ -59,24 +59,9 @@ class _LabResultWidgetState extends State<LabResultWidget> {
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.all(Radius.circular(10)), borderRadius: BorderRadius.all(Radius.circular(10)),
), ),
child: Column( child: Column(children: [
children: widget.labResult.map((result) { Container(
return Container( child: Row(
decoration: BoxDecoration(
borderRadius: BorderRadius.all(Radius.circular(10)),
border: Border(
bottom:
BorderSide(color: Colors.grey, width: 0.5),
top: BorderSide(color: Colors.grey, width: 0.5),
left: BorderSide(color: Colors.grey, width: 0.5),
right: BorderSide(color: Colors.grey, width: 0.5),
),
),
margin: EdgeInsets.only(top: 10),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Row(
children: <Widget>[ children: <Widget>[
Expanded( Expanded(
child: Container( child: Container(
@ -88,8 +73,7 @@ class _LabResultWidgetState extends State<LabResultWidget> {
), ),
child: Center( child: Center(
child: Texts( child: Texts(
TranslationBase.of(context) TranslationBase.of(context).description,
.description,
color: Colors.white, color: Colors.white,
), ),
), ),
@ -123,6 +107,24 @@ class _LabResultWidgetState extends State<LabResultWidget> {
), ),
], ],
), ),
),
...widget.labResult.map((result) {
return Container(
padding: EdgeInsets.symmetric(horizontal: 4),
decoration: BoxDecoration(
borderRadius: BorderRadius.all(Radius.circular(10)),
border: Border(
bottom:
BorderSide(color: Colors.grey, width: 0.5),
top: BorderSide(color: Colors.grey, width: 0.5),
left: BorderSide(color: Colors.grey, width: 0.5),
right: BorderSide(color: Colors.grey, width: 0.5),
),
),
margin: EdgeInsets.only(top: 10),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Row( Row(
children: <Widget>[ children: <Widget>[
Expanded( Expanded(
@ -164,7 +166,7 @@ class _LabResultWidgetState extends State<LabResultWidget> {
), ),
); );
}).toList(), }).toList(),
), ]),
), ),
) )
], ],

Loading…
Cancel
Save