worktimehero

commit 3315977dc1e69666eb1b3acf50d74d5f8ea2bdd9
parent 3aa5ff92784da2378c3d066eb5d37d3a55cd33af
Author: René Wagner <rwagner@rw-net.de>
Date:   Wed, 22 Jul 2020 10:57:00 +0200

fix ~rwa/misc#37

Diffstat:
M
WorkTimeHero/MainForm.cs
 | 
4
++--
M
WorkTimeHero/WorkTimeCalculator.cs
 | 
4
++--

2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/WorkTimeHero/MainForm.cs b/WorkTimeHero/MainForm.cs
@@ -57,8 +57,8 @@ namespace WorkTimeHero
             prgPercentage.Value = wtc.WorkTimePercentage;
             lblCompleted.Text = string.Format("{1,-20}{0}", wtc.DoneWorkTime.ToString(TimeFormatter), "Arbeitszeit:");
             lblOvertime.Text = string.Format("{1,-20}{0}", wtc.AdditionalWorkTime.ToString(TimeFormatter), "Überstunden:");
-            lblRemaining.Text = string.Format("{1,-20}{0}", wtc.RemainingWorkTime.ToString(TimeFormatter), "Arbeitsende:");
-            lblTimeDue.Text = string.Format("{1,-20}{0}", wtc.TimeDue.ToString(TimeFormatter), "Uhrzeit:");
+            lblRemaining.Text = string.Format("{1,-20}{0}", wtc.RemainingWorkTime.ToString(TimeFormatter), "verbleibende Zeit:");
+            lblTimeDue.Text = string.Format("{1,-20}{0}", wtc.TimeDue.ToString(TimeFormatter), "Arbeitsende um:");
 
             if (wtc.IndividualBreakTime.Date == DateTime.Now.Date)
             {
diff --git a/WorkTimeHero/WorkTimeCalculator.cs b/WorkTimeHero/WorkTimeCalculator.cs
@@ -52,7 +52,7 @@ namespace WorkTimeHero
         {
             get
             {
-                return StartTime.TimeOfDay + TargetTime + EffectiveBreakTime;
+                return StartTime.TimeOfDay + TargetTime + PlannedBreakTime;
             }
         }
 
@@ -97,7 +97,7 @@ namespace WorkTimeHero
                     return IndividualBreakTime.TimeOfDay + CurrentBreakTime;
                 }
 
-                return BruttoTime.CalculateBreak() + CurrentBreakTime;
+                return BruttoTime.CalculateBreak();
             }
         }