usite-sas-bic/prosappco
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

servicio

Browse Source
This commit is contained in:
Felipe
2024-04-09 21:28:16 -05:00
parent 60547febb6
commit ef06730840
12 changed files with 1440 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/components/general_secondary_button.dart
+38
View File
@@ -0,0 +1,38 @@
import 'package:flutter/material.dart';
class GeneralSecondaryButton extends StatelessWidget {
final String label;
final VoidCallback onPressed;
final Color? color;
const GeneralSecondaryButton({
super.key,
required this.label,
required this.onPressed,
this.color,
});
@override
Widget build(BuildContext context) {
return ElevatedButton(
onPressed: onPressed,
style: FilledButton.styleFrom(
backgroundColor: color ?? Theme.of(context).colorScheme.primary,
padding: const EdgeInsets.symmetric(vertical: 15),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(10),
),
),
child: Container(
alignment: Alignment.center,
child: Text(
label,
style: const TextStyle(
color: Colors.white,
fontSize: 18,
),
),
),
);
}
}
lib/screens/lists/professional_service_history_list_screen.dart
+6 -10
View File
@@ -6,6 +6,7 @@ import 'package:injector/injector.dart';
import 'package:intl/intl.dart'; import 'package:intl/intl.dart';
import 'package:professional_repository/professional_repository.dart'; import 'package:professional_repository/professional_repository.dart';
import 'package:prosappco/blocs/service_bloc/service_bloc.dart'; import 'package:prosappco/blocs/service_bloc/service_bloc.dart';
import 'package:prosappco/screens/service/professional_service_screen.dart';
import 'package:prosappco/screens/service/service_screen.dart'; import 'package:prosappco/screens/service/service_screen.dart';
import 'package:service_repository/service_repository.dart'; import 'package:service_repository/service_repository.dart';
import 'package:shimmer/shimmer.dart'; import 'package:shimmer/shimmer.dart';
@@ -52,7 +53,6 @@ class _ProfessionalServiceHistoryListScreenState
itemBuilder: (_, index) { itemBuilder: (_, index) {
final serviceInfo = serviceState.services[index]; final serviceInfo = serviceState.services[index];
final user = serviceInfo.user; final user = serviceInfo.user;
final professional = serviceInfo.professional;
final service = serviceInfo.service; final service = serviceInfo.service;
return Container( return Container(
@@ -68,7 +68,9 @@ class _ProfessionalServiceHistoryListScreenState
context, context,
CupertinoPageRoute( CupertinoPageRoute(
builder: (context) => builder: (context) =>
const ServiceScreen(), ProfessionalServiceScreen(
serviceId: service.id!,
),
), ),
); );
}, },
@@ -178,8 +180,8 @@ class _ProfessionalServiceHistoryListScreenState
if (service.status == ServiceStatus.completed) { if (service.status == ServiceStatus.completed) {
return itemStatus(Colors.blueAccent, 'Completado'); return itemStatus(Colors.blueAccent, 'Completado');
} }
if (service.status == ServiceStatus.cancelled) { if (service.status == ServiceStatus.denied) {
return itemStatus(Colors.red, 'Cancelado'); return itemStatus(Colors.red, 'Rechazado');
} }
return itemStatus(Colors.red, 'Cancelado'); return itemStatus(Colors.red, 'Cancelado');
@@ -205,9 +207,3 @@ class _ProfessionalServiceHistoryListScreenState
); );
} }
} }
// pending - 0
// acepted - 1
// active - 2
// cancelled - 3
// completed - 4
lib/screens/lists/professional_service_list_screen.dart
+12 -6
View File
@@ -6,6 +6,7 @@ import 'package:injector/injector.dart';
import 'package:intl/intl.dart'; import 'package:intl/intl.dart';
import 'package:professional_repository/professional_repository.dart'; import 'package:professional_repository/professional_repository.dart';
import 'package:prosappco/blocs/service_bloc/service_bloc.dart'; import 'package:prosappco/blocs/service_bloc/service_bloc.dart';
import 'package:prosappco/screens/service/professional_service_screen.dart';
import 'package:prosappco/screens/service/service_screen.dart'; import 'package:prosappco/screens/service/service_screen.dart';
import 'package:service_repository/service_repository.dart'; import 'package:service_repository/service_repository.dart';
import 'package:shimmer/shimmer.dart'; import 'package:shimmer/shimmer.dart';
@@ -38,7 +39,7 @@ class _ProfessionalServiceListScreenState
create: (context) => serviceBloc, create: (context) => serviceBloc,
child: Scaffold( child: Scaffold(
appBar: AppBar( appBar: AppBar(
title: const Text('Mis Servicios'), title: const Text('Mis servicios'),
), ),
body: BlocBuilder<ServiceBloc, ServiceState>( body: BlocBuilder<ServiceBloc, ServiceState>(
builder: (context, serviceState) { builder: (context, serviceState) {
@@ -66,7 +67,10 @@ class _ProfessionalServiceListScreenState
Navigator.push( Navigator.push(
context, context,
CupertinoPageRoute( CupertinoPageRoute(
builder: (context) => const ServiceScreen(), builder: (context) =>
ProfessionalServiceScreen(
serviceId: service.id!,
),
), ),
); );
}, },
@@ -127,10 +131,12 @@ class _ProfessionalServiceListScreenState
customStatus(service), customStatus(service),
], ],
), ),
Text( service.description.isEmpty
'"${service.description.trim()}"', ? Container()
overflow: TextOverflow.ellipsis, : Text(
), '"${service.description.trim()}"',
overflow: TextOverflow.ellipsis,
),
], ],
), ),
), ),
lib/screens/lists/user_service_history_list_screen.dart
+4 -1
View File
@@ -7,6 +7,7 @@ import 'package:intl/intl.dart';
import 'package:professional_repository/professional_repository.dart'; import 'package:professional_repository/professional_repository.dart';
import 'package:prosappco/blocs/service_bloc/service_bloc.dart'; import 'package:prosappco/blocs/service_bloc/service_bloc.dart';
import 'package:prosappco/screens/service/service_screen.dart'; import 'package:prosappco/screens/service/service_screen.dart';
import 'package:prosappco/screens/service/user_service_screen.dart';
import 'package:service_repository/service_repository.dart'; import 'package:service_repository/service_repository.dart';
import 'package:shimmer/shimmer.dart'; import 'package:shimmer/shimmer.dart';
@@ -67,7 +68,9 @@ class _UserServiceHistoryListScreenState
Navigator.push( Navigator.push(
context, context,
CupertinoPageRoute( CupertinoPageRoute(
builder: (context) => const ServiceScreen(), builder: (context) => UserServiceScreen(
serviceId: service.id!,
),
), ),
); );
}, },
lib/screens/lists/user_service_list_screen.dart
+4 -1
View File
@@ -7,6 +7,7 @@ import 'package:intl/intl.dart';
import 'package:professional_repository/professional_repository.dart'; import 'package:professional_repository/professional_repository.dart';
import 'package:prosappco/blocs/service_bloc/service_bloc.dart'; import 'package:prosappco/blocs/service_bloc/service_bloc.dart';
import 'package:prosappco/screens/service/service_screen.dart'; import 'package:prosappco/screens/service/service_screen.dart';
import 'package:prosappco/screens/service/user_service_screen.dart';
import 'package:service_repository/service_repository.dart'; import 'package:service_repository/service_repository.dart';
import 'package:shimmer/shimmer.dart'; import 'package:shimmer/shimmer.dart';
@@ -65,7 +66,9 @@ class _UserServiceListScreenState extends State<UserServiceListScreen> {
Navigator.push( Navigator.push(
context, context,
CupertinoPageRoute( CupertinoPageRoute(
builder: (context) => const ServiceScreen(), builder: (context) => UserServiceScreen(
serviceId: service.id!,
),
), ),
); );
}, },
lib/screens/service/professional_service_screen.dart
+495
View File
@@ -0,0 +1,495 @@
import 'package:firebase_auth/firebase_auth.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:injector/injector.dart';
import 'package:intl/intl.dart';
import 'package:professional_repository/professional_repository.dart';
import 'package:prosappco/blocs/service_bloc/service_bloc.dart';
import 'package:prosappco/components/general_secondary_button.dart';
import 'package:service_repository/service_repository.dart';
import 'package:setting_repository/setting_repository.dart';
import 'package:user_repository/user_repository.dart';
class ProfessionalServiceScreen extends StatefulWidget {
final String serviceId;
const ProfessionalServiceScreen({super.key, required this.serviceId});
@override
State<ProfessionalServiceScreen> createState() =>
_ProfessionalServiceScreenState();
}
class _ProfessionalServiceScreenState extends State<ProfessionalServiceScreen> {
final settingRepository = Injector.appInstance.get<SettingRepository>();
SettingEntity? settings;
@override
void initState() {
super.initState();
_loadSettings();
}
void _loadSettings() {
settingRepository.getSettings().then(
(value) => setState(() {
settings = value;
}),
);
}
@override
Widget build(BuildContext context) {
return BlocProvider<ServiceBloc>(
create: (context) => Injector.appInstance.get<ServiceBloc>(),
child: Scaffold(
appBar: AppBar(
title: const Text('Servicio'),
),
body: BlocBuilder<ServiceBloc, ServiceState>(
builder: (context, state) {
if (state is ServiceLoaded) {
final service = state.service;
return FutureBuilder(
future: _getUserAndProfessionalInfo(service),
builder: (BuildContext context,
AsyncSnapshot<List<dynamic>> snapshot) {
if (snapshot.connectionState == ConnectionState.waiting) {
return const Center(child: CircularProgressIndicator());
} else {
if (snapshot.hasError) {
return Center(
child: Text('Error inesperado: ${snapshot.error}'),
);
} else {
final userInfo = snapshot.data![0] as MyUser;
return Column(
children: [
Expanded(
child: SingleChildScrollView(
child: Column(
children: [
ListTile(
leading: Container(
width: 60,
height: 60,
decoration: BoxDecoration(
color: Colors.grey.shade300,
shape: BoxShape.circle,
image: userInfo.picture == null
? null
: DecorationImage(
image: NetworkImage(
userInfo.picture!,
),
fit: BoxFit.contain,
),
),
child: userInfo.picture == null
? Icon(
CupertinoIcons.person,
color: Colors.grey.shade400,
size: 40,
)
: null,
),
title: Row(
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
Text(
'${userInfo.name}',
style: const TextStyle(
fontWeight: FontWeight.bold),
),
const SizedBox(width: 5),
Text(
'${DateFormat('dd MMMM', 'es').format(DateTime.parse(service.day))} - ${ScheduleEntity.getFormatTime(service.range1Hour1)}',
style: TextStyle(
color: Colors.grey[600],
),
),
],
),
subtitle: const Text('Rating: 5.0'),
),
Container(
margin: const EdgeInsets.only(
left: 40,
right: 40,
top: 20,
bottom: 20,
),
padding: const EdgeInsets.symmetric(
horizontal: 20,
vertical: 15,
),
decoration: BoxDecoration(
color: const Color(0xFFD6F4FF),
borderRadius: BorderRadius.circular(20),
boxShadow: [
BoxShadow(
color: Colors.grey.withOpacity(0.5),
spreadRadius: 1,
blurRadius: 5,
offset: const Offset(1, 3),
),
],
),
child: Row(
children: [
const Icon(
Icons.error_outline,
size: 27,
color: Colors.black54,
),
const SizedBox(width: 15),
service.location ==
ServiceLocationPreferences
.delivery
? const Text(
'Servicio a domicilio.',
style: TextStyle(
color: Colors.black,
fontSize: 14,
),
)
: const Text(
'Servicio en tu consultorio',
style: TextStyle(
color: Colors.black,
fontSize: 14,
),
),
],
),
),
ListTile(
leading: const Icon(Icons.near_me),
title: Text(
service.address,
style: TextStyle(
fontSize: 15,
color: Colors.grey[600],
),
),
subtitle: service.aditionalAddress.isEmpty
? null
: Text(
service.aditionalAddress,
style: TextStyle(
fontSize: 15,
color: Colors.grey[600],
),
),
),
service.description.isEmpty
? const SizedBox()
: Container(
alignment: Alignment.center,
width: MediaQuery.of(context)
.size
.width *
0.8,
child: Text(
'"${service.description.trim()}"',
style: TextStyle(
color: Colors.grey[600],
fontStyle: FontStyle.italic,
),
),
),
const SizedBox(height: 65),
customMessageStatus(service),
const SizedBox(height: 20),
],
),
),
),
const Divider(
height: 1,
thickness: 0.5,
),
Padding(
padding: const EdgeInsets.symmetric(
vertical: 10,
horizontal: 15,
),
child: customButton(service, context),
),
],
);
}
}
},
);
} else {
BlocProvider.of<ServiceBloc>(context)
.add(LoadService(widget.serviceId));
return const Center(child: CircularProgressIndicator());
}
},
),
),
);
}
Widget customMessageStatus(ServiceEntity service) {
if (service.status == ServiceStatus.acepted) {
return Stack(
alignment: AlignmentDirectional.topCenter,
clipBehavior: Clip.none,
children: [
Card(
color: Colors.green.shade50,
child: const Padding(
padding: EdgeInsets.fromLTRB(32, 56, 32, 32),
child: Text(
'Aceptado',
style: TextStyle(fontSize: 32, color: Colors.green),
),
),
),
Positioned(
top: -40,
child: Container(
padding: const EdgeInsets.all(16),
decoration: BoxDecoration(
color: Colors.white,
border: Border.all(color: Colors.green.shade50, width: 4),
shape: BoxShape.circle,
),
child: const Icon(Icons.check, color: Colors.green, size: 48),
),
)
],
);
}
if (service.status == ServiceStatus.cancelled) {
return Stack(
alignment: AlignmentDirectional.topCenter,
clipBehavior: Clip.none,
children: [
Card(
color: Colors.red.shade100,
child: const Padding(
padding: EdgeInsets.fromLTRB(32, 56, 32, 32),
child: Text(
'Cancelado',
style: TextStyle(fontSize: 32, color: Colors.red),
),
),
),
Positioned(
top: -40,
child: Container(
padding: const EdgeInsets.all(16),
decoration: BoxDecoration(
color: Colors.white,
border: Border.all(color: Colors.red.shade100, width: 4),
shape: BoxShape.circle,
),
child:
const Icon(Icons.close_rounded, color: Colors.red, size: 48),
),
)
],
);
}
if (service.status == ServiceStatus.denied) {
return Stack(
alignment: AlignmentDirectional.topCenter,
clipBehavior: Clip.none,
children: [
Card(
color: Colors.red.shade100,
child: const Padding(
padding: EdgeInsets.fromLTRB(32, 56, 32, 32),
child: Text(
'Rechazado',
style: TextStyle(fontSize: 32, color: Colors.red),
),
),
),
Positioned(
top: -40,
child: Container(
padding: const EdgeInsets.all(16),
decoration: BoxDecoration(
color: Colors.white,
border: Border.all(color: Colors.red.shade100, width: 4),
shape: BoxShape.circle,
),
child:
const Icon(Icons.close_rounded, color: Colors.red, size: 48),
),
)
],
);
}
if (service.status == ServiceStatus.active) {
return Stack(
alignment: AlignmentDirectional.topCenter,
clipBehavior: Clip.none,
children: [
Card(
color: Colors.green.shade50,
child: const Padding(
padding: EdgeInsets.fromLTRB(32, 56, 32, 32),
child: Text(
'En proceso...',
style: TextStyle(fontSize: 32, color: Colors.green),
),
),
),
Positioned(
top: -40,
child: Container(
padding: const EdgeInsets.all(16),
decoration: BoxDecoration(
color: Colors.white,
border: Border.all(color: Colors.green.shade50, width: 4),
shape: BoxShape.circle,
),
child: const Icon(
Icons.access_time_rounded,
color: Colors.green,
size: 48,
),
),
)
],
);
}
if (service.status == ServiceStatus.completed) {
return Stack(
alignment: AlignmentDirectional.topCenter,
clipBehavior: Clip.none,
children: [
Card(
color: Colors.green.shade50,
child: const Padding(
padding: EdgeInsets.fromLTRB(32, 56, 32, 32),
child: Text(
'Completado',
style: TextStyle(fontSize: 32, color: Colors.green),
),
),
),
Positioned(
top: -40,
child: Container(
padding: const EdgeInsets.all(16),
decoration: BoxDecoration(
color: Colors.white,
border: Border.all(color: Colors.green.shade50, width: 4),
shape: BoxShape.circle,
),
child: const Icon(
Icons.star,
color: Colors.green,
size: 48,
),
),
)
],
);
}
return const SizedBox();
}
Widget customButton(ServiceEntity service, BuildContext context) {
if (service.status == ServiceStatus.pending) {
return Column(
children: [
GeneralSecondaryButton(
label: 'Rechazar servicio',
color: Theme.of(context).colorScheme.error,
onPressed: () {
final currentState = context.read<ServiceBloc>().state;
if (currentState is ServiceLoaded) {
context.read<ServiceBloc>().add(UpdateServiceStatus(
widget.serviceId, ServiceStatus.denied));
}
},
),
const SizedBox(height: 10),
GeneralSecondaryButton(
label: 'Aceptar servicio',
onPressed: () {
final currentState = context.read<ServiceBloc>().state;
if (currentState is ServiceLoaded) {
context.read<ServiceBloc>().add(UpdateServiceStatus(
widget.serviceId, ServiceStatus.acepted));
}
},
),
],
);
}
if (service.status == ServiceStatus.acepted) {
return GeneralSecondaryButton(
label: 'Iniciar servicio',
onPressed: () {
final currentState = context.read<ServiceBloc>().state;
if (currentState is ServiceLoaded) {
context.read<ServiceBloc>().add(
UpdateServiceStatus(widget.serviceId, ServiceStatus.active));
}
},
);
// customStatusButton(
// label: 'Iniciar servicio',
// onPressed: () {
// final currentState = context.read<ServiceBloc>().state;
// if (currentState is ServiceLoaded) {
// context.read<ServiceBloc>().add(
// UpdateServiceStatus(widget.serviceId, ServiceStatus.active));
// }
// },
// );
}
if (service.status == ServiceStatus.active) {
return GeneralSecondaryButton(
label: 'Terminar servicio',
onPressed: () {
final currentState = context.read<ServiceBloc>().state;
if (currentState is ServiceLoaded) {
context.read<ServiceBloc>().add(UpdateServiceStatus(
widget.serviceId, ServiceStatus.completed));
}
});
}
return GeneralSecondaryButton(
label: 'Volver',
onPressed: () {
Navigator.pop(context);
});
// customStatusButton(
// label: 'Volver',
// onPressed: () {
// Navigator.pop(context);
// },
// );
}
String formatCurrency(int number) {
final formatter =
NumberFormat.currency(locale: 'es_CO', decimalDigits: 0, symbol: '');
return '\$${formatter.format(number)}';
}
Future<List<dynamic>> _getUserAndProfessionalInfo(
ServiceEntity service) async {
final userRepo = FirebaseUserRepository(FirebaseAuth.instance);
final userInfo = await userRepo.getMyUser(service.userId);
return [userInfo];
}
}
lib/screens/service/service_screen.dart
+275 -197
View File
@@ -6,17 +6,13 @@ import 'package:injector/injector.dart';
import 'package:intl/intl.dart'; import 'package:intl/intl.dart';
import 'package:professional_repository/professional_repository.dart'; import 'package:professional_repository/professional_repository.dart';
import 'package:prosappco/blocs/service_bloc/service_bloc.dart'; import 'package:prosappco/blocs/service_bloc/service_bloc.dart';
import 'package:prosappco/components/general_primary_button.dart';
import 'package:service_repository/service_repository.dart'; import 'package:service_repository/service_repository.dart';
import 'package:setting_repository/setting_repository.dart'; import 'package:setting_repository/setting_repository.dart';
import 'package:user_repository/user_repository.dart'; import 'package:user_repository/user_repository.dart';
class ServiceScreen extends StatefulWidget { class ServiceScreen extends StatefulWidget {
// final String serviceId; final String serviceId;
const ServiceScreen({ const ServiceScreen({Key? key, required this.serviceId}) : super(key: key);
super.key,
// required this.serviceId
});
@override @override
State<ServiceScreen> createState() => _ServiceScreenState(); State<ServiceScreen> createState() => _ServiceScreenState();
@@ -71,182 +67,217 @@ class _ServiceScreenState extends State<ServiceScreen> {
return Column( return Column(
children: [ children: [
ListTile( Expanded(
leading: Container( child: SingleChildScrollView(
width: 60, child: Column(
height: 60, children: [
decoration: BoxDecoration( ListTile(
color: Colors.grey.shade300, leading: Container(
shape: BoxShape.circle, width: 60,
image: userInfo.picture == null height: 60,
? null decoration: BoxDecoration(
: DecorationImage( color: Colors.grey.shade300,
image: NetworkImage(userInfo.picture!), shape: BoxShape.circle,
fit: BoxFit.contain, image: userInfo.picture == null
? null
: DecorationImage(
image: NetworkImage(
userInfo.picture!),
fit: BoxFit.contain,
),
), ),
), child: userInfo.picture == null
child: userInfo.picture == null ? Icon(
? Icon( CupertinoIcons.person,
CupertinoIcons.person, color: Colors.grey.shade400,
color: Colors.grey.shade400, size: 40,
size: 40, )
) : null,
: null, ),
), title: Row(
title: Row( crossAxisAlignment:
crossAxisAlignment: CrossAxisAlignment.start, CrossAxisAlignment.start,
children: [ children: [
Text( Text(
'${userInfo.name}', '${userInfo.name}',
style: const TextStyle( style: const TextStyle(
fontWeight: FontWeight.bold), fontWeight: FontWeight.bold),
),
const SizedBox(width: 5),
Text(
'${DateFormat('dd MMMM', 'es').format(DateTime.parse(service.day))} - ${ScheduleEntity.getFormatTime(service.range1Hour1)}',
style: TextStyle(
color: Colors.grey[600],
),
),
],
),
subtitle: const Text('Rating: 5.0'),
),
Container(
margin: const EdgeInsets.only(
left: 40, right: 40, top: 20, bottom: 20),
padding: const EdgeInsets.symmetric(
horizontal: 20, vertical: 15),
decoration: BoxDecoration(
color: const Color(0xFFD6F4FF),
borderRadius: BorderRadius.circular(20),
boxShadow: [
BoxShadow(
color: Colors.grey.withOpacity(0.5),
spreadRadius: 1,
blurRadius: 5,
offset: const Offset(1, 3),
),
],
),
child: Row(
children: [
const Icon(
Icons.error_outline,
size: 27,
color: Colors.black54,
),
const SizedBox(width: 15),
service.location ==
ServiceLocationPreferences.delivery
? const Text(
'Servicio a su domicilio.',
style: TextStyle(
color: Colors.black, fontSize: 14),
)
: const Text(
'Servicio en sitio / consultorio',
style: TextStyle(
color: Colors.black, fontSize: 14),
),
],
),
),
Visibility(
visible: settings?.tarifas ?? false,
child: Column(
children: [
Text(
formatCurrency(
int.tryParse(service.rate) ?? 0),
style: const TextStyle(
fontWeight: FontWeight.w600,
fontSize: 25),
),
const Text('Tarifa de consulta'),
const SizedBox(height: 15),
const Text(
'Metodos de pago',
style: TextStyle(
fontSize: 18,
fontWeight: FontWeight.bold,
),
),
professionalInfo.paymentMethods.datafono ||
professionalInfo.paymentMethods.nequi ||
professionalInfo
.paymentMethods.transferencia
? Wrap(
spacing: 8,
runSpacing: 8,
alignment: WrapAlignment.center,
children: [
Visibility(
visible: professionalInfo
.paymentMethods.datafono,
child: const Chip(
label: Text('Datafono')),
),
Visibility(
visible: professionalInfo
.paymentMethods.nequi,
child: const Chip(
label: Text('Nequi')),
),
Visibility(
visible: professionalInfo
.paymentMethods.transferencia,
child: const Chip(
label: Text(
'Transferencia Bancaria')),
),
],
)
: const Text(
'No hay metodos de pago registrados',
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: 15,
color: Colors.black45,
), ),
), const SizedBox(width: 5),
], Text(
), '${DateFormat('dd MMMM', 'es').format(DateTime.parse(service.day))} - ${ScheduleEntity.getFormatTime(service.range1Hour1)}',
), style: TextStyle(
ListTile( color: Colors.grey[600],
leading: const Icon(Icons.near_me), ),
title: Text( ),
service.address, ],
style: TextStyle( ),
fontSize: 15, color: Colors.grey[600]), subtitle: const Text('Rating: 5.0'),
),
subtitle: service.aditionalAddress.isEmpty
? null
: Text(
service.aditionalAddress,
style: TextStyle(
fontSize: 15, color: Colors.grey[600]),
), ),
), Container(
service.description.isEmpty margin: const EdgeInsets.only(
? const SizedBox() left: 40,
: Container( right: 40,
alignment: Alignment.center, top: 20,
width: bottom: 20),
MediaQuery.of(context).size.width * 0.8, padding: const EdgeInsets.symmetric(
child: Text( horizontal: 20, vertical: 15),
'"${service.description.trim()}"', decoration: BoxDecoration(
style: TextStyle( color: const Color(0xFFD6F4FF),
color: Colors.grey[600], borderRadius: BorderRadius.circular(20),
fontStyle: FontStyle.italic, boxShadow: [
BoxShadow(
color: Colors.grey.withOpacity(0.5),
spreadRadius: 1,
blurRadius: 5,
offset: const Offset(1, 3),
),
],
),
child: Row(
children: [
const Icon(
Icons.error_outline,
size: 27,
color: Colors.black54,
),
const SizedBox(width: 15),
service.location ==
ServiceLocationPreferences
.delivery
? const Text(
'Servicio a s domicilio.',
style: TextStyle(
color: Colors.black,
fontSize: 14),
)
: const Text(
'Servicio en sitio / consultorio',
style: TextStyle(
color: Colors.black,
fontSize: 14),
),
],
), ),
), ),
), Visibility(
Expanded( visible: settings?.tarifas ?? false,
child: customMessageStatus(service), child: Column(
children: [
Text(
formatCurrency(
int.tryParse(service.rate) ?? 0),
style: const TextStyle(
fontWeight: FontWeight.w600,
fontSize: 25),
),
const Text('Tarifa de consulta'),
const SizedBox(height: 15),
const Text(
'Metodos de pago',
style: TextStyle(
fontSize: 18,
fontWeight: FontWeight.bold,
),
),
professionalInfo
.paymentMethods.datafono ||
professionalInfo
.paymentMethods.nequi ||
professionalInfo.paymentMethods
.transferencia
? Wrap(
spacing: 8,
runSpacing: 8,
alignment: WrapAlignment.center,
children: [
Visibility(
visible: professionalInfo
.paymentMethods
.datafono,
child: const Chip(
label:
Text('Datafono')),
),
Visibility(
visible: professionalInfo
.paymentMethods.nequi,
child: const Chip(
label: Text('Nequi')),
),
Visibility(
visible: professionalInfo
.paymentMethods
.transferencia,
child: const Chip(
label: Text(
'Transferencia Bancaria')),
),
],
)
: const Text(
'No hay metodos de pago registrados',
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: 15,
color: Colors.black45,
),
),
],
),
),
ListTile(
leading: const Icon(Icons.near_me),
title: Text(
service.address,
style: TextStyle(
fontSize: 15,
color: Colors.grey[600]),
),
subtitle: service.aditionalAddress.isEmpty
? null
: Text(
service.aditionalAddress,
style: TextStyle(
fontSize: 15,
color: Colors.grey[600]),
),
),
service.description.isEmpty
? const SizedBox()
: Container(
alignment: Alignment.center,
width: MediaQuery.of(context)
.size
.width *
0.8,
child: Text(
'"${service.description.trim()}"',
style: TextStyle(
color: Colors.grey[600],
fontStyle: FontStyle.italic,
),
),
),
customMessageStatus(service),
// customButton(service, context),
const SizedBox(height: 20),
],
),
),
),
const Divider(
height: 1,
thickness: 0.5,
),
Padding(
padding: const EdgeInsets.symmetric(
vertical: 10,
horizontal: 15,
),
child: customButton(service, context),
), ),
customButton(service, context),
const SizedBox(height: 20),
], ],
); );
} }
@@ -254,8 +285,8 @@ class _ServiceScreenState extends State<ServiceScreen> {
}, },
); );
} else { } else {
// BlocProvider.of<ServiceBloc>(context) BlocProvider.of<ServiceBloc>(context)
// .add(LoadService(widget.serviceId)); .add(LoadService(widget.serviceId));
return const Center( return const Center(
child: CircularProgressIndicator(), child: CircularProgressIndicator(),
); );
@@ -341,31 +372,69 @@ class _ServiceScreenState extends State<ServiceScreen> {
); );
} }
GeneralPrimaryButton customButton( ElevatedButton customButton(ServiceEntity service, BuildContext context) {
ServiceEntity service, BuildContext context) {
if (service.status == ServiceStatus.pending) { if (service.status == ServiceStatus.pending) {
return GeneralPrimaryButton( return ElevatedButton(
onPressed: () { onPressed: () {
final currentState = context.read<ServiceBloc>().state; final currentState = context.read<ServiceBloc>().state;
if (currentState is ServiceLoaded) { if (currentState is ServiceLoaded) {
// context.read<ServiceBloc>().add( context.read<ServiceBloc>().add(
// UpdateServiceStatus( UpdateServiceStatus(
// widget.serviceId, widget.serviceId,
// ServiceStatus.cancelled, ServiceStatus.cancelled,
// ), ),
// ); );
} }
}, },
color: Colors.red, style: FilledButton.styleFrom(
label: 'Cancelar Servicio', backgroundColor: Theme.of(context).colorScheme.error,
padding: const EdgeInsets.symmetric(vertical: 15),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(10),
),
),
child: Container(
alignment: Alignment.center,
child: const Text(
'Cancelar servicio',
style: TextStyle(
color: Colors.white,
fontSize: 18,
),
),
),
); );
} }
return GeneralPrimaryButton( return ElevatedButton(
onPressed: () { onPressed: () {
Navigator.pop(context); final currentState = context.read<ServiceBloc>().state;
if (currentState is ServiceLoaded) {
context.read<ServiceBloc>().add(
UpdateServiceStatus(
widget.serviceId,
ServiceStatus.cancelled,
),
);
}
}, },
label: 'Volver', style: FilledButton.styleFrom(
backgroundColor: Theme.of(context).colorScheme.primary,
padding: const EdgeInsets.symmetric(vertical: 15),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(10),
),
),
child: Container(
alignment: Alignment.center,
child: const Text(
'Volver',
style: TextStyle(
color: Colors.white,
fontSize: 18,
),
),
),
); );
} }
@@ -378,12 +447,21 @@ class _ServiceScreenState extends State<ServiceScreen> {
Future<List<dynamic>> _getUserAndProfessionalInfo( Future<List<dynamic>> _getUserAndProfessionalInfo(
ServiceEntity service) async { ServiceEntity service) async {
final userRepo = FirebaseUserRepository(FirebaseAuth.instance); final userRepo = FirebaseUserRepository(FirebaseAuth.instance);
final userInfo = await userRepo.getMyUser(service.professionalId);
final professionalRepo = FirebaseProfessionalRepository(); final professionalRepo = FirebaseProfessionalRepository();
final professionalInfo = if (FirebaseAuth.instance.currentUser!.uid == service.professionalId) {
await professionalRepo.getProInfo(service.professionalId); final userInfo = await userRepo.getMyUser(service.userId);
final professionalInfo =
await professionalRepo.getProInfo(service.professionalId);
return [userInfo, professionalInfo]; return [userInfo, professionalInfo];
} else {
final userRepo = FirebaseUserRepository(FirebaseAuth.instance);
final userInfo = await userRepo.getMyUser(service.professionalId);
final professionalInfo =
await professionalRepo.getProInfo(service.professionalId);
return [userInfo, professionalInfo];
}
} }
} }
lib/screens/service/user_service_screen.dart
+566
View File
@@ -0,0 +1,566 @@
import 'package:firebase_auth/firebase_auth.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:injector/injector.dart';
import 'package:intl/intl.dart';
import 'package:professional_repository/professional_repository.dart';
import 'package:prosappco/blocs/service_bloc/service_bloc.dart';
import 'package:prosappco/components/general_secondary_button.dart';
import 'package:service_repository/service_repository.dart';
import 'package:setting_repository/setting_repository.dart';
import 'package:user_repository/user_repository.dart';
class UserServiceScreen extends StatefulWidget {
final String serviceId;
const UserServiceScreen({super.key, required this.serviceId});
@override
State<UserServiceScreen> createState() => _UserServiceScreenState();
}
class _UserServiceScreenState extends State<UserServiceScreen> {
final settingRepository = Injector.appInstance.get<SettingRepository>();
SettingEntity? settings;
@override
void initState() {
super.initState();
_loadSettings();
}
void _loadSettings() {
settingRepository.getSettings().then(
(value) => setState(() {
settings = value;
}),
);
}
@override
Widget build(BuildContext context) {
return BlocProvider<ServiceBloc>(
create: (context) => Injector.appInstance.get<ServiceBloc>(),
child: Scaffold(
appBar: AppBar(
title: const Text('Servicio'),
),
body: BlocBuilder<ServiceBloc, ServiceState>(
builder: (context, state) {
if (state is ServiceLoaded) {
final service = state.service;
return FutureBuilder(
future: _getUserAndProfessionalInfo(service),
builder: (BuildContext context,
AsyncSnapshot<List<dynamic>> snapshot) {
if (snapshot.connectionState == ConnectionState.waiting) {
return const Center(child: CircularProgressIndicator());
} else {
if (snapshot.hasError) {
return Center(
child: Text('Error inesperado: ${snapshot.error}'),
);
} else {
final userInfo = snapshot.data![0] as MyUser;
final professionalInfo =
snapshot.data![1] as ProfessionalEntity;
return Column(
children: [
Expanded(
child: SingleChildScrollView(
child: Column(
children: [
ListTile(
leading: Container(
width: 60,
height: 60,
decoration: BoxDecoration(
color: Colors.grey.shade300,
shape: BoxShape.circle,
image: userInfo.picture == null
? null
: DecorationImage(
image: NetworkImage(
userInfo.picture!,
),
fit: BoxFit.contain,
),
),
child: userInfo.picture == null
? Icon(
CupertinoIcons.person,
color: Colors.grey.shade400,
size: 40,
)
: null,
),
title: Row(
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
Text(
'${userInfo.name}',
style: const TextStyle(
fontWeight: FontWeight.bold),
),
const SizedBox(width: 5),
Text(
'${DateFormat('dd MMMM', 'es').format(DateTime.parse(service.day))} - ${ScheduleEntity.getFormatTime(service.range1Hour1)}',
style: TextStyle(
color: Colors.grey[600],
),
),
],
),
subtitle: const Text('Rating: 5.0'),
),
Container(
margin: const EdgeInsets.only(
left: 40,
right: 40,
top: 20,
bottom: 20,
),
padding: const EdgeInsets.symmetric(
horizontal: 20,
vertical: 15,
),
decoration: BoxDecoration(
color: const Color(0xFFD6F4FF),
borderRadius: BorderRadius.circular(20),
boxShadow: [
BoxShadow(
color: Colors.grey.withOpacity(0.5),
spreadRadius: 1,
blurRadius: 5,
offset: const Offset(1, 3),
),
],
),
child: Row(
children: [
const Icon(
Icons.error_outline,
size: 27,
color: Colors.black54,
),
const SizedBox(width: 15),
service.location ==
ServiceLocationPreferences
.delivery
? const Text(
'Servicio a tu domicilio.',
style: TextStyle(
color: Colors.black,
fontSize: 14,
),
)
: const Text(
'Servicio en sitio / consultorio',
style: TextStyle(
color: Colors.black,
fontSize: 14,
),
),
],
),
),
Visibility(
visible: settings?.tarifas ?? false,
child: Column(
children: [
Text(
formatCurrency(
int.tryParse(service.rate) ?? 0),
style: const TextStyle(
fontWeight: FontWeight.w600,
fontSize: 25),
),
const Text('Tarifa de consulta'),
const SizedBox(height: 15),
const Text(
'Metodos de pago',
style: TextStyle(
fontSize: 18,
fontWeight: FontWeight.bold,
),
),
professionalInfo
.paymentMethods.datafono ||
professionalInfo
.paymentMethods.nequi ||
professionalInfo.paymentMethods
.transferencia
? Wrap(
spacing: 8,
runSpacing: 8,
alignment: WrapAlignment.center,
children: [
Visibility(
visible: professionalInfo
.paymentMethods
.datafono,
child: const Chip(
label:
Text('Datafono')),
),
Visibility(
visible: professionalInfo
.paymentMethods.nequi,
child: const Chip(
label: Text('Nequi')),
),
Visibility(
visible: professionalInfo
.paymentMethods
.transferencia,
child: const Chip(
label: Text(
'Transferencia Bancaria')),
),
],
)
: const Text(
'No hay metodos de pago registrados',
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: 15,
color: Colors.black45,
),
),
],
),
),
ListTile(
leading: const Icon(Icons.near_me),
title: Text(
service.address,
style: TextStyle(
fontSize: 15,
color: Colors.grey[600],
),
),
subtitle: service.aditionalAddress.isEmpty
? null
: Text(
service.aditionalAddress,
style: TextStyle(
fontSize: 15,
color: Colors.grey[600],
),
),
),
service.description.isEmpty
? const SizedBox()
: Container(
alignment: Alignment.center,
width: MediaQuery.of(context)
.size
.width *
0.8,
child: Text(
'"${service.description.trim()}"',
style: TextStyle(
color: Colors.grey[600],
fontStyle: FontStyle.italic,
),
),
),
const SizedBox(height: 55),
customMessageStatus(service),
const SizedBox(height: 20),
],
),
),
),
const Divider(
height: 1,
thickness: 0.5,
),
Padding(
padding: const EdgeInsets.symmetric(
vertical: 10,
horizontal: 15,
),
child: customButton(service, context),
),
],
);
}
}
},
);
} else {
BlocProvider.of<ServiceBloc>(context)
.add(LoadService(widget.serviceId));
return const Center(child: CircularProgressIndicator());
}
},
),
),
);
}
Widget customMessageStatus(ServiceEntity service) {
if (service.status == ServiceStatus.pending) {
return Stack(
alignment: AlignmentDirectional.topCenter,
clipBehavior: Clip.none,
children: [
Card(
color: Colors.green.shade50,
child: const Padding(
padding: EdgeInsets.fromLTRB(32, 56, 32, 32),
child: Text(
'Servicio enviado',
style: TextStyle(fontSize: 32, color: Colors.green),
),
),
),
Positioned(
top: -40,
child: Container(
padding: const EdgeInsets.all(16),
decoration: BoxDecoration(
color: Colors.white,
border: Border.all(color: Colors.green.shade50, width: 4),
shape: BoxShape.circle,
),
child: const Icon(Icons.mark_email_read_rounded,
color: Colors.green, size: 48),
),
)
],
);
}
if (service.status == ServiceStatus.acepted) {
return Stack(
alignment: AlignmentDirectional.topCenter,
clipBehavior: Clip.none,
children: [
Card(
color: Colors.green.shade50,
child: const Padding(
padding: EdgeInsets.fromLTRB(32, 56, 32, 32),
child: Text(
'Aceptado',
style: TextStyle(fontSize: 32, color: Colors.green),
),
),
),
Positioned(
top: -40,
child: Container(
padding: const EdgeInsets.all(16),
decoration: BoxDecoration(
color: Colors.white,
border: Border.all(color: Colors.green.shade50, width: 4),
shape: BoxShape.circle,
),
child: const Icon(Icons.check, color: Colors.green, size: 48),
),
)
],
);
}
if (service.status == ServiceStatus.cancelled) {
return Stack(
alignment: AlignmentDirectional.topCenter,
clipBehavior: Clip.none,
children: [
Card(
color: Colors.red.shade100,
child: const Padding(
padding: EdgeInsets.fromLTRB(32, 56, 32, 32),
child: Text(
'Cancelado',
style: TextStyle(fontSize: 32, color: Colors.red),
),
),
),
Positioned(
top: -40,
child: Container(
padding: const EdgeInsets.all(16),
decoration: BoxDecoration(
color: Colors.white,
border: Border.all(color: Colors.red.shade100, width: 4),
shape: BoxShape.circle,
),
child:
const Icon(Icons.close_rounded, color: Colors.red, size: 48),
),
)
],
);
}
if (service.status == ServiceStatus.denied) {
return Stack(
alignment: AlignmentDirectional.topCenter,
clipBehavior: Clip.none,
children: [
Card(
color: Colors.red.shade100,
child: const Padding(
padding: EdgeInsets.fromLTRB(32, 56, 32, 32),
child: Text(
'Rechazado',
style: TextStyle(fontSize: 32, color: Colors.red),
),
),
),
Positioned(
top: -40,
child: Container(
padding: const EdgeInsets.all(16),
decoration: BoxDecoration(
color: Colors.white,
border: Border.all(color: Colors.red.shade100, width: 4),
shape: BoxShape.circle,
),
child:
const Icon(Icons.close_rounded, color: Colors.red, size: 48),
),
)
],
);
}
if (service.status == ServiceStatus.active) {
return Stack(
alignment: AlignmentDirectional.topCenter,
clipBehavior: Clip.none,
children: [
Card(
color: Colors.green.shade50,
child: const Padding(
padding: EdgeInsets.fromLTRB(32, 56, 32, 32),
child: Text(
'En proceso...',
style: TextStyle(fontSize: 32, color: Colors.green),
),
),
),
Positioned(
top: -40,
child: Container(
padding: const EdgeInsets.all(16),
decoration: BoxDecoration(
color: Colors.white,
border: Border.all(color: Colors.green.shade50, width: 4),
shape: BoxShape.circle,
),
child: const Icon(
Icons.access_time_rounded,
color: Colors.green,
size: 48,
),
),
)
],
);
}
if (service.status == ServiceStatus.completed) {
return Stack(
alignment: AlignmentDirectional.topCenter,
clipBehavior: Clip.none,
children: [
Card(
color: Colors.green.shade50,
child: const Padding(
padding: EdgeInsets.fromLTRB(32, 56, 32, 32),
child: Text(
'Completado',
style: TextStyle(fontSize: 32, color: Colors.green),
),
),
),
Positioned(
top: -40,
child: Container(
padding: const EdgeInsets.all(16),
decoration: BoxDecoration(
color: Colors.white,
border: Border.all(color: Colors.green.shade50, width: 4),
shape: BoxShape.circle,
),
child: const Icon(
Icons.star,
color: Colors.green,
size: 48,
),
),
)
],
);
}
return const SizedBox();
}
Widget customButton(ServiceEntity service, BuildContext context) {
if (service.status == ServiceStatus.pending) {
return GeneralSecondaryButton(
label: 'Cancelar servicio',
color: Theme.of(context).colorScheme.error,
onPressed: () {
final currentState = context.read<ServiceBloc>().state;
if (currentState is ServiceLoaded) {
context.read<ServiceBloc>().add(
UpdateServiceStatus(widget.serviceId, ServiceStatus.cancelled));
}
},
);
}
// if (service.status == ServiceStatus.acepted) {
// return GeneralSecondaryButton(
// label: 'Iniciar servicio',
// onPressed: () {
// final currentState = context.read<ServiceBloc>().state;
// if (currentState is ServiceLoaded) {
// context.read<ServiceBloc>().add(
// UpdateServiceStatus(widget.serviceId, ServiceStatus.active));
// }
// },
// );
// }
// if (service.status == ServiceStatus.active) {
// return GeneralSecondaryButton(
// label: 'Terminar servicio',
// onPressed: () {
// final currentState = context.read<ServiceBloc>().state;
// if (currentState is ServiceLoaded) {
// context.read<ServiceBloc>().add(UpdateServiceStatus(
// widget.serviceId, ServiceStatus.completed));
// }
// });
// }
return GeneralSecondaryButton(
label: 'Volver',
onPressed: () {
Navigator.pop(context);
});
}
String formatCurrency(int number) {
final formatter =
NumberFormat.currency(locale: 'es_CO', decimalDigits: 0, symbol: '');
return '\$${formatter.format(number)}';
}
Future<List<dynamic>> _getUserAndProfessionalInfo(
ServiceEntity service) async {
final userRepo = FirebaseUserRepository(FirebaseAuth.instance);
final professionalRepo = FirebaseProfessionalRepository();
final userInfo = await userRepo.getMyUser(service.professionalId);
final professionalInfo =
await professionalRepo.getProInfo(service.professionalId);
return [userInfo, professionalInfo];
}
}
lib/screens/user/user_service_screen.dart
+8 -3
View File
@@ -1,3 +1,5 @@
import 'dart:developer';
import 'package:firebase_auth/firebase_auth.dart'; import 'package:firebase_auth/firebase_auth.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@@ -53,7 +55,8 @@ class _UserServiceScreenState extends State<UserServiceScreen> {
final service = state.service; final service = state.service;
return FutureBuilder( return FutureBuilder(
future: _getUserAndProfessionalInfo(service), future: _getUserAndProfessionalInfo(service),
builder: (BuildContext context, AsyncSnapshot<List<dynamic>> snapshot) { builder: (BuildContext context,
AsyncSnapshot<List<dynamic>> snapshot) {
if (snapshot.connectionState == ConnectionState.waiting) { if (snapshot.connectionState == ConnectionState.waiting) {
return const Center(child: CircularProgressIndicator()); return const Center(child: CircularProgressIndicator());
} else { } else {
@@ -372,12 +375,14 @@ class _UserServiceScreenState extends State<UserServiceScreen> {
return '\$${formatter.format(number)}'; return '\$${formatter.format(number)}';
} }
Future<List<dynamic>> _getUserAndProfessionalInfo(ServiceEntity service) async { Future<List<dynamic>> _getUserAndProfessionalInfo(
ServiceEntity service) async {
final userRepo = FirebaseUserRepository(FirebaseAuth.instance); final userRepo = FirebaseUserRepository(FirebaseAuth.instance);
final userInfo = await userRepo.getMyUser(service.professionalId); final userInfo = await userRepo.getMyUser(service.professionalId);
final professionalRepo = FirebaseProfessionalRepository(); final professionalRepo = FirebaseProfessionalRepository();
final professionalInfo = await professionalRepo.getProInfo(service.professionalId); final professionalInfo =
await professionalRepo.getProInfo(service.professionalId);
return [userInfo, professionalInfo]; return [userInfo, professionalInfo];
} }
packages/service_repository/lib/src/entities/service_entity.dart
+7 -2
View File
@@ -4,6 +4,7 @@ import 'package:service_repository/service_repository.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
class ServiceEntity extends Equatable { class ServiceEntity extends Equatable {
final String? id;
final String professionalId; final String professionalId;
final bool professionalScored; final bool professionalScored;
final String userId; final String userId;
@@ -22,6 +23,7 @@ class ServiceEntity extends Equatable {
final ServiceLocationPreferences location; final ServiceLocationPreferences location;
const ServiceEntity({ const ServiceEntity({
this.id,
required this.professionalId, required this.professionalId,
required this.professionalScored, required this.professionalScored,
required this.userId, required this.userId,
@@ -40,8 +42,9 @@ class ServiceEntity extends Equatable {
required this.location, required this.location,
}); });
static ServiceEntity fromDocument(Map<String, dynamic> doc) { static ServiceEntity fromDocument(Map<String, dynamic> doc, String id) {
return ServiceEntity( return ServiceEntity(
id: id,
professionalId: doc['professional_id'] as String, professionalId: doc['professional_id'] as String,
professionalScored: doc['professional_scored'] as bool, professionalScored: doc['professional_scored'] as bool,
userId: doc['user_id'] as String, userId: doc['user_id'] as String,
@@ -68,6 +71,7 @@ class ServiceEntity extends Equatable {
Map<String, dynamic> toDocument() { Map<String, dynamic> toDocument() {
return { return {
'id': id,
'professional_id': professionalId, 'professional_id': professionalId,
'professional_scored': professionalScored, 'professional_scored': professionalScored,
'user_id': userId, 'user_id': userId,
@@ -95,7 +99,8 @@ class ServiceEntity extends Equatable {
} }
@override @override
List<Object> get props => [ List<Object?> get props => [
id,
professionalId, professionalId,
professionalScored, professionalScored,
userId, userId,
packages/service_repository/lib/src/models/service_status.dart
+8 -1
View File
@@ -1,6 +1,13 @@
export 'service_status.dart'; export 'service_status.dart';
enum ServiceStatus { pending, acepted, active, cancelled, completed } enum ServiceStatus {
pending, // 0
acepted, // 1
denied, // 2
active, // 3
cancelled, // 4
completed, // 5
}
int enumToIntService(ServiceStatus state) { int enumToIntService(ServiceStatus state) {
return state.index; return state.index;
packages/service_repository/lib/src/repositories/firebase_service_repository.dart
+17 -9
View File
@@ -21,7 +21,7 @@ class FirebaseServiceRepository {
Stream<ServiceEntity> getService(String serviceId) { Stream<ServiceEntity> getService(String serviceId) {
return serviceCollection.doc(serviceId).snapshots().map((snapshot) { return serviceCollection.doc(serviceId).snapshots().map((snapshot) {
if (snapshot.exists) { if (snapshot.exists) {
return ServiceEntity.fromDocument(snapshot.data()!); return ServiceEntity.fromDocument(snapshot.data()!, snapshot.id);
} else { } else {
throw Exception('El servicio con ID $serviceId no existe'); throw Exception('El servicio con ID $serviceId no existe');
} }
@@ -31,10 +31,10 @@ class FirebaseServiceRepository {
Stream<List<ServiceEntity>> getServicesForUser(String userId) { Stream<List<ServiceEntity>> getServicesForUser(String userId) {
return serviceCollection return serviceCollection
.where('user_id', isEqualTo: userId) .where('user_id', isEqualTo: userId)
.where('status', whereIn: [0, 1, 2]) .where('status', whereIn: [0, 1, 2, 3])
.snapshots() .snapshots()
.map((querySnapshot) => querySnapshot.docs .map((querySnapshot) => querySnapshot.docs
.map((doc) => ServiceEntity.fromDocument(doc.data())) .map((doc) => ServiceEntity.fromDocument(doc.data(), doc.id))
.toList()); .toList());
} }
@@ -42,20 +42,20 @@ class FirebaseServiceRepository {
String professionalId) { String professionalId) {
return serviceCollection return serviceCollection
.where('professional_id', isEqualTo: professionalId) .where('professional_id', isEqualTo: professionalId)
.where('status', whereIn: [0, 1, 2]) .where('status', whereIn: [0, 1, 2, 3])
.snapshots() .snapshots()
.map((querySnapshot) => querySnapshot.docs .map((querySnapshot) => querySnapshot.docs
.map((doc) => ServiceEntity.fromDocument(doc.data())) .map((doc) => ServiceEntity.fromDocument(doc.data(), doc.id))
.toList()); .toList());
} }
Stream<List<ServiceEntity>> getServicesHistoryForUser(String userId) { Stream<List<ServiceEntity>> getServicesHistoryForUser(String userId) {
return serviceCollection return serviceCollection
.where('user_id', isEqualTo: userId) .where('user_id', isEqualTo: userId)
.where('status', whereIn: [3, 4]) .where('status', whereIn: [4, 5])
.snapshots() .snapshots()
.map((querySnapshot) => querySnapshot.docs .map((querySnapshot) => querySnapshot.docs
.map((doc) => ServiceEntity.fromDocument(doc.data())) .map((doc) => ServiceEntity.fromDocument(doc.data(), doc.id))
.toList()); .toList());
} }
@@ -63,10 +63,18 @@ class FirebaseServiceRepository {
String professionalId) { String professionalId) {
return serviceCollection return serviceCollection
.where('professional_id', isEqualTo: professionalId) .where('professional_id', isEqualTo: professionalId)
.where('status', whereIn: [3, 4]) .where('status', whereIn: [4, 5])
.snapshots() .snapshots()
.map((querySnapshot) => querySnapshot.docs .map((querySnapshot) => querySnapshot.docs
.map((doc) => ServiceEntity.fromDocument(doc.data())) .map((doc) => ServiceEntity.fromDocument(doc.data(), doc.id))
.toList()); .toList());
} }
} }
// 0 - pending
// 1 - acepted
// 2 - denied
// 3 - active
// 4 - cancelled
// 5 - completed