addnew service fix

aamir_dev
Faiz Hashmi 1 year ago
parent 0215abbff8
commit e4bfc04541

@ -1,4 +1,5 @@
import 'dart:async'; import 'dart:async';
import 'dart:developer';
import 'package:car_provider_app/views/dashboard/widget/general_appointment_widget.dart'; import 'package:car_provider_app/views/dashboard/widget/general_appointment_widget.dart';
import 'package:car_provider_app/views/branch_management/schedule/widgets/chips_picker_item.dart'; import 'package:car_provider_app/views/branch_management/schedule/widgets/chips_picker_item.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
@ -23,6 +24,7 @@ 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/button/show_fill_button.dart';
import 'package:mc_common_app/widgets/common_widgets/app_bar.dart'; import 'package:mc_common_app/widgets/common_widgets/app_bar.dart';
import 'package:mc_common_app/widgets/dropdown/dropdow_field.dart'; import 'package:mc_common_app/widgets/dropdown/dropdow_field.dart';
import 'package:mc_common_app/widgets/empty_widget.dart';
import 'package:mc_common_app/widgets/extensions/extensions_widget.dart'; import 'package:mc_common_app/widgets/extensions/extensions_widget.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:easy_localization/easy_localization.dart'; import 'package:easy_localization/easy_localization.dart';
@ -43,6 +45,8 @@ class _AddNewServiceAppointmentPageState extends State<AddNewServiceAppointmentP
List<ItemData> selectedList = []; List<ItemData> selectedList = [];
double totalPrice = 0.0;
List<PickerItem>? pickedItems; List<PickerItem>? pickedItems;
ServiceVM? serviceVM; ServiceVM? serviceVM;
@ -56,6 +60,29 @@ class _AddNewServiceAppointmentPageState extends State<AddNewServiceAppointmentP
}); });
} }
openItemsSelectionBottomSheet() async {
return showMyBottomSheet(
context,
child: SelectItemsSheet(
serviceId: service?.id ?? 0,
list: pickedItems,
onSelectItems: (List<ItemData> list) {
selectedList.clear();
selectedList.addAll(list);
pickedItems = [];
totalPrice = 0.0;
for (var element in list) {
totalPrice = totalPrice + double.parse(element.price ?? "0");
pickedItems!.add(
PickerItem(id: element.id ?? 0, title: element.name ?? ""),
);
}
setState(() {});
},
),
);
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
@ -116,23 +143,7 @@ class _AddNewServiceAppointmentPageState extends State<AddNewServiceAppointmentP
service = value; service = value;
pickedItems = null; pickedItems = null;
serviceVm.setState(ViewState.idle); serviceVm.setState(ViewState.idle);
showMyBottomSheet( openItemsSelectionBottomSheet();
context,
child: SelectItemsSheet(
serviceId: service?.id ?? 0,
onSelectItems: (List<ItemData> selectedList) {
this.selectedList.clear();
this.selectedList = selectedList;
pickedItems = [];
for (var element in selectedList) {
pickedItems!.add(
PickerItem(id: element.id ?? 0, title: element.name ?? ""),
);
}
serviceVm.notifyListeners();
},
),
);
}, },
dropdownValue: service, dropdownValue: service,
list: serviceVm.servicesDropList, list: serviceVm.servicesDropList,
@ -141,7 +152,7 @@ class _AddNewServiceAppointmentPageState extends State<AddNewServiceAppointmentP
: category == null : category == null
? Container() ? Container()
: serviceVm.services != null && serviceVm.servicesDropList.isEmpty : serviceVm.services != null && serviceVm.servicesDropList.isEmpty
? Text(LocaleKeys.noServiceFound.tr()) ? EmptyWidget(text: LocaleKeys.noServicesAvailable.tr())
: const CircularProgressIndicator(), : const CircularProgressIndicator(),
12.height, 12.height,
(service != null && pickedItems != null && pickedItems!.isNotEmpty) (service != null && pickedItems != null && pickedItems!.isNotEmpty)
@ -149,26 +160,11 @@ class _AddNewServiceAppointmentPageState extends State<AddNewServiceAppointmentP
hint: LocaleKeys.selectItems.tr(), hint: LocaleKeys.selectItems.tr(),
itemsList: [...pickedItems ?? []], itemsList: [...pickedItems ?? []],
onClick: () { onClick: () {
showMyBottomSheet( openItemsSelectionBottomSheet();
context,
child: SelectItemsSheet(
serviceId: service?.id ?? 0,
list: pickedItems,
onSelectItems: (List<ItemData> selectedList) {
pickedItems = [];
for (var element in selectedList) {
pickedItems!.add(
PickerItem(id: element.id ?? 0, title: element.name ?? ""),
);
}
serviceVm.notifyListeners();
},
),
);
}, },
) )
: service != null : service != null
? Text(LocaleKeys.noItemSelectedYet.tr()) ? EmptyWidget(text: LocaleKeys.noItemSelectedYet.tr())
: const SizedBox(), : const SizedBox(),
if ((service != null && pickedItems != null && pickedItems!.isNotEmpty)) if ((service != null && pickedItems != null && pickedItems!.isNotEmpty))
Column( Column(
@ -183,7 +179,7 @@ class _AddNewServiceAppointmentPageState extends State<AddNewServiceAppointmentP
Row( Row(
crossAxisAlignment: CrossAxisAlignment.end, crossAxisAlignment: CrossAxisAlignment.end,
children: [ children: [
calculatePrice().toString().toText( totalPrice.toString().toText(
fontSize: 29, fontSize: 29,
isBold: true, isBold: true,
), ),
@ -198,6 +194,7 @@ class _AddNewServiceAppointmentPageState extends State<AddNewServiceAppointmentP
.paddingOnly(bottom: 5), .paddingOnly(bottom: 5),
], ],
), ),
10.height,
], ],
), ),
], ],
@ -208,6 +205,7 @@ class _AddNewServiceAppointmentPageState extends State<AddNewServiceAppointmentP
); );
}, },
), ),
55.height,
], ],
), ),
), ),
@ -278,12 +276,4 @@ class _AddNewServiceAppointmentPageState extends State<AddNewServiceAppointmentP
}, },
); );
} }
double calculatePrice() {
double total = 0;
for (var element in selectedList) {
total = total + double.parse(element.price ?? "0");
}
return total;
}
} }

@ -1,3 +1,5 @@
import 'dart:developer';
import 'package:car_provider_app/view_models/items_view_model.dart'; import 'package:car_provider_app/view_models/items_view_model.dart';
import 'package:car_provider_app/views/branch_management/schedule/widgets/chips_picker_item.dart'; import 'package:car_provider_app/views/branch_management/schedule/widgets/chips_picker_item.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -13,11 +15,11 @@ import 'package:provider/provider.dart';
import 'package:easy_localization/easy_localization.dart'; import 'package:easy_localization/easy_localization.dart';
class SelectItemsSheet extends StatelessWidget { class SelectItemsSheet extends StatelessWidget {
int serviceId; final int serviceId;
Function(List<ItemData>) onSelectItems; final Function(List<ItemData>) onSelectItems;
List<PickerItem>? list; final List<PickerItem>? list;
SelectItemsSheet({Key? key, required this.serviceId, required this.onSelectItems, this.list}) : super(key: key); const SelectItemsSheet({super.key, required this.serviceId, required this.onSelectItems, this.list});
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@ -72,10 +74,11 @@ class SelectItemsSheet extends StatelessWidget {
controlAffinity: ListTileControlAffinity.leading, controlAffinity: ListTileControlAffinity.leading,
title: itemsVM.serviceItems!.data![index].name!.toText(fontSize: 16), title: itemsVM.serviceItems!.data![index].name!.toText(fontSize: 16),
subtitle: itemsVM.serviceItems!.data![index].price.toString().toText(fontSize: 14, color: MyColors.lightTextColor), subtitle: itemsVM.serviceItems!.data![index].price.toString().toText(fontSize: 14, color: MyColors.lightTextColor),
value: itemsVM.serviceItems!.data![index].isUpdateOrSelected, value: itemsVM.serviceItems!.data![index].isUpdateOrSelected,
onChanged: (bool? v) { onChanged: (bool? v) {
itemsVM.serviceItems!.data![index].isUpdateOrSelected = v; itemsVM.serviceItems!.data![index].isUpdateOrSelected = v;
log("itemsVM.serviceItems!.data![index].isUpdateOrSelected: ${itemsVM.serviceItems!.data![index].isUpdateOrSelected}");
itemsVM.notifyListeners(); itemsVM.notifyListeners();
}, },
); );
@ -97,9 +100,10 @@ class SelectItemsSheet extends StatelessWidget {
maxWidth: double.infinity, maxWidth: double.infinity,
margin: const EdgeInsets.all(20), margin: const EdgeInsets.all(20),
onPressed: () { onPressed: () {
if (context.read<ItemsVM>().serviceItems != null) { final itemsVM = context.read<ItemsVM>();
if (itemsVM.serviceItems != null) {
List<ItemData> list = []; List<ItemData> list = [];
for (var element in context.read<ItemsVM>().serviceItems!.data!) { for (var element in itemsVM.serviceItems!.data!) {
if (element.isUpdateOrSelected ?? false) { if (element.isUpdateOrSelected ?? false) {
list.add(element); list.add(element);
} }

@ -3,6 +3,7 @@ import 'dart:developer';
import 'package:car_provider_app/views/branch_management/services/duplication/sheet/approved_branches_list_sheet.dart'; import 'package:car_provider_app/views/branch_management/services/duplication/sheet/approved_branches_list_sheet.dart';
import 'package:easy_localization/easy_localization.dart'; import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart'; import 'package:flutter_svg/svg.dart';
import 'package:mc_common_app/classes/consts.dart'; import 'package:mc_common_app/classes/consts.dart';
@ -80,6 +81,96 @@ class _ServicesListPageState extends State<ServicesListPage> {
setState(() {}); setState(() {});
} }
bool isCategoryActive = true;
bool isEditDisabled = false;
Widget buildCategoryTileWidget() {
return Row(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Expanded(
flex: 1,
child: Padding(
padding: const EdgeInsets.only(top: 5),
child: SvgPicture.asset(
MyAssets.maintenanceIcon,
width: 14,
height: 14,
),
),
),
8.width,
Expanded(
flex: 20,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.start,
children: [
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
categoryData.categoryName.toString().toText(fontSize: 16),
],
),
// 5.height,
if (categoryData.services != null) ...[
Container(
child: ("${LocaleKeys.totalNumberOfServices.tr()}: ${categoryData.services!.length}").toText(
fontSize: 12,
color: MyColors.lightTextColor,
),
),
],
Container(
child: ("${LocaleKeys.branchName.tr()}: ${categoryData.branchName}").toText(
fontSize: 12,
color: MyColors.lightTextColor,
),
),
],
),
),
// TODO: NEED TO CONFIRM CATEGORY DEACTIVATION FROM ZAHOOR
const Expanded(
flex: 4,
child: Column(
children: [
// LocaleKeys.active.tr().toText(fontSize: 16),
// 8.width,
// Container(
// width: 50,
// height: 30,
// decoration: BoxDecoration(
// color: isCategoryActive ? MyColors.darkPrimaryColor : MyColors.white,
// borderRadius: BorderRadius.circular(25.0),
// border: Border.all(color: MyColors.lightTextColor, width: 1),
// ),
// child: Transform.scale(
// scale: 0.8,
// child: CupertinoSwitch(
// activeColor: MyColors.darkPrimaryColor,
// trackColor: MyColors.white,
// thumbColor: MyColors.greyACColor,
// value: isCategoryActive,
// onChanged: (value) async {
// if (isEditDisabled) return;
// isCategoryActive = value;
// // isCategoryActive = await updateServiceStatus(context, value);
// setState(() {});
// },
// ),
// ),
// ),
],
),
),
],
).toWhiteContainer(width: double.infinity, allPading: 12);
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
categoryData = ModalRoute.of(context)!.settings.arguments as CategoryData; categoryData = ModalRoute.of(context)!.settings.arguments as CategoryData;
@ -116,6 +207,7 @@ class _ServicesListPageState extends State<ServicesListPage> {
width: double.infinity, width: double.infinity,
child: Column( child: Column(
children: [ children: [
buildCategoryTileWidget().paddingOnly(left: 20, right: 20, top: 10),
20.height, 20.height,
Consumer( Consumer(
builder: (BuildContext context, ServiceVM serviceVM, Widget? child) { builder: (BuildContext context, ServiceVM serviceVM, Widget? child) {
@ -130,36 +222,6 @@ class _ServicesListPageState extends State<ServicesListPage> {
); );
}, },
), ),
// Padding(
// padding: const EdgeInsets.only(left: 20, right: 20, top: 20),
// child: RoleTypeTab(
// selectedTab,
// [
// DropValue(0, 'Active', ''),
// DropValue(1, 'Requested', ''),
// DropValue(2, 'Deactivated', ''),
// ],
// width: (MediaQuery.of(context).size.width / 3) - 26,
// onSelect: (DropValue value) {
// setState(() {
// selectedTab = value.id;
//
// if (selectedTab == 0) {
// selectedService = ServiceStatusEnum.approvedOrActive;
// filteredServices = categoryData.services!.where((i) => i.serviceStatusEnum == ServiceStatusEnum.approvedOrActive).toList();
// } else if (selectedTab == 2) {
// selectedService = ServiceStatusEnum.deactivated;
// filteredServices = categoryData.services!.where((i) => i.serviceStatusEnum == ServiceStatusEnum.deactivated).toList();
// } else {
// selectedService = value.id.toServiceStatusEnum();
// filteredServices =
// categoryData.services!.where((i) => (i.serviceStatusEnum != ServiceStatusEnum.approvedOrActive && i.serviceStatusEnum != ServiceStatusEnum.deactivated)).toList();
// }
// });
// },
// ),
// ),
const SizedBox(height: 10), const SizedBox(height: 10),
Expanded( Expanded(
child: RefreshIndicator( child: RefreshIndicator(

Loading…
Cancel
Save