From 4608d68eb896a2e795198a861a84f962167e3583 Mon Sep 17 00:00:00 2001 From: Marcel Hirschle Date: Wed, 2 Feb 2022 17:50:40 +0100 Subject: [PATCH] =?UTF-8?q?MH:=20Anpassungen=20f=C3=BCr=20Aidshilfe=20Esse?= =?UTF-8?q?n?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BeWo.sln | 19 + BeWo/ServiceProxy/Generated.cs | 18 + BeWo/View/Detail/Report/DienstplanerView.xaml | 39 +- .../Detail/Report/DienstplanerView.xaml.cs | 24 +- .../AidshilfeEssen/AidshilfeEssen.csproj | 95 + .../AidshilfeEssen/Properties/AssemblyInfo.cs | 36 + .../AidshilfeEssen/Properties/licenses.licx | 1 + .../ServiceInvoiceReport.Designer.cs | 446 ++++ .../AidshilfeEssen/ServiceInvoiceReport.cs | 87 + .../AidshilfeEssen/ServiceInvoiceReport.resx | 2202 +++++++++++++++++ .../SettlementReport.Designer.cs | 1357 ++++++++++ ReportImp/AidshilfeEssen/SettlementReport.cs | 248 ++ .../AidshilfeEssen/SettlementReport.resx | 2202 +++++++++++++++++ ReportImp/AidshilfeEssen/logo.jpg | Bin 0 -> 124391 bytes .../RechnungBeWo67.Designer.cs | 2 +- ReportImp/KundeXyz/KundeXyz.csproj | 72 + ReportImp/KundeXyz/Properties/AssemblyInfo.cs | 36 + .../Dienstplanung/DienstplanungsManager.cs | 93 +- Service/Plugins/PluginLoader.cs | 3 +- .../ServiceContracts/IOperationsService.cs | 8 + .../OperationsServiceImp.cs | 23 + Shared/DataContracts/DienstplanerRootDC.cs | 6 + 22 files changed, 7003 insertions(+), 14 deletions(-) create mode 100644 ReportImp/AidshilfeEssen/AidshilfeEssen.csproj create mode 100644 ReportImp/AidshilfeEssen/Properties/AssemblyInfo.cs create mode 100644 ReportImp/AidshilfeEssen/Properties/licenses.licx create mode 100644 ReportImp/AidshilfeEssen/ServiceInvoiceReport.Designer.cs create mode 100644 ReportImp/AidshilfeEssen/ServiceInvoiceReport.cs create mode 100644 ReportImp/AidshilfeEssen/ServiceInvoiceReport.resx create mode 100644 ReportImp/AidshilfeEssen/SettlementReport.Designer.cs create mode 100644 ReportImp/AidshilfeEssen/SettlementReport.cs create mode 100644 ReportImp/AidshilfeEssen/SettlementReport.resx create mode 100644 ReportImp/AidshilfeEssen/logo.jpg create mode 100644 ReportImp/KundeXyz/KundeXyz.csproj create mode 100644 ReportImp/KundeXyz/Properties/AssemblyInfo.cs diff --git a/BeWo.sln b/BeWo.sln index 494eef79c..9438c2148 100644 --- a/BeWo.sln +++ b/BeWo.sln @@ -501,6 +501,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IlkaLinkAmbulanteHilfen", " EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UebergangshilfeUnnaEV", "ReportImp\UebergangshilfeUnnaEV\UebergangshilfeUnnaEV.csproj", "{A9B88C6C-8965-4F08-B647-42CF0D8058A5}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AidshilfeEssen", "ReportImp\AidshilfeEssen\AidshilfeEssen.csproj", "{C52AC467-D452-4396-8DB3-D04AC1045CFB}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|.NET = Debug|.NET @@ -3896,6 +3898,22 @@ Global {A9B88C6C-8965-4F08-B647-42CF0D8058A5}.Release|Mixed Platforms.Build.0 = Release|Any CPU {A9B88C6C-8965-4F08-B647-42CF0D8058A5}.Release|x86.ActiveCfg = Release|Any CPU {A9B88C6C-8965-4F08-B647-42CF0D8058A5}.Release|x86.Build.0 = Release|Any CPU + {C52AC467-D452-4396-8DB3-D04AC1045CFB}.Debug|.NET.ActiveCfg = Debug|Any CPU + {C52AC467-D452-4396-8DB3-D04AC1045CFB}.Debug|.NET.Build.0 = Debug|Any CPU + {C52AC467-D452-4396-8DB3-D04AC1045CFB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C52AC467-D452-4396-8DB3-D04AC1045CFB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C52AC467-D452-4396-8DB3-D04AC1045CFB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {C52AC467-D452-4396-8DB3-D04AC1045CFB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {C52AC467-D452-4396-8DB3-D04AC1045CFB}.Debug|x86.ActiveCfg = Debug|Any CPU + {C52AC467-D452-4396-8DB3-D04AC1045CFB}.Debug|x86.Build.0 = Debug|Any CPU + {C52AC467-D452-4396-8DB3-D04AC1045CFB}.Release|.NET.ActiveCfg = Release|Any CPU + {C52AC467-D452-4396-8DB3-D04AC1045CFB}.Release|.NET.Build.0 = Release|Any CPU + {C52AC467-D452-4396-8DB3-D04AC1045CFB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C52AC467-D452-4396-8DB3-D04AC1045CFB}.Release|Any CPU.Build.0 = Release|Any CPU + {C52AC467-D452-4396-8DB3-D04AC1045CFB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {C52AC467-D452-4396-8DB3-D04AC1045CFB}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {C52AC467-D452-4396-8DB3-D04AC1045CFB}.Release|x86.ActiveCfg = Release|Any CPU + {C52AC467-D452-4396-8DB3-D04AC1045CFB}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -4142,6 +4160,7 @@ Global {D2668FF9-5A6B-497F-876D-C560919BA30C} = {D8A691C5-146D-4613-86CC-438F02FE9106} {AA0D5E5F-9690-4EDA-B1D8-7C883CC63DE4} = {D8A691C5-146D-4613-86CC-438F02FE9106} {A9B88C6C-8965-4F08-B647-42CF0D8058A5} = {D8A691C5-146D-4613-86CC-438F02FE9106} + {C52AC467-D452-4396-8DB3-D04AC1045CFB} = {D8A691C5-146D-4613-86CC-438F02FE9106} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {FBE985BB-9F0F-4DBB-8F94-ABC37A803FF9} diff --git a/BeWo/ServiceProxy/Generated.cs b/BeWo/ServiceProxy/Generated.cs index b9e694694..efdc9c7e0 100644 --- a/BeWo/ServiceProxy/Generated.cs +++ b/BeWo/ServiceProxy/Generated.cs @@ -5254,6 +5254,14 @@ namespace BeWo.ServiceProxy "BeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] void DeleteRegelmaessigeDiensteOfRemovedEmployee(System.Collections.Generic.List employee, long wOid); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/SetSortierMethoden", ReplyAction="http://tempuri.org/IOperationsService/SetSortierMethodenResponse")] + [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/SetSortierMethodenBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] + System.Collections.Generic.List SetSortierMethoden(); + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/DienstBloeckeNeuSortieren", ReplyAction="http://tempuri.org/IOperationsService/DienstBloeckeNeuSortierenResponse")] + [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/DienstBloeckeNeuSortierenBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] + System.Collections.Generic.List DienstBloeckeNeuSortieren(System.Collections.Generic.List bloecke, string auswahl, bool aufsteigend); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/UpdateBudget", ReplyAction="http://tempuri.org/IOperationsService/UpdateBudgetResponse")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/UpdateBudgetBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] void UpdateBudget(System.Collections.Generic.List budgets); @@ -6630,6 +6638,16 @@ namespace BeWo.ServiceProxy base.Channel.DeleteRegelmaessigeDiensteOfRemovedEmployee(employee, wOid); } + public System.Collections.Generic.List SetSortierMethoden() + { + return base.Channel.SetSortierMethoden(); + } + + public System.Collections.Generic.List DienstBloeckeNeuSortieren(System.Collections.Generic.List bloecke, string auswahl, bool aufsteigend) + { + return base.Channel.DienstBloeckeNeuSortieren(bloecke, auswahl, aufsteigend); + } + public void UpdateBudget(System.Collections.Generic.List budgets) { base.Channel.UpdateBudget(budgets); diff --git a/BeWo/View/Detail/Report/DienstplanerView.xaml b/BeWo/View/Detail/Report/DienstplanerView.xaml index 2af5ec3cc..3e8db7483 100644 --- a/BeWo/View/Detail/Report/DienstplanerView.xaml +++ b/BeWo/View/Detail/Report/DienstplanerView.xaml @@ -198,8 +198,8 @@ - - + + @@ -208,7 +208,40 @@