Merge branch 'design-fixes' into 'development'

design fixes for lab result

See merge request Cloud_Solution/doctor_app_flutter!843
merge-requests/844/merge
Mohammad Aljammal 4 years ago
commit 3cd4973eab

@ -8,15 +8,11 @@ import 'package:doctor_app_flutter/models/SOAP/master_key_model.dart';
import 'package:doctor_app_flutter/models/SOAP/order-procedure.dart'; import 'package:doctor_app_flutter/models/SOAP/order-procedure.dart';
import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart';
import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart';
import 'package:doctor_app_flutter/screens/patients/profile/UCAF/page-stepper-widget.dart';
import 'package:doctor_app_flutter/screens/patients/profile/UCAF/ucaf_pager_screen.dart';
import 'package:doctor_app_flutter/util/dr_app_toast_msg.dart'; import 'package:doctor_app_flutter/util/dr_app_toast_msg.dart';
import 'package:doctor_app_flutter/util/helpers.dart'; import 'package:doctor_app_flutter/util/helpers.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-app-bar.dart';
import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:hexcolor/hexcolor.dart'; import 'package:hexcolor/hexcolor.dart';

@ -119,25 +119,26 @@ class LabResultWidget extends StatelessWidget {
) )
], ],
), ),
SizedBox(
height: 4,
),
Divider( Divider(
color: Colors.black, color: Colors.grey.shade500,
thickness: 1, thickness: 1,
), ),
SizedBox( SizedBox(
height: 12, height: 12,
), ),
...List.generate( ListView.builder(
patientLabResultList.length, itemCount: patientLabResultList.length,
(index) => Column( scrollDirection: Axis.vertical,
physics: ScrollPhysics(),
shrinkWrap: true,
itemBuilder: (context, index) {
return Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Container( Container(
decoration: BoxDecoration( decoration: BoxDecoration(
shape: BoxShape.rectangle, shape: BoxShape.rectangle,
color: Color(0XFFF2F2F2), color: Color(0X55F2F2F2),
borderRadius: BorderRadius.all( borderRadius: BorderRadius.all(
Radius.circular(8.0), Radius.circular(8.0),
), ),
@ -160,6 +161,7 @@ class LabResultWidget extends StatelessWidget {
), ),
Expanded( Expanded(
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [ children: [
Container( Container(
decoration: BoxDecoration( decoration: BoxDecoration(
@ -170,12 +172,16 @@ class LabResultWidget extends StatelessWidget {
// ), // ),
), ),
child: Icon( child: Icon(
Icons.arrow_circle_up_sharp, Icons.arrow_upward,
color: Colors.white,
size: 16,
), ),
), ),
Expanded( Expanded(
child: Container( child: Container(
padding: EdgeInsets.all(10), alignment: Alignment.center,
padding: EdgeInsets.symmetric(
vertical: 10, horizontal: 4),
child: Center( child: Center(
child: AppText( child: AppText(
patientLabResultList[index].resultValue ?? patientLabResultList[index].resultValue ??
@ -247,13 +253,13 @@ class LabResultWidget extends StatelessWidget {
), ),
), ),
SizedBox( SizedBox(
height: 4, height: 16,
), ),
], ],
), );
), }),
SizedBox( SizedBox(
height: 6, height: 8,
), ),
Divider(), Divider(),
// Table( // Table(

@ -131,9 +131,13 @@ class _LaboratoryResultWidgetState extends State<LaboratoryResultWidget> {
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
...List.generate( ListView.builder(
model.labResultLists.length, itemCount: model.labResultLists.length,
(index) => LabResultWidget( scrollDirection: Axis.vertical,
physics: ScrollPhysics(),
shrinkWrap: true,
itemBuilder: (context, index) {
return LabResultWidget(
patientLabOrder: widget.patientLabOrder, patientLabOrder: widget.patientLabOrder,
filterName: model filterName: model
.labResultLists[index].filterName, .labResultLists[index].filterName,
@ -142,8 +146,8 @@ class _LaboratoryResultWidgetState extends State<LaboratoryResultWidget> {
.patientLabResultList, .patientLabResultList,
patient: widget.patient, patient: widget.patient,
isInpatient: widget.isInpatient, isInpatient: widget.isInpatient,
), );
), }),
], ],
), ),
), ),
@ -183,11 +187,12 @@ class _LaboratoryResultWidgetState extends State<LaboratoryResultWidget> {
Expanded( Expanded(
child: Container( child: Container(
margin: EdgeInsets.only( margin: EdgeInsets.only(
left: 10, right: 10), left: 0, right: 0),
child: AppText( child: AppText(
TranslationBase.of(context) TranslationBase.of(context)
.specialResult, .specialResult,
bold: true, fontSize: SizeConfig.textMultiplier * 2.3,
bold: false,
))), ))),
Container( Container(
width: 25, width: 25,

@ -400,7 +400,7 @@ class PatientProfileAppBar extends StatelessWidget with PreferredSizeWidget {
double.maxFinite, double.maxFinite,
height == 0 height == 0
? isInpatient ? isInpatient
? (isFromLabResult ? 200 : 190) ? (isFromLabResult ? 210 : 200)
: isAppointmentHeader : isAppointmentHeader
? 290 ? 290
: SizeConfig.isHeightVeryShort : SizeConfig.isHeightVeryShort

Loading…
Cancel
Save