From 42d3086b9e4e52beced38db9796a649bf08b8e03 Mon Sep 17 00:00:00 2001
From: Kojo <kojo.bauer@ownsoft.de>
Date: Mon, 9 Sep 2024 14:53:21 +0200
Subject: [PATCH] =?UTF-8?q?SKFLeverkusenJuHi:=20Berechnungslogik=20f=C3=BC?=
 =?UTF-8?q?r=20Gruppenbuchungen=20so=20anpasst,=20dass=20die=20volle=20Zei?=
 =?UTF-8?q?t=20f=C3=BCr=20alle=20Teilnehmer=20gebucht=20wird?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CustomGroupDurationCalculator.cs          |  18 ++
 .../SkfLeverkusenJuHi.csproj                  | 287 +++++++++---------
 2 files changed, 162 insertions(+), 143 deletions(-)
 create mode 100644 ReportImp/SKFLeverkusenJuHi/Calculations/CustomGroupDurationCalculator.cs

diff --git a/ReportImp/SKFLeverkusenJuHi/Calculations/CustomGroupDurationCalculator.cs b/ReportImp/SKFLeverkusenJuHi/Calculations/CustomGroupDurationCalculator.cs
new file mode 100644
index 000000000..953673b86
--- /dev/null
+++ b/ReportImp/SKFLeverkusenJuHi/Calculations/CustomGroupDurationCalculator.cs
@@ -0,0 +1,18 @@
+using BeWo.Service.Plugins;
+using BS.Shared.DataContracts;
+
+namespace SkfLeverkusenJuHi.Calculation
+{
+    
+    public class CustomGroupDurationCalculator : GroupDurationCalculator
+    {
+        public override GroupDurationDC CalculateGroupDuration(int personCount, int employeeCount, decimal totalDuration)
+        {
+            return new GroupDurationDC()
+            {
+                SingleDuration = totalDuration,
+                TotalDuration = totalDuration
+            };
+        }
+    }
+}
diff --git a/ReportImp/SKFLeverkusenJuHi/SkfLeverkusenJuHi.csproj b/ReportImp/SKFLeverkusenJuHi/SkfLeverkusenJuHi.csproj
index 38f8cf3de..28e943df4 100644
--- a/ReportImp/SKFLeverkusenJuHi/SkfLeverkusenJuHi.csproj
+++ b/ReportImp/SKFLeverkusenJuHi/SkfLeverkusenJuHi.csproj
@@ -1,144 +1,145 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{E426D6C6-9A15-4AA5-9FCA-1F71BAB4B8C3}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>SkfLeverkusenJuHi</RootNamespace>
-    <AssemblyName>7653029063_Reports</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\CustomerDlls\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\..\CustomerDlls\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="DevExpress.Drawing.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.Data.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.Office.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.RichEdit.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.RichEdit.v23.2.Export, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.Printing.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.Data.Desktop.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.Utils.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.XtraPrinting.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.Charts.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.XtraCharts.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.XtraReports.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Invoicing\CollectiveInvoiceCreation.cs" />
-    <Compile Include="Invoicing\CustomInvoiceFactory.cs" />
-    <Compile Include="Calculations\CustomServiceRecordStatisticFactory.cs" />
-    <Compile Include="CustomReportCreator.cs" />
-    <Compile Include="HilfeplanStand.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="HilfeplanStand.designer.cs">
-      <DependentUpon>HilfeplanStand.cs</DependentUpon>
-    </Compile>
-    <Compile Include="LeistungsdokuKurz.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="LeistungsdokuKurz.designer.cs">
-      <DependentUpon>LeistungsdokuKurz.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Leistungsdoku.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="Leistungsdoku.designer.cs">
-      <DependentUpon>Leistungsdoku.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Sammelrechnung.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="Sammelrechnung.Designer.cs">
-      <DependentUpon>Sammelrechnung.cs</DependentUpon>
-    </Compile>
-    <Compile Include="ServiceInvoiceReport.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="ServiceInvoiceReport.Designer.cs">
-      <DependentUpon>ServiceInvoiceReport.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Translation\TranslationDictionary.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\Data\Data.csproj">
-      <Project>{B0D73E3D-4AE7-4024-93A6-DB1F46D7CCEE}</Project>
-      <Name>Data</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Report\Report.csproj">
-      <Project>{40d8b312-ea64-49e3-a31a-5e57ed4d5654}</Project>
-      <Name>Report</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Service\Service.csproj">
-      <Project>{094331c3-ecee-4c89-bbfd-4c9ded89f0ef}</Project>
-      <Name>Service</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Shared\Shared.csproj">
-      <Project>{2f50b83d-a3f0-4ec4-979a-3f9b7e3d8ed4}</Project>
-      <Name>Shared</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="HilfeplanStand.resx">
-      <DependentUpon>HilfeplanStand.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="LeistungsdokuKurz.resx">
-      <DependentUpon>LeistungsdokuKurz.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Leistungsdoku.resx">
-      <DependentUpon>Leistungsdoku.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Properties\licenses.licx" />
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Sammelrechnung.resx">
-      <DependentUpon>Sammelrechnung.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ServiceInvoiceReport.resx">
-      <DependentUpon>ServiceInvoiceReport.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{E426D6C6-9A15-4AA5-9FCA-1F71BAB4B8C3}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>SkfLeverkusenJuHi</RootNamespace>
+    <AssemblyName>7653029063_Reports</AssemblyName>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\CustomerDlls\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\..\CustomerDlls\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="DevExpress.Drawing.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Data.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Office.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.RichEdit.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.RichEdit.v23.2.Export, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Printing.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Data.Desktop.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Utils.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraPrinting.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Charts.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraCharts.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraReports.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Calculations\CustomGroupDurationCalculator.cs" />
+    <Compile Include="Invoicing\CollectiveInvoiceCreation.cs" />
+    <Compile Include="Invoicing\CustomInvoiceFactory.cs" />
+    <Compile Include="Calculations\CustomServiceRecordStatisticFactory.cs" />
+    <Compile Include="CustomReportCreator.cs" />
+    <Compile Include="HilfeplanStand.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="HilfeplanStand.designer.cs">
+      <DependentUpon>HilfeplanStand.cs</DependentUpon>
+    </Compile>
+    <Compile Include="LeistungsdokuKurz.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="LeistungsdokuKurz.designer.cs">
+      <DependentUpon>LeistungsdokuKurz.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Leistungsdoku.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Leistungsdoku.designer.cs">
+      <DependentUpon>Leistungsdoku.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="Sammelrechnung.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Sammelrechnung.Designer.cs">
+      <DependentUpon>Sammelrechnung.cs</DependentUpon>
+    </Compile>
+    <Compile Include="ServiceInvoiceReport.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="ServiceInvoiceReport.Designer.cs">
+      <DependentUpon>ServiceInvoiceReport.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Translation\TranslationDictionary.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Data\Data.csproj">
+      <Project>{B0D73E3D-4AE7-4024-93A6-DB1F46D7CCEE}</Project>
+      <Name>Data</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Report\Report.csproj">
+      <Project>{40d8b312-ea64-49e3-a31a-5e57ed4d5654}</Project>
+      <Name>Report</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Service\Service.csproj">
+      <Project>{094331c3-ecee-4c89-bbfd-4c9ded89f0ef}</Project>
+      <Name>Service</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Shared\Shared.csproj">
+      <Project>{2f50b83d-a3f0-4ec4-979a-3f9b7e3d8ed4}</Project>
+      <Name>Shared</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="HilfeplanStand.resx">
+      <DependentUpon>HilfeplanStand.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="LeistungsdokuKurz.resx">
+      <DependentUpon>LeistungsdokuKurz.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Leistungsdoku.resx">
+      <DependentUpon>Leistungsdoku.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Properties\licenses.licx" />
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Sammelrechnung.resx">
+      <DependentUpon>Sammelrechnung.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="ServiceInvoiceReport.resx">
+      <DependentUpon>ServiceInvoiceReport.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file