diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index 3048a39d..672796a6 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -536,4 +536,8 @@ const Map> localizedValues = { 'en': "There is no Chief Complaint", 'ar': "ليس هناك شكوى رئيس" }, + 'patientNoDetailErrMsg': { + 'en': "There is no detail for this patient", + 'ar': "لا توجد تفاصيل لهذا المريض" + }, }; diff --git a/lib/core/service/base/base_service.dart b/lib/core/service/base/base_service.dart index 32edf34f..6f4c5d1e 100644 --- a/lib/core/service/base/base_service.dart +++ b/lib/core/service/base/base_service.dart @@ -1,4 +1,5 @@ import 'package:doctor_app_flutter/client/base_app_client.dart'; +import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/util/dr_app_shared_pref.dart'; import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/config/shared_pref_kay.dart'; @@ -12,7 +13,7 @@ class BaseService { DrAppSharedPreferances sharedPref = new DrAppSharedPreferances(); DoctorProfileModel doctorProfile; - List patientArrivalList = []; + List patientArrivalList = []; //TODO add the user login model when we need it Future getDoctorProfile() async { @@ -50,7 +51,7 @@ class BaseService { patientArrivalList.clear(); response['patientArrivalList']['entityList'].forEach((v) { - PatientArrivalEntity item = PatientArrivalEntity.fromJson(v); + PatiantInformtion item = PatiantInformtion.fromJson(v); patientArrivalList.add(item); }); }, diff --git a/lib/core/viewModel/patient-referral-viewmodel.dart b/lib/core/viewModel/patient-referral-viewmodel.dart index 35747c37..028eac0d 100644 --- a/lib/core/viewModel/patient-referral-viewmodel.dart +++ b/lib/core/viewModel/patient-referral-viewmodel.dart @@ -27,7 +27,7 @@ class PatientReferralViewModel extends BaseViewModel { List get pendingReferral => _referralPatientService.pendingReferralList; - List get patientArrivalList => + List get patientArrivalList => _referralPatientService.patientArrivalList; Future getMasterLookup(MasterKeysService masterKeys) async { diff --git a/lib/core/viewModel/patient-vital-sign-viewmodel.dart b/lib/core/viewModel/patient-vital-sign-viewmodel.dart index 4f2e7e28..5674030c 100644 --- a/lib/core/viewModel/patient-vital-sign-viewmodel.dart +++ b/lib/core/viewModel/patient-vital-sign-viewmodel.dart @@ -11,9 +11,6 @@ import '../../locator.dart'; class VitalSignsViewModel extends BaseViewModel { VitalSignsService _vitalSignService = locator(); - List get patientArrivalList => - _vitalSignService.patientArrivalList; - VitalSignData get patientVitalSigns => _vitalSignService.patientVitalSigns; Future getPatientVitalSign(PatiantInformtion patient) async { diff --git a/lib/screens/patients/profile/referral/my-referral-detail-screen.dart b/lib/screens/patients/profile/referral/my-referral-detail-screen.dart index 1019ede4..77b17e3d 100644 --- a/lib/screens/patients/profile/referral/my-referral-detail-screen.dart +++ b/lib/screens/patients/profile/referral/my-referral-detail-screen.dart @@ -12,6 +12,7 @@ import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/borderedButton.dart'; import 'package:flutter/material.dart'; +import 'package:hexcolor/hexcolor.dart'; import 'package:provider/provider.dart'; import '../../../../routes.dart'; @@ -39,7 +40,7 @@ class MyReferralDetailScreen extends StatelessWidget { builder: (_, model, w) => AppScaffold( baseViewModel: model, appBarTitle: TranslationBase.of(context).referPatient, - body: Column( + body: model.patientArrivalList != null ? Column( children: [ Expanded( child: SingleChildScrollView( @@ -110,7 +111,7 @@ class MyReferralDetailScreen extends StatelessWidget { icon: 'lab.png'), PatientProfileButton( key: key, - // patient: patient, + patient: model.patientArrivalList[0], route: PATIENT_VITAL_SIGN, nameLine1: TranslationBase.of(context).vital, nameLine2: TranslationBase.of(context).signs, @@ -160,6 +161,15 @@ class MyReferralDetailScreen extends StatelessWidget { ), ), ], + ) : Container( + child: Center( + child: AppText( + TranslationBase.of(context).patientNoDetailErrMsg, + color: HexColor("#B8382B"), + fontWeight: FontWeight.bold, + fontSize: 16, + ), + ), ), ), ); diff --git a/lib/util/translations_delegate_base.dart b/lib/util/translations_delegate_base.dart index b167b48e..8ee0dc7d 100644 --- a/lib/util/translations_delegate_base.dart +++ b/lib/util/translations_delegate_base.dart @@ -553,6 +553,7 @@ class TranslationBase { String get approvalRequired => localizedValues['approvalRequired'][locale.languageCode]; String get uncoveredByDoctor => localizedValues['uncoveredByDoctor'][locale.languageCode]; String get chiefComplaintEmptyMsg => localizedValues['chiefComplaintEmptyMsg'][locale.languageCode]; + String get patientNoDetailErrMsg => localizedValues['patientNoDetailErrMsg'][locale.languageCode]; } class TranslationBaseDelegate extends LocalizationsDelegate {