Merge branch 'fix-issues' into 'development'

hot Fixes

See merge request Cloud_Solution/doctor_app_flutter!508

lib/screens/medical-file/medical_file_details.dart

@@ -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,
+                                ),
+                              ],
+                            ),
+                          )
                   ],
                 ),
               ),

lib/screens/medical-file/medical_file_page.dart

@@ -104,7 +104,9 @@ class _MedicalFilePageState extends State<MedicalFilePage> {
                                   context,
                                   MaterialPageRoute(
                                       builder: (context) => MedicalFileDetails(
-                                            age: patient.age is String ? patient.age ?? "" : "${patient.age}",
+                                          age: patient.age is String
+                                              ? patient.age ?? ""
+                                              : "${patient.age}",
                                           firstName: patient.firstName,
                                           lastName: patient.lastName,
                                           gender: patient.genderDescription,
@@ -115,40 +117,45 @@ class _MedicalFilePageState extends State<MedicalFilePage> {
                                                   .medicalFileList[0]
                                                   .entityList[0]
                                                   .timelines[index]
-                                                .doctorName,
-                                            clinicName: model
+                                                  .timeLineEvents[0]
+                                                  .consulations
+                                                  .isNotEmpty
+                                              ? model
                                                   .medicalFileList[0]
                                                   .entityList[0]
                                                   .timelines[index]
-                                                .clinicName,
-                                            doctorImage: model
+                                                  .doctorName
+                                              : "",
+                                          clinicName: model
                                                   .medicalFileList[0]
                                                   .entityList[0]
                                                   .timelines[index]
-                                                .doctorImage,
-                                            episode:
-                                            model
+                                                  .timeLineEvents[0]
+                                                  .consulations
+                                                  .isNotEmpty
+                                              ? model
                                                   .medicalFileList[0]
                                                   .entityList[0]
                                                   .timelines[index]
-                                                .timeLineEvents[0]
-                                                .consulations.isNotEmpty?
-                                                model
+                                                  .clinicName
+                                              : "",
+                                          doctorImage: model
                                                   .medicalFileList[0]
                                                   .entityList[0]
                                                   .timelines[index]
                                                   .timeLineEvents[0]
-                                                .consulations[0]
-                                                .episodeID
-                                                .toString():"",
-                                            vistDate: model
+                                                  .consulations
+                                                  .isNotEmpty
+                                              ? model
                                                   .medicalFileList[0]
                                                   .entityList[0]
                                                   .timelines[index]
-                                                .date
-                                                .toString()
-                                                .toString(),
-                                          )),
+                                                  .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(

lib/widgets/patients/profile/patient_profile_header_with_appointment_card_app_bar.dart

@@ -235,7 +235,9 @@ class PatientProfileHeaderWhitAppointmentAppBar extends StatelessWidget
                         Row(
                           children: [
                             AppText(
-                              patient.nationalityName ?? patient.nationality??"",
+                              patient.nationalityName ??
+                                  patient.nationality ??
+                                  "",
                               fontWeight: FontWeight.bold,
                               fontSize: 12,
                             ),
@@ -382,6 +384,7 @@ class PatientProfileHeaderWhitAppointmentAppBar extends StatelessWidget
                                         Texts(vistDate ?? '', fontSize: 12)
                                       ],
                                     ),
+                                  if (!isMedicalFile)
                                     Row(
                                       children: <Widget>[
                                         Expanded(