diff --git a/ReportImp/BhsSolingen/Quittierungsbeleg.Designer.cs b/ReportImp/BhsSolingen/Quittierungsbeleg.Designer.cs index 6f1598886..276ca4a3b 100644 --- a/ReportImp/BhsSolingen/Quittierungsbeleg.Designer.cs +++ b/ReportImp/BhsSolingen/Quittierungsbeleg.Designer.cs @@ -62,6 +62,7 @@ namespace BhsSolingen this.cellMinOhne12 = 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.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); @@ -85,7 +86,6 @@ namespace BhsSolingen this.lblGesamtFkMinuten = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); this.lblGesamtstunden = new DevExpress.XtraReports.UI.XRLabel(); this.lblUnterschriftKlient = new DevExpress.XtraReports.UI.XRLabel(); this.lblUnterschriftMitarbeiter = new DevExpress.XtraReports.UI.XRLabel(); @@ -119,18 +119,21 @@ namespace BhsSolingen this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel(); this.lblOhneFactor = new DevExpress.XtraReports.UI.XRLabel(); this.lblFachleistungInMinuten = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); + this.lblGesamtminuten = new DevExpress.XtraReports.UI.XRLabel(); this.lblLeistungInStd = new DevExpress.XtraReports.UI.XRLabel(); this.fieldKontaktArt = new DevExpress.XtraReports.UI.CalculatedField(); this.fieldFLS = new DevExpress.XtraReports.UI.CalculatedField(); - this.lblGesamtminuten = new DevExpress.XtraReports.UI.XRLabel(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell32 = new DevExpress.XtraReports.UI.XRTableCell(); + this.lblGesamtFkStunden = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel18 = 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 @@ -157,7 +160,7 @@ namespace BhsSolingen // this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrTable3}); - this.Detail1.HeightF = 20F; + this.Detail1.HeightF = 20.00001F; this.Detail1.Name = "Detail1"; this.Detail1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); this.Detail1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; @@ -173,7 +176,7 @@ namespace BhsSolingen this.xrTable3.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow6}); - this.xrTable3.SizeF = new System.Drawing.SizeF(705F, 20F); + this.xrTable3.SizeF = new System.Drawing.SizeF(705.0003F, 20.00001F); this.xrTable3.StylePriority.UseFont = false; this.xrTable3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; // @@ -186,6 +189,7 @@ namespace BhsSolingen this.xrTableCell2, this.xrTableCell15, this.xrTableCell12, + this.xrTableCell32, this.xrTableCell44, this.xrTableCell50}); this.xrTableRow6.Name = "xrTableRow6"; @@ -205,7 +209,7 @@ namespace BhsSolingen this.xrTableCell13.StylePriority.UseTextAlignment = false; this.xrTableCell13.Text = "xrTableCell13"; this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell13.Weight = 0.11994951833461227D; + this.xrTableCell13.Weight = 0.14159440135603518D; // // xrTableCell14 // @@ -219,7 +223,7 @@ namespace BhsSolingen this.xrTableCell14.StylePriority.UseTextAlignment = false; this.xrTableCell14.Text = "xrTableCell14"; this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell14.Weight = 0.094696981389528381D; + this.xrTableCell14.Weight = 0.090379549086655075D; // // xrTableCell10 // @@ -233,7 +237,7 @@ namespace BhsSolingen this.xrTableCell10.StylePriority.UseTextAlignment = false; this.xrTableCell10.Text = "xrTableCell10"; this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell10.Weight = 0.094696933224158855D; + this.xrTableCell10.Weight = 0.098413086032175384D; // // xrTableCell2 // @@ -245,7 +249,7 @@ namespace BhsSolingen this.xrTableCell2.StylePriority.UsePadding = false; this.xrTableCell2.StylePriority.UseTextAlignment = false; this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell2.Weight = 0.05366162346946534D; + this.xrTableCell2.Weight = 0.059750855499287735D; // // xrTableCell15 // @@ -258,7 +262,7 @@ namespace BhsSolingen this.xrTableCell15.StylePriority.UsePadding = false; this.xrTableCell15.StylePriority.UseTextAlignment = false; this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell15.Weight = 0.05366162346946534D; + this.xrTableCell15.Weight = 0.0597511611955525D; // // xrTableCell12 // @@ -271,7 +275,7 @@ namespace BhsSolingen this.xrTableCell12.StylePriority.UsePadding = false; this.xrTableCell12.StylePriority.UseTextAlignment = false; this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell12.Weight = 0.10732323052948757D; + this.xrTableCell12.Weight = 0.11247189847725865D; // // xrTableCell44 // @@ -283,7 +287,7 @@ namespace BhsSolingen this.xrTableCell44.StylePriority.UsePadding = false; this.xrTableCell44.StylePriority.UseTextAlignment = false; this.xrTableCell44.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell44.Weight = 0.15151514114890302D; + this.xrTableCell44.Weight = 0.10544284867902302D; // // xrTableCell50 // @@ -295,7 +299,7 @@ namespace BhsSolingen this.xrTableCell50.StylePriority.UsePadding = false; this.xrTableCell50.StylePriority.UseTextAlignment = false; this.xrTableCell50.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell50.Weight = 0.21464645290443832D; + this.xrTableCell50.Weight = 0.23900360258739634D; // // picSignature // @@ -304,7 +308,7 @@ namespace BhsSolingen new DevExpress.XtraReports.UI.XRBinding("Tag", null, "Services.Signature")}); this.picSignature.LocationFloat = new DevExpress.Utils.PointFloat(0.9999593F, 0.9999593F); this.picSignature.Name = "picSignature"; - this.picSignature.SizeF = new System.Drawing.SizeF(168F, 18F); + this.picSignature.SizeF = new System.Drawing.SizeF(165.9999F, 18F); this.picSignature.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; this.picSignature.StylePriority.UseBorders = false; this.picSignature.BeforePrint += new System.Drawing.Printing.PrintEventHandler(this.picSignature_BeforePrint); @@ -328,7 +332,7 @@ namespace BhsSolingen this.xrTableServiceRecords1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow2, this.xrTableRow1}); - this.xrTableServiceRecords1.SizeF = new System.Drawing.SizeF(705F, 70F); + this.xrTableServiceRecords1.SizeF = new System.Drawing.SizeF(704.9999F, 70F); this.xrTableServiceRecords1.StylePriority.UseBackColor = false; this.xrTableServiceRecords1.StylePriority.UseBorders = false; this.xrTableServiceRecords1.StylePriority.UseFont = false; @@ -341,6 +345,7 @@ namespace BhsSolingen this.xrTableCell4, this.xrTableCell11, this.cellFLSHeader, + this.xrTableCell7, this.xrTableCell28, this.xrTableCell48}); this.xrTableRow2.Name = "xrTableRow2"; @@ -377,7 +382,7 @@ namespace BhsSolingen this.xrTableCell4.StylePriority.UseTextAlignment = false; this.xrTableCell4.Text = "Uhrzeit"; this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter; - this.xrTableCell4.Weight = 0.41899441340782145D; + this.xrTableCell4.Weight = 0.35381760330147666D; // // xrTableCell11 // @@ -392,7 +397,7 @@ namespace BhsSolingen this.xrTableCell11.StylePriority.UseTextAlignment = false; this.xrTableCell11.Text = "Angebot"; this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter; - this.xrTableCell11.Weight = 0.23743016759776542D; + this.xrTableCell11.Weight = 0.2239592036574187D; // // cellFLSHeader // @@ -408,7 +413,7 @@ namespace BhsSolingen this.cellFLSHeader.StylePriority.UseTextAlignment = false; this.cellFLSHeader.Text = "FLS in"; this.cellFLSHeader.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter; - this.cellFLSHeader.Weight = 0.23743016759776536D; + this.cellFLSHeader.Weight = 0.21078476274045349D; // // xrTableCell28 // @@ -421,7 +426,7 @@ namespace BhsSolingen this.xrTableCell28.StylePriority.UseTextAlignment = false; this.xrTableCell28.Text = "Betreuerin /"; this.xrTableCell28.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter; - this.xrTableCell28.Weight = 0.33519553072625696D; + this.xrTableCell28.Weight = 0.19761086457791877D; // // xrTableCell48 // @@ -435,7 +440,7 @@ namespace BhsSolingen this.xrTableCell48.StylePriority.UseTextAlignment = false; this.xrTableCell48.Text = "Unterschrift"; this.xrTableCell48.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter; - this.xrTableCell48.Weight = 0.47486033519553084D; + this.xrTableCell48.Weight = 0.44791740780633049D; // // xrTableRow1 // @@ -445,6 +450,7 @@ namespace BhsSolingen this.xrTableCell5, this.xrTableCell6, this.cellMinOhne12, + this.xrTableCell9, this.xrTableCell43, this.xrTableCell49}); this.xrTableRow1.Name = "xrTableRow1"; @@ -470,7 +476,7 @@ namespace BhsSolingen this.xrTableCell8.StylePriority.UseTextAlignment = false; this.xrTableCell8.Text = "von"; this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell8.Weight = 0.20949720670391073D; + this.xrTableCell8.Weight = 0.16938093841633176D; // // xrTableCell5 // @@ -484,7 +490,7 @@ namespace BhsSolingen this.xrTableCell5.StylePriority.UseTextAlignment = false; this.xrTableCell5.Text = "bis"; this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell5.Weight = 0.2094972067039107D; + this.xrTableCell5.Weight = 0.18443664478312896D; // // xrTableCell6 // @@ -499,7 +505,7 @@ namespace BhsSolingen this.xrTableCell6.StylePriority.UseTextAlignment = false; this.xrTableCell6.Text = "Art /\r\nAnzahl\r\nKlienten"; this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell6.Weight = 0.23743016759776545D; + this.xrTableCell6.Weight = 0.22395960569773749D; // // cellMinOhne12 // @@ -515,7 +521,7 @@ namespace BhsSolingen this.cellMinOhne12.StylePriority.UseTextAlignment = false; this.cellMinOhne12.Text = "Minuten\r\n(ohne 1,2)"; this.cellMinOhne12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; - this.cellMinOhne12.Weight = 0.23743016759776536D; + this.cellMinOhne12.Weight = 0.21078436070013473D; // // xrTableCell43 // @@ -528,7 +534,7 @@ namespace BhsSolingen this.xrTableCell43.StylePriority.UseTextAlignment = false; this.xrTableCell43.Text = "Betreuer"; this.xrTableCell43.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; - this.xrTableCell43.Weight = 0.33519553072625696D; + this.xrTableCell43.Weight = 0.19761086457791877D; // // xrTableCell49 // @@ -542,7 +548,11 @@ namespace BhsSolingen this.xrTableCell49.StylePriority.UseTextAlignment = false; this.xrTableCell49.Text = "Klientin / Klient"; this.xrTableCell49.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; - this.xrTableCell49.Weight = 0.47486033519553084D; + this.xrTableCell49.Weight = 0.44791734750028267D; + // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); // // formattingRuleStartDate // @@ -778,11 +788,12 @@ namespace BhsSolingen // GroupFooter1 // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.lblGesamtFkStunden, + this.xrLabel18, this.xrLabel2, this.lblGesamtFkMinuten, this.xrLabel17, this.xrLabel1, - this.xrLabel11, this.lblGesamtstunden, this.lblUnterschriftKlient, this.lblUnterschriftMitarbeiter, @@ -796,38 +807,39 @@ namespace BhsSolingen this.xrLabel12, this.lblOhneFactor, this.lblFachleistungInMinuten, - this.xrLabel9, this.lblGesamtminuten, this.lblLeistungInStd}); - this.GroupFooter1.HeightF = 298.125F; + this.GroupFooter1.HeightF = 314.7917F; this.GroupFooter1.KeepTogether = true; this.GroupFooter1.Name = "GroupFooter1"; // // xrLabel2 // - this.xrLabel2.Borders = DevExpress.XtraPrinting.BorderSide.Right; + this.xrLabel2.Borders = DevExpress.XtraPrinting.BorderSide.None; this.xrLabel2.Font = new System.Drawing.Font("Arial", 10F); - this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(245.0003F, 59.99997F); + this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(245.0002F, 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(85F, 20F); + this.xrLabel2.SizeF = new System.Drawing.SizeF(74.99974F, 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.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrLabel2.Text = "davon:"; + this.xrLabel2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; // // lblGesamtFkMinuten // this.lblGesamtFkMinuten.BackColor = System.Drawing.Color.Gainsboro; - this.lblGesamtFkMinuten.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right) + this.lblGesamtFkMinuten.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.lblGesamtFkMinuten.Font = new System.Drawing.Font("Arial", 10F); - this.lblGesamtFkMinuten.LocationFloat = new DevExpress.Utils.PointFloat(330.0001F, 59.99997F); + this.lblGesamtFkMinuten.LocationFloat = new DevExpress.Utils.PointFloat(319.9999F, 59.99997F); this.lblGesamtFkMinuten.Name = "lblGesamtFkMinuten"; this.lblGesamtFkMinuten.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.lblGesamtFkMinuten.SizeF = new System.Drawing.SizeF(85F, 20F); + this.lblGesamtFkMinuten.SizeF = new System.Drawing.SizeF(80.00006F, 20F); this.lblGesamtFkMinuten.StylePriority.UseBackColor = false; this.lblGesamtFkMinuten.StylePriority.UseBorders = false; this.lblGesamtFkMinuten.StylePriority.UseFont = false; @@ -841,10 +853,10 @@ namespace BhsSolingen this.xrLabel17.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrLabel17.Font = new System.Drawing.Font("Arial", 10F); - this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(415F, 59.99997F); + this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(399.9999F, 59.99997F); this.xrLabel17.Name = "xrLabel17"; this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.xrLabel17.SizeF = new System.Drawing.SizeF(290F, 20F); + this.xrLabel17.SizeF = new System.Drawing.SizeF(305.0001F, 20F); this.xrLabel17.StylePriority.UseBackColor = false; this.xrLabel17.StylePriority.UseBorders = false; this.xrLabel17.StylePriority.UseFont = false; @@ -865,33 +877,19 @@ namespace BhsSolingen this.xrLabel1.StylePriority.UseFont = false; this.xrLabel1.StylePriority.UsePadding = false; this.xrLabel1.StylePriority.UseTextAlignment = false; - this.xrLabel1.Text = "F = Fehlkontakt"; + this.xrLabel1.Text = "FK = Fehlkontakt"; this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; // - // xrLabel11 - // - this.xrLabel11.Borders = DevExpress.XtraPrinting.BorderSide.Right; - this.xrLabel11.Font = new System.Drawing.Font("Arial", 10F); - this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(245.0002F, 19.99995F); - this.xrLabel11.Name = "xrLabel11"; - this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.xrLabel11.SizeF = new System.Drawing.SizeF(85F, 20F); - this.xrLabel11.StylePriority.UseBackColor = false; - this.xrLabel11.StylePriority.UseBorders = false; - this.xrLabel11.StylePriority.UseFont = false; - this.xrLabel11.StylePriority.UsePadding = false; - this.xrLabel11.StylePriority.UseTextAlignment = false; - this.xrLabel11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - // // lblGesamtstunden // this.lblGesamtstunden.BackColor = System.Drawing.Color.Gainsboro; - this.lblGesamtstunden.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.lblGesamtstunden.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); this.lblGesamtstunden.Font = new System.Drawing.Font("Arial", 10F); - this.lblGesamtstunden.LocationFloat = new DevExpress.Utils.PointFloat(330F, 20F); + this.lblGesamtstunden.LocationFloat = new DevExpress.Utils.PointFloat(319.9999F, 20.00001F); this.lblGesamtstunden.Name = "lblGesamtstunden"; this.lblGesamtstunden.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.lblGesamtstunden.SizeF = new System.Drawing.SizeF(85F, 20F); + this.lblGesamtstunden.SizeF = new System.Drawing.SizeF(80.00006F, 20F); this.lblGesamtstunden.StylePriority.UseBackColor = false; this.lblGesamtstunden.StylePriority.UseBorders = false; this.lblGesamtstunden.StylePriority.UseFont = false; @@ -903,7 +901,7 @@ namespace BhsSolingen // this.lblUnterschriftKlient.Borders = DevExpress.XtraPrinting.BorderSide.Top; this.lblUnterschriftKlient.Font = new System.Drawing.Font("Arial", 10F); - this.lblUnterschriftKlient.LocationFloat = new DevExpress.Utils.PointFloat(66.99603F, 278.125F); + this.lblUnterschriftKlient.LocationFloat = new DevExpress.Utils.PointFloat(66.996F, 294.7917F); 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); @@ -919,7 +917,7 @@ namespace BhsSolingen // this.lblUnterschriftMitarbeiter.Borders = DevExpress.XtraPrinting.BorderSide.Top; this.lblUnterschriftMitarbeiter.Font = new System.Drawing.Font("Arial", 10F); - this.lblUnterschriftMitarbeiter.LocationFloat = new DevExpress.Utils.PointFloat(370.3057F, 278.125F); + this.lblUnterschriftMitarbeiter.LocationFloat = new DevExpress.Utils.PointFloat(370.3056F, 294.7917F); 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); @@ -938,7 +936,7 @@ namespace BhsSolingen | 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(170.0002F, 107.2917F); + this.xrTableAbwesenheiten.LocationFloat = new DevExpress.Utils.PointFloat(170.0002F, 123.9583F); 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[] { @@ -1149,7 +1147,7 @@ namespace BhsSolingen | 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.1389F, 157.2917F); + this.lblHatAbwesenheiten.LocationFloat = new DevExpress.Utils.PointFloat(435.1388F, 173.9583F); 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); @@ -1166,7 +1164,7 @@ namespace BhsSolingen | 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.1389F, 107.2917F); + this.lblHatGruppen.LocationFloat = new DevExpress.Utils.PointFloat(435.1388F, 123.9583F); 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); @@ -1180,7 +1178,7 @@ namespace BhsSolingen // xrRichText2 // this.xrRichText2.Font = new System.Drawing.Font("Arial", 8F); - this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(474.4719F, 157.2917F); + this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(474.4718F, 173.9583F); this.xrRichText2.Name = "xrRichText2"; this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString"); this.xrRichText2.SizeF = new System.Drawing.SizeF(232.5282F, 68.05556F); @@ -1189,7 +1187,7 @@ namespace BhsSolingen // xrRichText1 // this.xrRichText1.Font = new System.Drawing.Font("Arial", 8F); - this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(474.4719F, 107.2917F); + this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(474.4718F, 123.9583F); this.xrRichText1.Name = "xrRichText1"; this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString"); this.xrRichText1.SizeF = new System.Drawing.SizeF(232.5283F, 50F); @@ -1198,7 +1196,7 @@ namespace BhsSolingen // xrLabel15 // this.xrLabel15.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Underline); - this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(3.178914E-05F, 107.2917F); + this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0F, 123.9583F); this.xrLabel15.Multiline = true; this.xrLabel15.Name = "xrLabel15"; this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); @@ -1244,9 +1242,9 @@ namespace BhsSolingen // lblOhneFactor // this.lblOhneFactor.Font = new System.Drawing.Font("Arial", 8F); - this.lblOhneFactor.LocationFloat = new DevExpress.Utils.PointFloat(414.9996F, 39.99996F); + this.lblOhneFactor.LocationFloat = new DevExpress.Utils.PointFloat(399.9996F, 39.99996F); this.lblOhneFactor.Name = "lblOhneFactor"; - this.lblOhneFactor.SizeF = new System.Drawing.SizeF(290.0007F, 20F); + this.lblOhneFactor.SizeF = new System.Drawing.SizeF(305.0007F, 20F); this.lblOhneFactor.StylePriority.UseBackColor = false; this.lblOhneFactor.StylePriority.UseBorders = false; this.lblOhneFactor.StylePriority.UseFont = false; @@ -1260,10 +1258,10 @@ namespace BhsSolingen this.lblFachleistungInMinuten.BackColor = System.Drawing.Color.Gainsboro; this.lblFachleistungInMinuten.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom))); this.lblFachleistungInMinuten.Font = new System.Drawing.Font("Arial", 10F); - this.lblFachleistungInMinuten.LocationFloat = new DevExpress.Utils.PointFloat(415.0002F, 0F); + this.lblFachleistungInMinuten.LocationFloat = new DevExpress.Utils.PointFloat(400.0001F, 0F); this.lblFachleistungInMinuten.Name = "lblFachleistungInMinuten"; this.lblFachleistungInMinuten.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.lblFachleistungInMinuten.SizeF = new System.Drawing.SizeF(290F, 20F); + this.lblFachleistungInMinuten.SizeF = new System.Drawing.SizeF(305.0001F, 20F); this.lblFachleistungInMinuten.StylePriority.UseBackColor = false; this.lblFachleistungInMinuten.StylePriority.UseBorders = false; this.lblFachleistungInMinuten.StylePriority.UseFont = false; @@ -1272,30 +1270,32 @@ namespace BhsSolingen this.lblFachleistungInMinuten.Text = "Fachleistungen in Minuten"; this.lblFachleistungInMinuten.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; // - // xrLabel9 + // lblGesamtminuten // - this.xrLabel9.Borders = DevExpress.XtraPrinting.BorderSide.Right; - this.xrLabel9.Font = new System.Drawing.Font("Arial", 10F); - this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(245F, 0F); - this.xrLabel9.Name = "xrLabel9"; - this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.xrLabel9.SizeF = new System.Drawing.SizeF(85F, 20F); - this.xrLabel9.StylePriority.UseBackColor = false; - this.xrLabel9.StylePriority.UseBorders = false; - this.xrLabel9.StylePriority.UseFont = false; - this.xrLabel9.StylePriority.UsePadding = false; - this.xrLabel9.StylePriority.UseTextAlignment = false; - this.xrLabel9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.lblGesamtminuten.BackColor = System.Drawing.Color.Gainsboro; + this.lblGesamtminuten.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.lblGesamtminuten.Font = new System.Drawing.Font("Arial", 10F); + this.lblGesamtminuten.LocationFloat = new DevExpress.Utils.PointFloat(319.9999F, 0F); + this.lblGesamtminuten.Name = "lblGesamtminuten"; + this.lblGesamtminuten.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); + this.lblGesamtminuten.SizeF = new System.Drawing.SizeF(80.00006F, 20F); + this.lblGesamtminuten.StylePriority.UseBackColor = false; + this.lblGesamtminuten.StylePriority.UseBorders = false; + this.lblGesamtminuten.StylePriority.UseFont = false; + this.lblGesamtminuten.StylePriority.UsePadding = false; + this.lblGesamtminuten.StylePriority.UseTextAlignment = false; + this.lblGesamtminuten.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; // // lblLeistungInStd // this.lblLeistungInStd.BackColor = System.Drawing.Color.Gainsboro; this.lblLeistungInStd.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom))); this.lblLeistungInStd.Font = new System.Drawing.Font("Arial", 10F); - this.lblLeistungInStd.LocationFloat = new DevExpress.Utils.PointFloat(415F, 20F); + this.lblLeistungInStd.LocationFloat = new DevExpress.Utils.PointFloat(399.9999F, 20.00001F); this.lblLeistungInStd.Name = "lblLeistungInStd"; this.lblLeistungInStd.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.lblLeistungInStd.SizeF = new System.Drawing.SizeF(290F, 20F); + this.lblLeistungInStd.SizeF = new System.Drawing.SizeF(305.0001F, 20F); this.lblLeistungInStd.StylePriority.UseBackColor = false; this.lblLeistungInStd.StylePriority.UseBorders = false; this.lblLeistungInStd.StylePriority.UseFont = false; @@ -1317,25 +1317,80 @@ namespace BhsSolingen this.fieldFLS.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; this.fieldFLS.Name = "fieldFLS"; // - // lblGesamtminuten + // xrTableCell7 // - this.lblGesamtminuten.BackColor = System.Drawing.Color.Gainsboro; - this.lblGesamtminuten.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.lblGesamtminuten.Font = new System.Drawing.Font("Arial", 10F); - this.lblGesamtminuten.LocationFloat = new DevExpress.Utils.PointFloat(330F, 0F); - this.lblGesamtminuten.Name = "lblGesamtminuten"; - this.lblGesamtminuten.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.lblGesamtminuten.SizeF = new System.Drawing.SizeF(85F, 20F); - this.lblGesamtminuten.StylePriority.UseBackColor = false; - this.lblGesamtminuten.StylePriority.UseBorders = false; - this.lblGesamtminuten.StylePriority.UseFont = false; - this.lblGesamtminuten.StylePriority.UsePadding = false; - this.lblGesamtminuten.StylePriority.UseTextAlignment = false; - this.lblGesamtminuten.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell7.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTableCell7.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell7.Name = "xrTableCell7"; + this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); + this.xrTableCell7.StylePriority.UseBorders = false; + this.xrTableCell7.StylePriority.UseFont = false; + this.xrTableCell7.StylePriority.UsePadding = false; + this.xrTableCell7.StylePriority.UseTextAlignment = false; + this.xrTableCell7.Text = "FK in"; + this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter; + this.xrTableCell7.Weight = 0.15808892886612297D; // - // bindingSource1 + // xrTableCell9 // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); + this.xrTableCell9.BackColor = System.Drawing.Color.Gainsboro; + this.xrTableCell9.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell9.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell9.Name = "xrTableCell9"; + this.xrTableCell9.StylePriority.UseBackColor = false; + this.xrTableCell9.StylePriority.UseBorders = false; + this.xrTableCell9.StylePriority.UseFont = false; + this.xrTableCell9.StylePriority.UseTextAlignment = false; + this.xrTableCell9.Text = "Minuten"; + this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.xrTableCell9.Weight = 0.15808900927418676D; + // + // xrTableCell32 + // + this.xrTableCell32.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice4")}); + this.xrTableCell32.Font = new System.Drawing.Font("Arial", 10F); + this.xrTableCell32.Name = "xrTableCell32"; + this.xrTableCell32.StylePriority.UseFont = false; + this.xrTableCell32.StylePriority.UseTextAlignment = false; + this.xrTableCell32.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell32.Weight = 0.084354277913376824D; + // + // lblGesamtFkStunden + // + this.lblGesamtFkStunden.BackColor = System.Drawing.Color.Gainsboro; + this.lblGesamtFkStunden.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.lblGesamtFkStunden.Font = new System.Drawing.Font("Arial", 10F); + this.lblGesamtFkStunden.LocationFloat = new DevExpress.Utils.PointFloat(319.9999F, 79.99998F); + this.lblGesamtFkStunden.Name = "lblGesamtFkStunden"; + this.lblGesamtFkStunden.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); + this.lblGesamtFkStunden.SizeF = new System.Drawing.SizeF(80.00006F, 20F); + this.lblGesamtFkStunden.StylePriority.UseBackColor = false; + this.lblGesamtFkStunden.StylePriority.UseBorders = false; + this.lblGesamtFkStunden.StylePriority.UseFont = false; + this.lblGesamtFkStunden.StylePriority.UsePadding = false; + this.lblGesamtFkStunden.StylePriority.UseTextAlignment = false; + this.lblGesamtFkStunden.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + // + // xrLabel18 + // + this.xrLabel18.BackColor = System.Drawing.Color.Gainsboro; + this.xrLabel18.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrLabel18.Font = new System.Drawing.Font("Arial", 10F); + this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(399.9999F, 79.99998F); + this.xrLabel18.Name = "xrLabel18"; + this.xrLabel18.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); + this.xrLabel18.SizeF = new System.Drawing.SizeF(305.0001F, 20F); + this.xrLabel18.StylePriority.UseBackColor = false; + this.xrLabel18.StylePriority.UseBorders = false; + this.xrLabel18.StylePriority.UseFont = false; + this.xrLabel18.StylePriority.UsePadding = false; + this.xrLabel18.StylePriority.UseTextAlignment = false; + this.xrLabel18.Text = "Fehlkontakte in Stunden"; + this.xrLabel18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; // // Quittierungsbeleg // @@ -1363,10 +1418,10 @@ namespace BhsSolingen 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(); } @@ -1422,7 +1477,6 @@ namespace BhsSolingen private DevExpress.XtraReports.UI.CalculatedField fieldKontaktArt; private DevExpress.XtraReports.UI.XRLabel lblOhneFactor; private DevExpress.XtraReports.UI.XRLabel lblFachleistungInMinuten; - private DevExpress.XtraReports.UI.XRLabel xrLabel9; private DevExpress.XtraReports.UI.XRLabel xrLabel13; private DevExpress.XtraReports.UI.XRLabel xrLabel12; private DevExpress.XtraReports.UI.XRLabel xrLabel15; @@ -1457,7 +1511,6 @@ namespace BhsSolingen private DevExpress.XtraReports.UI.XRLabel xrLabel16; private DevExpress.XtraReports.UI.XRLabel lblGesamtstunden; private DevExpress.XtraReports.UI.XRLabel lblLeistungInStd; - private DevExpress.XtraReports.UI.XRLabel xrLabel11; private DevExpress.XtraReports.UI.CalculatedField fieldFLS; private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1; private DevExpress.XtraReports.UI.XRLabel xrLabel10; @@ -1467,5 +1520,10 @@ namespace BhsSolingen private DevExpress.XtraReports.UI.XRLabel lblGesamtFkMinuten; private DevExpress.XtraReports.UI.XRLabel xrLabel17; private DevExpress.XtraReports.UI.XRLabel lblGesamtminuten; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell32; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell7; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell9; + private DevExpress.XtraReports.UI.XRLabel lblGesamtFkStunden; + private DevExpress.XtraReports.UI.XRLabel xrLabel18; } } diff --git a/ReportImp/BhsSolingen/Quittierungsbeleg.cs b/ReportImp/BhsSolingen/Quittierungsbeleg.cs index 3f7fc48da..f14994168 100644 --- a/ReportImp/BhsSolingen/Quittierungsbeleg.cs +++ b/ReportImp/BhsSolingen/Quittierungsbeleg.cs @@ -41,7 +41,9 @@ namespace BhsSolingen sd.Notice5 = "E"; if (sd.ServiceDescription.ToLower().Contains("fehlkontakt") || sd.ServiceCategory.ToLower().Contains("fehlkontakt")) { - sd.Notice5 = "F"; + sd.Notice5 = "FK"; + sd.Notice4 = string.Format("{0:0}", sd.Minutes); + flMinutes += sd.Minutes; fkMinutes += sd.Minutes; } else @@ -76,6 +78,7 @@ namespace BhsSolingen lblGesamtminuten.Text = string.Format("{0:0.##}", flMinutes); lblGesamtstunden.Text = string.Format("{0:0.00}", flMinutes / 60); lblGesamtFkMinuten.Text = string.Format("{0:0.##}", fkMinutes); + lblGesamtFkStunden.Text = string.Format("{0:0.00}", fkMinutes / 60); if (String.IsNullOrWhiteSpace(pRO.AbsenceTimes)) {