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

Check appointmnet filter for provider

Browse Source
aamir_dev
Faiz Hashmi 10 months ago
parent d581bbd3ab
commit e1a97cc5a7
4 changed files with 73 additions and 69 deletions
Show Stats Download Patch File Download Diff File

1
lib/main.dart
Unescape Escape View File

@ -154,7 +154,6 @@ class MyApp extends StatelessWidget {
), ),
); );
return MaterialApp( return MaterialApp(
navigatorKey: navigatorKey, navigatorKey: navigatorKey,
theme: AppTheme.getTheme(isArabic: EasyLocalization.of(context)?.locale.languageCode == "ar"), theme: AppTheme.getTheme(isArabic: EasyLocalization.of(context)?.locale.languageCode == "ar"),

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

@ -1,3 +1,4 @@
import 'package:mc_common_app/classes/app_state.dart';
import 'package:mc_common_app/classes/consts.dart'; import 'package:mc_common_app/classes/consts.dart';
import 'package:mc_common_app/generated/locale_keys.g.dart'; import 'package:mc_common_app/generated/locale_keys.g.dart';
import 'package:mc_common_app/view_models/appointments_view_model.dart'; import 'package:mc_common_app/view_models/appointments_view_model.dart';
@ -44,7 +45,7 @@ class AppointmentsFragment extends StatelessWidget {
}) })
], ],
).toViewOnly(context, onTap: () { ).toViewOnly(context, onTap: () {
navigateWithName(context, AppRoutes.loginWithPassword); navigateWithName(context, AppRoutes.loginWithPassword, arguments: false);
}), }),
body: SizedBox( body: SizedBox(
width: double.infinity, width: double.infinity,
@ -53,67 +54,68 @@ class AppointmentsFragment extends StatelessWidget {
children: [ children: [
16.height, 16.height,
FiltersList( FiltersList(
filterList: appointmentsVM.appointmentsFilterOptions, filterList: appointmentsVM.appointmentsFilterOptions,
onFilterTapped: (index, selectedFilterId) { onFilterTapped: (index, selectedFilterId) {
appointmentsVM.applyFilterOnAppointmentsVMForCustomers(appointmentStatusEnum: selectedFilterId.toAppointmentStatusEnum()); appointmentsVM.applyFilterOnAppointmentsVMForCustomers(appointmentStatusEnum: selectedFilterId.toAppointmentStatusEnum());
}), },
),
16.height, 16.height,
Expanded( RefreshIndicator(
child: RefreshIndicator( onRefresh: () async {
onRefresh: () async { int index = appointmentsVM.appointmentsFilterOptions.indexWhere((element) => element.isSelected);
int index = appointmentsVM.appointmentsFilterOptions.indexWhere((element) => element.isSelected); if (index != -1) {
if (index != -1) { AppointmentStatusEnum appointmentStatusEnum = appointmentsVM.appointmentsFilterOptions[index].id.toAppointmentStatusEnum();
AppointmentStatusEnum appointmentStatusEnum = appointmentsVM.appointmentsFilterOptions[index].id.toAppointmentStatusEnum(); appointmentsVM.applyFilterOnAppointmentsVMForCustomers(appointmentStatusEnum: appointmentStatusEnum);
appointmentsVM.applyFilterOnAppointmentsVMForCustomers(appointmentStatusEnum: appointmentStatusEnum); }
} },
}, child: appointmentsVM.state == ViewState.busy
child: appointmentsVM.state == ViewState.busy ? const Center(child: CircularProgressIndicator())
? const Center(child: CircularProgressIndicator()) : appointmentsVM.myFilteredAppointmentsForCustomers.isEmpty
: appointmentsVM.myFilteredAppointmentsForCustomers.isEmpty ? AppState().getIsViewOnly
? Column( ? LocaleKeys.loginToViewAppointments.tr().toText(fontSize: 16, color: MyColors.lightTextColor)
mainAxisAlignment: MainAxisAlignment.center, : Column(
children: [ mainAxisAlignment: MainAxisAlignment.center,
LocaleKeys.noAppointmentstoShow.tr().toText(fontSize: 16, color: MyColors.lightTextColor), children: [
if (appointmentsVM.appointmentFiltersCounter > 0) ...[ LocaleKeys.noAppointmentstoShow.tr().toText(fontSize: 16, color: MyColors.lightTextColor),
8.height, if (appointmentsVM.appointmentFiltersCounter > 0) ...[
InkWell( 8.height,
onTap: () async { InkWell(
appointmentsVM.clearAppointmentFilters(); onTap: () async {
await appointmentsVM.applyFilterOnAppointmentsVMForCustomers(appointmentStatusEnum: AppointmentStatusEnum.allAppointments); appointmentsVM.clearAppointmentFilters();
}, await appointmentsVM.applyFilterOnAppointmentsVMForCustomers(appointmentStatusEnum: AppointmentStatusEnum.allAppointments);
child: LocaleKeys.clearFilters.tr().toText( },
fontSize: 14, child: LocaleKeys.clearFilters.tr().toText(
isBold: true, fontSize: 14,
color: MyColors.darkPrimaryColor, isBold: true,
), color: MyColors.darkPrimaryColor,
), ),
),
],
], ],
], )
) : ListView.separated(
: ListView.separated( separatorBuilder: (context, index) => 12.height,
separatorBuilder: (context, index) => 12.height, shrinkWrap: true,
shrinkWrap: true, itemCount: appointmentsVM.myFilteredAppointmentsForCustomers.length,
itemCount: appointmentsVM.myFilteredAppointmentsForCustomers.length, itemBuilder: (BuildContext context, int index) {
itemBuilder: (BuildContext context, int index) { return AppointmentFragmentTileWidget(
return AppointmentFragmentTileWidget( onTapped: () {
onTapped: () { AppointmentListModel appointmentModel = appointmentsVM.myFilteredAppointmentsForCustomers[index];
AppointmentListModel appointmentModel = appointmentsVM.myFilteredAppointmentsForCustomers[index]; appointmentModel.appointmentServicesList!.forEach((service) {
appointmentModel.appointmentServicesList!.forEach((service) { double totalServicePrice = 0.0;
double totalServicePrice = 0.0; service.serviceItems!.forEach((item) {
service.serviceItems!.forEach((item) { totalServicePrice = totalServicePrice + (double.parse("${item.price ?? 0.0}"));
totalServicePrice = totalServicePrice + (double.parse("${item.price ?? 0.0}"));
});
service.currentTotalServicePrice = totalServicePrice;
}); });
navigateWithName(context, AppRoutes.appointmentDetailView, arguments: appointmentModel); service.currentTotalServicePrice = totalServicePrice;
}, });
appointmentListModel: appointmentsVM.myFilteredAppointmentsForCustomers[index], navigateWithName(context, AppRoutes.appointmentDetailView, arguments: appointmentModel);
).margin(left: 21, right: 21); },
}, appointmentListModel: appointmentsVM.myFilteredAppointmentsForCustomers[index],
), ).margin(left: 21, right: 21);
), },
),
).toViewOnly(context, onTap: () { ).toViewOnly(context, onTap: () {
navigateWithName(context, AppRoutes.loginWithPassword); navigateWithName(context, AppRoutes.loginWithPassword, arguments: false);
}), }),
], ],
), ),
@ -128,7 +130,7 @@ class AppointmentsFragment extends StatelessWidget {
color: MyColors.white, color: MyColors.white,
), ),
).toViewOnly(context, onTap: () { ).toViewOnly(context, onTap: () {
navigateWithName(context, AppRoutes.loginWithPassword); navigateWithName(context, AppRoutes.loginWithPassword, arguments: false);
}), }),
); );
}, },

6
lib/views/dashboard/fragments/branches_fragment.dart
Unescape Escape View File

@ -43,8 +43,8 @@ class BranchesFragment extends StatelessWidget {
}), }),
], ],
).toViewOnly(context, onTap: () { ).toViewOnly(context, onTap: () {
navigateWithName(context, AppRoutes.loginWithPassword); navigateWithName(context, AppRoutes.loginWithPassword, arguments: false);
}), }),
body: SizedBox( body: SizedBox(
width: double.infinity, width: double.infinity,
height: double.infinity, height: double.infinity,
@ -89,7 +89,7 @@ class BranchesFragment extends StatelessWidget {
providerRatings: branchDetailModel.branchRateAvg ?? 0.0, providerRatings: branchDetailModel.branchRateAvg ?? 0.0,
services: branchDetailModel.branchServices, services: branchDetailModel.branchServices,
).toViewOnly(context, onTap: () { ).toViewOnly(context, onTap: () {
navigateWithName(context, AppRoutes.loginWithPassword); navigateWithName(context, AppRoutes.loginWithPassword, arguments: false);
}); });
}, },
separatorBuilder: (context, index) => 12.height, separatorBuilder: (context, index) => 12.height,

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

@ -52,7 +52,7 @@ class HomeFragment extends StatelessWidget {
// 10.width, // 10.width,
], ],
).toViewOnly(context, onTap: () { ).toViewOnly(context, onTap: () {
navigateWithName(context, AppRoutes.loginWithPassword); navigateWithName(context, AppRoutes.loginWithPassword, arguments: false);
}), }),
body: SizedBox( body: SizedBox(
width: double.infinity, width: double.infinity,
@ -72,14 +72,17 @@ class HomeFragment extends StatelessWidget {
context.read<AppointmentsVM>().applyFilterOnAppointmentsVMForCustomers(appointmentStatusEnum: AppointmentStatusEnum.allAppointments); context.read<AppointmentsVM>().applyFilterOnAppointmentsVMForCustomers(appointmentStatusEnum: AppointmentStatusEnum.allAppointments);
}, },
).horPaddingMain().toViewOnly(context, onTap: () { ).horPaddingMain().toViewOnly(context, onTap: () {
navigateWithName(context, AppRoutes.loginWithPassword); navigateWithName(context, AppRoutes.loginWithPassword, arguments: false);
}), }),
CommonAppointmentSliderWidget() CommonAppointmentSliderWidget()
.toWhiteContainer( .toWhiteContainer(
width: double.infinity, width: double.infinity,
backgroundColor: Colors.transparent, backgroundColor: Colors.transparent,
) )
.margin(left: 21, right: 21), .margin(left: 21, right: 21)
.toViewOnly(context, onTap: () {
navigateWithName(context, AppRoutes.loginWithPassword, arguments: false);
}),
// SERVICES SECTION // SERVICES SECTION
14.height, 14.height,
@ -96,7 +99,7 @@ class HomeFragment extends StatelessWidget {
subTitle: '', subTitle: '',
onSubtitleTapped: () {}, onSubtitleTapped: () {},
).horPaddingMain().toViewOnly(context, onTap: () { ).horPaddingMain().toViewOnly(context, onTap: () {
navigateWithName(context, AppRoutes.loginWithPassword); navigateWithName(context, AppRoutes.loginWithPassword, arguments: false);
}), }),
MyServicesCategoriesWidget(homeCategories: appointmentVM.branchesCategoriesFilterOptions).horPaddingMain() MyServicesCategoriesWidget(homeCategories: appointmentVM.branchesCategoriesFilterOptions).horPaddingMain()
], ],
@ -168,7 +171,7 @@ class HomeFragment extends StatelessWidget {
context.read<DashboardVmCustomer>().onNavbarTapped(3); context.read<DashboardVmCustomer>().onNavbarTapped(3);
context.read<AdVM>().updateIsExploreAds(false); context.read<AdVM>().updateIsExploreAds(false);
}).horPaddingMain().toViewOnly(context, onTap: () { }).horPaddingMain().toViewOnly(context, onTap: () {
navigateWithName(context, AppRoutes.loginWithPassword); navigateWithName(context, AppRoutes.loginWithPassword, arguments: false);
}), }),
AdsListWidget( AdsListWidget(
shouldShowAdStatus: true, shouldShowAdStatus: true,
@ -177,7 +180,7 @@ class HomeFragment extends StatelessWidget {
scrollPhysics: NeverScrollableScrollPhysics(), scrollPhysics: NeverScrollableScrollPhysics(),
hasMoreData: adVM.isExploreAdsTapped ? adVM.hasMoreDataForExploreAds : adVM.hasMoreDataForMyAds, hasMoreData: adVM.isExploreAdsTapped ? adVM.hasMoreDataForExploreAds : adVM.hasMoreDataForMyAds,
).toViewOnly(context, onTap: () { ).toViewOnly(context, onTap: () {
navigateWithName(context, AppRoutes.loginWithPassword); navigateWithName(context, AppRoutes.loginWithPassword, arguments: false);
}), }),
], ],
) )

Write Preview
Loading…
Cancel
Save