From a3196842f72076165e5eb4ed28d60b5ec44b5ee3 Mon Sep 17 00:00:00 2001 From: Alexandra Date: Wed, 18 Jun 2025 15:24:21 +0200 Subject: [PATCH] =?UTF-8?q?SchoengeistReports/Monatsabrechnung.cs=20-=20Dr?= =?UTF-8?q?uck=20der=20Rechnungs=C3=BCbersicht=20aktualisiert?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SchoengeistReports/CustomReportCreator.cs | 98 +++++++++ .../SchoengeistReports/Monatsabrechnung.cs | 32 +-- .../Monatsabrechnung.designer.cs | 194 ++++++++---------- .../SchoengeistReports/Monatsabrechnung.resx | 3 - .../SchoengeistReports.csproj | 5 + 5 files changed, 191 insertions(+), 141 deletions(-) create mode 100644 ReportImp/SchoengeistReports/CustomReportCreator.cs diff --git a/ReportImp/SchoengeistReports/CustomReportCreator.cs b/ReportImp/SchoengeistReports/CustomReportCreator.cs new file mode 100644 index 000000000..7f916fa8e --- /dev/null +++ b/ReportImp/SchoengeistReports/CustomReportCreator.cs @@ -0,0 +1,98 @@ +using System; +using System.Collections.Generic; +using System.Data; +using System.Linq; +using System.Text; +using BeWo.Data.Access; +using BeWo.Data.Entities; +using BeWo.Report; +using BeWo.Report.ReportObjects; +using BeWo.Service.DCEntityMapper; +using BS.Shared.Core; +using BS.Shared.DataContracts; +using DevExpress.XtraReports.Design; +using DevExpress.XtraReports.UI; + +namespace BeWo.SchoengeistReports +{ + public class CustomReportCreator : DefaultReportCreator + { + public override XtraReport CreateInvoiceOverviewReport(List oids) + { + var queryReport = new Monatsabrechnung(); + var invoices = MapperFactory.InvoiceBaseDC_InvoiceBase.MapToNewDCs(DAOFactory.GenericDAO.LoadByIDs(oids)); + DataTable table = new DataTable(); + string[] spalten = new string[] { "Art der Rechnung", "Klient/in", "Zeitraum", "Nummer", "Datum", "Empfänger", "Betrag", "Bemerkung", + "Geprüft", "Versendet", "Exportiert", "Bezahlt", "Teilzahlung"}; + + for (int i = 0; i < spalten.Length; i++) + table.Columns.Add(spalten[i], typeof(string)); + + for (int i = 0; i < invoices.Count; i++) + { + DataRow row = table.NewRow(); + InvoiceBaseDC invoice = invoices[i]; + row[0] = invoice.InvoiceTypeText; + if (invoice.InvoiceTypeText == null) + { + row[0] = "Spitzabrechnung"; + } + row[1] = invoice.CustomerLastName + ", " + invoice.CustomerFirstName; + row[2] = invoice.PeriodString; + row[3] = invoice.InvoiceNumber; + row[4] = string.Format("{0:dd.MM.yyyy}", invoice.InvoiceDate); + string recipient = invoice.RecipientOrganisation; + if (!string.IsNullOrEmpty(recipient) && (!string.IsNullOrEmpty(invoice.RecipientPersonFirstName) || !string.IsNullOrEmpty(invoice.RecipientPersonLastName))) + { + recipient += " - "; + } + recipient += invoice.RecipientPersonFirstName + " " + invoice.RecipientPersonLastName; + + row[5] = recipient; + row[6] = string.Format("{0:0.00}", invoice.TotalAmount); + row[7] = invoice.Notice; + row[8] = invoice.IsReviewed ? "Ja" : ""; + row[9] = invoice.IsSent ? "Ja" : ""; + row[10] = invoice.IsExported ? "Ja" : ""; + row[11] = invoice.IsPaid ? "Ja" : ""; + row[12] = invoice.PartialPayment; + table.Rows.Add(row); + } + + var queryReportObject = QueryRO.Create(new Query() { Title = "Rechnungen" }, table); + queryReportObject.Name = "Rechnungen"; + queryReport.SetReportDataSource(queryReportObject); + + return queryReport as XtraReport; + } + + public override XtraReport CreateQueryReport(long queryOid, String queryReportId) + { + var query = DAOFactory.GenericDAO.LoadByID(queryOid); + + if (query is null) + { + return new XtraReport(); + } + + var path = Utils.CreateSavePath(TempPath, queryReportId + ".xml"); + var table = Utils.XMLDeserialize(path); + if (queryOid == 101) + { + var report = FindReportImp(null, query.ReportTypeName); + var queryro = QueryRO.Create(query, table); + report.SetReportDataSource(queryro); + + return report as XtraReport; + } + else + { + var queryReport = new BeWo.Report.DefaultReports.Bericht(); + var queryReportObject = QueryRO.Create(query, table); + queryReport.SetReportDataSource(queryReportObject); + + return queryReport as XtraReport; + } + } + } +} diff --git a/ReportImp/SchoengeistReports/Monatsabrechnung.cs b/ReportImp/SchoengeistReports/Monatsabrechnung.cs index b2263e193..01d43e056 100644 --- a/ReportImp/SchoengeistReports/Monatsabrechnung.cs +++ b/ReportImp/SchoengeistReports/Monatsabrechnung.cs @@ -23,48 +23,32 @@ namespace BeWo.SchoengeistReports private void InitTable(QueryRO ro) { decimal gesamt = 0; + decimal gesamtOffen = 0; DateTime monat = DateTime.MinValue; foreach (BeWo.Report.ReportObjects.QueryRO.Row row in ro.Rows) { if (monat == DateTime.MinValue) { - monat = DateTime.Parse(row.Field8.ToString()); - lblHeader.Text = String.Format("Abrechnung {0:MMMM yyyy}", monat); + monat = DateTime.Parse(row.Field5.ToString()); + lblHeader.Text = String.Format("Abrechnung {0:yyyy}", monat); } - - - if (row.Field4 != null) - row.Field4 = String.Format("{0:0.00}", row.Field4.ToString()); - if (row.Field5 != null) - row.Field5 = String.Format("{0:0.00}", row.Field5.ToString()); - if (row.Field6 != null) - row.Field6 = String.Format("{0:0.00}", row.Field6.ToString()); - - //if (row.Field3 == null) - // row.Field3 = String.Empty; - //if (row.Field4 != null) - //{ - // if (row.Field3 != null && row.Field3.ToString().Length > 0) - // row.Field3 = row.Field3.ToString() + " "; - // row.Field3 = row.Field3.ToString() + row.Field4.ToString(); - //} - - //row.Field5 = String.Format("{0:dd.MM.yy} - {1:dd.MM.yy}", row.Field5, row.Field6); decimal betrag = 0; if (row.Field7 != null && Decimal.TryParse(row.Field7.ToString(), out betrag)) { gesamt += betrag; row.Field7 = String.Format("{0:c}", betrag); + if (row.Field12 == null || row.Field12.ToString() != "Ja") + { + gesamtOffen += betrag; + } } - } lblGesamt.Text = String.Format("Gesamt: {0:c}", gesamt); - + lblGesamtOffen.Text = String.Format("Gesamt noch offen: {0:c}", gesamtOffen); } - } } diff --git a/ReportImp/SchoengeistReports/Monatsabrechnung.designer.cs b/ReportImp/SchoengeistReports/Monatsabrechnung.designer.cs index 8c1550863..3b81273c3 100644 --- a/ReportImp/SchoengeistReports/Monatsabrechnung.designer.cs +++ b/ReportImp/SchoengeistReports/Monatsabrechnung.designer.cs @@ -30,6 +30,7 @@ namespace BeWo.SchoengeistReports private void InitializeComponent() { this.components = new System.ComponentModel.Container(); + DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark(); this.Detail = new DevExpress.XtraReports.UI.DetailBand(); this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); this.xrTableDetail = new DevExpress.XtraReports.UI.XRTable(); @@ -37,9 +38,8 @@ namespace BeWo.SchoengeistReports this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell(); this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); this.xrTableHeader = new DevExpress.XtraReports.UI.XRTable(); @@ -47,12 +47,10 @@ namespace BeWo.SchoengeistReports this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell(); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.lblGesamt = new DevExpress.XtraReports.UI.XRLabel(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); this.lblHeader = new DevExpress.XtraReports.UI.XRLabel(); this.pageFooterBand1 = new DevExpress.XtraReports.UI.PageFooterBand(); @@ -65,8 +63,8 @@ namespace BeWo.SchoengeistReports this.fieldFLS = new DevExpress.XtraReports.UI.CalculatedField(); this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); - this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell(); + this.lblGesamtOffen = new DevExpress.XtraReports.UI.XRLabel(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); @@ -83,7 +81,8 @@ namespace BeWo.SchoengeistReports // this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrTableDetail}); - this.Detail1.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.Detail1.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.Detail1.HeightF = 25F; this.Detail1.Name = "Detail1"; this.Detail1.StylePriority.UseFont = false; @@ -92,13 +91,14 @@ namespace BeWo.SchoengeistReports // this.xrTableDetail.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableDetail.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableDetail.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTableDetail.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrTableDetail.Name = "xrTableDetail"; this.xrTableDetail.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F); this.xrTableDetail.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRowDetail}); - this.xrTableDetail.SizeF = new System.Drawing.SizeF(724.9999F, 25F); + this.xrTableDetail.SizeF = new System.Drawing.SizeF(727.0001F, 25F); this.xrTableDetail.StylePriority.UseBorders = false; this.xrTableDetail.StylePriority.UseFont = false; this.xrTableDetail.StylePriority.UsePadding = false; @@ -109,8 +109,6 @@ namespace BeWo.SchoengeistReports this.xrTableCell3, this.xrTableCell10, this.xrTableCell9, - this.xrTableCell8, - this.xrTableCell11, this.xrTableCell12, this.xrTableCell14}); this.xrTableRowDetail.Name = "xrTableRowDetail"; @@ -119,62 +117,38 @@ namespace BeWo.SchoengeistReports // xrTableCell3 // this.xrTableCell3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field1")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field2")}); this.xrTableCell3.Name = "xrTableCell3"; this.xrTableCell3.StylePriority.UseFont = false; this.xrTableCell3.StylePriority.UseTextAlignment = false; this.xrTableCell3.Text = "xrTableCell3"; this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell3.Weight = 0.23448279585141352D; + this.xrTableCell3.Weight = 0.21059618309614014D; // // xrTableCell10 // this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field2")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field3")}); this.xrTableCell10.Name = "xrTableCell10"; this.xrTableCell10.StylePriority.UseTextAlignment = false; this.xrTableCell10.Text = "xrTableCell10"; this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell10.Weight = 0.17931037625235102D; + this.xrTableCell10.Weight = 0.15794713550739098D; // // xrTableCell9 // this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field3")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field6")}); this.xrTableCell9.Name = "xrTableCell9"; this.xrTableCell9.StylePriority.UseTextAlignment = false; this.xrTableCell9.Text = "xrTableCell9"; this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell9.Weight = 0.15172413731415291D; - // - // xrTableCell8 - // - this.xrTableCell8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field4")}); - this.xrTableCell8.Name = "xrTableCell8"; - this.xrTableCell8.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 3, 0, 0, 100F); - this.xrTableCell8.StylePriority.UsePadding = false; - this.xrTableCell8.StylePriority.UseTextAlignment = false; - this.xrTableCell8.Text = "xrTableCell8"; - this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell8.Weight = 0.11034484569354684D; - // - // xrTableCell11 - // - this.xrTableCell11.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field5")}); - this.xrTableCell11.Name = "xrTableCell11"; - this.xrTableCell11.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 3, 0, 0, 100F); - this.xrTableCell11.StylePriority.UsePadding = false; - this.xrTableCell11.StylePriority.UseTextAlignment = false; - this.xrTableCell11.Text = "xrTableCell11"; - this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell11.Weight = 0.12413795378658826D; + this.xrTableCell9.Weight = 0.19697399081438632D; // // xrTableCell12 // this.xrTableCell12.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field6")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field12")}); this.xrTableCell12.Name = "xrTableCell12"; this.xrTableCell12.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 3, 0, 0, 100F); this.xrTableCell12.StylePriority.UsePadding = false; @@ -183,6 +157,18 @@ namespace BeWo.SchoengeistReports this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; this.xrTableCell12.Weight = 0.06896552859929389D; // + // xrTableCell14 + // + this.xrTableCell14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field7")}); + this.xrTableCell14.Name = "xrTableCell14"; + this.xrTableCell14.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 3, 0, 0, 100F); + this.xrTableCell14.StylePriority.UsePadding = false; + this.xrTableCell14.StylePriority.UseTextAlignment = false; + this.xrTableCell14.Text = "xrTableCell14"; + this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell14.Weight = 0.1310343625026536D; + // // DetailReport // this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -207,13 +193,13 @@ namespace BeWo.SchoengeistReports this.xrTableHeader.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableHeader.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold); + this.xrTableHeader.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold); this.xrTableHeader.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrTableHeader.Name = "xrTableHeader"; this.xrTableHeader.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F); this.xrTableHeader.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRowHeader}); - this.xrTableHeader.SizeF = new System.Drawing.SizeF(725F, 25F); + this.xrTableHeader.SizeF = new System.Drawing.SizeF(727.0001F, 25F); this.xrTableHeader.StylePriority.UseBorders = false; this.xrTableHeader.StylePriority.UseFont = false; this.xrTableHeader.StylePriority.UsePadding = false; @@ -224,8 +210,6 @@ namespace BeWo.SchoengeistReports this.xrTableCell5, this.xrTableCell4, this.xrTableCell2, - this.xrTableCell6, - this.xrTableCell1, this.xrTableCell7, this.xrTableCell13}); this.xrTableRowHeader.Name = "xrTableRowHeader"; @@ -237,7 +221,7 @@ namespace BeWo.SchoengeistReports this.xrTableCell5.StylePriority.UseTextAlignment = false; this.xrTableCell5.Text = "Name"; this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell5.Weight = 0.23448275862068965D; + this.xrTableCell5.Weight = 0.21059619279211372D; // // xrTableCell4 // @@ -245,7 +229,7 @@ namespace BeWo.SchoengeistReports this.xrTableCell4.StylePriority.UseTextAlignment = false; this.xrTableCell4.Text = "Hilfeplan"; this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell4.Weight = 0.17931034482758618D; + this.xrTableCell4.Weight = 0.1579471511440084D; // // xrTableCell2 // @@ -253,27 +237,7 @@ namespace BeWo.SchoengeistReports this.xrTableCell2.StylePriority.UseTextAlignment = false; this.xrTableCell2.Text = "Kostenträger"; this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell2.Weight = 0.15172413793103451D; - // - // xrTableCell6 - // - this.xrTableCell6.Name = "xrTableCell6"; - this.xrTableCell6.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 3, 0, 0, 100F); - this.xrTableCell6.StylePriority.UsePadding = false; - this.xrTableCell6.StylePriority.UseTextAlignment = false; - this.xrTableCell6.Text = "FLS"; - this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell6.Weight = 0.1103448275862069D; - // - // xrTableCell1 - // - this.xrTableCell1.Name = "xrTableCell1"; - this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 3, 0, 0, 100F); - this.xrTableCell1.StylePriority.UsePadding = false; - this.xrTableCell1.StylePriority.UseTextAlignment = false; - this.xrTableCell1.Text = "Stundensatz"; - this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell1.Weight = 0.12413793103448276D; + this.xrTableCell2.Weight = 0.19697389744318825D; // // xrTableCell7 // @@ -281,20 +245,31 @@ namespace BeWo.SchoengeistReports this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 3, 0, 0, 100F); this.xrTableCell7.StylePriority.UsePadding = false; this.xrTableCell7.StylePriority.UseTextAlignment = false; - this.xrTableCell7.Text = "Faktor"; + this.xrTableCell7.Text = "bezahlt"; this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; this.xrTableCell7.Weight = 0.068965517241379309D; // + // xrTableCell13 + // + this.xrTableCell13.Name = "xrTableCell13"; + this.xrTableCell13.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 3, 0, 0, 100F); + this.xrTableCell13.StylePriority.UsePadding = false; + this.xrTableCell13.StylePriority.UseTextAlignment = false; + this.xrTableCell13.Text = "Betrag"; + this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell13.Weight = 0.13103448275862067D; + // // GroupFooter1 // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.lblGesamtOffen, this.lblGesamt}); - this.GroupFooter1.HeightF = 35.41667F; + this.GroupFooter1.HeightF = 57.08332F; this.GroupFooter1.Name = "GroupFooter1"; // // lblGesamt // - this.lblGesamt.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold); + this.lblGesamt.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold); this.lblGesamt.LocationFloat = new DevExpress.Utils.PointFloat(510F, 0F); this.lblGesamt.Multiline = true; this.lblGesamt.Name = "lblGesamt"; @@ -307,10 +282,6 @@ namespace BeWo.SchoengeistReports this.lblGesamt.Text = "Gesamt:"; this.lblGesamt.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.QueryRO); - // // ReportHeader // this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { @@ -320,7 +291,7 @@ namespace BeWo.SchoengeistReports // // lblHeader // - this.lblHeader.Font = new System.Drawing.Font("Arial", 14F); + this.lblHeader.Font = new DevExpress.Drawing.DXFont("Arial", 14F); this.lblHeader.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.lblHeader.Multiline = true; this.lblHeader.Name = "lblHeader"; @@ -338,18 +309,18 @@ namespace BeWo.SchoengeistReports // // xrPageInfo2 // - this.xrPageInfo2.Font = new System.Drawing.Font("Arial", 8F); - this.xrPageInfo2.Format = "Seite {0} von {1}"; + this.xrPageInfo2.Font = new DevExpress.Drawing.DXFont("Arial", 8F); this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(517F, 25F); this.xrPageInfo2.Name = "xrPageInfo2"; this.xrPageInfo2.SizeF = new System.Drawing.SizeF(207.9999F, 23F); this.xrPageInfo2.StyleName = "PageInfo"; this.xrPageInfo2.StylePriority.UseFont = false; this.xrPageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrPageInfo2.TextFormatString = "Seite {0} von {1}"; // // xrPageInfo1 // - this.xrPageInfo1.Font = new System.Drawing.Font("Arial", 8F); + this.xrPageInfo1.Font = new DevExpress.Drawing.DXFont("Arial", 8F); this.xrPageInfo1.LocationFloat = new DevExpress.Utils.PointFloat(8F, 25F); this.xrPageInfo1.Name = "xrPageInfo1"; this.xrPageInfo1.PageInfo = DevExpress.XtraPrinting.PageInfo.DateTime; @@ -362,8 +333,8 @@ namespace BeWo.SchoengeistReports this.Title.BackColor = System.Drawing.Color.White; this.Title.BorderColor = System.Drawing.SystemColors.ControlText; this.Title.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.Title.BorderWidth = 1; - this.Title.Font = new System.Drawing.Font("Times New Roman", 24F); + this.Title.BorderWidth = 1F; + this.Title.Font = new DevExpress.Drawing.DXFont("Times New Roman", 24F); this.Title.ForeColor = System.Drawing.Color.Black; this.Title.Name = "Title"; // @@ -372,8 +343,8 @@ namespace BeWo.SchoengeistReports this.FieldCaption.BackColor = System.Drawing.Color.White; this.FieldCaption.BorderColor = System.Drawing.SystemColors.ControlText; this.FieldCaption.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.FieldCaption.BorderWidth = 1; - this.FieldCaption.Font = new System.Drawing.Font("Times New Roman", 10F, System.Drawing.FontStyle.Bold); + this.FieldCaption.BorderWidth = 1F; + this.FieldCaption.Font = new DevExpress.Drawing.DXFont("Times New Roman", 10F, DevExpress.Drawing.DXFontStyle.Bold); this.FieldCaption.ForeColor = System.Drawing.Color.Black; this.FieldCaption.Name = "FieldCaption"; // @@ -382,8 +353,8 @@ namespace BeWo.SchoengeistReports this.PageInfo.BackColor = System.Drawing.Color.White; this.PageInfo.BorderColor = System.Drawing.SystemColors.ControlText; this.PageInfo.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.PageInfo.BorderWidth = 1; - this.PageInfo.Font = new System.Drawing.Font("Times New Roman", 8F); + this.PageInfo.BorderWidth = 1F; + this.PageInfo.Font = new DevExpress.Drawing.DXFont("Times New Roman", 8F); this.PageInfo.ForeColor = System.Drawing.Color.Black; this.PageInfo.Name = "PageInfo"; // @@ -392,15 +363,14 @@ namespace BeWo.SchoengeistReports this.DataField.BackColor = System.Drawing.Color.White; this.DataField.BorderColor = System.Drawing.SystemColors.ControlText; this.DataField.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.DataField.BorderWidth = 1; - this.DataField.Font = new System.Drawing.Font("Times New Roman", 8F); + this.DataField.BorderWidth = 1F; + this.DataField.Font = new DevExpress.Drawing.DXFont("Times New Roman", 8F); this.DataField.ForeColor = System.Drawing.SystemColors.ControlText; this.DataField.Name = "DataField"; // // fieldFLS // this.fieldFLS.DataMember = "FLSReportGroups"; - this.fieldFLS.DataSource = this.bindingSource1; this.fieldFLS.Expression = "[TotalFLM] / 60"; this.fieldFLS.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; this.fieldFLS.Name = "fieldFLS"; @@ -415,27 +385,24 @@ namespace BeWo.SchoengeistReports this.bottomMarginBand1.HeightF = 50F; this.bottomMarginBand1.Name = "bottomMarginBand1"; // - // xrTableCell13 + // lblGesamtOffen // - this.xrTableCell13.Name = "xrTableCell13"; - this.xrTableCell13.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 3, 0, 0, 100F); - this.xrTableCell13.StylePriority.UsePadding = false; - this.xrTableCell13.StylePriority.UseTextAlignment = false; - this.xrTableCell13.Text = "Betrag"; - this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell13.Weight = 0.13103448275862067D; + this.lblGesamtOffen.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold); + this.lblGesamtOffen.LocationFloat = new DevExpress.Utils.PointFloat(510F, 25F); + this.lblGesamtOffen.Multiline = true; + this.lblGesamtOffen.Name = "lblGesamtOffen"; + this.lblGesamtOffen.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 3, 0, 0, 100F); + this.lblGesamtOffen.SizeF = new System.Drawing.SizeF(214.9999F, 25F); + this.lblGesamtOffen.StyleName = "Title"; + this.lblGesamtOffen.StylePriority.UseFont = false; + this.lblGesamtOffen.StylePriority.UsePadding = false; + this.lblGesamtOffen.StylePriority.UseTextAlignment = false; + this.lblGesamtOffen.Text = "Gesamt noch offen:"; + this.lblGesamtOffen.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; // - // xrTableCell14 + // bindingSource1 // - this.xrTableCell14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field7")}); - this.xrTableCell14.Name = "xrTableCell14"; - this.xrTableCell14.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 3, 0, 0, 100F); - this.xrTableCell14.StylePriority.UsePadding = false; - this.xrTableCell14.StylePriority.UseTextAlignment = false; - this.xrTableCell14.Text = "xrTableCell14"; - this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell14.Weight = 0.1310343625026536D; + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.QueryRO); // // Monatsabrechnung // @@ -449,7 +416,7 @@ namespace BeWo.SchoengeistReports this.CalculatedFields.AddRange(new DevExpress.XtraReports.UI.CalculatedField[] { this.fieldFLS}); this.DataSource = this.bindingSource1; - this.Margins = new System.Drawing.Printing.Margins(50, 50, 50, 50); + this.Margins = new DevExpress.Drawing.DXMargins(50F, 50F, 50F, 50F); this.PageHeight = 1169; this.PageWidth = 827; this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4; @@ -458,7 +425,9 @@ namespace BeWo.SchoengeistReports this.FieldCaption, this.PageInfo, this.DataField}); - this.Version = "10.2"; + this.Version = "23.2"; + xrWatermark1.Id = "Watermark1"; + this.Watermarks.Add(xrWatermark1); ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); @@ -493,17 +462,14 @@ namespace BeWo.SchoengeistReports private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader1; private DevExpress.XtraReports.UI.XRTableCell xrTableCell10; private DevExpress.XtraReports.UI.XRTableCell xrTableCell9; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell8; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell11; private DevExpress.XtraReports.UI.XRTableCell xrTableCell12; private DevExpress.XtraReports.UI.XRTableCell xrTableCell4; private DevExpress.XtraReports.UI.XRTableCell xrTableCell2; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell6; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell1; private DevExpress.XtraReports.UI.XRTableCell xrTableCell7; private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1; private DevExpress.XtraReports.UI.XRLabel lblGesamt; private DevExpress.XtraReports.UI.XRTableCell xrTableCell14; private DevExpress.XtraReports.UI.XRTableCell xrTableCell13; + private DevExpress.XtraReports.UI.XRLabel lblGesamtOffen; } } diff --git a/ReportImp/SchoengeistReports/Monatsabrechnung.resx b/ReportImp/SchoengeistReports/Monatsabrechnung.resx index 0f60e7858..c7e0d4bdf 100644 --- a/ReportImp/SchoengeistReports/Monatsabrechnung.resx +++ b/ReportImp/SchoengeistReports/Monatsabrechnung.resx @@ -117,7 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 17, 17 - \ No newline at end of file diff --git a/ReportImp/SchoengeistReports/SchoengeistReports.csproj b/ReportImp/SchoengeistReports/SchoengeistReports.csproj index 3eda4e7ba..f84154064 100644 --- a/ReportImp/SchoengeistReports/SchoengeistReports.csproj +++ b/ReportImp/SchoengeistReports/SchoengeistReports.csproj @@ -107,6 +107,7 @@ + Component @@ -166,6 +167,10 @@ {40D8B312-EA64-49E3-A31A-5E57ED4D5654} Report + + {094331c3-ecee-4c89-bbfd-4c9ded89f0ef} + Service + {2f50b83d-a3f0-4ec4-979a-3f9b7e3d8ed4} Shared