Haroon6138
/
car_customer_app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: Haroon6138:e1a97cc5a75d816fd4ce335ae602b34c641045ad
Branches Tags
Haroon6138:faiz_development
Haroon6138:master
Haroon6138:aamir_dev
Haroon6138:mirza_development
Haroon6138:main
Haroon6138:fatima
...
compare: Haroon6138:bf32a2baf20c228fcea7c16a130d5d338d8a9959
Branches Tags
Haroon6138:faiz_development
Haroon6138:master
Haroon6138:aamir_dev
Haroon6138:mirza_development
Haroon6138:main
Haroon6138:fatima

2 Commits
e1a97cc5a7 ... bf32a2baf2

Author SHA1 Message Date
Faiz Hashmi bf32a2baf2 12 feb,2025 9 months ago
Faiz Hashmi cbffe18384 Check appointmnet filter for provider 9 months ago
4 changed files with 60 additions and 63 deletions
Show Stats

2
lib/views/branches/provider_profile_view.dart
Unescape Escape View File

@ -90,7 +90,7 @@ class _ProviderProfileViewState extends State<ProviderProfileView> {
Row(
children: [
("${LocaleKeys.companyName.tr()}:").toText(color: MyColors.lightTextColor, fontSize: 12),
4.width,
4.width,
(appointmentsVM.providerProfileModel!.companyName ?? appointmentsVM.providerProfileModel!.name).toString().toText(
fontSize: 16,
isBold: true,

2
lib/views/dashboard/dashboard_view.dart
Unescape Escape View File

@ -34,7 +34,7 @@ class _DashboardViewState extends State<DashboardView> {
void initState() {
super.initState();
dashboardVM = context.read<DashboardVmCustomer>();
scheduleMicrotask(() => dashboardVM.onRefresh(context, dashboardRouteEnum: widget.dashboardRouteEnum));
scheduleMicrotask(() async => await dashboardVM.onRefresh(context, dashboardRouteEnum: widget.dashboardRouteEnum));
}
@override

112
lib/views/dashboard/fragments/appointments_fragment.dart
Unescape Escape View File

@ -60,63 +60,65 @@ class AppointmentsFragment extends StatelessWidget {
},
),
16.height,
RefreshIndicator(
onRefresh: () async {
int index = appointmentsVM.appointmentsFilterOptions.indexWhere((element) => element.isSelected);
if (index != -1) {
AppointmentStatusEnum appointmentStatusEnum = appointmentsVM.appointmentsFilterOptions[index].id.toAppointmentStatusEnum();
appointmentsVM.applyFilterOnAppointmentsVMForCustomers(appointmentStatusEnum: appointmentStatusEnum);
}
},
child: appointmentsVM.state == ViewState.busy
? const Center(child: CircularProgressIndicator())
: appointmentsVM.myFilteredAppointmentsForCustomers.isEmpty
? AppState().getIsViewOnly
? LocaleKeys.loginToViewAppointments.tr().toText(fontSize: 16, color: MyColors.lightTextColor)
: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
LocaleKeys.noAppointmentstoShow.tr().toText(fontSize: 16, color: MyColors.lightTextColor),
if (appointmentsVM.appointmentFiltersCounter > 0) ...[
8.height,
InkWell(
onTap: () async {
appointmentsVM.clearAppointmentFilters();
await appointmentsVM.applyFilterOnAppointmentsVMForCustomers(appointmentStatusEnum: AppointmentStatusEnum.allAppointments);
},
child: LocaleKeys.clearFilters.tr().toText(
fontSize: 14,
isBold: true,
color: MyColors.darkPrimaryColor,
),
),
Expanded(
child: RefreshIndicator(
onRefresh: () async {
int index = appointmentsVM.appointmentsFilterOptions.indexWhere((element) => element.isSelected);
if (index != -1) {
AppointmentStatusEnum appointmentStatusEnum = appointmentsVM.appointmentsFilterOptions[index].id.toAppointmentStatusEnum();
appointmentsVM.applyFilterOnAppointmentsVMForCustomers(appointmentStatusEnum: appointmentStatusEnum);
}
},
child: appointmentsVM.state == ViewState.busy
? const Center(child: CircularProgressIndicator())
: appointmentsVM.myFilteredAppointmentsForCustomers.isEmpty
? AppState().getIsViewOnly
? LocaleKeys.loginToViewAppointments.tr().toText(fontSize: 16, color: MyColors.lightTextColor)
: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
LocaleKeys.noAppointmentstoShow.tr().toText(fontSize: 16, color: MyColors.lightTextColor),
if (appointmentsVM.appointmentFiltersCounter > 0) ...[
8.height,
InkWell(
onTap: () async {
appointmentsVM.clearAppointmentFilters();
await appointmentsVM.applyFilterOnAppointmentsVMForCustomers(appointmentStatusEnum: AppointmentStatusEnum.allAppointments);
},
child: LocaleKeys.clearFilters.tr().toText(
fontSize: 14,
isBold: true,
color: MyColors.darkPrimaryColor,
),
),
],
],
],
)
: ListView.separated(
separatorBuilder: (context, index) => 12.height,
shrinkWrap: true,
itemCount: appointmentsVM.myFilteredAppointmentsForCustomers.length,
itemBuilder: (BuildContext context, int index) {
return AppointmentFragmentTileWidget(
onTapped: () {
AppointmentListModel appointmentModel = appointmentsVM.myFilteredAppointmentsForCustomers[index];
appointmentModel.appointmentServicesList!.forEach((service) {
double totalServicePrice = 0.0;
service.serviceItems!.forEach((item) {
totalServicePrice = totalServicePrice + (double.parse("${item.price ?? 0.0}"));
)
: ListView.separated(
separatorBuilder: (context, index) => 12.height,
shrinkWrap: true,
itemCount: appointmentsVM.myFilteredAppointmentsForCustomers.length,
itemBuilder: (BuildContext context, int index) {
return AppointmentFragmentTileWidget(
onTapped: () {
AppointmentListModel appointmentModel = appointmentsVM.myFilteredAppointmentsForCustomers[index];
appointmentModel.appointmentServicesList!.forEach((service) {
double totalServicePrice = 0.0;
service.serviceItems!.forEach((item) {
totalServicePrice = totalServicePrice + (double.parse("${item.price ?? 0.0}"));
});
service.currentTotalServicePrice = totalServicePrice;
});
service.currentTotalServicePrice = totalServicePrice;
});
navigateWithName(context, AppRoutes.appointmentDetailView, arguments: appointmentModel);
},
appointmentListModel: appointmentsVM.myFilteredAppointmentsForCustomers[index],
).margin(left: 21, right: 21);
},
),
).toViewOnly(context, onTap: () {
navigateWithName(context, AppRoutes.loginWithPassword, arguments: false);
}),
navigateWithName(context, AppRoutes.appointmentDetailView, arguments: appointmentModel);
},
appointmentListModel: appointmentsVM.myFilteredAppointmentsForCustomers[index],
).margin(left: 21, right: 21).toViewOnly(context, onTap: () {
navigateWithName(context, AppRoutes.loginWithPassword, arguments: false);
});
},
),
),
)
],
),
),

7
lib/views/dashboard/fragments/home_fragment.dart
Unescape Escape View File

@ -1,15 +1,12 @@
import 'package:car_customer_app/views/dashboard/widgets/drawer_widget.dart';
import 'package:car_customer_app/views/dashboard/widgets/my_recent_branches_widget.dart';
import 'package:car_customer_app/views/dashboard/widgets/my_services_categories_widget.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart';
import 'package:mc_common_app/classes/app_state.dart';
import 'package:mc_common_app/config/routes.dart';
import 'package:mc_common_app/extensions/int_extensions.dart';
import 'package:mc_common_app/generated/locale_keys.g.dart';
import 'package:mc_common_app/utils/enums.dart';
import 'package:mc_common_app/utils/navigator.dart';
import 'package:mc_common_app/utils/utils.dart';
import 'package:mc_common_app/view_models/ad_view_model.dart';
import 'package:mc_common_app/view_models/appointments_view_model.dart';
import 'package:mc_common_app/view_models/dashboard_view_model_customer.dart';
@ -58,9 +55,7 @@ class HomeFragment extends StatelessWidget {
width: double.infinity,
height: double.infinity,
child: RefreshIndicator(
onRefresh: () async {
await context.read<DashboardVmCustomer>().onRefresh(context);
},
onRefresh: () async => await context.read<DashboardVmCustomer>().onRefresh(context),
child: ListView(
children: [
16.height,

Write Preview
Loading…
Cancel
Save