updates

lib/features/my_appointments/my_appointments_repo.dart

@@ -25,7 +25,7 @@ import 'models/resp_models/appointment_details_resp_model.dart';
 
 abstract class MyAppointmentsRepo {
   Future<Either<Failure, GenericApiModel<List<PatientAppointmentHistoryResponseModel>>>> getPatientAppointments(
-      {required bool isActiveAppointment, required bool isArrivedAppointments, bool isForEyeMeasurement = false});
+      {required bool isActiveAppointment, required bool isArrivedAppointments, bool isForEyeMeasurement = false, bool isForTimeLine = false});
 
   Future<Either<Failure, GenericApiModel<PatientAppointmentShareResponseModel>>> getPatientShareAppointment(
       {required int projectID, required int clinicID, required String appointmentNo, required bool isLiveCareAppointment});
@@ -105,14 +105,15 @@ class MyAppointmentsRepoImp implements MyAppointmentsRepo {
 
   @override
   Future<Either<Failure, GenericApiModel<List<PatientAppointmentHistoryResponseModel>>>> getPatientAppointments(
-      {required bool isActiveAppointment, required bool isArrivedAppointments, bool isForEyeMeasurement = false}) async {
+      {required bool isActiveAppointment, required bool isArrivedAppointments, bool isForEyeMeasurement = false, bool isForTimeLine = false}) async {
     Map<String, dynamic> mapDevice = {
       "IsActiveAppointment": isActiveAppointment,
       "IsComingFromCOC": false,
       "isForUpcomming": false,
       "IsForMedicalReport": false,
       "IsForArrived": isArrivedAppointments,
-      "IsIrisPrescription": isForEyeMeasurement
+      "IsIrisPrescription": isForEyeMeasurement,
+      "IsForTimeLine": isForTimeLine
     };
 
     try {

lib/features/my_appointments/my_appointments_view_model.dart

@@ -55,6 +55,7 @@ class MyAppointmentsViewModel extends ChangeNotifier {
 
   bool isAppointmentDataToBeLoaded = true;
   bool isMyDoctorsDataToBeLoaded = true;
+  bool isArrivedAppointmentDataLoaded = false;
 
   bool isEyeMeasurementsAppointmentsLoading = false;
 
@@ -76,7 +77,7 @@ class MyAppointmentsViewModel extends ChangeNotifier {
   List<PatientAppointmentHistoryResponseModel> patientUpcomingAppointmentsHistoryList = [];
   List<PatientAppointmentHistoryResponseModel> patientArrivedAppointmentsHistoryList = [];
 
-  List<PatientAppointmentHistoryResponseModel> patientTimelineAppointmentsList = [];
+  List<PatientAppointmentHistoryResponseModel> patientAllArrivedAppointmentsHistoryList = [];
 
   List<PatientAppointmentHistoryResponseModel> patientMyDoctorsList = [];
 
@@ -172,7 +173,7 @@ class MyAppointmentsViewModel extends ChangeNotifier {
       patientAppointmentsHistoryList.clear();
       patientUpcomingAppointmentsHistoryList.clear();
       patientArrivedAppointmentsHistoryList.clear();
-      patientTimelineAppointmentsList.clear();
+      patientAllArrivedAppointmentsHistoryList.clear();
       patientEyeMeasurementsAppointmentsHistoryList.clear();
       isMyAppointmentsLoading = true;
       isTimeLineAppointmentsLoading = true;
@@ -266,7 +267,7 @@ class MyAppointmentsViewModel extends ChangeNotifier {
     );
   }
 
-  Future<void> getPatientAppointments(bool isActiveAppointment, bool isArrivedAppointments, {Function(dynamic)? onSuccess, Function(String)? onError}) async {
+  Future<void> getPatientAppointments(bool isActiveAppointment, bool isArrivedAppointments, {bool isForTimeLine = false, Function(dynamic)? onSuccess, Function(String)? onError}) async {
     if (patientArrivedAppointmentsHistoryList.isNotEmpty) {
       isPatientHasQueueAppointment = false;
       notifyListeners();
@@ -277,12 +278,11 @@ class MyAppointmentsViewModel extends ChangeNotifier {
     }
     if (!isAppointmentDataToBeLoaded) return;
 
-
     patientAppointmentsByClinic.clear();
     patientAppointmentsByHospital.clear();
     patientAppointmentsViewList.clear();
 
-    patientTimelineAppointmentsList.clear();
+    patientAllArrivedAppointmentsHistoryList.clear();
     filteredAppointmentList.clear();
     patientAppointmentsHistoryList.clear();
     patientUpcomingAppointmentsHistoryList.clear();
@@ -291,7 +291,7 @@ class MyAppointmentsViewModel extends ChangeNotifier {
 
     final results = await Future.wait([
       myAppointmentsRepo.getPatientAppointments(isActiveAppointment: isActiveAppointment, isArrivedAppointments: isArrivedAppointments),
-      myAppointmentsRepo.getPatientAppointments(isActiveAppointment: false, isArrivedAppointments: true),
+      myAppointmentsRepo.getPatientAppointments(isActiveAppointment: false, isArrivedAppointments: true, isForTimeLine: isForTimeLine),
     ]);
 
     results[0].fold(
@@ -320,6 +320,10 @@ class MyAppointmentsViewModel extends ChangeNotifier {
           patientArrivedAppointmentsHistoryList = apiResponse.data!;
           isMyAppointmentsLoading = false;
           isAppointmentDataToBeLoaded = false;
+          if (!isForTimeLine) {
+            patientAllArrivedAppointmentsHistoryList = apiResponse.data!;
+            isArrivedAppointmentDataLoaded = true;
+          }
           notifyListeners();
           if (onSuccess != null) {
             onSuccess(apiResponse);

lib/presentation/book_appointment/select_doctor_page.dart

@@ -134,8 +134,28 @@ class _SelectDoctorPageState extends State<SelectDoctorPage> {
                                                   isLoading: bookAppointmentsVM.isClinicsListLoading,
                                                   doctorsListResponseModel: bookAppointmentsVM.liveCareDoctorsList[index],
                                                   bookAppointmentsViewModel: bookAppointmentsViewModel,
-                                                ).onPress(() {
+                                                ).onPress(() async {
-                                                  // onLiveCareClinicSelected(bookAppointmentsVM.liveCareClinicsList[index]);
+                                                  bookAppointmentsVM.setSelectedDoctor(bookAppointmentsVM.liveCareDoctorsList[index]);
+                                                  LoaderBottomSheet.showLoader();
+                                                  await bookAppointmentsVM.getDoctorProfile(onSuccess: (dynamic respData) {
+                                                    LoaderBottomSheet.hideLoader();
+                                                    Navigator.of(context).push(
+                                                      CustomPageRoute(
+                                                        page: DoctorProfilePage(
+                                                          isDoctorAllowedToBook: true,
+                                                        ),
+                                                      ),
+                                                    );
+                                                  }, onError: (err) {
+                                                    LoaderBottomSheet.hideLoader();
+                                                    showCommonBottomSheetWithoutHeight(
+                                                      context,
+                                                      child: Utils.getErrorWidget(loadingText: err),
+                                                      callBackFunc: () {},
+                                                      isFullScreen: false,
+                                                      isCloseButtonVisible: true,
+                                                    );
+                                                  });
                                                 }),
                                               ),
                                             ),

lib/presentation/book_appointment/widgets/doctor_card.dart

@@ -167,9 +167,10 @@ class DoctorCard extends StatelessWidget {
                     ],
                   ),
                 ),
-                (doctorsListResponseModel.isLiveCare ?? true)
+                // (doctorsListResponseModel.isLiveCare ?? true)
-                    ? SizedBox.shrink()
+                //     ? SizedBox.shrink()
-                    : Expanded(
+                //     :
+                Expanded(
                         flex: 1,
                         child: Utils.buildSvgWithAssets(icon: AppAssets.doctor_profile_icon, width: 20.h, height: 20.h, fit: BoxFit.scaleDown).toShimmer2(isShow: isLoading),
                       ),

lib/presentation/home/landing_page.dart

@@ -493,8 +493,8 @@ class _LandingPageState extends State<LandingPage> {
                                 ).paddingSymmetrical(24.h, 0.h).onPress(() {
                                   myAppointmentsViewModel.onTabChange(0);
                                   myAppointmentsViewModel.updateListWRTTab(0);
-                                  Navigator.of(context).push(CustomPageRoute(page: MyAppointmentsPage()));
 
+                                  Navigator.of(context).push(CustomPageRoute(page: MyAppointmentsPage()));
                                   // getIt.get<PayTabsViewModel>().setPaymentConfiguration("Appointment Payment", 15.5);
                                   // getIt.get<PayTabsViewModel>().startCardPayment();
                                 }),