From ca41aa622479d28c10478620546e8447bfcbac9f Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Fri, 27 Jun 2025 16:37:09 +0300
Subject: [PATCH] all dates in heatmap are utc.

---
 .../analytics/models/occupancy_heat_map_model.dart | 14 +++++++++-----
 .../occupancy/widgets/interactive_heat_map.dart    |  2 +-
 .../occupancy/widgets/occupancy_heat_map.dart      |  4 ++--
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/lib/pages/analytics/models/occupancy_heat_map_model.dart b/lib/pages/analytics/models/occupancy_heat_map_model.dart
index 60d1a453..e4b7d730 100644
--- a/lib/pages/analytics/models/occupancy_heat_map_model.dart
+++ b/lib/pages/analytics/models/occupancy_heat_map_model.dart
@@ -14,14 +14,18 @@ class OccupancyHeatMapModel extends Equatable {
   });
 
   factory OccupancyHeatMapModel.fromJson(Map<String, dynamic> json) {
-    final eventDate = json['event_date'] as String? ?? '${DateTime.now()}';
-    final year = eventDate.split('-')[0];
-    final month = eventDate.split('-')[1];
-    final day = eventDate.split('-')[2];
+    final eventDate = json['event_date'] as String?;
+    final year = eventDate?.split('-')[0];
+    final month = eventDate?.split('-')[1];
+    final day = eventDate?.split('-')[2];
 
     return OccupancyHeatMapModel(
       uuid: json['uuid'] as String? ?? '',
-      eventDate: DateTime(int.parse(year), int.parse(month), int.parse(day)),
+      eventDate: DateTime(
+        int.parse(year ?? '2025'),
+        int.parse(month ?? '1'),
+        int.parse(day ?? '1'),
+      ).toUtc(),
       countTotalPresenceDetected: num.parse(
         json['count_total_presence_detected']?.toString() ?? '0',
       ).toInt(),
diff --git a/lib/pages/analytics/modules/occupancy/widgets/interactive_heat_map.dart b/lib/pages/analytics/modules/occupancy/widgets/interactive_heat_map.dart
index a652ae73..514ebb65 100644
--- a/lib/pages/analytics/modules/occupancy/widgets/interactive_heat_map.dart
+++ b/lib/pages/analytics/modules/occupancy/widgets/interactive_heat_map.dart
@@ -52,7 +52,7 @@ class _InteractiveHeatMapState extends State<InteractiveHeatMap> {
             color: Colors.transparent,
             child: Transform.translate(
               offset: Offset(-(widget.cellSize * 2.5), -50),
-              child: HeatMapTooltip(date: item.date, value: item.value),
+              child: HeatMapTooltip(date: item.date.toUtc(), value: item.value),
             ),
           ),
         ),
diff --git a/lib/pages/analytics/modules/occupancy/widgets/occupancy_heat_map.dart b/lib/pages/analytics/modules/occupancy/widgets/occupancy_heat_map.dart
index 05415421..0809a990 100644
--- a/lib/pages/analytics/modules/occupancy/widgets/occupancy_heat_map.dart
+++ b/lib/pages/analytics/modules/occupancy/widgets/occupancy_heat_map.dart
@@ -20,14 +20,14 @@ class OccupancyHeatMap extends StatelessWidget {
       : 0;
 
   DateTime _getStartingDate() {
-    final jan1 = DateTime(DateTime.now().year, 1, 1);
+    final jan1 = DateTime(DateTime.now().year, 1, 1).toUtc();
     final startOfWeek = jan1.subtract(Duration(days: jan1.weekday - 1));
     return startOfWeek;
   }
 
   List<OccupancyPaintItem> _generatePaintItems(DateTime startDate) {
     return List.generate(_totalWeeks * 7, (index) {
-      final date = startDate.add(Duration(days: index));
+      final date = startDate.toUtc().add(Duration(days: index));
       final value = heatMapData[date] ?? 0;
       return OccupancyPaintItem(index: index, value: value, date: date);
     });