From f171a25c567cf4eae6c9554e17fbcd130a15a1a7 Mon Sep 17 00:00:00 2001
From: Marcel Hirschle <marcel.hirschle@ownsoft.de>
Date: Mon, 22 May 2023 14:38:11 +0200
Subject: [PATCH] MH: BetreuWo Dienstplan Fix

---
 ReportImp/BetreuWoReports/BetreuWoReports.csproj   | 14 +++-----------
 ReportImp/BetreuWoReports/BetreuwoReportCreator.cs |  6 +++---
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/ReportImp/BetreuWoReports/BetreuWoReports.csproj b/ReportImp/BetreuWoReports/BetreuWoReports.csproj
index 8fa5671f6..ec8fbcbed 100644
--- a/ReportImp/BetreuWoReports/BetreuWoReports.csproj
+++ b/ReportImp/BetreuWoReports/BetreuWoReports.csproj
@@ -117,13 +117,6 @@
     <Compile Include="Mitarbeiterstundenkonto.designer.cs">
       <DependentUpon>Mitarbeiterstundenkonto.cs</DependentUpon>
     </Compile>
-    <Compile Include="ReportObjects\CustomRosterRO.cs" />
-    <Compile Include="RosterReport.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="RosterReport.Designer.cs">
-      <DependentUpon>RosterReport.cs</DependentUpon>
-    </Compile>
     <Compile Include="Service\QueryService.cs" />
     <Compile Include="Service\ResourceService.cs" />
     <Compile Include="Stundenabrechnung.cs">
@@ -225,10 +218,6 @@
       <DependentUpon>Mitarbeiterstundenkonto.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="RosterReport.resx">
-      <DependentUpon>RosterReport.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
     <EmbeddedResource Include="Stundenabrechnung.resx">
       <DependentUpon>Stundenabrechnung.cs</DependentUpon>
     </EmbeddedResource>
@@ -310,6 +299,9 @@
   <ItemGroup>
     <None Include="app.config" />
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="ReportObjects\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/ReportImp/BetreuWoReports/BetreuwoReportCreator.cs b/ReportImp/BetreuWoReports/BetreuwoReportCreator.cs
index b653e1633..ed1e6650c 100644
--- a/ReportImp/BetreuWoReports/BetreuwoReportCreator.cs
+++ b/ReportImp/BetreuWoReports/BetreuwoReportCreator.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using BetreuWoReports.ReportObjects;
+//using BetreuWoReports.ReportObjects;
 using BeWo.Data.Access;
 using BeWo.Data.Entities;
 using BeWo.Report;
@@ -162,8 +162,8 @@ namespace BeWo.BetreuWoReports
             var creatorEmployee = MapperFactory.EmployeeDC_Employee.MapToNewDC(DAOFactory.GenericDAO.GetByID<Employee>(creator));
 
             //report.SetReportDataSource(RosterRO.Create(service.GetDienstEintraege(wOid, dt.Year, dt.Month), service.GetAllDienste(), service2.GetAllActiveWohnheimeCompact().First(x => x.WohnheimOid == wOid), dt.Year, dt.Month));
-            report.SetReportDataSource(CustomRosterRO.CreateNew(dienstEintraege, vertretungen, employee,
-                service.GetAllDienste(wOid), service2.GetAllActiveWohnheimeCompact().First(x => x.WohnheimOid == wOid), dt.Year, dt.Month, feiertage, sortingIndex, aufsteigend, creatorEmployee));
+            report.SetReportDataSource(RosterRO.CreateNew(dienstEintraege, vertretungen, employee,
+            service.GetAllDienste(wOid), service2.GetAllActiveWohnheimeCompact().First(x => x.WohnheimOid == wOid), dt.Year, dt.Month, feiertage, sortingIndex, aufsteigend, creatorEmployee));
 
             return report as XtraReport;
         }