Improved average count

prijindal · May 1, 2024 · 15387f6 · 15387f6
1 parent 8d6b262
commit 15387f6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/lib/components/statistics.dart b/lib/components/statistics.dart
@@ -136,6 +136,10 @@ class _StatisticsSubPageState extends State<StatisticsSubPage> {
     return startDate;
   }
 
+  DateTime? _getEndDate() {
+    return DateTime.now();
+  }
+
   List<Widget> _buildStats() {
     final habbit = widget.habbit;
     final list = <ListTile>[];
@@ -144,12 +148,11 @@ class _StatisticsSubPageState extends State<StatisticsSubPage> {
     }
     final config = HabbitConfig.getConfig(habbit.config);
     for (var element in config.statistics) {
-      final endDate = getEntries().lastOrNull?.creationTime;
       list.add(
         ListTile(
           title: Text(element.name),
           subtitle: Text(
-            element.transform(getEntries(), _getStartDate(), endDate),
+            element.transform(getEntries(), _getStartDate(), _getEndDate()),
           ),
         ),
       );

diff --git a/lib/helpers/stats.dart b/lib/helpers/stats.dart
@@ -94,7 +94,7 @@ List<DateTime> getDaysInBetween(DateTime startDate, DateTime endDate) {
 }
 
 List<CountsDayData> countPerDaysData(List<HabbitEntry>? entries,
-    [bool includeEmptyDates = true, DateTime? startDate]) {
+    [bool includeEmptyDates = true, DateTime? startDate, DateTime? endDate]) {
   final counts = <DateTime, int>{};
   if (entries == null) {
     return [];
@@ -114,7 +114,7 @@ List<CountsDayData> countPerDaysData(List<HabbitEntry>? entries,
   if (includeEmptyDates && entries.isNotEmpty) {
     final daysInBetween = getDaysInBetween(
       startDate?.toLocal() ?? entries.last.creationTime.toLocal(),
-      entries.first.creationTime.toLocal(),
+      endDate?.toLocal() ?? entries.first.creationTime.toLocal(),
     );
     for (var day in daysInBetween) {
       final date = DateTime(

diff --git a/lib/models/config.dart b/lib/models/config.dart
@@ -178,7 +178,7 @@ class HabbitStatistic {
   static final averageCounts = HabbitStatistic(
     name: "Average counts",
     transform: (entries, startDate, endDate) {
-      final counts = stats.countPerDaysData(entries, true, startDate);
+      final counts = stats.countPerDaysData(entries, true, startDate, endDate);
       var sum = 0;
       for (var element in counts) {
         // print(element.date);