Sp 1511 fe build occupancy heat map weekly monthly intensity view (#178)

* set the default tab to occupancy for ease of development. * Implemented an initial design for the occupancy chart. * Add Occupacy model and service for occupancy data handling. * Created `OccupancyBloc`. * Implemented the sidebar of Occupancy view. * Moved `OccupancyEndSideBar` widget to its own file. * Removed unnecessary widgets. * Matched the `OccupancyChart` with the figma design. * Added `AnalyticsDateFilterButton` to `OccupancyChartBox`. * Hides `AnalyticsDateFilterButton` that is in the page header, when the selected tab isn't `AnalyticsPageTab.energyManagement`. * Added animation to`AnalyticsDateFilterButton`. * modified the implementation of `FakeOccupacyService` to clamp all the generated values to less than a 100. * Injected `OccupancyBloc` into `AnalyticsPage`. * Made `OccupancyChart` read its data from `OccupancyBloc`. * Refactor AnalyticsCommunitiesSidebar to load data based on selected tab and implement loadEnergyManagementData method * Refactor Analytics views to use StatefulWidget and load data in initState * Created `OccupancyHeatMapModel`. * Add FakeOccupancyHeatMapService implementation. * Created `OccupancyHeatMapBloc`. * Injected `OccupancyHeatMapBloc` into `AnalyticsPage`. * Add OccupancyHeatMapBox widget and integrate into AnalyticsOccupancyView * Matching the heat map with the design, and added week days. * Made the HeatMap cells have a dashed border. * shows months. * responsiveness. * Integrate OccupancyHeatMapBloc and update OccupancyHeatMapBox to display heat map data with error handling * Integrate OccupancyHeatMapBloc and update OccupancyHeatMapBox to display heat map data with error handling * made the heatmap loading fast af by using painters instead of individually creating a widget for every single event. * Extracted `OccupancyHeatMapMonths` into its own widgte. * Moved `OccupancyHeatMapMonths` to its own file. * Adjusted design of `OccupancyHeatMapMonths`. * Adjust layout flex properties for `OccupancyEndSideBar` and its parent column in `AnalyticsOccupancyView`. * moved `OccupancyPaintItem` to `OccupancyPainter`s file. * removed comments from `OccupancyPainter`. * used color.withValues instead of .withOpacity. * re-added `OccupancyHeatMapGradient`. * Revert initial tab to `energyManagement`. * Made datepicker dynamic for multiple states. * Add year picker functionality to date filter button and implement dynamic date selection * Align date filter button to the end in occupancy chart and heat map boxes for improved UI consistency. * Enahnced color of border in `OccupancyPainter`. * Add ClearOccupancyHeatMapEvent to reset heat map state and update occupancy data helper to trigger event on empty selections * show percentage of value in tool tip of `OccupancyChart`.
2026-10-27 02:37:56 +00:00 · 2025-05-11 16:58:13 +03:00
parent d6f0b53b59
commit 49e93329c8
26 changed files with 983 additions and 102 deletions
@@ -2,16 +2,23 @@ import 'package:bloc/bloc.dart';
 import 'package:equatable/equatable.dart';

 part 'analytics_date_picker_event.dart';
+part 'analytics_date_picker_state.dart';

-class AnalyticsDatePickerBloc extends Bloc<AnalyticsDatePickerEvent, DateTime> {
-  AnalyticsDatePickerBloc() : super(DateTime.now()) {
+class AnalyticsDatePickerBloc
+    extends Bloc<AnalyticsDatePickerEvent, AnalyticsDatePickerState> {
+  AnalyticsDatePickerBloc() : super(AnalyticsDatePickerState()) {
    on<UpdateAnalyticsDatePickerEvent>(_onUpdateAnalyticsDatePickerEvent);
  }

  void _onUpdateAnalyticsDatePickerEvent(
    UpdateAnalyticsDatePickerEvent event,
-    Emitter<DateTime> emit,
+    Emitter<AnalyticsDatePickerState> emit,
  ) {
-    emit(event.date);
+    emit(
+      state.copyWith(
+        monthlyDate: event.montlyDate ?? state.monthlyDate,
+        yearlyDate: event.yearlyDate ?? state.yearlyDate,
+      ),
+    );
  }
 }
@@ -8,10 +8,11 @@ sealed class AnalyticsDatePickerEvent extends Equatable {
 }

 final class UpdateAnalyticsDatePickerEvent extends AnalyticsDatePickerEvent {
-  const UpdateAnalyticsDatePickerEvent(this.date);
+  const UpdateAnalyticsDatePickerEvent({this.montlyDate, this.yearlyDate});

-  final DateTime date;
+  final DateTime? montlyDate;
+  final DateTime? yearlyDate;

  @override
-  List<Object?> get props => [date];
+  List<Object?> get props => [montlyDate, yearlyDate];
 }
@@ -0,0 +1,25 @@
+part of 'analytics_date_picker_bloc.dart';
+
+final class AnalyticsDatePickerState extends Equatable {
+  AnalyticsDatePickerState({
+    DateTime? monthlyDate,
+    DateTime? yearlyDate,
+  })  : monthlyDate = monthlyDate ?? DateTime.now(),
+        yearlyDate = yearlyDate ?? DateTime.now();
+
+  final DateTime monthlyDate;
+  final DateTime yearlyDate;
+
+  AnalyticsDatePickerState copyWith({
+    DateTime? monthlyDate,
+    DateTime? yearlyDate,
+  }) {
+    return AnalyticsDatePickerState(
+      monthlyDate: monthlyDate ?? this.monthlyDate,
+      yearlyDate: yearlyDate ?? this.yearlyDate,
+    );
+  }
+
+  @override
+  List<Object?> get props => [monthlyDate, yearlyDate];
+}
@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/analytics/modules/analytics/blocs/analytics_date_picker_bloc/analytics_date_picker_bloc.dart';
 import 'package:syncrow_web/pages/analytics/modules/analytics/blocs/analytics_tab/analytics_tab_bloc.dart';
 import 'package:syncrow_web/pages/analytics/modules/analytics/widgets/analytics_communities_sidebar.dart';
 import 'package:syncrow_web/pages/analytics/modules/analytics/widgets/analytics_page_tabs_and_children.dart';
@@ -9,9 +10,11 @@ import 'package:syncrow_web/pages/analytics/modules/energy_management/blocs/powe
 import 'package:syncrow_web/pages/analytics/modules/energy_management/blocs/realtime_device_changes/realtime_device_changes_bloc.dart';
 import 'package:syncrow_web/pages/analytics/modules/energy_management/blocs/total_energy_consumption/total_energy_consumption_bloc.dart';
 import 'package:syncrow_web/pages/analytics/modules/occupancy/blocs/occupancy/occupancy_bloc.dart';
+import 'package:syncrow_web/pages/analytics/modules/occupancy/blocs/occupancy_heat_map/occupancy_heat_map_bloc.dart';
 import 'package:syncrow_web/pages/analytics/services/energy_consumption_by_phases/fake_energy_consumption_by_phases_service.dart';
 import 'package:syncrow_web/pages/analytics/services/energy_consumption_per_device/fake_energy_consumption_per_device_service.dart';
 import 'package:syncrow_web/pages/analytics/services/occupacy/fake_occupacy_service.dart';
+import 'package:syncrow_web/pages/analytics/services/occupancy_heat_map/fake_occupancy_heat_map_service.dart';
 import 'package:syncrow_web/pages/analytics/services/power_clamp_info/remote_power_clamp_info_service.dart';
 import 'package:syncrow_web/pages/analytics/services/realtime_device_service/firebase_realtime_device_service.dart';
 import 'package:syncrow_web/pages/analytics/services/total_energy_consumption/remote_total_energy_consumption_service.dart';
@@ -56,6 +59,10 @@ class AnalyticsPage extends StatelessWidget {
          ),
        ),
        BlocProvider(create: (context) => OccupancyBloc(FakeOccupacyService())),
+        BlocProvider(
+          create: (context) => OccupancyHeatMapBloc(FakeOccupancyHeatMapService()),
+        ),
+        BlocProvider(create: (context) => AnalyticsDatePickerBloc()),
      ],
      child: const AnalyticsPageForm(),
    );
@@ -1,15 +1,24 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_svg/svg.dart';
 import 'package:intl/intl.dart';
-import 'package:syncrow_web/pages/analytics/modules/analytics/blocs/analytics_date_picker_bloc/analytics_date_picker_bloc.dart';
 import 'package:syncrow_web/pages/analytics/modules/analytics/widgets/month_picker_widget.dart';
-import 'package:syncrow_web/pages/analytics/modules/energy_management/helpers/fetch_energy_management_data_helper.dart';
+import 'package:syncrow_web/pages/analytics/modules/analytics/widgets/year_picker_widget.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';

+enum DatePickerType { month, year }
+
 class AnalyticsDateFilterButton extends StatefulWidget {
-  const AnalyticsDateFilterButton({super.key});
+  const AnalyticsDateFilterButton({
+    required this.selectedDate,
+    required this.onDateSelected,
+    this.datePickerType = DatePickerType.month,
+    super.key,
+  });
+
+  final DateTime selectedDate;
+  final void Function(DateTime)? onDateSelected;
+  final DatePickerType datePickerType;

  static final _color = ColorsManager.blackColor.withValues(alpha: 0.8);

@@ -19,79 +28,69 @@ class AnalyticsDateFilterButton extends StatefulWidget {
 }

 class _AnalyticsDateFilterButtonState extends State<AnalyticsDateFilterButton> {
-  late final AnalyticsDatePickerBloc _analyticsDatePickerBloc;
-  @override
-  void initState() {
-    _analyticsDatePickerBloc = AnalyticsDatePickerBloc();
-    super.initState();
-  }
-
-  @override
-  void dispose() {
-    _analyticsDatePickerBloc.close();
-    super.dispose();
-  }
-
  @override
  Widget build(BuildContext context) {
-    return BlocProvider.value(
-      value: _analyticsDatePickerBloc,
-      child: Builder(builder: (context) {
-        final selectedDate = context.watch<AnalyticsDatePickerBloc>().state;
-        return TextButton.icon(
-          style: TextButton.styleFrom(
-            foregroundColor: AnalyticsDateFilterButton._color,
-            shape: RoundedRectangleBorder(
-              borderRadius: BorderRadius.circular(16),
-              side: const BorderSide(
-                color: ColorsManager.greyColor,
-                width: 1,
-              ),
-            ),
-            backgroundColor: ColorsManager.transparentColor,
-            padding: const EdgeInsets.symmetric(
-              horizontal: 32,
-              vertical: 16,
-            ),
+    return TextButton.icon(
+      style: TextButton.styleFrom(
+        foregroundColor: AnalyticsDateFilterButton._color,
+        shape: RoundedRectangleBorder(
+          borderRadius: BorderRadius.circular(16),
+          side: const BorderSide(
+            color: ColorsManager.greyColor,
+            width: 1,
          ),
-          icon: SvgPicture.asset(
-            Assets.blankCalendar,
-            height: 20,
-            width: 20,
-            colorFilter:
-                ColorFilter.mode(AnalyticsDateFilterButton._color, BlendMode.srcIn),
-          ),
-          label: Text(
-            _formatDate(selectedDate),
-            style: const TextStyle(
-              fontWeight: FontWeight.w700,
-            ),
-          ),
-          onPressed: () {
-            showDialog(
-              context: context,
-              builder: (_) => MonthPickerWidget(
-                selectedDate: selectedDate,
-                onDateSelected: (value) {
-                  _analyticsDatePickerBloc.add(
-                    UpdateAnalyticsDatePickerEvent(value),
-                  );
-                  FetchEnergyManagementDataHelper.fetchEnergyManagementData(
-                    context,
-                    selectedDate: value,
-                  );
-                },
-              ),
-            );
+        ),
+        backgroundColor: ColorsManager.transparentColor,
+        padding: const EdgeInsets.symmetric(
+          horizontal: 32,
+          vertical: 16,
+        ),
+      ),
+      icon: SvgPicture.asset(
+        Assets.blankCalendar,
+        height: 20,
+        width: 20,
+        colorFilter:
+            ColorFilter.mode(AnalyticsDateFilterButton._color, BlendMode.srcIn),
+      ),
+      label: Text(
+        _formatDate(widget.selectedDate),
+        style: const TextStyle(
+          fontWeight: FontWeight.w700,
+        ),
+      ),
+      onPressed: () {
+        showDialog(
+          context: context,
+          builder: (_) {
+            return switch (widget.datePickerType) {
+              DatePickerType.month => MonthPickerWidget(
+                  selectedDate: widget.selectedDate,
+                  onDateSelected: (value) {
+                    widget.onDateSelected?.call(value);
+                  },
+                ),
+              DatePickerType.year => YearPickerWidget(
+                  selectedDate: widget.selectedDate,
+                  onDateSelected: (value) {
+                    widget.onDateSelected?.call(value);
+                  },
+                ),
+            };
          },
        );
-      }),
+      },
    );
  }

  String _formatDate(DateTime? date) {
-    final formatter = DateFormat('MMMM yyyy');
-    final formattedDate = formatter.format(date ?? DateTime.now());
+    final formatterBasedOnDatePickerType = switch (widget.datePickerType) {
+      DatePickerType.month => DateFormat('MMMM yyyy'),
+      DatePickerType.year => DateFormat('yyyy'),
+    };
+    final formattedDate = formatterBasedOnDatePickerType.format(
+      date ?? DateTime.now(),
+    );
    return formattedDate;
  }
 }
@@ -1,9 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/analytics/modules/analytics/blocs/analytics_date_picker_bloc/analytics_date_picker_bloc.dart';
 import 'package:syncrow_web/pages/analytics/modules/analytics/blocs/analytics_tab/analytics_tab_bloc.dart';
 import 'package:syncrow_web/pages/analytics/modules/analytics/enums/analytics_page_tab.dart';
 import 'package:syncrow_web/pages/analytics/modules/analytics/widgets/analytics_date_filter_button.dart';
 import 'package:syncrow_web/pages/analytics/modules/analytics/widgets/analytics_page_tab_button.dart';
+import 'package:syncrow_web/pages/analytics/modules/energy_management/helpers/fetch_energy_management_data_helper.dart';
 import 'package:syncrow_web/utils/style.dart';

 class AnalyticsPageTabsAndChildren extends StatelessWidget {
@@ -51,14 +53,33 @@ class AnalyticsPageTabsAndChildren extends StatelessWidget {
                    ),
                  ),
                  const Spacer(),
-                  Visibility(
-                    visible: selectedTab == AnalyticsPageTab.energyManagement,
-                    child: const Expanded(
-                      flex: 2,
-                      child: FittedBox(
-                        fit: BoxFit.scaleDown,
-                        alignment: AlignmentDirectional.centerEnd,
-                        child: AnalyticsDateFilterButton(),
+                  _buildAnimation(
+                    child: Visibility(
+                      key: ValueKey(selectedTab),
+                      visible: selectedTab == AnalyticsPageTab.energyManagement,
+                      child: Expanded(
+                        flex: 2,
+                        child: FittedBox(
+                          fit: BoxFit.scaleDown,
+                          alignment: AlignmentDirectional.centerEnd,
+                          child: AnalyticsDateFilterButton(
+                            onDateSelected: (DateTime value) {
+                              context.read<AnalyticsDatePickerBloc>().add(
+                                    UpdateAnalyticsDatePickerEvent(
+                                        montlyDate: value),
+                                  );
+                              FetchEnergyManagementDataHelper
+                                  .fetchEnergyManagementData(
+                                context,
+                                selectedDate: value,
+                              );
+                            },
+                            selectedDate: context
+                                .watch<AnalyticsDatePickerBloc>()
+                                .state
+                                .monthlyDate,
+                          ),
+                        ),
                      ),
                    ),
                  ),
@@ -0,0 +1,147 @@
+import 'package:flutter/material.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
+import 'package:syncrow_web/utils/extension/build_context_x.dart';
+
+class YearPickerWidget extends StatefulWidget {
+  const YearPickerWidget({
+    super.key,
+    required this.selectedDate,
+    required this.onDateSelected,
+  });
+
+  final DateTime selectedDate;
+  final ValueChanged<DateTime>? onDateSelected;
+
+  @override
+  State<YearPickerWidget> createState() => _YearPickerWidgetState();
+}
+
+class _YearPickerWidgetState extends State<YearPickerWidget> {
+  late int _currentYear;
+
+  static final years = List.generate(
+    DateTime.now().year - 2020 + 1,
+    (index) => (2020 + index),
+  );
+
+  @override
+  void initState() {
+    super.initState();
+    _currentYear = widget.selectedDate.year;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Dialog(
+      backgroundColor: Theme.of(context).colorScheme.surface,
+      child: Container(
+        padding: const EdgeInsetsDirectional.all(20),
+        width: 320,
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            _buildMonthsGrid(),
+            const SizedBox(height: 20),
+            Row(
+              spacing: 12,
+              mainAxisAlignment: MainAxisAlignment.end,
+              children: [
+                FilledButton(
+                  onPressed: () => Navigator.pop(context),
+                  style: FilledButton.styleFrom(
+                    fixedSize: const Size(106, 40),
+                    backgroundColor: const Color(0xFFEDF2F7),
+                    padding: const EdgeInsetsDirectional.symmetric(
+                      vertical: 10,
+                      horizontal: 16,
+                    ),
+                    shape: RoundedRectangleBorder(
+                      borderRadius: BorderRadius.circular(20),
+                    ),
+                  ),
+                  child: Text(
+                    'Cancel',
+                    style: context.textTheme.titleSmall?.copyWith(
+                      fontSize: 14,
+                      fontWeight: FontWeight.w600,
+                      color: ColorsManager.grey700,
+                    ),
+                  ),
+                ),
+                FilledButton(
+                  onPressed: () {
+                    Navigator.pop(context);
+                    final date = DateTime(_currentYear);
+                    widget.onDateSelected?.call(date);
+                  },
+                  style: FilledButton.styleFrom(
+                    fixedSize: const Size(106, 40),
+                    backgroundColor: ColorsManager.vividBlue.withValues(
+                      alpha: 0.7,
+                    ),
+                    padding: const EdgeInsetsDirectional.symmetric(
+                      vertical: 10,
+                      horizontal: 16,
+                    ),
+                    shape: RoundedRectangleBorder(
+                      borderRadius: BorderRadius.circular(20),
+                    ),
+                  ),
+                  child: Text(
+                    'Done',
+                    style: context.textTheme.titleSmall?.copyWith(
+                      fontSize: 14,
+                      fontWeight: FontWeight.w600,
+                      color: ColorsManager.whiteColors,
+                    ),
+                  ),
+                ),
+              ],
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildMonthsGrid() {
+    return GridView.builder(
+      shrinkWrap: true,
+      itemCount: years.length,
+      physics: const NeverScrollableScrollPhysics(),
+      padding: const EdgeInsets.all(8),
+      gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
+        crossAxisCount: 3,
+        childAspectRatio: 2.5,
+        mainAxisSpacing: 8,
+        mainAxisExtent: 30,
+      ),
+      itemBuilder: (context, index) {
+        final isSelected = _currentYear == years[index];
+        return InkWell(
+          onTap: () => setState(() => _currentYear = years[index]),
+          child: Container(
+            alignment: Alignment.center,
+            decoration: BoxDecoration(
+              color: isSelected
+                  ? ColorsManager.vividBlue.withValues(alpha: 0.7)
+                  : const Color(0xFFEDF2F7),
+              borderRadius:
+                  isSelected ? BorderRadius.circular(15) : BorderRadius.zero,
+            ),
+            child: Text(
+              years[index].toString(),
+              style: context.textTheme.titleSmall?.copyWith(
+                fontSize: 12,
+                color: isSelected
+                    ? ColorsManager.whiteColors
+                    : ColorsManager.blackColor.withValues(alpha: 0.8),
+                fontWeight: FontWeight.w500,
+              ),
+            ),
+          ),
+        );
+      },
+    );
+  }
+}