From fb613407a63ec4198dd0c8fbfabb6917a0d0dbe2 Mon Sep 17 00:00:00 2001 From: Alexandra Date: Tue, 23 Apr 2024 16:27:28 +0200 Subject: [PATCH 1/5] =?UTF-8?q?DiakonischesWerkDinslakenJuDi/Leistungsnach?= =?UTF-8?q?weis=20f=C3=BCr=20zweiten=20Kostentr=C3=A4ger=20erweitert=20-?= =?UTF-8?q?=20verbleibende=20Kontingente?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Leistungsnachweis.Designer.cs | 750 +++++++++++------- .../Leistungsnachweis.cs | 319 +++++--- .../Leistungsnachweis.resx | 3 - .../Properties/licenses.licx | 1 + 4 files changed, 680 insertions(+), 393 deletions(-) diff --git a/ReportImp/DiakonischesWerkDinslakenJuDi/Leistungsnachweis.Designer.cs b/ReportImp/DiakonischesWerkDinslakenJuDi/Leistungsnachweis.Designer.cs index a2f8b615a..f085d1138 100644 --- a/ReportImp/DiakonischesWerkDinslakenJuDi/Leistungsnachweis.Designer.cs +++ b/ReportImp/DiakonischesWerkDinslakenJuDi/Leistungsnachweis.Designer.cs @@ -30,6 +30,7 @@ namespace DiakonischesWerkDinslakenJuDi private void InitializeComponent() { this.components = new System.ComponentModel.Container(); + DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark(); this.Detail = new DevExpress.XtraReports.UI.DetailBand(); this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); @@ -59,18 +60,7 @@ namespace DiakonischesWerkDinslakenJuDi this.xrTableCell49 = new DevExpress.XtraReports.UI.XRTableCell(); this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule(); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); - this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel24 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel16 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); + this.lblAnschrift = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); this.formattingRuleServiceDesc = new DevExpress.XtraReports.UI.FormattingRule(); this.formattingRuleCostBearer = new DevExpress.XtraReports.UI.FormattingRule(); @@ -84,10 +74,37 @@ namespace DiakonischesWerkDinslakenJuDi this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox(); this.fieldKontaktArt = new DevExpress.XtraReports.UI.CalculatedField(); + this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow7 = new DevExpress.XtraReports.UI.XRTableRow(); + this.cellApproved = new DevExpress.XtraReports.UI.XRTableCell(); + this.lblApprovedHours = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow5 = new DevExpress.XtraReports.UI.XRTableRow(); + this.lblHilfeart = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow8 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell25 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow10 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow9 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); + this.rowRestStd = new DevExpress.XtraReports.UI.XRTableRow(); + this.lblLabelRestStd = new DevExpress.XtraReports.UI.XRTableCell(); + this.lblRestStd = new DevExpress.XtraReports.UI.XRTableCell(); + this.lblRestStdNeu = new DevExpress.XtraReports.UI.XRLabel(); + this.lblLabelRestStdNeu = new DevExpress.XtraReports.UI.XRLabel(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); - this.xrLabel25 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // @@ -125,7 +142,8 @@ namespace DiakonischesWerkDinslakenJuDi this.xrTable3.BorderColor = System.Drawing.Color.Black; this.xrTable3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTable3.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTable3.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrTable3.Name = "xrTable3"; this.xrTable3.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); @@ -153,7 +171,8 @@ namespace DiakonischesWerkDinslakenJuDi // this.xrTableCell13.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.StartDate", "{0:dd/MM/yyyy}")}); - this.xrTableCell13.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell13.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTableCell13.Name = "xrTableCell13"; this.xrTableCell13.StylePriority.UseBorders = false; this.xrTableCell13.StylePriority.UseFont = false; @@ -167,7 +186,8 @@ namespace DiakonischesWerkDinslakenJuDi // this.xrTableCell14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.StartDateMinutes", "{0:HH:mm}")}); - this.xrTableCell14.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell14.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTableCell14.Name = "xrTableCell14"; this.xrTableCell14.StylePriority.UseBorders = false; this.xrTableCell14.StylePriority.UseFont = false; @@ -181,7 +201,8 @@ namespace DiakonischesWerkDinslakenJuDi // this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.EndDateMinutes", "{0:HH:mm}")}); - this.xrTableCell10.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell10.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTableCell10.Name = "xrTableCell10"; this.xrTableCell10.StylePriority.UseBorders = false; this.xrTableCell10.StylePriority.UseFont = false; @@ -195,7 +216,7 @@ namespace DiakonischesWerkDinslakenJuDi // this.xrTableCell12.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice4", "{0:0.##}")}); - this.xrTableCell12.Font = new System.Drawing.Font("Arial", 10F); + this.xrTableCell12.Font = new DevExpress.Drawing.DXFont("Arial", 10F); this.xrTableCell12.Name = "xrTableCell12"; this.xrTableCell12.StylePriority.UseBorders = false; this.xrTableCell12.StylePriority.UseFont = false; @@ -252,7 +273,8 @@ namespace DiakonischesWerkDinslakenJuDi // this.xrTableServiceRecords1.BackColor = System.Drawing.Color.Gainsboro; this.xrTableServiceRecords1.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.xrTableServiceRecords1.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableServiceRecords1.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTableServiceRecords1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrTableServiceRecords1.Name = "xrTableServiceRecords1"; this.xrTableServiceRecords1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); @@ -282,7 +304,8 @@ namespace DiakonischesWerkDinslakenJuDi // this.xrTableCell3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right))); - this.xrTableCell3.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell3.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTableCell3.Name = "xrTableCell3"; this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); this.xrTableCell3.StylePriority.UseBorders = false; @@ -297,7 +320,8 @@ namespace DiakonischesWerkDinslakenJuDi // this.xrTableCell4.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right))); - this.xrTableCell4.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell4.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTableCell4.Multiline = true; this.xrTableCell4.Name = "xrTableCell4"; this.xrTableCell4.Padding = new DevExpress.XtraPrinting.PaddingInfo(4, 4, 0, 0, 100F); @@ -313,7 +337,8 @@ namespace DiakonischesWerkDinslakenJuDi // this.xrTableCell9.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right))); - this.xrTableCell9.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell9.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTableCell9.Multiline = true; this.xrTableCell9.Name = "xrTableCell9"; this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); @@ -329,7 +354,7 @@ namespace DiakonischesWerkDinslakenJuDi // this.xrTableCell28.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right))); - this.xrTableCell28.Font = new System.Drawing.Font("Arial", 10F); + this.xrTableCell28.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); this.xrTableCell28.Name = "xrTableCell28"; this.xrTableCell28.StylePriority.UseBorders = false; this.xrTableCell28.StylePriority.UseFont = false; @@ -342,7 +367,7 @@ namespace DiakonischesWerkDinslakenJuDi // this.xrTableCell48.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right))); - this.xrTableCell48.Font = new System.Drawing.Font("Arial", 10F); + this.xrTableCell48.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); this.xrTableCell48.Multiline = true; this.xrTableCell48.Name = "xrTableCell48"; this.xrTableCell48.StylePriority.UseBorders = false; @@ -379,7 +404,8 @@ namespace DiakonischesWerkDinslakenJuDi this.xrTableCell8.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell8.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell8.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTableCell8.Name = "xrTableCell8"; this.xrTableCell8.StylePriority.UseBorders = false; this.xrTableCell8.StylePriority.UseFont = false; @@ -393,7 +419,8 @@ namespace DiakonischesWerkDinslakenJuDi this.xrTableCell5.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell5.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell5.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTableCell5.Name = "xrTableCell5"; this.xrTableCell5.StylePriority.UseBorders = false; this.xrTableCell5.StylePriority.UseFont = false; @@ -407,7 +434,8 @@ namespace DiakonischesWerkDinslakenJuDi this.xrTableCell7.BackColor = System.Drawing.Color.Gainsboro; this.xrTableCell7.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell7.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell7.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTableCell7.Multiline = true; this.xrTableCell7.Name = "xrTableCell7"; this.xrTableCell7.StylePriority.UseBackColor = false; @@ -422,7 +450,7 @@ namespace DiakonischesWerkDinslakenJuDi // this.xrTableCell43.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell43.Font = new System.Drawing.Font("Arial", 10F); + this.xrTableCell43.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); this.xrTableCell43.Name = "xrTableCell43"; this.xrTableCell43.StylePriority.UseBorders = false; this.xrTableCell43.StylePriority.UseFont = false; @@ -435,7 +463,7 @@ namespace DiakonischesWerkDinslakenJuDi // this.xrTableCell49.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell49.Font = new System.Drawing.Font("Arial", 10F); + this.xrTableCell49.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); this.xrTableCell49.Multiline = true; this.xrTableCell49.Name = "xrTableCell49"; this.xrTableCell49.StylePriority.UseBorders = false; @@ -455,234 +483,34 @@ namespace DiakonischesWerkDinslakenJuDi // ReportHeader // this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrLabel12, - this.xrLabel11, - this.xrLabel9, - this.xrLabel24, - this.xrLabel25, - this.xrLabel14, - this.xrLabel16, - this.xrLabel7, - this.xrLabel8, - this.xrLabel6, - this.xrLabel5, - this.xrLabel4, - this.xrLabel3, + this.xrTable1, + this.lblAnschrift, this.xrLabel2}); - this.ReportHeader.HeightF = 328.1288F; + this.ReportHeader.HeightF = 360.75F; this.ReportHeader.Name = "ReportHeader"; + this.ReportHeader.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 2, 0, 100F); + this.ReportHeader.StylePriority.UsePadding = false; // - // xrLabel12 + // lblAnschrift // - this.xrLabel12.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); - this.xrLabel12.ForeColor = System.Drawing.Color.Black; - this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); - this.xrLabel12.Multiline = true; - this.xrLabel12.Name = "xrLabel12"; - this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel12.SizeF = new System.Drawing.SizeF(494.3794F, 97.91666F); - this.xrLabel12.StylePriority.UseFont = false; - this.xrLabel12.StylePriority.UseForeColor = false; - this.xrLabel12.StylePriority.UseTextAlignment = false; - this.xrLabel12.Text = "An\r\nStadt Dinslaken\r\nGeschäftsbereich Jugend und Soziales\r\n-Wirtschaftliche Jugen" + + this.lblAnschrift.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); + this.lblAnschrift.ForeColor = System.Drawing.Color.Black; + this.lblAnschrift.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.lblAnschrift.Multiline = true; + this.lblAnschrift.Name = "lblAnschrift"; + this.lblAnschrift.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblAnschrift.SizeF = new System.Drawing.SizeF(494.3794F, 97.91666F); + 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.xrLabel12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - // - // xrLabel11 - // - this.xrLabel11.BackColor = System.Drawing.Color.Gainsboro; - this.xrLabel11.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrLabel11.Font = new System.Drawing.Font("Arial", 6F); - this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(0F, 172.6944F); - this.xrLabel11.Name = "xrLabel11"; - this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.xrLabel11.SizeF = new System.Drawing.SizeF(205.6386F, 12.99998F); - 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.Text = "(Name/Anschrift, Name des Mitarbeiters)"; - this.xrLabel11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - // - // xrLabel9 - // - this.xrLabel9.BackColor = System.Drawing.Color.Gainsboro; - this.xrLabel9.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrLabel9.Font = new System.Drawing.Font("Arial", 6F); - this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(0F, 206.1944F); - this.xrLabel9.Name = "xrLabel9"; - this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.xrLabel9.SizeF = new System.Drawing.SizeF(205.6386F, 12.99998F); - 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.Text = "(Name des Kindes und ggf. Anschrift)"; - this.xrLabel9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - // - // xrLabel24 - // - this.xrLabel24.BackColor = System.Drawing.Color.Gainsboro; - this.xrLabel24.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrLabel24.Font = new System.Drawing.Font("Arial", 10F); - this.xrLabel24.LocationFloat = new DevExpress.Utils.PointFloat(0F, 219.1944F); - this.xrLabel24.Name = "xrLabel24"; - this.xrLabel24.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.xrLabel24.SizeF = new System.Drawing.SizeF(205.64F, 33F); - this.xrLabel24.StylePriority.UseBackColor = false; - this.xrLabel24.StylePriority.UseBorders = false; - this.xrLabel24.StylePriority.UseFont = false; - this.xrLabel24.StylePriority.UsePadding = false; - this.xrLabel24.StylePriority.UseTextAlignment = false; - this.xrLabel24.Text = "Hilfeart"; - this.xrLabel24.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - // - // xrLabel14 - // - this.xrLabel14.BackColor = System.Drawing.Color.Gainsboro; - this.xrLabel14.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrLabel14.Font = new System.Drawing.Font("Arial", 10F); - this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 252.6705F); - this.xrLabel14.Multiline = true; - this.xrLabel14.Name = "xrLabel14"; - this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.xrLabel14.SizeF = new System.Drawing.SizeF(205.6386F, 33F); - this.xrLabel14.StylePriority.UseBackColor = false; - this.xrLabel14.StylePriority.UseBorders = false; - this.xrLabel14.StylePriority.UseFont = false; - this.xrLabel14.StylePriority.UsePadding = false; - this.xrLabel14.StylePriority.UseTextAlignment = false; - this.xrLabel14.Text = "Vereinbarter Leistungsumfang\r\npro Woche"; - this.xrLabel14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - // - // xrLabel16 - // - this.xrLabel16.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrLabel16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "ApprovedFLSPerWeek", "{0:0.##}")}); - this.xrLabel16.Font = new System.Drawing.Font("Arial", 10F); - this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(205.6386F, 252.1944F); - this.xrLabel16.Name = "xrLabel16"; - this.xrLabel16.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.xrLabel16.SizeF = new System.Drawing.SizeF(530.3613F, 33.47604F); - this.xrLabel16.StylePriority.UseBackColor = false; - this.xrLabel16.StylePriority.UseBorders = false; - this.xrLabel16.StylePriority.UseFont = false; - this.xrLabel16.StylePriority.UsePadding = false; - this.xrLabel16.StylePriority.UseTextAlignment = false; - this.xrLabel16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - // - // xrLabel7 - // - this.xrLabel7.BackColor = System.Drawing.Color.Gainsboro; - this.xrLabel7.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrLabel7.Font = new System.Drawing.Font("Arial", 10F); - this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 285.6704F); - this.xrLabel7.Name = "xrLabel7"; - this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.xrLabel7.SizeF = new System.Drawing.SizeF(205.64F, 33F); - this.xrLabel7.StylePriority.UseBackColor = false; - this.xrLabel7.StylePriority.UseBorders = false; - this.xrLabel7.StylePriority.UseFont = false; - this.xrLabel7.StylePriority.UsePadding = false; - this.xrLabel7.StylePriority.UseTextAlignment = false; - this.xrLabel7.Text = "Abrechnungszeitraum"; - this.xrLabel7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - // - // xrLabel8 - // - this.xrLabel8.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrLabel8.Font = new System.Drawing.Font("Arial", 10F); - this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(205.64F, 285.6704F); - this.xrLabel8.Name = "xrLabel8"; - this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.xrLabel8.SizeF = new System.Drawing.SizeF(530.3599F, 33F); - this.xrLabel8.StylePriority.UseBackColor = false; - this.xrLabel8.StylePriority.UseBorders = false; - this.xrLabel8.StylePriority.UseFont = false; - this.xrLabel8.StylePriority.UsePadding = false; - this.xrLabel8.StylePriority.UseTextAlignment = false; - this.xrLabel8.Text = "[Month] [Year]"; - this.xrLabel8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - // - // xrLabel6 - // - this.xrLabel6.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrLabel6.Font = new System.Drawing.Font("Arial", 10F); - this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(205.6386F, 185.6944F); - this.xrLabel6.Name = "xrLabel6"; - this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.xrLabel6.SizeF = new System.Drawing.SizeF(529.3613F, 33.49999F); - this.xrLabel6.StylePriority.UseBackColor = false; - this.xrLabel6.StylePriority.UseBorders = false; - this.xrLabel6.StylePriority.UseFont = false; - this.xrLabel6.StylePriority.UsePadding = false; - this.xrLabel6.StylePriority.UseTextAlignment = false; - this.xrLabel6.Text = "[CustomerName]"; - this.xrLabel6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - // - // xrLabel5 - // - this.xrLabel5.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrLabel5.Font = new System.Drawing.Font("Arial", 10F); - this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(205.6386F, 152.6944F); - this.xrLabel5.Name = "xrLabel5"; - this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.xrLabel5.SizeF = new System.Drawing.SizeF(529.3613F, 32.99998F); - this.xrLabel5.StylePriority.UseBackColor = false; - this.xrLabel5.StylePriority.UseBorders = false; - this.xrLabel5.StylePriority.UseFont = false; - this.xrLabel5.StylePriority.UsePadding = false; - this.xrLabel5.StylePriority.UseTextAlignment = false; - this.xrLabel5.Text = "Diakonisches Werk, Ju.Di, Wiesenstr. 44, 46535 Dinslaken"; - this.xrLabel5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - // - // xrLabel4 - // - this.xrLabel4.BackColor = System.Drawing.Color.Gainsboro; - this.xrLabel4.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right))); - this.xrLabel4.Font = new System.Drawing.Font("Arial", 10F); - this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 186.1944F); - this.xrLabel4.Name = "xrLabel4"; - this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.xrLabel4.SizeF = new System.Drawing.SizeF(205.6386F, 20F); - this.xrLabel4.StylePriority.UseBackColor = false; - this.xrLabel4.StylePriority.UseBorders = false; - this.xrLabel4.StylePriority.UseFont = false; - this.xrLabel4.StylePriority.UsePadding = false; - this.xrLabel4.StylePriority.UseTextAlignment = false; - this.xrLabel4.Text = "Leistungsempfänger"; - this.xrLabel4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - // - // xrLabel3 - // - this.xrLabel3.BackColor = System.Drawing.Color.Gainsboro; - this.xrLabel3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right))); - this.xrLabel3.Font = new System.Drawing.Font("Arial", 10F); - this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 152.6944F); - this.xrLabel3.Name = "xrLabel3"; - this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.xrLabel3.SizeF = new System.Drawing.SizeF(205.6386F, 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 = "Maßnahmeträger"; - this.xrLabel3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.lblAnschrift.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; // // xrLabel2 // - this.xrLabel2.Font = new System.Drawing.Font("Arial", 14F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Arial", 14F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrLabel2.ForeColor = System.Drawing.Color.Black; this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 116F); this.xrLabel2.Multiline = true; @@ -718,7 +546,6 @@ namespace DiakonischesWerkDinslakenJuDi // // topMarginBand1 // - this.topMarginBand1.HeightF = 100F; this.topMarginBand1.Name = "topMarginBand1"; // // bottomMarginBand1 @@ -729,20 +556,22 @@ namespace DiakonischesWerkDinslakenJuDi // GroupFooter1 // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.lblRestStdNeu, + this.lblLabelRestStdNeu, this.lblUnterschriftKlient, this.lblUnterschriftMitarbeiter, this.xrLabel10, this.xrLabel1, this.xrPictureBox1}); - this.GroupFooter1.HeightF = 103.9513F; + this.GroupFooter1.HeightF = 116.3263F; this.GroupFooter1.KeepTogether = true; this.GroupFooter1.Name = "GroupFooter1"; // // lblUnterschriftKlient // this.lblUnterschriftKlient.Borders = DevExpress.XtraPrinting.BorderSide.Top; - this.lblUnterschriftKlient.Font = new System.Drawing.Font("Arial", 10F); - this.lblUnterschriftKlient.LocationFloat = new DevExpress.Utils.PointFloat(0F, 72.03387F); + this.lblUnterschriftKlient.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.lblUnterschriftKlient.LocationFloat = new DevExpress.Utils.PointFloat(10.00001F, 92.03377F); this.lblUnterschriftKlient.Name = "lblUnterschriftKlient"; this.lblUnterschriftKlient.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); this.lblUnterschriftKlient.SizeF = new System.Drawing.SizeF(329.9998F, 20F); @@ -757,8 +586,8 @@ namespace DiakonischesWerkDinslakenJuDi // lblUnterschriftMitarbeiter // this.lblUnterschriftMitarbeiter.Borders = DevExpress.XtraPrinting.BorderSide.Top; - this.lblUnterschriftMitarbeiter.Font = new System.Drawing.Font("Arial", 10F); - this.lblUnterschriftMitarbeiter.LocationFloat = new DevExpress.Utils.PointFloat(414.9999F, 72.03391F); + this.lblUnterschriftMitarbeiter.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.lblUnterschriftMitarbeiter.LocationFloat = new DevExpress.Utils.PointFloat(414.9997F, 92.03383F); this.lblUnterschriftMitarbeiter.Name = "lblUnterschriftMitarbeiter"; this.lblUnterschriftMitarbeiter.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); this.lblUnterschriftMitarbeiter.SizeF = new System.Drawing.SizeF(320.0045F, 19.99995F); @@ -774,8 +603,8 @@ namespace DiakonischesWerkDinslakenJuDi // this.xrLabel10.BackColor = System.Drawing.Color.Transparent; this.xrLabel10.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.xrLabel10.Font = new System.Drawing.Font("Arial", 10F); - this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(95.00012F, 10F); + this.xrLabel10.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(95.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); @@ -790,13 +619,12 @@ namespace DiakonischesWerkDinslakenJuDi // xrLabel1 // this.xrLabel1.BackColor = System.Drawing.Color.Gainsboro; - this.xrLabel1.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right) + this.xrLabel1.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLS", "{0:0.##}")}); - this.xrLabel1.Font = new System.Drawing.Font("Arial", 10F); - this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(244.9998F, 10F); + 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.Name = "xrLabel1"; this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); this.xrLabel1.SizeF = new System.Drawing.SizeF(85F, 20F); @@ -806,12 +634,13 @@ namespace DiakonischesWerkDinslakenJuDi this.xrLabel1.StylePriority.UsePadding = false; this.xrLabel1.StylePriority.UseTextAlignment = false; this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrLabel1.TextFormatString = "{0:0.00}"; // // xrPictureBox1 // this.xrPictureBox1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Image", null, "EmployeeSignature")}); - this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(415F, 36.53391F); + new DevExpress.XtraReports.UI.XRBinding("ImageSource", null, "EmployeeSignature")}); + this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(414.9998F, 56.53388F); this.xrPictureBox1.Name = "xrPictureBox1"; this.xrPictureBox1.Scripts.OnBeforePrint = "xrPictureBox1_BeforePrint"; this.xrPictureBox1.SizeF = new System.Drawing.SizeF(320.0001F, 35.50002F); @@ -824,25 +653,338 @@ namespace DiakonischesWerkDinslakenJuDi this.fieldKontaktArt.FieldType = DevExpress.XtraReports.UI.FieldType.String; this.fieldKontaktArt.Name = "fieldKontaktArt"; // + // xrTableCell19 + // + this.xrTableCell19.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell19.Multiline = true; + this.xrTableCell19.Name = "xrTableCell19"; + this.xrTableCell19.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F); + this.xrTableCell19.StylePriority.UseBorders = false; + this.xrTableCell19.StylePriority.UsePadding = false; + this.xrTableCell19.StylePriority.UseTextAlignment = false; + this.xrTableCell19.Text = "[Month] [Year]"; + this.xrTableCell19.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell19.Weight = 2.0000000489399885D; + // + // xrTableCell18 + // + this.xrTableCell18.BackColor = System.Drawing.Color.Gainsboro; + this.xrTableCell18.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell18.Multiline = true; + this.xrTableCell18.Name = "xrTableCell18"; + this.xrTableCell18.StylePriority.UseBackColor = false; + this.xrTableCell18.StylePriority.UseBorders = false; + this.xrTableCell18.StylePriority.UseTextAlignment = false; + this.xrTableCell18.Text = "Abrechnungszeitraum"; + this.xrTableCell18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell18.Weight = 0.99999995106001183D; + // + // xrTableRow7 + // + this.xrTableRow7.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell18, + this.xrTableCell19}); + this.xrTableRow7.Name = "xrTableRow7"; + this.xrTableRow7.Weight = 1.3200000000000012D; + // + // cellApproved + // + this.cellApproved.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right))); + this.cellApproved.Multiline = true; + this.cellApproved.Name = "cellApproved"; + this.cellApproved.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F); + this.cellApproved.StylePriority.UseBorders = false; + this.cellApproved.StylePriority.UsePadding = false; + this.cellApproved.StylePriority.UseTextAlignment = false; + this.cellApproved.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.cellApproved.TextFormatString = "{0:0.##}"; + this.cellApproved.Weight = 2.0000000489399885D; + // + // lblApprovedHours + // + this.lblApprovedHours.BackColor = System.Drawing.Color.Gainsboro; + this.lblApprovedHours.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right))); + this.lblApprovedHours.Multiline = true; + this.lblApprovedHours.Name = "lblApprovedHours"; + this.lblApprovedHours.StylePriority.UseBackColor = false; + this.lblApprovedHours.StylePriority.UseBorders = false; + this.lblApprovedHours.StylePriority.UseTextAlignment = false; + this.lblApprovedHours.Text = "Vereinbarter Leistungsumfang\r\npro Woche"; + this.lblApprovedHours.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.lblApprovedHours.Weight = 0.99999995106001183D; + // + // xrTableRow5 + // + this.xrTableRow5.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.lblApprovedHours, + this.cellApproved}); + this.xrTableRow5.Name = "xrTableRow5"; + this.xrTableRow5.Weight = 1.3200000000000003D; + // + // lblHilfeart + // + this.lblHilfeart.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right))); + this.lblHilfeart.Multiline = true; + this.lblHilfeart.Name = "lblHilfeart"; + this.lblHilfeart.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F); + this.lblHilfeart.StylePriority.UseBorders = false; + this.lblHilfeart.StylePriority.UsePadding = false; + this.lblHilfeart.StylePriority.UseTextAlignment = false; + this.lblHilfeart.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.lblHilfeart.Weight = 2.0000000489399885D; + // + // xrTableCell20 + // + this.xrTableCell20.BackColor = System.Drawing.Color.Gainsboro; + this.xrTableCell20.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTableCell20.Multiline = true; + this.xrTableCell20.Name = "xrTableCell20"; + this.xrTableCell20.StylePriority.UseBackColor = false; + this.xrTableCell20.StylePriority.UseBorders = false; + this.xrTableCell20.StylePriority.UseTextAlignment = false; + this.xrTableCell20.Text = "Hilfeart"; + this.xrTableCell20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell20.Weight = 0.99999995106001183D; + // + // xrTableRow8 + // + this.xrTableRow8.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell20, + this.lblHilfeart}); + this.xrTableRow8.Name = "xrTableRow8"; + this.xrTableRow8.Weight = 1.3199999999999994D; + // + // xrTableCell25 + // + this.xrTableCell25.Borders = DevExpress.XtraPrinting.BorderSide.Right; + this.xrTableCell25.Multiline = true; + this.xrTableCell25.Name = "xrTableCell25"; + this.xrTableCell25.StylePriority.UseBorders = false; + this.xrTableCell25.Weight = 2.0000000489399885D; + // + // xrTableCell24 + // + this.xrTableCell24.BackColor = System.Drawing.Color.Gainsboro; + this.xrTableCell24.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTableCell24.Font = new DevExpress.Drawing.DXFont("Arial", 6F); + this.xrTableCell24.Multiline = true; + this.xrTableCell24.Name = "xrTableCell24"; + this.xrTableCell24.StylePriority.UseBackColor = false; + this.xrTableCell24.StylePriority.UseBorders = false; + this.xrTableCell24.StylePriority.UseFont = false; + this.xrTableCell24.StylePriority.UseTextAlignment = false; + this.xrTableCell24.Text = "(Name des Kindes und ggf. Anschrift)"; + this.xrTableCell24.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell24.Weight = 0.99999995106001183D; + // + // xrTableRow10 + // + this.xrTableRow10.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell24, + this.xrTableCell25}); + this.xrTableRow10.Name = "xrTableRow10"; + this.xrTableRow10.Weight = 0.52000000000000046D; + // + // xrTableCell15 + // + this.xrTableCell15.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTableCell15.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerName")}); + this.xrTableCell15.Multiline = true; + this.xrTableCell15.Name = "xrTableCell15"; + this.xrTableCell15.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 2, 0, 100F); + this.xrTableCell15.StylePriority.UseBorders = false; + this.xrTableCell15.StylePriority.UsePadding = false; + this.xrTableCell15.Weight = 2.0000000489399885D; + // + // xrTableCell11 + // + this.xrTableCell11.BackColor = System.Drawing.Color.Gainsboro; + this.xrTableCell11.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTableCell11.Multiline = true; + this.xrTableCell11.Name = "xrTableCell11"; + this.xrTableCell11.StylePriority.UseBackColor = false; + this.xrTableCell11.StylePriority.UseBorders = false; + this.xrTableCell11.StylePriority.UseTextAlignment = false; + this.xrTableCell11.Text = "Leistungsempfänger"; + this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell11.Weight = 0.99999995106001183D; + // + // xrTableRow4 + // + this.xrTableRow4.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell11, + this.xrTableCell15}); + this.xrTableRow4.Name = "xrTableRow4"; + this.xrTableRow4.Weight = 0.79999999999999982D; + // + // xrTableCell23 + // + this.xrTableCell23.Borders = DevExpress.XtraPrinting.BorderSide.Right; + this.xrTableCell23.Multiline = true; + this.xrTableCell23.Name = "xrTableCell23"; + this.xrTableCell23.StylePriority.UseBorders = false; + this.xrTableCell23.Weight = 2.0000000489399885D; + // + // xrTableCell22 + // + this.xrTableCell22.BackColor = System.Drawing.Color.Gainsboro; + this.xrTableCell22.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTableCell22.Font = new DevExpress.Drawing.DXFont("Arial", 6F); + this.xrTableCell22.Multiline = true; + this.xrTableCell22.Name = "xrTableCell22"; + this.xrTableCell22.StylePriority.UseBackColor = false; + this.xrTableCell22.StylePriority.UseBorders = false; + this.xrTableCell22.StylePriority.UseFont = false; + this.xrTableCell22.StylePriority.UseTextAlignment = false; + this.xrTableCell22.Text = "(Name/Anschrift, Name des Mitarbeiters)"; + this.xrTableCell22.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell22.Weight = 0.99999995106001183D; + // + // xrTableRow9 + // + this.xrTableRow9.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell22, + this.xrTableCell23}); + this.xrTableRow9.Name = "xrTableRow9"; + this.xrTableRow9.Weight = 0.52D; + // + // xrTableCell2 + // + this.xrTableCell2.BackColor = System.Drawing.Color.Gainsboro; + this.xrTableCell2.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTableCell2.Multiline = true; + this.xrTableCell2.Name = "xrTableCell2"; + this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 0, 100F); + this.xrTableCell2.StylePriority.UseBackColor = false; + this.xrTableCell2.StylePriority.UseBorders = false; + this.xrTableCell2.StylePriority.UsePadding = false; + this.xrTableCell2.StylePriority.UseTextAlignment = false; + this.xrTableCell2.Text = "Maßnahmeträger"; + this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell2.Weight = 0.99999995106001183D; + // + // xrTableRow3 + // + this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell2, + this.xrTableCell6}); + this.xrTableRow3.Name = "xrTableRow3"; + this.xrTableRow3.Weight = 0.79999999999999993D; + // + // xrTable1 + // + this.xrTable1.KeepTogether = true; + this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 151.0417F); + this.xrTable1.Name = "xrTable1"; + this.xrTable1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 96F); + this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow3, + this.xrTableRow9, + this.xrTableRow4, + this.xrTableRow10, + this.xrTableRow8, + this.xrTableRow5, + this.rowRestStd, + this.xrTableRow7}); + this.xrTable1.SizeF = new System.Drawing.SizeF(734.9999F, 198F); + // + // xrTableCell6 + // + this.xrTableCell6.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTableCell6.Multiline = true; + this.xrTableCell6.Name = "xrTableCell6"; + this.xrTableCell6.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 2, 0, 100F); + this.xrTableCell6.StylePriority.UseBorders = false; + this.xrTableCell6.StylePriority.UsePadding = false; + this.xrTableCell6.StylePriority.UseTextAlignment = false; + this.xrTableCell6.Text = "Diakonisches Werk, Ju.Di, Wiesenstr. 44, 46535 Dinslaken"; + this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell6.Weight = 2.0000000489399885D; + // + // rowRestStd + // + this.rowRestStd.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.lblLabelRestStd, + this.lblRestStd}); + this.rowRestStd.Name = "rowRestStd"; + this.rowRestStd.Visible = false; + this.rowRestStd.Weight = 1.3200000000000003D; + // + // lblLabelRestStd + // + this.lblLabelRestStd.BackColor = System.Drawing.Color.Gainsboro; + this.lblLabelRestStd.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right))); + this.lblLabelRestStd.Multiline = true; + this.lblLabelRestStd.Name = "lblLabelRestStd"; + this.lblLabelRestStd.StylePriority.UseBackColor = false; + this.lblLabelRestStd.StylePriority.UseBorders = false; + this.lblLabelRestStd.StylePriority.UseTextAlignment = false; + this.lblLabelRestStd.Text = "Noch verfügbares Stundenkontingent"; + this.lblLabelRestStd.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.lblLabelRestStd.Weight = 0.99999995106001183D; + // + // lblRestStd + // + this.lblRestStd.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right))); + this.lblRestStd.Multiline = true; + this.lblRestStd.Name = "lblRestStd"; + this.lblRestStd.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F); + this.lblRestStd.StylePriority.UseBorders = false; + this.lblRestStd.StylePriority.UsePadding = false; + this.lblRestStd.StylePriority.UseTextAlignment = false; + this.lblRestStd.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.lblRestStd.Weight = 2.0000000489399885D; + // + // 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.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.StylePriority.UseBackColor = false; + this.lblRestStdNeu.StylePriority.UseBorders = false; + this.lblRestStdNeu.StylePriority.UseFont = false; + this.lblRestStdNeu.StylePriority.UsePadding = false; + this.lblRestStdNeu.StylePriority.UseTextAlignment = false; + this.lblRestStdNeu.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.lblRestStdNeu.Visible = false; + // + // lblLabelRestStdNeu + // + 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.Multiline = true; + this.lblLabelRestStdNeu.Name = "lblLabelRestStdNeu"; + this.lblLabelRestStdNeu.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); + this.lblLabelRestStdNeu.SizeF = new System.Drawing.SizeF(149.9996F, 31.45835F); + this.lblLabelRestStdNeu.StylePriority.UseBackColor = false; + this.lblLabelRestStdNeu.StylePriority.UseBorders = false; + this.lblLabelRestStdNeu.StylePriority.UseFont = false; + this.lblLabelRestStdNeu.StylePriority.UsePadding = false; + this.lblLabelRestStdNeu.StylePriority.UseTextAlignment = false; + this.lblLabelRestStdNeu.Text = "Neues noch verfügbares Stundenkontingent"; + this.lblLabelRestStdNeu.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.lblLabelRestStdNeu.Visible = false; + // // bindingSource1 // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); // - // xrLabel25 - // - this.xrLabel25.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrLabel25.Font = new System.Drawing.Font("Arial", 10F); - this.xrLabel25.LocationFloat = new DevExpress.Utils.PointFloat(205.64F, 219.1944F); - this.xrLabel25.Name = "xrLabel25"; - this.xrLabel25.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.xrLabel25.SizeF = new System.Drawing.SizeF(529.3655F, 33F); - this.xrLabel25.StylePriority.UseBackColor = false; - this.xrLabel25.StylePriority.UseBorders = false; - this.xrLabel25.StylePriority.UseFont = false; - this.xrLabel25.StylePriority.UsePadding = false; - this.xrLabel25.StylePriority.UseTextAlignment = false; - this.xrLabel25.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - // // Leistungsnachweis // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -855,19 +997,22 @@ namespace DiakonischesWerkDinslakenJuDi this.CalculatedFields.AddRange(new DevExpress.XtraReports.UI.CalculatedField[] { this.fieldKontaktArt}); this.DataSource = this.bindingSource1; - this.Font = new System.Drawing.Font("Arial", 10F); + this.Font = new DevExpress.Drawing.DXFont("Arial", 10F); this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] { this.formattingRuleStartDate, this.formattingRuleServiceDesc, this.formattingRuleCostBearer, this.formattingRuleEmployeeName}); - this.Margins = new System.Drawing.Printing.Margins(50, 30, 100, 30); + this.Margins = new DevExpress.Drawing.DXMargins(50F, 30F, 100F, 30F); this.PageHeight = 1169; this.PageWidth = 827; this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4; - this.Version = "17.1"; + this.Version = "23.2"; + xrWatermark1.Id = "Watermark1"; + this.Watermarks.Add(xrWatermark1); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); @@ -903,12 +1048,6 @@ namespace DiakonischesWerkDinslakenJuDi private DevExpress.XtraReports.UI.XRTableCell xrTableCell43; private DevExpress.XtraReports.UI.XRTableCell xrTableCell49; private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1; - private DevExpress.XtraReports.UI.XRLabel xrLabel3; - private DevExpress.XtraReports.UI.XRLabel xrLabel7; - private DevExpress.XtraReports.UI.XRLabel xrLabel8; - private DevExpress.XtraReports.UI.XRLabel xrLabel6; - private DevExpress.XtraReports.UI.XRLabel xrLabel5; - private DevExpress.XtraReports.UI.XRLabel xrLabel4; private DevExpress.XtraReports.UI.XRTable xrTable3; private DevExpress.XtraReports.UI.XRTableRow xrTableRow6; private DevExpress.XtraReports.UI.XRTableCell xrTableCell13; @@ -922,14 +1061,35 @@ namespace DiakonischesWerkDinslakenJuDi private DevExpress.XtraReports.UI.XRLabel xrLabel1; private DevExpress.XtraReports.UI.XRLabel lblUnterschriftKlient; private DevExpress.XtraReports.UI.XRLabel lblUnterschriftMitarbeiter; - private DevExpress.XtraReports.UI.XRLabel xrLabel14; - private DevExpress.XtraReports.UI.XRLabel xrLabel16; private DevExpress.XtraReports.UI.XRPictureBox picSignature; private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1; - private DevExpress.XtraReports.UI.XRLabel xrLabel11; - private DevExpress.XtraReports.UI.XRLabel xrLabel9; - private DevExpress.XtraReports.UI.XRLabel xrLabel24; - private DevExpress.XtraReports.UI.XRLabel xrLabel12; - private DevExpress.XtraReports.UI.XRLabel xrLabel25; + private DevExpress.XtraReports.UI.XRLabel lblAnschrift; + private DevExpress.XtraReports.UI.XRTable xrTable1; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow3; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell2; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell6; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow9; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell22; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell23; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow4; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell11; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell15; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow10; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell24; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell25; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow8; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell20; + private DevExpress.XtraReports.UI.XRTableCell lblHilfeart; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow5; + private DevExpress.XtraReports.UI.XRTableCell lblApprovedHours; + private DevExpress.XtraReports.UI.XRTableCell cellApproved; + private DevExpress.XtraReports.UI.XRTableRow rowRestStd; + private DevExpress.XtraReports.UI.XRTableCell lblLabelRestStd; + private DevExpress.XtraReports.UI.XRTableCell lblRestStd; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow7; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell18; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell19; + private DevExpress.XtraReports.UI.XRLabel lblRestStdNeu; + private DevExpress.XtraReports.UI.XRLabel lblLabelRestStdNeu; } } diff --git a/ReportImp/DiakonischesWerkDinslakenJuDi/Leistungsnachweis.cs b/ReportImp/DiakonischesWerkDinslakenJuDi/Leistungsnachweis.cs index 485bffc12..58d112949 100644 --- a/ReportImp/DiakonischesWerkDinslakenJuDi/Leistungsnachweis.cs +++ b/ReportImp/DiakonischesWerkDinslakenJuDi/Leistungsnachweis.cs @@ -1,100 +1,229 @@ -using System; -using System.Collections.Generic; -using System.Drawing; -using System.IO; -using System.Text.RegularExpressions; +using System; +using System.Collections.Generic; +using System.Drawing; +using System.IO; +using System.Text.RegularExpressions; using BeWo.Data.Access; using BeWo.Data.Entities; using BeWo.Report; -using BeWo.Report.ReportObjects; -using BS.Shared.Core; -using DevExpress.XtraReports.UI; - -namespace DiakonischesWerkDinslakenJuDi -{ - public partial class Leistungsnachweis : XtraReport, IBeWoReport - { - public Leistungsnachweis() - { - InitializeComponent(); - } - - public void SetReportDataSource(ServicesOverviewRO pRO) - { - if (pRO.Services != null) - { - xrLabel25.Text = GetHilfeplanCat(pRO); - - List servicesBillable = new List(); - - foreach (var sd in pRO.Services) - { - if (sd.IsBillable || sd.ServiceDescription.ToLower().Contains("fehlkontakt") || sd.ServiceCategory.ToLower().Contains("fehlkontakt")) - { - ServicesOverviewRO.CreateSignatureString(sd); - - sd.Notice4 = string.Format("{0:0.00}", sd.Minutes / 60); - sd.Notice5 = "E"; - if (sd.IsGroup) - { - sd.Notice5 = "GR"; - } - if (sd.ServiceDescription.ToLower().Contains("fehlkontakt") || sd.ServiceCategory.ToLower().Contains("fehlkontakt")) - { - sd.Notice5 = "F"; - } - servicesBillable.Add(sd); - } - } - - pRO.Services = servicesBillable; - } - - bindingSource1.DataSource = pRO; +using BeWo.Report.ReportObjects; +using BeWo.Service.Plugins; +using BS.Shared.Core; +using BS.Shared.Services; +using DevExpress.XtraReports.UI; + +namespace DiakonischesWerkDinslakenJuDi +{ + public partial class Leistungsnachweis : XtraReport, IBeWoReport + { + public Leistungsnachweis() + { + InitializeComponent(); } - private String GetHilfeplanCat(ServicesOverviewRO pRO) - { - if (pRO.CostBearer2SupportConceptList.Count > 0) - { - var c2s = pRO.CostBearer2SupportConceptList[0]; - var c2se = DAOFactory.GenericDAO.LoadByID(c2s.Oid.Value); - - foreach (var scap in c2se.ApprovalPeriodList) - { - if (scap.ServiceCategory != null) - { - return scap.ServiceCategory.Name; - } - } - } - - return ""; - } - - private void picSignature_BeforePrint(object sender, System.ComponentModel.CancelEventArgs e) - { - XRPictureBox xrBox = sender as XRPictureBox; - string base64String = xrBox.Tag as string; - if (!String.IsNullOrWhiteSpace(base64String)) - { - var base64Data = Regex.Match(base64String, @"data:image/(?.+?),(?.+)").Groups["data"].Value; - var binData = Convert.FromBase64String(base64Data); - System.Drawing.Image img = ByteArrayToImage(binData); - xrBox.Image = Utils.CropImage(img); - } - else - { - xrBox.Image = null; - } - } - - public System.Drawing.Image ByteArrayToImage(byte[] byteArrayIn) - { - using(var memoryStream = new MemoryStream(byteArrayIn)) - { - return System.Drawing.Image.FromStream(memoryStream); - } - } - } -} + public void SetReportDataSource(ServicesOverviewRO pRO) + { + if (pRO.Services != null) + { + 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"; + lblApprovedHours.Text = "Bewilligtes Stundenkontingent proTZR"; + rowRestStd.Visible = true; + var adList = BerechneJugendamtSollIst(pRO); + + decimal remainingHoursTotal = 0; + if (adList.Count > 0) + { + var ad = adList[0]; + + cellApproved.Text = String.Format("{0:0.00}", ad.ApprovedHoursTotal); + remainingHoursTotal += ad.RemainingHoursTotal; + + lblRestStd.Text = String.Format("{0:0.00}", remainingHoursTotal); + lblRestStdNeu.Text = String.Format("{0:0.00}", remainingHoursTotal - (decimal)pRO.TotalFLS); + lblLabelRestStdNeu.Visible = true; + lblRestStdNeu.Visible = true; + } + } + else + { + cellApproved.Text = String.Format("{0:0.00}", pRO.ApprovedFLSPerWeek); + lblLabelRestStd.Text = null; + lblRestStd.Text = null; + } + + lblHilfeart.Text = GetHilfeplanCat(pRO); + List servicesBillable = new List(); + + foreach (var sd in pRO.Services) + { + if (sd.IsBillable || sd.ServiceDescription.ToLower().Contains("fehlkontakt") || sd.ServiceCategory.ToLower().Contains("fehlkontakt")) + { + ServicesOverviewRO.CreateSignatureString(sd); + + sd.Notice4 = string.Format("{0:0.00}", sd.Minutes / 60); + sd.Notice5 = "E"; + if (sd.IsGroup) + { + sd.Notice5 = "GR"; + } + if (sd.ServiceDescription.ToLower().Contains("fehlkontakt") || sd.ServiceCategory.ToLower().Contains("fehlkontakt")) + { + sd.Notice5 = "F"; + } + servicesBillable.Add(sd); + } + } + + pRO.Services = servicesBillable; + } + + bindingSource1.DataSource = pRO; + } + + private String GetHilfeplanCat(ServicesOverviewRO pRO) + { + if (pRO.CostBearer2SupportConceptList.Count > 0) + { + var c2s = pRO.CostBearer2SupportConceptList[0]; + var c2se = DAOFactory.GenericDAO.LoadByID(c2s.Oid.Value); + + foreach (var scap in c2se.ApprovalPeriodList) + { + if (scap.ServiceCategory != null) + { + return scap.ServiceCategory.Name; + } + } + } + + return ""; + } + + private void picSignature_BeforePrint(object sender, System.ComponentModel.CancelEventArgs e) + { + XRPictureBox xrBox = sender as XRPictureBox; + string base64String = xrBox.Tag as string; + if (!String.IsNullOrWhiteSpace(base64String)) + { + var base64Data = Regex.Match(base64String, @"data:image/(?.+?),(?.+)").Groups["data"].Value; + var binData = Convert.FromBase64String(base64Data); + System.Drawing.Image img = ByteArrayToImage(binData); + xrBox.Image = Utils.CropImage(img); + } + else + { + xrBox.Image = null; + } + } + + public System.Drawing.Image ByteArrayToImage(byte[] byteArrayIn) + { + using(var memoryStream = new MemoryStream(byteArrayIn)) + { + return System.Drawing.Image.FromStream(memoryStream); + } + } + + private List BerechneJugendamtSollIst(ServicesOverviewRO pRO) + { + var adList = new List(); + + + if (pRO.SupportConceptCostBearer != null && pRO.SupportConceptCostBearer.CostBearer2SupportConceptOid != null) + { + if (pRO.SupportConceptCostBearer.StartDate != null) + { + CostBearer2SupportConcept c2s = DAOFactory.GenericDAO.LoadByID(pRO.SupportConceptCostBearer.CostBearer2SupportConceptOid.Value); + var calc = PluginLoader.FindClass(c2s.CostBearer.ID) ?? Calculations.GetInstance(c2s.CostBearer.ID); + var endeVormonat = new DateTime(pRO.StartDate.Year, pRO.StartDate.Month, 1).AddDays(-1); + + if (c2s.StartDate.HasValue && c2s.StartDate > pRO.StartDate) + { + pRO.StartDate = c2s.StartDate.Value; + } + + if (c2s.EndDate.HasValue && c2s.EndDate < pRO.EndDate) + { + pRO.EndDate = c2s.EndDate.Value; + } + + IList allServiceRecords = c2s.ServiceRecords; + + foreach (var scap in pRO.SupportConceptCostBearer.ApprovalPeriodList) + { + if (scap.StartDate <= pRO.EndDate && scap.EndDate >= pRO.StartDate) + { + var ad = new ServicesOverviewRO.ApprovalDetail(); + adList.Add(ad); + if (scap.StartDate > pRO.StartDate) + ad.TimeSpanStartDate = (DateTime)scap.StartDate; + else + ad.TimeSpanStartDate = pRO.StartDate; + if (scap.EndDate < pRO.EndDate) + ad.TimeSpanEndDate = (DateTime)scap.EndDate; + else + ad.TimeSpanEndDate = pRO.EndDate; + + ad.TotalStartDate = scap.StartDate.Value; + ad.TotalEndDate = scap.EndDate.Value; + + TimeSpan ts = pRO.EndDate.Subtract(ad.TotalStartDate.Value); + + ad.ApprovedHoursPerWeek = calc.GetApprovedHoursPerWeek(scap, pRO.SupportConceptCostBearer.CostBearer.CostRatePeriods) ?? 0; + ad.ApprovedHoursInTimeSpan = ad.DaysInTimeSpan * (ad.ApprovedHoursPerWeek / 7m); + ad.ApprovedHoursTotal = ad.DaysTotal * (ad.ApprovedHoursPerWeek / 7m); + + decimal minutenIstBisEndeBeleg = 0; + decimal minutenIstVormonat = 0; + + DateTime end = pRO.EndDate.Date.AddDays(1); + + Dictionary groupBookingDict = new Dictionary(); + foreach (var item in allServiceRecords) + { + if (!item.GroupOid.HasValue || !groupBookingDict.ContainsKey(item.GroupOid.Value)) + { + if (item.GroupOid.HasValue) + groupBookingDict.Add(item.GroupOid.Value, true); + + if (item.Start != null && item.Start >= ad.TotalStartDate) + { + if (item.ServiceDescription != null && + item.ServiceDescription.ServiceCategory != null && + item.ServiceDescription.ServiceCategory.IsBillable) + { + if (scap.ServiceCategory == null || scap.ServiceCategory.ServiceCategoryOid == item.ServiceDescription.ServiceCategory.Oid) + if (item.Start.Value < end) + { + var prozent = item.ServiceDescription.ServiceCategory.ProzentAbrechnung; + if (item.ServiceDescription.ProzentAbrechnung.HasValue) + { + prozent = item.ServiceDescription.ProzentAbrechnung.Value; + + } + + minutenIstBisEndeBeleg += (item.RoundedDuration * prozent) / 100; + + if (item.Start.Value < endeVormonat.AddDays(1)) + { + minutenIstVormonat += (item.RoundedDuration * prozent) / 100; + } + } + } + } + } + } + + ad.UsedHoursPreviousMonths = minutenIstVormonat / 60; + } + } + } + } + + return adList; + } + } +} diff --git a/ReportImp/DiakonischesWerkDinslakenJuDi/Leistungsnachweis.resx b/ReportImp/DiakonischesWerkDinslakenJuDi/Leistungsnachweis.resx index f6606300d..c7e0d4bdf 100644 --- a/ReportImp/DiakonischesWerkDinslakenJuDi/Leistungsnachweis.resx +++ b/ReportImp/DiakonischesWerkDinslakenJuDi/Leistungsnachweis.resx @@ -117,7 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 21, 17 - \ No newline at end of file diff --git a/ReportImp/DiakonischesWerkDinslakenJuDi/Properties/licenses.licx b/ReportImp/DiakonischesWerkDinslakenJuDi/Properties/licenses.licx index e69de29bb..d59547a61 100644 --- a/ReportImp/DiakonischesWerkDinslakenJuDi/Properties/licenses.licx +++ b/ReportImp/DiakonischesWerkDinslakenJuDi/Properties/licenses.licx @@ -0,0 +1 @@ +DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a From 8c6a9d88471dcec9f286e50a54fac2d2551c7828 Mon Sep 17 00:00:00 2001 From: Alexandra Date: Tue, 23 Apr 2024 16:27:52 +0200 Subject: [PATCH 2/5] =?UTF-8?q?PerspektiveSelbstst=C3=A4ndigesLeben/Settle?= =?UTF-8?q?mentReport2=20-=20Nacharbeiten?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SettlementReport2.cs | 2 +- .../SettlementReport2.designer.cs | 51 +++++++++++++------ .../SettlementReport2.resx | 2 +- 3 files changed, 37 insertions(+), 18 deletions(-) diff --git a/ReportImp/PerspektiveSelbstständigesLeben/SettlementReport2.cs b/ReportImp/PerspektiveSelbstständigesLeben/SettlementReport2.cs index 2bccbb595..4256ba26a 100644 --- a/ReportImp/PerspektiveSelbstständigesLeben/SettlementReport2.cs +++ b/ReportImp/PerspektiveSelbstständigesLeben/SettlementReport2.cs @@ -87,7 +87,7 @@ namespace PerspektiveSL } if (!HatGruppen(pRO)) - lblGruppe.Text = String.Format("{0} {1} hat nicht an Gruppenangeboten teilgenommen.", pRO.Salutation2, pRO.CustomerLastName); + lblGruppe.Text = String.Format("{0} {1} hat nicht an Gruppenangeboten teilgenommen.", pRO.Salutation1, pRO.CustomerLastName); if (pRO.FehlkontakteString != null && pRO.FehlkontakteString.Length > 0) pRO.FehlkontakteString += " - Fehlkontakte werden von uns mit 80% des Stundensatzes abgerechnet."; diff --git a/ReportImp/PerspektiveSelbstständigesLeben/SettlementReport2.designer.cs b/ReportImp/PerspektiveSelbstständigesLeben/SettlementReport2.designer.cs index 587de88f6..69d8a057b 100644 --- a/ReportImp/PerspektiveSelbstständigesLeben/SettlementReport2.designer.cs +++ b/ReportImp/PerspektiveSelbstständigesLeben/SettlementReport2.designer.cs @@ -91,6 +91,7 @@ namespace PerspektiveSL this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableRow10 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.fieldApprovedWithFactor = new DevExpress.XtraReports.UI.CalculatedField(); this.PageFooter = new DevExpress.XtraReports.UI.PageFooterBand(); this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText(); @@ -112,15 +113,15 @@ namespace PerspektiveSL this.xrTableRow16 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -156,7 +157,7 @@ namespace PerspektiveSL this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel9.SizeF = new System.Drawing.SizeF(387.5F, 23.95833F); this.xrLabel9.StylePriority.UseFont = false; - this.xrLabel9.Text = "perspektive Selständiges Leben · \r\nVenloer Straße 341 / 50823 Köln"; + this.xrLabel9.Text = "perspektive - Selbständiges Leben - GmbH · \r\nVenloer Straße 341 / 50823 Köln"; // // xrLabel8 // @@ -175,7 +176,7 @@ namespace PerspektiveSL // xrTable1 // this.xrTable1.BorderColor = System.Drawing.SystemColors.ControlLight; - this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 391.2498F); + this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 404.7914F); this.xrTable1.Name = "xrTable1"; this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.rowErbrachteLeistung}); @@ -213,7 +214,7 @@ namespace PerspektiveSL // xrLabel6 // this.xrLabel6.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 310.6665F); + this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 324.2081F); this.xrLabel6.Multiline = true; this.xrLabel6.Name = "xrLabel6"; this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -224,7 +225,7 @@ namespace PerspektiveSL // lblAnrede // this.lblAnrede.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.lblAnrede.LocationFloat = new DevExpress.Utils.PointFloat(0F, 277.6666F); + this.lblAnrede.LocationFloat = new DevExpress.Utils.PointFloat(0F, 291.2083F); this.lblAnrede.Name = "lblAnrede"; this.lblAnrede.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.lblAnrede.SizeF = new System.Drawing.SizeF(317F, 17F); @@ -236,7 +237,7 @@ namespace PerspektiveSL this.xrLabel4.BackColor = System.Drawing.Color.Transparent; this.xrLabel4.CanShrink = true; this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 235.3333F); + this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 248.875F); this.xrLabel4.Multiline = true; this.xrLabel4.Name = "xrLabel4"; this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -251,7 +252,7 @@ namespace PerspektiveSL this.xrLabel3.BackColor = System.Drawing.Color.Transparent; this.xrLabel3.CanShrink = true; this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 219.3332F); + this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 232.8749F); this.xrLabel3.Name = "xrLabel3"; this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel3.SizeF = new System.Drawing.SizeF(617F, 16F); @@ -266,7 +267,7 @@ namespace PerspektiveSL this.xrLabel2.BackColor = System.Drawing.Color.Transparent; this.xrLabel2.CanShrink = true; this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 202.3332F); + this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 215.8749F); this.xrLabel2.Name = "xrLabel2"; this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel2.SizeF = new System.Drawing.SizeF(403.4583F, 17F); @@ -370,7 +371,7 @@ namespace PerspektiveSL this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel5.SizeF = new System.Drawing.SizeF(291.9999F, 17F); this.xrLabel5.StylePriority.UseFont = false; - this.xrLabel5.Text = "Im Voraus vielen Dank für Ihre Bemühungen"; + this.xrLabel5.Text = "Im Voraus vielen Dank für Ihre Bemühungen."; // // lblGruppe // @@ -520,7 +521,7 @@ namespace PerspektiveSL // xrLabel11 // this.xrLabel11.Borders = DevExpress.XtraPrinting.BorderSide.Top; - this.xrLabel11.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.xrLabel11.Font = new DevExpress.Drawing.DXFont("Arial", 8.5F); this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(0F, 284.6666F); this.xrLabel11.Name = "xrLabel11"; this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -531,7 +532,7 @@ namespace PerspektiveSL // // xrLabel14 // - this.xrLabel14.Font = new DevExpress.Drawing.DXFont("Arial", 8F); + this.xrLabel14.Font = new DevExpress.Drawing.DXFont("Arial", 8.5F); this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 301.6666F); this.xrLabel14.Name = "xrLabel14"; this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -572,6 +573,7 @@ namespace PerspektiveSL // GroupHeader1 // this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel13, this.xrRichText3, this.xrLabel1, this.xrLabel_RecipientContactPerson, @@ -587,7 +589,7 @@ namespace PerspektiveSL this.xrLabel8, this.xrLabel9}); this.GroupHeader1.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); - this.GroupHeader1.HeightF = 408.2498F; + this.GroupHeader1.HeightF = 421.7914F; this.GroupHeader1.Name = "GroupHeader1"; this.GroupHeader1.StylePriority.UseFont = false; // @@ -616,6 +618,8 @@ namespace PerspektiveSL this.Detail1.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); this.Detail1.HeightF = 17F; this.Detail1.Name = "Detail1"; + this.Detail1.SortFields.AddRange(new DevExpress.XtraReports.UI.GroupField[] { + new DevExpress.XtraReports.UI.GroupField("PeriodStartDate", DevExpress.XtraReports.UI.XRColumnSortOrder.Ascending)}); this.Detail1.StylePriority.UseFont = false; // // xrTable2 @@ -762,6 +766,10 @@ namespace PerspektiveSL this.xrTableCell7.StylePriority.UsePadding = false; this.xrTableCell7.Weight = 3D; // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO); + // // fieldApprovedWithFactor // this.fieldApprovedWithFactor.Expression = "[ApprovedFLSTotal] * [RateFactor]"; @@ -991,9 +999,19 @@ namespace PerspektiveSL this.xrTableCell21.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; this.xrTableCell21.Weight = 0.21685899000901443D; // - // bindingSource1 + // xrLabel13 // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO); + this.xrLabel13.BackColor = System.Drawing.Color.Transparent; + this.xrLabel13.CanShrink = true; + this.xrLabel13.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(0F, 198.8749F); + this.xrLabel13.Name = "xrLabel13"; + this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel13.SizeF = new System.Drawing.SizeF(403.4583F, 17F); + this.xrLabel13.StylePriority.UseBackColor = false; + this.xrLabel13.StylePriority.UseFont = false; + this.xrLabel13.Text = "Fachdienst-Nr. 2000159950"; + this.xrLabel13.WordWrap = false; // // Spitzabrechnung // @@ -1023,9 +1041,9 @@ namespace PerspektiveSL ((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } @@ -1114,5 +1132,6 @@ namespace PerspektiveSL private DevExpress.XtraReports.UI.XRTableRow xrTableRow16; private DevExpress.XtraReports.UI.XRTableCell xrTableCell20; private DevExpress.XtraReports.UI.XRTableCell xrTableCell21; + private DevExpress.XtraReports.UI.XRLabel xrLabel13; } } diff --git a/ReportImp/PerspektiveSelbstständigesLeben/SettlementReport2.resx b/ReportImp/PerspektiveSelbstständigesLeben/SettlementReport2.resx index ec27fecc7..186594771 100644 --- a/ReportImp/PerspektiveSelbstständigesLeben/SettlementReport2.resx +++ b/ReportImp/PerspektiveSelbstständigesLeben/SettlementReport2.resx @@ -127,6 +127,6 @@ ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAEEAcAB0AG8AcwA7AH0AewBcAGYAMwAgAEEAcgBpAGEAbAA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwBcAHIAZQBkADIANQA1AFwAZwByAGUAZQBuADIANQA1AFwAYgBsAHUAZQAyADUANQAgADsAfQB7AFwAKgBcAGQAZQBmAGMAaABwACAAXABmADEAXABmAHMAMgAyAFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGsAZQByAG4AaQBuAGcAMgB9AHsAXAAqAFwAZABlAGYAcABhAHAAIABcAHcAaQBkAGMAdABsAHAAYQByAFwAcwBsADIANQA4AFwAcwBsAG0AdQBsAHQAMQBcAHMAYQAxADYAMAB9AHsAXABzAHQAeQBsAGUAcwBoAGUAZQB0ACAAewBcAHMAbgBlAHgAdAAwAFwAcwBxAGYAbwByAG0AYQB0AFwAcQBsAFwAZgBzADIAMgBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAIABOAG8AcgBtAGEAbAA7AH0AewBcACoAXABjAHMAMQBcAGYAMgBcAGYAcwAyADIAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAawBlAHIAbgBpAG4AZwAyAFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADIAXABmAHMAMgAyAFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGsAZQByAG4AaQBuAGcAMgBcAGMAZgAxACAATABpAG4AZQAgAE4AdQBtAGIAZQByADsAfQB7AFwAKgBcAGMAcwAzAFwAZgAyAFwAZgBzADIAMgBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXAB1AGwAXABrAGUAcgBuAGkAbgBnADIAXABjAGYAMgAgAEgAeQBwAGUAcgBsAGkAbgBrADsAfQB7AFwAKgBcAHQAcwA0AFwAdABzAHIAbwB3AGQAXABmADIAXABmAHMAMgAyAFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGsAZQByAG4AaQBuAGcAMgBcAHEAbABcAHMAbAAyADUAOABcAHMAbABtAHUAbAB0ADEAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAGIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgByADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAHIAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAdAAzAFwAdABzAHYAZQByAHQAYQBsAHQAXABjAGwAdAB4AGwAcgB0AGIAIABOAG8AcgBtAGEAbAAgAFQAYQBiAGwAZQA7AH0AewBcACoAXAB0AHMANQBcAHQAcwByAG8AdwBkAFwAcwBiAGEAcwBlAGQAbwBuADQAXABmADIAXABmAHMAMgAyAFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGsAZQByAG4AaQBuAGcAMgBcAHEAbABcAHMAbAAyADUAOABcAHMAbABtAHUAbAB0ADEAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAaAB0AG0AYQB1AHQAcwBwAFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGEAbABuAHQAYgBsAGkAbgBkAFwAZQB4AHAAcwBoAHIAdABuAFwAcwBwAGwAdABwAGcAcABhAHIAXABuAG8AZwByAG8AdwBhAHUAdABvAGYAaQB0AFwAdQB0AGkAbgBsAFwAbgBvAHQAYgByAGsAYwBuAHMAdABmAHIAYwB0AGIAbABcAG4AbwBiAHIAawB3AHIAcAB0AGIAbABcAGYAdABuAGwAeQB0AHcAbgBpAG4AZQBcAG4AbwB0AGMAdgBhAHMAcABcAGQAbgB0AGIAbABuAHMAYgBkAGIAXABuAGUAdwB0AGIAbABzAHQAeQByAHUAbABzAFwAdAByAGEAYwBrAG0AbwB2AGUAcwAwAFwAZABlAGYAdABhAGIANwAwADgAXABoAHkAcABoAGgAbwB0AHoANAAyADUAXABmAG8AcgBtAHMAaABhAGQAZQBcAGoAZQB4AHAAYQBuAGQAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAdwBpAGQAYwB0AGwAcABhAHIAXABzAGgAYQBkAGkAbgBnADEAMAAwADAAMABcAGMAZgBwAGEAdAAzAFwAYwBiAHAAYQB0ADMAXAB0AHgAMQA0ADEAOAB7AFwAZgAzAFwAZgBzADEANQBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABjAGYAMQAgAEEAbgBzAHAAcgBlAGMAaABwAGEAcgB0AG4AZQByACoAaQBuADoAfQBcAGYAMwBcAGYAcwAxADUAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXAB3AGkAZABjAHQAbABwAGEAcgBcAHMAaABhAGQAaQBuAGcAMQAwADAAMAAwAFwAYwBmAHAAYQB0ADMAXABjAGIAcABhAHQAMwBcAHQAeAAxADQAMQA4AHsAXABmADMAXABmAHMAMQA1AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGkAXABjAGYAMQAgAEQAaQBwAGwALgAgAFMAbwB6AGkAYQBsAHAAXAB1ADIAMgA4AFwAJwBlADQAZABhAGcAbwBnAGUAIABSAFwAdQAyADUAMgBcACcAZgBjAGQAaQBnAGUAcgAgAEsAdQBzAHMAfQBcAGYAMwBcAGYAcwAxADUAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAaQBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAdwBpAGQAYwB0AGwAcABhAHIAXABzAGgAYQBkAGkAbgBnADEAMAAwADAAMABcAGMAZgBwAGEAdAAzAFwAYwBiAHAAYQB0ADMAXAB0AHgAMQA0ADEAOABcAGYAMwBcAGYAcwAxADUAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXAB3AGkAZABjAHQAbABwAGEAcgBcAHMAaABhAGQAaQBuAGcAMQAwADAAMAAwAFwAYwBmAHAAYQB0ADMAXABjAGIAcABhAHQAMwBcAHQAeAAxADQAMQA4AHsAXABmADMAXABmAHMAMQA1AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGMAZgAxACAAVABlAGwAZQBmAG8AbgAtAEQAdQByAGMAaAB3AGEAaABsADoAfQBcAGYAMwBcAGYAcwAxADUAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXAB3AGkAZABjAHQAbABwAGEAcgBcAHMAaABhAGQAaQBuAGcAMQAwADAAMAAwAFwAYwBmAHAAYQB0ADMAXABjAGIAcABhAHQAMwBcAHQAeAAxADQAMQA4AHsAXABmADMAXABmAHMAMQA1AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGkAXABjAGYAMQAgACgAMAAyACAAMgAxACkAIAAyADIAIAAyADUAIAAyADcALQAyADEAfQBcAGYAMwBcAGYAcwAxADUAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAaQBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAdwBpAGQAYwB0AGwAcABhAHIAXABzAGgAYQBkAGkAbgBnADEAMAAwADAAMABcAGMAZgBwAGEAdAAzAFwAYwBiAHAAYQB0ADMAXAB0AHgAMQA0ADEAOABcAGYAMwBcAGYAcwAxADUAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXAB3AGkAZABjAHQAbABwAGEAcgBcAHMAaABhAGQAaQBuAGcAMQAwADAAMAAwAFwAYwBmAHAAYQB0ADMAXABjAGIAcABhAHQAMwBcAHQAeAAxADQAMQA4AHsAXABmADMAXABmAHMAMQA1AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGMAZgAxACAARQAtAE0AYQBpAGwAOgB9AFwAZgAzAFwAZgBzADEANQBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAHcAaQBkAGMAdABsAHAAYQByAFwAcwBoAGEAZABpAG4AZwAxADAAMAAwADAAXABjAGYAcABhAHQAMwBcAGMAYgBwAGEAdAAzAFwAdAB4ADEANAAxADgAewBcAGYAMwBcAGYAcwAxADUAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAaQBcAGMAZgAxACAAcgB1AGUAZABpAGcAZQByAC4AawB1AHMAcwBAAHAAZQByAHMAcABlAGsAdABpAHYAZQAtAGIAZQB3AG8ALgBkAGUAfQBcAGYAMwBcAGYAcwAxADUAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAYwBmADEAXABwAGEAcgB9AA== - ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAEEAcgBpAGEAbAA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwBcAHIAZQBkADEAMAAwAFwAZwByAGUAZQBuADEAMAAxAFwAYgBsAHUAZQAxADAAMwAgADsAXAByAGUAZAAyADMAOABcAGcAcgBlAGUAbgAxADIANwBcAGIAbAB1AGUAMQAgADsAfQB7AFwAKgBcAGQAZQBmAGMAaABwACAAXABmADEAXABmAHMAMgA0AH0AewBcACoAXABkAGUAZgBwAGEAcAAgAFwAdwBpAGQAYwB0AGwAcABhAHIAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXABmADEAXABmAHMAMgA0AFwAdQBsAFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAaAB0AG0AYQB1AHQAcwBwAFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGEAbABuAHQAYgBsAGkAbgBkAFwAZQB4AHAAcwBoAHIAdABuAFwAcwBwAGwAdABwAGcAcABhAHIAXABuAG8AZwByAG8AdwBhAHUAdABvAGYAaQB0AFwAdQB0AGkAbgBsAFwAbgBvAGIAcgBrAHcAcgBwAHQAYgBsAFwAZgB0AG4AbAB5AHQAdwBuAGkAbgBlAFwAbgBvAHQAYwB2AGEAcwBwAFwAZABuAHQAYgBsAG4AcwBiAGQAYgBcAG4AZQB3AHQAYgBsAHMAdAB5AHIAdQBsAHMAXABmAG8AcgBtAHMAaABhAGQAZQBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGMAXAB3AGkAZABjAHQAbABwAGEAcgBcAHMAYgA2ADAAXABzAGEANgAwAHsAXABmADIAXABmAHMAMQAzAFwAYgBcAGMAZgAzACAAcABlAHIAcwBwAGUAawB0AGkAdgBlACAAXAB1ADgAMgAxADEAXAAnADkANgAgAFMAZQBsAGIAcwB0AFwAdQAyADIAOABcACcAZQA0AG4AZABpAGcAZQBzACAATABlAGIAZQBuACAAIAAgAH0AewBcAGYAMgBcAGYAcwAxADMAXABiAFwAYwBmADQAIAAvAH0AewBcAGYAMgBcAGYAcwAxADMAXABiAFwAYwBmADMAIAAgACAAIAAgAFYAZQBuAGwAbwBlAHIAIABTAHQAcgBhAFwAdQAyADIAMwBcACcAZABmAGUAIAAzADQAMQAgACAAIAAgAH0AewBcAGYAMgBcAGYAcwAxADMAXABiAFwAYwBmADQAIAAvAH0AewBcAGYAMgBcAGYAcwAxADMAXABiAFwAYwBmADMAIAAgACAAIAAgADUAMAA4ADIAMwAgAEsAXAB1ADIANAA2AFwAJwBmADYAbABuAH0AXABmADIAXABmAHMAMQAzAFwAYgBcAGMAZgAzAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBjAFwAdwBpAGQAYwB0AGwAcABhAHIAXABzAGIANgAwAFwAcwBhADYAMAB7AFwAZgAyAFwAZgBzADEAMwBcAGIAXABjAGYAMwAgAFQAZQBsAGUAZgBvAG4AIAAoADAAMgAyADEAKQAgADIAMgAgADIANQAgADIANwAtACAAMAAgAC8AIABGAGEAeAAgAC0AMQAwACAAIAAgACAAfQB7AFwAZgAyAFwAZgBzADEAMwBcAGIAXABjAGYANAAgAC8AfQB7AFwAZgAyAFwAZgBzADEAMwBcAGIAXABjAGYAMwAgACAAIAAgACAAdABlAGEAbQBAAHAAZQByAHMAcABlAGsAdABpAHYAZQAtAGIAZQB3AG8ALgBkAGUAIAAgACAAfQB7AFwAZgAyAFwAZgBzADEAMwBcAGIAXABjAGYANAAgAC8AfQB7AFwAZgAyAFwAZgBzADEAMwBcAGIAXABjAGYAMwAgACAAIAAgAHQAZQBhAG0AQABwAGUAcgBzAHAAZQBrAHQAaQB2AGUALQBlAGcAaAAuAGQAZQAgACAAIAAgAH0AewBcAGYAMgBcAGYAcwAxADMAXABiAFwAYwBmADQAIAAvAH0AewBcAGYAMgBcAGYAcwAxADMAXABiAFwAYwBmADMAIAAgACAAIAB3AHcAdwAuAHAAZQByAHMAcABlAGsAdABpAHYAZQAtAGIAZQB3AG8ALgBkAGUAfQBcAGYAMgBcAGYAcwAxADMAXABiAFwAYwBmADMAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGMAXAB3AGkAZABjAHQAbABwAGEAcgBcAHMAYgA2ADAAXABzAGEANgAwAHsAXABmADIAXABmAHMAMQAzAFwAYgBcAGMAZgAzACAARwBlAHMAZQBsAGwAcwBjAGgAYQBmAHQAIABtAGkAdAAgAGIAZQBzAGMAaAByAFwAdQAyADIAOABcACcAZQA0AG4AawB0AGUAcgAgAEgAYQBmAHQAdQBuAGcAIAAtACAARwBtAGIASAAgAC0AIAAgACAAfQB7AFwAZgAyAFwAZgBzADEAMwBcAGIAXABjAGYANAAgAC8AIAAgACAAIAB9AHsAXABmADIAXABmAHMAMQAzAFwAYgBcAGMAZgAzACAARgBhAGMAaABsAGkAYwBoAGUAcgAgAEwAZQBpAHQAZQByACAAdQBuAGQAIABHAGUAcwBjAGgAXAB1ADIAMgA4AFwAJwBlADQAZgB0AHMAZgBcAHUAMgA1ADIAXAAnAGYAYwBoAHIAZQByADoAIABEAGkAcABsAC4AIABTAG8AegBpAGEAbABwAFwAdQAyADIAOABcACcAZQA0AGQAYQBnAG8AZwBlACAAUgBcAHUAMgA1ADIAXAAnAGYAYwBkAGkAZwBlAHIAIABLAHUAcwBzAH0AXABmADIAXABmAHMAMQAzAFwAYgBcAGMAZgA0AFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBjAFwAdwBpAGQAYwB0AGwAcABhAHIAXABzAGIANgAwAFwAcwBhADYAMAB7AFwAZgAyAFwAZgBzADEAMwBcAGIAXABjAGYAMwAgAFMAaQB0AHoAIAB1AG4AZAAgAFIAZQBnAGkAcwB0AGUAcgBnAGUAcgBpAGMAaAB0ACAASwBcAHUAMgA0ADYAXAAnAGYANgBsAG4AIABIAFIAQgAgADcAMgA0ADYANwAgACAAIAAgAH0AewBcAGYAMgBcAGYAcwAxADMAXABiAFwAYwBmADQAIAAvAH0AewBcAGYAMgBcAGYAcwAxADMAXABiAFwAYwBmADMAIAAgACAAIAAgAEIAYQBuAGsAdgBlAHIAYgBpAG4AZAB1AG4AZwA6ACAAUwBwAGEAcgBrAGEAcwBzAGUAIABLAFwAdQAyADQANgBcACcAZgA2AGwAbgBCAG8AbgBuACAAIABJAEIAQQBOADoAIABEAEUANAA0ACAAMwA3ADAANQAgADAAMQA5ADgAIAAxADkAMwAwACAAMQAyADkANgAgADcAOQAgACAAIABCAEkAQwA6ACAAQwBPAEwAUwBEAEUAMwAzAFgAWABYAH0AXABmADIAXABmAHMAMQAzAFwAYgBcAGMAZgAzAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAdwBpAGQAYwB0AGwAcABhAHIAXABmADEAXABmAHMAMgAwAFwAYwBmADEAXABwAGEAcgB9AA== + ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAEEAcgBpAGEAbAA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwBcAHIAZQBkADEAMAAwAFwAZwByAGUAZQBuADEAMAAxAFwAYgBsAHUAZQAxADAAMwAgADsAXAByAGUAZAAyADMAOABcAGcAcgBlAGUAbgAxADIANwBcAGIAbAB1AGUAMQAgADsAfQB7AFwAKgBcAGQAZQBmAGMAaABwACAAXABmADEAXABmAHMAMgA0AH0AewBcACoAXABkAGUAZgBwAGEAcAAgAFwAdwBpAGQAYwB0AGwAcABhAHIAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXABmADEAXABmAHMAMgA0AFwAdQBsAFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAaAB0AG0AYQB1AHQAcwBwAFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGEAbABuAHQAYgBsAGkAbgBkAFwAZQB4AHAAcwBoAHIAdABuAFwAcwBwAGwAdABwAGcAcABhAHIAXABuAG8AZwByAG8AdwBhAHUAdABvAGYAaQB0AFwAdQB0AGkAbgBsAFwAbgBvAGIAcgBrAHcAcgBwAHQAYgBsAFwAZgB0AG4AbAB5AHQAdwBuAGkAbgBlAFwAbgBvAHQAYwB2AGEAcwBwAFwAZABuAHQAYgBsAG4AcwBiAGQAYgBcAG4AZQB3AHQAYgBsAHMAdAB5AHIAdQBsAHMAXABmAG8AcgBtAHMAaABhAGQAZQBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGMAXAB3AGkAZABjAHQAbABwAGEAcgBcAHMAYgA2ADAAXABzAGEANgAwAHsAXABmADIAXABmAHMAMQAzAFwAYgBcAGMAZgAzACAAcABlAHIAcwBwAGUAawB0AGkAdgBlACAAXAB1ADgAMgAxADEAXAAnADkANgAgAFMAZQBsAGIAcwB0AFwAdQAyADIAOABcACcAZQA0AG4AZABpAGcAZQBzACAATABlAGIAZQBuACAAfQB7AFwAZgAyAFwAZgBzADEAMwBcAGIAXABjAGYAMwAgAFwAdQA4ADIAMQAxAFwAJwA5ADYAIAB9AHsAXABmADIAXABmAHMAMQAzAFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGIAXABjAGYAMwAgAEcAbQBiAEgAfQB7AFwAZgAyAFwAZgBzADEAMwBcAGIAXABjAGYAMwAgACAAIAB9AHsAXABmADIAXABmAHMAMQAzAFwAYgBcAGMAZgA0ACAALwB9AHsAXABmADIAXABmAHMAMQAzAFwAYgBcAGMAZgAzACAAIAAgACAAIABWAGUAbgBsAG8AZQByACAAUwB0AHIAYQBcAHUAMgAyADMAXAAnAGQAZgBlACAAMwA0ADEAIAAgACAAIAB9AHsAXABmADIAXABmAHMAMQAzAFwAYgBcAGMAZgA0ACAALwB9AHsAXABmADIAXABmAHMAMQAzAFwAYgBcAGMAZgAzACAAIAAgACAAIAA1ADAAOAAyADMAIABLAFwAdQAyADQANgBcACcAZgA2AGwAbgB9AFwAZgAyAFwAZgBzADEAMwBcAGIAXABjAGYAMwBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAYwBcAHcAaQBkAGMAdABsAHAAYQByAFwAcwBiADYAMABcAHMAYQA2ADAAewBcAGYAMgBcAGYAcwAxADMAXABiAFwAYwBmADMAIABUAGUAbABlAGYAbwBuACAAKAAwADIAMgAxACkAIAAyADIAIAAyADUAIAAyADcALQAgADAAIAAvACAARgBhAHgAIAAtADEAMAAgACAAIAAgAH0AewBcAGYAMgBcAGYAcwAxADMAXABiAFwAYwBmADQAIAAvAH0AewBcAGYAMgBcAGYAcwAxADMAXABiAFwAYwBmADMAIAAgACAAIAAgAHQAZQBhAG0AQABwAGUAcgBzAHAAZQBrAHQAaQB2AGUALQBiAGUAdwBvAC4AZABlACAAIAAgAH0AewBcAGYAMgBcAGYAcwAxADMAXABiAFwAYwBmADQAIAAvAH0AewBcAGYAMgBcAGYAcwAxADMAXABiAFwAYwBmADMAIAAgACAAIAB0AGUAYQBtAEAAcABlAHIAcwBwAGUAawB0AGkAdgBlAC0AZQBnAGgALgBkAGUAIAAgACAAIAB9AHsAXABmADIAXABmAHMAMQAzAFwAYgBcAGMAZgA0ACAALwB9AHsAXABmADIAXABmAHMAMQAzAFwAYgBcAGMAZgAzACAAIAAgACAAdwB3AHcALgBwAGUAcgBzAHAAZQBrAHQAaQB2AGUALQBiAGUAdwBvAC4AZABlAH0AXABmADIAXABmAHMAMQAzAFwAYgBcAGMAZgAzAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBjAFwAdwBpAGQAYwB0AGwAcABhAHIAXABzAGIANgAwAFwAcwBhADYAMAB7AFwAZgAyAFwAZgBzADEAMwBcAGIAXABjAGYAMwAgAEcAZQBzAGUAbABsAHMAYwBoAGEAZgB0ACAAbQBpAHQAIABiAGUAcwBjAGgAcgBcAHUAMgAyADgAXAAnAGUANABuAGsAdABlAHIAIABIAGEAZgB0AHUAbgBnACAALQAgAEcAbQBiAEgAIAAtACAAIAAgAH0AewBcAGYAMgBcAGYAcwAxADMAXABiAFwAYwBmADQAIAAvACAAIAAgACAAfQB7AFwAZgAyAFwAZgBzADEAMwBcAGIAXABjAGYAMwAgAEYAYQBjAGgAbABpAGMAaABlAHIAIABMAGUAaQB0AGUAcgAgAHUAbgBkACAARwBlAHMAYwBoAFwAdQAyADIAOABcACcAZQA0AGYAdABzAGYAXAB1ADIANQAyAFwAJwBmAGMAaAByAGUAcgA6ACAARABpAHAAbAAuACAAUwBvAHoAaQBhAGwAcABcAHUAMgAyADgAXAAnAGUANABkAGEAZwBvAGcAZQAgAFIAXAB1ADIANQAyAFwAJwBmAGMAZABpAGcAZQByACAASwB1AHMAcwB9AFwAZgAyAFwAZgBzADEAMwBcAGIAXABjAGYANABcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAYwBcAHcAaQBkAGMAdABsAHAAYQByAFwAcwBiADYAMABcAHMAYQA2ADAAewBcAGYAMgBcAGYAcwAxADMAXABiAFwAYwBmADMAIABTAGkAdAB6ACAAdQBuAGQAIABSAGUAZwBpAHMAdABlAHIAZwBlAHIAaQBjAGgAdAAgAEsAXAB1ADIANAA2AFwAJwBmADYAbABuACAASABSAEIAIAA3ADIANAA2ADcAIAAgACAAIAB9AHsAXABmADIAXABmAHMAMQAzAFwAYgBcAGMAZgA0ACAALwB9AHsAXABmADIAXABmAHMAMQAzAFwAYgBcAGMAZgAzACAAIAAgACAAIABCAGEAbgBrAHYAZQByAGIAaQBuAGQAdQBuAGcAOgAgAFMAcABhAHIAawBhAHMAcwBlACAASwBcAHUAMgA0ADYAXAAnAGYANgBsAG4AQgBvAG4AbgAgACAASQBCAEEATgA6ACAARABFADQANAAgADMANwAwADUAIAAwADEAOQA4ACAAMQA5ADMAMAAgADEAMgA5ADYAIAA3ADkAIAAgACAAQgBJAEMAOgAgAEMATwBMAFMARABFADMAMwBYAFgAWAB9AFwAZgAyAFwAZgBzADEAMwBcAGIAXABjAGYAMwBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAHcAaQBkAGMAdABsAHAAYQByAFwAZgAxAFwAZgBzADIAMABcAGMAZgAxAFwAcABhAHIAfQA= \ No newline at end of file From 7cb070514b27e46ff8c0b7c15548d42356fba66f Mon Sep 17 00:00:00 2001 From: Lyndon Jetten Date: Tue, 23 Apr 2024 17:24:14 +0200 Subject: [PATCH 3/5] =?UTF-8?q?MoK:=20Leistungskategorien=20werden=20jetzt?= =?UTF-8?q?=20korrekt=20ausgew=C3=A4hlt.=20+=20Ein=20Bisschen=20Externe-Si?= =?UTF-8?q?gnatur-Link=20weitergemacht.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ExternalSignatureController.cs | 2 + BeWoPlanerMobil/Controllers/MainController.cs | 57 ++- BeWoPlanerMobil/Models/MainModel.cs | 4 + .../Util/FormCollectionConstants.cs | 5 - .../Views/Main/SingleBookingPartial.cshtml | 335 +++++++++--------- Service/Security/SecurityUtils.cs | 90 +++-- Service/ServiceContracts/IDownloadService.cs | 4 - .../DownloadServiceImp.cs | 35 -- 8 files changed, 282 insertions(+), 250 deletions(-) diff --git a/BeWoPlanerMobil/Controllers/ExternalSignatureController.cs b/BeWoPlanerMobil/Controllers/ExternalSignatureController.cs index 962975425..802377219 100644 --- a/BeWoPlanerMobil/Controllers/ExternalSignatureController.cs +++ b/BeWoPlanerMobil/Controllers/ExternalSignatureController.cs @@ -6,6 +6,8 @@ namespace BeWoPlanerMobil.Controllers { public ActionResult ExternalSignature(string token) { + var info = BeWo.Service.Security.SecurityUtils.SliceOneTimeLinkToken(token); + return View(); } } diff --git a/BeWoPlanerMobil/Controllers/MainController.cs b/BeWoPlanerMobil/Controllers/MainController.cs index b93c34390..081bf3d84 100644 --- a/BeWoPlanerMobil/Controllers/MainController.cs +++ b/BeWoPlanerMobil/Controllers/MainController.cs @@ -346,17 +346,6 @@ namespace BeWoPlanerMobil.Controllers UserService.UpdateUserSettings(loggedInUser.UserOid.Value, userSettings); } - [Authorize] - private void SaveServiceRecordTimeIntervalToSession(ServiceRecordTimeInterval serviceRecordTimeInterval) - { - if(Model is null) - { - return; - } - - Session[SessionConstants.ServiceRecordTimeIntervalKey] = serviceRecordTimeInterval; - } - [Authorize] public void LoadGoalRatings() { @@ -847,15 +836,15 @@ namespace BeWoPlanerMobil.Controllers try { - var scm = Model.ServiceCategories.FirstOrDefault(s => s.ServiceCategoryOid.HasValue && s.ServiceCategoryOid.Value == pServiceCategoryOid); + var serviceCategoryModel = Model.ServiceCategories.FirstOrDefault(s => s.ServiceCategoryOid.HasValue && s.ServiceCategoryOid.Value == pServiceCategoryOid); - if(scm != null) + if(serviceCategoryModel != null) { - Model.SelectedServiceCategoryOid = scm.ServiceCategoryOid; - Model.SelectedServiceDescriptionOid = scm.ServiceDescriptions.OrderBy(serviceDescription => serviceDescription.Position).FirstOrDefault()?.ServiceDescriptionOid; + Model.SelectedServiceCategoryOid = serviceCategoryModel.ServiceCategoryOid; + Model.SelectedServiceDescriptionOid = serviceCategoryModel.ServiceDescriptions.OrderBy(serviceDescription => serviceDescription.Position).FirstOrDefault()?.ServiceDescriptionOid; } - return SerializeObject(scm != null ? scm.ServiceDescriptions.OrderBy(serviceDescription => serviceDescription.Position).ToList() : new List()); + return SerializeObject(serviceCategoryModel != null ? serviceCategoryModel.ServiceDescriptions.OrderBy(serviceDescription => serviceDescription.Position).ToList() : new List()); } catch(Exception exception) { @@ -1750,6 +1739,27 @@ namespace BeWoPlanerMobil.Controllers { Model.ServiceCategories = Model.ServiceCategories.OrderBy(serviceCategory => serviceCategory.Position).ToList(); } + + if(Model.SelectedSupportConcept?.Customer?.AbsenceTimes?.Any() ?? false) + { + foreach(var absenceTime in Model.SelectedSupportConcept.Customer.AbsenceTimes) + { + if(absenceTime.Start.HasValue && DateTime.Now > absenceTime.Start.Value && (absenceTime.End is null || DateTime.Now < absenceTime.End.Value)) + { + Model.IsCustomerAbsence = true; + Model.CustomerAbsenceInfo = $"{absenceTime.Reason.Description} von {absenceTime.Start:dd.MM.yyyy} bis {(absenceTime.End.HasValue ? absenceTime.End.Value.ToString("dd.MM.yyyy") : "unbekannt")}"; + break; + } + + Model.IsCustomerAbsence = false; + Model.CustomerAbsenceInfo = null; + } + } + else + { + Model.IsCustomerAbsence = false; + Model.CustomerAbsenceInfo = null; + } } [HttpPost] @@ -2917,7 +2927,10 @@ namespace BeWoPlanerMobil.Controllers return; } - var firstServiceDescription = serviceDescriptions.OrderBy(sd => sd.Position).ThenBy(sd => sd.ServiceDescriptionOid).First(); + // Hier erst nach Kategorie gehen und dann die Leistung mit der niedrigsten Position nehmen! + + var firstCategory = serviceDescriptions.Select(sd => sd.Category).OrderBy(sc => sc.Position).ThenBy(sc => sc.ServiceCategoryOid).First(); + var firstServiceDescription = serviceDescriptions.Where(sd => sd.Category.ServiceCategoryOid.Value.Equals(firstCategory.ServiceCategoryOid.Value)).OrderBy(sd => sd.Position).ThenBy(sd => sd.ServiceDescriptionOid).First(); if(serviceDescriptions.Any(a => a.ServiceDescriptionOid.HasValue && Model.SelectedServiceDescriptionOid.HasValue && a.ServiceDescriptionOid.Value.Equals(Model.SelectedServiceDescriptionOid))) { @@ -4114,8 +4127,9 @@ namespace BeWoPlanerMobil.Controllers [Authorize] public ActionResult GenerateOneTimeLinkForSignature(long serviceRecordOid) { - var token = DownloadService.CreateTemporaryTokenForOneTimeLink(serviceRecordOid.ToString(), false, 2); - + //var token = DownloadService.CreateTemporaryTokenForOneTimeLink(serviceRecordOid.ToString(), false, 2); + var token = BeWo.Service.Security.SecurityUtils.CreateExternalSignatureToken(serviceRecordOid); + var server = LoginController.GetServerFromTenant(MobileSessionFacade.Tenant); #if DEBUG @@ -4145,6 +4159,11 @@ namespace BeWoPlanerMobil.Controllers Model.OneTimeLinkText = $"Hilfeplan: {hilfeplan}
Kategorie: {kategorie}
Leistung: {leistung}
Mitarbeiter: {employee}
Datum / Uhrzeit: {datumUhrzeit}

"; + #if DEBUG + // ToDo: Länge des Tokens angeben + Model.OneTimeLinkText += $"

Länge des Token: {token.Length}"; + #endif + return PartialView("OneTimeLinkCreationPartial", Model); } diff --git a/BeWoPlanerMobil/Models/MainModel.cs b/BeWoPlanerMobil/Models/MainModel.cs index f16824837..3b930b08f 100644 --- a/BeWoPlanerMobil/Models/MainModel.cs +++ b/BeWoPlanerMobil/Models/MainModel.cs @@ -317,6 +317,7 @@ namespace BeWoPlanerMobil.Models get { var result = new List(); + result.AddRange(ServiceCategories.Select(item => new SelectListItem {Value = item.ServiceCategoryOid.Value.ToString(), Text = item.Name}).ToList()); return result; @@ -760,6 +761,9 @@ namespace BeWoPlanerMobil.Models public string OneTimeLink { get; set; } public string OneTimeLinkText { get; set; } + + public bool IsCustomerAbsence { get; set; } + public string CustomerAbsenceInfo { get; set; } } public class CustomSelectListItem diff --git a/BeWoPlanerMobil/Util/FormCollectionConstants.cs b/BeWoPlanerMobil/Util/FormCollectionConstants.cs index 91fe8a81e..9140e5781 100644 --- a/BeWoPlanerMobil/Util/FormCollectionConstants.cs +++ b/BeWoPlanerMobil/Util/FormCollectionConstants.cs @@ -63,11 +63,6 @@ public static string ReportViewerModelKey => "ReportViewerModel"; } - public class SessionConstants - { - public static string ServiceRecordTimeIntervalKey => "ServiceRecordTimeInterval"; - } - public class TempDataConstants { public static string ShowSignatureSuggestionPopup => "ShowSignatureSuggestionPopup"; diff --git a/BeWoPlanerMobil/Views/Main/SingleBookingPartial.cshtml b/BeWoPlanerMobil/Views/Main/SingleBookingPartial.cshtml index 43a27d766..55d3c0e34 100644 --- a/BeWoPlanerMobil/Views/Main/SingleBookingPartial.cshtml +++ b/BeWoPlanerMobil/Views/Main/SingleBookingPartial.cshtml @@ -155,6 +155,17 @@ } + if(Model.IsCustomerAbsence) + { +
+ + +
Klient ist abwesend
+

@Model.CustomerAbsenceInfo

+ +
+ } + using(Html.BeginForm("CreateOrUpdateServiceRecord", "Main", FormMethod.Post, new { onreset = "serviceDescriptionSelectOnReset('category-select', 'leistung-select', 'textmodule-container', 'tree')", id = "singleBookingForm" })) {
@@ -489,189 +500,189 @@ { if(Model.SelectedSupportConcept != null || Model.CostBearer2SupportConceptOid == -2) { -
- @using(Html.BeginForm("LoadServiceRecords", "Main", FormMethod.Post, new { id = "selectServiceRecordForm" })) - { -
-
-
- +
+ @using(Html.BeginForm("LoadServiceRecords", "Main", FormMethod.Post, new { id = "selectServiceRecordForm" })) + { +
+
+
+ -
-
-
- -
-
- - @*----- Anzahl Tage: [Nummern-Input] ----- *@ -
-
-
-
-
- Anzahl Tage:
- +
+
+
-
-
- @*----- Zeitraum wählen: [Von-Datum] bis [Bis-Datum] erster des Monats bis aktuelles Datum ----- *@ - var defaultStartDate = DateTime.Now.GetFirstOfMonth().ToShortDateString(); - var defaultEndDate = DateTime.Today.ToShortDateString(); -
-
-
-
-
-
-
-
- Von -
- -
-
-
+ @*----- Anzahl Tage: [Nummern-Input] ----- *@ +
+
+
+
+
+ Anzahl Tage:
+
-
-
-
-
- Bis +
+
+ + @*----- Zeitraum wählen: [Von-Datum] bis [Bis-Datum] erster des Monats bis aktuelles Datum ----- *@ + var defaultStartDate = DateTime.Now.GetFirstOfMonth().ToShortDateString(); + var defaultEndDate = DateTime.Today.ToShortDateString(); +
+
+
+
+
+
+
+
+ Von +
+ +
+
+
+
- -
-
+
+
+
+
+
+ Bis +
+ +
+
+
+
-
-
-
-
-
-
-
- Monat -
- -
-
-
-
-
-
-
- Jahr -
- + - } - } - + + + + + + + + + + + + +
+
+
+
+
+
+
+ Jahr +
+ +
+
-
+ }
} -
- }