diff --git a/lib/generated/locale_keys.g.dart b/lib/generated/locale_keys.g.dart index b2d2eed1..8685166c 100644 --- a/lib/generated/locale_keys.g.dart +++ b/lib/generated/locale_keys.g.dart @@ -1787,12 +1787,6 @@ abstract class LocaleKeys { static const selectBloodDonationCity = 'selectBloodDonationCity'; static const selectBloodDonationGender = 'selectBloodDonationGender'; static const selectBloodType = 'selectBloodType'; - static const startLiveChat = 'startLiveChat'; - static const followUsOn = 'followUsOn'; - static const followUsOnX = 'followUsOnX'; - static const likeUsOnFB = 'likeUsOnFB'; - static const watchUsOnYoutube = 'watchUsOnYoutube'; - static const connectOnLinkedin = 'connectOnLinkedin'; static const networkErrorTitle = 'networkErrorTitle'; static const networkErrorMessage = 'networkErrorMessage'; static const networkConnectionReset = 'networkConnectionReset'; @@ -1801,5 +1795,11 @@ abstract class LocaleKeys { static const networkErrorWhileFetching = 'networkErrorWhileFetching'; static const networkPleaseCheckInternet = 'networkPleaseCheckInternet'; static const networkServerErrorNoMessage = 'networkServerErrorNoMessage'; + static const startLiveChat = 'startLiveChat'; + static const followUsOn = 'followUsOn'; + static const followUsOnX = 'followUsOnX'; + static const likeUsOnFB = 'likeUsOnFB'; + static const watchUsOnYoutube = 'watchUsOnYoutube'; + static const connectOnLinkedin = 'connectOnLinkedin'; } diff --git a/lib/presentation/appointments/appointment_details_page.dart b/lib/presentation/appointments/appointment_details_page.dart index dfdde83a..5b7edb3e 100644 --- a/lib/presentation/appointments/appointment_details_page.dart +++ b/lib/presentation/appointments/appointment_details_page.dart @@ -262,7 +262,7 @@ class _AppointmentDetailsPageState extends State { Expanded( child: CollapsingListView( title: LocaleKeys.appointmentDetails.tr(context: context), - report: AppointmentType.isArrived(widget.patientAppointmentHistoryResponseModel) + report: AppointmentType.isArrived(widget.patientAppointmentHistoryResponseModel) || widget.patientAppointmentHistoryResponseModel.isLiveCareAppointment! || widget.patientAppointmentHistoryResponseModel.isClinicReBookingAllowed! ==false || widget.patientAppointmentHistoryResponseModel.isActiveDoctor! == false ? () { contactUsViewModel.setSelectedFeedbackType(FeedbackType(id: 1, nameEN: "Complaint for appointment", nameAR: 'شكوى على موعد')); contactUsViewModel.setPatientFeedbackSelectedAppointment(widget.patientAppointmentHistoryResponseModel); diff --git a/lib/presentation/blood_donation/blood_donation_page.dart b/lib/presentation/blood_donation/blood_donation_page.dart index b706d2cd..c9036549 100644 --- a/lib/presentation/blood_donation/blood_donation_page.dart +++ b/lib/presentation/blood_donation/blood_donation_page.dart @@ -125,6 +125,7 @@ class _BloodDonationPageState extends State { backgroundColor: AppColors.bgRedLightColor, borderColor: AppColors.bgRedLightColor, textColor: AppColors.primaryRedColor, + isDisabled: !Utils.havePrivilege(117), padding: EdgeInsetsGeometry.symmetric(vertical: 0.h, horizontal: 20.h)), child: Padding( padding: EdgeInsets.all(24.w),