From e2caebde8b87802815602a0db943ee81dc16eb4a Mon Sep 17 00:00:00 2001 From: Elham Rababh Date: Wed, 18 Aug 2021 16:37:26 +0300 Subject: [PATCH] some fixes before live --- lib/config/config.dart | 6 +++--- lib/core/viewModel/dashboard_view_model.dart | 4 ++-- .../profile/profile_screen/patient_profile_screen.dart | 4 ++-- lib/widgets/shared/bottom_navigation_item.dart | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/config/config.dart b/lib/config/config.dart index c8a195a7..d5086b5b 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -5,8 +5,8 @@ const ONLY_NUMBERS = "[0-9]"; const ONLY_LETTERS = "[a-zA-Z &'\"]"; const ONLY_DATE = "[0-9/]"; const BASE_URL_LIVE_CARE = 'https://livecare.hmg.com/'; -// const BASE_URL = 'https://hmgwebservices.com/'; -const BASE_URL = 'https://uat.hmgwebservices.com/'; +const BASE_URL = 'https://hmgwebservices.com/'; +// const BASE_URL = 'https://uat.hmgwebservices.com/'; const PHARMACY_ITEMS_URL = "Services/Lists.svc/REST/GetPharmcyItems_Region_enh"; const PHARMACY_LIST_URL = "Services/Patients.svc/REST/GetPharmcyList"; const PATIENT_PROGRESS_NOTE_URL = "Services/DoctorApplication.svc/REST/GetProgressNoteForInPatient"; @@ -287,7 +287,7 @@ const TRANSACTION_NO = 0; const LANGUAGE_ID = 2; const STAMP = '2020-04-27T12:17:17.721Z'; const IP_ADDRESS = '9.9.9.9'; -const VERSION_ID = 6.3; +const VERSION_ID = 6.4; const CHANNEL = 9; const SESSION_ID = 'BlUSkYymTt'; const IS_LOGIN_FOR_DOCTOR_APP = true; diff --git a/lib/core/viewModel/dashboard_view_model.dart b/lib/core/viewModel/dashboard_view_model.dart index 946f2177..68c69ddf 100644 --- a/lib/core/viewModel/dashboard_view_model.dart +++ b/lib/core/viewModel/dashboard_view_model.dart @@ -120,12 +120,12 @@ class DashboardViewModel extends BaseViewModel { Future getNotRepliedCount() async { - setState(ViewState.Busy); + setState(ViewState.BusyLocal); await getDoctorProfile(); await _doctorReplyService.getNotRepliedCount(); if (_doctorReplyService.hasError) { error = _doctorReplyService.error; - setState(ViewState.Error); + setState(ViewState.ErrorLocal); } else setState(ViewState.Idle); } diff --git a/lib/screens/patients/profile/profile_screen/patient_profile_screen.dart b/lib/screens/patients/profile/profile_screen/patient_profile_screen.dart index bcf2a371..1d3ff652 100644 --- a/lib/screens/patients/profile/profile_screen/patient_profile_screen.dart +++ b/lib/screens/patients/profile/profile_screen/patient_profile_screen.dart @@ -198,7 +198,7 @@ class _PatientProfileScreenState extends State with Single ), ], ), - if (isInpatient?true:isFromLiveCare + if (isFromLiveCare ? patient.episodeNo != null : patient.patientStatusType != null && patient.patientStatusType == 43) BaseView( @@ -253,7 +253,7 @@ class _PatientProfileScreenState extends State with Single AppButton( title: "${TranslationBase.of(context).update}\n${TranslationBase.of(context).episode}", - color: isFromLiveCare || isInpatient + color: isFromLiveCare ? Colors.red.shade700 : patient.patientStatusType == 43 ? Colors.red.shade700 diff --git a/lib/widgets/shared/bottom_navigation_item.dart b/lib/widgets/shared/bottom_navigation_item.dart index 6540c060..6ca4d5d6 100644 --- a/lib/widgets/shared/bottom_navigation_item.dart +++ b/lib/widgets/shared/bottom_navigation_item.dart @@ -66,7 +66,7 @@ class BottomNavigationItem extends StatelessWidget { ), ], ), - if(currentIndex == 3) + if(currentIndex == 3 && model.notRepliedCount != 0) Positioned( right: 18.0, bottom: 40.0,