From 7e7afe4699381c75a2f994ef985c038b03e77204 Mon Sep 17 00:00:00 2001 From: Alexandra Date: Wed, 6 Sep 2023 13:56:58 +0200 Subject: [PATCH] DieLebenslotsen/ServiceRecordListReport angepasst --- .../ServiceRecordListReport.Designer.cs | 225 +++--------------- .../ServiceRecordListReport.cs | 14 +- 2 files changed, 45 insertions(+), 194 deletions(-) diff --git a/ReportImp/DieLebenslotsen/ServiceRecordListReport.Designer.cs b/ReportImp/DieLebenslotsen/ServiceRecordListReport.Designer.cs index eba014cde..32567c6c1 100644 --- a/ReportImp/DieLebenslotsen/ServiceRecordListReport.Designer.cs +++ b/ReportImp/DieLebenslotsen/ServiceRecordListReport.Designer.cs @@ -36,16 +36,8 @@ namespace DieLebenslotsen this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell(); this.formattingRuleGoalsInvisible = new DevExpress.XtraReports.UI.FormattingRule(); this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); - this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); - this.cellGoalCaption = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell(); this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); @@ -55,7 +47,6 @@ namespace DieLebenslotsen this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); @@ -70,12 +61,8 @@ namespace DieLebenslotsen this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); this.fieldGoalCaption = new DevExpress.XtraReports.UI.CalculatedField(); - this.DetailReport1 = new DevExpress.XtraReports.UI.DetailReportBand(); - this.Detail2 = new DevExpress.XtraReports.UI.DetailBand(); - this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); + this.lblStunden = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); @@ -97,7 +84,7 @@ namespace DieLebenslotsen this.xrTableCell3.StylePriority.UseTextAlignment = false; this.xrTableCell3.Text = "xrTableCell3"; this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell3.Weight = 0.50085023633476844D; + this.xrTableCell3.Weight = 0.43083938143947753D; // // xrTableCell1 // @@ -117,8 +104,7 @@ namespace DieLebenslotsen this.xrTableCell1, this.xrTableCell2, this.xrTableCell3, - this.xrTableCell4, - this.xrTableCell14}); + this.xrTableCell4}); this.xrTableRow1.FormattingRules.Add(this.formattingRuleGoalsInvisible); this.xrTableRow1.Name = "xrTableRow1"; this.xrTableRow1.StylePriority.UseBorders = false; @@ -133,28 +119,17 @@ namespace DieLebenslotsen this.xrTableCell2.StylePriority.UseTextAlignment = false; this.xrTableCell2.Text = "xrTableCell2"; this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell2.Weight = 0.62358280104033792D; + this.xrTableCell2.Weight = 0.41808386142067533D; // // xrTableCell4 // - this.xrTableCell4.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceRecordDetailList.Notice")}); this.xrTableCell4.Multiline = true; this.xrTableCell4.Name = "xrTableCell4"; this.xrTableCell4.StylePriority.UseBorders = false; this.xrTableCell4.StylePriority.UseTextAlignment = false; - this.xrTableCell4.Text = "xrTableCell4"; + this.xrTableCell4.Text = "[ServiceRecord.Notice]\r\n[ServiceRecord.Notice2]"; this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell4.Weight = 1.8242612071913762D; - // - // xrTableCell14 - // - this.xrTableCell14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceRecordDetailList.ServiceRecord.Notice2")}); - this.xrTableCell14.Name = "xrTableCell14"; - this.xrTableCell14.StylePriority.UseTextAlignment = false; - this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell14.Weight = 1.6882105194846147D; + this.xrTableCell4.Weight = 3.7879815211909444D; // // formattingRuleGoalsInvisible // @@ -172,85 +147,17 @@ namespace DieLebenslotsen this.xrTable1.Name = "xrTable1"; this.xrTable1.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F); this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { - this.xrTableRow1, - this.xrTableRow3}); - this.xrTable1.SizeF = new System.Drawing.SizeF(761F, 50F); + this.xrTableRow1}); + this.xrTable1.SizeF = new System.Drawing.SizeF(761F, 25F); this.xrTable1.StylePriority.UseBorders = false; this.xrTable1.StylePriority.UsePadding = false; // - // xrTableRow3 - // - this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell9, - this.xrTableCell10, - this.xrTableCell11, - this.cellGoalCaption, - this.xrTableCell12, - this.xrTableCell15}); - this.xrTableRow3.Name = "xrTableRow3"; - this.xrTableRow3.Weight = 1D; - // - // xrTableCell9 - // - this.xrTableCell9.CanShrink = true; - this.xrTableCell9.Name = "xrTableCell9"; - this.xrTableCell9.Weight = 0.46398341663570258D; - // - // xrTableCell10 - // - this.xrTableCell10.CanShrink = true; - this.xrTableCell10.Name = "xrTableCell10"; - this.xrTableCell10.Weight = 0.53583379516692309D; - // - // xrTableCell11 - // - this.xrTableCell11.CanShrink = true; - this.xrTableCell11.Name = "xrTableCell11"; - this.xrTableCell11.Weight = 0.43037185245101151D; - // - // cellGoalCaption - // - this.cellGoalCaption.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.cellGoalCaption.CanShrink = true; - this.cellGoalCaption.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceRecordDetailList.fieldGoalCaption")}); - this.cellGoalCaption.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); - this.cellGoalCaption.Name = "cellGoalCaption"; - this.cellGoalCaption.StylePriority.UseBorders = false; - this.cellGoalCaption.StylePriority.UseFont = false; - this.cellGoalCaption.StylePriority.UseTextAlignment = false; - this.cellGoalCaption.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.cellGoalCaption.Weight = 0.4242732057715779D; - // - // xrTableCell12 - // - this.xrTableCell12.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell12.CanShrink = true; - this.xrTableCell12.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceRecordDetailList.Goals")}); - this.xrTableCell12.Multiline = true; - this.xrTableCell12.Name = "xrTableCell12"; - this.xrTableCell12.StylePriority.UseBorders = false; - this.xrTableCell12.StylePriority.UseTextAlignment = false; - this.xrTableCell12.Text = "xrTableCell12"; - this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell12.Weight = 1.1432824260621373D; - // - // xrTableCell15 - // - this.xrTableCell15.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell15.Name = "xrTableCell15"; - this.xrTableCell15.StylePriority.UseBorders = false; - this.xrTableCell15.StylePriority.UseTextAlignment = false; - this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell15.Weight = 1.4506497001173451D; - // // Detail1 // this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrTable1}); this.Detail1.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Detail1.HeightF = 50F; + this.Detail1.HeightF = 25F; this.Detail1.Name = "Detail1"; this.Detail1.StylePriority.UseFont = false; // @@ -261,7 +168,7 @@ namespace DieLebenslotsen this.GroupHeader1}); this.DetailReport.DataMember = "ServiceRecordDetailList"; this.DetailReport.DataSource = this.bindingSource1; - this.DetailReport.Level = 1; + this.DetailReport.Level = 0; this.DetailReport.Name = "DetailReport"; // // GroupHeader1 @@ -294,8 +201,7 @@ namespace DieLebenslotsen this.xrTableCell5, this.xrTableCell6, this.xrTableCell7, - this.xrTableCell8, - this.xrTableCell13}); + this.xrTableCell8}); this.xrTableRow2.Name = "xrTableRow2"; this.xrTableRow2.Weight = 1D; // @@ -309,25 +215,19 @@ namespace DieLebenslotsen // this.xrTableCell6.Name = "xrTableCell6"; this.xrTableCell6.Text = "Uhrzeit"; - this.xrTableCell6.Weight = 0.62358280104033792D; + this.xrTableCell6.Weight = 0.41808386142067533D; // // xrTableCell7 // this.xrTableCell7.Name = "xrTableCell7"; this.xrTableCell7.Text = "Minuten"; - this.xrTableCell7.Weight = 0.50085023633476844D; + this.xrTableCell7.Weight = 0.43083938143947753D; // // xrTableCell8 // this.xrTableCell8.Name = "xrTableCell8"; this.xrTableCell8.Text = "Dokumentation"; - this.xrTableCell8.Weight = 1.8242620376016823D; - // - // xrTableCell13 - // - this.xrTableCell13.Name = "xrTableCell13"; - this.xrTableCell13.Text = "Dokumentation 2"; - this.xrTableCell13.Weight = 1.6882096890743086D; + this.xrTableCell8.Weight = 3.7879815211909444D; // // bindingSource1 // @@ -336,9 +236,11 @@ namespace DieLebenslotsen // ReportHeader // this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.lblStunden, + this.xrLabel3, this.xrLabel2, this.xrLabel1}); - this.ReportHeader.HeightF = 73.00002F; + this.ReportHeader.HeightF = 115.7084F; this.ReportHeader.Name = "ReportHeader"; // // xrLabel2 @@ -448,71 +350,24 @@ namespace DieLebenslotsen this.fieldGoalCaption.FieldType = DevExpress.XtraReports.UI.FieldType.String; this.fieldGoalCaption.Name = "fieldGoalCaption"; // - // DetailReport1 - // - this.DetailReport1.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { - this.Detail2}); - this.DetailReport1.DataMember = "Statistics"; - this.DetailReport1.DataSource = this.bindingSource1; - this.DetailReport1.Level = 0; - this.DetailReport1.Name = "DetailReport1"; - // - // Detail2 - // - this.Detail2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrLabel6, - this.xrLabel5, - this.xrLabel4, - this.xrLabel3}); - this.Detail2.Font = new System.Drawing.Font("Arial", 9.75F); - this.Detail2.HeightF = 117.7083F; - this.Detail2.MultiColumn.ColumnCount = 3; - this.Detail2.MultiColumn.Layout = DevExpress.XtraPrinting.ColumnLayout.AcrossThenDown; - this.Detail2.MultiColumn.Mode = DevExpress.XtraReports.UI.MultiColumnMode.UseColumnCount; - this.Detail2.Name = "Detail2"; - this.Detail2.StylePriority.UseFont = false; - // - // xrLabel6 - // - this.xrLabel6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Statistics.Text4")}); - this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 68.99995F); - this.xrLabel6.Name = "xrLabel6"; - this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel6.SizeF = new System.Drawing.SizeF(204.1667F, 23F); - this.xrLabel6.Text = "xrLabel6"; - // - // xrLabel5 - // - this.xrLabel5.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Statistics.Text3")}); - this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 45.99997F); - this.xrLabel5.Name = "xrLabel5"; - this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel5.SizeF = new System.Drawing.SizeF(204.1667F, 23F); - this.xrLabel5.Text = "xrLabel5"; - // - // xrLabel4 - // - this.xrLabel4.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Statistics.Text2")}); - this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 22.99999F); - this.xrLabel4.Name = "xrLabel4"; - this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel4.SizeF = new System.Drawing.SizeF(204.1667F, 23F); - this.xrLabel4.Text = "xrLabel4"; - // // xrLabel3 // - this.xrLabel3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Statistics.Text1")}); - this.xrLabel3.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Bold); - this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrLabel3.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(3.178914E-05F, 66.18751F); this.xrLabel3.Name = "xrLabel3"; this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel3.SizeF = new System.Drawing.SizeF(204.1667F, 23F); + this.xrLabel3.SizeF = new System.Drawing.SizeF(156.25F, 20.83334F); this.xrLabel3.StylePriority.UseFont = false; - this.xrLabel3.Text = "xrLabel3"; + this.xrLabel3.Text = "Geleistet diesen Monat:"; + // + // lblStunden + // + this.lblStunden.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblStunden.LocationFloat = new DevExpress.Utils.PointFloat(156.2501F, 66.18751F); + this.lblStunden.Name = "lblStunden"; + this.lblStunden.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblStunden.SizeF = new System.Drawing.SizeF(156.25F, 20.83334F); + this.lblStunden.StylePriority.UseFont = false; // // Leistungen // @@ -522,8 +377,7 @@ namespace DieLebenslotsen this.ReportHeader, this.pageFooterBand1, this.topMarginBand1, - this.bottomMarginBand1, - this.DetailReport1}); + this.bottomMarginBand1}); this.CalculatedFields.AddRange(new DevExpress.XtraReports.UI.CalculatedField[] { this.fieldGoalCaption}); this.DataSource = this.bindingSource1; @@ -576,23 +430,10 @@ namespace DieLebenslotsen private DevExpress.XtraReports.UI.XRTableCell xrTableCell8; private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1; private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow3; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell9; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell10; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell11; - private DevExpress.XtraReports.UI.XRTableCell cellGoalCaption; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell12; private DevExpress.XtraReports.UI.FormattingRule formattingRuleGoalsInvisible; private DevExpress.XtraReports.UI.CalculatedField fieldGoalCaption; private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader1; - private DevExpress.XtraReports.UI.DetailReportBand DetailReport1; - private DevExpress.XtraReports.UI.DetailBand Detail2; - private DevExpress.XtraReports.UI.XRLabel xrLabel6; - private DevExpress.XtraReports.UI.XRLabel xrLabel5; - private DevExpress.XtraReports.UI.XRLabel xrLabel4; - private DevExpress.XtraReports.UI.XRLabel xrLabel3; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell14; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell15; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell13; + private DevExpress.XtraReports.UI.XRLabel lblStunden; + private DevExpress.XtraReports.UI.XRLabel xrLabel3; } } diff --git a/ReportImp/DieLebenslotsen/ServiceRecordListReport.cs b/ReportImp/DieLebenslotsen/ServiceRecordListReport.cs index db425935c..9c8763a8a 100644 --- a/ReportImp/DieLebenslotsen/ServiceRecordListReport.cs +++ b/ReportImp/DieLebenslotsen/ServiceRecordListReport.cs @@ -1,5 +1,6 @@ using BeWo.Report; using BeWo.Report.ReportObjects; +using System; namespace DieLebenslotsen { @@ -12,8 +13,17 @@ namespace DieLebenslotsen public void SetReportDataSource(ServiceRecordListRO pRO) { - if (pRO.Statistics == null || pRO.Statistics.Count == 0) - Detail2.Visible = false; + //if (pRO.Statistics == null || pRO.Statistics.Count == 0) + // Detail2.Visible = false; + if (pRO.ServiceRecordDetailList != null) + { + decimal std = 0; + foreach (var srd in pRO.ServiceRecordDetailList) + { + std += srd.RoundedDuration; + } + lblStunden.Text = string.Format("{0:0.00} Stunden", Math.Round(std / 60, 2, MidpointRounding.AwayFromZero)); + } bindingSource1.DataSource = pRO; } }