diff --git a/lib/features/authentication/authentication_view_model.dart b/lib/features/authentication/authentication_view_model.dart index e5324525..cb164a0c 100644 --- a/lib/features/authentication/authentication_view_model.dart +++ b/lib/features/authentication/authentication_view_model.dart @@ -303,7 +303,7 @@ class AuthenticationViewModel extends ChangeNotifier { return true; } } else if (selectedCountrySignup == CountryEnum.unitedArabEmirates) { - if (!ValidationUtils.validateUaeNationalId(nationalIdController.text)) { + if (!ValidationUtils.validateUaeNationalId(nationalIdController.text) && cleanedId.length == 15) { _nationalIdError = LocaleKeys.pleaseEnterAValidNationalID.tr(); notifyListeners(); return false; diff --git a/lib/features/my_appointments/appointment_rating_view_model.dart b/lib/features/my_appointments/appointment_rating_view_model.dart index cef25419..7a8a9c43 100644 --- a/lib/features/my_appointments/appointment_rating_view_model.dart +++ b/lib/features/my_appointments/appointment_rating_view_model.dart @@ -44,8 +44,8 @@ class AppointmentRatingViewModel extends ChangeNotifier { ); } - Future getAppointmentDetails(int appointmentID, int projectID, {Function(dynamic)? onSuccess, Function(String)? onError}) async { - final result = await myAppointmentsRepo.getAppointmentDetails(appointmentID, projectID); + Future getAppointmentDetails(int appointmentID, int projectID, int clinicID, {Function(dynamic)? onSuccess, Function(String)? onError}) async { + final result = await myAppointmentsRepo.getAppointmentDetails(appointmentID, projectID, clinicID); result.fold( (failure) async => await errorHandlerService.handleError(failure: failure), diff --git a/lib/features/my_appointments/my_appointments_repo.dart b/lib/features/my_appointments/my_appointments_repo.dart index ef3cd283..313fe56a 100644 --- a/lib/features/my_appointments/my_appointments_repo.dart +++ b/lib/features/my_appointments/my_appointments_repo.dart @@ -72,7 +72,7 @@ abstract class MyAppointmentsRepo { Future>>> getLastRatingAppointment(); - Future>> getAppointmentDetails(int appointmentID, int projectID); + Future>> getAppointmentDetails(int appointmentID, int projectID, int clinicID); Future>> sendAppointmentRate(int rate, int appointmentNo, int projectID, int doctorID, int clinicID, String note); @@ -915,10 +915,11 @@ class MyAppointmentsRepoImp implements MyAppointmentsRepo { } @override - Future>> getAppointmentDetails(int appointmentID, int projectID) async { + Future>> getAppointmentDetails(int appointmentID, int projectID, int clinicID) async { Map mapDevice = { "AppointmentNumber": appointmentID, "ProjectID": projectID, + "ClinicID":clinicID }; try { GenericApiModel? apiResponse; diff --git a/lib/presentation/home/landing_page.dart b/lib/presentation/home/landing_page.dart index ec0b0ba9..f475c022 100644 --- a/lib/presentation/home/landing_page.dart +++ b/lib/presentation/home/landing_page.dart @@ -178,10 +178,12 @@ class _LandingPageState extends State { final lastAppointment = appointmentRatingViewModel.appointmentRatedList.last; final appointmentNo = lastAppointment.appointmentNo; final projectID = lastAppointment.projectID; + final clinicID =lastAppointment.clinicID; if (appointmentNo == null || projectID == null) return; appointmentRatingViewModel.getAppointmentDetails( appointmentNo, projectID, + clinicID!, onSuccess: ((response) { // Only open dialog if details are loaded AND widget is mounted if (!mounted || appointmentRatingViewModel.appointmentDetails == null) return; diff --git a/lib/presentation/my_family/widget/family_cards.dart b/lib/presentation/my_family/widget/family_cards.dart index 362aada0..de8c3d83 100644 --- a/lib/presentation/my_family/widget/family_cards.dart +++ b/lib/presentation/my_family/widget/family_cards.dart @@ -472,15 +472,16 @@ class _FamilyCardsState extends State { // textColor: AppColors.textColor), widget.isShowDetails ? SizedBox(height: 4.h) : SizedBox(), widget.isShowDetails - ? Wrap(direction: Axis.horizontal, spacing: 4.h, runSpacing: 4.h, children: [ + ? Row( children: [ AppCustomChipWidget( icon: AppAssets.file_icon, richText: "${profile.responseId}".toText10(isBold: true), - labelPadding: EdgeInsetsDirectional.only(start: -4.w, end: 6.w), + labelPadding: EdgeInsetsDirectional.only(start: -10.w, end: 5.w), ), + SizedBox(width: 5.h,), AppCustomChipWidget( labelText: "${LocaleKeys.age.tr(context: context)}: ${profile.age ?? "N/A"} ${LocaleKeys.years.tr(context: context)}", - labelPadding: EdgeInsetsDirectional.only(start: 4.w, end: 6.w), + labelPadding: EdgeInsetsDirectional.only(start: 4.w, end: 4.w), ), ]) : SizedBox(),