add lab & add radiology design update

merge-requests/471/head
hussam al-habibeh 5 years ago
parent ab20be2ea1
commit 8dca476898

@ -343,6 +343,8 @@ class _AddSelectedProcedureState extends State<AddSelectedProcedure> {
AppButton( AppButton(
title: TranslationBase.of(context) title: TranslationBase.of(context)
.addSelectedProcedures, .addSelectedProcedures,
color: Color(0xff359846),
fontWeight: FontWeight.w700,
onPressed: () { onPressed: () {
//print(entityList.toString()); //print(entityList.toString());
onPressed: onPressed:

@ -157,29 +157,24 @@ class _AddSelectedLabOrderState extends State<AddSelectedLabOrder> {
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Column( Row(
children: [ children: [
Row( AppText(
children: [ 'New Lab Order',
InkWell( fontWeight: FontWeight.w700,
child: Icon( fontSize: 20,
Icons.close,
size: 24.0,
),
onTap: () {
Navigator.pop(context);
},
),
],
), ),
Row( SizedBox(
children: [ width: MediaQuery.of(context).size.width * 0.48,
AppText( ),
'New Lab Order', InkWell(
fontWeight: FontWeight.w700, child: Icon(
fontSize: 20, Icons.close,
), size: 28.0,
], ),
onTap: () {
Navigator.pop(context);
},
), ),
], ],
), ),
@ -261,8 +256,10 @@ class _AddSelectedLabOrderState extends State<AddSelectedLabOrder> {
alignment: WrapAlignment.center, alignment: WrapAlignment.center,
children: <Widget>[ children: <Widget>[
AppButton( AppButton(
title: TranslationBase.of(context) title:
.addSelectedProcedures, "Add Lab Order", //TranslationBase.of(context)
fontWeight: FontWeight.w700,
//.addSelectedProcedures,
color: Color(0xff359846), color: Color(0xff359846),
onPressed: () { onPressed: () {
//print(entityList.toString()); //print(entityList.toString());

@ -157,29 +157,24 @@ class _AddSelectedRadiologyOrderState extends State<AddSelectedRadiologyOrder> {
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Column( Row(
children: [ children: [
Row( AppText(
children: [ 'New Radiology Order',
InkWell( fontWeight: FontWeight.w700,
child: Icon( fontSize: 20,
Icons.close,
size: 24.0,
),
onTap: () {
Navigator.pop(context);
},
),
],
), ),
Row( SizedBox(
children: [ width: MediaQuery.of(context).size.width * 0.48,
AppText( ),
'New Radiology Order', InkWell(
fontWeight: FontWeight.w700, child: Icon(
fontSize: 20, Icons.close,
), size: 28.0,
], ),
onTap: () {
Navigator.pop(context);
},
), ),
], ],
), ),
@ -261,9 +256,9 @@ class _AddSelectedRadiologyOrderState extends State<AddSelectedRadiologyOrder> {
alignment: WrapAlignment.center, alignment: WrapAlignment.center,
children: <Widget>[ children: <Widget>[
AppButton( AppButton(
title: TranslationBase.of(context) title: 'Add Radiology Order',
.addSelectedProcedures,
color: Color(0xff359846), color: Color(0xff359846),
fontWeight: FontWeight.w700,
onPressed: () { onPressed: () {
//print(entityList.toString()); //print(entityList.toString());
onPressed: onPressed:

@ -74,16 +74,18 @@ class _EntityListCheckboxSearchWidgetState
child: Container( child: Container(
margin: EdgeInsets.only(top: 15), margin: EdgeInsets.only(top: 15),
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(12), borderRadius: BorderRadius.circular(8),
color: Colors.white), color: Colors.white),
child: ListView( child: ListView(
children: [ children: [
TextFields( TextFields(
hintText: TranslationBase.of(context).searchProcedures, hintText: TranslationBase.of(context).searchProcedures,
suffixIcon: EvaIcons.search, suffixIcon: EvaIcons.search,
suffixIconColor: Color(0xff2B353E),
onChanged: (value) { onChanged: (value) {
filterSearchResults(value); filterSearchResults(value);
}, },
hasBorder: false,
), ),
SizedBox( SizedBox(
height: 15, height: 15,
@ -99,7 +101,7 @@ class _EntityListCheckboxSearchWidgetState
Checkbox( Checkbox(
value: widget.isEntityListSelected( value: widget.isEntityListSelected(
historyInfo), historyInfo),
activeColor: Colors.red[800], activeColor: Color(0xffD02127),
onChanged: (bool newValue) { onChanged: (bool newValue) {
setState(() { setState(() {
if (widget.isEntityListSelected( if (widget.isEntityListSelected(
@ -118,6 +120,7 @@ class _EntityListCheckboxSearchWidgetState
horizontal: 10, vertical: 0), horizontal: 10, vertical: 0),
child: Texts( child: Texts(
historyInfo.procedureName, historyInfo.procedureName,
fontSize: 14.0,
variant: "bodyText", variant: "bodyText",
bold: true, bold: true,
color: Color(0xff575757)), color: Color(0xff575757)),
@ -130,18 +133,32 @@ class _EntityListCheckboxSearchWidgetState
child: Padding( child: Padding(
padding: EdgeInsets.symmetric( padding: EdgeInsets.symmetric(
horizontal: 12), horizontal: 12),
child: Row( child: Column(
crossAxisAlignment:
CrossAxisAlignment.start,
children: [ children: [
AppText( Row(
TranslationBase.of(context) children: [
.orderType, Padding(
fontWeight: FontWeight.w700, padding: const EdgeInsets
.symmetric(
horizontal: 11),
child: AppText(
TranslationBase.of(
context)
.orderType,
fontWeight:
FontWeight.w700,
color: Color(0xff2B353E),
),
),
],
), ),
Row( Row(
children: [ children: [
Radio( Radio(
activeColor: activeColor:
Color(0xFFB9382C), Color(0xFFD02127),
value: 0, value: 0,
groupValue: selectedType, groupValue: selectedType,
onChanged: (value) { onChanged: (value) {
@ -153,10 +170,14 @@ class _EntityListCheckboxSearchWidgetState
value.toString(); value.toString();
}, },
), ),
Text('routine'), AppText(
'routine',
color: Color(0xff575757),
fontWeight: FontWeight.w600,
),
Radio( Radio(
activeColor: activeColor:
Color(0xFFB9382C), Color(0xFFD02127),
groupValue: selectedType, groupValue: selectedType,
value: 1, value: 1,
onChanged: (value) { onChanged: (value) {
@ -168,9 +189,12 @@ class _EntityListCheckboxSearchWidgetState
value.toString(); value.toString();
}, },
), ),
Text(TranslationBase.of( AppText(
context) TranslationBase.of(context)
.urgent), .urgent,
color: Color(0xff575757),
fontWeight: FontWeight.w600,
),
], ],
), ),
], ],
@ -192,11 +216,13 @@ class _EntityListCheckboxSearchWidgetState
}, },
minLines: 3, minLines: 3,
maxLines: 5, maxLines: 5,
borderWidth: 0.5,
borderColor: Colors.grey[500],
), ),
), ),
DividerWithSpacesAround(),
], ],
), ),
DividerWithSpacesAround(),
], ],
); );
}).toList(), }).toList(),

Loading…
Cancel
Save