ownSoft/BeWoPlaner
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MH: BetreuWo Dienstplan Fix

Browse Source
This commit is contained in:
Marcel Hirschle
2023-05-22 14:38:11 +02:00
parent 2dde5ab3e8
commit f171a25c56
2 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ReportImp/BetreuWoReports/BetreuWoReports.csproj
View File

@@ -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.

6
ReportImp/BetreuWoReports/BetreuwoReportCreator.cs
View File

@@ -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;
}