From 8a94a3068b41951a9f3db16bf4d201c132f84f08 Mon Sep 17 00:00:00 2001 From: Marcel Hirschle Date: Tue, 22 Mar 2022 11:36:48 +0100 Subject: [PATCH] =?UTF-8?q?MH:=20Anpassung=20f=C3=BCr=20Ilka=20Link=20Ivi?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BeWo.sln | 19 ++++++++++++++++ ...022_03_21_Abwesenheitsinformationprint.txt | 22 +++++++++++++++++++ ...BeWoRueckenwindAssistenzInvoiceCreation.cs | 10 ++++----- .../IlkaLinkAmbulanteHilfen.csproj | 2 ++ .../Invoicing/CustomInvoiceFactory.cs | 20 +++++++++++++++++ .../IlkaLinkAmbulanteHilfenInvoiceCreation.cs | 22 +++++++++++++++++++ .../Reporting/CustomReportCreator.cs | 8 +++---- .../ServiceInvoiceReport.Designer.cs | 4 ++-- Service/Plugins/PluginLoader.cs | 4 ++-- 9 files changed, 98 insertions(+), 13 deletions(-) create mode 100644 Model/Changes_2022_03_21_Abwesenheitsinformationprint.txt create mode 100644 ReportImp/IlkaLinkAmbulanteHilfen/Invoicing/CustomInvoiceFactory.cs create mode 100644 ReportImp/IlkaLinkAmbulanteHilfen/Invoicing/IlkaLinkAmbulanteHilfenInvoiceCreation.cs diff --git a/BeWo.sln b/BeWo.sln index a1baa78c3..568c96c28 100644 --- a/BeWo.sln +++ b/BeWo.sln @@ -513,6 +513,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LeWoAachen", "ReportImp\LeW EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ToprakGmbH", "ReportImp\ToprakGmbH\ToprakGmbH.csproj", "{12BC3B31-7499-44EC-B7B9-E3CEB2D9997B}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AlzeyTeilhabe", "ReportImp\AlzeyTeilhabe\AlzeyTeilhabe.csproj", "{D173B437-EAD2-4535-B59D-76737600E058}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|.NET = Debug|.NET @@ -4004,6 +4006,22 @@ Global {12BC3B31-7499-44EC-B7B9-E3CEB2D9997B}.Release|Mixed Platforms.Build.0 = Release|Any CPU {12BC3B31-7499-44EC-B7B9-E3CEB2D9997B}.Release|x86.ActiveCfg = Release|Any CPU {12BC3B31-7499-44EC-B7B9-E3CEB2D9997B}.Release|x86.Build.0 = Release|Any CPU + {D173B437-EAD2-4535-B59D-76737600E058}.Debug|.NET.ActiveCfg = Debug|Any CPU + {D173B437-EAD2-4535-B59D-76737600E058}.Debug|.NET.Build.0 = Debug|Any CPU + {D173B437-EAD2-4535-B59D-76737600E058}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D173B437-EAD2-4535-B59D-76737600E058}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D173B437-EAD2-4535-B59D-76737600E058}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {D173B437-EAD2-4535-B59D-76737600E058}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {D173B437-EAD2-4535-B59D-76737600E058}.Debug|x86.ActiveCfg = Debug|Any CPU + {D173B437-EAD2-4535-B59D-76737600E058}.Debug|x86.Build.0 = Debug|Any CPU + {D173B437-EAD2-4535-B59D-76737600E058}.Release|.NET.ActiveCfg = Release|Any CPU + {D173B437-EAD2-4535-B59D-76737600E058}.Release|.NET.Build.0 = Release|Any CPU + {D173B437-EAD2-4535-B59D-76737600E058}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D173B437-EAD2-4535-B59D-76737600E058}.Release|Any CPU.Build.0 = Release|Any CPU + {D173B437-EAD2-4535-B59D-76737600E058}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {D173B437-EAD2-4535-B59D-76737600E058}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {D173B437-EAD2-4535-B59D-76737600E058}.Release|x86.ActiveCfg = Release|Any CPU + {D173B437-EAD2-4535-B59D-76737600E058}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -4256,6 +4274,7 @@ Global {54419AAB-93DB-482F-B304-035D001081DD} = {D8A691C5-146D-4613-86CC-438F02FE9106} {C9CDE69B-D3A1-4BF7-B988-1A4ACF2D664A} = {D8A691C5-146D-4613-86CC-438F02FE9106} {12BC3B31-7499-44EC-B7B9-E3CEB2D9997B} = {D8A691C5-146D-4613-86CC-438F02FE9106} + {D173B437-EAD2-4535-B59D-76737600E058} = {D8A691C5-146D-4613-86CC-438F02FE9106} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {FBE985BB-9F0F-4DBB-8F94-ABC37A803FF9} diff --git a/Model/Changes_2022_03_21_Abwesenheitsinformationprint.txt b/Model/Changes_2022_03_21_Abwesenheitsinformationprint.txt new file mode 100644 index 000000000..d7ea0aa1c --- /dev/null +++ b/Model/Changes_2022_03_21_Abwesenheitsinformationprint.txt @@ -0,0 +1,22 @@ +CREATE TABLE `abwesenheitsinformationprint` ( + `Oid` bigint NOT NULL AUTO_INCREMENT, + `Tid` int NOT NULL, + `ObjectOid` bigint DEFAULT NULL, + `ObjectTid` int DEFAULT NULL, + `Notice` varchar(1024) DEFAULT NULL, + `InsTs` datetime DEFAULT NULL, + `InsUser` varchar(256) DEFAULT NULL, + `Version` bigint DEFAULT NULL, + `UdpUser` varchar(256) DEFAULT NULL, + `IsActive` tinyint DEFAULT NULL, + `SystemEntryID` int DEFAULT NULL, + `Employee` varchar(256) DEFAULT NULL, + `ResturlaubVorjahr` varchar(256) DEFAULT NULL, + `VerfallenerResturlaub` varchar(256) DEFAULT NULL, + `Urlaubsanspruch` varchar(256) DEFAULT NULL, + `Resturlaub` varchar(256) DEFAULT NULL, + `TageKrankheit` varchar(256) DEFAULT NULL, + `TageUrlaub` varchar(256) DEFAULT NULL, + `GeschenkteUrlaubstage` varchar(256) DEFAULT NULL, + PRIMARY KEY (`Oid`) +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; diff --git a/ReportImp/BeWoRueckenwind/Invoicing/BeWoRueckenwindAssistenzInvoiceCreation.cs b/ReportImp/BeWoRueckenwind/Invoicing/BeWoRueckenwindAssistenzInvoiceCreation.cs index 4db22e055..b1266f801 100644 --- a/ReportImp/BeWoRueckenwind/Invoicing/BeWoRueckenwindAssistenzInvoiceCreation.cs +++ b/ReportImp/BeWoRueckenwind/Invoicing/BeWoRueckenwindAssistenzInvoiceCreation.cs @@ -20,10 +20,10 @@ namespace BeWoRueckenwind.Invoicing } - //public override IList CreateSummaryInvoiceItems(IList itemList, DateTimeSpan invoicePeriod, SupportConceptApprovalPeriod scap, - // Calculations calc) - //{ - // return itemList; - //} + //public override IList CreateSummaryInvoiceItems(IList itemList, DateTimeSpan invoicePeriod, SupportConceptApprovalPeriod scap, + // Calculations calc) + //{ + // return itemList; + //} } } diff --git a/ReportImp/IlkaLinkAmbulanteHilfen/IlkaLinkAmbulanteHilfen.csproj b/ReportImp/IlkaLinkAmbulanteHilfen/IlkaLinkAmbulanteHilfen.csproj index 12f72afe6..83e1ce554 100644 --- a/ReportImp/IlkaLinkAmbulanteHilfen/IlkaLinkAmbulanteHilfen.csproj +++ b/ReportImp/IlkaLinkAmbulanteHilfen/IlkaLinkAmbulanteHilfen.csproj @@ -66,6 +66,8 @@ InvoiceCustomerReport.cs + + Component diff --git a/ReportImp/IlkaLinkAmbulanteHilfen/Invoicing/CustomInvoiceFactory.cs b/ReportImp/IlkaLinkAmbulanteHilfen/Invoicing/CustomInvoiceFactory.cs new file mode 100644 index 000000000..4fd6e5953 --- /dev/null +++ b/ReportImp/IlkaLinkAmbulanteHilfen/Invoicing/CustomInvoiceFactory.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using BeWo.Data.Access; +using BeWo.Data.Entities; +using BeWo.Service.Invoicing; +using BS.Shared.DataContracts; +using BS.Shared.DataContracts.Compact; + +namespace IlkaLinkAmbulanteHilfen.Invoicing +{ + public class CustomInvoiceFactory : InvoiceFactory + { + + public override InvoiceCreation CreateInvoiceCreator(string specificId, string tenant, Dictionary> supportConcepts2ServiceRecords) + { + return new IlkaLinkAmbulanteHilfenInvoiceCreation(); + } + + } +} diff --git a/ReportImp/IlkaLinkAmbulanteHilfen/Invoicing/IlkaLinkAmbulanteHilfenInvoiceCreation.cs b/ReportImp/IlkaLinkAmbulanteHilfen/Invoicing/IlkaLinkAmbulanteHilfenInvoiceCreation.cs new file mode 100644 index 000000000..ae0b7c86a --- /dev/null +++ b/ReportImp/IlkaLinkAmbulanteHilfen/Invoicing/IlkaLinkAmbulanteHilfenInvoiceCreation.cs @@ -0,0 +1,22 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using BeWo.Data.Access; +using BeWo.Data.Entities; +using BeWo.Service.Invoicing; +using BS.Shared.Core; +using BS.Shared.DataContracts; +using BS.Shared.Services; + +namespace IlkaLinkAmbulanteHilfen.Invoicing +{ + + public class IlkaLinkAmbulanteHilfenInvoiceCreation : InvoiceCreation + { + public override IList CreateSummaryInvoiceItems(IList itemList, DateTimeSpan invoicePeriod, SupportConceptApprovalPeriod scap, Calculations calc) + { + return itemList; + } + } +} diff --git a/ReportImp/IlkaLinkAmbulanteHilfen/Reporting/CustomReportCreator.cs b/ReportImp/IlkaLinkAmbulanteHilfen/Reporting/CustomReportCreator.cs index f5b710fd5..ee14b8b4a 100644 --- a/ReportImp/IlkaLinkAmbulanteHilfen/Reporting/CustomReportCreator.cs +++ b/ReportImp/IlkaLinkAmbulanteHilfen/Reporting/CustomReportCreator.cs @@ -29,10 +29,10 @@ namespace IlkaLinkAmbulanteHilfen.Reporting { var os = new OperationsServiceImp(); var m = os.GetMandator2(false); - if (m.AllowSbd) - { - return CreateSbdLeistungsnachweisForAllCustomers(month, year, orgaOid, empOid, serviceCategoryOid ?? 0, startDay, endDay); - } + //if (m.AllowSbd) + //{ + // return CreateSbdLeistungsnachweisForAllCustomers(month, year, orgaOid, empOid, serviceCategoryOid ?? 0, startDay, endDay); + //} List lROs = ServicesOverviewRO.Create(month, year, orgaOid, empOid, startDay, endDay, serviceCategoryOid, true, nurFehlende); diff --git a/ReportImp/IlkaLinkAmbulanteHilfen/ServiceInvoiceReport.Designer.cs b/ReportImp/IlkaLinkAmbulanteHilfen/ServiceInvoiceReport.Designer.cs index 31edcc1b6..d11a990f0 100644 --- a/ReportImp/IlkaLinkAmbulanteHilfen/ServiceInvoiceReport.Designer.cs +++ b/ReportImp/IlkaLinkAmbulanteHilfen/ServiceInvoiceReport.Designer.cs @@ -787,8 +787,8 @@ namespace IlkaLinkAmbulanteHilfen this.xrLabel1.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold); this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(1140F, 0F); this.xrLabel1.Name = "xrLabel1"; - this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 254F); - this.xrLabel1.SizeF = new System.Drawing.SizeF(394F, 70F); + this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 5, 5, 254F); + this.xrLabel1.SizeF = new System.Drawing.SizeF(390F, 70F); this.xrLabel1.StylePriority.UseFont = false; this.xrLabel1.StylePriority.UsePadding = false; this.xrLabel1.StylePriority.UseTextAlignment = false; diff --git a/Service/Plugins/PluginLoader.cs b/Service/Plugins/PluginLoader.cs index 593b0e2aa..1bdb65cb0 100644 --- a/Service/Plugins/PluginLoader.cs +++ b/Service/Plugins/PluginLoader.cs @@ -310,7 +310,7 @@ namespace BeWo.Service.Plugins //t = "1344064965"; // ABW Klaßen //t = "3625103678"; // Pro Hilfe GbR | MID //t = "6028314513"; // Grundstein e.V. - //t = "6178735147"; // Ilka Link ivi. - ambulante Hilfen, Beratung & Therapie + t = "6178735147"; // Ilka Link ivi. - ambulante Hilfen, Beratung & Therapie //t = "9416221963"; // Übergangshilfe Unna e.V. //t = "1316958991"; // Aidshilfe Essen //t = "3718732195"; // Diakonie Remscheid Lennep (Jobfit) @@ -324,7 +324,7 @@ namespace BeWo.Service.Plugins //t = "4293131072"; // ASB Rhein-Erft/Düren e.V. Schulbegleitung //t = "2221228727"; // Autismus Leben gGmbH //t = "5065709552"; // Biotop e.V. - t = "9094672461"; // Toprak GmbH + //t = "9094672461"; // Toprak GmbH return t; #else