cleanup

FeinstaubGurke · Dec 29, 2024 · a70a2a5 · a70a2a5
1 parent a715a53
commit a70a2a5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/Dashboard/Controllers/ReportController.cs b/src/Dashboard/Controllers/ReportController.cs
@@ -30,7 +30,7 @@ public ReportController(
         [Route("")]
         public async Task<ActionResult<byte[]>> CreateReportAsync()
         {
-            var sensors = this._sensorService.GetSensors().Take(1);
+            var sensors = this._sensorService.GetSensors();
 
             var startDate = DateTime.Today.AddDays(-1);
             var reportDays = 14;
@@ -50,6 +50,11 @@ public async Task<ActionResult<byte[]>> CreateReportAsync()
                         var dayJsonData = await this._objectStorageService.GetFileAsync($"{sensor.DeviceId}-{processingDate:yyyy-MM-dd}.json");
                         var sensorDayData = JsonSerializer.Deserialize<SensorDayData>(dayJsonData);
 
+                        if (sensorDayData == null)
+                        {
+                            continue;
+                        }
+
                         var sensorRecords = sensorDayData.SensorDetailRecords.Select(o => new SensorRecord
                         {
                             Timestamp = o.Timestamp,
@@ -76,7 +81,7 @@ public async Task<ActionResult<byte[]>> CreateReportAsync()
                     Name = sensor.Name,
                     City = sensor.City,
                     District = sensor.District,
-                    DailySensorRecords = dailySensorRecords
+                    DailySensorRecords = dailySensorRecords.OrderBy(o => o.Key).ToDictionary()
                 });
             }
 

diff --git a/src/FeinstaubGurke.PdfReport/PdfProcessor.cs b/src/FeinstaubGurke.PdfReport/PdfProcessor.cs
@@ -86,7 +86,7 @@ public byte[] CreateReport(DeviceInfo[] deviceInfos)
                     AveragePm2_5 = kvp.Value.Average(o => o.PM2_5),
                     MinimumPm2_5 = kvp.Value.Min(o => o.PM2_5),
                     MaximumPm2_5 = kvp.Value.Max(o => o.PM2_5)
-                }).OrderBy(o => o.Date).ToArray();
+                }).ToArray();
 
                 var position1 = pageTop.Translate(pagePadding, -180);
 
@@ -173,7 +173,7 @@ private void DrawDayGraphic(
 
             var drawInitPosition = new PdfPoint(pagePadding, page.PageSize.Top - positionShiftY);
             this.SetColor(page, DrawColor.Black);
-            page.AddText("Tagesverlauf (24h)", 12, drawInitPosition.MoveY(10), this._headlineFont);
+            page.AddText("Tagesverlauf (24h) 00:00 -> 23:59", 12, drawInitPosition.MoveY(10), this._headlineFont);
 
             var hourCount = 24;
             var blockHeight = chartElementHeight / (double)hourCount;