diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index 426a309b..df7cea74 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -587,14 +587,8 @@ const Map> localizedValues = { 'en': "There is no detail for this patient", 'ar': "لا توجد تفاصيل لهذا المريض" }, - "systolic-lng": { - "en": "Systolic", - "ar": "الإنقباض" - }, - "diastolic-lng": { - "en": "Diastolic", - "ar": "الإنبساط" - }, + "systolic-lng": {"en": "Systolic", "ar": "الإنقباض"}, + "diastolic-lng": {"en": "Diastolic", "ar": "الإنبساط"}, "mass": {"en": "Mass", "ar": "كتلة"}, "temp-c": {"en": "°C", "ar": "°س"}, "bpm": {"en": "bpm", "ar": "نبضة"}, @@ -603,14 +597,6 @@ const Map> localizedValues = { "body": {"en": "Body \n Mass", "ar": "كتلة\nالجسم"}, 'respirationRate': {'en': 'Respiration Rate', 'ar': 'معدل التنفس'}, 'heart': {'en': 'Heart', 'ar': 'قلب'}, - 'addAssessment': {'en': "Add ASSESSMENT", 'ar': "أضف التقييم"}, - 'assessment': {'en': "ASSESSMENT", 'ar': " التقييم"}, - 'physicalSystemExamination': { - 'en': "Physical/System Examination", - 'ar': " الفحص البدني / النظام" - }, - 'searchExamination': {'en': "Search Examination", 'ar': "فحص البحث"}, - 'addExamination': {'en': "Add Examination", 'ar': "اضافه"}, 'medicalReport': {'en': "medical Report", 'ar': "تقرير طبي"}, 'visitDate': {'en': "Visit Date", 'ar': "تاريخ الزيارة"}, 'test': {'en': "Procedures/Test", 'ar': "عمليات/تحاليل"}, diff --git a/lib/util/translations_delegate_base.dart b/lib/util/translations_delegate_base.dart index aae8e091..c3df9d86 100644 --- a/lib/util/translations_delegate_base.dart +++ b/lib/util/translations_delegate_base.dart @@ -612,8 +612,10 @@ class TranslationBase { String get doc => localizedValues['doc'][locale.languageCode]; String get patientNoDetailErrMsg => localizedValues['patientNoDetailErrMsg'][locale.languageCode]; - String get systolicLng => localizedValues['systolic-lng'][locale.languageCode]; - String get diastolicLng => localizedValues['diastolic-lng'][locale.languageCode]; + String get systolicLng => + localizedValues['systolic-lng'][locale.languageCode]; + String get diastolicLng => + localizedValues['diastolic-lng'][locale.languageCode]; String get mass => localizedValues['mass'][locale.languageCode]; String get tempC => localizedValues['temp-c'][locale.languageCode]; String get bpm => localizedValues['bpm'][locale.languageCode]; @@ -624,14 +626,7 @@ class TranslationBase { String get respirationRate => localizedValues['respirationRate'][locale.languageCode]; String get heart => localizedValues['heart'][locale.languageCode]; - String get chiefComplaintEmptyMsg => - localizedValues['chiefComplaintEmptyMsg'][locale.languageCode]; - String get physicalSystemExamination => - localizedValues['physicalSystemExamination'][locale.languageCode]; - String get searchExamination => - localizedValues['searchExamination'][locale.languageCode]; - String get addExamination => - localizedValues['addExamination'][locale.languageCode]; + String get medicalReport => localizedValues['medicalReport'][locale.languageCode]; String get visitDate => localizedValues['visitDate'][locale.languageCode]; diff --git a/lib/widgets/patients/profile/profile_medical_info_widget.dart b/lib/widgets/patients/profile/profile_medical_info_widget.dart index ad813be0..6085f938 100644 --- a/lib/widgets/patients/profile/profile_medical_info_widget.dart +++ b/lib/widgets/patients/profile/profile_medical_info_widget.dart @@ -27,8 +27,11 @@ class ProfileMedicalInfoWidget extends StatelessWidget { ProfileMedicalInfoWidget( {Key key, this.patient, this.patientType, this.from, this.to}); + String from; + String to; + PatiantInformtion patient; - String patientType; + String patientType; @override Widget build(BuildContext context) { return BaseView( @@ -43,7 +46,8 @@ class ProfileMedicalInfoWidget extends StatelessWidget { PatientProfileButton( key: key, patient: patient, - isDisable: patient.episodeNo != 0 ? true : false,nameLine1: TranslationBase.of(context).createNew, + isDisable: patient.episodeNo != 0 ? true : false, + nameLine1: TranslationBase.of(context).createNew, nameLine2: TranslationBase.of(context).episode, route: CREATE_EPISODE, onTap: () async { @@ -55,15 +59,18 @@ class ProfileMedicalInfoWidget extends StatelessWidget { Navigator.of(context).pushNamed(CREATE_EPISODE, arguments: {'patient': patient}); }, - isLoading: model.state == ViewState.BusyLocal,icon: 'create-episod.png'), + isLoading: model.state == ViewState.BusyLocal, + icon: 'create-episod.png'), if (int.parse(patientType) == 7) PatientProfileButton( key: key, patient: patient, - isDisable: patient.episodeNo == 0 ? true : false,nameLine1: TranslationBase.of(context).update, + isDisable: patient.episodeNo == 0 ? true : false, + nameLine1: TranslationBase.of(context).update, nameLine2: TranslationBase.of(context).episode, route: UPDATE_EPISODE, - icon: 'modilfy-episode.png'),if (int.parse(patientType) == 7) + icon: 'modilfy-episode.png'), + if (int.parse(patientType) == 7) PatientProfileButton( key: key, patient: patient, @@ -71,9 +78,11 @@ class ProfileMedicalInfoWidget extends StatelessWidget { to: to, nameLine1: TranslationBase.of(context).vital, nameLine2: TranslationBase.of(context).signs, - route: VITAL_SIGN_DETAILS /* PATIENT_VITAL_SIGN - */, - icon: 'heartbeat.png'), + route: + VITAL_SIGN_DETAILS /* PATIENT_VITAL_SIGN + */ + , + icon: 'heartbeat.png'), if (selectedPatientType != 7) PatientProfileButton( key: key, diff --git a/pubspec.lock b/pubspec.lock index 77edb88a..9d63a65c 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -510,7 +510,7 @@ packages: name: js url: "https://pub.dartlang.org" source: hosted - version: "0.6.2" + version: "0.6.3-nullsafety.1" json_annotation: dependency: transitive description: