servicio

lib/screens/lists/professional_service_history_list_screen.dart

@@ -6,6 +6,7 @@ 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/screens/service/professional_service_screen.dart';
 import 'package:prosappco/screens/service/service_screen.dart';
 import 'package:service_repository/service_repository.dart';
 import 'package:shimmer/shimmer.dart';
@@ -52,7 +53,6 @@ class _ProfessionalServiceHistoryListScreenState
                       itemBuilder: (_, index) {
                         final serviceInfo = serviceState.services[index];
                         final user = serviceInfo.user;
-                        final professional = serviceInfo.professional;
                         final service = serviceInfo.service;
 
                         return Container(
@@ -68,7 +68,9 @@ class _ProfessionalServiceHistoryListScreenState
                                 context,
                                 CupertinoPageRoute(
                                   builder: (context) =>
-                                      const ServiceScreen(),
+                                      ProfessionalServiceScreen(
+                                    serviceId: service.id!,
+                                  ),
                                 ),
                               );
                             },
@@ -178,8 +180,8 @@ class _ProfessionalServiceHistoryListScreenState
     if (service.status == ServiceStatus.completed) {
       return itemStatus(Colors.blueAccent, 'Completado');
     }
-    if (service.status == ServiceStatus.cancelled) {
-      return itemStatus(Colors.red, 'Cancelado');
+    if (service.status == ServiceStatus.denied) {
+      return itemStatus(Colors.red, 'Rechazado');
     }
 
     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

@@ -6,6 +6,7 @@ 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/screens/service/professional_service_screen.dart';
 import 'package:prosappco/screens/service/service_screen.dart';
 import 'package:service_repository/service_repository.dart';
 import 'package:shimmer/shimmer.dart';
@@ -38,7 +39,7 @@ class _ProfessionalServiceListScreenState
       create: (context) => serviceBloc,
       child: Scaffold(
         appBar: AppBar(
-          title: const Text('Mis Servicios'),
+          title: const Text('Mis servicios'),
         ),
         body: BlocBuilder<ServiceBloc, ServiceState>(
           builder: (context, serviceState) {
@@ -66,7 +67,10 @@ class _ProfessionalServiceListScreenState
                               Navigator.push(
                                 context,
                                 CupertinoPageRoute(
-                                  builder: (context) => const ServiceScreen(),
+                                  builder: (context) =>
+                                      ProfessionalServiceScreen(
+                                    serviceId: service.id!,
+                                  ),
                                 ),
                               );
                             },
@@ -127,10 +131,12 @@ class _ProfessionalServiceListScreenState
                                     customStatus(service),
                                   ],
                                 ),
-                                Text(
-                                  '"${service.description.trim()}"',
-                                  overflow: TextOverflow.ellipsis,
-                                ),
+                                service.description.isEmpty
+                                    ? Container()
+                                    : Text(
+                                        '"${service.description.trim()}"',
+                                        overflow: TextOverflow.ellipsis,
+                                      ),
                               ],
                             ),
                           ),

lib/screens/lists/user_service_history_list_screen.dart

@@ -7,6 +7,7 @@ import 'package:intl/intl.dart';
 import 'package:professional_repository/professional_repository.dart';
 import 'package:prosappco/blocs/service_bloc/service_bloc.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:shimmer/shimmer.dart';
 
@@ -67,7 +68,9 @@ class _UserServiceHistoryListScreenState
                               Navigator.push(
                                 context,
                                 CupertinoPageRoute(
-                                  builder: (context) => const ServiceScreen(),
+                                  builder: (context) => UserServiceScreen(
+                                    serviceId: service.id!,
+                                  ),
                                 ),
                               );
                             },

lib/screens/lists/user_service_list_screen.dart

@@ -7,6 +7,7 @@ import 'package:intl/intl.dart';
 import 'package:professional_repository/professional_repository.dart';
 import 'package:prosappco/blocs/service_bloc/service_bloc.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:shimmer/shimmer.dart';
 
@@ -65,7 +66,9 @@ class _UserServiceListScreenState extends State<UserServiceListScreen> {
                               Navigator.push(
                                 context,
                                 CupertinoPageRoute(
-                                  builder: (context) => const ServiceScreen(),
+                                  builder: (context) => UserServiceScreen(
+                                    serviceId: service.id!,
+                                  ),
                                 ),
                               );
                             },