some fixes before live

merge-requests/789/head
Elham Rababh 4 years ago
parent 8b7d61ba03
commit e2caebde8b

@ -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;

@ -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);
}

@ -198,7 +198,7 @@ class _PatientProfileScreenState extends State<PatientProfileScreen> with Single
),
],
),
if (isInpatient?true:isFromLiveCare
if (isFromLiveCare
? patient.episodeNo != null
: patient.patientStatusType != null && patient.patientStatusType == 43)
BaseView<SOAPViewModel>(
@ -253,7 +253,7 @@ class _PatientProfileScreenState extends State<PatientProfileScreen> 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

@ -66,7 +66,7 @@ class BottomNavigationItem extends StatelessWidget {
),
],
),
if(currentIndex == 3)
if(currentIndex == 3 && model.notRepliedCount != 0)
Positioned(
right: 18.0,
bottom: 40.0,

Loading…
Cancel
Save