haroon_dev
haroon amjad 5 hours ago
parent f08c2f0b0c
commit 6532002cdd

@ -1843,5 +1843,6 @@
"weatherIndicators": "طقس", "weatherIndicators": "طقس",
"submitRating": "إرسال التقييم", "submitRating": "إرسال التقييم",
"maxOneFileAllowed": "يمكن رفع ملف واحد فقط", "maxOneFileAllowed": "يمكن رفع ملف واحد فقط",
"fileSizeExceedsLimit": "يجب ألا يتجاوز حجم الملف 1 ميغابايت" "fileSizeExceedsLimit": "يجب ألا يتجاوز حجم الملف 1 ميغابايت",
"completedPrescriptionOrder": "تمت الخدمة"
} }

@ -1833,7 +1833,8 @@
"weatherIndicators": "Weather", "weatherIndicators": "Weather",
"submitRating": "Submit", "submitRating": "Submit",
"maxOneFileAllowed": "Only 1 file can be uploaded", "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"
} }

@ -1834,6 +1834,8 @@ abstract class LocaleKeys {
static const liveCareNotificationPermissionsMessage = 'liveCareNotificationPermissionsMessage'; static const liveCareNotificationPermissionsMessage = 'liveCareNotificationPermissionsMessage';
static const weatherIndicators = 'weatherIndicators'; static const weatherIndicators = 'weatherIndicators';
static const submitRating = 'submitRating'; static const submitRating = 'submitRating';
static const maxOneFileAllowed = 'maxOneFileAllowed';
static const fileSizeExceedsLimit = 'fileSizeExceedsLimit';
static const completedPrescriptionOrder = 'completedPrescriptionOrder'; static const completedPrescriptionOrder = 'completedPrescriptionOrder';
} }

@ -162,9 +162,11 @@ class AppointmentDoctorCard extends StatelessWidget {
], ],
), ),
), ),
patientAppointmentHistoryResponseModel.isLiveCareAppointment! || (patientAppointmentHistoryResponseModel.isLiveCareAppointment! ||
patientAppointmentHistoryResponseModel.isExecludeDoctor! ||
patientAppointmentHistoryResponseModel.isClinicReBookingAllowed! == false || patientAppointmentHistoryResponseModel.isClinicReBookingAllowed! == false ||
patientAppointmentHistoryResponseModel.isActiveDoctor! == false patientAppointmentHistoryResponseModel.isActiveDoctor! == false ||
!Utils.isClinicAllowedForRebook(patientAppointmentHistoryResponseModel.clinicID))
? SizedBox.shrink() ? SizedBox.shrink()
: Utils.buildSvgWithAssets(icon: AppAssets.doctor_profile_icon, width: 20.h, height: 20.h, fit: BoxFit.scaleDown) : Utils.buildSvgWithAssets(icon: AppAssets.doctor_profile_icon, width: 20.h, height: 20.h, fit: BoxFit.scaleDown)
.onPress(() async { .onPress(() async {

@ -471,27 +471,23 @@ class _FamilyCardsState extends State<FamilyCards> {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
children: [ children: [
CustomChipWidget( AppCustomChipWidget(
height: 30.h, labelText: profile.statusDescription ?? " N/A",
chipType: ChipTypeEnum.alert, backgroundColor: profile.status == FamilyFileEnum.pending.toInt
backgroundColor: profile.status == FamilyFileEnum.pending.toInt ? AppColors.alertLightColor.withValues(alpha: 0.20)
? AppColors.alertLightColor.withValues(alpha: 0.20) : profile.status == FamilyFileEnum.rejected.toInt
: profile.status == FamilyFileEnum.rejected.toInt ? AppColors.primaryRedColor.withValues(alpha: 0.20)
? AppColors.primaryRedColor.withValues(alpha: 0.20) : profile.status == FamilyFileEnum.active.toInt
: profile.status == FamilyFileEnum.active.toInt ? AppColors.lightGreenColor
? AppColors.lightGreenColor : AppColors.lightGrayBGColor,
: AppColors.lightGrayBGColor,
chipText: profile.statusDescription ?? " N/A",
iconAsset: null,
isShowBorder: false,
borderRadius: 8.h,
textColor: profile.status == FamilyFileEnum.pending.toInt textColor: profile.status == FamilyFileEnum.pending.toInt
? AppColors.alertLightColor ? AppColors.alertLightColor
: profile.status == FamilyFileEnum.rejected.toInt : profile.status == FamilyFileEnum.rejected.toInt
? AppColors.primaryRedColor ? AppColors.primaryRedColor
: profile.status == FamilyFileEnum.active.toInt : profile.status == FamilyFileEnum.active.toInt
? AppColors.textGreenColor ? AppColors.textGreenColor
: AppColors.alertColor), : AppColors.alertColor
),
SizedBox(height: 8.h), SizedBox(height: 8.h),
Wrap(alignment: WrapAlignment.start, crossAxisAlignment: WrapCrossAlignment.start, runAlignment: WrapAlignment.start, spacing: 0.h, children: [ Wrap(alignment: WrapAlignment.start, crossAxisAlignment: WrapCrossAlignment.start, runAlignment: WrapAlignment.start, spacing: 0.h, children: [
(profile.patientName ?? "").toText14(isBold: true, isCenter: false, maxlines: 1), (profile.patientName ?? "").toText14(isBold: true, isCenter: false, maxlines: 1),
@ -499,15 +495,9 @@ class _FamilyCardsState extends State<FamilyCards> {
.toText12(isCenter: false, maxLine: 1, isBold: true, color: AppColors.greyTextColor), .toText12(isCenter: false, maxLine: 1, isBold: true, color: AppColors.greyTextColor),
]), ]),
SizedBox(height: 8.h), SizedBox(height: 8.h),
CustomChipWidget( AppCustomChipWidget(
height: 30.h, labelText: "Medical File: ${profile.responseId ?? "N/A"}",
chipType: ChipTypeEnum.alert, ),
backgroundColor: AppColors.lightGrayBGColor,
chipText: "Medical File: ${profile.responseId ?? "N/A"}",
iconAsset: null,
isShowBorder: false,
borderRadius: 8.h,
textColor: AppColors.textColor),
], ],
), ),
), ),
@ -802,13 +792,13 @@ class _FamilyCardsState extends State<FamilyCards> {
], ],
), ),
if (widget.isShowRemoveButton) ...[ if (widget.isShowRemoveButton) ...[
Positioned( isParentUser ? Positioned(
top: 0, top: 0,
right: 0, right: 0,
child: Utils.buildSvgWithAssets(icon: AppAssets.deleteIcon).onPress(() { child: Utils.buildSvgWithAssets(icon: AppAssets.deleteIcon).onPress(() {
if (!isActive) widget.onRemove(profile); if (!isActive) widget.onRemove(profile);
}), }),
), ) : SizedBox(),
], ],
], ],
), ),
@ -845,9 +835,8 @@ class _FamilyCardsState extends State<FamilyCards> {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
children: [ children: [
CustomChipWidget( AppCustomChipWidget(
height: 30.h, labelText: profile.statusDescription ?? "N/A",
chipType: ChipTypeEnum.alert,
backgroundColor: profile.status == FamilyFileEnum.pending.toInt backgroundColor: profile.status == FamilyFileEnum.pending.toInt
? AppColors.alertLightColor.withValues(alpha: 0.20) ? AppColors.alertLightColor.withValues(alpha: 0.20)
: profile.status == FamilyFileEnum.rejected.toInt : profile.status == FamilyFileEnum.rejected.toInt
@ -855,10 +844,6 @@ class _FamilyCardsState extends State<FamilyCards> {
: profile.status == FamilyFileEnum.active.toInt : profile.status == FamilyFileEnum.active.toInt
? AppColors.lightGreenColor ? AppColors.lightGreenColor
: AppColors.lightGrayBGColor, : AppColors.lightGrayBGColor,
chipText: profile.statusDescription ?? "N/A",
iconAsset: null,
isShowBorder: false,
borderRadius: 8.h,
textColor: profile.status == FamilyFileEnum.pending.toInt textColor: profile.status == FamilyFileEnum.pending.toInt
? AppColors.alertLightColor ? AppColors.alertLightColor
: profile.status == FamilyFileEnum.rejected.toInt : profile.status == FamilyFileEnum.rejected.toInt
@ -885,15 +870,8 @@ class _FamilyCardsState extends State<FamilyCards> {
], ],
), ),
SizedBox(height: 8.h), SizedBox(height: 8.h),
CustomChipWidget( AppCustomChipWidget(
height: 30.h, labelText: "${LocaleKeys.medicalFile.tr(context: context)}: ${profile.patientId ?? "N/A"}",
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,
), ),
SizedBox(height: 16.h), SizedBox(height: 16.h),
Row( Row(

Loading…
Cancel
Save