From 6532002cddb2f3617f464611a5b0c736255a330f Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Tue, 28 Apr 2026 19:43:23 +0300 Subject: [PATCH] updates --- assets/langs/ar-SA.json | 3 +- assets/langs/en-US.json | 3 +- lib/generated/locale_keys.g.dart | 2 + .../widgets/appointment_doctor_card.dart | 6 +- .../my_family/widget/family_cards.dart | 68 +++++++------------ 5 files changed, 33 insertions(+), 49 deletions(-) diff --git a/assets/langs/ar-SA.json b/assets/langs/ar-SA.json index b034ed89..923aa59e 100644 --- a/assets/langs/ar-SA.json +++ b/assets/langs/ar-SA.json @@ -1843,5 +1843,6 @@ "weatherIndicators": "طقس", "submitRating": "إرسال التقييم", "maxOneFileAllowed": "يمكن رفع ملف واحد فقط", - "fileSizeExceedsLimit": "يجب ألا يتجاوز حجم الملف 1 ميغابايت" + "fileSizeExceedsLimit": "يجب ألا يتجاوز حجم الملف 1 ميغابايت", + "completedPrescriptionOrder": "تمت الخدمة" } diff --git a/assets/langs/en-US.json b/assets/langs/en-US.json index ece2f0d9..5056b297 100644 --- a/assets/langs/en-US.json +++ b/assets/langs/en-US.json @@ -1833,7 +1833,8 @@ "weatherIndicators": "Weather", "submitRating": "Submit", "maxOneFileAllowed": "Only 1 file can be uploaded", - "fileSizeExceedsLimit": "File size must not exceed 1 MB" + "fileSizeExceedsLimit": "File size must not exceed 1 MB", + "completedPrescriptionOrder": "Completed" } diff --git a/lib/generated/locale_keys.g.dart b/lib/generated/locale_keys.g.dart index 5ef765b6..30fe1132 100644 --- a/lib/generated/locale_keys.g.dart +++ b/lib/generated/locale_keys.g.dart @@ -1834,6 +1834,8 @@ abstract class LocaleKeys { static const liveCareNotificationPermissionsMessage = 'liveCareNotificationPermissionsMessage'; static const weatherIndicators = 'weatherIndicators'; static const submitRating = 'submitRating'; + static const maxOneFileAllowed = 'maxOneFileAllowed'; + static const fileSizeExceedsLimit = 'fileSizeExceedsLimit'; static const completedPrescriptionOrder = 'completedPrescriptionOrder'; } diff --git a/lib/presentation/appointments/widgets/appointment_doctor_card.dart b/lib/presentation/appointments/widgets/appointment_doctor_card.dart index 951583d6..ac346d10 100644 --- a/lib/presentation/appointments/widgets/appointment_doctor_card.dart +++ b/lib/presentation/appointments/widgets/appointment_doctor_card.dart @@ -162,9 +162,11 @@ class AppointmentDoctorCard extends StatelessWidget { ], ), ), - patientAppointmentHistoryResponseModel.isLiveCareAppointment! || + (patientAppointmentHistoryResponseModel.isLiveCareAppointment! || + patientAppointmentHistoryResponseModel.isExecludeDoctor! || patientAppointmentHistoryResponseModel.isClinicReBookingAllowed! == false || - patientAppointmentHistoryResponseModel.isActiveDoctor! == false + patientAppointmentHistoryResponseModel.isActiveDoctor! == false || + !Utils.isClinicAllowedForRebook(patientAppointmentHistoryResponseModel.clinicID)) ? SizedBox.shrink() : Utils.buildSvgWithAssets(icon: AppAssets.doctor_profile_icon, width: 20.h, height: 20.h, fit: BoxFit.scaleDown) .onPress(() async { diff --git a/lib/presentation/my_family/widget/family_cards.dart b/lib/presentation/my_family/widget/family_cards.dart index b648a23a..d263ae55 100644 --- a/lib/presentation/my_family/widget/family_cards.dart +++ b/lib/presentation/my_family/widget/family_cards.dart @@ -471,27 +471,23 @@ class _FamilyCardsState extends State { crossAxisAlignment: CrossAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start, children: [ - CustomChipWidget( - height: 30.h, - chipType: ChipTypeEnum.alert, - backgroundColor: profile.status == FamilyFileEnum.pending.toInt - ? AppColors.alertLightColor.withValues(alpha: 0.20) - : profile.status == FamilyFileEnum.rejected.toInt - ? AppColors.primaryRedColor.withValues(alpha: 0.20) - : profile.status == FamilyFileEnum.active.toInt - ? AppColors.lightGreenColor - : AppColors.lightGrayBGColor, - chipText: profile.statusDescription ?? " N/A", - iconAsset: null, - isShowBorder: false, - borderRadius: 8.h, + AppCustomChipWidget( + labelText: profile.statusDescription ?? " N/A", + backgroundColor: profile.status == FamilyFileEnum.pending.toInt + ? AppColors.alertLightColor.withValues(alpha: 0.20) + : profile.status == FamilyFileEnum.rejected.toInt + ? AppColors.primaryRedColor.withValues(alpha: 0.20) + : profile.status == FamilyFileEnum.active.toInt + ? AppColors.lightGreenColor + : AppColors.lightGrayBGColor, textColor: profile.status == FamilyFileEnum.pending.toInt ? AppColors.alertLightColor : profile.status == FamilyFileEnum.rejected.toInt - ? AppColors.primaryRedColor - : profile.status == FamilyFileEnum.active.toInt - ? AppColors.textGreenColor - : AppColors.alertColor), + ? AppColors.primaryRedColor + : profile.status == FamilyFileEnum.active.toInt + ? AppColors.textGreenColor + : AppColors.alertColor + ), SizedBox(height: 8.h), Wrap(alignment: WrapAlignment.start, crossAxisAlignment: WrapCrossAlignment.start, runAlignment: WrapAlignment.start, spacing: 0.h, children: [ (profile.patientName ?? "").toText14(isBold: true, isCenter: false, maxlines: 1), @@ -499,15 +495,9 @@ class _FamilyCardsState extends State { .toText12(isCenter: false, maxLine: 1, isBold: true, color: AppColors.greyTextColor), ]), SizedBox(height: 8.h), - CustomChipWidget( - height: 30.h, - chipType: ChipTypeEnum.alert, - backgroundColor: AppColors.lightGrayBGColor, - chipText: "Medical File: ${profile.responseId ?? "N/A"}", - iconAsset: null, - isShowBorder: false, - borderRadius: 8.h, - textColor: AppColors.textColor), + AppCustomChipWidget( + labelText: "Medical File: ${profile.responseId ?? "N/A"}", + ), ], ), ), @@ -802,13 +792,13 @@ class _FamilyCardsState extends State { ], ), if (widget.isShowRemoveButton) ...[ - Positioned( + isParentUser ? Positioned( top: 0, right: 0, child: Utils.buildSvgWithAssets(icon: AppAssets.deleteIcon).onPress(() { if (!isActive) widget.onRemove(profile); }), - ), + ) : SizedBox(), ], ], ), @@ -845,9 +835,8 @@ class _FamilyCardsState extends State { crossAxisAlignment: CrossAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start, children: [ - CustomChipWidget( - height: 30.h, - chipType: ChipTypeEnum.alert, + AppCustomChipWidget( + labelText: profile.statusDescription ?? "N/A", backgroundColor: profile.status == FamilyFileEnum.pending.toInt ? AppColors.alertLightColor.withValues(alpha: 0.20) : profile.status == FamilyFileEnum.rejected.toInt @@ -855,10 +844,6 @@ class _FamilyCardsState extends State { : profile.status == FamilyFileEnum.active.toInt ? AppColors.lightGreenColor : AppColors.lightGrayBGColor, - chipText: profile.statusDescription ?? "N/A", - iconAsset: null, - isShowBorder: false, - borderRadius: 8.h, textColor: profile.status == FamilyFileEnum.pending.toInt ? AppColors.alertLightColor : profile.status == FamilyFileEnum.rejected.toInt @@ -885,15 +870,8 @@ class _FamilyCardsState extends State { ], ), SizedBox(height: 8.h), - CustomChipWidget( - height: 30.h, - chipType: ChipTypeEnum.alert, - backgroundColor: AppColors.lightGrayBGColor, - chipText: "${LocaleKeys.medicalFile.tr(context: context)}: ${profile.patientId ?? "N/A"}", - iconAsset: null, - isShowBorder: false, - borderRadius: 8.h, - textColor: AppColors.textColor, + AppCustomChipWidget( + labelText: "${LocaleKeys.medicalFile.tr(context: context)}: ${profile.patientId ?? "N/A"}", ), SizedBox(height: 16.h), Row(