diff --git a/ReportImp/DiakonischesWerkDinslakenJuDi/Leistungsnachweis.Designer.cs b/ReportImp/DiakonischesWerkDinslakenJuDi/Leistungsnachweis.Designer.cs index bf1378231..28de5151e 100644 --- a/ReportImp/DiakonischesWerkDinslakenJuDi/Leistungsnachweis.Designer.cs +++ b/ReportImp/DiakonischesWerkDinslakenJuDi/Leistungsnachweis.Designer.cs @@ -93,6 +93,8 @@ namespace DiakonischesWerkDinslakenJuDi this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); + this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel16 = new DevExpress.XtraReports.UI.XRLabel(); this.lblRestStdNeu = new DevExpress.XtraReports.UI.XRLabel(); this.lblLabelRestStdNeu = new DevExpress.XtraReports.UI.XRLabel(); this.lblUnterschriftKlient = new DevExpress.XtraReports.UI.XRLabel(); @@ -100,8 +102,6 @@ namespace DiakonischesWerkDinslakenJuDi this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox(); this.fieldKontaktArt = new DevExpress.XtraReports.UI.CalculatedField(); - this.xrLabel16 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit(); @@ -795,8 +795,8 @@ namespace DiakonischesWerkDinslakenJuDi this.lblAnschrift.StylePriority.UseFont = false; this.lblAnschrift.StylePriority.UseForeColor = false; this.lblAnschrift.StylePriority.UseTextAlignment = false; - this.lblAnschrift.Text = "An\r\nStadt Dinslaken\r\nGeschäftsbereich Jugend und Soziales\r\n-Wirtschaftliche Jugen" + - "dhilfe -\r\nWilhelm-Lantermann-Str. 65\r\n46535 Dinslaken"; + this.lblAnschrift.Text = "An\r\nStadt Dinslaken\r\nGeschäftsbereich Jugend und Soziales\r\n- Wirtschaftliche Juge" + + "ndhilfe -\r\nWilhelm-Lantermann-Str. 65\r\n46535 Dinslaken"; this.lblAnschrift.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; // // xrLabel2 @@ -861,16 +861,45 @@ namespace DiakonischesWerkDinslakenJuDi this.GroupFooter1.KeepTogether = true; this.GroupFooter1.Name = "GroupFooter1"; // + // xrLabel3 + // + this.xrLabel3.Borders = DevExpress.XtraPrinting.BorderSide.Top; + this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(391.3056F, 94.82628F); + this.xrLabel3.Name = "xrLabel3"; + this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); + this.xrLabel3.SizeF = new System.Drawing.SizeF(80.98254F, 20F); + this.xrLabel3.StylePriority.UseBackColor = false; + this.xrLabel3.StylePriority.UseBorders = false; + this.xrLabel3.StylePriority.UseFont = false; + this.xrLabel3.StylePriority.UsePadding = false; + this.xrLabel3.StylePriority.UseTextAlignment = false; + this.xrLabel3.Text = "Datum"; + this.xrLabel3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + // + // xrLabel16 + // + this.xrLabel16.BackColor = System.Drawing.Color.Transparent; + this.xrLabel16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeSignatureDate", "{0:dd.MM.yyyy}")}); + this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(391.3056F, 57.82628F); + this.xrLabel16.Name = "xrLabel16"; + this.xrLabel16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel16.SizeF = new System.Drawing.SizeF(136.83F, 35F); + this.xrLabel16.StylePriority.UseBackColor = false; + this.xrLabel16.StylePriority.UseTextAlignment = false; + this.xrLabel16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft; + // // lblRestStdNeu // this.lblRestStdNeu.BackColor = System.Drawing.Color.Gainsboro; this.lblRestStdNeu.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.lblRestStdNeu.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.lblRestStdNeu.LocationFloat = new DevExpress.Utils.PointFloat(245.0001F, 20.00001F); + this.lblRestStdNeu.LocationFloat = new DevExpress.Utils.PointFloat(243.9997F, 20.00001F); this.lblRestStdNeu.Name = "lblRestStdNeu"; this.lblRestStdNeu.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.lblRestStdNeu.SizeF = new System.Drawing.SizeF(84.99998F, 31.45835F); + this.lblRestStdNeu.SizeF = new System.Drawing.SizeF(86.00032F, 31.45835F); this.lblRestStdNeu.StylePriority.UseBackColor = false; this.lblRestStdNeu.StylePriority.UseBorders = false; this.lblRestStdNeu.StylePriority.UseFont = false; @@ -884,7 +913,7 @@ namespace DiakonischesWerkDinslakenJuDi this.lblLabelRestStdNeu.BackColor = System.Drawing.Color.Transparent; this.lblLabelRestStdNeu.Borders = DevExpress.XtraPrinting.BorderSide.None; this.lblLabelRestStdNeu.Font = new DevExpress.Drawing.DXFont("Arial", 8F); - this.lblLabelRestStdNeu.LocationFloat = new DevExpress.Utils.PointFloat(95.0004F, 20.00001F); + this.lblLabelRestStdNeu.LocationFloat = new DevExpress.Utils.PointFloat(94.0004F, 20.00001F); this.lblLabelRestStdNeu.Multiline = true; this.lblLabelRestStdNeu.Name = "lblLabelRestStdNeu"; this.lblLabelRestStdNeu.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); @@ -919,7 +948,7 @@ namespace DiakonischesWerkDinslakenJuDi this.xrLabel10.BackColor = System.Drawing.Color.Transparent; this.xrLabel10.Borders = DevExpress.XtraPrinting.BorderSide.None; this.xrLabel10.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(95.00017F, 0F); + this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(94.00017F, 0F); this.xrLabel10.Name = "xrLabel10"; this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); this.xrLabel10.SizeF = new System.Drawing.SizeF(149.9996F, 20F); @@ -939,10 +968,10 @@ namespace DiakonischesWerkDinslakenJuDi this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLS")}); this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(244.9998F, 0F); + this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(243.9997F, 0F); this.xrLabel1.Name = "xrLabel1"; this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.xrLabel1.SizeF = new System.Drawing.SizeF(85F, 20F); + this.xrLabel1.SizeF = new System.Drawing.SizeF(86.00005F, 20F); this.xrLabel1.StylePriority.UseBackColor = false; this.xrLabel1.StylePriority.UseBorders = false; this.xrLabel1.StylePriority.UseFont = false; @@ -968,35 +997,6 @@ namespace DiakonischesWerkDinslakenJuDi this.fieldKontaktArt.FieldType = DevExpress.XtraReports.UI.FieldType.String; this.fieldKontaktArt.Name = "fieldKontaktArt"; // - // xrLabel16 - // - this.xrLabel16.BackColor = System.Drawing.Color.Transparent; - this.xrLabel16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeSignatureDate", "{0:dd.MM.yyyy}")}); - this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(391.3056F, 57.82628F); - this.xrLabel16.Name = "xrLabel16"; - this.xrLabel16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel16.SizeF = new System.Drawing.SizeF(136.83F, 35F); - this.xrLabel16.StylePriority.UseBackColor = false; - this.xrLabel16.StylePriority.UseTextAlignment = false; - this.xrLabel16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft; - // - // xrLabel3 - // - this.xrLabel3.Borders = DevExpress.XtraPrinting.BorderSide.Top; - this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(391.3056F, 94.82628F); - this.xrLabel3.Name = "xrLabel3"; - this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.xrLabel3.SizeF = new System.Drawing.SizeF(80.98254F, 20F); - this.xrLabel3.StylePriority.UseBackColor = false; - this.xrLabel3.StylePriority.UseBorders = false; - this.xrLabel3.StylePriority.UseFont = false; - this.xrLabel3.StylePriority.UsePadding = false; - this.xrLabel3.StylePriority.UseTextAlignment = false; - this.xrLabel3.Text = "Datum"; - this.xrLabel3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - // // bindingSource1 // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); diff --git a/ReportImp/DiakonischesWerkDinslakenJuDi/Leistungsnachweis.cs b/ReportImp/DiakonischesWerkDinslakenJuDi/Leistungsnachweis.cs index 58d112949..71846c75a 100644 --- a/ReportImp/DiakonischesWerkDinslakenJuDi/Leistungsnachweis.cs +++ b/ReportImp/DiakonischesWerkDinslakenJuDi/Leistungsnachweis.cs @@ -27,8 +27,8 @@ namespace DiakonischesWerkDinslakenJuDi { if (pRO.Costbearer.Contains("Voerde")) { - lblAnschrift.Text = "An \nStadt Voerde(Ndrrh.)\nAmt für Schulen, Soziales und Jugend \n" + - "- Wirtschaftliche Jugendhilfe - \nRathausplatz 20 \n46562 Voerde"; + lblAnschrift.Text = "An\nStadt Voerde (Ndrrh.)\nAmt für Schulen, Soziales und Jugend\n" + + "- Wirtschaftliche Jugendhilfe -\nRathausplatz 20\n46562 Voerde"; lblApprovedHours.Text = "Bewilligtes Stundenkontingent proTZR"; rowRestStd.Visible = true; var adList = BerechneJugendamtSollIst(pRO); @@ -49,6 +49,11 @@ namespace DiakonischesWerkDinslakenJuDi } else { + if (pRO.Costbearer.Contains("Jugendamt") && pRO.Costbearer.Contains("Wesel")) + { + lblAnschrift.Text = "An\nKreis Wesel\nDer Landrat\nJugendamt\nPhilipp-Reis-Straße 7\n46483 Wesel"; + } + cellApproved.Text = String.Format("{0:0.00}", pRO.ApprovedFLSPerWeek); lblLabelRestStd.Text = null; lblRestStd.Text = null;