From 7dfc7163ef6adfdc100c6f32834c0469c7c9b830 Mon Sep 17 00:00:00 2001
From: Marcel Hirschle <marcel.hirschle@ownsoft.de>
Date: Tue, 10 Jan 2023 14:18:43 +0100
Subject: [PATCH] MH: FFS Stundenkonto Fix

---
 BeWo.sln                                      | 19 ++++++++++++++++
 ...CustomMitarbeiterstundenkontoBerechnung.cs | 22 +++++++++----------
 2 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/BeWo.sln b/BeWo.sln
index 87de15049..69e1eee42 100644
--- a/BeWo.sln
+++ b/BeWo.sln
@@ -585,6 +585,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BetreuungsserviceFuerAlltag
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PortaEV", "ReportImp\PortaEV\PortaEV.csproj", "{0114A289-5FD4-4CD9-A704-5161B6FD7726}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LebensWert", "ReportImp\LebensWert\LebensWert.csproj", "{09BA6418-1FC2-4B45-8CE0-BB9C24499442}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|.NET = Debug|.NET
@@ -4652,6 +4654,22 @@ Global
 		{0114A289-5FD4-4CD9-A704-5161B6FD7726}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{0114A289-5FD4-4CD9-A704-5161B6FD7726}.Release|x86.ActiveCfg = Release|Any CPU
 		{0114A289-5FD4-4CD9-A704-5161B6FD7726}.Release|x86.Build.0 = Release|Any CPU
+		{09BA6418-1FC2-4B45-8CE0-BB9C24499442}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{09BA6418-1FC2-4B45-8CE0-BB9C24499442}.Debug|.NET.Build.0 = Debug|Any CPU
+		{09BA6418-1FC2-4B45-8CE0-BB9C24499442}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{09BA6418-1FC2-4B45-8CE0-BB9C24499442}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{09BA6418-1FC2-4B45-8CE0-BB9C24499442}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{09BA6418-1FC2-4B45-8CE0-BB9C24499442}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{09BA6418-1FC2-4B45-8CE0-BB9C24499442}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{09BA6418-1FC2-4B45-8CE0-BB9C24499442}.Debug|x86.Build.0 = Debug|Any CPU
+		{09BA6418-1FC2-4B45-8CE0-BB9C24499442}.Release|.NET.ActiveCfg = Release|Any CPU
+		{09BA6418-1FC2-4B45-8CE0-BB9C24499442}.Release|.NET.Build.0 = Release|Any CPU
+		{09BA6418-1FC2-4B45-8CE0-BB9C24499442}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{09BA6418-1FC2-4B45-8CE0-BB9C24499442}.Release|Any CPU.Build.0 = Release|Any CPU
+		{09BA6418-1FC2-4B45-8CE0-BB9C24499442}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{09BA6418-1FC2-4B45-8CE0-BB9C24499442}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{09BA6418-1FC2-4B45-8CE0-BB9C24499442}.Release|x86.ActiveCfg = Release|Any CPU
+		{09BA6418-1FC2-4B45-8CE0-BB9C24499442}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -4940,6 +4958,7 @@ Global
 		{182599E0-36D9-4804-8904-F28F40A79A5D} = {D8A691C5-146D-4613-86CC-438F02FE9106}
 		{40BE484A-5DC5-4257-95AA-5C2B1AA1B056} = {D8A691C5-146D-4613-86CC-438F02FE9106}
 		{0114A289-5FD4-4CD9-A704-5161B6FD7726} = {D8A691C5-146D-4613-86CC-438F02FE9106}
+		{09BA6418-1FC2-4B45-8CE0-BB9C24499442} = {D8A691C5-146D-4613-86CC-438F02FE9106}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {FBE985BB-9F0F-4DBB-8F94-ABC37A803FF9}
diff --git a/ReportImp/FreundeskreisSuchthilfe/CustomMitarbeiterstundenkontoBerechnung.cs b/ReportImp/FreundeskreisSuchthilfe/CustomMitarbeiterstundenkontoBerechnung.cs
index a86da6f06..0403a00fc 100644
--- a/ReportImp/FreundeskreisSuchthilfe/CustomMitarbeiterstundenkontoBerechnung.cs
+++ b/ReportImp/FreundeskreisSuchthilfe/CustomMitarbeiterstundenkontoBerechnung.cs
@@ -25,17 +25,17 @@ namespace FreundeskreisSuchthilfe.Alt
             return dd;
         }
 
-        //public override bool AddServiceRecordToDuration(ServiceRecord item)
-        //{
-        //    if (item.ServiceDescription != null && item.ServiceDescription.ServiceCategory != null)
-        //    {
-        //        if (item.ServiceDescription.ServiceCategory.Name == "Dienstzeiten")
-        //        {
-        //            return true;
-        //        }
-        //    }
-        //    return false;
-        //}
+        public override bool AddServiceRecordToDuration(ServiceRecord item)
+        {
+            if (item.ServiceDescription != null && item.ServiceDescription.ServiceCategory != null)
+            {
+                if (item.ServiceDescription.ServiceCategory.Name == "Dienstzeiten")
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
 
         protected override ServiceRecordSummary BerechneStunden(MitarbeiterstundenkontoRO.EmployeeDetail empDetail, IList<ServiceRecord> groupFilteredRecords, DateTime berichtsAnfang,
             DateTime berichtsEnde)