From b5d87a4d38e55b1b1f33c7cba3cc573fb46bc6a0 Mon Sep 17 00:00:00 2001 From: Alexandra Date: Thu, 30 Apr 2026 11:26:40 +0200 Subject: [PATCH] FeidPartnerReports/PersonalplanungReport - v. 1.1 Formatierung SupportOID=161471 --- .../FeidPartnerReports/PersonalplanungRO.cs | 6 +- .../PersonalplanungReport.Designer.cs | 463 ++++++++++++++---- .../PersonalplanungReport.cs | 2 + 3 files changed, 361 insertions(+), 110 deletions(-) diff --git a/ReportImp/FeidPartnerReports/PersonalplanungRO.cs b/ReportImp/FeidPartnerReports/PersonalplanungRO.cs index 0ef14b34f..3555e737a 100644 --- a/ReportImp/FeidPartnerReports/PersonalplanungRO.cs +++ b/ReportImp/FeidPartnerReports/PersonalplanungRO.cs @@ -309,9 +309,9 @@ namespace FeidPartnerReports public string MitarbeiterName { get; set; } public decimal VertragWochenstunden { get; set; } public decimal VertragFLSProWoche { get; set; } - public string MitarbeiterNameMitVertrag => VertragWochenstunden > 0 || VertragFLSProWoche > 0 - ? $"{MitarbeiterName} (Std/Wo: {VertragWochenstunden:0.##}, FLS/Wo: {VertragFLSProWoche:0.##})" - : MitarbeiterName; + public string VertragInfo => VertragWochenstunden > 0 || VertragFLSProWoche > 0 + ? $"Std/Wo: {VertragWochenstunden:0.##}, FLS/Wo: {VertragFLSProWoche:0.##}" + : ""; public string KlientName { get; set; } public string Kostentraeger { get; set; } public string WohnortKlient { get; set; } diff --git a/ReportImp/FeidPartnerReports/PersonalplanungReport.Designer.cs b/ReportImp/FeidPartnerReports/PersonalplanungReport.Designer.cs index d0dacdb8f..53a784653 100644 --- a/ReportImp/FeidPartnerReports/PersonalplanungReport.Designer.cs +++ b/ReportImp/FeidPartnerReports/PersonalplanungReport.Designer.cs @@ -16,7 +16,6 @@ namespace FeidPartnerReports private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.Detail = new DevExpress.XtraReports.UI.DetailBand(); this.xrTableDetail = new DevExpress.XtraReports.UI.XRTable(); @@ -33,7 +32,7 @@ namespace FeidPartnerReports this.cellEnddatum = new DevExpress.XtraReports.UI.XRTableCell(); this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); this.xrLabelMitarbeiter = new DevExpress.XtraReports.UI.XRLabel(); - this.PageHeader = new DevExpress.XtraReports.UI.PageHeaderBand(); + this.xrLabelVertragInfo = new DevExpress.XtraReports.UI.XRLabel(); this.xrTableHeader = new DevExpress.XtraReports.UI.XRTable(); this.xrRowHeader1 = new DevExpress.XtraReports.UI.XRTableRow(); this.cellHKlientSpan = new DevExpress.XtraReports.UI.XRTableCell(); @@ -53,139 +52,386 @@ namespace FeidPartnerReports this.cellHGeleistetNext = new DevExpress.XtraReports.UI.XRTableCell(); this.cellHAuslastungNext = new DevExpress.XtraReports.UI.XRTableCell(); this.cellHEnddatum = new DevExpress.XtraReports.UI.XRTableCell(); + this.PageHeader = new DevExpress.XtraReports.UI.PageHeaderBand(); this.PageFooter = new DevExpress.XtraReports.UI.PageFooterBand(); this.xrPageInfo = new DevExpress.XtraReports.UI.XRPageInfo(); this.xrLabelFooter = new DevExpress.XtraReports.UI.XRLabel(); - + this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); + this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); - + // // bindingSource1 + // this.bindingSource1.DataSource = typeof(FeidPartnerReports.PersonalplanungRow); - - // --- Page Header (2 Zeilen: Monatsgruppen-Label + Spaltenköpfe) --- - this.PageHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrTableHeader }); - this.PageHeader.HeightF = 50F; - this.PageHeader.Name = "PageHeader"; - - this.xrTableHeader.LocationF = new System.Drawing.PointF(0F, 0F); - this.xrTableHeader.Name = "xrTableHeader"; - this.xrTableHeader.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrRowHeader1, this.xrRowHeader2 }); - this.xrTableHeader.SizeF = new System.Drawing.SizeF(1050F, 50F); - this.xrTableHeader.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold); - - // Zeile 1: Gruppenbezeichnungen - this.xrRowHeader1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.cellHKlientSpan, this.cellHKostentraegerSpan, this.cellHWohnortSpan, - this.cellHDieserMonat, this.cellHNaechsterMonat, this.cellHEnddatumSpan }); - this.xrRowHeader1.Name = "xrRowHeader1"; - this.xrRowHeader1.Weight = 1D; - - this.cellHKlientSpan.Name = "cellHKlientSpan"; this.cellHKlientSpan.Text = ""; this.cellHKlientSpan.Weight = 2.5D; - this.cellHKostentraegerSpan.Name = "cellHKostentraegerSpan"; this.cellHKostentraegerSpan.Text = ""; this.cellHKostentraegerSpan.Weight = 2D; - this.cellHWohnortSpan.Name = "cellHWohnortSpan"; this.cellHWohnortSpan.Text = ""; this.cellHWohnortSpan.Weight = 1.5D; - this.cellHDieserMonat.Name = "cellHDieserMonat"; this.cellHDieserMonat.Text = "Dieser Monat"; this.cellHDieserMonat.Weight = 3D; this.cellHDieserMonat.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.cellHNaechsterMonat.Name = "cellHNaechsterMonat"; this.cellHNaechsterMonat.Text = "Nächster Monat"; this.cellHNaechsterMonat.Weight = 3D; this.cellHNaechsterMonat.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.cellHEnddatumSpan.Name = "cellHEnddatumSpan"; this.cellHEnddatumSpan.Text = ""; this.cellHEnddatumSpan.Weight = 1D; - - // Zeile 2: Spaltenköpfe - this.xrRowHeader2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.cellHKlient, this.cellHKostentraeger, this.cellHWohnort, - this.cellHBewilligt, this.cellHGeleistet, this.cellHAuslastung, - this.cellHBewilligtNext, this.cellHGeleistetNext, this.cellHAuslastungNext, - this.cellHEnddatum }); - this.xrRowHeader2.Name = "xrRowHeader2"; - this.xrRowHeader2.Weight = 1D; - - this.cellHKlient.Name = "cellHKlient"; this.cellHKlient.Text = "Klient"; this.cellHKlient.Weight = 2.5D; - this.cellHKostentraeger.Name = "cellHKostentraeger"; this.cellHKostentraeger.Text = "Kostenträger"; this.cellHKostentraeger.Weight = 2D; - this.cellHWohnort.Name = "cellHWohnort"; this.cellHWohnort.Text = "Wohnort"; this.cellHWohnort.Weight = 1.5D; - this.cellHBewilligt.Name = "cellHBewilligt"; this.cellHBewilligt.Text = "Bew. Std/Wo"; this.cellHBewilligt.Weight = 1D; this.cellHBewilligt.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.cellHGeleistet.Name = "cellHGeleistet"; this.cellHGeleistet.Text = "Gel. Std/Wo"; this.cellHGeleistet.Weight = 1D; this.cellHGeleistet.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.cellHAuslastung.Name = "cellHAuslastung"; this.cellHAuslastung.Text = "Auslastung"; this.cellHAuslastung.Weight = 1D; this.cellHAuslastung.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.cellHBewilligtNext.Name = "cellHBewilligtNext"; this.cellHBewilligtNext.Text = "Bew. Std/Wo"; this.cellHBewilligtNext.Weight = 1D; this.cellHBewilligtNext.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.cellHGeleistetNext.Name = "cellHGeleistetNext"; this.cellHGeleistetNext.Text = "Gel. Std/Wo"; this.cellHGeleistetNext.Weight = 1D; this.cellHGeleistetNext.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.cellHAuslastungNext.Name = "cellHAuslastungNext"; this.cellHAuslastungNext.Text = "Auslastung"; this.cellHAuslastungNext.Weight = 1D; this.cellHAuslastungNext.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.cellHEnddatum.Name = "cellHEnddatum"; this.cellHEnddatum.Text = "Enddatum"; this.cellHEnddatum.Weight = 1D; this.cellHEnddatum.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - - // --- Group Header (Mitarbeiter) --- - this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrLabelMitarbeiter }); - this.GroupHeader1.GroupFields.AddRange(new DevExpress.XtraReports.UI.GroupField[] { - new DevExpress.XtraReports.UI.GroupField("MitarbeiterName", DevExpress.XtraReports.UI.XRColumnSortOrder.Ascending) }); - this.GroupHeader1.HeightF = 22F; - this.GroupHeader1.Name = "GroupHeader1"; - this.GroupHeader1.RepeatEveryPage = true; - - this.xrLabelMitarbeiter.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "MitarbeiterNameMitVertrag") }); - this.xrLabelMitarbeiter.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrLabelMitarbeiter.LocationF = new System.Drawing.PointF(0F, 2F); - this.xrLabelMitarbeiter.Name = "xrLabelMitarbeiter"; - this.xrLabelMitarbeiter.SizeF = new System.Drawing.SizeF(500F, 18F); - - // --- Detail Band --- - this.Detail.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrTableDetail }); + // + // Detail + // + this.Detail.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTableDetail}); this.Detail.HeightF = 22F; this.Detail.Name = "Detail"; - - this.xrTableDetail.LocationF = new System.Drawing.PointF(0F, 0F); - this.xrTableDetail.Name = "xrTableDetail"; - this.xrTableDetail.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrRowDetail }); - this.xrTableDetail.SizeF = new System.Drawing.SizeF(1050F, 22F); + // + // xrTableDetail + // this.xrTableDetail.Font = new DevExpress.Drawing.DXFont("Arial", 8F); - + this.xrTableDetail.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrTableDetail.Name = "xrTableDetail"; + this.xrTableDetail.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrRowDetail}); + this.xrTableDetail.SizeF = new System.Drawing.SizeF(1050F, 22F); + // + // xrRowDetail + // this.xrRowDetail.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.cellKlient, this.cellKostentraeger, this.cellWohnort, - this.cellBewilligt, this.cellGeleistet, this.cellAuslastung, - this.cellBewilligtNext, this.cellGeleistetNext, this.cellAuslastungNext, - this.cellEnddatum }); + this.cellKlient, + this.cellKostentraeger, + this.cellWohnort, + this.cellBewilligt, + this.cellGeleistet, + this.cellAuslastung, + this.cellBewilligtNext, + this.cellGeleistetNext, + this.cellAuslastungNext, + this.cellEnddatum}); this.xrRowDetail.Name = "xrRowDetail"; this.xrRowDetail.Weight = 1D; - - this.cellKlient.Name = "cellKlient"; this.cellKlient.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "KlientName") }); this.cellKlient.Weight = 2.5D; - this.cellKostentraeger.Name = "cellKostentraeger"; this.cellKostentraeger.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Kostentraeger") }); this.cellKostentraeger.Weight = 2D; - this.cellWohnort.Name = "cellWohnort"; this.cellWohnort.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "WohnortKlient") }); this.cellWohnort.Weight = 1.5D; - this.cellBewilligt.Name = "cellBewilligt"; this.cellBewilligt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "BewilligteStdProWoche", "{0:0.00}") }); this.cellBewilligt.Weight = 1D; this.cellBewilligt.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.cellGeleistet.Name = "cellGeleistet"; this.cellGeleistet.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "GeleisteteStdProWoche", "{0:0.00}") }); this.cellGeleistet.Weight = 1D; this.cellGeleistet.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.cellAuslastung.Name = "cellAuslastung"; this.cellAuslastung.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "AuslastungFormatted") }); this.cellAuslastung.Weight = 1D; this.cellAuslastung.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.cellBewilligtNext.Name = "cellBewilligtNext"; this.cellBewilligtNext.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "BewilligteStdProWocheNaechsterMonat", "{0:0.00}") }); this.cellBewilligtNext.Weight = 1D; this.cellBewilligtNext.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.cellGeleistetNext.Name = "cellGeleistetNext"; this.cellGeleistetNext.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "GeleisteteStdProWocheNaechsterMonat", "{0:0.00}") }); this.cellGeleistetNext.Weight = 1D; this.cellGeleistetNext.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.cellAuslastungNext.Name = "cellAuslastungNext"; this.cellAuslastungNext.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "AuslastungNaechsterMonatFormatted") }); this.cellAuslastungNext.Weight = 1D; this.cellAuslastungNext.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.cellEnddatum.Name = "cellEnddatum"; this.cellEnddatum.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "EnddatumFormatted") }); this.cellEnddatum.Weight = 1D; this.cellEnddatum.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - - // --- Page Footer --- - this.PageFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrPageInfo, this.xrLabelFooter }); - this.PageFooter.HeightF = 25F; + // + // cellKlient + // + this.cellKlient.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "KlientName")}); + this.cellKlient.Name = "cellKlient"; + this.cellKlient.Weight = 2.5D; + // + // cellKostentraeger + // + this.cellKostentraeger.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Kostentraeger")}); + this.cellKostentraeger.Name = "cellKostentraeger"; + this.cellKostentraeger.Weight = 2D; + // + // cellWohnort + // + this.cellWohnort.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "WohnortKlient")}); + this.cellWohnort.Name = "cellWohnort"; + this.cellWohnort.Weight = 1.5D; + // + // cellBewilligt + // + this.cellBewilligt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "BewilligteStdProWoche", "{0:0.00}")}); + this.cellBewilligt.Name = "cellBewilligt"; + this.cellBewilligt.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.cellBewilligt.Weight = 1D; + // + // cellGeleistet + // + this.cellGeleistet.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "GeleisteteStdProWoche", "{0:0.00}")}); + this.cellGeleistet.Name = "cellGeleistet"; + this.cellGeleistet.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.cellGeleistet.Weight = 1D; + // + // cellAuslastung + // + this.cellAuslastung.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "AuslastungFormatted")}); + this.cellAuslastung.Name = "cellAuslastung"; + this.cellAuslastung.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.cellAuslastung.Weight = 1D; + // + // cellBewilligtNext + // + this.cellBewilligtNext.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "BewilligteStdProWocheNaechsterMonat", "{0:0.00}")}); + this.cellBewilligtNext.Name = "cellBewilligtNext"; + this.cellBewilligtNext.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.cellBewilligtNext.Weight = 1D; + // + // cellGeleistetNext + // + this.cellGeleistetNext.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "GeleisteteStdProWocheNaechsterMonat", "{0:0.00}")}); + this.cellGeleistetNext.Name = "cellGeleistetNext"; + this.cellGeleistetNext.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.cellGeleistetNext.Weight = 1D; + // + // cellAuslastungNext + // + this.cellAuslastungNext.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "AuslastungNaechsterMonatFormatted")}); + this.cellAuslastungNext.Name = "cellAuslastungNext"; + this.cellAuslastungNext.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.cellAuslastungNext.Weight = 1D; + // + // cellEnddatum + // + this.cellEnddatum.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EnddatumFormatted")}); + this.cellEnddatum.Name = "cellEnddatum"; + this.cellEnddatum.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.cellEnddatum.Weight = 1D; + // + // GroupHeader1 + // + this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabelMitarbeiter, + this.xrLabelVertragInfo, + this.xrTableHeader}); + this.GroupHeader1.GroupFields.AddRange(new DevExpress.XtraReports.UI.GroupField[] { + new DevExpress.XtraReports.UI.GroupField("MitarbeiterName", DevExpress.XtraReports.UI.XRColumnSortOrder.Ascending)}); + this.GroupHeader1.HeightF = 102F; + this.GroupHeader1.Name = "GroupHeader1"; + this.GroupHeader1.RepeatEveryPage = true; + // + // xrLabelMitarbeiter + // + this.xrLabelMitarbeiter.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "MitarbeiterName")}); + this.xrLabelMitarbeiter.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrLabelMitarbeiter.LocationFloat = new DevExpress.Utils.PointFloat(0F, 2F); + this.xrLabelMitarbeiter.Name = "xrLabelMitarbeiter"; + this.xrLabelMitarbeiter.SizeF = new System.Drawing.SizeF(500F, 18F); + this.xrLabelMitarbeiter.StylePriority.UseFont = false; + // + // xrLabelVertragInfo + // + this.xrLabelVertragInfo.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "VertragInfo")}); + this.xrLabelVertragInfo.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrLabelVertragInfo.LocationFloat = new DevExpress.Utils.PointFloat(0F, 22F); + this.xrLabelVertragInfo.Name = "xrLabelVertragInfo"; + this.xrLabelVertragInfo.SizeF = new System.Drawing.SizeF(500F, 18F); + this.xrLabelVertragInfo.StylePriority.UseFont = false; + // + // xrTableHeader + // + this.xrTableHeader.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableHeader.LocationFloat = new DevExpress.Utils.PointFloat(0F, 52F); + this.xrTableHeader.Name = "xrTableHeader"; + this.xrTableHeader.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrRowHeader1, + this.xrRowHeader2}); + this.xrTableHeader.SizeF = new System.Drawing.SizeF(1050F, 50F); + // + // xrRowHeader1 + // + this.xrRowHeader1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.cellHKlientSpan, + this.cellHKostentraegerSpan, + this.cellHWohnortSpan, + this.cellHDieserMonat, + this.cellHNaechsterMonat, + this.cellHEnddatumSpan}); + this.xrRowHeader1.Name = "xrRowHeader1"; + this.xrRowHeader1.Weight = 1D; + // + // cellHKlientSpan + // + this.cellHKlientSpan.Name = "cellHKlientSpan"; + this.cellHKlientSpan.Weight = 2.5D; + // + // cellHKostentraegerSpan + // + this.cellHKostentraegerSpan.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold); + this.cellHKostentraegerSpan.Name = "cellHKostentraegerSpan"; + this.cellHKostentraegerSpan.StylePriority.UseFont = false; + this.cellHKostentraegerSpan.Weight = 2D; + // + // cellHWohnortSpan + // + this.cellHWohnortSpan.Name = "cellHWohnortSpan"; + this.cellHWohnortSpan.Weight = 1.5D; + // + // cellHDieserMonat + // + this.cellHDieserMonat.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold); + this.cellHDieserMonat.Name = "cellHDieserMonat"; + this.cellHDieserMonat.StylePriority.UseFont = false; + this.cellHDieserMonat.Text = "Dieser Monat"; + this.cellHDieserMonat.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.cellHDieserMonat.Weight = 3D; + // + // cellHNaechsterMonat + // + this.cellHNaechsterMonat.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold); + this.cellHNaechsterMonat.Name = "cellHNaechsterMonat"; + this.cellHNaechsterMonat.StylePriority.UseFont = false; + this.cellHNaechsterMonat.Text = "Nächster Monat"; + this.cellHNaechsterMonat.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.cellHNaechsterMonat.Weight = 3D; + // + // cellHEnddatumSpan + // + this.cellHEnddatumSpan.Name = "cellHEnddatumSpan"; + this.cellHEnddatumSpan.Weight = 1D; + // + // xrRowHeader2 + // + this.xrRowHeader2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.cellHKlient, + this.cellHKostentraeger, + this.cellHWohnort, + this.cellHBewilligt, + this.cellHGeleistet, + this.cellHAuslastung, + this.cellHBewilligtNext, + this.cellHGeleistetNext, + this.cellHAuslastungNext, + this.cellHEnddatum}); + this.xrRowHeader2.Name = "xrRowHeader2"; + this.xrRowHeader2.Weight = 1D; + // + // cellHKlient + // + this.cellHKlient.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold); + this.cellHKlient.Name = "cellHKlient"; + this.cellHKlient.StylePriority.UseFont = false; + this.cellHKlient.Text = "Klient"; + this.cellHKlient.Weight = 2.5D; + // + // cellHKostentraeger + // + this.cellHKostentraeger.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold); + this.cellHKostentraeger.Name = "cellHKostentraeger"; + this.cellHKostentraeger.StylePriority.UseFont = false; + this.cellHKostentraeger.Text = "Kostenträger"; + this.cellHKostentraeger.Weight = 2D; + // + // cellHWohnort + // + this.cellHWohnort.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold); + this.cellHWohnort.Name = "cellHWohnort"; + this.cellHWohnort.StylePriority.UseFont = false; + this.cellHWohnort.Text = "Wohnort"; + this.cellHWohnort.Weight = 1.5D; + // + // cellHBewilligt + // + this.cellHBewilligt.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold); + this.cellHBewilligt.Name = "cellHBewilligt"; + this.cellHBewilligt.StylePriority.UseFont = false; + this.cellHBewilligt.Text = "Bew. Std/Wo"; + this.cellHBewilligt.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.cellHBewilligt.Weight = 1D; + // + // cellHGeleistet + // + this.cellHGeleistet.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold); + this.cellHGeleistet.Name = "cellHGeleistet"; + this.cellHGeleistet.StylePriority.UseFont = false; + this.cellHGeleistet.Text = "Gel. Std/Wo"; + this.cellHGeleistet.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.cellHGeleistet.Weight = 1D; + // + // cellHAuslastung + // + this.cellHAuslastung.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold); + this.cellHAuslastung.Name = "cellHAuslastung"; + this.cellHAuslastung.StylePriority.UseFont = false; + this.cellHAuslastung.Text = "Auslastung"; + this.cellHAuslastung.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.cellHAuslastung.Weight = 1D; + // + // cellHBewilligtNext + // + this.cellHBewilligtNext.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold); + this.cellHBewilligtNext.Name = "cellHBewilligtNext"; + this.cellHBewilligtNext.StylePriority.UseFont = false; + this.cellHBewilligtNext.Text = "Bew. Std/Wo"; + this.cellHBewilligtNext.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.cellHBewilligtNext.Weight = 1D; + // + // cellHGeleistetNext + // + this.cellHGeleistetNext.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold); + this.cellHGeleistetNext.Name = "cellHGeleistetNext"; + this.cellHGeleistetNext.StylePriority.UseFont = false; + this.cellHGeleistetNext.Text = "Gel. Std/Wo"; + this.cellHGeleistetNext.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.cellHGeleistetNext.Weight = 1D; + // + // cellHAuslastungNext + // + this.cellHAuslastungNext.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold); + this.cellHAuslastungNext.Name = "cellHAuslastungNext"; + this.cellHAuslastungNext.StylePriority.UseFont = false; + this.cellHAuslastungNext.Text = "Auslastung"; + this.cellHAuslastungNext.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.cellHAuslastungNext.Weight = 1D; + // + // cellHEnddatum + // + this.cellHEnddatum.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold); + this.cellHEnddatum.Name = "cellHEnddatum"; + this.cellHEnddatum.StylePriority.UseFont = false; + this.cellHEnddatum.Text = "Enddatum"; + this.cellHEnddatum.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.cellHEnddatum.Weight = 1D; + // + // PageHeader + // + this.PageHeader.HeightF = 0F; + this.PageHeader.Name = "PageHeader"; + // + // PageFooter + // + this.PageFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrPageInfo, + this.xrLabelFooter}); + this.PageFooter.HeightF = 42.66668F; this.PageFooter.Name = "PageFooter"; - - this.xrPageInfo.LocationF = new System.Drawing.PointF(800F, 2F); + // + // xrPageInfo + // + this.xrPageInfo.Font = new DevExpress.Drawing.DXFont("Arial", 7F); + this.xrPageInfo.LocationFloat = new DevExpress.Utils.PointFloat(800F, 22.66668F); this.xrPageInfo.Name = "xrPageInfo"; this.xrPageInfo.SizeF = new System.Drawing.SizeF(250F, 20F); this.xrPageInfo.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrPageInfo.Font = new DevExpress.Drawing.DXFont("Arial", 7F); - - this.xrLabelFooter.LocationF = new System.Drawing.PointF(0F, 2F); + // + // xrLabelFooter + // + this.xrLabelFooter.Font = new DevExpress.Drawing.DXFont("Arial", 7F); + this.xrLabelFooter.LocationFloat = new DevExpress.Utils.PointFloat(0F, 22.66668F); this.xrLabelFooter.Name = "xrLabelFooter"; this.xrLabelFooter.SizeF = new System.Drawing.SizeF(400F, 20F); this.xrLabelFooter.Text = "Personalplanung"; - this.xrLabelFooter.Font = new DevExpress.Drawing.DXFont("Arial", 7F); - - // --- Report --- + // + // topMarginBand1 + // + this.topMarginBand1.HeightF = 20F; + this.topMarginBand1.Name = "topMarginBand1"; + // + // bottomMarginBand1 + // + this.bottomMarginBand1.HeightF = 20F; + this.bottomMarginBand1.Name = "bottomMarginBand1"; + // + // PersonalplanungReport + // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { - this.Detail, this.GroupHeader1, this.PageHeader, this.PageFooter }); + this.Detail, + this.GroupHeader1, + this.PageHeader, + this.PageFooter, + this.topMarginBand1, + this.bottomMarginBand1}); this.DataSource = this.bindingSource1; - this.Margins = new System.Drawing.Printing.Margins(20, 20, 20, 20); - this.PageWidth = 1090; + this.Margins = new DevExpress.Drawing.DXMargins(18F, 20F, 20F, 20F); + this.PageHeight = 827; + this.PageWidth = 1169; this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4Rotated; - this.Name = "PersonalplanungReport"; - this.Version = "17.2"; - + this.Version = "23.2"; + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); + } #endregion @@ -208,6 +454,7 @@ namespace FeidPartnerReports private DevExpress.XtraReports.UI.XRTableCell cellGeleistetNext; private DevExpress.XtraReports.UI.XRTableCell cellAuslastungNext; private DevExpress.XtraReports.UI.XRTableCell cellEnddatum; + private DevExpress.XtraReports.UI.XRLabel xrLabelVertragInfo; private DevExpress.XtraReports.UI.XRTable xrTableHeader; private DevExpress.XtraReports.UI.XRTableRow xrRowHeader1; private DevExpress.XtraReports.UI.XRTableCell cellHKlientSpan; @@ -229,5 +476,7 @@ namespace FeidPartnerReports private DevExpress.XtraReports.UI.XRTableCell cellHEnddatum; private DevExpress.XtraReports.UI.XRPageInfo xrPageInfo; private DevExpress.XtraReports.UI.XRLabel xrLabelFooter; + private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1; + private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1; } } diff --git a/ReportImp/FeidPartnerReports/PersonalplanungReport.cs b/ReportImp/FeidPartnerReports/PersonalplanungReport.cs index 875dd473d..1102b4d9f 100644 --- a/ReportImp/FeidPartnerReports/PersonalplanungReport.cs +++ b/ReportImp/FeidPartnerReports/PersonalplanungReport.cs @@ -13,6 +13,8 @@ namespace FeidPartnerReports public void SetReportDataSource(FeidPartnerReports.PersonalplanungRO pRO) { this.bindingSource1.DataSource = pRO.Rows; + this.cellHDieserMonat.Text = pRO.ReportMonth.ToString("MM.yyyy"); + this.cellHNaechsterMonat.Text = pRO.ReportMonth.AddMonths(1).ToString("MM.yyyy"); } } }