Skip to content
Snippets Groups Projects
Commit f86521db authored by Benoît Harrault's avatar Benoît Harrault
Browse files

Fix hour/day heatmap last column

parent 79cc3abc
No related branches found
No related tags found
1 merge request!80Resolve "Fix heatmap last column"
Pipeline #7765 passed
Fix hour/day heatmap last column.
Correction sur dernière colonne de la répartition par heure/jour.
...@@ -16,7 +16,7 @@ class HeatmapData { ...@@ -16,7 +16,7 @@ class HeatmapData {
Map<int, int> dataForThisDay = {}; Map<int, int> dataForThisDay = {};
for (var hour in rawDataForThisDay.keys) { for (var hour in rawDataForThisDay.keys) {
dataForThisDay[int.parse(hour)] = int.parse(rawDataForThisDay[hour].toString()); dataForThisDay[int.parse(hour) % 24] = int.parse(rawDataForThisDay[hour].toString());
} }
data[int.parse(day)] = dataForThisDay; data[int.parse(day)] = dataForThisDay;
...@@ -32,7 +32,7 @@ class HeatmapData { ...@@ -32,7 +32,7 @@ class HeatmapData {
for (var day in data.keys) { for (var day in data.keys) {
Map<String, int> dayMap = {}; Map<String, int> dayMap = {};
data[day]?.forEach((hour, count) { data[day]?.forEach((hour, count) {
dayMap[hour.toString()] = count; dayMap[(hour % 24).toString()] = count;
}); });
map[day.toString()] = dayMap; map[day.toString()] = dayMap;
} }
......
...@@ -34,7 +34,7 @@ class ChartHeatmap extends CustomChart { ...@@ -34,7 +34,7 @@ class ChartHeatmap extends CustomChart {
ScatterChartData( ScatterChartData(
scatterSpots: getSpots(), scatterSpots: getSpots(),
minX: 0, minX: 0,
maxX: 24, maxX: 23,
minY: 0, minY: 0,
maxY: 7, maxY: 7,
borderData: FlBorderData(show: false), borderData: FlBorderData(show: false),
...@@ -73,11 +73,12 @@ class ChartHeatmap extends CustomChart { ...@@ -73,11 +73,12 @@ class ChartHeatmap extends CustomChart {
final int maxCount = getMaxCount(); final int maxCount = getMaxCount();
chartData.data.forEach((day, hours) { chartData.data.forEach((day, hours) {
// hours.removeWhere((h, i) => h == 24);
hours.forEach((hour, count) { hours.forEach((hour, count) {
double normalizedValue = count / maxCount; double normalizedValue = count / maxCount;
spots.add(ScatterSpot( spots.add(ScatterSpot(
hour.toDouble(), (hour % 24).toDouble(),
8 - day.toDouble(), 8 - day.toDouble(),
dotPainter: FlDotSquarePainter( dotPainter: FlDotSquarePainter(
color: getColorFromNormalizedValue(normalizedValue), color: getColorFromNormalizedValue(normalizedValue),
......
...@@ -3,7 +3,7 @@ description: Display scrobbles data and charts ...@@ -3,7 +3,7 @@ description: Display scrobbles data and charts
publish_to: "none" publish_to: "none"
version: 0.8.3+75 version: 0.8.4+76
environment: environment:
sdk: "^3.0.0" sdk: "^3.0.0"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment