Merge pull request #40 from DSaladinCH/develop

Fix infinite loop on statistics calculation
DSaladinCH · Jul 10, 2024 · 913a8b9 · 913a8b9
2 parents 76ad84c + b6750a5
commit 913a8b9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/speed-time/Dialogs/TimeStatistics.xaml.cs b/speed-time/Dialogs/TimeStatistics.xaml.cs
@@ -254,12 +254,12 @@ private async Task LoadData()
                         currentStartOfWeek = currentStartOfWeek.AddDays(-1);
                     }
 
-                    while (currentStartOfWeek <= EndDate)
+                    for (DateTime current = StartDate; current <= EndDate; current = current.AddDays(7))
                     {
-                        DateTime currentEndOfWeek = currentStartOfWeek.AddDays(6);  // Move to Sunday
+                        DateTime currentEndOfWeek = current.AddDays(6);  // Move to Sunday
 
                         // Adjust dates to fit within the range
-                        DateTime effectiveStart = (currentStartOfWeek < StartDate) ? StartDate : currentStartOfWeek;
+                        DateTime effectiveStart = (current < StartDate) ? StartDate : current;
                         DateTime effectiveEnd = (currentEndOfWeek > EndDate) ? EndDate : currentEndOfWeek;
 
                         double targetWorkhours = SettingsModel.Instance.Workdays.GetWorkHoursForRange(effectiveStart, effectiveEnd);
@@ -269,11 +269,8 @@ private async Task LoadData()
                         if (targetWorkhours == 0 && actualWorkhours == 0)
                             continue;
 
-                        actualWork.Add(new(currentStartOfWeek, actualWorkhours));
-                        targetWork.Add(new(currentStartOfWeek, targetWorkhours));
-
-                        // Move to the start of the next week
-                        currentStartOfWeek = currentStartOfWeek.AddDays(7);
+                        actualWork.Add(new(current, actualWorkhours));
+                        targetWork.Add(new(current, targetWorkhours));
                     }
                     break;
             }

diff --git a/speed-time/speed-time.csproj b/speed-time/speed-time.csproj
@@ -19,7 +19,7 @@
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <ApplicationIcon>Icon.ico</ApplicationIcon>
     <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
-    <Version>0.17.1</Version>
+    <Version>0.17.2</Version>
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile></AssemblyOriginatorKeyFile>
   </PropertyGroup>