Fixed bug where current activity would be shown in day breakdown from…

… past days.
RobinWeitzel · Dec 7, 2018 · 904feaa · 904feaa
1 parent 661043c
commit 904feaa
Show file tree

Hide file tree

Showing 21 changed files with 17 additions and 17 deletions.
diff --git a/.vs/TimeTracker/v15/.suo b/.vs/TimeTracker/v15/.suo
diff --git a/.vs/TimeTracker/v15/Server/sqlite3/storage.ide-shm b/.vs/TimeTracker/v15/Server/sqlite3/storage.ide-shm
diff --git a/.vs/TimeTracker/v15/Server/sqlite3/storage.ide-wal b/.vs/TimeTracker/v15/Server/sqlite3/storage.ide-wal
diff --git a/TimeTracker/HTMLDataWindow.xaml.cs b/TimeTracker/HTMLDataWindow.xaml.cs
@@ -101,7 +101,7 @@ public string getData(int value)
                     var records = csv.GetRecords<TimeTracker.Helper.Activity>();
                     today_activities = records.Where(r => r.To >= day_in_question && r.From < day_in_question_after).ToList();
 
-                    if (Variables.currentActivity != null)
+                    if (Variables.currentActivity != null && day_in_question_after > DateTime.Now)
                         today_activities.Add(Variables.currentActivity);
 
                     List<Event> Events = today_activities.Select(ta => new Event

diff --git a/TimeTracker/WiX Installer/TimeTrackerSetup.msi b/TimeTracker/WiX Installer/TimeTrackerSetup.msi
diff --git a/TimeTracker/WiX Installer/TimeTrackerSetup.wixobj b/TimeTracker/WiX Installer/TimeTrackerSetup.wixobj
diff --git a/TimeTracker/WiX Installer/TimeTrackerSetup.wixpdb b/TimeTracker/WiX Installer/TimeTrackerSetup.wixpdb
diff --git a/TimeTracker/bin/x64/Debug/GPUCache/data_0 b/TimeTracker/bin/x64/Debug/GPUCache/data_0
diff --git a/TimeTracker/bin/x64/Debug/GPUCache/data_1 b/TimeTracker/bin/x64/Debug/GPUCache/data_1
diff --git a/TimeTracker/bin/x64/Debug/TimeTracker.application b/TimeTracker/bin/x64/Debug/TimeTracker.application
@@ -14,7 +14,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>BNg9bAH54mkL2e5I9uECvQ6qJqBQnPGpAypgu0oK4kY=</dsig:DigestValue>
+        <dsig:DigestValue>HSUZIZ3SGo/P2y1RUP4OCKcGw1459ct75R1gKi7jVF4=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

diff --git a/TimeTracker/bin/x64/Debug/TimeTracker.exe b/TimeTracker/bin/x64/Debug/TimeTracker.exe
diff --git a/TimeTracker/bin/x64/Debug/TimeTracker.exe.manifest b/TimeTracker/bin/x64/Debug/TimeTracker.exe.manifest
@@ -302,7 +302,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>dbEMp2lOvU/Axc+PmfguXI6G6p/T09RErtXI0gbJcCY=</dsig:DigestValue>
+        <dsig:DigestValue>LRwK9NOTcZHe/GEyK7QmE/UYGJk/vgMPW6Dvf0FbGaE=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

diff --git a/TimeTracker/bin/x64/Debug/TimeTracker.pdb b/TimeTracker/bin/x64/Debug/TimeTracker.pdb
diff --git a/TimeTracker/bin/x64/Debug/app.publish/TimeTracker.exe b/TimeTracker/bin/x64/Debug/app.publish/TimeTracker.exe
diff --git a/TimeTracker/obj/x64/Debug/TimeTracker.application b/TimeTracker/obj/x64/Debug/TimeTracker.application
@@ -14,7 +14,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>BNg9bAH54mkL2e5I9uECvQ6qJqBQnPGpAypgu0oK4kY=</dsig:DigestValue>
+        <dsig:DigestValue>HSUZIZ3SGo/P2y1RUP4OCKcGw1459ct75R1gKi7jVF4=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

diff --git a/TimeTracker/obj/x64/Debug/TimeTracker.csproj.CoreCompileInputs.cache b/TimeTracker/obj/x64/Debug/TimeTracker.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-85b310e5ac216ebe10cb76b43c0094650f3a6d62
+0171e550ee76b6323cfccc11e5bb866eecfd4755
diff --git a/TimeTracker/obj/x64/Debug/TimeTracker.exe b/TimeTracker/obj/x64/Debug/TimeTracker.exe
diff --git a/TimeTracker/obj/x64/Debug/TimeTracker.exe.manifest b/TimeTracker/obj/x64/Debug/TimeTracker.exe.manifest
@@ -302,7 +302,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>dbEMp2lOvU/Axc+PmfguXI6G6p/T09RErtXI0gbJcCY=</dsig:DigestValue>
+        <dsig:DigestValue>LRwK9NOTcZHe/GEyK7QmE/UYGJk/vgMPW6Dvf0FbGaE=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

diff --git a/TimeTracker/obj/x64/Debug/TimeTracker.pdb b/TimeTracker/obj/x64/Debug/TimeTracker.pdb
diff --git a/TimeTracker/obj/x64/Debug/TimeTracker_MarkupCompile.cache b/TimeTracker/obj/x64/Debug/TimeTracker_MarkupCompile.cache
@@ -4,16 +4,16 @@
 winexe
 C#
 .cs
-C:\Users\Robin\source\repos\WindowsTimeTracker\TimeTracker\obj\x64\Debug\
+C:\Users\Robin\Source\Repos\WindowsTimeTracker\TimeTracker\obj\x64\Debug\
 TimeTracker
 none
 false
 DEBUG;TRACE
-C:\Users\Robin\source\repos\WindowsTimeTracker\TimeTracker\App.xaml
+C:\Users\Robin\Source\Repos\WindowsTimeTracker\TimeTracker\App.xaml
 7-365385716
 121304485923
 14605311057
-99-421979203
+99-1547203427
 CustomToast.xaml;HTMLDataWindow.xaml;MainWindow.xaml;ManualEdit.xaml;NewVersion.xaml;SettingsWindow.xaml;Tutorial.xaml;
 
 False

diff --git a/TimeTracker/obj/x64/Debug/TimeTracker_MarkupCompile.lref b/TimeTracker/obj/x64/Debug/TimeTracker_MarkupCompile.lref
@@ -1,10 +1,10 @@
 
 
-FC:\Users\Robin\source\repos\WindowsTimeTracker\TimeTracker\CustomToast.xaml;;
-FC:\Users\Robin\source\repos\WindowsTimeTracker\TimeTracker\HTMLDataWindow.xaml;;
-FC:\Users\Robin\source\repos\WindowsTimeTracker\TimeTracker\MainWindow.xaml;;
-FC:\Users\Robin\source\repos\WindowsTimeTracker\TimeTracker\ManualEdit.xaml;;
-FC:\Users\Robin\source\repos\WindowsTimeTracker\TimeTracker\NewVersion.xaml;;
-FC:\Users\Robin\source\repos\WindowsTimeTracker\TimeTracker\SettingsWindow.xaml;;
-FC:\Users\Robin\source\repos\WindowsTimeTracker\TimeTracker\Tutorial.xaml;;
+FC:\Users\Robin\Source\Repos\WindowsTimeTracker\TimeTracker\CustomToast.xaml;;
+FC:\Users\Robin\Source\Repos\WindowsTimeTracker\TimeTracker\HTMLDataWindow.xaml;;
+FC:\Users\Robin\Source\Repos\WindowsTimeTracker\TimeTracker\MainWindow.xaml;;
+FC:\Users\Robin\Source\Repos\WindowsTimeTracker\TimeTracker\ManualEdit.xaml;;
+FC:\Users\Robin\Source\Repos\WindowsTimeTracker\TimeTracker\NewVersion.xaml;;
+FC:\Users\Robin\Source\Repos\WindowsTimeTracker\TimeTracker\SettingsWindow.xaml;;
+FC:\Users\Robin\Source\Repos\WindowsTimeTracker\TimeTracker\Tutorial.xaml;;