Merge branch 'fix_live_care_issues' into 'development'

fix live care issues

See merge request Cloud_Solution/doctor_app_flutter!699

lib/core/viewModel/authentication_view_model.dart

@@ -423,6 +423,7 @@ class AuthenticationViewModel extends BaseViewModel {
     deleteUser();
     await getDeviceInfoFromFirebase();
     this.isFromLogin = isFromLogin;
+    app_status = APP_STATUS.UNAUTHENTICATED;
     setState(ViewState.Idle);
     Navigator.pushAndRemoveUntil(
         AppGlobal.CONTEX,

lib/models/patient/patiant_info_model.dart

@@ -154,7 +154,7 @@ class PatiantInformtion {
         patientIdentificationNo:
             json["PatientIdentificationNo"] ?? json["patientIdentificationNo"],
         //TODO make 7 dynamic when the backend retrun it in patient arrival
-          patientType: json["PatientType"] ?? json["patientType"]??7,
+          patientType: json["PatientType"] ?? json["patientType"]??1,
         admissionNo: json["AdmissionNo"] ?? json["admissionNo"],
         admissionDate: json["AdmissionDate"] ?? json["admissionDate"],
         createdOn: json["CreatedOn"] ?? json["CreatedOn"],

lib/screens/live_care/live_care_patient_screen.dart

@@ -143,7 +143,7 @@ class _LiveCarePatientScreenState extends State<LiveCarePatientScreen> {
                                       "isInpatient": false,
                                       "arrivalType": "0",
                                       "isSearchAndOut": false,
-                                      "isFromLiveCare":true
+                                      "isFromLiveCare":true,
                                     });
                               },
                               // isFromSearch: widget.isSearch,

lib/screens/patients/profile/vital_sign/vital_sign_details_screen.dart

@@ -57,7 +57,7 @@ class VitalSignDetailsScreen extends StatelessWidget {
                               crossAxisAlignment: CrossAxisAlignment.start,
                               children: [
                                 AppText(
-                                  "${patient.firstName ?? patient.patientDetails.firstName}'s",
+                                  "${patient.firstName ?? patient.patientDetails?.firstName??''}'s",
                                   fontSize: SizeConfig.textMultiplier * 1.6,
                                   fontWeight: FontWeight.w700,
                                   color: Color(0xFF2E303A),

lib/widgets/patients/profile/patient_profile_header_with_appointment_card_app_bar.dart

@@ -84,7 +84,7 @@ class PatientProfileHeaderWhitAppointmentAppBar extends StatelessWidget
                         ? (Helpers.capitalize(patient.firstName) +
                             " " +
                             Helpers.capitalize(patient.lastName))
-                        : Helpers.capitalize(patient.patientDetails.fullName),
+                        : Helpers.capitalize(patient.fullName??patient?.patientDetails?.fullName??""),
                     fontSize: SizeConfig.textMultiplier * 2.2,
                     fontWeight: FontWeight.bold,
                     fontFamily: 'Poppins',

lib/widgets/shared/app_drawer_widget.dart

@@ -175,6 +175,7 @@ class _AppDrawerState extends State<AppDrawer> {
                         Navigator.pop(context);
                         GifLoaderDialogUtils.showMyDialog(context);
                         await authenticationViewModel.logout(isFromLogin: false);
+                       // GifLoaderDialogUtils.showMyDialog(context);
                       },
                     ),
                   ],