Haroon6138
/
doctor_app_flutter
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge branch 'fix-issues' into 'development'

Browse Source 
hot Fixes

See merge request Cloud_Solution/doctor_app_flutter!508
merge-requests/509/head
Mohammad Aljammal 4 years ago
parent 6fffc3f262 369a5789a3
commit 96d861ab81
3 changed files with 92 additions and 65 deletions
Show Stats Download Patch File Download Diff File

19
lib/screens/medical-file/medical_file_details.dart
Unescape Escape View File

@ -1095,7 +1095,24 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
), ),
), ),
) )
: Text("There's no medical file for this patient") : Center(
child: Column(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
SizedBox(
height: 100,
),
Image.asset('assets/images/no-data.png'),
Padding(
padding: const EdgeInsets.all(8.0),
child: Texts('No Data For This Visit '),
),
SizedBox(
height: 100,
),
],
),
)
], ],
), ),
), ),

97
lib/screens/medical-file/medical_file_page.dart
Unescape Escape View File

@ -104,51 +104,58 @@ class _MedicalFilePageState extends State<MedicalFilePage> {
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => MedicalFileDetails( builder: (context) => MedicalFileDetails(
age: patient.age is String ? patient.age ?? "" : "${patient.age}", age: patient.age is String
firstName: patient.firstName, ? patient.age ?? ""
lastName: patient.lastName, : "${patient.age}",
gender: patient.genderDescription, firstName: patient.firstName,
encounterNumber: index, lastName: patient.lastName,
pp: patient.patientId, gender: patient.genderDescription,
patient: patient, encounterNumber: index,
doctorName: model pp: patient.patientId,
.medicalFileList[0] patient: patient,
.entityList[0] doctorName: model
.timelines[index] .medicalFileList[0]
.doctorName, .entityList[0]
clinicName: model .timelines[index]
.medicalFileList[0] .timeLineEvents[0]
.entityList[0] .consulations
.timelines[index] .isNotEmpty
.clinicName, ? model
doctorImage: model .medicalFileList[0]
.medicalFileList[0] .entityList[0]
.entityList[0] .timelines[index]
.timelines[index] .doctorName
.doctorImage, : "",
episode: clinicName: model
model .medicalFileList[0]
.medicalFileList[0] .entityList[0]
.entityList[0] .timelines[index]
.timelines[index] .timeLineEvents[0]
.timeLineEvents[0] .consulations
.consulations.isNotEmpty? .isNotEmpty
model ? model
.medicalFileList[0] .medicalFileList[0]
.entityList[0] .entityList[0]
.timelines[index] .timelines[index]
.timeLineEvents[0] .clinicName
.consulations[0] : "",
.episodeID doctorImage: model
.toString():"", .medicalFileList[0]
vistDate: model .entityList[0]
.medicalFileList[0] .timelines[index]
.entityList[0] .timeLineEvents[0]
.timelines[index] .consulations
.date .isNotEmpty
.toString() ? model
.toString(), .medicalFileList[0]
)), .entityList[0]
.timelines[index]
.doctorImage
: "",
episode: model.medicalFileList[0].entityList[0].timelines[index].timeLineEvents[0].consulations.isNotEmpty
? model.medicalFileList[0].entityList[0].timelines[index].timeLineEvents[0].consulations[0].episodeID.toString()
: "",
vistDate: model.medicalFileList[0].entityList[0].timelines[index].date.toString())),
); );
}, },
child: DoctorCard( child: DoctorCard(

41
lib/widgets/patients/profile/patient_profile_header_with_appointment_card_app_bar.dart
Unescape Escape View File

@ -182,7 +182,7 @@ class PatientProfileHeaderWhitAppointmentAppBar extends StatelessWidget
color: HexColor("#20A169"), color: HexColor("#20A169"),
), ),
child: AppText( child: AppText(
patient.startTime??"", patient.startTime ?? "",
color: Colors.white, color: Colors.white,
fontSize: 1.5 * SizeConfig.textMultiplier, fontSize: 1.5 * SizeConfig.textMultiplier,
textAlign: TextAlign.center, textAlign: TextAlign.center,
@ -235,7 +235,9 @@ class PatientProfileHeaderWhitAppointmentAppBar extends StatelessWidget
Row( Row(
children: [ children: [
AppText( AppText(
patient.nationalityName ?? patient.nationality??"", patient.nationalityName ??
patient.nationality ??
"",
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
fontSize: 12, fontSize: 12,
), ),
@ -307,7 +309,7 @@ class PatientProfileHeaderWhitAppointmentAppBar extends StatelessWidget
children: <Widget>[ children: <Widget>[
Container( Container(
child: LargeAvatar( child: LargeAvatar(
name: doctorName??"", name: doctorName ?? "",
url: profileUrl, url: profileUrl,
), ),
width: 25, width: 25,
@ -382,23 +384,24 @@ class PatientProfileHeaderWhitAppointmentAppBar extends StatelessWidget
Texts(vistDate ?? '', fontSize: 12) Texts(vistDate ?? '', fontSize: 12)
], ],
), ),
Row( if (!isMedicalFile)
children: <Widget>[ Row(
Expanded( children: <Widget>[
child: Texts( Expanded(
!isPrescriptions child: Texts(
? 'Result Date: ' !isPrescriptions
: 'Prescriptions Date ', ? 'Result Date: '
color: Colors.grey[800], : 'Prescriptions Date ',
fontSize: 12, color: Colors.grey[800],
fontSize: 12,
),
), ),
), Texts(
Texts( '${DateUtils.getDayMonthYearDateFormatted(appointmentDate, isArabic: projectViewModel.isArabic)}',
'${DateUtils.getDayMonthYearDateFormatted(appointmentDate, isArabic: projectViewModel.isArabic)}', fontSize: 14,
fontSize: 14, )
) ],
], )
)
]), ]),
), ),
), ),

Write Preview
Loading…
Cancel
Save