Fixed bug where TimeTracker would not show the last activity correctly.

RobinWeitzel · Nov 29, 2018 · 7d24718 · 7d24718
1 parent 14aa426
commit 7d24718
Show file tree

Hide file tree

Showing 21 changed files with 11 additions and 9 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/Constants.cs b/TimeTracker/Constants.cs
@@ -18,7 +18,7 @@ static class Constants
         public static bool useNativeToast = false; 
         public static bool makeSound = false;
 
-        public static string version = "0.9.1.0";
+        public static string version = "0.9.2.0";
         public static Nullable<DateTime> lastConfirmed = null;
     }
 }
diff --git a/TimeTracker/CustomToast.xaml.cs b/TimeTracker/CustomToast.xaml.cs
@@ -90,7 +90,9 @@ public CustomToast(string window)
 
                 ComboBox.ItemsSource = Activities;
 
-                activity_active last_activity = db.activity_active.OrderByDescending(aa => aa.to).FirstOrDefault();
+                activity_active last_activity = db.activity_active.Where(aa => aa.to == null).FirstOrDefault();
+                if (last_activity == null)
+                    last_activity = db.activity_active.OrderByDescending(aa => aa.to).FirstOrDefault();
                 defaultName = last_activity != null ? last_activity.name : "";
                 ComboBox.SelectedItem = Activities.Where(a => a.Name.Equals(defaultName)).FirstOrDefault();
 

diff --git a/TimeTracker/WiX Installer/BundleSetup.exe b/TimeTracker/WiX Installer/BundleSetup.exe
diff --git a/TimeTracker/WiX Installer/BundleSetup.wixobj b/TimeTracker/WiX Installer/BundleSetup.wixobj
@@ -1 +1 @@
-<?xml version="1.0" encoding="utf-8"?><wixObject version="3.0.2002.0" xmlns="http://schemas.microsoft.com/wix/2006/objects"><section id="TimeTrackerBundle" type="bundle"><table name="ChainPackage"><row sourceLineNumber="C:\Users\Robin\source\repos\WindowsTimeTracker\TimeTracker\WiX Installer\BundleSetup.wxs*9"><field>SqliteNet.exe</field><field>Exe</field><field>SqliteNet.exe</field><field>ProductAInstalled</field><field>/VERYSLIENT /SUPPRESSMSGBOXES</field><field /><field /><field /><field /><field>1</field><field>1</field><field>1</field><field>ExeDetectedVariable</field><field /><field /><field>WixBundleLog_SqliteNet.exe</field><field>WixBundleRollbackLog_SqliteNet.exe</field><field /><field>-2147483648</field><field /><field /><field /><field /></row><row sourceLineNumber="C:\Users\Robin\source\repos\WindowsTimeTracker\TimeTracker\WiX Installer\BundleSetup.wxs*18"><field>MainPackage</field><field>Msi</field><field>MainPackage</field><field /><field /><field /><field /><field /><field /><field>0</field><field>1</field><field /><field /><field /><field /><field>WixBundleLog_MainPackage</field><field>WixBundleRollbackLog_MainPackage</field><field /><field>-2147483648</field><field /><field /><field /><field>1</field></row></table><table name="Payload"><row sourceLineNumber="C:\Users\Robin\source\repos\WindowsTimeTracker\TimeTracker\WiX Installer\BundleSetup.wxs*9"><field>SqliteNet.exe</field><field>SqliteNet.exe</field><field>SqliteNet.exe</field><field /><field /><field>SqliteNet.exe</field><field>1</field></row><row sourceLineNumber="C:\Users\Robin\source\repos\WindowsTimeTracker\TimeTracker\WiX Installer\BundleSetup.wxs*18"><field>MainPackage</field><field>TimeTrackerSetup.msi</field><field>TimeTrackerSetup.msi</field><field /><field>1</field><field>TimeTrackerSetup.msi</field><field>1</field></row></table><table name="RelatedBundle"><row sourceLineNumber="C:\Users\Robin\source\repos\WindowsTimeTracker\TimeTracker\WiX Installer\BundleSetup.wxs*3"><field>{FCEF1123-6A65-4143-9C59-60C0A7D733BF}</field><field>1</field></row></table><table name="WixBundle"><row sourceLineNumber="C:\Users\Robin\source\repos\WindowsTimeTracker\TimeTracker\WiX Installer\BundleSetup.wxs*3"><field>0.9.0.0</field><field>Copyright (c). All rights reserved.</field><field>TimeTrackerBundle</field><field /><field /><field /><field /><field /><field /><field /><field /><field /><field>WixBundleLog:TimeTrackerBundle.log</field><field /><field /><field /><field /><field>X86</field><field /><field>{FCEF1123-6A65-4143-9C59-60C0A7D733BF}</field><field /><field /><field /></row></table><table name="WixChain"><row sourceLineNumber="C:\Users\Robin\source\repos\WindowsTimeTracker\TimeTracker\WiX Installer\BundleSetup.wxs*8"><field>0</field></row></table><table name="WixGroup"><row sourceLineNumber="C:\Users\Robin\source\repos\WindowsTimeTracker\TimeTracker\WiX Installer\BundleSetup.wxs*9"><field>SqliteNet.exe</field><field>Package</field><field>SqliteNet.exe</field><field>Payload</field></row><row sourceLineNumber="C:\Users\Robin\source\repos\WindowsTimeTracker\TimeTracker\WiX Installer\BundleSetup.wxs*9"><field>WixChain</field><field>PackageGroup</field><field>SqliteNet.exe</field><field>Package</field></row><row sourceLineNumber="C:\Users\Robin\source\repos\WindowsTimeTracker\TimeTracker\WiX Installer\BundleSetup.wxs*18"><field>MainPackage</field><field>Package</field><field>MainPackage</field><field>Payload</field></row><row sourceLineNumber="C:\Users\Robin\source\repos\WindowsTimeTracker\TimeTracker\WiX Installer\BundleSetup.wxs*18"><field>WixChain</field><field>PackageGroup</field><field>MainPackage</field><field>Package</field></row></table><table name="WixOrdering"><row sourceLineNumber="C:\Users\Robin\source\repos\WindowsTimeTracker\TimeTracker\WiX Installer\BundleSetup.wxs*18"><field>Package</field><field>MainPackage</field><field>Package</field><field>SqliteNet.exe</field></row></table><table name="WixRegistrySearch"><row sourceLineNumber="C:\Users\Robin\source\repos\WindowsTimeTracker\TimeTracker\WiX Installer\BundleSetup.wxs*6"><field>wrs7CB27A379AF255A489D99C2FDA07CB8D</field><field>2</field><field>SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\{02E43EC2-6B1C-45B5-9E48-941C3E1B204A}_is1</field><field>ProductAInstalled</field><field>17</field></row></table><table name="WixSearch"><row sourceLineNumber="C:\Users\Robin\source\repos\WindowsTimeTracker\TimeTracker\WiX Installer\BundleSetup.wxs*6"><field>wrs7CB27A379AF255A489D99C2FDA07CB8D</field><field>ProductAInstalled</field><field /></row></table><table name="WixSimpleReference"><row sourceLineNumber="C:\Users\Robin\source\repos\WindowsTimeTracker\TimeTracker\WiX Installer\BundleSetup.wxs*4"><field>WixBootstrapperApplication</field><field>WixStandardBootstrapperApplication.RtfLicense</field></row></table></section></wixObject>
+<?xml version="1.0" encoding="utf-8"?><wixObject version="3.0.2002.0" xmlns="http://schemas.microsoft.com/wix/2006/objects"><section id="TimeTrackerBundle" type="bundle"><table name="ChainPackage"><row sourceLineNumber="C:\Users\Robin\Source\Repos\WindowsTimeTracker\TimeTracker\WiX Installer\BundleSetup.wxs*9"><field>SqliteNet.exe</field><field>Exe</field><field>SqliteNet.exe</field><field>ProductAInstalled</field><field>/VERYSLIENT /SUPPRESSMSGBOXES</field><field /><field /><field /><field /><field>1</field><field>1</field><field>1</field><field>ExeDetectedVariable</field><field /><field /><field>WixBundleLog_SqliteNet.exe</field><field>WixBundleRollbackLog_SqliteNet.exe</field><field /><field>-2147483648</field><field /><field /><field /><field /></row><row sourceLineNumber="C:\Users\Robin\Source\Repos\WindowsTimeTracker\TimeTracker\WiX Installer\BundleSetup.wxs*18"><field>MainPackage</field><field>Msi</field><field>MainPackage</field><field /><field /><field /><field /><field /><field /><field>0</field><field>1</field><field /><field /><field /><field /><field>WixBundleLog_MainPackage</field><field>WixBundleRollbackLog_MainPackage</field><field /><field>-2147483648</field><field /><field /><field /><field>1</field></row></table><table name="Payload"><row sourceLineNumber="C:\Users\Robin\Source\Repos\WindowsTimeTracker\TimeTracker\WiX Installer\BundleSetup.wxs*9"><field>SqliteNet.exe</field><field>SqliteNet.exe</field><field>SqliteNet.exe</field><field /><field /><field>SqliteNet.exe</field><field>1</field></row><row sourceLineNumber="C:\Users\Robin\Source\Repos\WindowsTimeTracker\TimeTracker\WiX Installer\BundleSetup.wxs*18"><field>MainPackage</field><field>TimeTrackerSetup.msi</field><field>TimeTrackerSetup.msi</field><field /><field>1</field><field>TimeTrackerSetup.msi</field><field>1</field></row></table><table name="RelatedBundle"><row sourceLineNumber="C:\Users\Robin\Source\Repos\WindowsTimeTracker\TimeTracker\WiX Installer\BundleSetup.wxs*3"><field>{FCEF1123-6A65-4143-9C59-60C0A7D733BF}</field><field>1</field></row></table><table name="WixBundle"><row sourceLineNumber="C:\Users\Robin\Source\Repos\WindowsTimeTracker\TimeTracker\WiX Installer\BundleSetup.wxs*3"><field>0.9.0.0</field><field>Copyright (c). All rights reserved.</field><field>TimeTrackerBundle</field><field /><field /><field /><field /><field /><field /><field /><field /><field /><field>WixBundleLog:TimeTrackerBundle.log</field><field /><field /><field /><field /><field>X86</field><field /><field>{FCEF1123-6A65-4143-9C59-60C0A7D733BF}</field><field /><field /><field /></row></table><table name="WixChain"><row sourceLineNumber="C:\Users\Robin\Source\Repos\WindowsTimeTracker\TimeTracker\WiX Installer\BundleSetup.wxs*8"><field>0</field></row></table><table name="WixGroup"><row sourceLineNumber="C:\Users\Robin\Source\Repos\WindowsTimeTracker\TimeTracker\WiX Installer\BundleSetup.wxs*9"><field>SqliteNet.exe</field><field>Package</field><field>SqliteNet.exe</field><field>Payload</field></row><row sourceLineNumber="C:\Users\Robin\Source\Repos\WindowsTimeTracker\TimeTracker\WiX Installer\BundleSetup.wxs*9"><field>WixChain</field><field>PackageGroup</field><field>SqliteNet.exe</field><field>Package</field></row><row sourceLineNumber="C:\Users\Robin\Source\Repos\WindowsTimeTracker\TimeTracker\WiX Installer\BundleSetup.wxs*18"><field>MainPackage</field><field>Package</field><field>MainPackage</field><field>Payload</field></row><row sourceLineNumber="C:\Users\Robin\Source\Repos\WindowsTimeTracker\TimeTracker\WiX Installer\BundleSetup.wxs*18"><field>WixChain</field><field>PackageGroup</field><field>MainPackage</field><field>Package</field></row></table><table name="WixOrdering"><row sourceLineNumber="C:\Users\Robin\Source\Repos\WindowsTimeTracker\TimeTracker\WiX Installer\BundleSetup.wxs*18"><field>Package</field><field>MainPackage</field><field>Package</field><field>SqliteNet.exe</field></row></table><table name="WixRegistrySearch"><row sourceLineNumber="C:\Users\Robin\Source\Repos\WindowsTimeTracker\TimeTracker\WiX Installer\BundleSetup.wxs*6"><field>wrs7CB27A379AF255A489D99C2FDA07CB8D</field><field>2</field><field>SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\{02E43EC2-6B1C-45B5-9E48-941C3E1B204A}_is1</field><field>ProductAInstalled</field><field>17</field></row></table><table name="WixSearch"><row sourceLineNumber="C:\Users\Robin\Source\Repos\WindowsTimeTracker\TimeTracker\WiX Installer\BundleSetup.wxs*6"><field>wrs7CB27A379AF255A489D99C2FDA07CB8D</field><field>ProductAInstalled</field><field /></row></table><table name="WixSimpleReference"><row sourceLineNumber="C:\Users\Robin\Source\Repos\WindowsTimeTracker\TimeTracker\WiX Installer\BundleSetup.wxs*4"><field>WixBootstrapperApplication</field><field>WixStandardBootstrapperApplication.RtfLicense</field></row></table></section></wixObject>
diff --git a/TimeTracker/WiX Installer/BundleSetup.wixpdb b/TimeTracker/WiX Installer/BundleSetup.wixpdb
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/WiX Installer/TimeTrackerSetup.wxs b/TimeTracker/WiX Installer/TimeTrackerSetup.wxs
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-    <Product Id="*" UpgradeCode="94ed6562-d6d5-4282-9c23-c843b86f80db" Version="0.9.1.0" Language="1033" Name="TimeTracker" Manufacturer="Robin Weitzel">
+    <Product Id="*" UpgradeCode="94ed6562-d6d5-4282-9c23-c843b86f80db" Version="0.9.2.0" Language="1033" Name="TimeTracker" Manufacturer="Robin Weitzel">
         <Package InstallerVersion="300" Compressed="yes" InstallScope="perMachine" />
         <MajorUpgrade DowngradeErrorMessage="A later version of TimeTracker is already installed. Setup will now exit." />
         <Media Id="1" Cabinet="TimeTracker.cab" EmbedCab="yes" />

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>14xUoMAJ9OSlzVaWAZGJlI+nSs3B4dSvhojRQ/KZPQ8=</dsig:DigestValue>
+        <dsig:DigestValue>+yD7SvFYEITnCtjp06rrM0KvhUmp1Xu2UogzR7Dj0SQ=</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
@@ -398,7 +398,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>/Im5480JcAsk6E6TtUM0BO2Qsrpb673vPXjb3dOkL1s=</dsig:DigestValue>
+        <dsig:DigestValue>GFer8SJNY7oK6dbw6ERQGLA+50G/48mkE+oHlJNKVbU=</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>14xUoMAJ9OSlzVaWAZGJlI+nSs3B4dSvhojRQ/KZPQ8=</dsig:DigestValue>
+        <dsig:DigestValue>+yD7SvFYEITnCtjp06rrM0KvhUmp1Xu2UogzR7Dj0SQ=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

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
@@ -398,7 +398,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>/Im5480JcAsk6E6TtUM0BO2Qsrpb673vPXjb3dOkL1s=</dsig:DigestValue>
+        <dsig:DigestValue>GFer8SJNY7oK6dbw6ERQGLA+50G/48mkE+oHlJNKVbU=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

diff --git a/TimeTracker/obj/x64/Debug/TimeTracker.pdb b/TimeTracker/obj/x64/Debug/TimeTracker.pdb