enhance week navigation layout for improved UI

Enhance garage door scheduling functionality and UI improvements (#358 )
## Description  Enhance garage door scheduling functionality and UI improvements ## Type of Change  - [ ] ✨ New feature (non-breaking change which adds functionality) - [x] 🛠️ Bug fix (non-breaking change which fixes an issue) - [ ] ❌ Breaking change (fix or feature that would cause existing functionality to change) - [ ] 🧹 Code refactor - [ ] ✅ Build configuration change - [ ] 📝 Documentation - [ ] 🗑️ Chore
2025-08-25 17:49:40 +00:00 · 2025-07-22 14:40:50 +03:00 · 2025-07-21 16:25:53 +03:00 · 2025-07-21 16:25:34 +03:00 · 2025-07-21 15:22:17 +03:00 · 2025-07-21 15:10:15 +03:00
28 changed files with 335 additions and 464 deletions
--- a/lib/pages/access_management/booking_system/presentation/bloc/calendar/events_bloc.dart
+++ b/lib/pages/access_management/booking_system/presentation/bloc/calendar/events_bloc.dart
@ -10,7 +10,7 @@ part 'events_event.dart';
 part 'events_state.dart';

 class CalendarEventsBloc extends Bloc<CalendarEventsEvent, CalendarEventState> {
-  final EventController eventController = EventController();
+  EventController eventController = EventController();
  final CalendarSystemService calendarService;

  CalendarEventsBloc({
@ -20,7 +20,9 @@ class CalendarEventsBloc extends Bloc<CalendarEventsEvent, CalendarEventState> {
    on<AddEvent>(_onAddEvent);
    on<DisposeResources>(_onDisposeResources);
    on<GoToWeek>(_onGoToWeek);
+    on<ResetEvents>(_onResetEvents);
  }
+
  Future<void> _onLoadEvents(
    LoadEvents event,
    Emitter<CalendarEventState> emit,
@ -126,4 +128,18 @@ class CalendarEventsBloc extends Bloc<CalendarEventsEvent, CalendarEventState> {
    eventController.dispose();
    return super.close();
  }
+
+  void _onResetEvents(
+    ResetEvents event,
+    Emitter<CalendarEventState> emit,
+  ) {
+    if (calendarService is MemoryCalendarServiceWithRemoteFallback) {
+      (calendarService as MemoryCalendarServiceWithRemoteFallback)
+          .memoryService
+          .clear();
+    }
+    eventController.dispose();
+    eventController = EventController();
+    emit(EventsInitial());
+  }
 }
--- a/lib/pages/access_management/booking_system/presentation/bloc/calendar/events_event.dart
+++ b/lib/pages/access_management/booking_system/presentation/bloc/calendar/events_event.dart
@ -29,3 +29,10 @@ class CheckWeekHasEvents extends CalendarEventsEvent {
  final DateTime weekStart;
  const CheckWeekHasEvents(this.weekStart);
 }
+
+class ResetEvents extends CalendarEventsEvent {
+  const ResetEvents();
+
+  @override
+  List<Object?> get props => [];
+}
--- a/lib/pages/access_management/booking_system/presentation/view/booking_page.dart
+++ b/lib/pages/access_management/booking_system/presentation/view/booking_page.dart
@ -26,7 +26,33 @@ class BookingPage extends StatefulWidget {
 }

 class _BookingPageState extends State<BookingPage> {
-  late final EventController _eventController;
+  @override
+  Widget build(BuildContext context) {
+    return MultiBlocProvider(
+      providers: [
+        BlocProvider(create: (_) => SelectedBookableSpaceBloc()),
+        BlocProvider(create: (_) => DateSelectionBloc()),
+        BlocProvider(
+          create: (_) => CalendarEventsBloc(
+            calendarService: MemoryCalendarServiceWithRemoteFallback(
+              remoteService: RemoteCalendarService(HTTPService()),
+              memoryService: MemoryCalendarService(),
+            ),
+          ),
+        ),
+      ],
+      child: _BookingPageContent(),
+    );
+  }
+}
+
+class _BookingPageContent extends StatefulWidget {
+  @override
+  State<_BookingPageContent> createState() => _BookingPageContentState();
+}
+
+class _BookingPageContentState extends State<_BookingPageContent> {
+  late EventController _eventController;

  @override
  void initState() {
@ -40,7 +66,7 @@ class _BookingPageState extends State<BookingPage> {
    super.dispose();
  }

-  void _dispatchLoadEvents(BuildContext context) {
+  void _loadEvents(BuildContext context) {
    final selectedRoom =
        context.read<SelectedBookableSpaceBloc>().state.selectedBookableSpace;
    final dateState = context.read<DateSelectionBloc>().state;
@ -60,186 +86,168 @@ class _BookingPageState extends State<BookingPage> {

  @override
  Widget build(BuildContext context) {
-    return MultiBlocProvider(
-      providers: [
-        BlocProvider(create: (_) => SelectedBookableSpaceBloc()),
-        BlocProvider(create: (_) => DateSelectionBloc()),
-        BlocProvider(
-            create: (_) => CalendarEventsBloc(
-                  calendarService: MemoryCalendarServiceWithRemoteFallback(
-                    remoteService: RemoteCalendarService(
-                      HTTPService(),
-                    ),
-                    memoryService: MemoryCalendarService(),
-                  ),
-                )),
-      ],
-      child: Builder(
-        builder: (context) =>
-            BlocListener<CalendarEventsBloc, CalendarEventState>(
-          listenWhen: (prev, curr) => curr is EventsLoaded,
+    return BlocListener<SelectedBookableSpaceBloc, SelectedBookableSpaceState>(
+      listener: (context, state) {
+        if (state.selectedBookableSpace != null) {
+          context.read<CalendarEventsBloc>().add(const ResetEvents());
+          _loadEvents(context);
+        }
+      },
+      child: BlocListener<DateSelectionBloc, DateSelectionState>(
+        listener: (context, state) {
+          _loadEvents(context);
+        },
+        child: BlocListener<CalendarEventsBloc, CalendarEventState>(
          listener: (context, state) {
            if (state is EventsLoaded) {
              _eventController.removeWhere((_) => true);
              _eventController.addAll(state.events);
            }
          },
-          child: BlocListener<SelectedBookableSpaceBloc,
-              SelectedBookableSpaceState>(
-            listener: (context, state) => _dispatchLoadEvents(context),
-            child: BlocListener<DateSelectionBloc, DateSelectionState>(
-              listener: (context, state) => _dispatchLoadEvents(context),
-              child: Row(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  Expanded(
-                    child: Container(
-                      decoration: BoxDecoration(
-                        color: ColorsManager.whiteColors,
-                        boxShadow: [
-                          BoxShadow(
-                            color: ColorsManager.blackColor.withOpacity(0.1),
-                            offset: const Offset(3, 0),
-                            blurRadius: 6,
-                            spreadRadius: 0,
-                          ),
-                        ],
+          child: Row(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Expanded(
+                child: Container(
+                  decoration: BoxDecoration(
+                    color: ColorsManager.whiteColors,
+                    boxShadow: [
+                      BoxShadow(
+                        color: ColorsManager.blackColor.withOpacity(0.1),
+                        offset: const Offset(3, 0),
+                        blurRadius: 6,
+                        spreadRadius: 0,
                      ),
-                      child: Column(
-                        children: [
-                          Expanded(
-                            flex: 2,
-                            child: BlocBuilder<SelectedBookableSpaceBloc,
-                                SelectedBookableSpaceState>(
-                              builder: (context, state) {
-                                return BookingSidebar(
-                                  onRoomSelected: (selectedRoom) {
-                                    context
-                                        .read<SelectedBookableSpaceBloc>()
-                                        .add(SelectBookableSpace(selectedRoom));
-                                  },
-                                );
-                              },
-                            ),
-                          ),
-                          Expanded(
-                            child: BlocBuilder<DateSelectionBloc,
-                                DateSelectionState>(
-                              builder: (context, dateState) {
-                                return CustomCalendarPage(
-                                  selectedDate: dateState.selectedDate,
-                                  onDateChanged: (day, month, year) {
-                                    final newDate = DateTime(year, month, day);
-                                    context
-                                        .read<DateSelectionBloc>()
-                                        .add(SelectDate(newDate));
-                                    context.read<DateSelectionBloc>().add(
-                                        SelectDateFromSidebarCalendar(newDate));
-                                  },
-                                );
-                              },
-                            ),
-                          ),
-                        ],
-                      ),
-                    ),
+                    ],
                  ),
-                  Expanded(
-                    flex: 5,
-                    child: Padding(
-                      padding: const EdgeInsets.all(20.0),
-                      child: Column(
-                        crossAxisAlignment: CrossAxisAlignment.start,
+                  child: Column(
+                    children: [
+                      Expanded(
+                        flex: 2,
+                        child: BlocBuilder<SelectedBookableSpaceBloc,
+                            SelectedBookableSpaceState>(
+                          builder: (context, state) {
+                            return BookingSidebar(
+                              onRoomSelected: (selectedRoom) {
+                                context
+                                    .read<SelectedBookableSpaceBloc>()
+                                    .add(SelectBookableSpace(selectedRoom));
+                              },
+                            );
+                          },
+                        ),
+                      ),
+                      Expanded(
+                        child:
+                            BlocBuilder<DateSelectionBloc, DateSelectionState>(
+                          builder: (context, dateState) {
+                            return CustomCalendarPage(
+                              selectedDate: dateState.selectedDate,
+                              onDateChanged: (day, month, year) {
+                                final newDate = DateTime(year, month, day);
+                                context
+                                    .read<DateSelectionBloc>()
+                                    .add(SelectDate(newDate));
+                                context.read<DateSelectionBloc>().add(
+                                    SelectDateFromSidebarCalendar(newDate));
+                              },
+                            );
+                          },
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
+              ),
+              Expanded(
+                flex: 5,
+                child: Padding(
+                  padding: const EdgeInsets.all(20.0),
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      Row(
+                        mainAxisAlignment: MainAxisAlignment.spaceBetween,
                        children: [
                          Row(
-                            mainAxisAlignment: MainAxisAlignment.spaceBetween,
                            children: [
-                              Row(
-                                children: [
-                                  SvgTextButton(
-                                    svgAsset: Assets.homeIcon,
-                                    label: 'Manage Bookable Spaces',
-                                    onPressed: () {},
-                                  ),
-                                  const SizedBox(width: 20),
-                                  SvgTextButton(
-                                    svgAsset: Assets.groupIcon,
-                                    label: 'Manage Users',
-                                    onPressed: () {},
-                                  ),
-                                ],
+                              SvgTextButton(
+                                svgAsset: Assets.homeIcon,
+                                label: 'Manage Bookable Spaces',
+                                onPressed: () {},
                              ),
-                              BlocBuilder<DateSelectionBloc,
-                                  DateSelectionState>(
-                                builder: (context, state) {
-                                  final weekStart = state.weekStart;
-                                  final weekEnd =
-                                      weekStart.add(const Duration(days: 6));
-                                  return WeekNavigation(
-                                    weekStart: weekStart,
-                                    weekEnd: weekEnd,
-                                    onPreviousWeek: () {
-                                      context
-                                          .read<DateSelectionBloc>()
-                                          .add(PreviousWeek());
-                                    },
-                                    onNextWeek: () {
-                                      context
-                                          .read<DateSelectionBloc>()
-                                          .add(NextWeek());
-                                    },
-                                  );
-                                },
+                              const SizedBox(width: 20),
+                              SvgTextButton(
+                                svgAsset: Assets.groupIcon,
+                                label: 'Manage Users',
+                                onPressed: () {},
                              ),
                            ],
                          ),
-                          Expanded(
-                            flex: 5,
-                            child: BlocBuilder<SelectedBookableSpaceBloc,
-                                SelectedBookableSpaceState>(
-                              builder: (context, roomState) {
-                                final selectedRoom =
-                                    roomState.selectedBookableSpace;
-                                return BlocBuilder<DateSelectionBloc,
-                                    DateSelectionState>(
-                                  builder: (context, dateState) {
-                                    return BlocListener<CalendarEventsBloc,
-                                        CalendarEventState>(
-                                      listenWhen: (prev, curr) =>
-                                          curr is EventsLoaded,
-                                      listener: (context, state) {
-                                        if (state is EventsLoaded) {
-                                          _eventController
-                                              .removeWhere((_) => true);
-                                          _eventController.addAll(state.events);
-                                        }
-                                      },
-                                      child: WeeklyCalendarPage(
-                                        startTime: selectedRoom
-                                            ?.bookableConfig.startTime,
-                                        endTime: selectedRoom
-                                            ?.bookableConfig.endTime,
-                                        weekStart: dateState.weekStart,
-                                        selectedDate: dateState.selectedDate,
-                                        eventController: _eventController,
-                                        selectedDateFromSideBarCalender: context
-                                            .watch<DateSelectionBloc>()
-                                            .state
-                                            .selectedDateFromSideBarCalender,
-                                      ),
+                          BlocBuilder<DateSelectionBloc, DateSelectionState>(
+                            builder: (context, state) {
+                              final weekStart = state.weekStart;
+                              final weekEnd =
+                                  weekStart.add(const Duration(days: 6));
+                              return WeekNavigation(
+                                weekStart: weekStart,
+                                weekEnd: weekEnd,
+                                onPreviousWeek: () {
+                                  context
+                                      .read<DateSelectionBloc>()
+                                      .add(PreviousWeek());
+                                },
+                                onNextWeek: () {
+                                  context
+                                      .read<DateSelectionBloc>()
+                                      .add(NextWeek());
+                                },
+                              );
+                            },
+                          ),
+                        ],
+                      ),
+                      const SizedBox(height: 20),
+                      Expanded(
+                        flex: 5,
+                        child: BlocBuilder<SelectedBookableSpaceBloc,
+                            SelectedBookableSpaceState>(
+                          builder: (context, roomState) {
+                            final selectedRoom =
+                                roomState.selectedBookableSpace;
+                            return BlocBuilder<DateSelectionBloc,
+                                DateSelectionState>(
+                              builder: (context, dateState) {
+                                return BlocBuilder<CalendarEventsBloc,
+                                    CalendarEventState>(
+                                  builder: (context, eventState) {
+                                    return WeeklyCalendarPage(
+                                      key: ValueKey(
+                                          selectedRoom?.uuid ?? 'no-room'),
+                                      startTime: selectedRoom
+                                          ?.bookableConfig.startTime,
+                                      endTime:
+                                          selectedRoom?.bookableConfig.endTime,
+                                      weekStart: dateState.weekStart,
+                                      selectedDate: dateState.selectedDate,
+                                      eventController: _eventController,
+                                      selectedDateFromSideBarCalender: context
+                                          .watch<DateSelectionBloc>()
+                                          .state
+                                          .selectedDateFromSideBarCalender,
                                    );
                                  },
                                );
                              },
-                            ),
-                          ),
-                        ],
+                            );
+                          },
+                        ),
                      ),
-                    ),
+                    ],
                  ),
-                ],
+                ),
              ),
-            ),
+            ],
          ),
        ),
      ),
--- a/lib/pages/access_management/booking_system/presentation/view/widgets/booking_sidebar.dart
+++ b/lib/pages/access_management/booking_system/presentation/view/widgets/booking_sidebar.dart
@ -76,21 +76,29 @@ class __SidebarContentState extends State<_SidebarContent> {
      builder: (context, state) {
        return Column(
          children: [
-            const _SidebarHeader(title: 'Spaces'),
+            Padding(
+              padding: const EdgeInsets.only(top: 10.0, bottom: 10.0),
+              child: Container(
+                  decoration: BoxDecoration(
+                    color: ColorsManager.whiteColors,
+                    boxShadow: [
+                      BoxShadow(
+                        color: ColorsManager.blackColor.withOpacity(0.1),
+                        offset: const Offset(0, 4),
+                        blurRadius: 4,
+                        spreadRadius: 0,
+                      ),
+                    ],
+                  ),
+                  child: _SidebarHeader(title: 'Spaces')),
+            ),
            Container(
              decoration: BoxDecoration(
                color: ColorsManager.whiteColors,
-                borderRadius: BorderRadius.circular(8.0),
                boxShadow: [
                  BoxShadow(
                    color: ColorsManager.blackColor.withOpacity(0.1),
-                    offset: const Offset(0, -2),
-                    blurRadius: 4,
-                    spreadRadius: 0,
-                  ),
-                  BoxShadow(
-                    color: ColorsManager.blackColor.withOpacity(0.1),
-                    offset: const Offset(0, 2),
+                    offset: const Offset(0, 4),
                    blurRadius: 4,
                    spreadRadius: 0,
                  ),
@ -220,7 +228,7 @@ class _SidebarHeader extends StatelessWidget {
  @override
  Widget build(BuildContext context) {
    return Padding(
-      padding: const EdgeInsets.all(16.0),
+      padding: const EdgeInsets.all(10.0),
      child: Row(
        mainAxisAlignment: MainAxisAlignment.spaceBetween,
        children: [
--- a/lib/pages/access_management/booking_system/presentation/view/widgets/custom_calendar_page.dart
+++ b/lib/pages/access_management/booking_system/presentation/view/widgets/custom_calendar_page.dart
@ -66,18 +66,28 @@ class _CustomCalendarPageState extends State<CustomCalendarPage> {
      weekdayLabels: const ['Mo', 'Tu', 'We', 'Th', 'Fr', 'Sa', 'Su'],
    );

-    return CalendarDatePicker2(
-      config: config,
-      value: [_selectedDate],
-      onValueChanged: (dates) {
-        final picked = dates.first;
-        if (picked != null) {
-          setState(() {
-            _selectedDate = picked;
-          });
-          widget.onDateChanged(picked.day, picked.month, picked.year);
-        }
-      },
+    return Container(
+      decoration: const BoxDecoration(
+        border: Border(
+          top: BorderSide(
+            color: ColorsManager.textGray,
+            width: 1.0,
+          ),
+        ),
+      ),
+      child: CalendarDatePicker2(
+        config: config,
+        value: [_selectedDate],
+        onValueChanged: (dates) {
+          final picked = dates.first;
+          if (picked != null) {
+            setState(() {
+              _selectedDate = picked;
+            });
+            widget.onDateChanged(picked.day, picked.month, picked.year);
+          }
+        },
+      ),
    );
  }
 }
--- a/lib/pages/access_management/booking_system/presentation/view/widgets/event_tile_widget.dart
+++ b/lib/pages/access_management/booking_system/presentation/view/widgets/event_tile_widget.dart
@ -32,15 +32,17 @@ class EventTileWidget extends StatelessWidget {
          return Expanded(
            child: Container(
              width: double.infinity,
-              padding: EdgeInsets.all(5),
+              padding: const EdgeInsets.all(5),
              decoration: BoxDecoration(
                color: isEventEnded
                    ? ColorsManager.grayColor.withOpacity(0.1)
                    : ColorsManager.blue1.withOpacity(0.1),
                borderRadius: BorderRadius.circular(6),
-                border: const Border(
+                border: Border(
                  left: BorderSide(
-                    color: ColorsManager.grayColor,
+                    color: isEventEnded
+                        ? ColorsManager.grayColor
+                        : ColorsManager.secondaryColor,
                    width: 4,
                  ),
                ),
--- a/lib/pages/access_management/booking_system/presentation/view/widgets/room_list_item.dart
+++ b/lib/pages/access_management/booking_system/presentation/view/widgets/room_list_item.dart
@ -21,7 +21,7 @@ class RoomListItem extends StatelessWidget {
      groupValue: isSelected ? room.uuid : null,
      visualDensity: const VisualDensity(vertical: -4),
      onChanged: (value) => onTap(),
-      activeColor: ColorsManager.primaryColor,
+      activeColor: ColorsManager.secondaryColor,
      title: Text(
        room.spaceName,
        maxLines: 2,
--- a/lib/pages/access_management/booking_system/presentation/view/widgets/week_day_header.dart
+++ b/lib/pages/access_management/booking_system/presentation/view/widgets/week_day_header.dart
@ -14,26 +14,33 @@ class WeekDayHeader extends StatelessWidget {

  @override
  Widget build(BuildContext context) {
-    return Column(
-      children: [
-        Text(
-          DateFormat('EEE').format(date).toUpperCase(),
-          style: TextStyle(
-            fontWeight: FontWeight.w400,
-            fontSize: 14,
-            color: isSelectedDay ? Colors.blue : Colors.black,
+    return ColoredBox(
+      color: isSelectedDay
+          ? ColorsManager.secondaryColor.withOpacity(0.1)
+          : Colors.transparent,
+      child: Column(
+        children: [
+          const SizedBox(
+            height: 10,
          ),
-        ),
-        Text(
-          DateFormat('d').format(date),
-          style: TextStyle(
-            fontWeight: FontWeight.w700,
-            fontSize: 20,
-            color:
-                isSelectedDay ? ColorsManager.blue1 : ColorsManager.blackColor,
+          Text(
+            DateFormat('EEE').format(date).toUpperCase(),
+            style: const TextStyle(
+              fontWeight: FontWeight.w400,
+              fontSize: 14,
+              color: ColorsManager.blackColor,
+            ),
          ),
-        ),
-      ],
+          Text(
+            DateFormat('d').format(date),
+            style: const TextStyle(
+              fontWeight: FontWeight.w700,
+              fontSize: 30,
+              color: ColorsManager.blackColor,
+            ),
+          ),
+        ],
+      ),
    );
  }
 }
--- a/lib/pages/access_management/booking_system/presentation/view/widgets/week_navigation.dart
+++ b/lib/pages/access_management/booking_system/presentation/view/widgets/week_navigation.dart
@ -19,6 +19,7 @@ class WeekNavigation extends StatelessWidget {
  @override
  Widget build(BuildContext context) {
    return Container(
+      width: 250,
      padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 5),
      decoration: BoxDecoration(
        color: ColorsManager.circleRolesBackground,
@ -32,6 +33,8 @@ class WeekNavigation extends StatelessWidget {
        ],
      ),
      child: Row(
+        mainAxisAlignment: MainAxisAlignment.center,
+        crossAxisAlignment: CrossAxisAlignment.center,
        children: [
          IconButton(
            iconSize: 15,
@ -40,12 +43,16 @@ class WeekNavigation extends StatelessWidget {
            onPressed: onPreviousWeek,
          ),
          const SizedBox(width: 10),
-          Text(
-            _getMonthYearText(weekStart, weekEnd),
-            style: const TextStyle(
-              color: ColorsManager.lightGrayColor,
-              fontSize: 14,
-              fontWeight: FontWeight.w400,
+          SizedBox(
+            width: 120,
+            child: Text(
+              _getMonthYearText(weekStart, weekEnd),
+              style: const TextStyle(
+                color: ColorsManager.lightGrayColor,
+                fontSize: 14,
+                fontWeight: FontWeight.w400,
+              ),
+              textAlign: TextAlign.center,
            ),
          ),
          const SizedBox(width: 10),
--- a/lib/pages/access_management/booking_system/presentation/view/widgets/weekly_calendar_page.dart
+++ b/lib/pages/access_management/booking_system/presentation/view/widgets/weekly_calendar_page.dart
@ -24,7 +24,7 @@ class WeeklyCalendarPage extends StatelessWidget {
  });
  static const double timeLineWidth = 65;
  static const int totalDays = 7;
-  static const double dayColumnWidth = 220; 
+  static const double dayColumnWidth = 220;

  final double calendarContentWidth =
      timeLineWidth + (totalDays * dayColumnWidth);
@ -57,13 +57,10 @@ class WeeklyCalendarPage extends StatelessWidget {
      );
    }

-  
-
-    const double timeLineWidth = 65;
+    const double timeLineWidth = 90;

    return LayoutBuilder(
      builder: (context, constraints) {
-  
        bool isInRange(DateTime date, DateTime start, DateTime end) {
          !date.isBefore(start) && !date.isAfter(end);
          // remove this line and Check if the date is within the range
@ -100,7 +97,6 @@ class WeeklyCalendarPage extends StatelessWidget {
                              width: width,
                              decoration: BoxDecoration(
                                color: Colors.orange.withOpacity(0.13),
-                                borderRadius: BorderRadius.circular(8),
                              ),
                            );
                          } else if (isSelected) {
@ -110,7 +106,6 @@ class WeeklyCalendarPage extends StatelessWidget {
                              decoration: BoxDecoration(
                                color:
                                    ColorsManager.spaceColor.withOpacity(0.07),
-                                borderRadius: BorderRadius.circular(8),
                              ),
                            );
                          }
@ -143,7 +138,7 @@ class WeeklyCalendarPage extends StatelessWidget {
                        heightPerMinute: 1.7,
                        showLiveTimeLineInAllDays: false,
                        showVerticalLines: true,
-                        emulateVerticalOffsetBy: -80,
+                        emulateVerticalOffsetBy: -95,
                        startDay: WeekDays.monday,
                        liveTimeIndicatorSettings:
                            const LiveTimeIndicatorSettings(
@ -161,7 +156,7 @@ class WeeklyCalendarPage extends StatelessWidget {
                        },
                        timeLineWidth: timeLineWidth,
                        weekPageHeaderBuilder: (start, end) => Container(),
-                        weekTitleHeight: 60,
+                        weekTitleHeight: 90,
                        weekNumberBuilder: (firstDayOfWeek) => Padding(
                          padding: const EdgeInsets.only(right: 15, bottom: 10),
                          child: Column(
@ -208,8 +203,6 @@ class WeeklyCalendarPage extends StatelessWidget {
      },
    );
  }
-
-
 }

 bool isSameDay(DateTime d1, DateTime d2) {
--- a/lib/pages/device_managment/garage_door/view/garage_door_control_view.dart
+++ b/lib/pages/device_managment/garage_door/view/garage_door_control_view.dart
@ -6,6 +6,7 @@ import 'package:syncrow_web/pages/device_managment/garage_door/bloc/garage_door_
 import 'package:syncrow_web/pages/device_managment/garage_door/helper/garage_door_helper.dart';
 import 'package:syncrow_web/pages/device_managment/garage_door/models/garage_door_model.dart';
 import 'package:syncrow_web/pages/device_managment/garage_door/schedule_view/schedule_garage_view.dart';
+import 'package:syncrow_web/pages/device_managment/schedule_device/schedule_widgets/schedual_view.dart';
 import 'package:syncrow_web/pages/device_managment/shared/icon_name_status_container.dart';
 import 'package:syncrow_web/pages/device_managment/shared/table/report_table.dart';
 import 'package:syncrow_web/pages/device_managment/shared/toggle_widget.dart';
@ -94,11 +95,18 @@ class GarageDoorControlView extends StatelessWidget
                  FetchGarageDoorSchedulesEvent(
                      deviceId: deviceId, category: 'doorcontact_state'),
                );
-            showDialog(
+
+            showDialog<void>(
                context: context,
                builder: (ctx) => BlocProvider.value(
                      value: BlocProvider.of<GarageDoorBloc>(context),
-                      child: BuildGarageDoorScheduleView(status: status),
+                      child: BuildScheduleView(
+                        deviceUuid: deviceId,
+                        category: 'Timer',
+                        code: 'doorcontact_state',
+                        countdownCode: 'Timer',
+                        deviceType: 'GD',
+                      ),
                    ));
          },
          name: 'Scheduling',
--- a/lib/pages/device_managment/schedule_device/bloc/schedule_bloc.dart
+++ b/lib/pages/device_managment/schedule_device/bloc/schedule_bloc.dart
@ -287,7 +287,8 @@ class ScheduleBloc extends Bloc<ScheduleEvent, ScheduleState> {
    try {
      if (state is ScheduleLoaded) {
        Status status = Status(code: '', value: '');
-        if (event.deviceType == 'CUR_2') {
+        if (event.deviceType == 'CUR_2' ||
+            event.deviceType == 'GD' ) {
          status = status.copyWith(
              code: 'control',
              value: event.functionOn == true ? 'open' : 'close');
--- a/lib/pages/device_managment/schedule_device/schedule_widgets/count_down_button.dart
+++ b/lib/pages/device_managment/schedule_device/schedule_widgets/count_down_button.dart
@ -69,7 +69,7 @@ class CountdownModeButtons extends StatelessWidget {
                              countDownCode: countDownCode),
                        );
                  },
-                  backgroundColor: ColorsManager.primaryColorWithOpacity,
+                  backgroundColor: ColorsManager.secondaryColor,
                  child: const Text('Save'),
                ),
        ),
--- a/lib/pages/device_managment/schedule_device/schedule_widgets/inching_mode_buttons.dart
+++ b/lib/pages/device_managment/schedule_device/schedule_widgets/inching_mode_buttons.dart
@ -63,7 +63,7 @@ class InchingModeButtons extends StatelessWidget {
                          ),
                        );
                  },
-                  backgroundColor: ColorsManager.primaryColor,
+                  backgroundColor: ColorsManager.secondaryColor,
                  child: const Text('Save'),
                ),
        ),
--- a/lib/pages/device_managment/schedule_device/schedule_widgets/schedual_view.dart
+++ b/lib/pages/device_managment/schedule_device/schedule_widgets/schedual_view.dart
@ -31,11 +31,12 @@ class BuildScheduleView extends StatelessWidget {
  @override
  Widget build(BuildContext context) {
    return BlocProvider(
-      create: (_) => ScheduleBloc(deviceId: deviceUuid,)
+      create: (_) => ScheduleBloc(
+        deviceId: deviceUuid,
+      )
        ..add(ScheduleGetEvent(category: category))
        ..add(ScheduleFetchStatusEvent(
-            deviceId: deviceUuid,
-            countdownCode: countdownCode ?? '')),
+            deviceId: deviceUuid, countdownCode: countdownCode ?? '')),
      child: Dialog(
        backgroundColor: Colors.white,
        insetPadding: const EdgeInsets.all(20),
@ -56,7 +57,7 @@ class BuildScheduleView extends StatelessWidget {
                      children: [
                        const ScheduleHeader(),
                        const SizedBox(height: 20),
-                        if (deviceType == 'CUR_2')
+                        if (deviceType == 'CUR_2' || deviceType == 'GD')
                          const SizedBox()
                        else
                          ScheduleModeSelector(
@ -76,8 +77,7 @@ class BuildScheduleView extends StatelessWidget {
                                        category: category,
                                        time: '',
                                        function: Status(
-                                            code: code.toString(),
-                                            value: true),
+                                            code: code.toString(), value: true),
                                        days: [],
                                      ),
                                      isEdit: false,
@ -96,7 +96,7 @@ class BuildScheduleView extends StatelessWidget {
                              }
                            },
                          ),
-                        if (deviceType != 'CUR_2')
+                        if (deviceType != 'CUR_2'|| deviceType != 'GD')
                          if (state.scheduleMode == ScheduleModes.countdown ||
                              state.scheduleMode == ScheduleModes.inching)
                            CountdownInchingView(
--- a/lib/pages/device_managment/schedule_device/schedule_widgets/schedule_managment_ui.dart
+++ b/lib/pages/device_managment/schedule_device/schedule_widgets/schedule_managment_ui.dart
@ -24,12 +24,13 @@ class ScheduleManagementUI extends StatelessWidget {
      crossAxisAlignment: CrossAxisAlignment.start,
      children: [
        SizedBox(
-          width: 170,
+          width: 177,
          height: 40,
          child: DefaultButton(
-            borderColor: ColorsManager.grayColor.withOpacity(0.5),
-            padding: 2,
-            backgroundColor: ColorsManager.graysColor,
+            borderWidth: 4,
+            borderColor: ColorsManager.neutralGray,
+            padding: 8,
+            backgroundColor: ColorsManager.textFieldGreyColor,
            borderRadius: 15,
            onPressed: onAddSchedule,
            child: Row(
--- a/lib/pages/device_managment/schedule_device/schedule_widgets/schedule_mode_buttons.dart
+++ b/lib/pages/device_managment/schedule_device/schedule_widgets/schedule_mode_buttons.dart
@ -39,7 +39,7 @@ class ScheduleModeButtons extends StatelessWidget {
            borderRadius: 8,
            height: 40,
            onPressed: onSave,
-            backgroundColor: ColorsManager.primaryColorWithOpacity,
+            backgroundColor: ColorsManager.secondaryColor,
            child: const Text('Save'),
          ),
        ),
--- a/lib/pages/device_managment/schedule_device/schedule_widgets/schedule_table.dart
+++ b/lib/pages/device_managment/schedule_device/schedule_widgets/schedule_table.dart
@ -194,7 +194,7 @@ class _ScheduleTableView extends StatelessWidget {
            child: Text(_getSelectedDays(
                ScheduleModel.parseSelectedDays(schedule.days)))),
        Center(child: Text(formatIsoStringToTime(schedule.time, context))),
-        if (deviceType == 'CUR_2')
+        if (deviceType == 'CUR_2' || deviceType == 'GD')
          Center(
              child: Text(schedule.function.value == true ? 'open' : 'close'))
        else
--- a/lib/pages/device_managment/water_heater/helper/add_schedule_dialog_helper.dart
+++ b/lib/pages/device_managment/water_heater/helper/add_schedule_dialog_helper.dart
@ -23,7 +23,7 @@ class ScheduleDialogHelper {
    required String deviceType,
  }) {
    bool temp;
-    if (deviceType == 'CUR_2') {
+    if (deviceType == 'CUR_2' || deviceType == 'GD') {
      temp = schedule!.function.value == 'open' ? true : false;
    } else {
      temp = schedule!.function.value;
@ -116,7 +116,7 @@ class ScheduleDialogHelper {
                ScheduleModeButtons(
                  onSave: () {
                    dynamic temp;
-                    if (deviceType == 'CUR_2') {
+                    if (deviceType == 'CUR_2' || deviceType == 'GD') {
                      temp = functionOn! ? 'open' : 'close';
                    } else {
                      temp = functionOn;
@ -202,18 +202,23 @@ class ScheduleDialogHelper {
        ),
        const SizedBox(width: 10),
        Radio<bool>(
+          activeColor: ColorsManager.secondaryColor,
+          focusColor: ColorsManager.secondaryColor,
          value: true,
          groupValue: isOn,
          onChanged: (val) => onChanged(true),
        ),
-        Text(categor == 'CUR_2' ? 'open' : 'On'),
+        Text(categor == 'CUR_2' || categor == 'GD' ? 'open' : 'On'),
        const SizedBox(width: 10),
        Radio<bool>(
+          activeColor: ColorsManager.secondaryColor,
+          focusColor: ColorsManager.secondaryColor,
+
          value: false,
          groupValue: isOn,
          onChanged: (val) => onChanged(false),
        ),
-        Text(categor == 'CUR_2' ? 'close' : 'Off'),
+        Text(categor == 'CUR_2' || categor == 'GD' ? 'close' : 'Off'),
      ],
    );
  }
--- a/lib/pages/space_management_v2/main_module/views/space_management_page.dart
+++ b/lib/pages/space_management_v2/main_module/views/space_management_page.dart
@ -9,8 +9,6 @@ import 'package:syncrow_web/pages/space_management_v2/modules/communities/presen
 import 'package:syncrow_web/pages/space_management_v2/modules/communities/presentation/communities_tree_selection_bloc/communities_tree_selection_bloc.dart';
 import 'package:syncrow_web/pages/space_management_v2/modules/products/data/services/remote_products_service.dart';
 import 'package:syncrow_web/pages/space_management_v2/modules/products/presentation/bloc/products_bloc.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/reorder_spaces/data/services/remote_reorder_spaces_service.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/reorder_spaces/presentation/bloc/reorder_spaces_bloc.dart';
 import 'package:syncrow_web/pages/space_management_v2/modules/space_details/data/services/remote_space_details_service.dart';
 import 'package:syncrow_web/pages/space_management_v2/modules/space_details/data/services/unique_space_details_spaces_decorator_service.dart';
 import 'package:syncrow_web/pages/space_management_v2/modules/space_details/presentation/bloc/space_details_bloc.dart';
@ -27,16 +25,15 @@ class SpaceManagementPage extends StatefulWidget {

 class _SpaceManagementPageState extends State<SpaceManagementPage> {
  late final CommunitiesBloc communitiesBloc;
-  late final HTTPService _httpService;

  @override
  void initState() {
-    _httpService = HTTPService();
    communitiesBloc = CommunitiesBloc(
      communitiesService: DebouncedCommunitiesService(
-        RemoteCommunitiesService(_httpService),
+        RemoteCommunitiesService(HTTPService()),
      ),
    )..add(const LoadCommunities(LoadCommunitiesParam()));
+
    super.initState();
  }

@ -53,18 +50,13 @@ class _SpaceManagementPageState extends State<SpaceManagementPage> {
        BlocProvider(
          create: (context) => SpaceDetailsBloc(
            UniqueSpaceDetailsSpacesDecoratorService(
-              RemoteSpaceDetailsService(httpService: _httpService),
+              RemoteSpaceDetailsService(httpService: HTTPService()),
            ),
          ),
        ),
        BlocProvider(
          create: (context) => ProductsBloc(
-            RemoteProductsService(_httpService),
-          ),
-        ),
-        BlocProvider(
-          create: (context) => ReorderSpacesBloc(
-            RemoteReorderSpacesService(_httpService),
+            RemoteProductsService(HTTPService()),
          ),
        ),
      ],
--- a/lib/pages/space_management_v2/main_module/widgets/community_structure_canvas.dart
+++ b/lib/pages/space_management_v2/main_module/widgets/community_structure_canvas.dart
@ -11,8 +11,6 @@ import 'package:syncrow_web/pages/space_management_v2/modules/communities/domain
 import 'package:syncrow_web/pages/space_management_v2/modules/communities/domain/models/space_model.dart';
 import 'package:syncrow_web/pages/space_management_v2/modules/communities/presentation/bloc/communities_bloc.dart';
 import 'package:syncrow_web/pages/space_management_v2/modules/communities/presentation/communities_tree_selection_bloc/communities_tree_selection_bloc.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/reorder_spaces/domain/params/reorder_spaces_param.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/reorder_spaces/presentation/bloc/reorder_spaces_bloc.dart';
 import 'package:syncrow_web/pages/space_management_v2/modules/space_details/presentation/helpers/space_details_dialog_helper.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';

@ -166,16 +164,6 @@ class _CommunityStructureCanvasState extends State<CommunityStructureCanvas>
    context.read<CommunitiesBloc>().add(
          CommunitiesUpdateCommunity(newCommunity),
        );
-
-    context.read<ReorderSpacesBloc>().add(
-          ReorderSpacesEvent(
-            ReorderSpacesParam(
-              communityUuid: widget.community.uuid,
-              parentSpaceUuid: data.parent?.uuid ?? '',
-              spaces: children,
-            ),
-          ),
-        );
  }

  void _onSpaceTapped(SpaceModel? space) {
@ -257,13 +245,6 @@ class _CommunityStructureCanvasState extends State<CommunityStructureCanvas>
    final levelXOffset = <int, double>{};
    _calculateLayout(community.spaces, 0, levelXOffset);

-    const horizontalCanvasPadding = 100.0;
-    final originalPositions = Map.of(_positions);
-    _positions.clear();
-    for (final entry in originalPositions.entries) {
-      _positions[entry.key] = entry.value.translate(horizontalCanvasPadding, 0);
-    }
-
    final selectedSpace = widget.selectedSpace;
    final highlightedUuids = <String>{};
    if (selectedSpace != null) {
@ -281,7 +262,7 @@ class _CommunityStructureCanvasState extends State<CommunityStructureCanvas>
      community: widget.community,
    );

-    final createButtonX = (levelXOffset[0] ?? 0.0) + horizontalCanvasPadding;
+    final createButtonX = levelXOffset[0] ?? 0.0;
    const createButtonY = 0.0;

    widgets.add(
@ -313,12 +294,10 @@ class _CommunityStructureCanvasState extends State<CommunityStructureCanvas>
    CommunityModel? community,
    SpaceModel? parent,
  }) {
-    const targetWidth = 40.0;
-    final padding = (_horizontalSpacing - targetWidth) / 2;
    if (spaces.isNotEmpty) {
      final firstChildPos = _positions[spaces.first.uuid]!;
      final targetPos = Offset(
-        firstChildPos.dx - padding - targetWidth,
+        firstChildPos.dx - (_horizontalSpacing / 4),
        firstChildPos.dy,
      );
      widgets.add(_buildDropTarget(parent, community, 0, targetPos));
@ -400,7 +379,7 @@ class _CommunityStructureCanvasState extends State<CommunityStructureCanvas>
      );

      final targetPos = Offset(
-        position.dx + cardWidth + padding,
+        position.dx + cardWidth + (_horizontalSpacing / 4) - 20,
        position.dy,
      );
      widgets.add(_buildDropTarget(parent, community, i + 1, targetPos));
@ -435,33 +414,24 @@ class _CommunityStructureCanvasState extends State<CommunityStructureCanvas>
      child: DragTarget<SpaceReorderDataModel>(
        builder: (context, candidateData, rejectedData) {
          if (_draggedData == null) {
-            return const SizedBox.shrink();
+            return const SizedBox();
          }

-          final children = parent?.children ?? community?.spaces ?? [];
-          final isSameParent = (_draggedData!.parent?.uuid == parent?.uuid &&
-                  _draggedData!.community == null) ||
-              (_draggedData!.community?.uuid == community?.uuid &&
-                  _draggedData!.parent == null);
+          final isTargetForDragged = (_draggedData?.parent?.uuid == parent?.uuid &&
+                  _draggedData?.community == null) ||
+              (_draggedData?.community?.uuid == community?.uuid &&
+                  _draggedData?.parent == null);

-          if (!isSameParent) {
-            return const SizedBox.shrink();
+          if (!isTargetForDragged) {
+            return const SizedBox();
          }

-          final oldIndex =
-              children.indexWhere((s) => s.uuid == _draggedData!.space.uuid);
-          if (oldIndex != -1 && (oldIndex == index || oldIndex == index - 1)) {
-            return const SizedBox.shrink();
-          }
-
-          return AnimatedContainer(
-            duration: const Duration(milliseconds: 150),
+          return Container(
            width: 40,
-            alignment: Alignment.center,
            height: _cardHeight,
            decoration: BoxDecoration(
              color: context.theme.colorScheme.primary.withValues(
-                alpha: candidateData.isNotEmpty ? 0.9 : 0.3,
+                alpha: candidateData.isNotEmpty ? 0.7 : 0.3,
              ),
              borderRadius: BorderRadius.circular(8),
            ),
@ -484,9 +454,6 @@ class _CommunityStructureCanvasState extends State<CommunityStructureCanvas>

          final oldIndex =
              children.indexWhere((s) => s.uuid == data.data.space.uuid);
-          if (oldIndex == -1) {
-            return true;
-          }
          if (oldIndex == index || oldIndex == index - 1) {
            return false;
          }
@ -514,7 +481,7 @@ class _CommunityStructureCanvasState extends State<CommunityStructureCanvas>
        child: SizedBox(
          width: context.screenWidth * 5,
          height: context.screenHeight * 5,
-          child: Stack(clipBehavior: Clip.none, children: treeWidgets),
+          child: Stack(children: treeWidgets),
        ),
      ),
    );
--- a/lib/pages/space_management_v2/modules/reorder_spaces/data/services/remote_reorder_spaces_service.dart
+++ b/lib/pages/space_management_v2/modules/reorder_spaces/data/services/remote_reorder_spaces_service.dart
@ -1,58 +0,0 @@
-import 'package:dio/dio.dart';
-import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/reorder_spaces/domain/params/reorder_spaces_param.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/reorder_spaces/domain/services/reorder_spaces_service.dart';
-import 'package:syncrow_web/services/api/api_exception.dart';
-import 'package:syncrow_web/services/api/http_service.dart';
-import 'package:syncrow_web/utils/constants/api_const.dart';
-
-final class RemoteReorderSpacesService implements ReorderSpacesService {
-  RemoteReorderSpacesService(this._httpClient);
-
-  final HTTPService _httpClient;
-
-  @override
-  Future<void> reorderSpaces(ReorderSpacesParam param) async {
-    try {
-      await _httpClient.post(
-        path: await _makeUrl(param),
-        body: param.toJson(),
-        expectedResponseModel: (json) => json,
-      );
-    } on DioException catch (e) {
-      final message = e.response?.data as Map<String, dynamic>?;
-      throw APIException(_getErrorMessageFromBody(message));
-    } catch (e) {
-      throw APIException(e.toString());
-    }
-  }
-
-  String _getErrorMessageFromBody(Map<String, dynamic>? body) {
-    if (body == null) return 'Failed to delete space';
-    final error = body['error'] as Map<String, dynamic>?;
-    final errorMessage = error?['message'] as String? ?? '';
-    return errorMessage;
-  }
-
-  Future<String> _makeUrl(ReorderSpacesParam param) async {
-    final projectUuid = await ProjectManager.getProjectUUID();
-    final communityUuid = param.communityUuid;
-
-    if (projectUuid == null || projectUuid.isEmpty) {
-      throw APIException('Project UUID is not set');
-    }
-
-    if (communityUuid.isEmpty) {
-      throw APIException('Community UUID is not set');
-    }
-
-    if (param.parentSpaceUuid.isEmpty) {
-      throw APIException('Parent Space UUID is not set');
-    }
-
-    return ApiEndpoints.reorderSpaces
-        .replaceAll('{projectUuid}', projectUuid)
-        .replaceAll('{communityUuid}', communityUuid)
-        .replaceAll('{parentSpaceUuid}', param.parentSpaceUuid);
-  }
-}
--- a/lib/pages/space_management_v2/modules/reorder_spaces/domain/params/reorder_spaces_param.dart
+++ b/lib/pages/space_management_v2/modules/reorder_spaces/domain/params/reorder_spaces_param.dart
@ -1,21 +0,0 @@
-import 'package:equatable/equatable.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/communities/domain/models/space_model.dart';
-
-class ReorderSpacesParam extends Equatable {
-  const ReorderSpacesParam({
-    required this.communityUuid,
-    required this.parentSpaceUuid,
-    required this.spaces,
-  });
-
-  final String communityUuid;
-  final String parentSpaceUuid;
-  final List<SpaceModel> spaces;
-
-  @override
-  List<Object?> get props => [spaces, communityUuid, parentSpaceUuid];
-
-  Map<String, dynamic> toJson() => {
-        'spacesUuids': spaces.map((space) => space.uuid).toList(),
-      };
-}
--- a/lib/pages/space_management_v2/modules/reorder_spaces/domain/services/reorder_spaces_service.dart
+++ b/lib/pages/space_management_v2/modules/reorder_spaces/domain/services/reorder_spaces_service.dart
@ -1,5 +0,0 @@
-import 'package:syncrow_web/pages/space_management_v2/modules/reorder_spaces/domain/params/reorder_spaces_param.dart';
-
-abstract interface class ReorderSpacesService {
-  Future<void> reorderSpaces(ReorderSpacesParam param);
-}
--- a/lib/pages/space_management_v2/modules/reorder_spaces/presentation/bloc/reorder_spaces_bloc.dart
+++ b/lib/pages/space_management_v2/modules/reorder_spaces/presentation/bloc/reorder_spaces_bloc.dart
@ -1,35 +0,0 @@
-import 'package:bloc/bloc.dart';
-import 'package:equatable/equatable.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/reorder_spaces/domain/params/reorder_spaces_param.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/reorder_spaces/domain/services/reorder_spaces_service.dart';
-import 'package:syncrow_web/services/api/api_exception.dart';
-
-part 'reorder_spaces_event.dart';
-part 'reorder_spaces_state.dart';
-
-class ReorderSpacesBloc extends Bloc<ReorderSpacesEvent, ReorderSpacesState> {
-  ReorderSpacesBloc(
-    this._reorderSpacesService,
-  ) : super(const ReorderSpacesInitial()) {
-    on<ReorderSpacesEvent>(_onReorderSpacesEvent);
-  }
-
-  final ReorderSpacesService _reorderSpacesService;
-
-  Future<void> _onReorderSpacesEvent(
-    ReorderSpacesEvent event,
-    Emitter<ReorderSpacesState> emit,
-  ) async {
-    emit(const ReorderSpacesLoading());
-    try {
-      await _reorderSpacesService.reorderSpaces(event.param);
-      emit(const ReorderSpacesSuccess());
-    } on APIException catch (e) {
-      emit(ReorderSpacesFailure(e.message));
-    } catch (e) {
-      emit(ReorderSpacesFailure(e.toString()));
-    } finally {
-      emit(const ReorderSpacesInitial());
-    }
-  }
-}
--- a/lib/pages/space_management_v2/modules/reorder_spaces/presentation/bloc/reorder_spaces_event.dart
+++ b/lib/pages/space_management_v2/modules/reorder_spaces/presentation/bloc/reorder_spaces_event.dart
@ -1,10 +0,0 @@
-part of 'reorder_spaces_bloc.dart';
-
-final class ReorderSpacesEvent extends Equatable {
-  const ReorderSpacesEvent(this.param);
-
-  final ReorderSpacesParam param;
-
-  @override
-  List<Object> get props => [param];
-}
--- a/lib/pages/space_management_v2/modules/reorder_spaces/presentation/bloc/reorder_spaces_state.dart
+++ b/lib/pages/space_management_v2/modules/reorder_spaces/presentation/bloc/reorder_spaces_state.dart
@ -1,29 +0,0 @@
-part of 'reorder_spaces_bloc.dart';
-
-sealed class ReorderSpacesState extends Equatable {
-  const ReorderSpacesState();
-
-  @override
-  List<Object> get props => [];
-}
-
-final class ReorderSpacesInitial extends ReorderSpacesState {
-  const ReorderSpacesInitial();
-}
-
-final class ReorderSpacesLoading extends ReorderSpacesState {
-  const ReorderSpacesLoading();
-}
-
-final class ReorderSpacesSuccess extends ReorderSpacesState {
-  const ReorderSpacesSuccess();
-}
-
-final class ReorderSpacesFailure extends ReorderSpacesState {
-  const ReorderSpacesFailure(this.errorMessage);
-
-  final String errorMessage;
-
-  @override
-  List<Object> get props => [errorMessage];
-}
--- a/lib/utils/constants/api_const.dart
+++ b/lib/utils/constants/api_const.dart
@ -41,8 +41,6 @@ abstract class ApiEndpoints {
      '/projects/{projectId}/communities/{communityId}/spaces/{spaceId}';
  static const String getSpaceHierarchy =
      '/projects/{projectId}/communities/{communityId}/spaces';
-  static const String reorderSpaces =
-      '/projects/{projectUuid}/communities/{communityUuid}/spaces/{parentSpaceUuid}/spaces/order';

 // Community Module
  static const String createCommunity = '/projects/{projectId}/communities';
@ -142,6 +140,5 @@ abstract class ApiEndpoints {
  static const String saveSchedule = '/schedule/{deviceUuid}';

  static const String getBookableSpaces = '/bookable-spaces';
-  static const String getBookings =
-      '/bookings?month={mm}%2F{yyyy}&space={space}';
+  static const String getBookings = '/bookings?month={mm}-{yyyy}&space={space}';
 }
Author	SHA1	Message	Date
mohammad	59058cf2d2	enhance week navigation layout for improved UI	2025-07-22 14:40:50 +03:00
mohammadnemer1	0eb4652f26	Enhance garage door scheduling functionality and UI improvements (#358 ) <!-- Thanks for contributing! Provide a description of your changes below and a general summary in the title Please look at the following checklist to ensure that your PR can be accepted quickly: --> ## Description <!--- Describe your changes in detail --> Enhance garage door scheduling functionality and UI improvements ## Type of Change <!--- Put an `x` in all the boxes that apply: --> - [ ] ✨ New feature (non-breaking change which adds functionality) - [x] 🛠️ Bug fix (non-breaking change which fixes an issue) - [ ] ❌ Breaking change (fix or feature that would cause existing functionality to change) - [ ] 🧹 Code refactor - [ ] ✅ Build configuration change - [ ] 📝 Documentation - [ ] 🗑️ Chore	2025-07-21 16:25:53 +03:00
mohammadnemer1	460639b681	Refactor booking system: update API endpoint format, add ResetEvents event, and enhance UI components for improved user experience (#361 ) <!-- Thanks for contributing! Provide a description of your changes below and a general summary in the title Please look at the following checklist to ensure that your PR can be accepted quickly: --> ## Description <!--- Describe your changes in detail --> Refactor booking system: update API endpoint format, add ResetEvents event, and enhance UI components for improved user experience ## Type of Change <!--- Put an `x` in all the boxes that apply: --> - [ ] ✨ New feature (non-breaking change which adds functionality) - [x] 🛠️ Bug fix (non-breaking change which fixes an issue) - [ ] ❌ Breaking change (fix or feature that would cause existing functionality to change) - [ ] 🧹 Code refactor - [ ] ✅ Build configuration change - [ ] 📝 Documentation - [ ] 🗑️ Chore	2025-07-21 16:25:34 +03:00
mohammad	5589e5b587	Refactor booking system: update API endpoint format, add ResetEvents event, and enhance UI components for improved user experience	2025-07-21 15:22:17 +03:00
mohammad	d3bd363b70	Fix category check in schedule dialog for water heater	2025-07-21 15:10:15 +03:00
mohammad	076c80fe44	Enhance garage door scheduling functionality and UI improvements	2025-07-17 17:02:23 +03:00