From 3aa7b9c6a63b862310a70e781a0e1928694347b1 Mon Sep 17 00:00:00 2001 From: Marcel Hirschle Date: Wed, 17 Feb 2021 08:20:28 +0100 Subject: [PATCH] =?UTF-8?q?Anpassung=20Quittierungsbeleg=20f=C3=BCr=20Inpu?= =?UTF-8?q?t=20Familienhilfe?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BeWo.sln | 19 +++++++++++ .../Stundennachweis.designer.cs | 34 +++++++++---------- Service/Plugins/PluginLoader.cs | 4 +-- 3 files changed, 38 insertions(+), 19 deletions(-) diff --git a/BeWo.sln b/BeWo.sln index 8320017d6..3dcffd762 100644 --- a/BeWo.sln +++ b/BeWo.sln @@ -425,6 +425,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KompassBeWoWesel", "ReportI EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DieBrueckeHilfeUndHalt", "ReportImp\DieBrueckeHilfeUndHalt\DieBrueckeHilfeUndHalt.csproj", "{7981F6A5-05CE-471E-8B54-4AF0D0A6D94F}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InputFamilienhilfe", "ReportImp\InputFamilienhilfe\InputFamilienhilfe.csproj", "{2C071D8A-E6B8-4284-8AF7-14CA8AB4D6A8}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|.NET = Debug|.NET @@ -3212,6 +3214,22 @@ Global {7981F6A5-05CE-471E-8B54-4AF0D0A6D94F}.Release|Mixed Platforms.Build.0 = Release|Any CPU {7981F6A5-05CE-471E-8B54-4AF0D0A6D94F}.Release|x86.ActiveCfg = Release|Any CPU {7981F6A5-05CE-471E-8B54-4AF0D0A6D94F}.Release|x86.Build.0 = Release|Any CPU + {2C071D8A-E6B8-4284-8AF7-14CA8AB4D6A8}.Debug|.NET.ActiveCfg = Debug|Any CPU + {2C071D8A-E6B8-4284-8AF7-14CA8AB4D6A8}.Debug|.NET.Build.0 = Debug|Any CPU + {2C071D8A-E6B8-4284-8AF7-14CA8AB4D6A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2C071D8A-E6B8-4284-8AF7-14CA8AB4D6A8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2C071D8A-E6B8-4284-8AF7-14CA8AB4D6A8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {2C071D8A-E6B8-4284-8AF7-14CA8AB4D6A8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {2C071D8A-E6B8-4284-8AF7-14CA8AB4D6A8}.Debug|x86.ActiveCfg = Debug|Any CPU + {2C071D8A-E6B8-4284-8AF7-14CA8AB4D6A8}.Debug|x86.Build.0 = Debug|Any CPU + {2C071D8A-E6B8-4284-8AF7-14CA8AB4D6A8}.Release|.NET.ActiveCfg = Release|Any CPU + {2C071D8A-E6B8-4284-8AF7-14CA8AB4D6A8}.Release|.NET.Build.0 = Release|Any CPU + {2C071D8A-E6B8-4284-8AF7-14CA8AB4D6A8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2C071D8A-E6B8-4284-8AF7-14CA8AB4D6A8}.Release|Any CPU.Build.0 = Release|Any CPU + {2C071D8A-E6B8-4284-8AF7-14CA8AB4D6A8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {2C071D8A-E6B8-4284-8AF7-14CA8AB4D6A8}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {2C071D8A-E6B8-4284-8AF7-14CA8AB4D6A8}.Release|x86.ActiveCfg = Release|Any CPU + {2C071D8A-E6B8-4284-8AF7-14CA8AB4D6A8}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -3420,6 +3438,7 @@ Global {87D57693-C3EB-4DD0-8C32-4C8D7BE9066E} = {D8A691C5-146D-4613-86CC-438F02FE9106} {911023BC-9AAC-427D-AA85-04AF886FE81C} = {D8A691C5-146D-4613-86CC-438F02FE9106} {7981F6A5-05CE-471E-8B54-4AF0D0A6D94F} = {D8A691C5-146D-4613-86CC-438F02FE9106} + {2C071D8A-E6B8-4284-8AF7-14CA8AB4D6A8} = {D8A691C5-146D-4613-86CC-438F02FE9106} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {FBE985BB-9F0F-4DBB-8F94-ABC37A803FF9} diff --git a/ReportImp/InputFamilienhilfe/Stundennachweis.designer.cs b/ReportImp/InputFamilienhilfe/Stundennachweis.designer.cs index 56bc988ff..bb6a43d83 100644 --- a/ReportImp/InputFamilienhilfe/Stundennachweis.designer.cs +++ b/ReportImp/InputFamilienhilfe/Stundennachweis.designer.cs @@ -51,6 +51,7 @@ namespace InputFamilienhilfe this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); + this.picSignature = new DevExpress.XtraReports.UI.XRPictureBox(); this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); @@ -79,7 +80,6 @@ namespace InputFamilienhilfe this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel29 = new DevExpress.XtraReports.UI.XRLabel(); - this.picSignature = new DevExpress.XtraReports.UI.XRPictureBox(); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); @@ -331,6 +331,18 @@ namespace InputFamilienhilfe this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; this.xrTableCell9.Weight = 0.22348487838163472D; // + // picSignature + // + this.picSignature.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.picSignature.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Tag", null, "Services.Signature")}); + this.picSignature.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.picSignature.Name = "picSignature"; + this.picSignature.SizeF = new System.Drawing.SizeF(176.9998F, 25F); + this.picSignature.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; + this.picSignature.StylePriority.UseBorders = false; + this.picSignature.BeforePrint += new System.Drawing.Printing.PrintEventHandler(this.picSignature_BeforePrint); + // // GroupHeader1 // this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { @@ -469,7 +481,7 @@ namespace InputFamilienhilfe this.xrLabel11, this.xrLabel8}); this.ReportFooter.Font = new System.Drawing.Font("Arial", 11F); - this.ReportFooter.HeightF = 34.24998F; + this.ReportFooter.HeightF = 34.24999F; this.ReportFooter.Name = "ReportFooter"; this.ReportFooter.StylePriority.UseFont = false; // @@ -491,14 +503,14 @@ namespace InputFamilienhilfe // xrLabel8 // this.xrLabel8.Font = new System.Drawing.Font("Arial", 12F); - this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(527.0002F, 10.00002F); + this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(527.0002F, 9.999974F); this.xrLabel8.Name = "xrLabel8"; this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel8.SizeF = new System.Drawing.SizeF(169.493F, 24.24997F); + this.xrLabel8.SizeF = new System.Drawing.SizeF(202.8263F, 24.24997F); this.xrLabel8.StylePriority.UseBorders = false; this.xrLabel8.StylePriority.UseFont = false; this.xrLabel8.StylePriority.UseTextAlignment = false; - this.xrLabel8.Text = "Unterschrift SPFH"; + this.xrLabel8.Text = "Unterschrift Mitarbeiter"; this.xrLabel8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; // // fieldAbrechenbareMinuten @@ -609,18 +621,6 @@ namespace InputFamilienhilfe this.xrLabel29.StylePriority.UseBorders = false; this.xrLabel29.StylePriority.UseFont = false; // - // picSignature - // - this.picSignature.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.picSignature.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Tag", null, "Services.Signature")}); - this.picSignature.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); - this.picSignature.Name = "picSignature"; - this.picSignature.SizeF = new System.Drawing.SizeF(176.9998F, 25F); - this.picSignature.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; - this.picSignature.StylePriority.UseBorders = false; - this.picSignature.BeforePrint += new System.Drawing.Printing.PrintEventHandler(this.picSignature_BeforePrint); - // // Stundennachweis // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { diff --git a/Service/Plugins/PluginLoader.cs b/Service/Plugins/PluginLoader.cs index 90e5faac0..a068defe3 100644 --- a/Service/Plugins/PluginLoader.cs +++ b/Service/Plugins/PluginLoader.cs @@ -161,7 +161,7 @@ namespace BeWo.Service.Plugins //t = "9800364930"; // BeWo Leverkusen //t = "4439874912"; // BeWo Sahin //t = "1873138856"; // BUG e.V. - t = "6463422907"; // Caritas Leverkusen + //t = "6463422907"; // Caritas Leverkusen //t = "6149463003"; // Diakonisches Werk Bad Windsheim Neustadt a. d. Aisch //t = "6548202677"; // VKM Aachen SBD //t = "7803602698"; // Taubblindendienst @@ -236,7 +236,7 @@ namespace BeWo.Service.Plugins //t = "4423043131"; // Die Perspektive e.V. //t = "5263375280"; // LH Wolfsburg //t = "4900722829"; // Evangelische Kirchengemeinde Bottrop - //t = "9853685258"; // Input + t = "9853685258"; // Input //t = "7622428090"; // Freie gemeinnützige Beratungsstelle für Psychotherapie e.V. (BfpDus) (Panama) //t = "0206140343"; // Lebenswelt Gabriel //t = "6916712798"; // LH Rodenkirchen Bewo