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,
MaterialPageRoute(
builder: (context) => MedicalFileDetails(
age: patient.age is String ? patient.age ?? "" : "${patient.age}",
firstName: patient.firstName,
lastName: patient.lastName,
gender: patient.genderDescription,
encounterNumber: index,
pp: patient.patientId,
patient: patient,
doctorName: model
.medicalFileList[0]
.entityList[0]
.timelines[index]
.doctorName,
clinicName: model
.medicalFileList[0]
.entityList[0]
.timelines[index]
.clinicName,
doctorImage: model
.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()
.toString(),
)),
age: patient.age is String
? patient.age ?? ""
: "${patient.age}",
firstName: patient.firstName,
lastName: patient.lastName,
gender: patient.genderDescription,
encounterNumber: index,
pp: patient.patientId,
patient: patient,
doctorName: model
.medicalFileList[0]
.entityList[0]
.timelines[index]
.timeLineEvents[0]
.consulations
.isNotEmpty
? model
.medicalFileList[0]
.entityList[0]
.timelines[index]
.doctorName
: "",
clinicName: model
.medicalFileList[0]
.entityList[0]
.timelines[index]
.timeLineEvents[0]
.consulations
.isNotEmpty
? model
.medicalFileList[0]
.entityList[0]
.timelines[index]
.clinicName
: "",
doctorImage: model
.medicalFileList[0]
.entityList[0]
.timelines[index]
.timeLineEvents[0]
.consulations
.isNotEmpty
? model
.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(

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

Write Preview
Loading…
Cancel
Save