Bug Fixes

aamir_dev
Faiz Hashmi 1 year ago
parent 1c22486ed3
commit d809cd8871

@ -330,6 +330,7 @@ class BranchDetailPage extends StatelessWidget {
arguments: CreateBranchModel( arguments: CreateBranchModel(
branchId: branchData.id.toString(), branchId: branchData.id.toString(),
branchName: branchData.branchName.toString(), branchName: branchData.branchName.toString(),
isForEdit: false,
), ),
); );
}), }),

@ -1,4 +1,5 @@
import 'dart:async'; import 'dart:async';
import 'dart:developer';
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/models/general_models/generic_resp_model.dart'; import 'package:mc_common_app/models/general_models/generic_resp_model.dart';
import 'package:mc_common_app/utils/navigator.dart'; import 'package:mc_common_app/utils/navigator.dart';
@ -48,13 +49,11 @@ class _CreateServicesPage3State extends State<CreateServicesPage3> {
super.initState(); super.initState();
scheduleMicrotask(() async { scheduleMicrotask(() async {
ServiceVM serviceVM = context.read<ServiceVM>(); ServiceVM serviceVM = context.read<ServiceVM>();
log("widget.branchModel!.categoryId: ${widget.branchModel!.categoryId}");
if (widget.branchModel!.categoryId != null) { if (widget.branchModel!.categoryId != null) {
await serviceVM.fetchServicesByCategoryId(int.parse(widget.branchModel!.categoryId ?? "0")); await serviceVM.fetchServicesByCategoryId(int.parse(widget.branchModel!.categoryId ?? "0"));
category = DropValue(int.parse(widget.branchModel!.categoryId ?? "0"), widget.branchModel!.categoryName ?? "", ""); category = DropValue(int.parse(widget.branchModel!.categoryId ?? "0"), widget.branchModel!.categoryName ?? "", "");
service = serviceVM.servicesDropList.firstWhere((element) => element.id == widget.branchModel!.serviceProviderService!.serviceId); service = serviceVM.servicesDropList.firstWhere((element) => element.id == widget.branchModel!.serviceProviderService!.serviceId);
isAppointmentAvailable = widget.branchModel?.serviceProviderService?.isAllowAppointment ?? false; isAppointmentAvailable = widget.branchModel?.serviceProviderService?.isAllowAppointment ?? false;
serviceRage = widget.branchModel?.serviceProviderService?.customerLocationRange ?? 0; serviceRage = widget.branchModel?.serviceProviderService?.customerLocationRange ?? 0;
if (serviceRage > 0) { if (serviceRage > 0) {
@ -63,6 +62,8 @@ class _CreateServicesPage3State extends State<CreateServicesPage3> {
chargersPerKm = widget.branchModel?.serviceProviderService?.rangePricePerKm ?? ""; chargersPerKm = widget.branchModel?.serviceProviderService?.rangePricePerKm ?? "";
serviceId = widget.branchModel?.serviceProviderService?.serviceProviderServiceId ?? -1; serviceId = widget.branchModel?.serviceProviderService?.serviceProviderServiceId ?? -1;
setState(() {}); setState(() {});
} else {
serviceVM.fetchBranchCategory(EasyLocalization.of(context)?.currentLocale?.countryCode ?? "SA");
} }
}); });
} }
@ -84,17 +85,17 @@ class _CreateServicesPage3State extends State<CreateServicesPage3> {
padding: const EdgeInsets.all(20.0), padding: const EdgeInsets.all(20.0),
child: Column( child: Column(
children: [ children: [
(widget.branchModel!.categoryId != null) (model.state == ViewState.idle)
? DropdownField( ? DropdownField(
isSelectAble: false, isSelectAble: !widget.branchModel!.isForEdit,
(DropValue value) async { (DropValue value) async {
// categoryId = value.id; categoryId = value.id;
// category = value; category = value;
// service = null; service = null;
// serviceId = -1; serviceId = -1;
// isAppointmentAvailable = false; isAppointmentAvailable = false;
// isHomeAppointmentAvailable = false; isHomeAppointmentAvailable = false;
// model.fetchServicesByCategoryId(value.id); model.fetchServicesByCategoryId(value.id);
}, },
dropdownValue: category, dropdownValue: category,
list: model.categoryDropList, list: model.categoryDropList,
@ -106,6 +107,7 @@ class _CreateServicesPage3State extends State<CreateServicesPage3> {
? DropdownField( ? DropdownField(
(DropValue value) { (DropValue value) {
service = value; service = value;
serviceId = value.id;
isAppointmentAvailable = false; isAppointmentAvailable = false;
isHomeAppointmentAvailable = false; isHomeAppointmentAvailable = false;
model.setState(ViewState.idle); model.setState(ViewState.idle);

@ -27,6 +27,7 @@ class CreateBranchModel {
final String? categoryId; final String? categoryId;
final String? categoryName; final String? categoryName;
final ServiceModel? serviceProviderService; final ServiceModel? serviceProviderService;
final bool isForEdit;
CreateBranchModel({ CreateBranchModel({
required this.branchId, required this.branchId,
@ -34,6 +35,7 @@ class CreateBranchModel {
this.categoryId, this.categoryId,
this.categoryName, this.categoryName,
this.serviceProviderService, this.serviceProviderService,
required this.isForEdit,
}); });
} }
@ -131,22 +133,15 @@ class _ServicesListPageState extends State<ServicesListPage> {
height: 16, height: 16,
), ),
).onPress(() { ).onPress(() {
// log("${categoryData.branchId}"); navigateWithName(context, ProviderAppRoutes.createServices3,
// log("${categoryData.branchName}");
// log("${categoryData.id}");
// log("${categoryData.categoryName}");
// log("${services[index].serviceDescription}");
navigateWithName(
context,
ProviderAppRoutes.createServices3,
arguments: CreateBranchModel( arguments: CreateBranchModel(
branchId: categoryData.branchId ?? '', branchId: categoryData.branchId ?? '',
branchName: categoryData.branchName ?? '', branchName: categoryData.branchName ?? '',
categoryId: categoryData.id.toString(), categoryId: categoryData.id.toString(),
categoryName: categoryData.categoryName, categoryName: categoryData.categoryName,
serviceProviderService: services[index], serviceProviderService: services[index],
), isForEdit: true,
); ));
}), }),
], ],
), ),

Loading…
Cancel
Save