diff --git a/assets/images/medical/active_medications.png b/assets/images/medical/active_medications.png new file mode 100644 index 00000000..67122598 Binary files /dev/null and b/assets/images/medical/active_medications.png differ diff --git a/assets/images/medical/ask_doctor_icon.png b/assets/images/medical/ask_doctor_icon.png new file mode 100644 index 00000000..bcb1f279 Binary files /dev/null and b/assets/images/medical/ask_doctor_icon.png differ diff --git a/assets/images/medical/check-in.png b/assets/images/medical/check-in.png new file mode 100644 index 00000000..f6effbeb Binary files /dev/null and b/assets/images/medical/check-in.png differ diff --git a/assets/images/new-design/eye_measurement_icon.png b/assets/images/medical/eye_measurement_icon.png similarity index 100% rename from assets/images/new-design/eye_measurement_icon.png rename to assets/images/medical/eye_measurement_icon.png diff --git a/assets/images/medical/insurance_update_icon_.png b/assets/images/medical/insurance_update_icon_.png new file mode 100644 index 00000000..0001bcd2 Binary files /dev/null and b/assets/images/medical/insurance_update_icon_.png differ diff --git a/assets/images/medical/medical_reports_icon.png b/assets/images/medical/medical_reports_icon.png new file mode 100644 index 00000000..ad9c9f7b Binary files /dev/null and b/assets/images/medical/medical_reports_icon.png differ diff --git a/assets/images/medical/monthly_reports_icon.png b/assets/images/medical/monthly_reports_icon.png new file mode 100644 index 00000000..5d51e24c Binary files /dev/null and b/assets/images/medical/monthly_reports_icon.png differ diff --git a/assets/images/medical/my_allergies_icon.png b/assets/images/medical/my_allergies_icon.png new file mode 100644 index 00000000..689b5321 Binary files /dev/null and b/assets/images/medical/my_allergies_icon.png differ diff --git a/assets/images/medical/my_tracker_icon.png b/assets/images/medical/my_tracker_icon.png new file mode 100644 index 00000000..1d46b859 Binary files /dev/null and b/assets/images/medical/my_tracker_icon.png differ diff --git a/assets/images/medical/my_vaccines_icon.png b/assets/images/medical/my_vaccines_icon.png new file mode 100644 index 00000000..23a7352b Binary files /dev/null and b/assets/images/medical/my_vaccines_icon.png differ diff --git a/assets/images/medical/sick_leaves_icons.png b/assets/images/medical/sick_leaves_icons.png new file mode 100644 index 00000000..67a9c937 Binary files /dev/null and b/assets/images/medical/sick_leaves_icons.png differ diff --git a/assets/images/medical/smartwatch_icon.png b/assets/images/medical/smartwatch_icon.png new file mode 100644 index 00000000..c43fe468 Binary files /dev/null and b/assets/images/medical/smartwatch_icon.png differ diff --git a/assets/images/medical/vital_signs.png b/assets/images/medical/vital_signs.png new file mode 100644 index 00000000..7b642d6e Binary files /dev/null and b/assets/images/medical/vital_signs.png differ diff --git a/lib/core/viewModels/medical/medical_view_model.dart b/lib/core/viewModels/medical/medical_view_model.dart index 59e8db48..fa330aad 100644 --- a/lib/core/viewModels/medical/medical_view_model.dart +++ b/lib/core/viewModels/medical/medical_view_model.dart @@ -10,9 +10,10 @@ class MedicalViewModel extends BaseViewModel { List get appoitmentAllHistoryResultList => _medicalService.appoitmentAllHistoryResultList; - getAppointmentHistory() async{ + getAppointmentHistory() async { setState(ViewState.Busy); - await _medicalService.getAppointmentHistory(); + if (_medicalService.appoitmentAllHistoryResultList.length == 0) + await _medicalService.getAppointmentHistory(); if (_medicalService.hasError) { error = _medicalService.error; setState(ViewState.Error); diff --git a/lib/pages/medical/medical_profile_page.dart b/lib/pages/medical/medical_profile_page.dart index cec19e8b..e0acb192 100644 --- a/lib/pages/medical/medical_profile_page.dart +++ b/lib/pages/medical/medical_profile_page.dart @@ -180,7 +180,7 @@ class _MedicalProfilePageState extends State { child: MedicalProfileItem( title: TranslationBase.of(context) .vitalSigns, - imagePath: 'medical_history_icon.png', + imagePath: 'vital_signs.png', subTitle: TranslationBase.of(context) .vitalSignsSubtitle, ), @@ -194,7 +194,7 @@ class _MedicalProfilePageState extends State { child: MedicalProfileItem( title: TranslationBase.of(context) .myMedical, - imagePath: 'radiology_icon.png', + imagePath: 'active_medications.png', subTitle: TranslationBase.of(context) .myMedicalSubtitle, ), @@ -235,8 +235,7 @@ class _MedicalProfilePageState extends State { }, child: MedicalProfileItem( title: TranslationBase.of(context).eye, - imagePath: - 'insurance_approvals_icon.png', + imagePath: 'eye_measurement_icon.png', subTitle: TranslationBase.of(context) .eyeSubtitle, ), @@ -271,7 +270,7 @@ class _MedicalProfilePageState extends State { child: MedicalProfileItem( title: TranslationBase.of(context) .updateInsurance, - imagePath: 'insurance_card_icon.png', + imagePath: 'insurance_update_icon_.png', subTitle: TranslationBase.of(context) .updateInsuranceSubtitle, ), @@ -299,7 +298,7 @@ class _MedicalProfilePageState extends State { onTap:()=> Navigator.push(context, FadePage(page: AllergiesPage())) , child: MedicalProfileItem( title: TranslationBase.of(context).allergies, - imagePath: 'medical_history_icon.png', + imagePath: 'my_allergies_icon.png', subTitle: TranslationBase.of(context) .allergiesSubtitle, ), @@ -317,7 +316,7 @@ class _MedicalProfilePageState extends State { child: MedicalProfileItem( title: TranslationBase.of(context) .myVaccines, - imagePath: 'insurance_card_icon.png', + imagePath: 'my_vaccines_icon.png', subTitle: TranslationBase.of(context) .myVaccinesSubtitle, ), @@ -333,7 +332,7 @@ class _MedicalProfilePageState extends State { child: MedicalProfileItem( title: TranslationBase.of(context).medical, - imagePath: 'insurance_approvals_icon.png', + imagePath: 'medical_reports_icon.png', subTitle: TranslationBase.of(context) .medicalSubtitle, ), @@ -349,7 +348,7 @@ class _MedicalProfilePageState extends State { child: MedicalProfileItem( title: TranslationBase.of(context).monthly, - imagePath: 'medical_history_icon.png', + imagePath: 'monthly_reports_icon.png', subTitle: TranslationBase.of(context) .monthlySubtitle, ), @@ -368,7 +367,7 @@ class _MedicalProfilePageState extends State { }, child: MedicalProfileItem( title: TranslationBase.of(context).sick, - imagePath: 'insurance_card_icon.png', + imagePath: 'sick_leaves_icons.png', subTitle: TranslationBase.of(context) .sickSubtitle, ), @@ -384,7 +383,7 @@ class _MedicalProfilePageState extends State { child: MedicalProfileItem( title: TranslationBase.of(context).myBalance, - imagePath: 'insurance_approvals_icon.png', + imagePath: 'check-in.png', subTitle: TranslationBase.of(context) .myBalanceSubtitle, ), @@ -413,7 +412,7 @@ class _MedicalProfilePageState extends State { child: MedicalProfileItem( title: TranslationBase.of(context) .smartWatches, - imagePath: 'insurance_card_icon.png', + imagePath: 'smartwatch_icon.png', subTitle: TranslationBase.of(context) .smartWatchesSubtitle, ), @@ -429,7 +428,7 @@ class _MedicalProfilePageState extends State { child: MedicalProfileItem( title: TranslationBase.of(context) .myTrackers, - imagePath: 'insurance_approvals_icon.png', + imagePath: 'my_tracker_icon.png', subTitle: TranslationBase.of(context) .myTrackersSubtitle, ), @@ -444,7 +443,7 @@ class _MedicalProfilePageState extends State { }, child: MedicalProfileItem( title: TranslationBase.of(context).askYour, - imagePath: 'medical_history_icon.png', + imagePath: 'ask_doctor_icon.png', subTitle: TranslationBase.of(context) .askYourSubtitle, ), diff --git a/lib/widgets/data_display/medical/medical_profile_item.dart b/lib/widgets/data_display/medical/medical_profile_item.dart index e2baa1e4..be6ffba2 100644 --- a/lib/widgets/data_display/medical/medical_profile_item.dart +++ b/lib/widgets/data_display/medical/medical_profile_item.dart @@ -42,7 +42,8 @@ class MedicalProfileItem extends StatelessWidget { alignment: Alignment.bottomRight, child: Image.asset( "assets/images/medical/$imagePath", - height: SizeConfig.heightMultiplier * 7, + height: SizeConfig.heightMultiplier * 5, + width: SizeConfig.heightMultiplier * 5, ), ) ],