Medical Report New Design

merge-requests/381/head
hussam al-habibeh 5 years ago
parent db2c086ffd
commit ebb130af09

@ -140,134 +140,155 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
child: Container( child: Container(
child: Column( child: Column(
children: [ children: [
Row( Container(
children: [ width: double.infinity,
AppText( margin: EdgeInsets.only(
TranslationBase.of(context).visitDate + top: 10, left: 10, right: 10),
": ", padding: EdgeInsets.all(8.0),
fontWeight: FontWeight.w700, decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.all(
Radius.circular(10.0),
), ),
if (model.medicalFileList.length != 0 && border: Border.all(
model color: Colors.grey[200], width: 0.5),
.medicalFileList[0] ),
.entityList[0] child: Column(
.timelines[encounterNumber]
.timeLineEvents[0]
.consulations
.length !=
0)
AppText(model
.medicalFileList[0]
.entityList[0]
.timelines[encounterNumber]
.timeLineEvents[0]
.consulations[0]
.appointmentDate
.toString()),
SizedBox(width: 35.0),
// AppText(
// 'Appt Date : ',
// fontWeight: FontWeight.w700,
// ),
// AppText(
// '23/12/2020',
// ),
],
),
Row(
children: [
AppText(
TranslationBase.of(context).doctorName +
": ".toUpperCase(),
fontWeight: FontWeight.w700,
),
if (model.medicalFileList.length != 0 &&
model
.medicalFileList[0]
.entityList[0]
.timelines[encounterNumber]
.timeLineEvents[0]
.consulations
.length !=
0)
Expanded(
child: AppText(
model
.medicalFileList[0]
.entityList[0]
.timelines[encounterNumber]
.timeLineEvents[0]
.consulations[0]
.doctorName
.toUpperCase(),
fontWeight: FontWeight.w700,
),
),
],
),
if (model.medicalFileList.length != 0)
Row(
children: [ children: [
AppText( Row(
TranslationBase.of(context) children: [
.clinicName + if (model.medicalFileList.length !=
": ", 0 &&
fontWeight: FontWeight.w700, model
.medicalFileList[0]
.entityList[0]
.timelines[
encounterNumber]
.timeLineEvents[0]
.consulations
.length !=
0)
Expanded(
child: AppText(
model
.medicalFileList[0]
.entityList[0]
.timelines[
encounterNumber]
.timeLineEvents[0]
.consulations[0]
.doctorName
.toUpperCase(),
fontWeight: FontWeight.w700,
),
),
],
), ),
if (model.medicalFileList.length != 0 && if (model.medicalFileList.length != 0)
model Row(
children: [
AppText(
TranslationBase.of(context)
.clinic +
": ",
fontWeight: FontWeight.w700,
),
if (model.medicalFileList
.length !=
0 &&
model
.medicalFileList[0]
.entityList[0]
.timelines[
encounterNumber]
.timeLineEvents[0]
.consulations
.length !=
0)
AppText(
model
.medicalFileList[0]
.entityList[0]
.timelines[
encounterNumber]
.timeLineEvents[0]
.consulations[0]
.clinicName,
),
],
),
Row(
children: [
AppText(
TranslationBase.of(context)
.episode +
": ",
fontWeight: FontWeight.w700,
),
if (model.medicalFileList.length !=
0 &&
model
.medicalFileList[0]
.entityList[0]
.timelines[
encounterNumber]
.timeLineEvents[0]
.consulations
.length !=
0)
AppText(
model
.medicalFileList[0] .medicalFileList[0]
.entityList[0] .entityList[0]
.timelines[encounterNumber] .timelines[encounterNumber]
.timeLineEvents[0] .timeLineEvents[0]
.consulations .consulations[0]
.length != .episodeID
0) .toString(),
AppText( ),
model ],
.medicalFileList[0] ),
.entityList[0] Row(
.timelines[encounterNumber] children: [
.timeLineEvents[0] AppText(
.consulations[0] TranslationBase.of(context)
.clinicName, .visitDate +
), ": ",
], fontWeight: FontWeight.w700,
), ),
Row( if (model.medicalFileList.length !=
children: [ 0 &&
AppText( model
TranslationBase.of(context).episode + .medicalFileList[0]
": ", .entityList[0]
fontWeight: FontWeight.w700, .timelines[
), encounterNumber]
if (model.medicalFileList.length != 0 && .timeLineEvents[0]
model .consulations
.length !=
0)
AppText(model
.medicalFileList[0] .medicalFileList[0]
.entityList[0] .entityList[0]
.timelines[encounterNumber] .timelines[encounterNumber]
.timeLineEvents[0] .timeLineEvents[0]
.consulations .consulations[0]
.length != .appointmentDate
0) .toString()),
AppText( SizedBox(width: 35.0),
model // AppText(
.medicalFileList[0] // 'Appt Date : ',
.entityList[0] // fontWeight: FontWeight.w700,
.timelines[encounterNumber] // ),
.timeLineEvents[0] // AppText(
.consulations[0] // '23/12/2020',
.episodeID // ),
.toString(), ],
), ),
], ],
), ),
SizedBox(height: 15.0),
Divider(
height: 1.0,
thickness: 1.0,
color: Colors.grey.shade400,
), ),
SizedBox(height: 25.0), SizedBox(height: 25.0),
if (model.medicalFileList.length != 0 && if (model.medicalFileList.length != 0 &&
model model

@ -103,27 +103,31 @@ class _MedicalFilePageState extends State<MedicalFilePage> {
padding: padding:
EdgeInsets.symmetric(horizontal: 12.0, vertical: 8.0), EdgeInsets.symmetric(horizontal: 12.0, vertical: 8.0),
child: Container( child: Container(
child: Column( child: Padding(
children: [ padding: const EdgeInsets.all(8.0),
Row( child: Column(
children: [ children: [
AppText( Row(
'Medical', children: [
fontSize: 15.0, AppText(
fontWeight: FontWeight.normal, 'Medical',
), fontSize: 13.0,
], fontWeight: FontWeight.w600,
), fontFamily: 'Poppins',
Row( ),
children: [ ],
AppText( ),
'Report', Row(
fontSize: 35.0, children: [
fontWeight: FontWeight.w700, AppText(
), 'Report',
], fontSize: 30.0,
), fontWeight: FontWeight.w700,
], ),
],
),
],
),
), ),
), ),
), ),
@ -223,7 +227,7 @@ class _MedicalFilePageState extends State<MedicalFilePage> {
BorderRadius.all( BorderRadius.all(
Radius.circular(30)), Radius.circular(30)),
child: Image.network( child: Image.network(
'https://media.istockphoto.com/photos/portrait-senior-asian-doctor-over-radiography-background-asian-picture-id1019862020?k=6&m=1019862020&s=612x612&w=0&h=40frRnNnEGhNv5XRcDMRn55bIxCC3oXzbO6pOSQL_sQ=', 'https://previews.123rf.com/images/yupiramos/yupiramos1705/yupiramos170524444/78443570-a-female-doctor-avatar-character-vector-illustration-design.jpg',
fit: BoxFit.cover, fit: BoxFit.cover,
width: 60, width: 60,
height: 70, height: 70,
@ -291,59 +295,6 @@ class _MedicalFilePageState extends State<MedicalFilePage> {
) )
], ],
), ),
// Row(
// children: [
// Expanded(
// child: AppText(
// model
// .medicalFileList[0]
// .entityList[0]
// .timelines[index]
// .doctorName,
// fontWeight: FontWeight.w700,
// fontSize: 18.0,
// fontFamily: 'Poppins',
// ),
// ),
// ],
// ),
// Row(
// children: [
// AppText(
// TranslationBase.of(context).branch +
// ": ",
// fontWeight: FontWeight.w700,
// ),
// AppText(model
// .medicalFileList[0]
// .entityList[0]
// .timelines[index]
// .projectName),
// ],
// ),
// Row(
// children: [
// AppText(
// TranslationBase.of(context)
// .clinicName +
// ": ",
// fontWeight: FontWeight.w700,
// ),
// AppText(
// model
// .medicalFileList[0]
// .entityList[0]
// .timelines[index]
// .clinicName,
// ),
// ],
// ),
// SizedBox(height: 10.0),
// Divider(
// height: 1.0,
// thickness: 1.0,
// color: Colors.grey.shade400,
// )
], ],
), ),
), ),
@ -365,10 +316,17 @@ class _MedicalFilePageState extends State<MedicalFilePage> {
), ),
); );
}) })
: Container( : Column(
child: AppText( children: [
'THERES NO MEDICAL FILE FOR THIS Patient', Container(
), child: AppText(
'THERES NO MEDICAL FILE FOR THIS Patient',
),
),
SizedBox(
height: 400,
)
],
) )
], ],
), ),

Loading…
Cancel
Save