From eab65fc617630c3e3eb7fa4feebe9ea8f4f07f8c Mon Sep 17 00:00:00 2001 From: "Mirza.Shafique@cloudsolutions.com.sa" <5093@Shf> Date: Sun, 31 Dec 2023 15:06:23 +0300 Subject: [PATCH] Appointment Implementation 1.2 --- .../appoinments/update_appointment_page.dart | 24 ++++++++++++------- lib/views/dashboard/dashboard_page.dart | 22 ++++++++++------- 2 files changed, 29 insertions(+), 17 deletions(-) diff --git a/lib/views/appoinments/update_appointment_page.dart b/lib/views/appoinments/update_appointment_page.dart index c847c8b..177d94e 100644 --- a/lib/views/appoinments/update_appointment_page.dart +++ b/lib/views/appoinments/update_appointment_page.dart @@ -15,6 +15,7 @@ import 'package:mc_common_app/view_models/appointments_view_model.dart'; import 'package:mc_common_app/widgets/bottom_sheet.dart'; import 'package:mc_common_app/widgets/button/show_fill_button.dart'; import 'package:mc_common_app/widgets/common_widgets/app_bar.dart'; +import 'package:mc_common_app/widgets/extensions/extensions_widget.dart'; import 'package:provider/provider.dart'; import '../dashboard/widget/appointment_slider_widget.dart'; @@ -79,10 +80,10 @@ class UpdateAppointmentPage extends StatelessWidget { Column( children: [ showPayNowButton(context, appointmentsVM), + 21.height, showCancelButton(context, appointmentsVM), ], - ), - + ).paddingAll(21), if (appointmentListModel.appointmentStatusEnum == AppointmentStatusEnum.confirmed && @@ -92,7 +93,7 @@ class UpdateAppointmentPage extends StatelessWidget { children: [ showArrivedutton(context, appointmentsVM), ], - ), + ).paddingAll(21), if (appointmentListModel.appointmentStatusEnum == AppointmentStatusEnum.arrived && @@ -101,9 +102,10 @@ class UpdateAppointmentPage extends StatelessWidget { Column( children: [ showPayNowButton(context, appointmentsVM), + 21.height, showPayLaterButton(context, appointmentsVM), ], - ), + ).paddingAll(21), if ((appointmentListModel.appointmentStatusEnum == AppointmentStatusEnum.arrived || @@ -123,7 +125,7 @@ class UpdateAppointmentPage extends StatelessWidget { children: [ showWorkStartButton(context, appointmentsVM), ], - ), + ).paddingAll(21), if (appointmentListModel.appointmentStatusEnum == AppointmentStatusEnum.workStarted && @@ -132,9 +134,10 @@ class UpdateAppointmentPage extends StatelessWidget { Column( children: [ showPayLaterButton(context, appointmentsVM), + 21.height, showPayNowButton(context, appointmentsVM), ], - ), + ).paddingAll(21), // "Show Pay Now".toText(), if (appointmentListModel.appointmentStatusEnum == @@ -145,14 +148,17 @@ class UpdateAppointmentPage extends StatelessWidget { children: [ showCompleteButton(context, appointmentsVM), ], - ), + ).paddingAll(21), // "Show Complete Button".toText(), - if(appointmentListModel.appointmentStatusEnum==AppointmentStatusEnum.workStarted&&appointmentListModel.appointmentPaymentStatusEnum==AppointmentPaymentStatusEnum.payLater) + if (appointmentListModel.appointmentStatusEnum == + AppointmentStatusEnum.workStarted && + appointmentListModel.appointmentPaymentStatusEnum == + AppointmentPaymentStatusEnum.payLater) showPayNowButton(context, appointmentsVM), if (appointmentListModel.appointmentStatusEnum == AppointmentStatusEnum.visitCompleted) - "Appointment is completed".toText(), + "Appointment is completed".toText().paddingAll(21), // Padding( // padding: const EdgeInsets.all(21.0), diff --git a/lib/views/dashboard/dashboard_page.dart b/lib/views/dashboard/dashboard_page.dart index bd749a7..27d84bc 100644 --- a/lib/views/dashboard/dashboard_page.dart +++ b/lib/views/dashboard/dashboard_page.dart @@ -55,16 +55,22 @@ class _DashboardPageState extends State { Provider.of(context, listen: false); if (appointmentsVM.myAppointments.isEmpty) { await appointmentsVM.getProviderMyAppointments({ - "ServiceProviderID": - injector.get().getUser.data?.userInfo?.providerId.toString() ?? "0" + "ServiceProviderID": injector + .get() + .getUser + .data + ?.userInfo + ?.providerId + .toString() ?? + "0" }); } - // if (adVm.myAds.isEmpty) { - // await adVm.getMyAds(); - // } - // if (adVm.exploreAds.isEmpty) { - // await adVm.getExploreAds(); - // } + if (adVm.myAds.isEmpty) { + await adVm.getMyAds(); + } + if (adVm.exploreAds.isEmpty) { + await adVm.getExploreAds(); + } } @override