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

Merge branch 'master' of ssh://float.ownsoft.de/git/beyondSoft/BeWo

Browse Source
This commit is contained in:
HirschleM
2026-07-30 07:29:51 +02:00
parent 00cbc763c4 51665371c1
commit 61dbeb71a7
7 changed files with 239 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ReportImp/HshCologne/CustomReportCreator.cs
View File

@@ -191,7 +191,14 @@ namespace HshCologne
}
//report = AddReportToReport(report, new Quittierungsbeleg2(), bewoRo);
report = AddReportToReport(report, new LeistungsnachweisFamilienhilfe(), spfhRo);
report = AddReportToReport(report, new LeistungsnachweisSchulbegleitung(), sbdRo);
if (ro.Costbearer != null && ro.Costbearer.Contains("Wesseling"))
{
report = AddReportToReport(report, new LeistungsnachweisSbWesseling(), sbdRo);
}
else
{
report = AddReportToReport(report, new LeistungsnachweisSchulbegleitung(), sbdRo);
}
//report = AddReportToReport(report, eingliederungshilfe);
@@ -218,7 +225,6 @@ namespace HshCologne
}
masterReport.Pages.AddRange(((XtraReport)newReport).Pages);
}
}
return masterReport;

317
ReportImp/HshCologne/LeistungsnachweisSbWesseling.Designer.cs generated
View File

@@ -28,33 +28,40 @@ namespace HshCologne
/// </summary>
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
DevExpress.XtraReports.UI.XRSummary xrSummary1 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark();
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
this.xrTableServiceRecords1 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell();
this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
this.xrTable3 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow6 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell();
this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule();
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow5 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
this.lblAbteilung = new DevExpress.XtraReports.UI.XRTableCell();
this.lblHeader = new DevExpress.XtraReports.UI.XRLabel();
this.formattingRuleServiceDesc = new DevExpress.XtraReports.UI.FormattingRule();
this.formattingRuleCostBearer = new DevExpress.XtraReports.UI.FormattingRule();
@@ -74,6 +81,9 @@ namespace HshCologne
this.xrTable2 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow9 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
this.fieldAbrechenbareStunden = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldTotalFLSBillable = new DevExpress.XtraReports.UI.CalculatedField();
@@ -82,24 +92,16 @@ namespace HshCologne
this.fieldBillableFLS = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldAbrechenbareFLS = new DevExpress.XtraReports.UI.CalculatedField();
this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell();
this.calculatedField1 = new DevExpress.XtraReports.UI.CalculatedField();
this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrPageInfo1 = new DevExpress.XtraReports.UI.XRPageInfo();
this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
this.bindingSource1 = new System.Windows.Forms.BindingSource();
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
@@ -121,7 +123,7 @@ namespace HshCologne
this.xrTableServiceRecords1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.xrTableServiceRecords1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow2});
this.xrTableServiceRecords1.SizeF = new System.Drawing.SizeF(682F, 40F);
this.xrTableServiceRecords1.SizeF = new System.Drawing.SizeF(680F, 25F);
this.xrTableServiceRecords1.StylePriority.UseBackColor = false;
this.xrTableServiceRecords1.StylePriority.UseFont = false;
this.xrTableServiceRecords1.StylePriority.UseTextAlignment = false;
@@ -139,7 +141,7 @@ namespace HshCologne
this.xrTableRow2.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.xrTableRow2.StylePriority.UseFont = false;
this.xrTableRow2.StylePriority.UseTextAlignment = false;
this.xrTableRow2.Weight = 2.2222184546263724D;
this.xrTableRow2.Weight = 1.3888865341414829D;
//
// xrTableCell3
//
@@ -149,7 +151,18 @@ namespace HshCologne
this.xrTableCell3.StylePriority.UseTextAlignment = false;
this.xrTableCell3.Text = "Datum";
this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.xrTableCell3.Weight = 0.310366161724111D;
this.xrTableCell3.Weight = 0.32366763925601244D;
//
// xrTableCell17
//
this.xrTableCell17.Multiline = true;
this.xrTableCell17.Name = "xrTableCell17";
this.xrTableCell17.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell17.StylePriority.UseFont = false;
this.xrTableCell17.StylePriority.UseTextAlignment = false;
this.xrTableCell17.Text = "Uhrzeit";
this.xrTableCell17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.xrTableCell17.Weight = 0.407909834158614D;
//
// xrTableCell5
//
@@ -158,7 +171,7 @@ namespace HshCologne
this.xrTableCell5.StylePriority.UseTextAlignment = false;
this.xrTableCell5.Text = "Betreuung";
this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.xrTableCell5.Weight = 0.36061604276173054D;
this.xrTableCell5.Weight = 0.37687327639783491D;
//
// xrTableCell1
//
@@ -168,7 +181,18 @@ namespace HshCologne
this.xrTableCell1.StylePriority.UseTextAlignment = false;
this.xrTableCell1.Text = "Themen";
this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
this.xrTableCell1.Weight = 1.6146434587093605D;
this.xrTableCell1.Weight = 1.6405072886973222D;
//
// xrTableCell19
//
this.xrTableCell19.Multiline = true;
this.xrTableCell19.Name = "xrTableCell19";
this.xrTableCell19.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
this.xrTableCell19.StylePriority.UsePadding = false;
this.xrTableCell19.StylePriority.UseTextAlignment = false;
this.xrTableCell19.Text = "FLS";
this.xrTableCell19.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.xrTableCell19.Weight = 0.26602820037485575D;
//
// DetailReport
//
@@ -227,7 +251,18 @@ namespace HshCologne
this.xrTableCell13.StylePriority.UseTextAlignment = false;
this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.xrTableCell13.TextFormatString = "{0:dd.MM.yyyy}";
this.xrTableCell13.Weight = 0.096677903364725024D;
this.xrTableCell13.Weight = 0.10082124218741323D;
//
// xrTableCell20
//
this.xrTableCell20.Multiline = true;
this.xrTableCell20.Name = "xrTableCell20";
this.xrTableCell20.StylePriority.UseFont = false;
this.xrTableCell20.StylePriority.UsePadding = false;
this.xrTableCell20.StylePriority.UseTextAlignment = false;
this.xrTableCell20.Text = "[StartDateMinutes!HH:mm] - [EndDateMinutes!HH:mm]";
this.xrTableCell20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.xrTableCell20.Weight = 0.12706243011967136D;
//
// xrTableCell6
//
@@ -236,7 +271,7 @@ namespace HshCologne
this.xrTableCell6.Name = "xrTableCell6";
this.xrTableCell6.StylePriority.UseTextAlignment = false;
this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.xrTableCell6.Weight = 0.11233049285039497D;
this.xrTableCell6.Weight = 0.11739460173249526D;
//
// xrTableCell2
//
@@ -249,11 +284,20 @@ namespace HshCologne
this.xrTableCell2.StylePriority.UseTextAlignment = false;
this.xrTableCell2.Text = "xrTableCell2";
this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
this.xrTableCell2.Weight = 0.50295528359323982D;
this.xrTableCell2.Weight = 0.51101178979787421D;
//
// bindingSource1
// xrTableCell21
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
this.xrTableCell21.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.fieldAbrechenbareStunden")});
this.xrTableCell21.Multiline = true;
this.xrTableCell21.Name = "xrTableCell21";
this.xrTableCell21.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 100F);
this.xrTableCell21.StylePriority.UsePadding = false;
this.xrTableCell21.StylePriority.UseTextAlignment = false;
this.xrTableCell21.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.xrTableCell21.TextFormatString = "{0:0.00}";
this.xrTableCell21.Weight = 0.082866735971871469D;
//
// formattingRuleStartDate
//
@@ -268,7 +312,7 @@ namespace HshCologne
this.xrTable1,
this.lblHeader});
this.ReportHeader.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.ReportHeader.HeightF = 140F;
this.ReportHeader.HeightF = 160.3334F;
this.ReportHeader.Name = "ReportHeader";
this.ReportHeader.StylePriority.UseFont = false;
//
@@ -303,6 +347,16 @@ namespace HshCologne
this.xrTableRow1.StylePriority.UseTextAlignment = false;
this.xrTableRow1.Weight = 1.111109227313186D;
//
// xrTableCell10
//
this.xrTableCell10.Name = "xrTableCell10";
this.xrTableCell10.StylePriority.UseBackColor = false;
this.xrTableCell10.StylePriority.UseFont = false;
this.xrTableCell10.StylePriority.UsePadding = false;
this.xrTableCell10.StylePriority.UseTextAlignment = false;
this.xrTableCell10.Text = "Klient/in";
this.xrTableCell10.Weight = 0.29263101788877588D;
//
// xrTableCell11
//
this.xrTableCell11.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
@@ -318,10 +372,18 @@ namespace HshCologne
this.xrTableRow3.Name = "xrTableRow3";
this.xrTableRow3.Weight = 1.1111092273131864D;
//
// xrTableCell4
//
this.xrTableCell4.Name = "xrTableCell4";
this.xrTableCell4.StylePriority.UsePadding = false;
this.xrTableCell4.StylePriority.UseTextAlignment = false;
this.xrTableCell4.Text = "Monat";
this.xrTableCell4.Weight = 0.29263079462902719D;
//
// xrTableCell7
//
this.xrTableCell7.Name = "xrTableCell7";
this.xrTableCell7.Text = "[Month]/[Year]";
this.xrTableCell7.Text = "[Month] [Year]";
this.xrTableCell7.Weight = 1.3656116394315783D;
//
// xrTableRow4
@@ -332,6 +394,12 @@ namespace HshCologne
this.xrTableRow4.Name = "xrTableRow4";
this.xrTableRow4.Weight = 1.1111092273131862D;
//
// xrTableCell8
//
this.xrTableCell8.Name = "xrTableCell8";
this.xrTableCell8.Text = "Aktenzeichen";
this.xrTableCell8.Weight = 0.29263079462902719D;
//
// xrTableCell14
//
this.xrTableCell14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
@@ -344,17 +412,21 @@ namespace HshCologne
//
this.xrTableRow5.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell15,
this.xrTableCell18});
this.lblAbteilung});
this.xrTableRow5.Name = "xrTableRow5";
this.xrTableRow5.Weight = 1.111109227313186D;
//
// xrTableCell18
// xrTableCell15
//
this.xrTableCell18.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "MainAttendant")});
this.xrTableCell18.Name = "xrTableCell18";
this.xrTableCell18.Text = "xrTableCell18";
this.xrTableCell18.Weight = 1.3656116394315783D;
this.xrTableCell15.Name = "xrTableCell15";
this.xrTableCell15.Text = "Abteilung";
this.xrTableCell15.Weight = 0.29263079462902719D;
//
// lblAbteilung
//
this.lblAbteilung.Name = "lblAbteilung";
this.lblAbteilung.Text = "[Costbearer] - ";
this.lblAbteilung.Weight = 1.3656116394315783D;
//
// lblHeader
//
@@ -399,7 +471,10 @@ namespace HshCologne
//
// bottomMarginBand1
//
this.bottomMarginBand1.HeightF = 36F;
this.bottomMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel6,
this.xrPageInfo1});
this.bottomMarginBand1.HeightF = 50F;
this.bottomMarginBand1.Name = "bottomMarginBand1";
//
// ReportFooter
@@ -410,6 +485,7 @@ namespace HshCologne
this.xrTable2});
this.ReportFooter.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.ReportFooter.HeightF = 130.375F;
this.ReportFooter.KeepTogether = true;
this.ReportFooter.Name = "ReportFooter";
this.ReportFooter.StylePriority.UseFont = false;
//
@@ -461,7 +537,7 @@ namespace HshCologne
this.cellDatum.StylePriority.UseFont = false;
this.cellDatum.StylePriority.UseTextAlignment = false;
this.cellDatum.Text = "Datum";
this.cellDatum.Weight = 0.58526203320664327D;
this.cellDatum.Weight = 0.60964795128980764D;
//
// xrTableCell24
//
@@ -475,7 +551,7 @@ namespace HshCologne
this.xrTableCell24.StylePriority.UsePadding = false;
this.xrTableCell24.StylePriority.UseTextAlignment = false;
this.xrTableCell24.Text = "Unterschrift";
this.xrTableCell24.Weight = 1.0729803964485358D;
this.xrTableCell24.Weight = 1.0485944783653713D;
//
// xrLabel5
//
@@ -547,7 +623,7 @@ namespace HshCologne
this.xrTable2.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow9});
this.xrTable2.SizeF = new System.Drawing.SizeF(681.9999F, 25F);
this.xrTable2.SizeF = new System.Drawing.SizeF(679.9998F, 25F);
this.xrTable2.StylePriority.UseBackColor = false;
this.xrTable2.StylePriority.UseFont = false;
this.xrTable2.StylePriority.UseTextAlignment = false;
@@ -573,17 +649,47 @@ namespace HshCologne
this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell9.StylePriority.UseFont = false;
this.xrTableCell9.StylePriority.UseTextAlignment = false;
this.xrTableCell9.Weight = 0.23027169784383567D;
this.xrTableCell9.Weight = 0.24014053702298543D;
//
// xrTableCell22
//
this.xrTableCell22.Multiline = true;
this.xrTableCell22.Name = "xrTableCell22";
this.xrTableCell22.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell22.StylePriority.UseFont = false;
this.xrTableCell22.StylePriority.UseTextAlignment = false;
this.xrTableCell22.Weight = 0.30264276136833063D;
//
// xrTableCell23
//
this.xrTableCell23.Multiline = true;
this.xrTableCell23.Name = "xrTableCell23";
this.xrTableCell23.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell23.StylePriority.UseFont = false;
this.xrTableCell23.StylePriority.UseTextAlignment = false;
this.xrTableCell23.Text = "Summe";
this.xrTableCell23.Weight = 0.2796155512890689D;
//
// xrTableCell16
//
this.xrTableCell16.Multiline = true;
this.xrTableCell16.Name = "xrTableCell16";
this.xrTableCell16.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell16.StylePriority.UseFont = false;
this.xrTableCell16.StylePriority.UseTextAlignment = false;
this.xrTableCell16.Weight = 1.2171506724689758D;
//
// xrTableCell12
//
this.xrTableCell12.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.fieldAbrechenbareStunden")});
this.xrTableCell12.Name = "xrTableCell12";
this.xrTableCell12.StylePriority.UseTextAlignment = false;
xrSummary1.FormatString = "{0:0.00}";
xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Report;
this.xrTableCell12.Summary = xrSummary1;
this.xrTableCell12.Weight = 0.25603998022608909D;
this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell12.Weight = 0.19737537852337286D;
//
// fieldAbrechenbareStunden
//
@@ -628,119 +734,42 @@ namespace HshCologne
this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTableServiceRecords1});
this.GroupHeader1.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.GroupHeader1.HeightF = 40F;
this.GroupHeader1.HeightF = 25F;
this.GroupHeader1.Name = "GroupHeader1";
this.GroupHeader1.RepeatEveryPage = true;
this.GroupHeader1.StylePriority.UseFont = false;
//
// xrTableCell15
//
this.xrTableCell15.Name = "xrTableCell15";
this.xrTableCell15.Text = "Abteilung";
this.xrTableCell15.Weight = 0.29263079462902719D;
//
// xrTableCell8
//
this.xrTableCell8.Name = "xrTableCell8";
this.xrTableCell8.Text = "Aktenzeichen";
this.xrTableCell8.Weight = 0.29263079462902719D;
//
// xrTableCell4
//
this.xrTableCell4.Name = "xrTableCell4";
this.xrTableCell4.StylePriority.UsePadding = false;
this.xrTableCell4.StylePriority.UseTextAlignment = false;
this.xrTableCell4.Text = "Monat";
this.xrTableCell4.Weight = 0.29263079462902719D;
//
// xrTableCell10
//
this.xrTableCell10.Name = "xrTableCell10";
this.xrTableCell10.StylePriority.UseBackColor = false;
this.xrTableCell10.StylePriority.UseFont = false;
this.xrTableCell10.StylePriority.UsePadding = false;
this.xrTableCell10.StylePriority.UseTextAlignment = false;
this.xrTableCell10.Text = "Klient/in";
this.xrTableCell10.Weight = 0.29263101788877588D;
//
// xrTableCell17
//
this.xrTableCell17.Multiline = true;
this.xrTableCell17.Name = "xrTableCell17";
this.xrTableCell17.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell17.StylePriority.UseFont = false;
this.xrTableCell17.StylePriority.UseTextAlignment = false;
this.xrTableCell17.Text = "Uhrzeit";
this.xrTableCell17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.xrTableCell17.Weight = 0.39313058005631485D;
//
// xrTableCell19
//
this.xrTableCell19.Multiline = true;
this.xrTableCell19.Name = "xrTableCell19";
this.xrTableCell19.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
this.xrTableCell19.StylePriority.UsePadding = false;
this.xrTableCell19.StylePriority.UseTextAlignment = false;
this.xrTableCell19.Text = "FLS";
this.xrTableCell19.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
this.xrTableCell19.Weight = 0.34509760221807734D;
//
// xrTableCell20
//
this.xrTableCell20.Multiline = true;
this.xrTableCell20.Name = "xrTableCell20";
this.xrTableCell20.StylePriority.UseFont = false;
this.xrTableCell20.StylePriority.UsePadding = false;
this.xrTableCell20.StylePriority.UseTextAlignment = false;
this.xrTableCell20.Text = "[StartDateMinutes!HH:mm]";
this.xrTableCell20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.xrTableCell20.Weight = 0.12245874841549918D;
//
// xrTableCell21
//
this.xrTableCell21.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.fieldAbrechenbareStunden")});
this.xrTableCell21.Multiline = true;
this.xrTableCell21.Name = "xrTableCell21";
this.xrTableCell21.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 100F);
this.xrTableCell21.StylePriority.UsePadding = false;
this.xrTableCell21.StylePriority.UseTextAlignment = false;
this.xrTableCell21.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
this.xrTableCell21.TextFormatString = "{0:0.00}";
this.xrTableCell21.Weight = 0.10473437158546656D;
//
// calculatedField1
//
this.calculatedField1.DataMember = "Services";
this.calculatedField1.Name = "calculatedField1";
//
// xrTableCell22
// xrPageInfo1
//
this.xrTableCell22.Multiline = true;
this.xrTableCell22.Name = "xrTableCell22";
this.xrTableCell22.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell22.StylePriority.UseFont = false;
this.xrTableCell22.StylePriority.UseTextAlignment = false;
this.xrTableCell22.Weight = 0.29167740681161158D;
this.xrPageInfo1.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.xrPageInfo1.LocationFloat = new DevExpress.Utils.PointFloat(581.1248F, 8.472239F);
this.xrPageInfo1.Name = "xrPageInfo1";
this.xrPageInfo1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrPageInfo1.SizeF = new System.Drawing.SizeF(90.87524F, 17.52774F);
this.xrPageInfo1.StylePriority.UseBorders = false;
this.xrPageInfo1.TextFormatString = "Seite {0} von {1}";
//
// xrTableCell23
// xrLabel6
//
this.xrTableCell23.Multiline = true;
this.xrTableCell23.Name = "xrTableCell23";
this.xrTableCell23.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell23.StylePriority.UseFont = false;
this.xrTableCell23.StylePriority.UseTextAlignment = false;
this.xrTableCell23.Text = "Summe";
this.xrTableCell23.Weight = 0.26755388213580639D;
this.xrLabel6.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 8.472239F);
this.xrLabel6.Multiline = true;
this.xrLabel6.Name = "xrLabel6";
this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel6.SizeF = new System.Drawing.SizeF(119.9999F, 17.52772F);
this.xrLabel6.StylePriority.UseFont = false;
this.xrLabel6.StylePriority.UseTextAlignment = false;
this.xrLabel6.Text = "[Month] [Year]";
this.xrLabel6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// xrTableCell16
// bindingSource1
//
this.xrTableCell16.Multiline = true;
this.xrTableCell16.Name = "xrTableCell16";
this.xrTableCell16.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell16.StylePriority.UseFont = false;
this.xrTableCell16.StylePriority.UseTextAlignment = false;
this.xrTableCell16.Weight = 1.1979613270923457D;
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
//
// LeistungsnachweisSbWesseling
//
@@ -768,18 +797,20 @@ namespace HshCologne
this.formattingRuleServiceDesc,
this.formattingRuleCostBearer,
this.formattingRuleEmployeeName});
this.Margins = new DevExpress.Drawing.DXMargins(75F, 70F, 99F, 36F);
this.Margins = new DevExpress.Drawing.DXMargins(75F, 70F, 99F, 50F);
this.PageHeight = 1169;
this.PageWidth = 827;
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
this.SnapGridSize = 9F;
this.Version = "23.2";
xrWatermark1.Id = "Watermark1";
this.Watermarks.Add(xrWatermark1);
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}
@@ -823,7 +854,7 @@ namespace HshCologne
private DevExpress.XtraReports.UI.XRTableRow xrTableRow4;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell14;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow5;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell18;
private DevExpress.XtraReports.UI.XRTableCell lblAbteilung;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell6;
private DevExpress.XtraReports.UI.XRTable xrTable2;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow9;
@@ -850,5 +881,7 @@ namespace HshCologne
private DevExpress.XtraReports.UI.XRTableCell xrTableCell23;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell16;
private DevExpress.XtraReports.UI.CalculatedField calculatedField1;
private DevExpress.XtraReports.UI.XRLabel xrLabel6;
private DevExpress.XtraReports.UI.XRPageInfo xrPageInfo1;
}
}

24
ReportImp/HshCologne/LeistungsnachweisSbWesseling.cs
View File

@@ -25,43 +25,31 @@ namespace HshCologne
var c2s = pRO.CostBearer2SupportConceptList[0];
org = c2s.CostBearer.Organisation;
if (org.Name.Contains("Jugendamt"))
if (org.Name.Contains("Wesseling"))
{
this.lblHeader.Text = "Leistungsnachweis\r\nfür das ";
this.lblHeader.Text += org.Name;
this.lblHeader.Text = "Tätigkeitsnachweis\r\nfür die Stadt Wesseling";
}
if (c2s.CostBearerContactPerson != null)
{
lblAbteilung.Text += c2s.CostBearerContactPerson.FirstNameLastName;
}
//if (c2s.CostBearerContactPerson != null)
//{
// cellAsd.Text = c2s.CostBearerContactPerson.FirstNameLastName;
//}
}
if (pRO.CustomerOid > 0)
{
var c = DAOFactory.GenericDAO.LoadByID<Customer>(pRO.CustomerOid);
//cellKinder.Text = c.Childs;
}
Dictionary<String, String> empDict = new Dictionary<string, string>();
String emp = "";
if (pRO.Services != null)
{
//List<ServicesOverviewRO.ServiceDetail> servicesBillable = new List<ServicesOverviewRO.ServiceDetail>();
foreach (ServicesOverviewRO.ServiceDetail s in pRO.Services)
{
if (!empDict.ContainsKey(s.EmployeeFullname))
{
empDict.Add(s.EmployeeFullname, s.EmployeeFullname);
}
// es werden überall nur die FLS als Dauer direkt in 45 Min Einheiten erfasst, außer Erftstadt
if (pRO.StartDate > new DateTime(2025,10,31) && org != null && org.Name.Contains("Erftstadt"))
{
s.Minutes = Math.Round((s.Minutes / 45 * 60), 2, MidpointRounding.AwayFromZero);
}
emp = s.EmployeeFullname;
s.TimeRangeString = String.Format("{0:ddd}./{0:dd.MM.}", s.StartDate);
}
}

67
ReportImp/SKFLeverkusen/Export/DatevExporter.cs
View File

@@ -39,15 +39,15 @@ namespace SKFLeverkusen.Export
{
sb.Append(s);
}
// AB, 29.07.2026: Frau Geroneit-Jepp will nur die Abgrenzung über die gesamte Zeiterfassung exportiert haben, die rechnen nach wie vor noch gar nicht mit dem BeWoPlaner ab
//s = GetMonatlicheRechnungenString(date);
//if (!String.IsNullOrWhiteSpace(s))
//{
// if (sb.Length > 0)
// sb.AppendLine();
s = GetMonatlicheRechnungenString(date);
if (!String.IsNullOrWhiteSpace(s))
{
if (sb.Length > 0)
sb.AppendLine();
sb.Append(s);
}
// sb.Append(s);
//}
return sb.ToString();
}
@@ -81,7 +81,8 @@ ib.InvoiceId
lastDate = lastDate.AddMonths(1).AddDays(-1);
sb.Append(String.Format("{0:dd.MM.yyyy}", lastDate));
sb.Append(";");
sb.Append(String.Format("{0:MM} '. {0:yyyy}", lastDate));
sb.Append(String.Format("{0}", row[3]));
//sb.Append(String.Format("{0:MM} '. {0:yyyy}", lastDate));
sb.Append(";");
sb.Append(String.Format("{0}", row[1]));
@@ -184,32 +185,60 @@ order by ib.invoicenumber
{
String sql = @"
SELECT
sum(qry.Betrag) AS 'Betrag',
qry.DebitorNumber,
qry.CostCenter,
qry.Verwendung,
qry.Oid
FROM
(
(SELECT
IF(crpRateFactor.`CostRateValue` is null, ROUND((sr.`GeleisteteFLM` / 60) * (SELECT crp.`CostRateValue` FROM `costrateperiod` crp WHERE crp.`ObjectTid` = 22 AND crp.`CostRateType` = 0 AND crp.`ObjectOid` = cb2sc.`CostBearerOid` AND (crp.`EndDate` is null or crp.`EndDate` > ':Monat_Start') order by IF(crp.`EndDate` is null, MAKEDATE(9999,365),crp.`EndDate`) LIMIT 1 )),
ROUND(ROUND((sr.`GeleisteteFLM` / 60), 2) * (SELECT crp.`CostRateValue` FROM `costrateperiod` crp WHERE crp.`ObjectTid` = 22 AND crp.`CostRateType` = 0 AND crp.`ObjectOid` = cb2sc.`CostBearerOid` AND (crp.`EndDate` is null or crp.`EndDate` > ':Monat_Start') order by IF(crp.`EndDate` is null, MAKEDATE(9999,365),crp.`EndDate`) LIMIT 1 ) * ((100 + crpRateFactor.`CostRateValue`)/100), 2)) AS 'Betrag',
c.DebitorNumber,
c.CostCenter,
CONCAT(p.`LastName`, ', ', p.`FirstName`) as 'Verwendung',
cb2sc.Oid
FROM `supportconcept` sc
FROM `supportconcept` sc
INNER JOIN `costbearer2supportconcept` cb2sc ON sc.`Oid` = cb2sc.`SupportConceptOid`
INNER JOIN `costbearer` cb ON cb2sc.`CostBearerOid` = cb.`Oid`
LEFT JOIN
(SELECT crp.`ObjectOid`, crp.`CostRateValue` FROM `costrateperiod` crp
LEFT JOIN
(SELECT crp.`ObjectOid`, crp.`CostRateValue` FROM `costrateperiod` crp
WHERE crp.`ObjectTid` = 22 AND crp.`CostRateType` = 2 AND (crp.`EndDate` is null or crp.`EndDate` > NOW()))
AS crpRateFactor ON crpRateFactor.`ObjectOid` = cb.`Oid`
INNER JOIN `organisation` org ON org.`CostBearerOid` = cb.`Oid`
INNER JOIN `customer` c ON sc.`CustomerOid` = c.`Oid`
INNER JOIN `person` p on c.`PersonOid` = p.`Oid`
LEFT JOIN
INNER JOIN `person` p on c.`PersonOid` = p.`Oid`
LEFT JOIN
(SELECT sr2.`CostBearer2SupportConceptOid`, SUM(sr2.`roundedduration` / IF(sr2.`GroupEmployeeCount` is null, 1, sr2.`GroupEmployeeCount`)) AS GeleisteteFLM FROM `servicerecord` sr2
INNER JOIN `servicedescription` sd ON sr2.`ServiceDescriptionOid` = sd.`Oid`
INNER JOIN `servicecategory` sc ON sd.`ServiceCategoryOid` = sc.`Oid`
WHERE sr2.`StartDate` >= ':Monat_Start' AND sr2.`StartDate` < ':Monat_End' AND sc.`Billable` = 1 GROUP BY sr2.`CostBearer2SupportConceptOid`)
WHERE sr2.`StartDate` >= ':Monat_Start' AND sr2.`StartDate` < ':Monat_End' AND sc.`Billable` = 1 AND sd.Name <> 'Fehlkontakt' GROUP BY sr2.`CostBearer2SupportConceptOid`)
AS sr ON sr.`CostBearer2SupportConceptOid` = cb2sc.`Oid`
WHERE c.`IsActive` = 1 AND sc.`IsActive` = 1
and (sr.`GeleisteteFLM` is not null)
and org.Name = 'LVR'
ORDER BY p.`LastName`, p.`FirstName`, cb2sc.`ApprovedStartDate`
WHERE c.`IsActive` = 1 AND sc.`IsActive` = 1 and (sr.`GeleisteteFLM` is not null))
UNION
(SELECT
ROUND(0.8 * (sr.`GeleisteteFLM` / 60) * (SELECT crp.`CostRateValue` FROM `costrateperiod` crp WHERE crp.`ObjectTid` = 22 AND crp.`CostRateType` = 0 AND crp.`ObjectOid` = cb2sc.`CostBearerOid` AND (crp.`EndDate` is null or crp.`EndDate` > ':Monat_Start') order by IF(crp.`EndDate` is null, MAKEDATE(9999,365),crp.`EndDate`) LIMIT 1 ),2) AS 'Betrag',
c.DebitorNumber,
c.CostCenter,
CONCAT(p.`LastName`, ', ', p.`FirstName`) as 'Verwendung',
cb2sc.Oid
FROM `supportconcept` sc
INNER JOIN `costbearer2supportconcept` cb2sc ON sc.`Oid` = cb2sc.`SupportConceptOid`
INNER JOIN `costbearer` cb ON cb2sc.`CostBearerOid` = cb.`Oid`
INNER JOIN `organisation` org ON org.`CostBearerOid` = cb.`Oid`
INNER JOIN `customer` c ON sc.`CustomerOid` = c.`Oid`
INNER JOIN `person` p on c.`PersonOid` = p.`Oid`
LEFT JOIN
(SELECT sr2.`CostBearer2SupportConceptOid`, SUM(sr2.`roundedduration` / IF(sr2.`GroupEmployeeCount` is null, 1, sr2.`GroupEmployeeCount`)) AS GeleisteteFLM FROM `servicerecord` sr2
INNER JOIN `servicedescription` sd ON sr2.`ServiceDescriptionOid` = sd.`Oid`
INNER JOIN `servicecategory` sc ON sd.`ServiceCategoryOid` = sc.`Oid`
WHERE sr2.`StartDate` >= ':Monat_Start' AND sr2.`StartDate` < ':Monat_End' AND sc.`Billable` = 1 and sd.Name = 'Fehlkontakt' GROUP BY sr2.`CostBearer2SupportConceptOid`)
AS sr ON sr.`CostBearer2SupportConceptOid` = cb2sc.`Oid`
WHERE c.`IsActive` = 1 AND sc.`IsActive` = 1 and (sr.`GeleisteteFLM` is not null))
)qry
GROUP BY qry.Oid
ORDER BY qry.Verwendung
";
return sql;

2
ReportImp/SKFLeverkusen/Invoicing/CustomInvoiceFactory.cs
View File

@@ -24,7 +24,7 @@ namespace SKFLeverkusen.Invoicing
}
}
return new CustomInvoiceCreation();
return new InvoiceCreation(); // AB, 29.07.2026: hab die alte Anpassung rausgenommen, da die überhaupt nicht genutzt wird und die Finanzauswertung gestört hat
}
}
}

1
ReportImp/SKFLeverkusen/SKFLeverkusen.csproj
View File

@@ -62,7 +62,6 @@
<DependentUpon>ABWAufnahmeanzeigeLVR.cs</DependentUpon>
</Compile>
<Compile Include="Calculations\CustomGroupDurationCalculator.cs" />
<Compile Include="Invoicing\CustomInvoiceCreation.cs" />
<Compile Include="Invoicing\CustomInvoiceFactory.cs" />
<Compile Include="Invoicing\SettlementInvoiceCreation.cs" />
<Compile Include="Krisenplan.cs">

2
ReportImp/VereinZurIntegrationChemnitz/VereinZurIntegrationChemnitz.csproj
View File

@@ -4,7 +4,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{C1FED668-ADB9-47E0-B589-1389618E1B6E}</ProjectGuid>
<ProjectGuid>{EA969934-60A6-459F-A07C-1CF537ED775E}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>VereinZurIntegrationChemnitz</RootNamespace>