after

lib/screens/user/user_calendar_screen.dart

@@ -20,12 +20,16 @@ class UserCalendarScreen extends StatefulWidget {
 
 class UserCalendarScreenState extends State<UserCalendarScreen> {
   final settingRepository = Injector.appInstance.get<SettingRepository>();
+  final serviceRepository =
+      Injector.appInstance.get<FirebaseServiceRepository>();
   SettingEntity? settings;
 
   DateTime today = DateTime.now();
   DateTime now = DateTime.now();
   late int numDay;
 
+  List<ServiceEntity>? _services;
+
   CalendarFormat _calendarFormat = CalendarFormat.month;
 
   @override
@@ -36,6 +40,7 @@ class UserCalendarScreenState extends State<UserCalendarScreen> {
     numDay = today.weekday;
 
     _loadSettings();
+    _loadServices();
   }
 
   void _loadSettings() {
@@ -46,6 +51,17 @@ class UserCalendarScreenState extends State<UserCalendarScreen> {
         );
   }
 
+  void _loadServices() {
+    serviceRepository
+        .getServicesForProfessionalforCalendar(
+            widget.userProfessional.myUser.id)
+        .then((services) {
+      setState(() {
+        _services = services;
+      });
+    });
+  }
+
   void _onDaySelected(DateTime day, DateTime focusedDay) {
     setState(() {
       today = day;
@@ -164,7 +180,7 @@ class UserCalendarScreenState extends State<UserCalendarScreen> {
         schedule.range2Hour2!,
       );
 
-      return rangesItemList(ranges, null);
+      return rangesItemList(ranges, _services);
     }
 
     List<TimeOfDay> ranges1 = TimeOfDayUtils.genRanges(
@@ -177,23 +193,15 @@ class UserCalendarScreenState extends State<UserCalendarScreen> {
     );
 
     return [
-      ...rangesItemList(ranges1, null),
-      ...rangesItemList(ranges2, null),
+      ...rangesItemList(ranges1, _services),
+      ...rangesItemList(ranges2, _services),
     ];
   }
 
   bool _isHora1Ocupada(TimeOfDay hora1, List<ServiceEntity>? events) {
     if (events != null) {
       for (ServiceEntity event in events) {
-        DateTime time1 = DateTime(
-          today.year,
-          today.month,
-          today.day,
-          hora1.hour,
-          hora1.minute,
-        );
-
-        if (event.range1Hour1 == time1.toString()) {
+        if (hora1 == event.range1Hour1) {
           return true;
         }
       }
@@ -238,7 +246,7 @@ class UserCalendarScreenState extends State<UserCalendarScreen> {
               ),
             ),
             title: Text(
-              time.format(context),
+              ScheduleEntity.getFormatTime(time) ?? '',
               style: const TextStyle(fontSize: 15, fontWeight: FontWeight.bold),
             ),
             subtitle: const Text(

lib/screens/user/user_map_screen.dart

@@ -16,10 +16,8 @@ import 'package:prosappco/blocs/my_user_bloc/my_user_bloc.dart';
 import 'package:prosappco/blocs/professional_list_bloc/professional_list_bloc.dart';
 import 'package:prosappco/blocs/service_bloc/service_bloc.dart';
 import 'package:prosappco/constansts.dart';
-import 'package:prosappco/screens/lists/city_list_screen.dart';
 import 'package:prosappco/screens/lists/professional_list_screen.dart';
 import 'package:prosappco/screens/user/user_service_screen.dart';
-import 'package:prosappco/screens/web/web_view_screen.dart';
 import 'package:prosappco/utils/time_of_day_extension.dart';
 import 'package:service_repository/service_repository.dart';
 import 'package:setting_repository/setting_repository.dart';