design inhancment

merge-requests/319/head
hussam al-habibeh 5 years ago
parent 2ee2429c70
commit 54ad8bde0b

@ -558,25 +558,34 @@ class _UpdatePrescriptionFormState extends State<UpdatePrescriptionForm> {
height: 12.0, height: 12.0,
), ),
Container( Container(
height: screenSize.height * 0.070, height: model.patientAssessmentList
width: double.infinity, .isNotEmpty
child: Row( ? screenSize.height * 0.070
: 0.0,
width: model.patientAssessmentList
.isNotEmpty
? double.infinity
: 0.0,
child: model.patientAssessmentList
.isNotEmpty
? Row(
children: [ children: [
Container( Container(
width: MediaQuery.of(context) width:
MediaQuery.of(context)
.size .size
.width * .width *
0.29, 0.29,
child: InkWell( child: InkWell(
onTap: indicationList != null onTap:
indicationList != null
? () { ? () {
Helpers.hideKeyboard( Helpers.hideKeyboard(
context); context);
} }
: null, : null,
child: TextField( child: TextField(
decoration: decoration: textFieldSelectorDecoration(
textFieldSelectorDecoration(
model.patientAssessmentList model.patientAssessmentList
.isNotEmpty .isNotEmpty
? model ? model
@ -586,7 +595,8 @@ class _UpdatePrescriptionFormState extends State<UpdatePrescriptionForm> {
.toString() .toString()
: '', : '',
indication != null indication != null
? indication['name'] ? indication[
'name']
: null, : null,
true), true),
enabled: true, enabled: true,
@ -595,12 +605,14 @@ class _UpdatePrescriptionFormState extends State<UpdatePrescriptionForm> {
), ),
), ),
Container( Container(
width: MediaQuery.of(context) width:
MediaQuery.of(context)
.size .size
.width * .width *
0.61, 0.61,
child: InkWell( child: InkWell(
onTap: indicationList != null onTap:
indicationList != null
? () { ? () {
Helpers.hideKeyboard( Helpers.hideKeyboard(
context); context);
@ -608,8 +620,7 @@ class _UpdatePrescriptionFormState extends State<UpdatePrescriptionForm> {
: null, : null,
child: TextField( child: TextField(
maxLines: 3, maxLines: 3,
decoration: decoration: textFieldSelectorDecoration(
textFieldSelectorDecoration(
model.patientAssessmentList model.patientAssessmentList
.isNotEmpty .isNotEmpty
? model ? model
@ -619,7 +630,8 @@ class _UpdatePrescriptionFormState extends State<UpdatePrescriptionForm> {
.toString() .toString()
: '', : '',
indication != null indication != null
? indication['name'] ? indication[
'name']
: null, : null,
true), true),
enabled: true, enabled: true,
@ -628,8 +640,8 @@ class _UpdatePrescriptionFormState extends State<UpdatePrescriptionForm> {
), ),
), ),
], ],
), )
), : null),
SizedBox( SizedBox(
height: 12.0, height: 12.0,
), ),

@ -227,43 +227,63 @@ class _ProcedureScreenState extends State<ProcedureScreen> {
.entityList[ .entityList[
index] index]
.orderDate) .orderDate)
.day .year
.toString(), .toString(),
color: color: model
Colors.green,
),
AppText(
Helpers.getMonth(model
.procedureList[ .procedureList[
0] 0]
.entityList[ .entityList[
index] index]
.orderDate != .orderType ==
0
? Color(
0xFFB9382C)
: Colors
.green),
AppText(
Helpers.getMonth(model.procedureList[0].entityList[index].orderDate !=
null null
? (DateTime.parse(model ? (DateTime.parse(model.procedureList[0].entityList[index].orderDate)
.month)
: DateTime.now()
.month)
.toUpperCase(),
color: model
.procedureList[
0]
.entityList[
index]
.orderType ==
0
? Color(
0xFFB9382C)
: Colors
.green),
AppText(
DateTime.parse(model
.procedureList[ .procedureList[
0] 0]
.entityList[ .entityList[
index] index]
.orderDate) .orderDate)
.month) .day
: DateTime .toString(),
.now() color: model
.month) .procedureList[
.toUpperCase(), 0]
color: .entityList[
Colors.green, index]
) .orderType ==
0
? Color(
0xFFB9382C)
: Colors
.green),
], ],
), ),
), ),
Expanded( Expanded(
child: Container( child: Container(
// height: MediaQuery.of(
// context)
// .size
// .height *
// 0.21,
width: MediaQuery.of( width: MediaQuery.of(
context) context)
.size .size
@ -308,17 +328,17 @@ class _ProcedureScreenState extends State<ProcedureScreen> {
13.0, 13.0,
), ),
Expanded( Expanded(
child: child: AppText(
AppText(
model.procedureList[0].entityList[index].orderType == model.procedureList[0].entityList[index].orderType ==
1 1
? 'Routine' ? 'Routine'
: 'Urgent', : 'Urgent',
fontSize: fontSize:
11.5, 13.5,
color: Color( color: model.procedureList[0].entityList[index].orderType ==
0xFFB9382C), 0
), ? Color(0xFFB9382C)
: Colors.green),
), ),
], ],
), ),

Loading…
Cancel
Save