historial y pendientes

lib/blocs/service_bloc/service_bloc.dart

@@ -29,6 +29,7 @@ class ServiceBloc extends Bloc<ServiceEvent, ServiceState> {
     on<LoadService>(_onLoadService);
     on<UpdateServiceStatus>(_onUpdateServiceStatus);
     on<LoadServicesForUser>(_onLoadServicesForUser);
+    on<LoadServicesHistoryForUser>(_onLoadServicesHistoryForUser);
   }
 
   void _onCreateService(CreateService event, Emitter<ServiceState> emit) async {
@@ -76,13 +77,17 @@ class ServiceBloc extends Bloc<ServiceEvent, ServiceState> {
     }
   }
 
-  void _onLoadServicesForUser(
+  void _onLoadServicesHistoryForUser(
-      LoadServicesForUser event, Emitter<ServiceState> emit) async {
+      LoadServicesHistoryForUser event, Emitter<ServiceState> emit) async {
     try {
       final servicesStream =
-          _serviceRepository.getServicesForUser(event.userId);
+          _serviceRepository.getServicesHistoryForUser(event.userId);
 
       await for (var services in servicesStream) {
+        if (services.isEmpty) {
+          emit(const ServicesForUserLoaded([]));
+          return;
+        }
         final professionalIds = services.map((e) => e.professionalId);
         final List<MyUser> users =
             await _userRepository.getUsersFromIds(professionalIds);
@@ -91,7 +96,46 @@ class ServiceBloc extends Bloc<ServiceEvent, ServiceState> {
 
         final List<ProfessionalEntity> professionsList =
             await _professionalRepository
-                .getProfessionsFromIds(professionalIds);
+                .getProfessionalsFromIds(professionalIds);
+
+        final professionsDir = {for (var e in professionsList) e.id: e};
+
+        final servicesInfo = services.map((e) {
+          return ServiceInfoUI(
+              service: e,
+              user: usersDir[e.professionalId]!,
+              professional: professionsDir[e.professionalId]!);
+        }).toList();
+
+        emit(ServicesForUserLoaded(servicesInfo));
+      }
+    } catch (e) {
+      log(e.toString());
+      emit(CreateServiceFailure());
+    }
+  }
+
+  void _onLoadServicesForUser(
+      LoadServicesForUser event, Emitter<ServiceState> emit) async {
+    try {
+      final servicesStream =
+          _serviceRepository.getServicesForUser(event.userId);
+
+      await for (var services in servicesStream) {
+        if (services.isEmpty) {
+          emit(const ServicesForUserLoaded([]));
+          return;
+        }
+        final professionalIds = services.map((e) => e.professionalId);
+
+        final List<MyUser> users =
+            await _userRepository.getUsersFromIds(professionalIds);
+
+        final usersDir = {for (var e in users) e.id: e};
+
+        final List<ProfessionalEntity> professionsList =
+            await _professionalRepository
+                .getProfessionalsFromIds(professionalIds);
 
         final professionsDir = {for (var e in professionsList) e.id: e};
 
@@ -129,6 +173,9 @@ class ServiceInfoUI {
   final MyUser user;
   final ProfessionalEntity professional;
 
-  ServiceInfoUI(
+  ServiceInfoUI({
-      {required this.service, required this.user, required this.professional});
+    required this.service,
+    required this.user,
+    required this.professional,
+  });
 }

lib/blocs/service_bloc/service_event.dart

@@ -35,6 +35,15 @@ class LoadServicesForUser extends ServiceEvent {
   List<Object> get props => [userId];
 }
 
+class LoadServicesHistoryForUser extends ServiceEvent {
+  final String userId;
+
+  const LoadServicesHistoryForUser(this.userId);
+
+  @override
+  List<Object> get props => [userId];
+}
+
 class CreateService extends ServiceEvent {
   final String professionalId;
   final bool? professionalScored;

lib/blocs/service_bloc/service_state.dart

@@ -16,6 +16,7 @@ class ServiceLoaded extends ServiceState {
   List<Object> get props => [service];
 }
 
+
 class ServicesForUserLoaded extends ServiceState {
   final List<ServiceInfoUI> services;
 

lib/components/general_drawer.dart

@@ -9,6 +9,8 @@ import 'package:prosappco/components/general_drawer_item.dart';
 import 'package:prosappco/screens/configuration/configuration_screen.dart';
 import 'package:prosappco/screens/configuration/configuration_support_screen.dart';
 import 'package:prosappco/screens/lists/professional_list_screen.dart';
+import 'package:prosappco/screens/lists/professional_service_history_list_screen.dart';
+import 'package:prosappco/screens/lists/user_service_history_list_screen.dart';
 import 'package:prosappco/screens/lists/user_service_list_screen.dart';
 import 'package:prosappco/screens/professional/professional_calendar_screen.dart';
 import 'package:prosappco/screens/professional/professional_denied_screen.dart';
@@ -93,13 +95,21 @@ class GeneralDrawer extends StatelessWidget {
                             leading: Icons.access_time_outlined,
                             label: 'Historial',
                             onTap: () {
-                              Navigator.push(
+                              shouldProModeActive(context, professionalState)
-                                context,
+                                  ? Navigator.push(
-                                CupertinoPageRoute(
+                                      context,
-                                  builder: (context) =>
+                                      CupertinoPageRoute(
-                                      const UserHistoryServicesScreen(),
+                                        builder: (context) =>
-                                ),
+                                            const ProfessionalServiceHistoryListScreen(),
-                              );
+                                      ),
+                                    )
+                                  : Navigator.push(
+                                      context,
+                                      CupertinoPageRoute(
+                                        builder: (context) =>
+                                            const UserServiceHistoryListScreen(),
+                                      ),
+                                    );
                             },
                           ),
                           shouldProModeActive(context, professionalState)

lib/screens/lists/profession_list_screen.dart

@@ -78,12 +78,20 @@ class _ProfessionListScreenState extends State<ProfessionListScreen> {
                           itemCount: _filteredProfessions!.length,
                           itemBuilder: (BuildContext context, int index) {
                             final profession = _filteredProfessions![index];
-                            return ListTile(
+                            return Container(
-                              title: Text(profession),
+                              decoration: BoxDecoration(
-                              onTap: () {
+                                border: Border(
-                                Navigator.pop(
+                                  bottom: BorderSide(
-                                    context, _filteredProfessions![index]);
+                                      color: Colors.grey.withOpacity(0.2)),
-                              },
+                                ),
+                              ),
+                              child: ListTile(
+                                title: Text(profession),
+                                onTap: () {
+                                  Navigator.pop(
+                                      context, _filteredProfessions![index]);
+                                },
+                              ),
                             );
                           },
                         )

lib/screens/lists/professional_service_history_list_screen.dart

@@ -0,0 +1,204 @@
+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:service_repository/service_repository.dart';
+import 'package:shimmer/shimmer.dart';
+
+class ProfessionalServiceHistoryListScreen extends StatefulWidget {
+  const ProfessionalServiceHistoryListScreen({super.key});
+
+  @override
+  State<ProfessionalServiceHistoryListScreen> createState() =>
+      _ProfessionalServiceHistoryListScreenState();
+}
+
+class _ProfessionalServiceHistoryListScreenState
+    extends State<ProfessionalServiceHistoryListScreen> {
+  late final ServiceBloc serviceBloc;
+
+  @override
+  void initState() {
+    super.initState();
+
+    serviceBloc = Injector.appInstance.get<ServiceBloc>();
+
+    serviceBloc.add(
+        LoadServicesHistoryForUser(FirebaseAuth.instance.currentUser!.uid));
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return BlocProvider<ServiceBloc>(
+      create: (context) => serviceBloc,
+      child: Scaffold(
+        appBar: AppBar(
+          title: const Text('Historial'),
+        ),
+        body: BlocBuilder<ServiceBloc, ServiceState>(
+          builder: (context, serviceState) {
+            if (serviceState is ServicesForUserLoaded) {
+              return serviceState.services.isEmpty
+                  ? const Center(
+                      child: Text('No tienes servicios'),
+                    )
+                  : ListView.builder(
+                      itemCount: serviceState.services.length,
+                      itemBuilder: (_, index) {
+                        final serviceInfo = serviceState.services[index];
+                        final user = serviceInfo.user;
+                        final professional = serviceInfo.professional;
+                        final service = serviceInfo.service;
+
+                        return Container(
+                          decoration: BoxDecoration(
+                            border: Border(
+                              bottom: BorderSide(
+                                  color: Colors.grey.withOpacity(0.2)),
+                            ),
+                          ),
+                          child: ListTile(
+                            onTap: () {},
+                            leading: Container(
+                              width: 60,
+                              height: 60,
+                              decoration: BoxDecoration(
+                                color: Colors.grey.shade300,
+                                shape: BoxShape.circle,
+                                image: user.picture == null
+                                    ? null
+                                    : DecorationImage(
+                                        image: NetworkImage(user.picture!),
+                                        fit: BoxFit.contain,
+                                      ),
+                              ),
+                              child: user.picture == null
+                                  ? Icon(
+                                      CupertinoIcons.person,
+                                      color: Colors.grey.shade400,
+                                      size: 40,
+                                    )
+                                  : null,
+                            ),
+                            title: Row(
+                              crossAxisAlignment: CrossAxisAlignment.start,
+                              children: [
+                                Flexible(
+                                  child: Text(
+                                    '${user.name}',
+                                    overflow: TextOverflow.ellipsis,
+                                    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: Column(
+                              crossAxisAlignment: CrossAxisAlignment.start,
+                              children: [
+                                Row(
+                                  children: [
+                                    const Text(
+                                      'Estado:',
+                                      style: TextStyle(
+                                        fontStyle: FontStyle.italic,
+                                      ),
+                                    ),
+                                    const SizedBox(width: 5),
+                                    customStatus(service),
+                                  ],
+                                ),
+                                Text(
+                                  '"${service.description.trim()}"',
+                                  overflow: TextOverflow.ellipsis,
+                                ),
+                              ],
+                            ),
+                          ),
+                        );
+                      },
+                    );
+            }
+
+            return Shimmer.fromColors(
+              baseColor: Colors.grey[300]!,
+              highlightColor: Colors.grey[100]!,
+              child: ListView.builder(
+                itemCount: 10,
+                itemBuilder: (_, __) => ListTile(
+                  leading: CircleAvatar(
+                    backgroundColor: Colors.grey[300],
+                    radius: 30,
+                  ),
+                  title: Container(
+                    height: 20,
+                    decoration: BoxDecoration(
+                      color: Colors.grey.shade300,
+                      borderRadius: BorderRadius.circular(8),
+                    ),
+                  ),
+                  subtitle: Container(
+                    height: 15,
+                    decoration: BoxDecoration(
+                      color: Colors.grey.shade300,
+                      borderRadius: BorderRadius.circular(8),
+                    ),
+                  ),
+                ),
+              ),
+            );
+          },
+        ),
+      ),
+    );
+  }
+
+  Container customStatus(ServiceEntity service) {
+    if (service.status == ServiceStatus.completed) {
+      return itemStatus(Colors.blueAccent, 'Completado');
+    }
+    if (service.status == ServiceStatus.cancelled) {
+      return itemStatus(Colors.red, 'Cancelado');
+    }
+
+    return itemStatus(Colors.red, 'Cancelado');
+  }
+
+  Container itemStatus(Color color, String text) {
+    return Container(
+      padding: const EdgeInsets.symmetric(
+        horizontal: 8,
+        vertical: 3,
+      ),
+      decoration: BoxDecoration(
+        color: color,
+        borderRadius: BorderRadius.circular(8),
+      ),
+      child: Text(
+        text,
+        style: const TextStyle(
+          fontStyle: FontStyle.italic,
+          color: Colors.white,
+        ),
+      ),
+    );
+  }
+}
+
+// pending   - 0
+// acepted   - 1
+// active    - 2
+// cancelled - 3
+// completed - 4

lib/screens/lists/user_service_history_list_screen.dart

@@ -1,16 +1,204 @@
+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:service_repository/service_repository.dart';
+import 'package:shimmer/shimmer.dart';
 
-class UserServiceHistoryScreen extends StatefulWidget {
+class UserServiceHistoryListScreen extends StatefulWidget {
-  const UserServiceHistoryScreen({super.key});
+  const UserServiceHistoryListScreen({super.key});
 
   @override
-  State<UserServiceHistoryScreen> createState() =>
+  State<UserServiceHistoryListScreen> createState() =>
-      _UserServiceHistoryScreenState();
+      _UserServiceHistoryListScreenState();
 }
 
-class _UserServiceHistoryScreenState extends State<UserServiceHistoryScreen> {
+class _UserServiceHistoryListScreenState
+    extends State<UserServiceHistoryListScreen> {
+  late final ServiceBloc serviceBloc;
+
+  @override
+  void initState() {
+    super.initState();
+
+    serviceBloc = Injector.appInstance.get<ServiceBloc>();
+
+    serviceBloc.add(
+        LoadServicesHistoryForUser(FirebaseAuth.instance.currentUser!.uid));
+  }
+
   @override
   Widget build(BuildContext context) {
-    return Container();
+    return BlocProvider<ServiceBloc>(
+      create: (context) => serviceBloc,
+      child: Scaffold(
+        appBar: AppBar(
+          title: const Text('Historial'),
+        ),
+        body: BlocBuilder<ServiceBloc, ServiceState>(
+          builder: (context, serviceState) {
+            if (serviceState is ServicesForUserLoaded) {
+              return serviceState.services.isEmpty
+                  ? const Center(
+                      child: Text('No tienes servicios'),
+                    )
+                  : ListView.builder(
+                      itemCount: serviceState.services.length,
+                      itemBuilder: (_, index) {
+                        final serviceInfo = serviceState.services[index];
+                        final user = serviceInfo.user;
+                        final professional = serviceInfo.professional;
+                        final service = serviceInfo.service;
+
+                        return Container(
+                          decoration: BoxDecoration(
+                            border: Border(
+                              bottom: BorderSide(
+                                  color: Colors.grey.withOpacity(0.2)),
+                            ),
+                          ),
+                          child: ListTile(
+                            onTap: () {},
+                            leading: Container(
+                              width: 60,
+                              height: 60,
+                              decoration: BoxDecoration(
+                                color: Colors.grey.shade300,
+                                shape: BoxShape.circle,
+                                image: user.picture == null
+                                    ? null
+                                    : DecorationImage(
+                                        image: NetworkImage(user.picture!),
+                                        fit: BoxFit.contain,
+                                      ),
+                              ),
+                              child: user.picture == null
+                                  ? Icon(
+                                      CupertinoIcons.person,
+                                      color: Colors.grey.shade400,
+                                      size: 40,
+                                    )
+                                  : null,
+                            ),
+                            title: Row(
+                              crossAxisAlignment: CrossAxisAlignment.start,
+                              children: [
+                                Flexible(
+                                  child: Text(
+                                    '${user.name}',
+                                    overflow: TextOverflow.ellipsis,
+                                    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: Column(
+                              crossAxisAlignment: CrossAxisAlignment.start,
+                              children: [
+                                Row(
+                                  children: [
+                                    const Text(
+                                      'Estado:',
+                                      style: TextStyle(
+                                        fontStyle: FontStyle.italic,
+                                      ),
+                                    ),
+                                    const SizedBox(width: 5),
+                                    customStatus(service),
+                                  ],
+                                ),
+                                Text(
+                                  '"${service.description.trim()}"',
+                                  overflow: TextOverflow.ellipsis,
+                                ),
+                              ],
+                            ),
+                          ),
+                        );
+                      },
+                    );
+            }
+
+            return Shimmer.fromColors(
+              baseColor: Colors.grey[300]!,
+              highlightColor: Colors.grey[100]!,
+              child: ListView.builder(
+                itemCount: 10,
+                itemBuilder: (_, __) => ListTile(
+                  leading: CircleAvatar(
+                    backgroundColor: Colors.grey[300],
+                    radius: 30,
+                  ),
+                  title: Container(
+                    height: 20,
+                    decoration: BoxDecoration(
+                      color: Colors.grey.shade300,
+                      borderRadius: BorderRadius.circular(8),
+                    ),
+                  ),
+                  subtitle: Container(
+                    height: 15,
+                    decoration: BoxDecoration(
+                      color: Colors.grey.shade300,
+                      borderRadius: BorderRadius.circular(8),
+                    ),
+                  ),
+                ),
+              ),
+            );
+          },
+        ),
+      ),
+    );
+  }
+
+  Container customStatus(ServiceEntity service) {
+    if (service.status == ServiceStatus.completed) {
+      return itemStatus(Colors.blueAccent, 'Completado');
+    }
+    if (service.status == ServiceStatus.cancelled) {
+      return itemStatus(Colors.red, 'Cancelado');
+    }
+
+    return itemStatus(Colors.red, 'Cancelado');
+  }
+
+  Container itemStatus(Color color, String text) {
+    return Container(
+      padding: const EdgeInsets.symmetric(
+        horizontal: 8,
+        vertical: 3,
+      ),
+      decoration: BoxDecoration(
+        color: color,
+        borderRadius: BorderRadius.circular(8),
+      ),
+      child: Text(
+        text,
+        style: const TextStyle(
+          fontStyle: FontStyle.italic,
+          color: Colors.white,
+        ),
+      ),
+    );
   }
 }
+
+// pending   - 0
+// acepted   - 1
+// active    - 2
+// cancelled - 3
+// completed - 4

lib/screens/lists/user_service_list_screen.dart

@@ -52,68 +52,78 @@ class _UserServiceListScreenState extends State<UserServiceListScreen> {
                         final professional = serviceInfo.professional;
                         final service = serviceInfo.service;
 
-                        return ListTile(
+                        return Container(
-                          onTap: () {},
+                          decoration: BoxDecoration(
-                          leading: Container(
+                            border: Border(
-                            width: 60,
+                              bottom: BorderSide(
-                            height: 60,
+                                  color: Colors.grey.withOpacity(0.2)),
-                            decoration: BoxDecoration(
-                              color: Colors.grey.shade300,
-                              shape: BoxShape.circle,
-                              image: user.picture == null
-                                  ? null
-                                  : DecorationImage(
-                                      image: NetworkImage(user.picture!),
-                                      fit: BoxFit.contain,
-                                    ),
                             ),
-                            child: user.picture == null
-                                ? Icon(
-                                    CupertinoIcons.person,
-                                    color: Colors.grey.shade400,
-                                    size: 40,
-                                  )
-                                : null,
                           ),
-                          title: Row(
+                          child: ListTile(
-                            crossAxisAlignment: CrossAxisAlignment.start,
+                            onTap: () {},
-                            children: [
+                            leading: Container(
-                              Flexible(
+                              width: 60,
-                                child: Text(
+                              height: 60,
-                                  '${user.name}',
+                              decoration: BoxDecoration(
+                                color: Colors.grey.shade300,
+                                shape: BoxShape.circle,
+                                image: user.picture == null
+                                    ? null
+                                    : DecorationImage(
+                                        image: NetworkImage(user.picture!),
+                                        fit: BoxFit.contain,
+                                      ),
+                              ),
+                              child: user.picture == null
+                                  ? Icon(
+                                      CupertinoIcons.person,
+                                      color: Colors.grey.shade400,
+                                      size: 40,
+                                    )
+                                  : null,
+                            ),
+                            title: Row(
+                              crossAxisAlignment: CrossAxisAlignment.start,
+                              children: [
+                                Flexible(
+                                  child: Text(
+                                    '${user.name}',
+                                    overflow: TextOverflow.ellipsis,
+                                    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: Column(
+                              crossAxisAlignment: CrossAxisAlignment.start,
+                              children: [
+                                Row(
+                                  children: [
+                                    const Text(
+                                      'Estado:',
+                                      style: TextStyle(
+                                        fontStyle: FontStyle.italic,
+                                      ),
+                                    ),
+                                    const SizedBox(width: 5),
+                                    customStatus(service),
+                                  ],
+                                ),
+                                Text(
+                                  '"${service.description.trim()}"',
                                   overflow: TextOverflow.ellipsis,
-                                  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: Row(
-                            children: [
-                              const Text(
-                                'Estado:',
-                                style: TextStyle(fontStyle: FontStyle.italic),
-                              ),
-                              const SizedBox(width: 5),
-                              Container(
-                                padding: const EdgeInsets.symmetric(
-                                  horizontal: 8,
-                                  vertical: 3,
-                                ),
-                                decoration: BoxDecoration(
-                                  color: Colors.blueAccent,
-                                  borderRadius: BorderRadius.circular(8),
-                                ),
-                                child: customStatus(service),
-                              ),
-                            ],
                           ),
                         );
                       },
@@ -153,48 +163,43 @@ class _UserServiceListScreenState extends State<UserServiceListScreen> {
     );
   }
 
-  Text customStatus(ServiceEntity service) {
+  Container customStatus(ServiceEntity service) {
     if (service.status == ServiceStatus.pending) {
-      return const Text(
+      return itemStatus(Colors.black54, 'Pendiente');
-        'Pendiente',
-        style: TextStyle(
-          fontStyle: FontStyle.italic,
-          color: Colors.white,
-        ),
-      );
     }
-
     if (service.status == ServiceStatus.acepted) {
-      return const Text(
+      return itemStatus(Colors.green, 'Aceptado');
-        'Aceptado',
-        style: TextStyle(
-          fontStyle: FontStyle.italic,
-          color: Colors.white,
-        ),
-      );
     }
     if (service.status == ServiceStatus.active) {
-      return const Text(
+      return itemStatus(Colors.blueAccent, 'Activo');
-        'Activo',
+    }
-        style: TextStyle(
+
+    return itemStatus(Colors.red, 'Cancelado');
+  }
+
+  Container itemStatus(Color color, String text) {
+    return Container(
+      padding: const EdgeInsets.symmetric(
+        horizontal: 8,
+        vertical: 3,
+      ),
+      decoration: BoxDecoration(
+        color: color,
+        borderRadius: BorderRadius.circular(8),
+      ),
+      child: Text(
+        text,
+        style: const TextStyle(
           fontStyle: FontStyle.italic,
           color: Colors.white,
         ),
-      );
-    }
-
-    return const Text(
-      'Cancelado',
-      style: TextStyle(
-        fontStyle: FontStyle.italic,
-        color: Colors.white,
       ),
     );
   }
 }
 
-// pending
+// pending   - 0
-// acepted
+// acepted   - 1
-// active
+// active    - 2
-// cancelled
+// cancelled - 3
-// completed
+// completed - 4

lib/screens/professional/professional_form_screen.dart

@@ -56,175 +56,197 @@ class _ProfessionalFormScreenState extends State<ProfessionalFormScreen> {
         ),
         body: BlocBuilder<MyUserBloc, MyUserState>(
           builder: (context, state) {
-            return SingleChildScrollView(
+            return Column(
-              child: Padding(
+              children: [
-                padding:
+                Expanded(
-                    const EdgeInsets.symmetric(horizontal: 40, vertical: 10),
+                  child: SingleChildScrollView(
-                child: Column(
+                    child: Padding(
-                  crossAxisAlignment: CrossAxisAlignment.stretch,
+                      padding: const EdgeInsets.symmetric(
-                  children: [
+                          horizontal: 40, vertical: 10),
-                    pictureWidget(state, context),
+                      child: Column(
-                    const SizedBox(height: 30),
+                        crossAxisAlignment: CrossAxisAlignment.stretch,
-                    TextFormField(
-                      controller: _cedulaController,
-                      decoration: const InputDecoration(
-                        labelText: 'Cedula',
-                        prefixIcon: Icon(Icons.assignment_ind),
-                        hintText: 'Ingresa tu cedula',
-                        border: OutlineInputBorder(
-                            borderRadius: BorderRadius.all(
-                          Radius.circular(10.0),
-                        )),
-                        errorBorder: OutlineInputBorder(
-                          borderSide: BorderSide(color: Colors.red),
-                        ),
-                        focusedErrorBorder: OutlineInputBorder(
-                          borderSide: BorderSide(color: Colors.red, width: 2.0),
-                        ),
-                      ),
-                      validator: (value) {
-                        if (value == null || value.isEmpty) {
-                          return 'Por favor, ingrese su nombre';
-                        }
-                        return null;
-                      },
-                    ),
-                    const SizedBox(height: 10.0),
-                    ElevatedButton(
-                      onPressed: _pickCedulaPDF,
-                      child: Row(
-                        mainAxisAlignment: MainAxisAlignment.spaceBetween,
                         children: [
-                          const Text('Cargar pdf de la cedula'),
+                          pictureWidget(state, context),
-                          _cedulaPdfFile != null
+                          const SizedBox(height: 30),
-                              ? const Icon(Icons.check)
+                          TextFormField(
-                              : const Icon(Icons.file_upload_outlined),
+                            controller: _cedulaController,
-                        ],
+                            decoration: const InputDecoration(
-                      ),
+                              labelText: 'Cedula',
-                    ),
+                              prefixIcon: Icon(Icons.assignment_ind),
-                    const SizedBox(height: 20.0),
+                              hintText: 'Ingresa tu cedula',
-                    TextFormField(
+                              border: OutlineInputBorder(
-                      controller: _professionController,
+                                  borderRadius: BorderRadius.all(
-                      readOnly: true,
+                                Radius.circular(10.0),
-                      onTap: () async {
+                              )),
-                        final professionName = await Navigator.push(
+                              errorBorder: OutlineInputBorder(
-                          context,
+                                borderSide: BorderSide(color: Colors.red),
-                          CupertinoPageRoute(
+                              ),
-                            builder: (BuildContext context) {
+                              focusedErrorBorder: OutlineInputBorder(
-                              return const ProfessionListScreen();
+                                borderSide:
+                                    BorderSide(color: Colors.red, width: 2.0),
+                              ),
+                            ),
+                            validator: (value) {
+                              if (value == null || value.isEmpty) {
+                                return 'Por favor, ingrese su nombre';
+                              }
+                              return null;
                             },
                           ),
-                        );
+                          const SizedBox(height: 10.0),
-
+                          ElevatedButton(
-                        if (professionName != null) {
+                            onPressed: _pickCedulaPDF,
-                          _professionController.text = professionName;
+                            child: Row(
-                        }
+                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                      },
+                              children: [
-                      decoration: const InputDecoration(
+                                const Text('Cargar pdf de la cedula'),
-                        labelText: 'Profesión',
+                                _cedulaPdfFile != null
-                        prefixIcon: Icon(Icons.work_rounded),
+                                    ? const Icon(Icons.check)
-                        hintText: 'Selecciona tu profesión',
+                                    : const Icon(Icons.file_upload_outlined),
-                        border: OutlineInputBorder(
+                              ],
-                            borderRadius: BorderRadius.all(
-                          Radius.circular(10.0),
-                        )),
-                        errorBorder: OutlineInputBorder(
-                          borderSide: BorderSide(color: Colors.red),
-                        ),
-                        focusedErrorBorder: OutlineInputBorder(
-                          borderSide: BorderSide(color: Colors.red, width: 2.0),
-                        ),
-                      ),
-                      validator: (value) {
-                        if (value == null || value.isEmpty) {
-                          return 'Por favor, ingrese su nombre';
-                        }
-                        return null;
-                      },
-                    ),
-                    const SizedBox(height: 10.0),
-                    ElevatedButton(
-                      onPressed: _pickCertificadoPDF,
-                      child: Row(
-                        mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                        children: [
-                          const Text('Cargar pdf del certificado'),
-                          _certificadoPdfFile != null
-                              ? const Icon(Icons.check)
-                              : const Icon(Icons.file_upload_outlined),
-                        ],
-                      ),
-                    ),
-                    const SizedBox(height: 20.0),
-                    TextField(
-                      controller: _specialityController,
-                      onSubmitted: (value) {
-                        _addItemToList();
-                      },
-                      decoration: InputDecoration(
-                        labelText: 'Especializaciones',
-                        prefixIcon: const Icon(Icons.assignment_rounded),
-                        suffixIcon: IconButton(
-                            onPressed: () {
-                              _addItemToList();
-                            },
-                            icon: const Icon(Icons.add)),
-                        hintText: 'Ingresa tus especializaciones',
-                        border: const OutlineInputBorder(
-                            borderRadius: BorderRadius.all(
-                          Radius.circular(10.0),
-                        )),
-                        errorBorder: const OutlineInputBorder(
-                          borderSide: BorderSide(color: Colors.red),
-                        ),
-                        focusedErrorBorder: const OutlineInputBorder(
-                          borderSide: BorderSide(color: Colors.red, width: 2.0),
-                        ),
-                      ),
-                    ),
-                    const SizedBox(height: 10.0),
-                    ElevatedButton(
-                      onPressed: _pickEspecializacionesPDF,
-                      child: Row(
-                        mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                        children: [
-                          const Expanded(
-                            child: Text(
-                              'Cargar pdfs de tus especializaciones',
-                              overflow: TextOverflow.ellipsis,
-                              maxLines: 2,
                             ),
                           ),
-                          _especializacionesPdfFiles?.isNotEmpty == true
+                          const SizedBox(height: 20.0),
-                              ? const Icon(Icons.check)
+                          TextFormField(
-                              : const Icon(Icons.file_upload_outlined),
+                            controller: _professionController,
+                            readOnly: true,
+                            onTap: () async {
+                              final professionName = await Navigator.push(
+                                context,
+                                CupertinoPageRoute(
+                                  builder: (BuildContext context) {
+                                    return const ProfessionListScreen();
+                                  },
+                                ),
+                              );
+
+                              if (professionName != null) {
+                                _professionController.text = professionName;
+                              }
+                            },
+                            decoration: const InputDecoration(
+                              labelText: 'Profesión',
+                              prefixIcon: Icon(Icons.work_rounded),
+                              hintText: 'Selecciona tu profesión',
+                              border: OutlineInputBorder(
+                                  borderRadius: BorderRadius.all(
+                                Radius.circular(10.0),
+                              )),
+                              errorBorder: OutlineInputBorder(
+                                borderSide: BorderSide(color: Colors.red),
+                              ),
+                              focusedErrorBorder: OutlineInputBorder(
+                                borderSide:
+                                    BorderSide(color: Colors.red, width: 2.0),
+                              ),
+                            ),
+                            validator: (value) {
+                              if (value == null || value.isEmpty) {
+                                return 'Por favor, ingrese su nombre';
+                              }
+                              return null;
+                            },
+                          ),
+                          const SizedBox(height: 10.0),
+                          ElevatedButton(
+                            onPressed: _pickCertificadoPDF,
+                            child: Row(
+                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                              children: [
+                                const Text('Cargar pdf del certificado'),
+                                _certificadoPdfFile != null
+                                    ? const Icon(Icons.check)
+                                    : const Icon(Icons.file_upload_outlined),
+                              ],
+                            ),
+                          ),
+                          const SizedBox(height: 20.0),
+                          TextField(
+                            controller: _specialityController,
+                            onSubmitted: (value) {
+                              _addItemToList();
+                            },
+                            decoration: InputDecoration(
+                              labelText: 'Especializaciones',
+                              prefixIcon: const Icon(Icons.assignment_rounded),
+                              suffixIcon: IconButton(
+                                  onPressed: () {
+                                    _addItemToList();
+                                  },
+                                  icon: const Icon(Icons.add)),
+                              hintText: 'Ingresa tus especializaciones',
+                              border: const OutlineInputBorder(
+                                  borderRadius: BorderRadius.all(
+                                Radius.circular(10.0),
+                              )),
+                              errorBorder: const OutlineInputBorder(
+                                borderSide: BorderSide(color: Colors.red),
+                              ),
+                              focusedErrorBorder: const OutlineInputBorder(
+                                borderSide:
+                                    BorderSide(color: Colors.red, width: 2.0),
+                              ),
+                            ),
+                          ),
+                          const SizedBox(height: 10.0),
+                          ElevatedButton(
+                            onPressed: _pickEspecializacionesPDF,
+                            child: Row(
+                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                              children: [
+                                const Expanded(
+                                  child: Text(
+                                    'Cargar pdfs de tus especializaciones',
+                                    overflow: TextOverflow.ellipsis,
+                                    maxLines: 2,
+                                  ),
+                                ),
+                                _especializacionesPdfFiles?.isNotEmpty == true
+                                    ? const Icon(Icons.check)
+                                    : const Icon(Icons.file_upload_outlined),
+                              ],
+                            ),
+                          ),
+                          const SizedBox(height: 10.0),
+                          Wrap(
+                            spacing: 8.0,
+                            runSpacing: 4.0,
+                            children: _items
+                                .map((item) => Chip(
+                                      label: Text(item),
+                                      backgroundColor: Theme.of(context)
+                                          .colorScheme
+                                          .tertiary,
+                                      labelStyle:
+                                          const TextStyle(color: Colors.blue),
+                                      deleteIconColor: Colors.blue,
+                                      onDeleted: () {
+                                        _removeItemFromList(item);
+                                      },
+                                      shape: RoundedRectangleBorder(
+                                        side: const BorderSide(
+                                            color: Colors.blue, width: 0.3),
+                                        borderRadius: BorderRadius.circular(8),
+                                      ),
+                                    ))
+                                .toList(),
+                          ),
+                          const SizedBox(height: 20),
                         ],
                       ),
                     ),
-                    const SizedBox(height: 10.0),
+                  ),
-                    Wrap(
+                ),
-                      spacing: 8.0,
+                const Divider(
-                      runSpacing: 4.0,
+                  height: 1,
-                      children: _items
+                  thickness: 0.5,
-                          .map((item) => Chip(
+                ),
-                                label: Text(item),
+                Padding(
-                                backgroundColor:
+                    padding: const EdgeInsets.symmetric(
-                                    Theme.of(context).colorScheme.tertiary,
+                      vertical: 10,
-                                labelStyle: const TextStyle(color: Colors.blue),
+                      horizontal: 15,
-                                deleteIconColor: Colors.blue,
-                                onDeleted: () {
-                                  _removeItemFromList(item);
-                                },
-                                shape: RoundedRectangleBorder(
-                                  side: const BorderSide(
-                                      color: Colors.blue, width: 0.3),
-                                  borderRadius: BorderRadius.circular(8),
-                                ),
-                              ))
-                          .toList(),
                     ),
-                    const SizedBox(height: 40),
+                    child: FilledButton(
-                    ElevatedButton(
                       onPressed: () {
                         final userId =
                             context.read<MyUserBloc>().state.user!.id;
@@ -293,33 +315,26 @@ class _ProfessionalFormScreenState extends State<ProfessionalFormScreen> {
 
                         Navigator.pop(context);
                       },
-                      style: ElevatedButton.styleFrom(
+                      style: FilledButton.styleFrom(
-                        backgroundColor: Colors.blue,
+                        backgroundColor: Theme.of(context).colorScheme.primary,
-                        padding: const EdgeInsets.symmetric(vertical: 5),
+                        padding: const EdgeInsets.symmetric(vertical: 15),
                         shape: RoundedRectangleBorder(
-                          borderRadius: BorderRadius.circular(50),
+                          borderRadius: BorderRadius.circular(10),
                         ),
-                        shadowColor: Colors.grey,
-                        // elevation: 0,
                       ),
                       child: Container(
-                        constraints: const BoxConstraints(
-                            maxWidth: 300.0, minHeight: 50.0),
                         alignment: Alignment.center,
+                        width: double.infinity,
                         child: const Text(
                           'Enviar a revisión',
                           style: TextStyle(
                             color: Colors.white,
-                            fontSize: 16,
+                            fontSize: 18,
-                            fontWeight: FontWeight.bold,
                           ),
                         ),
                       ),
-                    ),
+                    )),
-                    const SizedBox(height: 20),
+              ],
-                  ],
-                ),
-              ),
             );
           },
         ),

lib/screens/service/service_screen.dart

@@ -0,0 +1,15 @@
+import 'package:flutter/material.dart';
+
+class ServiceScreen extends StatefulWidget {
+  const ServiceScreen({super.key});
+
+  @override
+  State<ServiceScreen> createState() => _ServiceScreenState();
+}
+
+class _ServiceScreenState extends State<ServiceScreen> {
+  @override
+  Widget build(BuildContext context) {
+    return Container();
+  }
+}

packages/professional_repository/lib/src/repositories/firebase_professional_repository.dart

@@ -190,10 +190,9 @@ class FirebaseProfessionalRepository {
     }
   }
 
-  Future<List<ProfessionalEntity>> getProfessionsFromIds(
+  Future<List<ProfessionalEntity>> getProfessionalsFromIds(
       Iterable<String> ids) async {
     try {
-      // Realizar una consulta única para obtener la información de todos los usuarios
       final querySnapshot = await professionalCollection
           .where(FieldPath.documentId, whereIn: ids)
           .get();

packages/service_repository/lib/src/repositories/firebase_service_repository.dart

@@ -37,4 +37,14 @@ class FirebaseServiceRepository {
             .map((doc) => ServiceEntity.fromDocument(doc.data()))
             .toList());
   }
+
+  Stream<List<ServiceEntity>> getServicesHistoryForUser(String userId) {
+    return serviceCollection
+        .where('user_id', isEqualTo: userId)
+        .where('status', whereIn: [3, 4])
+        .snapshots()
+        .map((querySnapshot) => querySnapshot.docs
+            .map((doc) => ServiceEntity.fromDocument(doc.data()))
+            .toList());
+  }
 }

packages/user_repository/lib/src/repositories/firebase_user_repository.dart

@@ -407,7 +407,6 @@ class FirebaseUserRepository implements UserRepository {
   @override
   Future<List<MyUser>> getUsersFromIds(Iterable<String> ids) async {
     try {
-      // Realizar una consulta única para obtener la información de todos los usuarios
       final querySnapshot =
           await usersCollection.where(FieldPath.documentId, whereIn: ids).get();