ammar/syncrow-web
1
0
Fork 0
mirror of https://github.com/SyncrowIOT/web.git synced 2025-07-15 01:35:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

all dates in heatmap are utc.

Browse Source
This commit is contained in:
Faris Armoush
2025-06-27 16:37:09 +03:00
parent 475462301f
commit ca41aa6224
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/pages/analytics/models/occupancy_heat_map_model.dart
View File

@ -14,14 +14,18 @@ class OccupancyHeatMapModel extends Equatable {
}); });
factory OccupancyHeatMapModel.fromJson(Map<String, dynamic> json) { factory OccupancyHeatMapModel.fromJson(Map<String, dynamic> json) {
final eventDate = json['event_date'] as String? ?? '${DateTime.now()}'; final eventDate = json['event_date'] as String?;
final year = eventDate.split('-')[0]; final year = eventDate?.split('-')[0];
final month = eventDate.split('-')[1]; final month = eventDate?.split('-')[1];
final day = eventDate.split('-')[2]; final day = eventDate?.split('-')[2];
return OccupancyHeatMapModel( return OccupancyHeatMapModel(
uuid: json['uuid'] as String? ?? '', 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( countTotalPresenceDetected: num.parse(
json['count_total_presence_detected']?.toString() ?? '0', json['count_total_presence_detected']?.toString() ?? '0',
).toInt(), ).toInt(),

2
lib/pages/analytics/modules/occupancy/widgets/interactive_heat_map.dart
View File

@ -52,7 +52,7 @@ class _InteractiveHeatMapState extends State<InteractiveHeatMap> {
color: Colors.transparent, color: Colors.transparent,
child: Transform.translate( child: Transform.translate(
offset: Offset(-(widget.cellSize * 2.5), -50), offset: Offset(-(widget.cellSize * 2.5), -50),
child: HeatMapTooltip(date: item.date, value: item.value), child: HeatMapTooltip(date: item.date.toUtc(), value: item.value),
), ),
), ),
), ),

4
lib/pages/analytics/modules/occupancy/widgets/occupancy_heat_map.dart
View File

@ -20,14 +20,14 @@ class OccupancyHeatMap extends StatelessWidget {
: 0; : 0;
DateTime _getStartingDate() { 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)); final startOfWeek = jan1.subtract(Duration(days: jan1.weekday - 1));
return startOfWeek; return startOfWeek;
} }
List<OccupancyPaintItem> _generatePaintItems(DateTime startDate) { List<OccupancyPaintItem> _generatePaintItems(DateTime startDate) {
return List.generate(_totalWeeks * 7, (index) { 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; final value = heatMapData[date] ?? 0;
return OccupancyPaintItem(index: index, value: value, date: date); return OccupancyPaintItem(index: index, value: value, date: date);
}); });