Merge branch 'fix_live_care_issues' into 'development'

fix live care issues

See merge request Cloud_Solution/doctor_app_flutter!699
merge-requests/700/merge
Mohammad Aljammal 5 years ago
commit 38d0c6ddbd

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

@ -154,7 +154,7 @@ class PatiantInformtion {
patientIdentificationNo: patientIdentificationNo:
json["PatientIdentificationNo"] ?? json["patientIdentificationNo"], json["PatientIdentificationNo"] ?? json["patientIdentificationNo"],
//TODO make 7 dynamic when the backend retrun it in patient arrival //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"], admissionNo: json["AdmissionNo"] ?? json["admissionNo"],
admissionDate: json["AdmissionDate"] ?? json["admissionDate"], admissionDate: json["AdmissionDate"] ?? json["admissionDate"],
createdOn: json["CreatedOn"] ?? json["CreatedOn"], createdOn: json["CreatedOn"] ?? json["CreatedOn"],

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

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

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

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

Loading…
Cancel
Save