[VEX-104]: Fixed graph bug caused by local time conversions

Author: BitTim

VexTrack/Core/TrackingData.cs

@@ -141,17 +141,19 @@ public static Season CurrentSeasonData
 			DateTimeOffset today = DateTimeOffset.Now.ToLocalTime().Date;
 
 			int remainingDays = (endDate - today).Days;
+			if ((endDate - today).Hours > 0) { remainingDays += 1; }
 			if (remainingDays < 0) remainingDays = 0;
 
 			return remainingDays;
 		}
 
 		public static int GetDuration(string sUUID)
 		{
-			DateTimeOffset endDate = DateTimeOffset.Parse(Data.Seasons.Find(s => s.UUID == sUUID).EndDate).ToLocalTime();
+			DateTimeOffset endDate = DateTimeOffset.Parse(Data.Seasons.Find(s => s.UUID == sUUID).EndDate).ToLocalTime().Date;
 			DateTimeOffset startDate = DateTimeOffset.FromUnixTimeSeconds(Data.Seasons.Find(s => s.UUID == sUUID).History.First().Time).ToLocalTime().Date;
 
 			int duration = (endDate - startDate).Days;
+			if ((endDate - startDate).Hours > 0) { duration += 1; }
 			if (duration < 0) duration = 0;
 
 			return duration;

VexTrack/VexTrack.csproj

@@ -2,14 +2,14 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net5.0-windows10.0.20348.0</TargetFramework>
+    <TargetFramework>net6.0-windows10.0.22000.0</TargetFramework>
     <UseWPF>true</UseWPF>
-    <ApplicationIcon>P:\Visual Studio\VexTrack\VexTrack\Images\VexTrack.ico</ApplicationIcon>
-    <Version>1.7</Version>
+    <ApplicationIcon>Images\VexTrack.ico</ApplicationIcon>
+    <Version>1.87</Version>
     <Authors>BitTim</Authors>
     <Description />
     <PackageProjectUrl>https://github.com/BitTim/VexTrack</PackageProjectUrl>
-    <PackageIcon>VexTrack.png</PackageIcon>
+    <PackageIcon>VexTrack_128.png</PackageIcon>
     <PackageIconUrl />
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <RepositoryUrl>https://github.com/BitTim/VexTrack</RepositoryUrl>
@@ -19,10 +19,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <None Remove="Images\VexTrack_128.png" />
     <None Remove="Images\VexTrack_64.png" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Content Include="Images\VexTrack.ico" />
+  </ItemGroup>
+
   <ItemGroup>
     <Folder Include="Fonts\" />
   </ItemGroup>
@@ -56,6 +59,10 @@
   </ItemGroup>
 
   <ItemGroup>
+    <None Update="Images\VexTrack_128.png">
+      <Pack>True</Pack>
+      <PackagePath>\</PackagePath>
+    </None>
     <None Update="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>