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

MH: BetreuWo RosterReport Bugfix

Browse Source
This commit is contained in:
HirschleM
2025-07-03 11:27:09 +02:00
parent b90fd19e20
commit 7359bc886d
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ReportImp/BetreuWoReports/BetreuWoReports.csproj
View File

@@ -124,6 +124,12 @@
<Compile Include="Mitarbeiterstundenkonto.designer.cs">
<DependentUpon>Mitarbeiterstundenkonto.cs</DependentUpon>
</Compile>
<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,6 +231,10 @@
<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>

2
ReportImp/BetreuWoReports/RosterReport.Designer.cs generated
View File

@@ -226,7 +226,7 @@ namespace BetreuWoReports
this.Margins = new System.Drawing.Printing.Margins(30, 30, 50, 20);
this.PageHeight = 827;
this.PageWidth = 1169;
this.PaperKind = System.Drawing.Printing.PaperKind.A4;
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
this.Version = "17.1";
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();

6
ReportImp/BetreuWoReports/RosterReport.cs
View File

@@ -11,7 +11,7 @@ using BeWo.Report;
namespace BetreuWoReports
{
public partial class RosterReport : XtraReport, IBeWoReport<ReportObjects.CustomRosterRO>
public partial class RosterReport : XtraReport, IBeWoReport<RosterRO>
{
public XRTable Table1 { get; set; }
public XRTable Table2 { get; set; }
@@ -39,7 +39,7 @@ namespace BetreuWoReports
InitializeComponent2();
}
public void SetReportDataSource(ReportObjects.CustomRosterRO pRO) // In Rows sind die Days drin, da müssen die Abwesenheiten rein. Das ist der way2go
public void SetReportDataSource(RosterRO pRO) // In Rows sind die Days drin, da müssen die Abwesenheiten rein. Das ist der way2go
{
int days = DateTime.DaysInMonth(pRO.ReportDateTime.Year, pRO.ReportDateTime.Month);
monthAndYear = new DateTime(pRO.ReportDateTime.Year, pRO.ReportDateTime.Month, 1);
@@ -349,7 +349,7 @@ namespace BetreuWoReports
if (abwesenheit.AbsenceSpan.ContainsDate(new DateTime(monthAndYear.Year, monthAndYear.Month, tag)))
{
cell.Row.Cells[index].BackColor = Color.White;
cell.Row.Cells[index].Text = abwesenheit.Reason.Description[0].ToString();
cell.Row.Cells[index].Text = abwesenheit.Reason.Description[0].ToString(); // Der Text erscheint nicht, scheint überschrieben zu werden
cell.Row.Cells[index].ForeColor = Color.Red;
}
}