change to proper handling of no configured breaks, update how tray me…

…ssages are handled
ouoertheo · Oct 26, 2020 · afdf9fc · afdf9fc
1 parent 370052c
commit afdf9fc
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 48 deletions.
diff --git a/TomeScreenClient/App - Copy.config b/TomeScreenClient/App - Copy.config
diff --git a/TomeScreenClient/Program.cs b/TomeScreenClient/Program.cs
@@ -291,9 +291,10 @@ private async static void getActivity(string _user)
                 FileLogger.Log("Server response: " + JsonSerializer.Serialize(data),1);
                 TimeSpan duration;
                 TimeSpan timeTilBreak;
+                string trayString = "";
 
 
-                if (data.nextBreak != 0)
+                if (data.nextBreak != -1)
                 {
                     // break early warning
                     if (data.freeTimeLeft < 300000 && !breakNotification)
@@ -305,6 +306,7 @@ private async static void getActivity(string _user)
                         breakNotification = false;
                     }
                     timeTilBreak = TimeSpan.FromMilliseconds(data.freeTimeLeft);
+                    trayString += "Next Break: " + timeTilBreak.ToString() + "\r\n";
                 } else {
                     timeTilBreak = TimeSpan.Zero;
                     FileLogger.Log("No break cofigured", 2);
@@ -315,15 +317,16 @@ private async static void getActivity(string _user)
                 {
                     duration = TimeSpan.FromMilliseconds(data.total * -1);
                     FileLogger.Log("getActivity data: " + duration.ToString(), 1);
-                    MyCustomApplicationContext.setTooltip("Total: -" + duration.ToString() + "\r\n Next Break: " + timeTilBreak.ToString());
+                    trayString += "Total: -" + duration.ToString();
                     LockWorkStation();
                 }
                 else
                 {
                     duration = TimeSpan.FromMilliseconds(data.total);
                     FileLogger.Log("getActivity data: " + duration.ToString(), 1);
-                    MyCustomApplicationContext.setTooltip("Total: " + duration.ToString() + "\r\n Next Break: " + timeTilBreak.ToString());
+                    trayString += "Total: " + duration.ToString();
                 }
+                MyCustomApplicationContext.setTooltip(trayString);
 
             } catch (Exception e) {
                 FileLogger.Log(e.Message, 1);

diff --git a/TomeScreenClient/TomeScreenClient.csproj b/TomeScreenClient/TomeScreenClient.csproj
@@ -167,7 +167,6 @@
       <DependentUpon>Resources.resx</DependentUpon>
       <DesignTime>True</DesignTime>
     </Compile>
-    <None Include="App - Copy.config" />
     <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>