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,141 +119,147 @@ 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,
crossAxisAlignment: CrossAxisAlignment.start, physics: ScrollPhysics(),
children: [ shrinkWrap: true,
Container( itemBuilder: (context, index) {
decoration: BoxDecoration( return Column(
shape: BoxShape.rectangle, crossAxisAlignment: CrossAxisAlignment.start,
color: Color(0XFFF2F2F2), children: [
borderRadius: BorderRadius.all( Container(
Radius.circular(8.0), decoration: BoxDecoration(
), shape: BoxShape.rectangle,
), color: Color(0X55F2F2F2),
child: Row( borderRadius: BorderRadius.all(
children: [ Radius.circular(8.0),
Expanded(
child: Container(
padding: EdgeInsets.all(10),
child: Center(
child: AppText(
/*'${patientLabResultList[index].testCode}\n' +*/
patientLabResultList[index].description,
textAlign: TextAlign.center,
fontSize: SizeConfig.textMultiplier * 1.8,
isCopyable: true,
),
),
), ),
), ),
Expanded( child: Row(
child: Row( children: [
children: [ Expanded(
Container( child: Container(
decoration: BoxDecoration( padding: EdgeInsets.all(10),
shape: BoxShape.circle, child: Center(
color: Colors.red.shade700, child: AppText(
// borderRadius: BorderRadius.all( /*'${patientLabResultList[index].testCode}\n' +*/
// Radius.circular(25.0), patientLabResultList[index].description,
// ), textAlign: TextAlign.center,
), fontSize: SizeConfig.textMultiplier * 1.8,
child: Icon( isCopyable: true,
Icons.arrow_circle_up_sharp,
),
),
Expanded(
child: Container(
padding: EdgeInsets.all(10),
child: Center(
child: AppText(
patientLabResultList[index].resultValue ??
"" +
" " +
"${patientLabResultList[index].uOM ?? ""}",
textAlign: TextAlign.center,
isCopyable: true,
fontSize: SizeConfig.textMultiplier * 1.8,
),
), ),
), ),
), ),
],
),
),
Expanded(
child: Container(
padding: EdgeInsets.all(10),
// color: Colors.white,
child: Center(
child: AppText(
patientLabResultList[index].referanceRange,
textAlign: TextAlign.center,
fontSize: SizeConfig.textMultiplier * 1.8,
isCopyable: true,
),
), ),
), Expanded(
),
Expanded(
child: Container(
child: InkWell(
onTap: () {
Navigator.push(
context,
FadePage(
page: FlowChartPage(
filterName:
patientLabResultList[index].description,
patientLabOrder: patientLabOrder,
patient: patient,
isInpatient: isInpatient,
),
// page: LabResultHistoryPage(
// filterName: patientLabResultList[index].description,
// patientLabOrder: patientLabOrder,
// patient: patient,
// ),
),
);
},
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: [ children: [
AppText( Container(
TranslationBase.of(context).showMoreBtn, decoration: BoxDecoration(
textDecoration: TextDecoration.underline, shape: BoxShape.circle,
color: Colors.red.shade700, color: Colors.red.shade700,
fontSize: SizeConfig.textMultiplier * 1.8, // borderRadius: BorderRadius.all(
fontWeight: FontWeight.w700, // Radius.circular(25.0),
// ),
),
child: Icon(
Icons.arrow_upward,
color: Colors.white,
size: 16,
),
),
Expanded(
child: Container(
alignment: Alignment.center,
padding: EdgeInsets.symmetric(
vertical: 10, horizontal: 4),
child: Center(
child: AppText(
patientLabResultList[index].resultValue ??
"" +
" " +
"${patientLabResultList[index].uOM ?? ""}",
textAlign: TextAlign.center,
isCopyable: true,
fontSize: SizeConfig.textMultiplier * 1.8,
),
),
),
), ),
], ],
), ),
), ),
), Expanded(
child: Container(
padding: EdgeInsets.all(10),
// color: Colors.white,
child: Center(
child: AppText(
patientLabResultList[index].referanceRange,
textAlign: TextAlign.center,
fontSize: SizeConfig.textMultiplier * 1.8,
isCopyable: true,
),
),
),
),
Expanded(
child: Container(
child: InkWell(
onTap: () {
Navigator.push(
context,
FadePage(
page: FlowChartPage(
filterName:
patientLabResultList[index].description,
patientLabOrder: patientLabOrder,
patient: patient,
isInpatient: isInpatient,
),
// page: LabResultHistoryPage(
// filterName: patientLabResultList[index].description,
// patientLabOrder: patientLabOrder,
// patient: patient,
// ),
),
);
},
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
AppText(
TranslationBase.of(context).showMoreBtn,
textDecoration: TextDecoration.underline,
color: Colors.red.shade700,
fontSize: SizeConfig.textMultiplier * 1.8,
fontWeight: FontWeight.w700,
),
],
),
),
),
),
],
), ),
], ),
), SizedBox(
), height: 16,
SizedBox( ),
height: 4, ],
), );
], }),
),
),
SizedBox( SizedBox(
height: 6, height: 8,
), ),
Divider(), Divider(),
// Table( // Table(

@ -131,19 +131,23 @@ 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,
patientLabOrder: widget.patientLabOrder, physics: ScrollPhysics(),
filterName: model shrinkWrap: true,
.labResultLists[index].filterName, itemBuilder: (context, index) {
patientLabResultList: model return LabResultWidget(
.labResultLists[index] patientLabOrder: widget.patientLabOrder,
.patientLabResultList, filterName: model
patient: widget.patient, .labResultLists[index].filterName,
isInpatient: widget.isInpatient, patientLabResultList: model
), .labResultLists[index]
), .patientLabResultList,
patient: widget.patient,
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