feat(app): bug fixed

@@ -89,13 +89,6 @@ class ApiHrvReportDataSource implements HrvReportDataSource {
       for (final trend in data.hrvTrendList ?? const <HrvTrendList>[])
       for (final trend in data.hrvTrendList ?? const <HrvTrendList>[])
         if (_parseApiDate(trend.timeKey) case final date?) date: trend,
         if (_parseApiDate(trend.timeKey) case final date?) date: trend,
     };
     };
-    final levelsByDate = <DateTime, HrvStressLevel>{
-      for (final item
-          in data.dailyDistributionList ?? const <DailyDistributionList>[])
-        if (_parseApiDate(item.date) case final date?)
-          if (_stressLevelFromApiId(item.hrvLevel) case final level?)
-            date: level,
-    };
     final distributionCounts = _distributionCounts(data.hrvDistributionList);
     final distributionCounts = _distributionCounts(data.hrvDistributionList);
     final previousDistributionCounts =
     final previousDistributionCounts =
         _previousDistributionCounts(data.qoqHrvDistributionList);
         _previousDistributionCounts(data.qoqHrvDistributionList);
@@ -107,15 +100,23 @@ class ApiHrvReportDataSource implements HrvReportDataSource {
           _dayReport(
           _dayReport(
             weekStart.add(Duration(days: i)),
             weekStart.add(Duration(days: i)),
             trendsByDate,
             trendsByDate,
-            levelsByDate,
+            const <DateTime, HrvStressLevel>{},
           ),
           ),
       ],
       ],
       previousRelaxedDays: _relaxedDays(previousDistributionCounts),
       previousRelaxedDays: _relaxedDays(previousDistributionCounts),
       previousStressedDays: _stressedDays(previousDistributionCounts),
       previousStressedDays: _stressedDays(previousDistributionCounts),
       distributionCounts:
       distributionCounts:
           distributionCounts.isEmpty ? null : distributionCounts,
           distributionCounts.isEmpty ? null : distributionCounts,
-      minDayOverride: _extremeDay(data.hrvMin, trendsByDate, levelsByDate),
-      maxDayOverride: _extremeDay(data.hrvMax, trendsByDate, levelsByDate),
+      minDayOverride: _extremeDay(
+        data.hrvMin,
+        trendsByDate,
+        const <DateTime, HrvStressLevel>{},
+      ),
+      maxDayOverride: _extremeDay(
+        data.hrvMax,
+        trendsByDate,
+        const <DateTime, HrvStressLevel>{},
+      ),
     );
     );
   }
   }
 
 
@@ -127,13 +128,6 @@ class ApiHrvReportDataSource implements HrvReportDataSource {
       for (final trend in data.hrvTrendList ?? const <HrvTrendList>[])
       for (final trend in data.hrvTrendList ?? const <HrvTrendList>[])
         if (_parseApiDate(trend.timeKey) case final date?) date: trend,
         if (_parseApiDate(trend.timeKey) case final date?) date: trend,
     };
     };
-    final levelsByDate = <DateTime, HrvStressLevel>{
-      for (final item
-          in data.dailyDistributionList ?? const <DailyDistributionList>[])
-        if (_parseApiDate(item.date) case final date?)
-          if (_stressLevelFromApiId(item.hrvLevel) case final level?)
-            date: level,
-    };
     final distributionCounts = _distributionCounts(data.hrvDistributionList);
     final distributionCounts = _distributionCounts(data.hrvDistributionList);
     final previousDistributionCounts =
     final previousDistributionCounts =
         _previousDistributionCounts(data.qoqHrvDistributionList);
         _previousDistributionCounts(data.qoqHrvDistributionList);
@@ -146,15 +140,23 @@ class ApiHrvReportDataSource implements HrvReportDataSource {
           _dayReport(
           _dayReport(
             monthStart.add(Duration(days: i)),
             monthStart.add(Duration(days: i)),
             trendsByDate,
             trendsByDate,
-            levelsByDate,
+            const <DateTime, HrvStressLevel>{},
           ),
           ),
       ],
       ],
       previousRelaxedDays: _relaxedDays(previousDistributionCounts),
       previousRelaxedDays: _relaxedDays(previousDistributionCounts),
       previousStressedDays: _stressedDays(previousDistributionCounts),
       previousStressedDays: _stressedDays(previousDistributionCounts),
       distributionCounts:
       distributionCounts:
           distributionCounts.isEmpty ? null : distributionCounts,
           distributionCounts.isEmpty ? null : distributionCounts,
-      minDayOverride: _extremeDay(data.hrvMin, trendsByDate, levelsByDate),
-      maxDayOverride: _extremeDay(data.hrvMax, trendsByDate, levelsByDate),
+      minDayOverride: _extremeDay(
+        data.hrvMin,
+        trendsByDate,
+        const <DateTime, HrvStressLevel>{},
+      ),
+      maxDayOverride: _extremeDay(
+        data.hrvMax,
+        trendsByDate,
+        const <DateTime, HrvStressLevel>{},
+      ),
     );
     );
   }
   }
 
 
@@ -213,6 +215,7 @@ class ApiHrvReportDataSource implements HrvReportDataSource {
       averageHeartRate: trend?.hrAverage?.round(),
       averageHeartRate: trend?.hrAverage?.round(),
       lastRestingHrValue: trend?.lastRestingHrValue,
       lastRestingHrValue: trend?.lastRestingHrValue,
       comprehensiveStressScore: trend?.comprehensiveStressScore?.toDouble(),
       comprehensiveStressScore: trend?.comprehensiveStressScore?.toDouble(),
+      trendLevel: trendLevel,
       level: level,
       level: level,
     );
     );
   }
   }

@@ -38,6 +38,7 @@ class HrvDayReport {
     this.averageHeartRate,
     this.averageHeartRate,
     this.lastRestingHrValue,
     this.lastRestingHrValue,
     this.comprehensiveStressScore,
     this.comprehensiveStressScore,
+    this.trendLevel,
     this.level,
     this.level,
   });
   });
 
 
@@ -46,6 +47,7 @@ class HrvDayReport {
   final int? averageHeartRate;
   final int? averageHeartRate;
   final int? lastRestingHrValue;
   final int? lastRestingHrValue;
   final double? comprehensiveStressScore;
   final double? comprehensiveStressScore;
+  final HrvStressLevel? trendLevel;
   final HrvStressLevel? level;
   final HrvStressLevel? level;
 
 
   bool get hasData => averageHrv != null;
   bool get hasData => averageHrv != null;
@@ -398,6 +400,12 @@ class YearlyHrvReport implements HrvPeriodReport {
   }
   }
 
 
   HrvStressLevel? levelForMonth(int month) {
   HrvStressLevel? levelForMonth(int month) {
+    final trendLevels = daysForMonth(month)
+        .map((day) => day.trendLevel)
+        .whereType<HrvStressLevel>()
+        .toList();
+    if (trendLevels.isNotEmpty) return trendLevels.first;
+
     final levels = daysForMonth(month)
     final levels = daysForMonth(month)
         .where((day) => day.averageHrv != null)
         .where((day) => day.averageHrv != null)
         .map((day) => day.level)
         .map((day) => day.level)