Merge branch 'fix_bugs_Mar' into 'development'

Fix bugs mar

See merge request Cloud_Solution/diplomatic-quarter!297
merge-update-with-lab-changes
Mohammad Aljammal 5 years ago
commit 008a39f043

@ -124,7 +124,7 @@ class _AmbulanceRequestIndexPageState extends State<AmbulanceRequestIndexPage> {
: Column( : Column(
children: [ children: [
SizedBox( SizedBox(
height: 80, height: 20,
), ),
Container( Container(
margin: EdgeInsets.only(left: 12, right: 12), margin: EdgeInsets.only(left: 12, right: 12),

@ -210,71 +210,77 @@ class _SelectTransportationMethodState
SizedBox( SizedBox(
height: 5, height: 5,
), ),
Row( Container(
children: [ margin: EdgeInsets.only(bottom:65 ),
Expanded( child: Row(
child: InkWell( children: [
onTap: () { Expanded(
setState(() { child: InkWell(
_way = Way.OneWay; onTap: () {
}); setState(() {
}, _way = Way.OneWay;
child: Container( });
decoration: BoxDecoration( },
shape: BoxShape.rectangle, child: Container(
borderRadius: BorderRadius.circular(8), decoration: BoxDecoration(
border: shape: BoxShape.rectangle,
Border.all(color: Colors.grey, width: 0.5), borderRadius: BorderRadius.circular(8),
color: Colors.white, border:
), Border.all(color: Colors.grey, width: 0.5),
child: ListTile( color: Colors.white,
title: ),
Texts(TranslationBase.of(context).oneDirec), child: ListTile(
leading: Radio( title:
value: Way.OneWay, Texts(TranslationBase.of(context).oneDirec),
groupValue: _way, leading: Radio(
onChanged: (value) { value: Way.OneWay,
setState(() { groupValue: _way,
_way = value; onChanged: (value) {
}); setState(() {
}, _way = value;
});
},
),
), ),
), ),
), ),
), ),
), Expanded(
Expanded( child: InkWell(
child: InkWell( onTap: () {
onTap: () { setState(() {
setState(() { _way = Way.TwoWays;
_way = Way.TwoWays; });
}); },
}, child: Container(
child: Container( decoration: BoxDecoration(
decoration: BoxDecoration( shape: BoxShape.rectangle,
shape: BoxShape.rectangle, borderRadius: BorderRadius.circular(8),
borderRadius: BorderRadius.circular(8), border:
border: Border.all(color: Colors.grey, width: 0.5),
Border.all(color: Colors.grey, width: 0.5), color: Colors.white,
color: Colors.white, ),
), child: ListTile(
child: ListTile( title:
title: Texts(TranslationBase.of(context).twoDirec),
Texts(TranslationBase.of(context).twoDirec), leading: Radio(
leading: Radio( value: Way.TwoWays,
value: Way.TwoWays, groupValue: _way,
groupValue: _way, onChanged: (value) {
onChanged: (value) { setState(() {
setState(() { _way = value;
_way = value; });
}); },
}, ),
), ),
), ),
), ),
), ),
), ],
], ),
),
SizedBox(
height: 30,
), ),
], ],
), ),

@ -73,6 +73,7 @@ class _SummaryState extends State<Summary> {
Texts(TranslationBase.of(context).billAmount,textAlign: TextAlign.start,), Texts(TranslationBase.of(context).billAmount,textAlign: TextAlign.start,),
SizedBox(height: 5,), SizedBox(height: 5,),
Container( Container(
height: 55, height: 55,
padding: EdgeInsets.all(10), padding: EdgeInsets.all(10),
decoration: BoxDecoration( decoration: BoxDecoration(
@ -87,8 +88,8 @@ class _SummaryState extends State<Summary> {
], ],
), ),
), ),
SizedBox(height: 250),
SizedBox(height: 45,),
], ],
), ),

@ -23,18 +23,21 @@ class FlowChartPage extends StatelessWidget {
appBarTitle: filterName, appBarTitle: filterName,
baseViewModel: model, baseViewModel: model,
body: SingleChildScrollView( body: SingleChildScrollView(
child: model.labOrdersResultsList.isNotEmpty child: model. labOrdersResultsList.isNotEmpty
? Container( ? Container(
child: LabResultChartAndDetails( child: LabResultChartAndDetails(
name: filterName, name: filterName,
labResult: model.labOrdersResultsList, labResult: model.labOrdersResultsList,
), ),
) )
: Container( : Center(
child: Center( child: Container(
child: Texts('no Data'), padding: EdgeInsets.only(top: MediaQuery.of(context).size.height *0.42),
child: Center(
child: Texts('No Data'),
),
), ),
), ),
), ),
), ),
); );

Loading…
Cancel
Save