Merge pull request #29 from BinderDyn/bugfix-weekday-productivity

BinderDyn · web-flow · commit 1512aa7de2b9 · 2020-02-25T14:15:22.000+01:00
Fixed the wrong display of percentages and removed unnecessary scroll…
diff --git a/.vs/TakeMyTime.NETCore/DesignTimeBuild/.dtbcache b/.vs/TakeMyTime.NETCore/DesignTimeBuild/.dtbcache
diff --git a/.vs/TakeMyTime.NETCore/v16/.suo b/.vs/TakeMyTime.NETCore/v16/.suo
diff --git a/TakeMyTime.BLL.Tests/ProjectTypeLogicTests.cs b/TakeMyTime.BLL.Tests/ProjectTypeLogicTests.cs
@@ -50,10 +50,10 @@ public void GetProjectTypes_Test()
 
             // ACT
             var projectTypes = projectTypeLogic.GetProjectTypes();
-            projectTypeLogic.Dispose();
 
             // ASSERT
             Assert.IsTrue(projectTypes.Count() == 3);
+            projectTypeLogic.Dispose();
         }
 
         [TestMethod]
diff --git a/TakeMyTime.WPF/Projects/ProjectOverview.xaml b/TakeMyTime.WPF/Projects/ProjectOverview.xaml
@@ -76,8 +76,7 @@
                       Margin="18"
                       Visibility="Visible"
                       SelectionChanged="lv_Projects_SelectionChanged"
-                      SelectionMode="Single"
-                      ScrollViewer.VerticalScrollBarVisibility="Visible">
+                      SelectionMode="Single">
             <!--<ListView.Resources>
                 <Style TargetType="{x:Type GridViewColumnHeader}">
                     <Setter Property="HorizontalContentAlignment" Value="Left"></Setter>
diff --git a/TakeMyTime.WPF/Resources/Dashboard.Designer.cs b/TakeMyTime.WPF/Resources/Dashboard.Designer.cs
diff --git a/TakeMyTime.WPF/Resources/Dashboard.de-DE.resx b/TakeMyTime.WPF/Resources/Dashboard.de-DE.resx
@@ -120,6 +120,18 @@
   <data name="Friday" xml:space="preserve">
     <value>Freitag</value>
   </data>
+  <data name="LabelAssignmentDistribution" xml:space="preserve">
+    <value>Verteilte Arbeitszeit bei ausgewähltem Projekt</value>
+  </data>
+  <data name="LabelMostProductiveWeekdays" xml:space="preserve">
+    <value>Produktivste Wochentage</value>
+  </data>
+  <data name="LabelTotalShareOfProjects" xml:space="preserve">
+    <value>Arbeitszeit verteilt auf alle Projekte</value>
+  </data>
+  <data name="LabelWorkingTimeHistory" xml:space="preserve">
+    <value>Durchschnittliche Arbeitszeit verteilt auf alle Zeiteinträge zum ausgewählten Projekt</value>
+  </data>
   <data name="Monday" xml:space="preserve">
     <value>Montag</value>
   </data>
diff --git a/TakeMyTime.WPF/Resources/Dashboard.resx b/TakeMyTime.WPF/Resources/Dashboard.resx
@@ -120,6 +120,18 @@
   <data name="Friday" xml:space="preserve">
     <value>Friday</value>
   </data>
+  <data name="LabelAssignmentDistribution" xml:space="preserve">
+    <value>Working time shared among assignments for selected project</value>
+  </data>
+  <data name="LabelMostProductiveWeekdays" xml:space="preserve">
+    <value>Most productive weekday distribution</value>
+  </data>
+  <data name="LabelTotalShareOfProjects" xml:space="preserve">
+    <value>Working time shared among all projects</value>
+  </data>
+  <data name="LabelWorkingTimeHistory" xml:space="preserve">
+    <value>Average working time on selected project for all log entries</value>
+  </data>
   <data name="Monday" xml:space="preserve">
     <value>Monday</value>
   </data>
diff --git a/TakeMyTime.WPF/Statistics/Dashboard.xaml b/TakeMyTime.WPF/Statistics/Dashboard.xaml
@@ -16,19 +16,28 @@
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="3*"></RowDefinition>
+            <RowDefinition Height="40"></RowDefinition>
             <RowDefinition></RowDefinition>
         </Grid.RowDefinitions>
         <Grid Grid.Row="0">
             <Grid.RowDefinitions>
+                <RowDefinition Height="40"></RowDefinition>
                 <RowDefinition Height="40"></RowDefinition>
                 <RowDefinition Height="2*"></RowDefinition>
+                <RowDefinition Height="40"></RowDefinition>
                 <RowDefinition></RowDefinition>
             </Grid.RowDefinitions>
             <Grid.ColumnDefinitions>
                 <ColumnDefinition></ColumnDefinition>
                 <ColumnDefinition></ColumnDefinition>
             </Grid.ColumnDefinitions>
-            <lvc:PieChart Grid.Row="1" Grid.Column="0"
+            <Label Grid.Row="1" Content="{x:Static resources:Dashboard.LabelTotalShareOfProjects}"
+                   FontFamily="Segoe UI"
+                   Foreground="{StaticResource LightWhite}"
+                   FontWeight="Bold"
+                   FontSize="20"
+                   VerticalAlignment="Bottom"></Label>
+            <lvc:PieChart Grid.Row="2" Grid.Column="0"
                           Margin="10"
                           LegendLocation="Right" Series="{Binding ShareOfProjects}"
                           x:Name="pc_ProjectShare"
@@ -38,18 +47,30 @@
                 Grid.Row="0"
                 Grid.Column="1"
                 HorizontalAlignment="Left"
-                Content="{x:Static resources:Dashboard.ProjectFilterLabel}"></Label>
+                Content="{x:Static resources:Dashboard.ProjectFilterLabel}"
+                Foreground="{StaticResource LightWhite}"></Label>
             <ComboBox 
                 Margin="0 5 50 0"
                 Grid.Row="0" Grid.Column="1"
                 x:Name="cb_ProjectFilter"
                 Width="200"
                 HorizontalAlignment="Right"
+                Foreground="{StaticResource LightWhite}"
                 ItemsSource="{Binding ProjectViewModels}"
                 SelectionChanged="cb_ProjectFilter_SelectionChanged"
                 DisplayMemberPath="Name"
                 ></ComboBox>
-            <lvc:PieChart       Grid.Row="1" 
+            <Label x:Name="lbl_AssignmentShare"
+                   Grid.Row="1" 
+                   Grid.Column="1"
+                   Content="{x:Static resources:Dashboard.LabelAssignmentDistribution}"
+                   FontFamily="Segoe UI"
+                   FontSize="20"
+                   Foreground="{StaticResource LightWhite}"
+                   FontWeight="Bold"
+                   VerticalAlignment="Bottom"
+                   Visibility="Hidden"></Label>
+            <lvc:PieChart       Grid.Row="2" 
                                 Margin="10"
                                 Grid.Column="1" 
                                 Series="{Binding ShareOfAssignments}"
@@ -58,8 +79,18 @@
                                 Visibility="Hidden"
                                 InnerRadius="50"
                                 ></lvc:PieChart>
+            <Label x:Name="lbl_WorkingTimeHistory"
+                   Grid.Row="3" 
+                   Grid.Column="0"
+                   Grid.ColumnSpan="2"
+                   FontWeight="Bold"
+                   FontSize="20"
+                   VerticalAlignment="Bottom"
+                   Visibility="Hidden"
+                   Foreground="{StaticResource LightWhite}"
+                   Content="{x:Static resources:Dashboard.LabelWorkingTimeHistory}"></Label>
             <lvc:CartesianChart
-                Grid.Row="2"
+                Grid.Row="4"
                 Grid.Column="0"
                 Grid.ColumnSpan="2"
                 Visibility="Hidden"
@@ -77,15 +108,21 @@
             </lvc:CartesianChart>
             
         </Grid>
+        <Label Grid.Row="1"
+               Foreground="{StaticResource LightWhite}"
+               FontWeight="Bold"
+               FontSize="20"
+               VerticalAlignment="Bottom"
+               Content="{x:Static resources:Dashboard.LabelMostProductiveWeekdays}"></Label>
         <lvc:CartesianChart
-                Grid.Row="3"
+            Grid.Row="2"
             Margin="10"
             x:Name="cc_MostProductiveWeekdays">
             <lvc:CartesianChart.AxisX>
                 <lvc:Axis x:Name="weekdays_x_Axis" Labels="{Binding WeekdayLabels}"></lvc:Axis>
             </lvc:CartesianChart.AxisX>
             <lvc:CartesianChart.AxisY>
-                <lvc:Axis x:Name="weekdays_y_Axis"></lvc:Axis>
+                <lvc:Axis x:Name="weekdays_y_Axis" LabelFormatter="{Binding YAxisFormatter}"></lvc:Axis>
             </lvc:CartesianChart.AxisY>
         </lvc:CartesianChart>
     </Grid>
diff --git a/TakeMyTime.WPF/Statistics/Dashboard.xaml.cs b/TakeMyTime.WPF/Statistics/Dashboard.xaml.cs
@@ -95,6 +95,7 @@ public void LoadSharesOfAssignments(int project_id)
 
             this.pc_AssignmentShare.Series = this.ShareOfAssignments;
             this.pc_AssignmentShare.Visibility = Visibility.Visible;
+            this.lbl_AssignmentShare.Visibility = Visibility.Visible;
         }
 
         public void LoadProductiveDays(int project_id)
@@ -112,6 +113,7 @@ public void LoadProductiveDays(int project_id)
             this.cc_Productivity.Series = this.ProductiveDays;
             this.dateAxis.LabelFormatter = Formatter;
             this.cc_Productivity.Visibility = Visibility.Visible;
+            this.lbl_WorkingTimeHistory.Visibility = Visibility.Visible;
             DataContext = this;
         }
 
@@ -121,14 +123,15 @@ public void LoadMostProductiveDays()
             this.MostProductiveWeekDaysViewModels = this.statisticsLogic.GetMostProductiveWeekDays();
             var series = new ColumnSeries
             {
-                Values = this.MostProductiveWeekDaysViewModels.Select(vm => Math.Round(vm.Value, 2)).AsChartValues()
+                Values = this.MostProductiveWeekDaysViewModels.Select(vm => Math.Round(vm.Value, 2)).AsChartValues(),
             };
             series.Fill = Brushes.Orange;
             this.MostProductiveWeekdays.Add(series);
             this.cc_MostProductiveWeekdays.Series = this.MostProductiveWeekdays;
-
             this.WeekdayLabels = ResolveWeekdayNames(this.MostProductiveWeekDaysViewModels);
             this.weekdays_x_Axis.Labels = this.WeekdayLabels;
+            this.YAxisFormatter = val => string.Format("{0:0.#}%", val * 100);
+            this.weekdays_y_Axis.LabelFormatter = this.YAxisFormatter;
             DataContext = this;
         }
 
@@ -156,6 +159,7 @@ private string[] ResolveWeekdayNames(IEnumerable<MostProductiveWeekDaysViewModel
         public Dictionary<string, double> ProjectShares { get; set; }
         public IEnumerable<ProductivityViewModel> ProductiveEntryDays { get; set; }
         public Func<double, string> Formatter { get; set; }
+        public Func<double, string> YAxisFormatter { get; set; }
         public IEnumerable<MostProductiveWeekDaysViewModel> MostProductiveWeekDaysViewModels  { get; set; }
         public string[] WeekdayLabels { get; set; }
 

Original file line number	Diff line number	Diff line change
`@@ -50,10 +50,10 @@ public void GetProjectTypes_Test()`
`50`	`50`
`51`	`51`	`// ACT`
`52`	`52`	`var projectTypes = projectTypeLogic.GetProjectTypes();`
`53`		`- projectTypeLogic.Dispose();`
`54`	`53`
`55`	`54`	`// ASSERT`
`56`	`55`	`Assert.IsTrue(projectTypes.Count() == 3);`
	`56`	`+ projectTypeLogic.Dispose();`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`[TestMethod]`