diff --git a/ReportImp/KcmGmbH/Quittierungsbeleg.Designer.cs b/ReportImp/KcmGmbH/Quittierungsbeleg.Designer.cs index 7aeb3f140..719fedff7 100644 --- a/ReportImp/KcmGmbH/Quittierungsbeleg.Designer.cs +++ b/ReportImp/KcmGmbH/Quittierungsbeleg.Designer.cs @@ -42,8 +42,6 @@ namespace KcmGmbH this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell33 = new DevExpress.XtraReports.UI.XRTableCell(); - this.picSignature = new DevExpress.XtraReports.UI.XRPictureBox(); this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); this.xrTableServiceRecords1 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow(); @@ -51,15 +49,12 @@ namespace KcmGmbH this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell32 = 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.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox(); @@ -79,8 +74,10 @@ namespace KcmGmbH this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.xrPictureBox2 = new DevExpress.XtraReports.UI.XRPictureBox(); + this.xrPictureBox3 = new DevExpress.XtraReports.UI.XRPictureBox(); this.xrLabel19 = new DevExpress.XtraReports.UI.XRLabel(); this.lblUnterschriftMitarbeiter = new DevExpress.XtraReports.UI.XRLabel(); + this.lblUnterschriftKlient = new DevExpress.XtraReports.UI.XRLabel(); this.xrTableAbwesenheiten = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -114,12 +111,17 @@ namespace KcmGmbH this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); this.fieldKontaktArt = new DevExpress.XtraReports.UI.CalculatedField(); + this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell32 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell33 = new DevExpress.XtraReports.UI.XRTableCell(); + this.picSignature = new DevExpress.XtraReports.UI.XRPictureBox(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((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 @@ -254,31 +256,6 @@ namespace KcmGmbH this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; this.xrTableCell12.Weight = 0.13129476520915889D; // - // xrTableCell33 - // - this.xrTableCell33.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.picSignature}); - this.xrTableCell33.Multiline = true; - this.xrTableCell33.Name = "xrTableCell33"; - this.xrTableCell33.StylePriority.UseBorders = false; - this.xrTableCell33.StylePriority.UseFont = false; - this.xrTableCell33.StylePriority.UsePadding = false; - this.xrTableCell33.StylePriority.UseTextAlignment = false; - this.xrTableCell33.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell33.Weight = 0.17173553421372628D; - // - // picSignature - // - this.picSignature.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.picSignature.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Tag", null, "Services.Signature")}); - this.picSignature.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); - this.picSignature.Name = "picSignature"; - this.picSignature.SizeF = new System.Drawing.SizeF(160F, 20F); - this.picSignature.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; - this.picSignature.StylePriority.UseBorders = false; - this.picSignature.BeforePrint += new DevExpress.XtraReports.UI.BeforePrintEventHandler(this.picSignature_BeforePrint); - // // GroupHeader1 // this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { @@ -382,23 +359,6 @@ namespace KcmGmbH this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter; this.xrTableCell9.Weight = 0.29047118785039627D; // - // xrTableCell28 - // - this.xrTableCell28.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right))); - this.xrTableCell28.Font = new DevExpress.Drawing.DXFont("Calibri", 11F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { - new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); - this.xrTableCell28.Multiline = true; - this.xrTableCell28.Name = "xrTableCell28"; - this.xrTableCell28.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.xrTableCell28.StylePriority.UseBorders = false; - this.xrTableCell28.StylePriority.UseFont = false; - this.xrTableCell28.StylePriority.UsePadding = false; - this.xrTableCell28.StylePriority.UseTextAlignment = false; - this.xrTableCell28.Text = "Unterschrift"; - this.xrTableCell28.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter; - this.xrTableCell28.Weight = 0.37991987360211765D; - // // xrTableRow1 // this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { @@ -482,26 +442,6 @@ namespace KcmGmbH this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; this.xrTableCell7.Weight = 0.29047115161857495D; // - // xrTableCell32 - // - this.xrTableCell32.BackColor = System.Drawing.Color.Gainsboro; - this.xrTableCell32.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell32.Font = new DevExpress.Drawing.DXFont("Calibri", 11F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { - new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); - this.xrTableCell32.Multiline = true; - this.xrTableCell32.Name = "xrTableCell32"; - this.xrTableCell32.StylePriority.UseBackColor = false; - this.xrTableCell32.StylePriority.UseBorders = false; - this.xrTableCell32.StylePriority.UseFont = false; - this.xrTableCell32.StylePriority.UseTextAlignment = false; - this.xrTableCell32.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; - this.xrTableCell32.Weight = 0.37991990983393908D; - // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); - // // formattingRuleStartDate // this.formattingRuleStartDate.Condition = "[StartDate2] < [StartDate]"; @@ -722,8 +662,10 @@ namespace KcmGmbH // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrPictureBox2, + this.xrPictureBox3, this.xrLabel19, this.lblUnterschriftMitarbeiter, + this.lblUnterschriftKlient, this.xrTableAbwesenheiten, this.lblHatAbwesenheiten, this.lblHatGruppen, @@ -750,6 +692,15 @@ namespace KcmGmbH this.xrPictureBox2.SizeF = new System.Drawing.SizeF(270.8491F, 51.94455F); this.xrPictureBox2.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; // + // xrPictureBox3 + // + this.xrPictureBox3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("ImageSource", null, "CustomerSignature")}); + this.xrPictureBox3.LocationFloat = new DevExpress.Utils.PointFloat(108.0692F, 222.8334F); + this.xrPictureBox3.Name = "xrPictureBox3"; + this.xrPictureBox3.SizeF = new System.Drawing.SizeF(271.2919F, 53.20844F); + this.xrPictureBox3.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; + // // xrLabel19 // this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(0F, 61.99992F); @@ -780,6 +731,22 @@ namespace KcmGmbH this.lblUnterschriftMitarbeiter.Text = "Datum, verantwortliche/r Mitarbeiter/in"; this.lblUnterschriftMitarbeiter.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; // + // lblUnterschriftKlient + // + this.lblUnterschriftKlient.Borders = DevExpress.XtraPrinting.BorderSide.Top; + this.lblUnterschriftKlient.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.lblUnterschriftKlient.LocationFloat = new DevExpress.Utils.PointFloat(61.36096F, 276.0417F); + this.lblUnterschriftKlient.Name = "lblUnterschriftKlient"; + this.lblUnterschriftKlient.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); + this.lblUnterschriftKlient.SizeF = new System.Drawing.SizeF(336.6944F, 20F); + this.lblUnterschriftKlient.StylePriority.UseBackColor = false; + this.lblUnterschriftKlient.StylePriority.UseBorders = false; + this.lblUnterschriftKlient.StylePriority.UseFont = false; + this.lblUnterschriftKlient.StylePriority.UsePadding = false; + this.lblUnterschriftKlient.StylePriority.UseTextAlignment = false; + this.lblUnterschriftKlient.Text = "Datum, Unterschrift Klient/in"; + this.lblUnterschriftKlient.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + // // xrTableAbwesenheiten // this.xrTableAbwesenheiten.BorderColor = System.Drawing.Color.Black; @@ -1174,6 +1141,68 @@ namespace KcmGmbH this.fieldKontaktArt.FieldType = DevExpress.XtraReports.UI.FieldType.String; this.fieldKontaktArt.Name = "fieldKontaktArt"; // + // xrTableCell28 + // + this.xrTableCell28.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTableCell28.Font = new DevExpress.Drawing.DXFont("Calibri", 11F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); + this.xrTableCell28.Multiline = true; + this.xrTableCell28.Name = "xrTableCell28"; + this.xrTableCell28.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); + this.xrTableCell28.StylePriority.UseBorders = false; + this.xrTableCell28.StylePriority.UseFont = false; + this.xrTableCell28.StylePriority.UsePadding = false; + this.xrTableCell28.StylePriority.UseTextAlignment = false; + this.xrTableCell28.Text = "Unterschrift"; + this.xrTableCell28.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter; + this.xrTableCell28.Weight = 0.37991987360211765D; + // + // xrTableCell32 + // + this.xrTableCell32.BackColor = System.Drawing.Color.Gainsboro; + this.xrTableCell32.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell32.Font = new DevExpress.Drawing.DXFont("Calibri", 11F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); + this.xrTableCell32.Multiline = true; + this.xrTableCell32.Name = "xrTableCell32"; + this.xrTableCell32.StylePriority.UseBackColor = false; + this.xrTableCell32.StylePriority.UseBorders = false; + this.xrTableCell32.StylePriority.UseFont = false; + this.xrTableCell32.StylePriority.UseTextAlignment = false; + this.xrTableCell32.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.xrTableCell32.Weight = 0.37991990983393908D; + // + // xrTableCell33 + // + this.xrTableCell33.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.picSignature}); + this.xrTableCell33.Multiline = true; + this.xrTableCell33.Name = "xrTableCell33"; + this.xrTableCell33.StylePriority.UseBorders = false; + this.xrTableCell33.StylePriority.UseFont = false; + this.xrTableCell33.StylePriority.UsePadding = false; + this.xrTableCell33.StylePriority.UseTextAlignment = false; + this.xrTableCell33.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell33.Weight = 0.17173553421372628D; + // + // picSignature + // + this.picSignature.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.picSignature.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Tag", null, "Services.Signature")}); + this.picSignature.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.picSignature.Name = "picSignature"; + this.picSignature.SizeF = new System.Drawing.SizeF(160F, 20F); + this.picSignature.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; + this.picSignature.StylePriority.UseBorders = false; + this.picSignature.BeforePrint += new DevExpress.XtraReports.UI.BeforePrintEventHandler(this.picSignature_BeforePrint); + // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); + // // Quittierungsbeleg // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -1200,10 +1229,10 @@ namespace KcmGmbH this.Version = "23.2"; ((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(); } @@ -1287,8 +1316,10 @@ namespace KcmGmbH private DevExpress.XtraReports.UI.XRLabel xrLabel16; private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1; private DevExpress.XtraReports.UI.XRLabel lblUnterschriftMitarbeiter; + private DevExpress.XtraReports.UI.XRLabel lblUnterschriftKlient; private DevExpress.XtraReports.UI.XRLabel xrLabel19; private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox2; + private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox3; private DevExpress.XtraReports.UI.XRTableCell xrTableCell33; private DevExpress.XtraReports.UI.XRTableCell xrTableCell28; private DevExpress.XtraReports.UI.XRTableCell xrTableCell32; diff --git a/ReportImp/KcmGmbH/Quittierungsbeleg.cs b/ReportImp/KcmGmbH/Quittierungsbeleg.cs index 62081a9a5..724fb34d8 100644 --- a/ReportImp/KcmGmbH/Quittierungsbeleg.cs +++ b/ReportImp/KcmGmbH/Quittierungsbeleg.cs @@ -107,6 +107,7 @@ namespace KcmGmbH if (newRows > 0) { + lblUnterschriftKlient.Top += newRows * 20; lblUnterschriftMitarbeiter.Top += newRows * 20; } } diff --git a/ReportImp/KcmGmbH/QuittierungsbelegAssistenz.Designer.cs b/ReportImp/KcmGmbH/QuittierungsbelegAssistenz.Designer.cs index 91022a16a..20801425c 100644 --- a/ReportImp/KcmGmbH/QuittierungsbelegAssistenz.Designer.cs +++ b/ReportImp/KcmGmbH/QuittierungsbelegAssistenz.Designer.cs @@ -42,8 +42,6 @@ namespace KcmGmbH this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell33 = new DevExpress.XtraReports.UI.XRTableCell(); - this.picSignature = new DevExpress.XtraReports.UI.XRPictureBox(); this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); this.xrTableServiceRecords1 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow(); @@ -51,14 +49,12 @@ namespace KcmGmbH this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell32 = 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(); @@ -78,9 +74,10 @@ namespace KcmGmbH this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); - this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); this.xrPictureBox2 = new DevExpress.XtraReports.UI.XRPictureBox(); + this.xrPictureBox3 = new DevExpress.XtraReports.UI.XRPictureBox(); this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); + this.lblUnterschriftKlient = new DevExpress.XtraReports.UI.XRLabel(); this.lblUnterschriftMitarbeiter = new DevExpress.XtraReports.UI.XRLabel(); this.xrTableAbwesenheiten = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow(); @@ -113,6 +110,11 @@ namespace KcmGmbH this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); this.fieldKontaktArt = new DevExpress.XtraReports.UI.CalculatedField(); + this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell32 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell33 = new DevExpress.XtraReports.UI.XRTableCell(); + this.picSignature = new DevExpress.XtraReports.UI.XRPictureBox(); + this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); @@ -253,30 +255,6 @@ namespace KcmGmbH this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; this.xrTableCell12.Weight = 0.13129483071921969D; // - // xrTableCell33 - // - this.xrTableCell33.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.picSignature}); - this.xrTableCell33.Multiline = true; - this.xrTableCell33.Name = "xrTableCell33"; - this.xrTableCell33.StylePriority.UseBorders = false; - this.xrTableCell33.StylePriority.UseFont = false; - this.xrTableCell33.StylePriority.UsePadding = false; - this.xrTableCell33.StylePriority.UseTextAlignment = false; - this.xrTableCell33.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell33.Weight = 0.17173546870366549D; - // - // picSignature - // - this.picSignature.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.picSignature.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Tag", null, "Services.Signature")}); - this.picSignature.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); - this.picSignature.Name = "picSignature"; - this.picSignature.SizeF = new System.Drawing.SizeF(160F, 20F); - this.picSignature.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; - this.picSignature.StylePriority.UseBorders = false; - // // GroupHeader1 // this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { @@ -380,23 +358,6 @@ namespace KcmGmbH this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter; this.xrTableCell9.Weight = 0.29046245598145243D; // - // xrTableCell28 - // - this.xrTableCell28.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right))); - this.xrTableCell28.Font = new DevExpress.Drawing.DXFont("Calibri", 11F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { - new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); - this.xrTableCell28.Multiline = true; - this.xrTableCell28.Name = "xrTableCell28"; - this.xrTableCell28.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.xrTableCell28.StylePriority.UseBorders = false; - this.xrTableCell28.StylePriority.UseFont = false; - this.xrTableCell28.StylePriority.UsePadding = false; - this.xrTableCell28.StylePriority.UseTextAlignment = false; - this.xrTableCell28.Text = "Unterschrift"; - this.xrTableCell28.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter; - this.xrTableCell28.Weight = 0.3799286054710615D; - // // xrTableRow1 // this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { @@ -479,22 +440,6 @@ namespace KcmGmbH this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; this.xrTableCell7.Weight = 0.29046231105416709D; // - // xrTableCell32 - // - this.xrTableCell32.BackColor = System.Drawing.Color.Gainsboro; - this.xrTableCell32.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell32.Font = new DevExpress.Drawing.DXFont("Calibri", 11F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { - new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); - this.xrTableCell32.Multiline = true; - this.xrTableCell32.Name = "xrTableCell32"; - this.xrTableCell32.StylePriority.UseBackColor = false; - this.xrTableCell32.StylePriority.UseBorders = false; - this.xrTableCell32.StylePriority.UseFont = false; - this.xrTableCell32.StylePriority.UseTextAlignment = false; - this.xrTableCell32.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; - this.xrTableCell32.Weight = 0.37992875039834695D; - // // bindingSource1 // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); @@ -720,7 +665,9 @@ namespace KcmGmbH this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrLabel9, this.xrPictureBox2, + this.xrPictureBox3, this.xrLabel11, + this.lblUnterschriftKlient, this.lblUnterschriftMitarbeiter, this.xrTableAbwesenheiten, this.lblHatAbwesenheiten, @@ -737,21 +684,6 @@ namespace KcmGmbH this.GroupFooter1.Name = "GroupFooter1"; this.GroupFooter1.BeforePrint += new DevExpress.XtraReports.UI.BeforePrintEventHandler(this.picSignature_BeforePrint); // - // xrLabel9 - // - this.xrLabel9.Borders = DevExpress.XtraPrinting.BorderSide.Right; - this.xrLabel9.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(89.61531F, 0F); - this.xrLabel9.Name = "xrLabel9"; - this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.xrLabel9.SizeF = new System.Drawing.SizeF(110.3689F, 21.99999F); - 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; - // // xrPictureBox2 // this.xrPictureBox2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { @@ -762,6 +694,15 @@ namespace KcmGmbH this.xrPictureBox2.SizeF = new System.Drawing.SizeF(173.3194F, 35.50002F); this.xrPictureBox2.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; // + // xrPictureBox3 + // + this.xrPictureBox3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("ImageSource", null, "CustomerSignature")}); + this.xrPictureBox3.LocationFloat = new DevExpress.Utils.PointFloat(202.9418F, 236.375F); + this.xrPictureBox3.Name = "xrPictureBox3"; + this.xrPictureBox3.SizeF = new System.Drawing.SizeF(181.6528F, 35.50002F); + this.xrPictureBox3.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; + // // xrLabel11 // this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(0F, 65.20831F); @@ -776,6 +717,22 @@ namespace KcmGmbH this.xrLabel11.Text = "F = Fehlkontakt"; this.xrLabel11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; // + // lblUnterschriftKlient + // + this.lblUnterschriftKlient.Borders = DevExpress.XtraPrinting.BorderSide.Top; + this.lblUnterschriftKlient.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.lblUnterschriftKlient.LocationFloat = new DevExpress.Utils.PointFloat(61.36096F, 271.875F); + this.lblUnterschriftKlient.Name = "lblUnterschriftKlient"; + this.lblUnterschriftKlient.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); + this.lblUnterschriftKlient.SizeF = new System.Drawing.SizeF(336.6944F, 20F); + this.lblUnterschriftKlient.StylePriority.UseBackColor = false; + this.lblUnterschriftKlient.StylePriority.UseBorders = false; + this.lblUnterschriftKlient.StylePriority.UseFont = false; + this.lblUnterschriftKlient.StylePriority.UsePadding = false; + this.lblUnterschriftKlient.StylePriority.UseTextAlignment = false; + this.lblUnterschriftKlient.Text = "Datum, Unterschrift Klient/in"; + this.lblUnterschriftKlient.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + // // lblUnterschriftMitarbeiter // this.lblUnterschriftMitarbeiter.Borders = DevExpress.XtraPrinting.BorderSide.Top; @@ -1156,6 +1113,78 @@ namespace KcmGmbH this.fieldKontaktArt.FieldType = DevExpress.XtraReports.UI.FieldType.String; this.fieldKontaktArt.Name = "fieldKontaktArt"; // + // xrTableCell28 + // + this.xrTableCell28.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTableCell28.Font = new DevExpress.Drawing.DXFont("Calibri", 11F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); + this.xrTableCell28.Multiline = true; + this.xrTableCell28.Name = "xrTableCell28"; + this.xrTableCell28.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); + this.xrTableCell28.StylePriority.UseBorders = false; + this.xrTableCell28.StylePriority.UseFont = false; + this.xrTableCell28.StylePriority.UsePadding = false; + this.xrTableCell28.StylePriority.UseTextAlignment = false; + this.xrTableCell28.Text = "Unterschrift"; + this.xrTableCell28.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter; + this.xrTableCell28.Weight = 0.3799286054710615D; + // + // xrTableCell32 + // + this.xrTableCell32.BackColor = System.Drawing.Color.Gainsboro; + this.xrTableCell32.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell32.Font = new DevExpress.Drawing.DXFont("Calibri", 11F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); + this.xrTableCell32.Multiline = true; + this.xrTableCell32.Name = "xrTableCell32"; + this.xrTableCell32.StylePriority.UseBackColor = false; + this.xrTableCell32.StylePriority.UseBorders = false; + this.xrTableCell32.StylePriority.UseFont = false; + this.xrTableCell32.StylePriority.UseTextAlignment = false; + this.xrTableCell32.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.xrTableCell32.Weight = 0.37992875039834695D; + // + // xrTableCell33 + // + this.xrTableCell33.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.picSignature}); + this.xrTableCell33.Multiline = true; + this.xrTableCell33.Name = "xrTableCell33"; + this.xrTableCell33.StylePriority.UseBorders = false; + this.xrTableCell33.StylePriority.UseFont = false; + this.xrTableCell33.StylePriority.UsePadding = false; + this.xrTableCell33.StylePriority.UseTextAlignment = false; + this.xrTableCell33.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell33.Weight = 0.17173546870366549D; + // + // picSignature + // + this.picSignature.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.picSignature.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Tag", null, "Services.Signature")}); + this.picSignature.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.picSignature.Name = "picSignature"; + this.picSignature.SizeF = new System.Drawing.SizeF(160F, 20F); + this.picSignature.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; + this.picSignature.StylePriority.UseBorders = false; + // + // xrLabel9 + // + this.xrLabel9.Borders = DevExpress.XtraPrinting.BorderSide.Right; + this.xrLabel9.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(89.61531F, 0F); + this.xrLabel9.Name = "xrLabel9"; + this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); + this.xrLabel9.SizeF = new System.Drawing.SizeF(110.3689F, 21.99999F); + 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; + // // QuittierungsbelegAssistenz // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -1266,9 +1295,11 @@ namespace KcmGmbH private DevExpress.XtraReports.UI.XRLabel xrLabel14; private DevExpress.XtraReports.UI.XRLabel xrLabel16; private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1; + private DevExpress.XtraReports.UI.XRLabel lblUnterschriftKlient; private DevExpress.XtraReports.UI.XRLabel lblUnterschriftMitarbeiter; private DevExpress.XtraReports.UI.XRLabel xrLabel11; private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox2; + private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox3; private DevExpress.XtraReports.UI.XRTableCell xrTableCell33; private DevExpress.XtraReports.UI.XRTableCell xrTableCell28; private DevExpress.XtraReports.UI.XRTableCell xrTableCell32; diff --git a/ReportImp/KcmGmbH/QuittierungsbelegAssistenz.cs b/ReportImp/KcmGmbH/QuittierungsbelegAssistenz.cs index 6fa0f47f6..a15a2063f 100644 --- a/ReportImp/KcmGmbH/QuittierungsbelegAssistenz.cs +++ b/ReportImp/KcmGmbH/QuittierungsbelegAssistenz.cs @@ -118,6 +118,7 @@ namespace KcmGmbH if (newRows > 0) { + lblUnterschriftKlient.Top += newRows * 20; lblUnterschriftMitarbeiter.Top += newRows * 20; } }