Branches list & provider profile 1.0

pull/1/head
mirza.shafique 2 years ago
parent 4ccbf361fe
commit 274e407fa9

@ -3,6 +3,7 @@ import 'package:car_customer_app/views/appointments/book_appointment_services_vi
import 'package:car_customer_app/views/appointments/pick_items_view.dart';
import 'package:car_customer_app/views/dashboard/dashboard_page.dart';
import 'package:car_customer_app/views/provider/branch_detail_page.dart';
import 'package:car_customer_app/views/provider/provider_profile_page.dart';
import 'package:flutter/cupertino.dart';
import 'package:mc_common_app/config/routes.dart';
import 'package:mc_common_app/models/advertisment_models/ad_details_model.dart';
@ -22,5 +23,6 @@ class CustomerAppRoutes {
AppRoutes.bookAppointmenServicesView: (context) => BookAppointmentServicesView(),
AppRoutes.paymentMethodsView: (context) => PaymentMethodsView(),
AppRoutes.branchDetailPage: (context) => BranchDetailPage(branchModel: ModalRoute.of(context)!.settings.arguments as BranchModel),
AppRoutes.providerProfilePage: (context) => ProviderProfilePage(providerId: ModalRoute.of(context)!.settings.arguments as int),
};
}

@ -1,6 +1,8 @@
import 'dart:async';
import 'dart:convert';
import 'dart:io';
import 'package:mc_common_app/models/model/provider_model.dart';
import 'package:mc_common_app/models/services/item_model.dart';
import 'package:mc_common_app/models/services/near_branch_model.dart';
import 'package:http/http.dart' as http;
@ -9,16 +11,15 @@ import 'package:mc_common_app/classes/app_state.dart';
import 'package:mc_common_app/classes/consts.dart';
import 'package:mc_common_app/config/dependencies.dart';
import 'package:mc_common_app/models/m_response.dart';
import 'package:mc_common_app/models/model/branch2.dart';
import 'package:mc_common_app/models/profile/branch.dart';
import 'package:mc_common_app/models/profile/categroy.dart';
import 'package:mc_common_app/models/profile/document.dart';
import 'package:mc_common_app/models/profile/services.dart';
import 'package:flutter/cupertino.dart';
abstract class ProviderRepo {
Future<NearBrancheModel> getAllNearBranchAndServices();
Future<ItemModel> getServiceItems(int serviceId);
Future<ProviderModel> getBranchAndServices(int providerId);
}
class ProviderRepoImp implements ProviderRepo {
@ -28,4 +29,23 @@ class ProviderRepoImp implements ProviderRepo {
String t = AppState().getUser.data!.accessToken ?? "";
return await injector.get<ApiClient>().getJsonForObject((json) => NearBrancheModel.fromJson(json), ApiConsts.GetAllNearBranches, token: t);
}
@override
Future<ItemModel> getServiceItems(int serviceId) async {
var queryParameters = {
"ServiceProviderServiceID": serviceId.toString(),
};
String? token = AppState().getUser.data?.accessToken;
debugPrint(token);
return await injector
.get<ApiClient>()
.getJsonForObject((json) => ItemModel.fromJson(json), ApiConsts.getServiceItems, queryParameters: queryParameters, token: AppState().getUser.data!.accessToken ?? "");
}
@override
Future<ProviderModel> getBranchAndServices(int providerId) async {
var postParams = {"serviceProviderID": providerId.toString()};
String t = AppState().getUser.data!.accessToken ?? "";
return await injector.get<ApiClient>().getJsonForObject((json) => ProviderModel.fromJson(json), ApiConsts.BranchesAndServices, queryParameters: postParams, token: t);
}
}

@ -1,7 +1,8 @@
import 'package:mc_common_app/models/model/provider_model.dart';
import 'package:mc_common_app/models/services/item_model.dart';
import 'package:mc_common_app/models/services/near_branch_model.dart';
import 'package:car_customer_app/repositories/provider_repo.dart';
import 'package:flutter/cupertino.dart';
import 'package:mc_common_app/models/model/branch2.dart';
import 'package:mc_common_app/models/widgets_models.dart';
import 'package:mc_common_app/repositories/common_repo.dart';
import 'package:mc_common_app/services/common_services.dart';
@ -17,6 +18,8 @@ class ProvidersVM extends BaseVM {
List<FilterListModel> providersFilterOptions = [];
NearBrancheModel? branches;
ItemModel? serviceItems;
ProviderModel? providerModel;
populateProvidersFilterList() {
providersFilterOptions.clear();
@ -48,4 +51,17 @@ class ProvidersVM extends BaseVM {
branches = await providerRepo.getAllNearBranchAndServices();
setState(ViewState.idle);
}
Future<ItemModel?> getServiceItems(int serviceId) async {
serviceItems = null;
serviceItems = await providerRepo.getServiceItems(serviceId);
setState(ViewState.idle);
return serviceItems;
}
getBranchAndServices(int providerId) async {
providerModel = null;
providerModel = await providerRepo.getBranchAndServices(providerId);
setState(ViewState.idle);
}
}

@ -1,5 +1,7 @@
import 'package:car_customer_app/views/provider/sheet/items_list_sheet.dart';
import 'package:flutter/material.dart';
import 'package:mc_common_app/classes/consts.dart';
import 'package:mc_common_app/config/routes.dart';
import 'package:mc_common_app/extensions/int_extensions.dart';
import 'package:mc_common_app/extensions/string_extensions.dart';
import 'package:mc_common_app/generated/locale_keys.g.dart';
@ -7,6 +9,8 @@ import 'package:mc_common_app/models/services/branch_model.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:mc_common_app/models/services/service_model.dart';
import 'package:mc_common_app/theme/colors.dart';
import 'package:mc_common_app/utils/navigator.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';
@ -21,6 +25,13 @@ class BranchDetailPage extends StatefulWidget {
}
class _BranchDetailPageState extends State<BranchDetailPage> {
@override
void initState() {
// TODO: implement initState
super.initState();
if (widget.branchModel.branchServices!.length > 0) widget.branchModel.branchServices?.first.isExpanded = true;
}
@override
Widget build(BuildContext context) {
return Scaffold(
@ -67,6 +78,7 @@ class _BranchDetailPageState extends State<BranchDetailPage> {
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
//TODO: Needs to implement url launcher
"Open Map Location".toText(
fontSize: 12,
isBold: true,
@ -107,11 +119,13 @@ class _BranchDetailPageState extends State<BranchDetailPage> {
],
)
.padding(
EdgeInsets.symmetric(vertical: 6, horizontal: 2),
)
EdgeInsets.symmetric(vertical: 6, horizontal: 2),
)
.onPress(
() {},
),
() {
navigateWithName(context, AppRoutes.providerProfilePage, arguments: widget.branchModel.serviceProviderId);
},
),
],
),
20.height,
@ -120,6 +134,7 @@ class _BranchDetailPageState extends State<BranchDetailPage> {
color: MyColors.lightTextColor,
isBold: true,
),
if (widget.branchModel.branchServices!.length == 0) "No Services Available".toText(fontSize: 12, isBold: true),
showServicesList(),
],
).toWhiteContainer(
@ -162,7 +177,7 @@ class _BranchDetailPageState extends State<BranchDetailPage> {
showItem("Home service range", widget.branchModel.branchServices![index].customerLocationRange.toString() + "KM"),
showItem("Charges per KM", widget.branchModel.branchServices![index].customerLocationRange.toString() + "SAR"),
8.height,
(widget.branchModel.branchServices![index].itemsCount.toString() + "+ services").toText(
(widget.branchModel.branchServices![index].itemsCount.toString() + "+ items").toText(
fontSize: 12,
isBold: true,
color: MyColors.primaryColor,
@ -170,7 +185,9 @@ class _BranchDetailPageState extends State<BranchDetailPage> {
),
20.height,
],
).onPress(() {}),
).onPress(() {
showMyBottomSheet(context, child: ItemsListSheet(widget.branchModel.branchServices![index].providerBranchServiceId ?? 0));
}),
],
onExpansionChanged: (value) {
setState(() {

@ -0,0 +1,80 @@
import 'package:car_customer_app/view_models/providers_view_model.dart';
import 'package:flutter/material.dart';
import 'package:mc_common_app/classes/consts.dart';
import 'package:mc_common_app/extensions/int_extensions.dart';
import 'package:mc_common_app/extensions/string_extensions.dart';
import 'package:mc_common_app/theme/colors.dart';
import 'package:mc_common_app/widgets/common_widgets/app_bar.dart';
import 'package:mc_common_app/widgets/empty_widget.dart';
import 'package:mc_common_app/widgets/extensions/extensions_widget.dart';
import 'package:provider/provider.dart';
class ProviderProfilePage extends StatefulWidget {
int providerId;
ProviderProfilePage({required this.providerId});
@override
State<ProviderProfilePage> createState() => _ProviderProfilePageState();
}
class _ProviderProfilePageState extends State<ProviderProfilePage> {
@override
void initState() {
super.initState();
context.read<ProvidersVM>().getBranchAndServices(widget.providerId ?? 0);
}
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: CustomAppBar(
title: "Provider Details",
),
body: Container(
width: double.infinity,
height: double.infinity,
padding: EdgeInsets.all(21),
child: Consumer<ProvidersVM>(
builder: (context, model, _) {
return model.providerModel == null
? const Center(child: CircularProgressIndicator())
: model.providerModel!.data == null
? const EmptyWidget()
: Column(
children: [
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
//TODO: company logo/banner not added form provider app yet
Image.asset(MyAssets.bnCar),
12.height,
model.providerModel!.data!.companyName.toString().toText(
fontSize: 16,
isBold: true,
),
Row(
children: [
("Mowater Member Since:").toText(color: MyColors.lightTextColor, fontSize: 12),
4.width,
//TODO: date is missing from API side
"2023".toText(fontSize: 12, isBold: true),
],
),
4.height,
//TODO: company description not added form provider app yet
// model.providerModel!.data!.companyDescription!.toText(color: MyColors.lightTextColor, fontSize: 12),
"Some description about the provider and their years of experience and their reputation".toText(color: MyColors.lightTextColor, fontSize: 12),
],
).toWhiteContainer(
width: double.infinity,
allPading: 12,
),
],
);
},
),
),
);
}
}

@ -0,0 +1,112 @@
import 'package:flutter_svg/flutter_svg.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:mc_common_app/classes/consts.dart';
import 'package:mc_common_app/extensions/int_extensions.dart';
import 'package:mc_common_app/extensions/string_extensions.dart';
import 'package:mc_common_app/theme/colors.dart';
import 'package:mc_common_app/utils/enums.dart';
import 'package:mc_common_app/widgets/empty_widget.dart';
import 'package:mc_common_app/widgets/extensions/extensions_widget.dart';
import 'package:provider/provider.dart';
import '../../../view_models/providers_view_model.dart';
class ItemsListSheet extends StatefulWidget {
int serviceId;
ItemsListSheet(this.serviceId);
@override
State<ItemsListSheet> createState() => _ItemsListSheetState();
}
class _ItemsListSheetState extends State<ItemsListSheet> {
@override
void initState() {
super.initState();
context.read<ProvidersVM>().getServiceItems(widget.serviceId ?? 0);
}
@override
Widget build(BuildContext context) {
return SizedBox(
height: MediaQuery.of(context).size.height / 1.2,
child: Consumer<ProvidersVM>(
builder: (context, model, _) {
return model.serviceItems == null
? const Center(child: CircularProgressIndicator())
: model.serviceItems!.data!.isEmpty
? const EmptyWidget()
: ListView.separated(
itemBuilder: (BuildContext context, int index) {
return SizedBox(
width: double.infinity,
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.start,
children: [
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.start,
children: [
model.serviceItems!.data![index].name.toString().toText(fontSize: 16, isBold: true),
4.height,
showItem("Available for appointment:", (model.serviceItems!.data![index].isAllowAppointment ?? false) ? "Yes" : "No", valueColor: Colors.green),
showItem("Allowing Workshop service:", (model.serviceItems!.data![index].isAppointmentCompanyLoc ?? false) ? "Yes" : "No", valueColor: Colors.green),
showItem("Allowing home service:", (model.serviceItems!.data![index].isAppointmentCustomerLoc ?? false) ? "Yes" : "No", valueColor: Colors.green),
12.height,
"Service Amount".toText(fontSize: 12, color: MyColors.lightTextColor, isBold: true),
Row(
crossAxisAlignment: CrossAxisAlignment.end,
children: [
model.serviceItems!.data![index].price!.toText(fontSize: 22, isBold: true),
2.width,
Padding(
padding: const EdgeInsets.only(bottom: 4),
child: "SAR".toText(fontSize: 12, color: MyColors.lightTextColor, isBold: true),
),
],
),
],
),
),
// Padding(
// padding: const EdgeInsets.all(4.0),
// child: SvgPicture.asset(
// MyAssets.icEdit,
// width: 16,
// height: 16,
// ),
// )
],
),
).toWhiteContainer(
width: double.infinity,
allPading: 12,
);
},
separatorBuilder: (BuildContext context, int index) {
return 12.height;
},
padding: const EdgeInsets.all(20),
itemCount: model.serviceItems!.data!.length,
);
},
),
);
}
Widget showItem(String item, String value, {Color valueColor = Colors.black}) {
return Row(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.start,
children: [
item.toText(fontSize: 12, color: MyColors.lightTextColor, isBold: true),
4.width,
value.toText(fontSize: 12, color: valueColor, isBold: true),
],
);
}
}
Loading…
Cancel
Save