Merge branch 'fix-issues' into 'development'

Fix issues

See merge request Cloud_Solution/doctor_app_flutter!381
merge-requests/382/merge
Mohammad Aljammal 5 years ago
commit 2d1528e30e

@ -3,7 +3,9 @@ import 'package:doctor_app_flutter/icons_app/doctor_app_icons.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/patient_profile_screen.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-header-new-design.dart';
import 'package:doctor_app_flutter/widgets/shared/Text.dart';
import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
@ -19,6 +21,7 @@ class MedicalFileDetails extends StatefulWidget {
String gender;
int encounterNumber;
int pp;
PatiantInformtion patient;
MedicalFileDetails(
{this.age,
@ -26,7 +29,8 @@ class MedicalFileDetails extends StatefulWidget {
this.lastName,
this.gender,
this.encounterNumber,
this.pp});
this.pp,
this.patient});
@override
_MedicalFileDetailsState createState() => _MedicalFileDetailsState(
@ -35,7 +39,9 @@ class MedicalFileDetails extends StatefulWidget {
lastName: lastName,
gender: gender,
encounterNumber: encounterNumber,
pp: pp);
pp: pp,
patient: patient,
);
}
class _MedicalFileDetailsState extends State<MedicalFileDetails> {
@ -45,6 +51,7 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
String lastName;
String gender;
int pp;
PatiantInformtion patient;
_MedicalFileDetailsState(
{this.age,
@ -52,7 +59,8 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
this.lastName,
this.gender,
this.encounterNumber,
this.pp});
this.pp,
this.patient});
bool isPhysicalExam = false;
bool isProcedureExpand = false;
bool isHistoryExpand = false;
@ -72,60 +80,10 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
child: SingleChildScrollView(
child: Center(
child: Container(
color: Colors.white,
child: Column(
children: [
Padding(
padding: EdgeInsets.all(8.0),
child: Row(
children: <Widget>[
AvatarWidget(
Icon(
gender == "Male"
? DoctorApp.male
: DoctorApp.female_icon,
size: 70,
color: Colors.white,
),
),
SizedBox(
width: 20,
),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
AppText(
firstName + ' ' + lastName,
color: Colors.black,
fontWeight: FontWeight.bold,
),
Row(
children: [
AppText(
TranslationBase.of(context).age2,
color: Colors.black,
fontWeight: FontWeight.bold,
),
SizedBox(
width: 5.0,
),
AppText(
age,
color: Colors.black,
fontWeight: FontWeight.normal,
),
],
),
],
)
],
),
),
Divider(
height: 1.0,
thickness: 1.0,
color: Colors.grey,
),
PatientProfileHeaderNewDesign(patient,
patient.patientType.toString(), patient.arrivedOn),
model.medicalFileList.length != 0 &&
model
.medicalFileList[0]
@ -138,87 +96,100 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
? Padding(
padding: EdgeInsets.all(10.0),
child: Container(
child: Column(
children: [
Container(
width: double.infinity,
margin: EdgeInsets.only(
top: 10, left: 10, right: 10),
padding: EdgeInsets.all(8.0),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.all(
Radius.circular(10.0),
),
border: Border.all(
color: Colors.grey[200], width: 0.5),
),
child: Column(
children: [
Row(
children: [
AppText(
TranslationBase.of(context).visitDate +
": ",
fontWeight: FontWeight.w700,
),
if (model.medicalFileList.length != 0 &&
if (model.medicalFileList.length !=
0 &&
model
.medicalFileList[0]
.entityList[0]
.timelines[encounterNumber]
.timelines[
encounterNumber]
.timeLineEvents[0]
.consulations
.length !=
0)
AppText(model
Expanded(
child: AppText(
model
.medicalFileList[0]
.entityList[0]
.timelines[encounterNumber]
.timelines[
encounterNumber]
.timeLineEvents[0]
.consulations[0]
.appointmentDate
.toString()),
SizedBox(width: 35.0),
// AppText(
// 'Appt Date : ',
// fontWeight: FontWeight.w700,
// ),
// AppText(
// '23/12/2020',
// ),
.doctorName
.toUpperCase(),
fontWeight: FontWeight.w700,
),
),
],
),
if (model.medicalFileList.length != 0)
Row(
children: [
AppText(
TranslationBase.of(context).doctorName +
": ".toUpperCase(),
fontWeight: FontWeight.w700,
TranslationBase.of(context)
.clinic +
": ",
),
if (model.medicalFileList.length != 0 &&
if (model.medicalFileList
.length !=
0 &&
model
.medicalFileList[0]
.entityList[0]
.timelines[encounterNumber]
.timelines[
encounterNumber]
.timeLineEvents[0]
.consulations
.length !=
0)
Expanded(
child: AppText(
AppText(
model
.medicalFileList[0]
.entityList[0]
.timelines[encounterNumber]
.timelines[
encounterNumber]
.timeLineEvents[0]
.consulations[0]
.doctorName
.toUpperCase(),
.clinicName,
fontWeight: FontWeight.w700,
),
),
],
),
if (model.medicalFileList.length != 0)
Row(
children: [
AppText(
TranslationBase.of(context)
.clinicName +
.episode +
": ",
fontWeight: FontWeight.w700,
),
if (model.medicalFileList.length != 0 &&
if (model.medicalFileList.length !=
0 &&
model
.medicalFileList[0]
.entityList[0]
.timelines[encounterNumber]
.timelines[
encounterNumber]
.timeLineEvents[0]
.consulations
.length !=
@ -230,22 +201,27 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
.timelines[encounterNumber]
.timeLineEvents[0]
.consulations[0]
.clinicName,
.episodeID
.toString(),
fontWeight: FontWeight.w700,
),
],
),
Row(
children: [
AppText(
TranslationBase.of(context).episode +
TranslationBase.of(context)
.visitDate +
": ",
fontWeight: FontWeight.w700,
),
if (model.medicalFileList.length != 0 &&
if (model.medicalFileList.length !=
0 &&
model
.medicalFileList[0]
.entityList[0]
.timelines[encounterNumber]
.timelines[
encounterNumber]
.timeLineEvents[0]
.consulations
.length !=
@ -257,17 +233,24 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
.timelines[encounterNumber]
.timeLineEvents[0]
.consulations[0]
.episodeID
.appointmentDate
.toString(),
fontWeight: FontWeight.w700,
),
SizedBox(width: 35.0),
// AppText(
// 'Appt Date : ',
// fontWeight: FontWeight.w700,
// ),
// AppText(
// '23/12/2020',
// ),
],
),
],
),
SizedBox(height: 15.0),
Divider(
height: 1.0,
thickness: 1.0,
color: Colors.grey.shade400,
),
SizedBox(height: 25.0),
if (model.medicalFileList.length != 0 &&
model
@ -278,7 +261,23 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
.consulations
.length !=
0)
HeaderBodyExpandableNotifier(
Container(
width: double.infinity,
margin: EdgeInsets.only(
top: 10, left: 10, right: 10),
padding: EdgeInsets.all(8.0),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.all(
Radius.circular(10.0),
),
border: Border.all(
color: Colors.grey[200],
width: 0.5),
),
child: Padding(
padding: const EdgeInsets.all(15.0),
child: HeaderBodyExpandableNotifier(
headerWidget: Row(
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
@ -286,7 +285,8 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
Row(
children: [
Texts(
TranslationBase.of(context)
TranslationBase.of(
context)
.historyOfPresentIllness
.toUpperCase(),
variant: isHistoryExpand
@ -294,7 +294,7 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
: '',
bold: isHistoryExpand
? true
: false,
: true,
color: Colors.black),
],
),
@ -311,7 +311,8 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
],
),
bodyWidget: ListView.builder(
//physics: ,
physics:
NeverScrollableScrollPhysics(),
scrollDirection: Axis.vertical,
shrinkWrap: true,
itemCount: model
@ -322,14 +323,15 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
.consulations[0]
.lstCheifComplaint
.length,
itemBuilder:
(BuildContext ctxt, int index) {
itemBuilder: (BuildContext ctxt,
int index) {
return Padding(
padding: EdgeInsets.all(8.0),
child: Container(
child: Column(
mainAxisAlignment:
MainAxisAlignment.center,
MainAxisAlignment
.center,
children: [
Row(
children: [
@ -338,19 +340,22 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
model
.medicalFileList[
0]
.entityList[0]
.entityList[
0]
.timelines[
encounterNumber]
.timeLineEvents[
0]
.consulations[0]
.consulations[
0]
.lstCheifComplaint[
index]
.hOPI
.trim(),
),
),
SizedBox(width: 35.0),
SizedBox(
width: 35.0),
],
),
],
@ -360,14 +365,12 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
}),
isExpand: isHistoryExpand,
),
SizedBox(
height: 30,
),
Container(
width: double.infinity,
height: 1,
color: Color(0xffCCCCCC),
),
// SizedBox(
// height: 30,
// ),
SizedBox(
height: 30,
),
@ -380,7 +383,23 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
.consulations
.length !=
0)
HeaderBodyExpandableNotifier(
Container(
width: double.infinity,
margin: EdgeInsets.only(
top: 10, left: 10, right: 10),
padding: EdgeInsets.all(8.0),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.all(
Radius.circular(10.0),
),
border: Border.all(
color: Colors.grey[200],
width: 0.5),
),
child: Padding(
padding: const EdgeInsets.all(15.0),
child: HeaderBodyExpandableNotifier(
headerWidget: Row(
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
@ -388,15 +407,17 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
Row(
children: [
Texts(
TranslationBase.of(context)
TranslationBase.of(
context)
.assessment
.toUpperCase(),
variant: isAssessmentExpand
variant:
isAssessmentExpand
? "bodyText"
: '',
bold: isAssessmentExpand
? true
: false,
: true,
color: Colors.black),
],
),
@ -413,7 +434,8 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
],
),
bodyWidget: ListView.builder(
//physics: ,
physics:
NeverScrollableScrollPhysics(),
scrollDirection: Axis.vertical,
shrinkWrap: true,
itemCount: model
@ -424,21 +446,23 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
.consulations[0]
.lstAssessments
.length,
itemBuilder:
(BuildContext ctxt, int index) {
itemBuilder: (BuildContext ctxt,
int index) {
return Padding(
padding: EdgeInsets.all(8.0),
child: Container(
child: Column(
mainAxisAlignment:
MainAxisAlignment.center,
MainAxisAlignment
.center,
children: [
Row(
children: [
AppText(
'ICD',
fontWeight:
FontWeight.w700,
FontWeight
.w700,
),
AppText(
model
@ -447,18 +471,22 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
.entityList[0]
.timelines[
encounterNumber]
.timeLineEvents[0]
.consulations[0]
.timeLineEvents[
0]
.consulations[
0]
.lstAssessments[
index]
.iCD10
.trim(),
),
SizedBox(width: 35.0),
SizedBox(
width: 35.0),
AppText(
'Condition: ',
fontWeight:
FontWeight.w700,
FontWeight
.w700,
),
AppText(
model
@ -467,8 +495,10 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
.entityList[0]
.timelines[
encounterNumber]
.timeLineEvents[0]
.consulations[0]
.timeLineEvents[
0]
.consulations[
0]
.lstAssessments[
index]
.condition
@ -485,13 +515,16 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
.entityList[0]
.timelines[
encounterNumber]
.timeLineEvents[0]
.consulations[0]
.timeLineEvents[
0]
.consulations[
0]
.lstAssessments[
index]
.description,
fontWeight:
FontWeight.w700,
FontWeight
.w700,
)
],
),
@ -500,14 +533,17 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
AppText(
'Type: ',
fontWeight:
FontWeight.w700,
FontWeight
.w700,
),
AppText(model
.medicalFileList[0]
.medicalFileList[
0]
.entityList[0]
.timelines[
encounterNumber]
.timeLineEvents[0]
.timeLineEvents[
0]
.consulations[0]
.lstAssessments[
index]
@ -519,13 +555,15 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
),
AppText(
model
.medicalFileList[0]
.medicalFileList[
0]
.entityList[0]
.timelines[
encounterNumber]
.timeLineEvents[0]
.consulations[0]
.lstAssessments[index]
.lstAssessments[
index]
.remarks
.trim(),
),
@ -544,14 +582,16 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
}),
isExpand: isAssessmentExpand,
),
SizedBox(
height: 30,
),
Container(
width: double.infinity,
height: 1,
color: Color(0xffCCCCCC),
),
// SizedBox(
// height: 30,
// ),
// Container(
// width: double.infinity,
// height: 1,
// color: Color(0xffCCCCCC),
// ),
SizedBox(
height: 30,
),
@ -564,7 +604,23 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
.consulations
.length !=
0)
HeaderBodyExpandableNotifier(
Container(
width: double.infinity,
margin: EdgeInsets.only(
top: 10, left: 10, right: 10),
padding: EdgeInsets.all(8.0),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.all(
Radius.circular(10.0),
),
border: Border.all(
color: Colors.grey[200],
width: 0.5),
),
child: Padding(
padding: const EdgeInsets.all(15.0),
child: HeaderBodyExpandableNotifier(
headerWidget: Row(
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
@ -572,7 +628,8 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
Row(
children: [
Texts(
TranslationBase.of(context)
TranslationBase.of(
context)
.test
.toUpperCase(),
variant: isProcedureExpand
@ -580,7 +637,7 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
: '',
bold: isProcedureExpand
? true
: false,
: true,
color: Colors.black),
],
),
@ -609,61 +666,85 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
.consulations[0]
.lstProcedure
.length,
itemBuilder:
(BuildContext ctxt, int index) {
itemBuilder: (BuildContext ctxt,
int index) {
return Padding(
padding: EdgeInsets.all(8.0),
child: Container(
child: Column(
mainAxisAlignment:
MainAxisAlignment.center,
MainAxisAlignment
.center,
children: [
Row(
children: [
Column(
children: [
AppText(
'Procedure ID: ',
fontWeight:
FontWeight.w700,
FontWeight
.w700,
),
AppText(
model
.medicalFileList[
0]
.entityList[0]
.entityList[
0]
.timelines[
encounterNumber]
.timeLineEvents[0]
.consulations[0]
.timeLineEvents[
0]
.consulations[
0]
.lstProcedure[
index]
.procedureId
.trim(),
),
SizedBox(width: 35.0),
],
),
SizedBox(
width: 35.0),
Column(
children: [
AppText(
'Order Date: ',
fontWeight:
FontWeight.w700,
FontWeight
.w700,
),
Expanded(
child: AppText(
AppText(
Helpers.getDateFormatted(
DateTime
.parse(
model
.medicalFileList[
0]
.entityList[0]
.entityList[
0]
.timelines[
encounterNumber]
.timeLineEvents[
0]
.consulations[0]
.consulations[
0]
.lstProcedure[
index]
.orderDate
.trim(),
)),
fontSize:
13.5,
),
],
),
],
),
SizedBox(
height: 20.0,
),
Row(
children: [
Expanded(
@ -671,17 +752,20 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
model
.medicalFileList[
0]
.entityList[0]
.entityList[
0]
.timelines[
encounterNumber]
.timeLineEvents[
0]
.consulations[0]
.consulations[
0]
.lstProcedure[
index]
.procName,
fontWeight:
FontWeight.w700,
FontWeight
.w700,
),
)
],
@ -691,16 +775,20 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
AppText(
'CPT Code : ',
fontWeight:
FontWeight.w700,
FontWeight
.w700,
),
AppText(model
.medicalFileList[0]
.medicalFileList[
0]
.entityList[0]
.timelines[
encounterNumber]
.timeLineEvents[0]
.timeLineEvents[
0]
.consulations[0]
.lstProcedure[index]
.lstProcedure[
index]
.patientID
.toString()),
],
@ -723,14 +811,16 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
}),
isExpand: isProcedureExpand,
),
SizedBox(
height: 30,
),
Container(
width: double.infinity,
height: 1,
color: Color(0xffCCCCCC),
),
// SizedBox(
// height: 30,
// ),
// Container(
// width: double.infinity,
// height: 1,
// color: Color(0xffCCCCCC),
// ),
SizedBox(
height: 30,
),
@ -743,7 +833,23 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
.consulations
.length !=
0)
HeaderBodyExpandableNotifier(
Container(
width: double.infinity,
margin: EdgeInsets.only(
top: 10, left: 10, right: 10),
padding: EdgeInsets.all(8.0),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.all(
Radius.circular(10.0),
),
border: Border.all(
color: Colors.grey[200],
width: 0.5),
),
child: Padding(
padding: const EdgeInsets.all(15.0),
child: HeaderBodyExpandableNotifier(
headerWidget: Row(
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
@ -751,7 +857,8 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
Row(
children: [
Texts(
TranslationBase.of(context)
TranslationBase.of(
context)
.physicalSystemExamination
.toUpperCase(),
variant: isPhysicalExam
@ -759,7 +866,7 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
: '',
bold: isPhysicalExam
? true
: false,
: true,
color: Colors.black),
],
),
@ -788,8 +895,8 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
.consulations[0]
.lstPhysicalExam
.length,
itemBuilder:
(BuildContext ctxt, int index) {
itemBuilder: (BuildContext ctxt,
int index) {
return Padding(
padding: EdgeInsets.all(8.0),
child: Container(
@ -800,14 +907,17 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
AppText(
'Exam Type: ',
fontWeight:
FontWeight.w700,
FontWeight
.w700,
),
AppText(model
.medicalFileList[0]
.medicalFileList[
0]
.entityList[0]
.timelines[
encounterNumber]
.timeLineEvents[0]
.timeLineEvents[
0]
.consulations[0]
.lstPhysicalExam[
index]
@ -823,13 +933,16 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
.entityList[0]
.timelines[
encounterNumber]
.timeLineEvents[0]
.consulations[0]
.timeLineEvents[
0]
.consulations[
0]
.lstPhysicalExam[
index]
.examDesc,
fontWeight:
FontWeight.w700,
FontWeight
.w700,
)
],
),
@ -838,14 +951,17 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
AppText(
'Abnormal: ',
fontWeight:
FontWeight.w700,
FontWeight
.w700,
),
AppText(model
.medicalFileList[0]
.medicalFileList[
0]
.entityList[0]
.timelines[
encounterNumber]
.timeLineEvents[0]
.timeLineEvents[
0]
.consulations[0]
.lstPhysicalExam[
index]
@ -857,7 +973,8 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
),
AppText(
model
.medicalFileList[0]
.medicalFileList[
0]
.entityList[0]
.timelines[
encounterNumber]
@ -882,14 +999,16 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
}),
isExpand: isPhysicalExam,
),
),
),
SizedBox(
height: 30,
),
Container(
width: double.infinity,
height: 1,
color: Color(0xffCCCCCC),
),
// Container(
// width: double.infinity,
// height: 1,
// color: Color(0xffCCCCCC),
// ),
],
),
),

@ -1,14 +1,21 @@
import 'package:doctor_app_flutter/config/config.dart';
import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:doctor_app_flutter/core/viewModel/medical_file_view_model.dart';
import 'package:doctor_app_flutter/icons_app/doctor_app_icons.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/medical-file/medical_file_details.dart';
import 'package:doctor_app_flutter/screens/patients/profile/patient_profile_screen.dart';
import 'package:doctor_app_flutter/util/date-utils.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-page-header-widget.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design.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/network_base_view.dart';
import 'package:flutter/material.dart';
import 'package:hexcolor/hexcolor.dart';
class MedicalFilePage extends StatefulWidget {
@override
@ -21,6 +28,9 @@ class _MedicalFilePageState extends State<MedicalFilePage> {
Widget build(BuildContext context) {
final routeArgs = ModalRoute.of(context).settings.arguments as Map;
patient = routeArgs['patient'];
String patientType = routeArgs['patientType'];
String arrivalType = routeArgs['arrivalType'];
return BaseView<MedicalFileViewModel>(
onModelReady: (model) => model.getMedicalFile(mrn: patient.patientId),
builder:
@ -32,18 +42,45 @@ class _MedicalFilePageState extends State<MedicalFilePage> {
baseViewModel: model,
child: SingleChildScrollView(
child: Container(
color: Colors.white,
child: Column(
// mainAxisAlignment: model.medicalFileList.length != 0 &&
// model.medicalFileList != null
// ? MainAxisAlignment.start
// : MainAxisAlignment.center,
children: [
PatientPageHeaderWidget(patient),
Divider(
height: 1.0,
thickness: 1.0,
color: Colors.grey,
PatientProfileHeaderNewDesign(
patient, patient.patientType.toString(), arrivalType),
Padding(
padding:
EdgeInsets.symmetric(horizontal: 12.0, vertical: 8.0),
child: Container(
child: Padding(
padding: const EdgeInsets.all(8.0),
child: Column(
children: [
Row(
children: [
AppText(
'Medical',
fontSize: 15.0,
fontWeight: FontWeight.w600,
fontFamily: 'Poppins',
),
],
),
Row(
children: [
AppText(
'Report',
fontSize: 30.0,
fontWeight: FontWeight.w700,
),
],
),
],
),
),
),
),
(model.medicalFileList != null &&
model.medicalFileList.length != 0)
@ -60,67 +97,156 @@ class _MedicalFilePageState extends State<MedicalFilePage> {
horizontal: 12.0, vertical: 8.0),
child: InkWell(
child: Container(
width: double.infinity,
margin: EdgeInsets.only(
top: 10, left: 10, right: 10),
padding: EdgeInsets.all(8.0),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.all(
Radius.circular(10.0),
),
border: Border.all(
color: Colors.grey[200], width: 0.5),
),
child: Column(
children: [
Row(
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: [
Row(
children: [
AppText(
TranslationBase.of(context).branch +
": ",
model
.medicalFileList[0]
.entityList[0]
.timelines[index]
.doctorName,
fontWeight: FontWeight.w700,
fontSize: 17.0,
fontFamily: 'Poppins',
)
],
),
Row(
children: [
AppText(
Helpers.convertStringToDate(model
.medicalFileList[0]
.entityList[0]
.timelines[index]
.date)
.day
.toString() +
"/",
),
AppText(
Helpers.convertStringToDate(model
.medicalFileList[0]
.entityList[0]
.timelines[index]
.date)
.month
.toString() +
"/",
),
AppText(model
AppText(
Helpers.convertStringToDate(
model
.medicalFileList[0]
.entityList[0]
.timelines[index]
.projectName),
.date)
.year
.toString(),
),
],
)
],
),
Row(
mainAxisAlignment:
MainAxisAlignment.start,
children: [
Padding(
padding: const EdgeInsets.all(8.0),
child: Column(
children: [
ClipRRect(
borderRadius:
BorderRadius.all(
Radius.circular(30)),
child: Image.network(
'https://previews.123rf.com/images/yupiramos/yupiramos1705/yupiramos170524444/78443570-a-female-doctor-avatar-character-vector-illustration-design.jpg',
fit: BoxFit.cover,
width: 60,
height: 70,
),
),
],
),
),
Column(
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
Row(
children: [
AppText(
TranslationBase.of(context)
.doctorName
.toUpperCase() +
.clinic +
": ",
fontWeight: FontWeight.w700,
),
Expanded(
child: AppText(
AppText(
model
.medicalFileList[0]
.entityList[0]
.timelines[index]
.doctorName,
fontWeight: FontWeight.w700,
),
.clinicName,
fontWeight: FontWeight.w600,
),
],
),
Row(
mainAxisAlignment:
MainAxisAlignment
.spaceBetween,
children: [
AppText(
TranslationBase.of(context)
.clinicName +
.branch +
": ",
fontWeight: FontWeight.w700,
),
AppText(
model
.medicalFileList[0]
.entityList[0]
.timelines[index]
.clinicName,
.projectName,
fontWeight: FontWeight.w600,
),
],
),
SizedBox(height: 10.0),
Divider(
height: 1.0,
thickness: 1.0,
color: Colors.grey.shade400,
],
),
],
),
Row(
mainAxisAlignment:
MainAxisAlignment.end,
children: [
Column(
children: [
Icon(
Icons.remove_red_eye,
size: 30.0,
)
],
)
],
),
],
),
),
onTap: () {
@ -135,16 +261,24 @@ class _MedicalFilePageState extends State<MedicalFilePage> {
gender: patient.genderDescription,
encounterNumber: index,
pp: patient.patientId,
patient: patient,
)),
);
},
),
);
})
: Container(
: Column(
children: [
Container(
child: AppText(
'THERES NO MEDICAL FILE FOR THIS Patient',
),
),
SizedBox(
height: 400,
)
],
)
],
),

@ -566,7 +566,7 @@ packages:
name: js
url: "https://pub.dartlang.org"
source: hosted
version: "0.6.2"
version: "0.6.3-nullsafety.1"
json_annotation:
dependency: transitive
description:
@ -608,7 +608,7 @@ packages:
name: meta
url: "https://pub.dartlang.org"
source: hosted
version: "1.3.0-nullsafety.3"
version: "1.3.0-nullsafety.4"
mime:
dependency: transitive
description:
@ -900,7 +900,7 @@ packages:
name: stack_trace
url: "https://pub.dartlang.org"
source: hosted
version: "1.10.0-nullsafety.1"
version: "1.10.0-nullsafety.2"
stream_channel:
dependency: transitive
description:
@ -1084,5 +1084,5 @@ packages:
source: hosted
version: "2.2.1"
sdks:
dart: ">=2.10.0 <2.11.0"
dart: ">=2.10.0 <=2.11.0-213.1.beta"
flutter: ">=1.22.0 <2.0.0"

Loading…
Cancel
Save