From 16b0ccc33166143a5090027fdff8aaf8ef06e81b Mon Sep 17 00:00:00 2001 From: Christian Date: Wed, 3 Jan 2024 12:18:26 +0100 Subject: [PATCH] Stundenkonto SHK Service, Alpha QB --- .gitignore | 1 + BeWoAllReports.sln | 27 ++ BeWoPlanerMobil.sln | 12 +- BeWoPlanerMobil/BeWoPlanerMobil.csproj | 2 +- Model/Changes_alle_fuer_neue_db.txt | 14 +- .../MitarbeiterstundenkontoBerechnung.cs | 2 +- ReportImp/AlphaEv/CustomReportCreator.cs | 50 +--- .../ServicesOverviewReport.Designer.cs | 141 +++++---- ReportImp/Fortis/Quittierungsbeleg.cs | 76 ++--- .../PraxisPusteblume/IfsSammelRechnung.cs | 17 ++ .../Invoicing/IFSSammelInvoiceCreation.cs | 4 + ...CustomMitarbeiterstundenkontoBerechnung.cs | 19 +- .../Mitarbeiterarbeitszeitkonto.cs | 19 ++ .../Mitarbeiterarbeitszeitkonto.designer.cs | 12 +- .../Service/CustomVertretungsManager.cs | 4 +- .../SettlementReport.Designer.cs | 49 +-- .../SettlementReport2.designer.cs | 279 ++++++++---------- Service/Plugins/PluginLoader.cs | 7 +- 18 files changed, 373 insertions(+), 362 deletions(-) diff --git a/.gitignore b/.gitignore index 08e70ec98..3f61bfd2d 100644 --- a/.gitignore +++ b/.gitignore @@ -622,3 +622,4 @@ obj /CustomerDlls /Dakota/bin /Dakota/obj +/BeWoDatabaseTerminator/BeWoDatabaseTerminator/bin/Debug diff --git a/BeWoAllReports.sln b/BeWoAllReports.sln index ffe0f37c4..5fe1cde1d 100644 --- a/BeWoAllReports.sln +++ b/BeWoAllReports.sln @@ -822,6 +822,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CaritasverbandKelheim", "Re EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PSM", "ReportImp\PSM\PSM.csproj", "{3D34C4A1-C566-43F8-AA58-467B3FF17A51}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dakota", "Dakota\Dakota.csproj", "{47331732-DD96-4075-869F-83AA9F3F9937}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|.NET = Debug|.NET @@ -10073,6 +10075,30 @@ Global {3D34C4A1-C566-43F8-AA58-467B3FF17A51}.Release|Mixed Platforms.Build.0 = Release|Any CPU {3D34C4A1-C566-43F8-AA58-467B3FF17A51}.Release|x86.ActiveCfg = Release|Any CPU {3D34C4A1-C566-43F8-AA58-467B3FF17A51}.Release|x86.Build.0 = Release|Any CPU + {47331732-DD96-4075-869F-83AA9F3F9937}.Debug|.NET.ActiveCfg = Debug|Any CPU + {47331732-DD96-4075-869F-83AA9F3F9937}.Debug|.NET.Build.0 = Debug|Any CPU + {47331732-DD96-4075-869F-83AA9F3F9937}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {47331732-DD96-4075-869F-83AA9F3F9937}.Debug|Any CPU.Build.0 = Debug|Any CPU + {47331732-DD96-4075-869F-83AA9F3F9937}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {47331732-DD96-4075-869F-83AA9F3F9937}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {47331732-DD96-4075-869F-83AA9F3F9937}.Debug|x86.ActiveCfg = Debug|Any CPU + {47331732-DD96-4075-869F-83AA9F3F9937}.Debug|x86.Build.0 = Debug|Any CPU + {47331732-DD96-4075-869F-83AA9F3F9937}.DebugRemote|.NET.ActiveCfg = Debug|Any CPU + {47331732-DD96-4075-869F-83AA9F3F9937}.DebugRemote|.NET.Build.0 = Debug|Any CPU + {47331732-DD96-4075-869F-83AA9F3F9937}.DebugRemote|Any CPU.ActiveCfg = Debug|Any CPU + {47331732-DD96-4075-869F-83AA9F3F9937}.DebugRemote|Any CPU.Build.0 = Debug|Any CPU + {47331732-DD96-4075-869F-83AA9F3F9937}.DebugRemote|Mixed Platforms.ActiveCfg = Debug|Any CPU + {47331732-DD96-4075-869F-83AA9F3F9937}.DebugRemote|Mixed Platforms.Build.0 = Debug|Any CPU + {47331732-DD96-4075-869F-83AA9F3F9937}.DebugRemote|x86.ActiveCfg = Debug|Any CPU + {47331732-DD96-4075-869F-83AA9F3F9937}.DebugRemote|x86.Build.0 = Debug|Any CPU + {47331732-DD96-4075-869F-83AA9F3F9937}.Release|.NET.ActiveCfg = Release|Any CPU + {47331732-DD96-4075-869F-83AA9F3F9937}.Release|.NET.Build.0 = Release|Any CPU + {47331732-DD96-4075-869F-83AA9F3F9937}.Release|Any CPU.ActiveCfg = Release|Any CPU + {47331732-DD96-4075-869F-83AA9F3F9937}.Release|Any CPU.Build.0 = Release|Any CPU + {47331732-DD96-4075-869F-83AA9F3F9937}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {47331732-DD96-4075-869F-83AA9F3F9937}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {47331732-DD96-4075-869F-83AA9F3F9937}.Release|x86.ActiveCfg = Release|Any CPU + {47331732-DD96-4075-869F-83AA9F3F9937}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -10482,6 +10508,7 @@ Global {326BEC08-0B97-43B0-8288-D17E424B6A58} = {D8A691C5-146D-4613-86CC-438F02FE9106} {489A02AC-7809-4CD9-BE36-365ADA472692} = {D8A691C5-146D-4613-86CC-438F02FE9106} {3D34C4A1-C566-43F8-AA58-467B3FF17A51} = {D8A691C5-146D-4613-86CC-438F02FE9106} + {47331732-DD96-4075-869F-83AA9F3F9937} = {FEB0336B-F053-40B6-92DD-7DE56AB9408A} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {FBE985BB-9F0F-4DBB-8F94-ABC37A803FF9} diff --git a/BeWoPlanerMobil.sln b/BeWoPlanerMobil.sln index 69cf55c1e..4dedacd95 100644 --- a/BeWoPlanerMobil.sln +++ b/BeWoPlanerMobil.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.28307.1622 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.31729.503 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BeWoPlanerMobil", "BeWoPlanerMobil\BeWoPlanerMobil.csproj", "{284B02ED-114A-426C-9162-31BB6CF05589}" EndProject @@ -15,6 +15,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Report", "Report\Report.csp EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReportingService", "ReportService\ReportingService.csproj", "{663EFCB5-9E3E-4C76-97EE-3188E072634C}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dakota", "Dakota\Dakota.csproj", "{47331732-DD96-4075-869F-83AA9F3F9937}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -58,6 +60,12 @@ Global {663EFCB5-9E3E-4C76-97EE-3188E072634C}.DebugRemote|Any CPU.Build.0 = Debug|Any CPU {663EFCB5-9E3E-4C76-97EE-3188E072634C}.Release|Any CPU.ActiveCfg = Release|Any CPU {663EFCB5-9E3E-4C76-97EE-3188E072634C}.Release|Any CPU.Build.0 = Release|Any CPU + {47331732-DD96-4075-869F-83AA9F3F9937}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {47331732-DD96-4075-869F-83AA9F3F9937}.Debug|Any CPU.Build.0 = Debug|Any CPU + {47331732-DD96-4075-869F-83AA9F3F9937}.DebugRemote|Any CPU.ActiveCfg = Debug|Any CPU + {47331732-DD96-4075-869F-83AA9F3F9937}.DebugRemote|Any CPU.Build.0 = Debug|Any CPU + {47331732-DD96-4075-869F-83AA9F3F9937}.Release|Any CPU.ActiveCfg = Release|Any CPU + {47331732-DD96-4075-869F-83AA9F3F9937}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/BeWoPlanerMobil/BeWoPlanerMobil.csproj b/BeWoPlanerMobil/BeWoPlanerMobil.csproj index ad17b02a3..c8a78fe58 100644 --- a/BeWoPlanerMobil/BeWoPlanerMobil.csproj +++ b/BeWoPlanerMobil/BeWoPlanerMobil.csproj @@ -5117,7 +5117,7 @@ - True + False False 8808 / diff --git a/Model/Changes_alle_fuer_neue_db.txt b/Model/Changes_alle_fuer_neue_db.txt index b2519c641..50632c625 100644 --- a/Model/Changes_alle_fuer_neue_db.txt +++ b/Model/Changes_alle_fuer_neue_db.txt @@ -993,4 +993,16 @@ CREATE TABLE `AdditionalServiceNotice` ( `CustomerOid` bigint DEFAULT NULL, `Monat` datetime DEFAULT NULL, PRIMARY KEY (`Oid`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; \ No newline at end of file +) ENGINE=InnoDB DEFAULT CHARSET=latin1; + +ALTER TABLE `customer` +ADD COLUMN `VersichertenStatus` VARCHAR(16) NULL DEFAULT NULL; + +ALTER TABLE `organisation` +ADD COLUMN `IKKrankenkasse` VARCHAR(16) NULL DEFAULT NULL, +ADD COLUMN `IKKostentrager` VARCHAR(16) NULL DEFAULT NULL, +ADD COLUMN `IKDatenannahmestelle` VARCHAR(16) NULL DEFAULT NULL; + + +ALTER TABLE `mandator` +ADD COLUMN `IKLeistungserbringer` VARCHAR(16) NULL; \ No newline at end of file diff --git a/Report/ReportObjects/MitarbeiterstundenkontoBerechnung.cs b/Report/ReportObjects/MitarbeiterstundenkontoBerechnung.cs index 9becdcca5..0bd30c9ad 100644 --- a/Report/ReportObjects/MitarbeiterstundenkontoBerechnung.cs +++ b/Report/ReportObjects/MitarbeiterstundenkontoBerechnung.cs @@ -1686,7 +1686,7 @@ namespace BeWo.Report.ReportObjects dd.NightEnd = 6; dd.MaxHoursUntilBreak = 6; dd.BreakMinutes = 30; - if (date.Year == 2022 && date.Month == 12 && date.Day == 27) + if (date.Year == 2023 && date.Month == 12 && date.Day == 27) { int test = 0; } diff --git a/ReportImp/AlphaEv/CustomReportCreator.cs b/ReportImp/AlphaEv/CustomReportCreator.cs index 8ef8a1111..a4ada5832 100644 --- a/ReportImp/AlphaEv/CustomReportCreator.cs +++ b/ReportImp/AlphaEv/CustomReportCreator.cs @@ -141,8 +141,8 @@ namespace AlphaEv { XtraReport report = null; - ServicesOverviewRO flsRo = CopyFromRO(ro); - ServicesOverviewRO assiRo = CopyFromRO(ro); + ServicesOverviewRO flsRo = ServicesOverviewRO.CopyFromRO(ro); + ServicesOverviewRO assiRo = ServicesOverviewRO.CopyFromRO(ro); if (ro.Services != null) { @@ -178,52 +178,6 @@ namespace AlphaEv return report; } - private ServicesOverviewRO CopyFromRO(ServicesOverviewRO ro) - { - ServicesOverviewRO newRo = new ServicesOverviewRO(); - - newRo.StartDate = ro.StartDate; - newRo.Abwesenheiten = ro.Abwesenheiten; - newRo.AbsenceTimes = ro.AbsenceTimes; - newRo.ApprovedEndDate = ro.ApprovedEndDate; - newRo.ApprovedFLSPerMonth = ro.ApprovedFLSPerMonth; - newRo.ApprovedFLSPerMonthTotal = ro.ApprovedFLSPerMonthTotal; - newRo.ApprovedFLSPerWeek = ro.ApprovedFLSPerWeek; - newRo.ApprovedFLSPerWeekTotal = ro.ApprovedFLSPerWeekTotal; - newRo.ApprovedFLSTotal = ro.ApprovedFLSTotal; - newRo.ApprovedStartDate = ro.ApprovedStartDate; - newRo.ContactEmployee = ro.ContactEmployee; - newRo.CostBearer2SupportConceptList = ro.CostBearer2SupportConceptList; - newRo.Costbearer = ro.Costbearer; - newRo.CustomerBirthday = ro.CustomerBirthday; - newRo.CustomerLastName = ro.CustomerLastName; - newRo.CustomerCity = ro.CustomerCity; - newRo.CustomerFirstName = ro.CustomerFirstName; - newRo.CustomerName = ro.CustomerName; - newRo.CustomerPostalCode = ro.CustomerPostalCode; - newRo.CustomerStreet = ro.CustomerStreet; - newRo.EndDate = ro.EndDate; - newRo.FreeMinutesThisMonth = ro.FreeMinutesThisMonth; - newRo.Month = ro.Month; - newRo.Year = ro.Year; - newRo.MainAttendant = ro.MainAttendant; - newRo.MainAttendantCommaSeperated = ro.MainAttendantCommaSeperated; - newRo.ReferenceNumber = ro.ReferenceNumber; - newRo.TotalFLMBillable = ro.TotalFLMBillable; - newRo.TotalFLM = ro.TotalFLM; - newRo.TotalFLMQualified = ro.TotalFLMQualified; - newRo.TotalFLMUnqualified = ro.TotalFLMUnqualified; - newRo.TotalFLS = ro.TotalFLS; - newRo.TotalFLSQualified = ro.TotalFLSQualified; - newRo.TotalFLSUnqualified = ro.TotalFLSUnqualified; - newRo.TotalFLSPerCostBearer = ro.TotalFLSPerCostBearer; - newRo.TotalGefahreneKilometer = ro.TotalGefahreneKilometer; - newRo.SupportConceptCostBearer = ro.SupportConceptCostBearer; - newRo.Mandator = ro.Mandator; - - return newRo; - } - private XtraReport AddReportToReport(XtraReport report, ServicesOverviewRO ro, bool isAssi) { if (ro.Services.Count > 0) diff --git a/ReportImp/AlphaEv/ServicesOverviewReport.Designer.cs b/ReportImp/AlphaEv/ServicesOverviewReport.Designer.cs index 6b0f9e873..56fe08026 100644 --- a/ReportImp/AlphaEv/ServicesOverviewReport.Designer.cs +++ b/ReportImp/AlphaEv/ServicesOverviewReport.Designer.cs @@ -54,6 +54,11 @@ namespace AlphaEv this.cellUnterschrift = new DevExpress.XtraReports.UI.XRTableCell(); this.xrPictureBox2 = new DevExpress.XtraReports.UI.XRPictureBox(); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); + this.xrLabel16 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrPictureBox3 = new DevExpress.XtraReports.UI.XRPictureBox(); + this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel(); + this.lblFehlkontakt = new DevExpress.XtraReports.UI.XRLabel(); this.lblUnterschriftKlientDatum = new DevExpress.XtraReports.UI.XRLabel(); this.lblUnterschriftKlient = new DevExpress.XtraReports.UI.XRLabel(); this.lblAbsenceTime = new DevExpress.XtraReports.UI.XRLabel(); @@ -78,7 +83,6 @@ namespace AlphaEv this.lblUnterschriftMitarbeiterDatum = new DevExpress.XtraReports.UI.XRLabel(); this.lblUnterschriftMitarbeiter = new DevExpress.XtraReports.UI.XRLabel(); this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.formattingRuleRowInvisible = new DevExpress.XtraReports.UI.FormattingRule(); this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule(); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); @@ -99,14 +103,12 @@ namespace AlphaEv this.fieldAbrechenbareMinuten = new DevExpress.XtraReports.UI.CalculatedField(); this.fieldBillableFLS = new DevExpress.XtraReports.UI.CalculatedField(); this.fieldAbrechenbareFLS = new DevExpress.XtraReports.UI.CalculatedField(); - this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel(); - this.lblFehlkontakt = new DevExpress.XtraReports.UI.XRLabel(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -335,6 +337,8 @@ namespace AlphaEv // GroupFooter1 // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel16, + this.xrPictureBox3, this.xrLabel3, this.xrLabel13, this.lblFehlkontakt, @@ -357,11 +361,81 @@ namespace AlphaEv this.GroupFooter1.Name = "GroupFooter1"; this.GroupFooter1.StylePriority.UseFont = false; // + // xrLabel16 + // + this.xrLabel16.BackColor = System.Drawing.Color.Transparent; + this.xrLabel16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeSignatureDate", "{0:dd.MM.yyyy}")}); + this.xrLabel16.Font = new System.Drawing.Font("Arial", 11F); + this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(230F, 123.2918F); + this.xrLabel16.Name = "xrLabel16"; + this.xrLabel16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel16.SizeF = new System.Drawing.SizeF(116.9999F, 35.50002F); + this.xrLabel16.StylePriority.UseBackColor = false; + this.xrLabel16.StylePriority.UseFont = false; + this.xrLabel16.StylePriority.UseTextAlignment = false; + this.xrLabel16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft; + // + // xrPictureBox3 + // + this.xrPictureBox3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Image", null, "EmployeeSignature")}); + this.xrPictureBox3.LocationFloat = new DevExpress.Utils.PointFloat(350F, 123.2918F); + this.xrPictureBox3.Name = "xrPictureBox3"; + this.xrPictureBox3.Scripts.OnBeforePrint = "xrPictureBox1_BeforePrint"; + this.xrPictureBox3.SizeF = new System.Drawing.SizeF(196.861F, 35.50002F); + this.xrPictureBox3.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; + // + // xrLabel3 + // + this.xrLabel3.Font = new System.Drawing.Font("Arial", 10F); + this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 30.83333F); + this.xrLabel3.Name = "xrLabel3"; + this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); + this.xrLabel3.SizeF = new System.Drawing.SizeF(245F, 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 = "E = ear to ear, face to face"; + this.xrLabel3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + // + // xrLabel13 + // + this.xrLabel13.Font = new System.Drawing.Font("Arial", 10F); + this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(0F, 50.83333F); + this.xrLabel13.Name = "xrLabel13"; + this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); + this.xrLabel13.SizeF = new System.Drawing.SizeF(245F, 20F); + this.xrLabel13.StylePriority.UseBackColor = false; + this.xrLabel13.StylePriority.UseBorders = false; + this.xrLabel13.StylePriority.UseFont = false; + this.xrLabel13.StylePriority.UsePadding = false; + this.xrLabel13.StylePriority.UseTextAlignment = false; + this.xrLabel13.Text = "GR = Gruppenangebot"; + this.xrLabel13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + // + // lblFehlkontakt + // + this.lblFehlkontakt.Font = new System.Drawing.Font("Arial", 10F); + this.lblFehlkontakt.LocationFloat = new DevExpress.Utils.PointFloat(0F, 70.83334F); + this.lblFehlkontakt.Name = "lblFehlkontakt"; + this.lblFehlkontakt.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); + this.lblFehlkontakt.SizeF = new System.Drawing.SizeF(245F, 20F); + this.lblFehlkontakt.StylePriority.UseBackColor = false; + this.lblFehlkontakt.StylePriority.UseBorders = false; + this.lblFehlkontakt.StylePriority.UseFont = false; + this.lblFehlkontakt.StylePriority.UsePadding = false; + this.lblFehlkontakt.StylePriority.UseTextAlignment = false; + this.lblFehlkontakt.Text = "F = Fehlkontakt"; + this.lblFehlkontakt.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + // // lblUnterschriftKlientDatum // this.lblUnterschriftKlientDatum.Borders = DevExpress.XtraPrinting.BorderSide.Top; this.lblUnterschriftKlientDatum.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold); - this.lblUnterschriftKlientDatum.LocationFloat = new DevExpress.Utils.PointFloat(230F, 118.0417F); + this.lblUnterschriftKlientDatum.LocationFloat = new DevExpress.Utils.PointFloat(230F, 90.83334F); this.lblUnterschriftKlientDatum.Name = "lblUnterschriftKlientDatum"; this.lblUnterschriftKlientDatum.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.lblUnterschriftKlientDatum.SizeF = new System.Drawing.SizeF(117F, 29.4583F); @@ -376,7 +450,7 @@ namespace AlphaEv // this.lblUnterschriftKlient.Borders = DevExpress.XtraPrinting.BorderSide.Top; this.lblUnterschriftKlient.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold); - this.lblUnterschriftKlient.LocationFloat = new DevExpress.Utils.PointFloat(346.9999F, 118.0417F); + this.lblUnterschriftKlient.LocationFloat = new DevExpress.Utils.PointFloat(346.9999F, 90.83334F); this.lblUnterschriftKlient.Name = "lblUnterschriftKlient"; this.lblUnterschriftKlient.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.lblUnterschriftKlient.SizeF = new System.Drawing.SizeF(259.7918F, 29.45831F); @@ -637,10 +711,6 @@ namespace AlphaEv this.GroupHeader1.RepeatEveryPage = true; this.GroupHeader1.StylePriority.UseFont = false; // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); - // // formattingRuleRowInvisible // this.formattingRuleRowInvisible.Condition = "Not StartsWith([ServiceCategory], \'FLS\')"; @@ -826,50 +896,9 @@ namespace AlphaEv this.fieldAbrechenbareFLS.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; this.fieldAbrechenbareFLS.Name = "fieldAbrechenbareFLS"; // - // xrLabel3 + // bindingSource1 // - this.xrLabel3.Font = new System.Drawing.Font("Arial", 10F); - this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 30.83333F); - this.xrLabel3.Name = "xrLabel3"; - this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.xrLabel3.SizeF = new System.Drawing.SizeF(245F, 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 = "E = ear to ear, face to face"; - this.xrLabel3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - // - // xrLabel13 - // - this.xrLabel13.Font = new System.Drawing.Font("Arial", 10F); - this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(0F, 50.83333F); - this.xrLabel13.Name = "xrLabel13"; - this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.xrLabel13.SizeF = new System.Drawing.SizeF(245F, 20F); - this.xrLabel13.StylePriority.UseBackColor = false; - this.xrLabel13.StylePriority.UseBorders = false; - this.xrLabel13.StylePriority.UseFont = false; - this.xrLabel13.StylePriority.UsePadding = false; - this.xrLabel13.StylePriority.UseTextAlignment = false; - this.xrLabel13.Text = "GR = Gruppenangebot"; - this.xrLabel13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - // - // lblFehlkontakt - // - this.lblFehlkontakt.Font = new System.Drawing.Font("Arial", 10F); - this.lblFehlkontakt.LocationFloat = new DevExpress.Utils.PointFloat(0F, 70.83334F); - this.lblFehlkontakt.Name = "lblFehlkontakt"; - this.lblFehlkontakt.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.lblFehlkontakt.SizeF = new System.Drawing.SizeF(245F, 20F); - this.lblFehlkontakt.StylePriority.UseBackColor = false; - this.lblFehlkontakt.StylePriority.UseBorders = false; - this.lblFehlkontakt.StylePriority.UseFont = false; - this.lblFehlkontakt.StylePriority.UsePadding = false; - this.lblFehlkontakt.StylePriority.UseTextAlignment = false; - this.lblFehlkontakt.Text = "F = Fehlkontakt"; - this.lblFehlkontakt.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); // // Stundenzettel // @@ -899,8 +928,8 @@ namespace AlphaEv ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } @@ -978,5 +1007,7 @@ namespace AlphaEv private DevExpress.XtraReports.UI.XRLabel xrLabel3; private DevExpress.XtraReports.UI.XRLabel xrLabel13; private DevExpress.XtraReports.UI.XRLabel lblFehlkontakt; + private DevExpress.XtraReports.UI.XRLabel xrLabel16; + private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox3; } } diff --git a/ReportImp/Fortis/Quittierungsbeleg.cs b/ReportImp/Fortis/Quittierungsbeleg.cs index 1817f9493..bf09853b7 100644 --- a/ReportImp/Fortis/Quittierungsbeleg.cs +++ b/ReportImp/Fortis/Quittierungsbeleg.cs @@ -22,7 +22,7 @@ namespace Fortis { if (pRO.Services != null) { - Dictionary tag2Details = new Dictionary(); + Dictionary tag2Details = new Dictionary(); foreach (var sr in pRO.Services) { @@ -31,16 +31,18 @@ namespace Fortis sr.Minutes = (sr.Minutes / 100) * (double)sr.ProzentAbrechenbar; } - FortisServiceRecord fsr = null; - if (!tag2Details.ContainsKey(String.Format("{0:yyyyMMdd}", sr.StartDate))) - { - fsr = new FortisServiceRecord(); - tag2Details.Add(String.Format("{0:yyyyMMdd}", sr.StartDate), fsr); - } - else - { - fsr = tag2Details[String.Format("{0:yyyyMMdd}", sr.StartDate)]; - } + FortisServiceRecord fsr = new FortisServiceRecord(); + tag2Details.Add(sr.ServiceRecordOid, fsr); + + //if (!tag2Details.ContainsKey(String.Format("{0:yyyyMMdd}", sr.StartDate))) + //{ + // fsr = new FortisServiceRecord(); + // tag2Details.Add(String.Format("{0:yyyyMMdd}", sr.StartDate), fsr); + //} + //else + //{ + // fsr = tag2Details[String.Format("{0:yyyyMMdd}", sr.StartDate)]; + //} if (sr.ServiceDescription.Contains("Wohnraum")) @@ -85,28 +87,40 @@ namespace Fortis } else { - fsr.MinutenH += sr.Minutes; + //fsr.MinutenH += sr.Minutes; } - if (sr.EmployeeCount > 1) - { - fsr.AnzahlMA += sr.EmployeeCount; - } - + //if (sr.EmployeeCount > 1) + //{ + // fsr.AnzahlMA += sr.EmployeeCount; + //} + fsr.AnzahlMA = sr.EmployeeCount; fsr.Groesse += sr.CustomerCount; } - List newServices = new List(); + //List newServices = new List(); - DateTime dt = pRO.StartDate; - while (dt <= pRO.EndDate) + //DateTime dt = pRO.StartDate; + //while (dt <= pRO.EndDate) + foreach (var sr in pRO.Services) { - String key = String.Format("{0:yyyyMMdd}", dt); - if (tag2Details.ContainsKey(key)) - { - var fsr = tag2Details[key]; + sr.Notice = ""; + sr.Notice2 = ""; + sr.Notice3 = ""; + sr.Notice4 = ""; + sr.Notice5 = ""; + sr.ServiceCategory = ""; + sr.GefahreneKilometer = ""; + sr.EmployeeFirstName = ""; + sr.EmployeeFullname = ""; + sr.EmployeeLastName = ""; - var sr = new ServicesOverviewRO.ServiceDetail(); - sr.StartDate = dt; + //String key = String.Format("{0:yyyyMMdd}", dt); + if (tag2Details.ContainsKey(sr.ServiceRecordOid)) + { + var fsr = tag2Details[sr.ServiceRecordOid]; + + //var sr = new ServicesOverviewRO.ServiceDetail(); + //sr.StartDate = dt; //H Hausbesuch = Notice //B Begleitung im Sozialraum = Notice2 @@ -152,10 +166,6 @@ namespace Fortis } sr.EmployeeCount = fsr.AnzahlMA; - if (sr.EmployeeCount == 0) - { - sr.EmployeeCount = 1; - } sr.CustomerCount = fsr.Groesse; sr.TimeRangeString = String.Format("{0:0}", fsr.MinutenH + fsr.MinutenB + fsr.MinutenT + fsr.MinutenGD + fsr.MinutenKL + fsr.MinutenAK + fsr.MinutenGI); @@ -167,12 +177,12 @@ namespace Fortis sr.EmployeeLastName = String.Format("{0:0}", fsr.FehlkontaktMinuten); } - newServices.Add(sr); + //newServices.Add(sr); } - dt = dt.AddDays(1); + //dt = dt.AddDays(1); } - pRO.Services = newServices; + //pRO.Services = newServices; } diff --git a/ReportImp/PraxisPusteblume/IfsSammelRechnung.cs b/ReportImp/PraxisPusteblume/IfsSammelRechnung.cs index 38d01bcae..d738be9e2 100644 --- a/ReportImp/PraxisPusteblume/IfsSammelRechnung.cs +++ b/ReportImp/PraxisPusteblume/IfsSammelRechnung.cs @@ -275,6 +275,11 @@ namespace PraxisPusteblume preisTeam = 11.77m; preisGruppe = 35.22m; } + if (pRO.AccountingPeriodStart >= new DateTime(2023, 11, 1)) + { + preisTeam = 12.81m; + preisGruppe = 38.35m; + } if (DateTime.Now >= new DateTime(2021, 8, 17)) { preisInvest = 6.86m; @@ -306,6 +311,18 @@ namespace PraxisPusteblume preisAmbulant = crp.CostRateValue.Value; } } + var gruppe = sdList.FirstOrDefault(s => s.Name.Contains("Gruppe")); + if (gruppe != null && ambulant.CostRatePeriods != null) + { + var crpList = MapperFactory.CostRatePeriodDC_CostRatePeriod.MapToNewDCs(gruppe.CostRatePeriods); + CostRatePeriodDC crp = crpList.GetCostRatePeriodForDate(CostRatePeriodType.AmountOfMoney, pRO.AccountingPeriodStart); + + if (crp != null && crp.CostRateValue.HasValue) + { + preisGruppe = crp.CostRateValue.Value; + } + } + } cellPreisAmbulant.Text = String.Format("{0:c}", preisAmbulant); diff --git a/ReportImp/PraxisPusteblume/Invoicing/IFSSammelInvoiceCreation.cs b/ReportImp/PraxisPusteblume/Invoicing/IFSSammelInvoiceCreation.cs index d56957236..c117bd7bb 100644 --- a/ReportImp/PraxisPusteblume/Invoicing/IFSSammelInvoiceCreation.cs +++ b/ReportImp/PraxisPusteblume/Invoicing/IFSSammelInvoiceCreation.cs @@ -167,6 +167,10 @@ namespace PraxisPusteblume.Invoicing { betrag = 11.77m; } + if (invoicePeriod.StartDateTime >= new DateTime(2023, 12, 1)) + { + betrag = 12.81m; + } var invoiceItem = new InvoiceItem(); invoiceItem.AmountPerUnit = betrag; diff --git a/ReportImp/SHKServiceSBD/CustomMitarbeiterstundenkontoBerechnung.cs b/ReportImp/SHKServiceSBD/CustomMitarbeiterstundenkontoBerechnung.cs index 30146c749..17a189633 100644 --- a/ReportImp/SHKServiceSBD/CustomMitarbeiterstundenkontoBerechnung.cs +++ b/ReportImp/SHKServiceSBD/CustomMitarbeiterstundenkontoBerechnung.cs @@ -238,7 +238,24 @@ namespace SHKServiceSBD } } - + + var absenceTimes = ed.Employee.AbsenceTimes; + + if (dd.AbsenceTimes == null && absenceTimes != null) + { + foreach (var absenceTime in absenceTimes) + { + if (absenceTime.Start < dd.Date.AddDays(1) && (!absenceTime.End.HasValue || absenceTime.End >= dd.Date)) + { + if (dd.AbsenceTimes == null) + { + dd.AbsenceTimes = new List(); + } + dd.AbsenceTimes.Add(absenceTime); + } + } + } + if (dd.AbsenceTimes != null) { diff --git a/ReportImp/SHKServiceSBD/Mitarbeiterarbeitszeitkonto.cs b/ReportImp/SHKServiceSBD/Mitarbeiterarbeitszeitkonto.cs index ee42de123..1d2d2ea4d 100644 --- a/ReportImp/SHKServiceSBD/Mitarbeiterarbeitszeitkonto.cs +++ b/ReportImp/SHKServiceSBD/Mitarbeiterarbeitszeitkonto.cs @@ -46,6 +46,25 @@ namespace SHKServiceSBD { ed.UrlaubUndKrankheit += (day.HoursSick + day.HoursInVacation); } + + + foreach (var dd in ed.Days) + { + dd.Custom10 = dd.ZeitraeumeString; + + if (dd.IstFeiertag && dd.AbsenceTimes != null && dd.AbsenceTimes.Count > 0) + { + if (!dd.Custom10.Contains(dd.AbsenceTimes[0].AbsenceReason.Description)) + { + if (!String.IsNullOrEmpty(dd.Custom10) && dd.Custom10.Length > 0) + { + dd.Custom10 += ", "; + } + dd.Custom10 += dd.AbsenceTimes[0].AbsenceReason.Description; + + } + } + } } this.bindingSource1.DataSource = pRO; diff --git a/ReportImp/SHKServiceSBD/Mitarbeiterarbeitszeitkonto.designer.cs b/ReportImp/SHKServiceSBD/Mitarbeiterarbeitszeitkonto.designer.cs index 83f2c99f4..a52de5ef3 100644 --- a/ReportImp/SHKServiceSBD/Mitarbeiterarbeitszeitkonto.designer.cs +++ b/ReportImp/SHKServiceSBD/Mitarbeiterarbeitszeitkonto.designer.cs @@ -108,6 +108,7 @@ namespace SHKServiceSBD this.xrTableCell57 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell58 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell26 = new DevExpress.XtraReports.UI.XRTableCell(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.Title = new DevExpress.XtraReports.UI.XRControlStyle(); this.FieldCaption = new DevExpress.XtraReports.UI.XRControlStyle(); this.PageInfo = new DevExpress.XtraReports.UI.XRControlStyle(); @@ -126,7 +127,6 @@ namespace SHKServiceSBD this.fieldIstArbeitszeit = new DevExpress.XtraReports.UI.CalculatedField(); this.fieldUeberstundenGesamt = new DevExpress.XtraReports.UI.CalculatedField(); this.fieldPause = new DevExpress.XtraReports.UI.CalculatedField(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); @@ -196,7 +196,7 @@ namespace SHKServiceSBD // xrTableCell20 // this.xrTableCell20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Days.ZeitraeumeString", "{0:HH:mm}")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Days.Custom10", "{0:HH:mm}")}); this.xrTableCell20.Name = "xrTableCell20"; this.xrTableCell20.Text = "xrTableCell20"; this.xrTableCell20.Weight = 0.24346258577943605D; @@ -958,6 +958,10 @@ namespace SHKServiceSBD this.xrTableCell26.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; this.xrTableCell26.Weight = 0.11143081848591821D; // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO); + // // Title // this.Title.BackColor = System.Drawing.Color.White; @@ -1094,10 +1098,6 @@ namespace SHKServiceSBD this.fieldPause.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; this.fieldPause.Name = "fieldPause"; // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO); - // // Mitarbeiterarbeitszeitkonto // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { diff --git a/ReportImp/SHKServiceSBD/Service/CustomVertretungsManager.cs b/ReportImp/SHKServiceSBD/Service/CustomVertretungsManager.cs index 7f5455d4a..9471e30dd 100644 --- a/ReportImp/SHKServiceSBD/Service/CustomVertretungsManager.cs +++ b/ReportImp/SHKServiceSBD/Service/CustomVertretungsManager.cs @@ -41,7 +41,7 @@ namespace SHKService.Service { foreach (var at in emp.AbsenceTimes) { - if (at.Start <= start && (!at.End.HasValue || at.End >= end)) + if (at.Start <= end && (!at.End.HasValue || at.End >= start)) { if (!abwesenheitByEmployee.ContainsKey(emp.Oid.Value) && (vertretungenMartingSchule.Count(v => v.EmployeeOid.Value == emp.Oid) == 0)) { @@ -73,8 +73,8 @@ namespace SHKService.Service var newItem = ErstelleMartinschuleVertretungsItem(dt, absenceTimeDC, employeeDC, null); SetSBDInformation(newItem, null, emp, true); vertretungsListe.Add(newItem); - dt = dt.AddDays(1); } + dt = dt.AddDays(1); } } } diff --git a/ReportImp/TagwerkReports/SettlementReport.Designer.cs b/ReportImp/TagwerkReports/SettlementReport.Designer.cs index 76a8831e7..3176b7d53 100644 --- a/ReportImp/TagwerkReports/SettlementReport.Designer.cs +++ b/ReportImp/TagwerkReports/SettlementReport.Designer.cs @@ -39,10 +39,7 @@ namespace BeWo.TagwerkReports this.xrTableRow9 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow10 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell(); this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule(); - this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableRow11 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell(); this.rowErbrachteLeistung = new DevExpress.XtraReports.UI.XRTableRow(); @@ -152,7 +149,6 @@ namespace BeWo.TagwerkReports this.xrTable1.Name = "xrTable1"; this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow9, - this.xrTableRow10, this.xrTableRow11, this.rowErbrachteLeistung, this.rowAbrechnung1, @@ -165,7 +161,7 @@ namespace BeWo.TagwerkReports this.xrTableRow15, this.xrTableRow18, this.xrTableRow17}); - this.xrTable1.SizeF = new System.Drawing.SizeF(650F, 251F); + this.xrTable1.SizeF = new System.Drawing.SizeF(650F, 234F); this.xrTable1.StylePriority.UseBorderColor = false; // // xrTableRow9 @@ -205,50 +201,12 @@ namespace BeWo.TagwerkReports this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; this.xrTableCell6.Weight = 0.21685899000901443D; // - // xrTableRow10 - // - this.xrTableRow10.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell20, - this.xrTableCell7}); - this.xrTableRow10.FormattingRules.Add(this.ruleRateFactorNull); - this.xrTableRow10.Name = "xrTableRow10"; - this.xrTableRow10.Weight = 0.085D; - // - // xrTableCell20 - // - this.xrTableCell20.BorderColor = System.Drawing.SystemColors.ControlLight; - this.xrTableCell20.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right))); - this.xrTableCell20.FormattingRules.Add(this.ruleRateFactorNull); - this.xrTableCell20.Name = "xrTableCell20"; - this.xrTableCell20.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell20.StylePriority.UseBorderColor = false; - this.xrTableCell20.StylePriority.UseBorders = false; - this.xrTableCell20.StylePriority.UseFont = false; - this.xrTableCell20.Text = "- zzgl. Faktor [RateFactorText2]:"; - this.xrTableCell20.Weight = 0.78314100999098568D; - // // ruleRateFactorNull // this.ruleRateFactorNull.Condition = "[RateFactorText2] == ?"; this.ruleRateFactorNull.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False; this.ruleRateFactorNull.Name = "ruleRateFactorNull"; // - // xrTableCell7 - // - this.xrTableCell7.BorderColor = System.Drawing.SystemColors.ControlLight; - this.xrTableCell7.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right))); - this.xrTableCell7.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); - this.xrTableCell7.FormattingRules.Add(this.ruleRateFactorNull); - this.xrTableCell7.Name = "xrTableCell7"; - this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell7.StylePriority.UseBorderColor = false; - this.xrTableCell7.StylePriority.UseBorders = false; - this.xrTableCell7.StylePriority.UseFont = false; - this.xrTableCell7.StylePriority.UseTextAlignment = false; - this.xrTableCell7.Text = "[ApprovedFLSWithFactor]"; - this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell7.Weight = 0.21685899000901443D; - // // xrTableRow11 // this.xrTableRow11.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { @@ -866,7 +824,7 @@ namespace BeWo.TagwerkReports this.xrTable1, this.xrLabel8}); this.GroupHeader1.Font = new System.Drawing.Font("Arial", 10F); - this.GroupHeader1.HeightF = 626.3333F; + this.GroupHeader1.HeightF = 609.3333F; this.GroupHeader1.Name = "GroupHeader1"; this.GroupHeader1.StylePriority.UseFont = false; // @@ -920,9 +878,6 @@ namespace BeWo.TagwerkReports private DevExpress.XtraReports.UI.XRTable xrTable1; private DevExpress.XtraReports.UI.XRTableRow xrTableRow9; private DevExpress.XtraReports.UI.XRTableCell xrTableCell19; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow10; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell20; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell7; private DevExpress.XtraReports.UI.XRTableRow xrTableRow11; private DevExpress.XtraReports.UI.XRTableCell xrTableCell21; private DevExpress.XtraReports.UI.XRTableRow rowErbrachteLeistung; diff --git a/ReportImp/TagwerkReports/SettlementReport2.designer.cs b/ReportImp/TagwerkReports/SettlementReport2.designer.cs index 43552ab9a..f7a051121 100644 --- a/ReportImp/TagwerkReports/SettlementReport2.designer.cs +++ b/ReportImp/TagwerkReports/SettlementReport2.designer.cs @@ -66,23 +66,20 @@ namespace BeWo.TagwerkReports.Neu this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); - this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand(); - this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); - this.xrTable2 = new DevExpress.XtraReports.UI.XRTable(); - this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow12 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell(); + this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand(); + this.xrTable2 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); + this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.xrTable4 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow40 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell63 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -104,8 +101,8 @@ namespace BeWo.TagwerkReports.Neu this.xrTableCell73 = new DevExpress.XtraReports.UI.XRTableCell(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // @@ -448,150 +445,6 @@ namespace BeWo.TagwerkReports.Neu this.Detail1.Name = "Detail1"; this.Detail1.StylePriority.UseFont = false; // - // GroupHeader2 - // - this.GroupHeader2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrTable2}); - this.GroupHeader2.Font = new System.Drawing.Font("Arial", 10F); - this.GroupHeader2.HeightF = 68F; - this.GroupHeader2.Name = "GroupHeader2"; - this.GroupHeader2.StylePriority.UseFont = false; - // - // GroupFooter1 - // - this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrTable4}); - this.GroupFooter1.Font = new System.Drawing.Font("Arial", 10F); - this.GroupFooter1.HeightF = 132F; - this.GroupFooter1.Name = "GroupFooter1"; - this.GroupFooter1.StylePriority.UseFont = false; - // - // xrTable2 - // - this.xrTable2.BorderColor = System.Drawing.SystemColors.ControlLight; - this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); - this.xrTable2.Name = "xrTable2"; - this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { - this.xrTableRow1, - this.xrTableRow2, - this.xrTableRow3, - this.xrTableRow4}); - this.xrTable2.SizeF = new System.Drawing.SizeF(650F, 68F); - this.xrTable2.StylePriority.UseBorderColor = false; - // - // xrTableRow1 - // - this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell1, - this.xrTableCell2}); - this.xrTableRow1.Name = "xrTableRow1"; - this.xrTableRow1.Weight = 0.085D; - // - // xrTableCell1 - // - this.xrTableCell1.BorderColor = System.Drawing.SystemColors.ControlLight; - this.xrTableCell1.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right))); - this.xrTableCell1.Name = "xrTableCell1"; - this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell1.StylePriority.UseBorderColor = false; - this.xrTableCell1.StylePriority.UseBorders = false; - this.xrTableCell1.StylePriority.UseFont = false; - this.xrTableCell1.Text = "Bewilligte Fachleistungsstunden (FLS) gesamt:"; - this.xrTableCell1.Weight = 0.78314100999098568D; - // - // xrTableCell2 - // - this.xrTableCell2.BorderColor = System.Drawing.SystemColors.ControlLight; - this.xrTableCell2.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right))); - this.xrTableCell2.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); - this.xrTableCell2.Name = "xrTableCell2"; - this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell2.StylePriority.UseBorderColor = false; - this.xrTableCell2.StylePriority.UseBorders = false; - this.xrTableCell2.StylePriority.UseFont = false; - this.xrTableCell2.StylePriority.UseTextAlignment = false; - this.xrTableCell2.Text = "[ApprovedFLS]"; - this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell2.Weight = 0.21685899000901443D; - // - // xrTableRow2 - // - this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell4, - this.xrTableCell5}); - this.xrTableRow2.FormattingRules.Add(this.ruleRateFactorNull); - this.xrTableRow2.Name = "xrTableRow2"; - this.xrTableRow2.Weight = 0.085D; - // - // xrTableCell4 - // - this.xrTableCell4.BorderColor = System.Drawing.SystemColors.ControlLight; - this.xrTableCell4.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right))); - this.xrTableCell4.FormattingRules.Add(this.ruleRateFactorNull); - this.xrTableCell4.Name = "xrTableCell4"; - this.xrTableCell4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell4.StylePriority.UseBorderColor = false; - this.xrTableCell4.StylePriority.UseBorders = false; - this.xrTableCell4.StylePriority.UseFont = false; - this.xrTableCell4.Text = "- zzgl. Faktor [RateFactorText2]:"; - this.xrTableCell4.Weight = 0.78314100999098568D; - // - // xrTableCell5 - // - this.xrTableCell5.BorderColor = System.Drawing.SystemColors.ControlLight; - this.xrTableCell5.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right))); - this.xrTableCell5.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); - this.xrTableCell5.FormattingRules.Add(this.ruleRateFactorNull); - this.xrTableCell5.Name = "xrTableCell5"; - this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell5.StylePriority.UseBorderColor = false; - this.xrTableCell5.StylePriority.UseBorders = false; - this.xrTableCell5.StylePriority.UseFont = false; - this.xrTableCell5.StylePriority.UseTextAlignment = false; - this.xrTableCell5.Text = "[ApprovedFLSWithFactor]"; - this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell5.Weight = 0.21685899000901443D; - // - // xrTableRow3 - // - this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell8}); - this.xrTableRow3.Name = "xrTableRow3"; - this.xrTableRow3.Weight = 0.085D; - // - // xrTableCell8 - // - this.xrTableCell8.BorderColor = System.Drawing.SystemColors.ControlLight; - this.xrTableCell8.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right))); - this.xrTableCell8.Name = "xrTableCell8"; - this.xrTableCell8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell8.StylePriority.UseBorderColor = false; - this.xrTableCell8.StylePriority.UseBorders = false; - this.xrTableCell8.Weight = 1D; - // - // xrTableRow4 - // - this.xrTableRow4.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell11}); - this.xrTableRow4.Name = "xrTableRow4"; - this.xrTableRow4.Weight = 0.085D; - // - // xrTableCell11 - // - this.xrTableCell11.BorderColor = System.Drawing.SystemColors.ControlLight; - this.xrTableCell11.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell11.Name = "xrTableCell11"; - this.xrTableCell11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell11.StylePriority.UseBorderColor = false; - this.xrTableCell11.StylePriority.UseBorders = false; - this.xrTableCell11.StylePriority.UseFont = false; - this.xrTableCell11.Text = "Erbrachte Leistungen:"; - this.xrTableCell11.Weight = 1D; - // // xrTable1 // this.xrTable1.BorderColor = System.Drawing.SystemColors.ControlLight; @@ -643,6 +496,111 @@ namespace BeWo.TagwerkReports.Neu this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; this.xrTableCell15.Weight = 0.21685899000901443D; // + // GroupHeader2 + // + this.GroupHeader2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable2}); + this.GroupHeader2.Font = new System.Drawing.Font("Arial", 10F); + this.GroupHeader2.HeightF = 51F; + this.GroupHeader2.Name = "GroupHeader2"; + this.GroupHeader2.StylePriority.UseFont = false; + // + // xrTable2 + // + this.xrTable2.BorderColor = System.Drawing.SystemColors.ControlLight; + this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrTable2.Name = "xrTable2"; + this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow1, + this.xrTableRow3, + this.xrTableRow4}); + this.xrTable2.SizeF = new System.Drawing.SizeF(650F, 51F); + this.xrTable2.StylePriority.UseBorderColor = false; + // + // xrTableRow1 + // + this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell1, + this.xrTableCell2}); + this.xrTableRow1.Name = "xrTableRow1"; + this.xrTableRow1.Weight = 0.085D; + // + // xrTableCell1 + // + this.xrTableCell1.BorderColor = System.Drawing.SystemColors.ControlLight; + this.xrTableCell1.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTableCell1.Name = "xrTableCell1"; + this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell1.StylePriority.UseBorderColor = false; + this.xrTableCell1.StylePriority.UseBorders = false; + this.xrTableCell1.StylePriority.UseFont = false; + this.xrTableCell1.Text = "Bewilligte Fachleistungsstunden (FLS) gesamt:"; + this.xrTableCell1.Weight = 0.78314100999098568D; + // + // xrTableCell2 + // + this.xrTableCell2.BorderColor = System.Drawing.SystemColors.ControlLight; + this.xrTableCell2.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTableCell2.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); + this.xrTableCell2.Name = "xrTableCell2"; + this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell2.StylePriority.UseBorderColor = false; + this.xrTableCell2.StylePriority.UseBorders = false; + this.xrTableCell2.StylePriority.UseFont = false; + this.xrTableCell2.StylePriority.UseTextAlignment = false; + this.xrTableCell2.Text = "[ApprovedFLS]"; + this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableCell2.Weight = 0.21685899000901443D; + // + // xrTableRow3 + // + this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell8}); + this.xrTableRow3.Name = "xrTableRow3"; + this.xrTableRow3.Weight = 0.085D; + // + // xrTableCell8 + // + this.xrTableCell8.BorderColor = System.Drawing.SystemColors.ControlLight; + this.xrTableCell8.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTableCell8.Name = "xrTableCell8"; + this.xrTableCell8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell8.StylePriority.UseBorderColor = false; + this.xrTableCell8.StylePriority.UseBorders = false; + this.xrTableCell8.Weight = 1D; + // + // xrTableRow4 + // + this.xrTableRow4.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell11}); + this.xrTableRow4.Name = "xrTableRow4"; + this.xrTableRow4.Weight = 0.085D; + // + // xrTableCell11 + // + this.xrTableCell11.BorderColor = System.Drawing.SystemColors.ControlLight; + this.xrTableCell11.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell11.Name = "xrTableCell11"; + this.xrTableCell11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell11.StylePriority.UseBorderColor = false; + this.xrTableCell11.StylePriority.UseBorders = false; + this.xrTableCell11.StylePriority.UseFont = false; + this.xrTableCell11.Text = "Erbrachte Leistungen:"; + this.xrTableCell11.Weight = 1D; + // + // GroupFooter1 + // + this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable4}); + this.GroupFooter1.Font = new System.Drawing.Font("Arial", 10F); + this.GroupFooter1.HeightF = 132F; + this.GroupFooter1.Name = "GroupFooter1"; + this.GroupFooter1.StylePriority.UseFont = false; + // // xrTable4 // this.xrTable4.BorderColor = System.Drawing.SystemColors.ControlLight; @@ -870,8 +828,8 @@ namespace BeWo.TagwerkReports.Neu this.Version = "17.1"; ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); @@ -919,9 +877,6 @@ namespace BeWo.TagwerkReports.Neu private DevExpress.XtraReports.UI.XRTableRow xrTableRow1; private DevExpress.XtraReports.UI.XRTableCell xrTableCell1; private DevExpress.XtraReports.UI.XRTableCell xrTableCell2; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow2; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell4; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell5; private DevExpress.XtraReports.UI.XRTableRow xrTableRow3; private DevExpress.XtraReports.UI.XRTableCell xrTableCell8; private DevExpress.XtraReports.UI.XRTableRow xrTableRow4; diff --git a/Service/Plugins/PluginLoader.cs b/Service/Plugins/PluginLoader.cs index 8593ece2a..5f5b5e117 100644 --- a/Service/Plugins/PluginLoader.cs +++ b/Service/Plugins/PluginLoader.cs @@ -31,7 +31,7 @@ namespace BeWo.Service.Plugins //t = "1076891970"; // Assistenza //t = "0216265667"; // LH Hannover //t = "1774789565"; // LH Essen - t = "9342168675"; // ABC Betreuungen - jetzt Schubkraft + //t = "9342168675"; // ABC Betreuungen - jetzt Schubkraft //t = "1193188501"; // Aids Hilfe Dortmund //t = "7860351957"; // SKF Alsdorf //t = "3311520228"; // Die Düne @@ -173,7 +173,7 @@ namespace BeWo.Service.Plugins //t = "6586058528"; // Freundeskreis Suchtkrankenhilfe e.V. (FFS) //t = "2632162696"; // Hand in Hand (ehemals Pro BeWo Düren) //t = "6340891020"; // Caritas Ahlen - //t = "3659854106"; // alpha e.V. + t = "3659854106"; // alpha e.V. //t = "5809130435"; // Lebenshilfe Kusel //t = "3367947706"; // PaS Mönchengladbach //t = "2331203795"; // BeWo für dich @@ -373,7 +373,8 @@ namespace BeWo.Service.Plugins //t = "4431610343"; // B-B-C-Terwort GmbH //t = "2235342307"; // Suchtkrankenhilfe Ostfriesland //t = "1733934665"; // Auf eigenen Füßen stehen (Birgit Apel de Santos & Stefan Haefs) - t = "9814444882"; // PSM gGmbH (Paritätische Sozialdienste in Meerbusch) + //t = "9814444882"; // PSM gGmbH (Paritätische Sozialdienste in Meerbusch) + return t; #else if (MultitenancyOperationContextExt.Current != null)