diff --git a/lib/screens/patients/profile/UCAF/UCAF-detail-screen.dart b/lib/screens/patients/profile/UCAF/UCAF-detail-screen.dart index ea4511e3..9268b031 100644 --- a/lib/screens/patients/profile/UCAF/UCAF-detail-screen.dart +++ b/lib/screens/patients/profile/UCAF/UCAF-detail-screen.dart @@ -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/patient/patiant_info_model.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/helpers.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_texts_widget.dart'; -import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart'; import 'package:flutter/material.dart'; import 'package:hexcolor/hexcolor.dart'; diff --git a/lib/screens/patients/profile/lab_result/LabResultWidget.dart b/lib/screens/patients/profile/lab_result/LabResultWidget.dart index 5b8a3ea9..e1b5cfc0 100644 --- a/lib/screens/patients/profile/lab_result/LabResultWidget.dart +++ b/lib/screens/patients/profile/lab_result/LabResultWidget.dart @@ -119,141 +119,147 @@ class LabResultWidget extends StatelessWidget { ) ], ), - SizedBox( - height: 4, - ), Divider( - color: Colors.black, + color: Colors.grey.shade500, thickness: 1, ), SizedBox( height: 12, ), - ...List.generate( - patientLabResultList.length, - (index) => Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Container( - decoration: BoxDecoration( - shape: BoxShape.rectangle, - color: Color(0XFFF2F2F2), - borderRadius: BorderRadius.all( - Radius.circular(8.0), - ), - ), - child: Row( - children: [ - 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, - ), - ), + ListView.builder( + itemCount: patientLabResultList.length, + scrollDirection: Axis.vertical, + physics: ScrollPhysics(), + shrinkWrap: true, + itemBuilder: (context, index) { + return Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + decoration: BoxDecoration( + shape: BoxShape.rectangle, + color: Color(0X55F2F2F2), + borderRadius: BorderRadius.all( + Radius.circular(8.0), ), ), - Expanded( - child: Row( - children: [ - Container( - decoration: BoxDecoration( - shape: BoxShape.circle, - color: Colors.red.shade700, - // borderRadius: BorderRadius.all( - // Radius.circular(25.0), - // ), - ), - child: Icon( - 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, - ), + child: Row( + children: [ + 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: 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, - // ), - ), - ); - }, + Expanded( 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, + Container( + decoration: BoxDecoration( + shape: BoxShape.circle, + color: Colors.red.shade700, + // borderRadius: BorderRadius.all( + // 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: 4, - ), - ], - ), - ), + ), + SizedBox( + height: 16, + ), + ], + ); + }), SizedBox( - height: 6, + height: 8, ), Divider(), // Table( diff --git a/lib/screens/patients/profile/lab_result/laboratory_result_widget.dart b/lib/screens/patients/profile/lab_result/laboratory_result_widget.dart index 97ab6cc5..9bf81081 100644 --- a/lib/screens/patients/profile/lab_result/laboratory_result_widget.dart +++ b/lib/screens/patients/profile/lab_result/laboratory_result_widget.dart @@ -131,19 +131,23 @@ class _LaboratoryResultWidgetState extends State { child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - ...List.generate( - model.labResultLists.length, - (index) => LabResultWidget( - patientLabOrder: widget.patientLabOrder, - filterName: model - .labResultLists[index].filterName, - patientLabResultList: model - .labResultLists[index] - .patientLabResultList, - patient: widget.patient, - isInpatient: widget.isInpatient, - ), - ), + ListView.builder( + itemCount: model.labResultLists.length, + scrollDirection: Axis.vertical, + physics: ScrollPhysics(), + shrinkWrap: true, + itemBuilder: (context, index) { + return LabResultWidget( + patientLabOrder: widget.patientLabOrder, + filterName: model + .labResultLists[index].filterName, + patientLabResultList: model + .labResultLists[index] + .patientLabResultList, + patient: widget.patient, + isInpatient: widget.isInpatient, + ); + }), ], ), ), @@ -183,11 +187,12 @@ class _LaboratoryResultWidgetState extends State { Expanded( child: Container( margin: EdgeInsets.only( - left: 10, right: 10), + left: 0, right: 0), child: AppText( TranslationBase.of(context) .specialResult, - bold: true, + fontSize: SizeConfig.textMultiplier * 2.3, + bold: false, ))), Container( width: 25, diff --git a/lib/widgets/patients/profile/patient-profile-app-bar.dart b/lib/widgets/patients/profile/patient-profile-app-bar.dart index a0b110bc..174da04d 100644 --- a/lib/widgets/patients/profile/patient-profile-app-bar.dart +++ b/lib/widgets/patients/profile/patient-profile-app-bar.dart @@ -400,7 +400,7 @@ class PatientProfileAppBar extends StatelessWidget with PreferredSizeWidget { double.maxFinite, height == 0 ? isInpatient - ? (isFromLabResult ? 200 : 190) + ? (isFromLabResult ? 210 : 200) : isAppointmentHeader ? 290 : SizeConfig.isHeightVeryShort