From 4490b74279a4ee7ba7e1cc283d89971dd5f90b6b Mon Sep 17 00:00:00 2001 From: Marcel Hirschle Date: Tue, 4 Apr 2023 15:41:36 +0200 Subject: [PATCH] MH: Hilfe Daheim Fehlkontakte --- .../Quittierungsbeleg.Designer.cs | 74 ++++++++++++------- .../Quittierungsbeleg.cs | 9 ++- .../SettlementReport.Designer.cs | 22 +++++- 3 files changed, 72 insertions(+), 33 deletions(-) diff --git a/ReportImp/HilfeDaheimHandInHand/Quittierungsbeleg.Designer.cs b/ReportImp/HilfeDaheimHandInHand/Quittierungsbeleg.Designer.cs index d8586190c..46310c5c1 100644 --- a/ReportImp/HilfeDaheimHandInHand/Quittierungsbeleg.Designer.cs +++ b/ReportImp/HilfeDaheimHandInHand/Quittierungsbeleg.Designer.cs @@ -62,8 +62,10 @@ namespace HilfeDaheimHandInHand this.lblMitOhne20Prozent = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell43 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell49 = new DevExpress.XtraReports.UI.XRTableCell(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule(); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); + this.xrPictureBox3 = new DevExpress.XtraReports.UI.XRPictureBox(); this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel(); @@ -116,14 +118,13 @@ namespace HilfeDaheimHandInHand this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox(); this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel(); this.fieldKontaktArt = new DevExpress.XtraReports.UI.CalculatedField(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); - this.xrPictureBox3 = new DevExpress.XtraReports.UI.XRPictureBox(); + this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableAbwesenheiten)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -231,7 +232,7 @@ namespace HilfeDaheimHandInHand // xrTableCell2 // this.xrTableCell2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.fieldKontaktArt")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice5")}); this.xrTableCell2.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.xrTableCell2.Name = "xrTableCell2"; this.xrTableCell2.StylePriority.UseFont = false; @@ -534,6 +535,10 @@ namespace HilfeDaheimHandInHand this.xrTableCell49.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; this.xrTableCell49.Weight = 0.44692737430167606D; // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); + // // formattingRuleStartDate // this.formattingRuleStartDate.Condition = "[StartDate2] < [StartDate]"; @@ -555,6 +560,14 @@ namespace HilfeDaheimHandInHand this.ReportHeader.HeightF = 117.5F; this.ReportHeader.Name = "ReportHeader"; // + // xrPictureBox3 + // + this.xrPictureBox3.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox3.Image"))); + this.xrPictureBox3.LocationFloat = new DevExpress.Utils.PointFloat(666.0001F, 0F); + this.xrPictureBox3.Name = "xrPictureBox3"; + this.xrPictureBox3.SizeF = new System.Drawing.SizeF(81.00003F, 67.37499F); + this.xrPictureBox3.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; + // // xrLabel7 // this.xrLabel7.BackColor = System.Drawing.Color.Gainsboro; @@ -710,6 +723,7 @@ namespace HilfeDaheimHandInHand // GroupFooter1 // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel2, this.xrLabel18, this.xrPictureBox2, this.lblUnterschriftKlient, @@ -728,7 +742,7 @@ namespace HilfeDaheimHandInHand this.xrLabel1, this.xrPictureBox1, this.xrLabel17}); - this.GroupFooter1.HeightF = 270F; + this.GroupFooter1.HeightF = 289.7917F; this.GroupFooter1.KeepTogether = true; this.GroupFooter1.Name = "GroupFooter1"; // @@ -736,7 +750,7 @@ namespace HilfeDaheimHandInHand // this.xrLabel18.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerSignatureDate", "{0:dd.MM.yyyy,}")}); - this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(129.4998F, 227F); + this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(129.4998F, 244.7083F); this.xrLabel18.Name = "xrLabel18"; this.xrLabel18.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel18.SizeF = new System.Drawing.SizeF(100F, 23F); @@ -746,7 +760,7 @@ namespace HilfeDaheimHandInHand // this.xrPictureBox2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Tag", null, "CustomerSignature")}); - this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(230F, 227F); + this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(230F, 244.7083F); this.xrPictureBox2.Name = "xrPictureBox2"; this.xrPictureBox2.SizeF = new System.Drawing.SizeF(100F, 23F); this.xrPictureBox2.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; @@ -756,7 +770,7 @@ namespace HilfeDaheimHandInHand // this.lblUnterschriftKlient.Borders = DevExpress.XtraPrinting.BorderSide.Top; this.lblUnterschriftKlient.Font = new System.Drawing.Font("Arial", 10F); - this.lblUnterschriftKlient.LocationFloat = new DevExpress.Utils.PointFloat(94.99999F, 250F); + this.lblUnterschriftKlient.LocationFloat = new DevExpress.Utils.PointFloat(94.99998F, 267.7083F); this.lblUnterschriftKlient.Name = "lblUnterschriftKlient"; this.lblUnterschriftKlient.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); this.lblUnterschriftKlient.SizeF = new System.Drawing.SizeF(271.8472F, 20F); @@ -772,7 +786,7 @@ namespace HilfeDaheimHandInHand // this.lblUnterschriftMitarbeiter.Borders = DevExpress.XtraPrinting.BorderSide.Top; this.lblUnterschriftMitarbeiter.Font = new System.Drawing.Font("Arial", 10F); - this.lblUnterschriftMitarbeiter.LocationFloat = new DevExpress.Utils.PointFloat(398.31F, 250F); + this.lblUnterschriftMitarbeiter.LocationFloat = new DevExpress.Utils.PointFloat(398.31F, 267.7083F); this.lblUnterschriftMitarbeiter.Name = "lblUnterschriftMitarbeiter"; this.lblUnterschriftMitarbeiter.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); this.lblUnterschriftMitarbeiter.SizeF = new System.Drawing.SizeF(336.6944F, 19.99998F); @@ -791,7 +805,7 @@ namespace HilfeDaheimHandInHand | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableAbwesenheiten.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrTableAbwesenheiten.LocationFloat = new DevExpress.Utils.PointFloat(170F, 79.99997F); + this.xrTableAbwesenheiten.LocationFloat = new DevExpress.Utils.PointFloat(170F, 97.70832F); this.xrTableAbwesenheiten.Name = "xrTableAbwesenheiten"; this.xrTableAbwesenheiten.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); this.xrTableAbwesenheiten.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { @@ -1002,7 +1016,7 @@ namespace HilfeDaheimHandInHand | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.lblHatAbwesenheiten.Font = new System.Drawing.Font("Arial", 10F); - this.lblHatAbwesenheiten.LocationFloat = new DevExpress.Utils.PointFloat(435.1388F, 130F); + this.lblHatAbwesenheiten.LocationFloat = new DevExpress.Utils.PointFloat(435.1388F, 147.7083F); this.lblHatAbwesenheiten.Name = "lblHatAbwesenheiten"; this.lblHatAbwesenheiten.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); this.lblHatAbwesenheiten.SizeF = new System.Drawing.SizeF(30F, 30F); @@ -1019,7 +1033,7 @@ namespace HilfeDaheimHandInHand | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.lblHatGruppen.Font = new System.Drawing.Font("Arial", 10F); - this.lblHatGruppen.LocationFloat = new DevExpress.Utils.PointFloat(435.1388F, 79.99997F); + this.lblHatGruppen.LocationFloat = new DevExpress.Utils.PointFloat(435.1388F, 97.70832F); this.lblHatGruppen.Name = "lblHatGruppen"; this.lblHatGruppen.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); this.lblHatGruppen.SizeF = new System.Drawing.SizeF(30F, 30F); @@ -1033,7 +1047,7 @@ namespace HilfeDaheimHandInHand // xrRichText2 // this.xrRichText2.Font = new System.Drawing.Font("Arial", 8F); - this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(474.4723F, 130F); + this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(474.4723F, 147.7083F); this.xrRichText2.Name = "xrRichText2"; this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString"); this.xrRichText2.SizeF = new System.Drawing.SizeF(264.972F, 68.05556F); @@ -1042,7 +1056,7 @@ namespace HilfeDaheimHandInHand // xrRichText1 // this.xrRichText1.Font = new System.Drawing.Font("Arial", 8F); - this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(474.4723F, 79.99997F); + this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(474.4723F, 97.70832F); this.xrRichText1.Name = "xrRichText1"; this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString"); this.xrRichText1.SizeF = new System.Drawing.SizeF(264.9721F, 50F); @@ -1051,7 +1065,7 @@ namespace HilfeDaheimHandInHand // xrLabel15 // this.xrLabel15.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Underline); - this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0F, 79.99997F); + this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0F, 97.70832F); this.xrLabel15.Multiline = true; this.xrLabel15.Name = "xrLabel15"; this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); @@ -1162,7 +1176,7 @@ namespace HilfeDaheimHandInHand // this.xrPictureBox1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Tag", null, "EmployeeSignature")}); - this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(535.6389F, 227F); + this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(535.6389F, 244.7083F); this.xrPictureBox1.Name = "xrPictureBox1"; this.xrPictureBox1.Scripts.OnBeforePrint = "xrPictureBox1_BeforePrint"; this.xrPictureBox1.SizeF = new System.Drawing.SizeF(100F, 23F); @@ -1173,7 +1187,7 @@ namespace HilfeDaheimHandInHand // this.xrLabel17.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeSignatureDate", "{0:dd.MM.yyyy,}")}); - this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(435.1388F, 227F); + this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(435.1388F, 244.7083F); this.xrLabel17.Name = "xrLabel17"; this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel17.SizeF = new System.Drawing.SizeF(100F, 23F); @@ -1186,17 +1200,20 @@ namespace HilfeDaheimHandInHand this.fieldKontaktArt.FieldType = DevExpress.XtraReports.UI.FieldType.String; this.fieldKontaktArt.Name = "fieldKontaktArt"; // - // bindingSource1 + // xrLabel2 // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); - // - // xrPictureBox3 - // - this.xrPictureBox3.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox3.Image"))); - this.xrPictureBox3.LocationFloat = new DevExpress.Utils.PointFloat(666.0001F, 0F); - this.xrPictureBox3.Name = "xrPictureBox3"; - this.xrPictureBox3.SizeF = new System.Drawing.SizeF(81.00003F, 67.37499F); - this.xrPictureBox3.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; + this.xrLabel2.Font = new System.Drawing.Font("Arial", 10F); + this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(7.947286E-06F, 59.99997F); + this.xrLabel2.Name = "xrLabel2"; + this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); + this.xrLabel2.SizeF = new System.Drawing.SizeF(320F, 20F); + this.xrLabel2.StylePriority.UseBackColor = false; + this.xrLabel2.StylePriority.UseBorders = false; + this.xrLabel2.StylePriority.UseFont = false; + this.xrLabel2.StylePriority.UsePadding = false; + this.xrLabel2.StylePriority.UseTextAlignment = false; + this.xrLabel2.Text = "F = Fehlkontakt"; + this.xrLabel2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; // // Quittierungsbeleg // @@ -1223,10 +1240,10 @@ namespace HilfeDaheimHandInHand this.Version = "17.1"; ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableAbwesenheiten)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } @@ -1320,5 +1337,6 @@ namespace HilfeDaheimHandInHand private DevExpress.XtraReports.UI.XRLabel xrLabel18; private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox2; private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox3; + private DevExpress.XtraReports.UI.XRLabel xrLabel2; } } diff --git a/ReportImp/HilfeDaheimHandInHand/Quittierungsbeleg.cs b/ReportImp/HilfeDaheimHandInHand/Quittierungsbeleg.cs index 81e433409..0e16cc2ec 100644 --- a/ReportImp/HilfeDaheimHandInHand/Quittierungsbeleg.cs +++ b/ReportImp/HilfeDaheimHandInHand/Quittierungsbeleg.cs @@ -35,8 +35,15 @@ namespace HilfeDaheimHandInHand foreach (var sd in pRO.Services) { - if (sd.IsBillable) + if (sd.IsBillable || sd.ServiceDescription.ToLower().Contains("fehlkontakt")) { + if (sd.ServiceDescription.ToLower().Contains("fehlkontakt")) + sd.Notice5 = "F"; + else if (sd.IsGroup) + sd.Notice5 = "GR"; + else if (!sd.IsGroup) + sd.Notice5 = "E"; + ServicesOverviewRO.CreateSignatureString(sd); if (sd.IsGroup) { diff --git a/ReportImp/HilfeDaheimHandInHand/SettlementReport.Designer.cs b/ReportImp/HilfeDaheimHandInHand/SettlementReport.Designer.cs index 1c66c69c7..d3b5b09bd 100644 --- a/ReportImp/HilfeDaheimHandInHand/SettlementReport.Designer.cs +++ b/ReportImp/HilfeDaheimHandInHand/SettlementReport.Designer.cs @@ -67,6 +67,7 @@ namespace HilfeDaheimHandInHand this.xrTableRow15 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.xrLabel42 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel40 = new DevExpress.XtraReports.UI.XRLabel(); @@ -88,7 +89,7 @@ namespace HilfeDaheimHandInHand this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); this.AnspruchMinusEigenbeteiligung = new DevExpress.XtraReports.UI.CalculatedField(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.xrLabel30 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); @@ -606,9 +607,14 @@ namespace HilfeDaheimHandInHand this.xrTableCell23.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; this.xrTableCell23.Weight = 0.21616984089967392D; // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO); + // // GroupFooter1 // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel30, this.xrLabel42, this.xrLabel40, this.xrLabel39, @@ -629,7 +635,7 @@ namespace HilfeDaheimHandInHand this.xrLabel4, this.xrLabel3}); this.GroupFooter1.Font = new System.Drawing.Font("Verdana", 10F); - this.GroupFooter1.HeightF = 345.7848F; + this.GroupFooter1.HeightF = 383.2848F; this.GroupFooter1.Name = "GroupFooter1"; this.GroupFooter1.StylePriority.UseFont = false; // @@ -954,9 +960,16 @@ namespace HilfeDaheimHandInHand this.AnspruchMinusEigenbeteiligung.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; this.AnspruchMinusEigenbeteiligung.Name = "AnspruchMinusEigenbeteiligung"; // - // bindingSource1 + // xrLabel30 // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO); + this.xrLabel30.CanShrink = true; + this.xrLabel30.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "FehlkontakteString")}); + this.xrLabel30.LocationFloat = new DevExpress.Utils.PointFloat(0F, 360.2847F); + this.xrLabel30.Name = "xrLabel30"; + this.xrLabel30.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 96F); + this.xrLabel30.SizeF = new System.Drawing.SizeF(724.5001F, 23F); + this.xrLabel30.Text = "xrLabel30"; // // Spitzabrechnung // @@ -1047,5 +1060,6 @@ namespace HilfeDaheimHandInHand private DevExpress.XtraReports.UI.XRLabel xrLabel12; private DevExpress.XtraReports.UI.XRLabel xrLabel41; private DevExpress.XtraReports.UI.XRLabel xrLabel42; + private DevExpress.XtraReports.UI.XRLabel xrLabel30; } }