From 0851e1ab68a615ece7f05ea170fbe77a3a11ef46 Mon Sep 17 00:00:00 2001 From: Rene Evertz Date: Mon, 6 May 2024 13:14:35 +0200 Subject: [PATCH] Zwischenstand GetSTatus GetIK --- BeWo/ServiceProxy/Generated.cs | 61 ++- .../Accounting/GkvAbrechnungOverview.xaml | 5 +- .../Accounting/GkvAbrechnungOverview.xaml.cs | 24 +- .../NewGkvAbrechnungPopUpView .xaml.cs | 1 + BeWo/ViewModel/GkvAbrechnungVM.cs | 5 +- .../ListViewModel/GkvAbrechnungListVM.cs | 1 + Data/ASPHibernateSessionManager.cs | 2 +- Data/WCFHibernateSessionManager.cs | 3 +- Host/GkvAbrechnungView.aspx | 2 +- Host/GkvAbrechnungView.aspx.cs | 414 ++++++++---------- Host/Host.csproj | 1 + Host/Login.aspx.cs | 27 +- Host/ReportView.aspx.cs | 1 - .../GkvAbrechnungDC_GkvAbrechnung.cs | 1 + .../ServiceContracts/IAccountingService.cs | 5 + .../AccountingServiceImp.cs | 313 ++++++++----- .../ServiceImplementations/UserServiceImp.cs | 2 + Shared/BeWoEntityEnums.cs | 8 + .../{ => GkvAbrechnung}/GkvAbrechnungDC.cs | 152 +++---- .../GkvAbrechnungRequestDC.cs | 2 +- .../GkvAbrechnungResponseDC.cs | 2 +- .../GkvAbrechnungSendRequestDC.cs | 16 + .../GkvAbrechnungSendResponseDC.cs | 19 + .../GkvAbrechnungViewFilterDC.cs | 2 +- .../GkvAbrechnung/GkvApp8GetIKRequest.cs | 20 + .../GkvAbrechnung/GkvApp8GetIKResponse.cs | 21 + .../GkvAbrechnung/GkvApp8GetStatusRequest.cs | 20 + .../GkvAbrechnung/GkvApp8GetStatusResponse.cs | 18 + .../GkvAbrechnung/GkvApp8Request.cs | 25 ++ .../GkvAbrechnung/GkvApp8Response.cs | 19 + .../GkvAbrechnung/GkvApp8SendNewRequest.cs | 20 + Shared/Extensions/GkvAbrechnungExtensions.cs | 47 ++ Shared/Shared.csproj | 18 +- 33 files changed, 817 insertions(+), 460 deletions(-) rename Shared/DataContracts/{ => GkvAbrechnung}/GkvAbrechnungDC.cs (94%) rename Shared/DataContracts/{ => GkvAbrechnung}/GkvAbrechnungRequestDC.cs (92%) rename Shared/DataContracts/{ => GkvAbrechnung}/GkvAbrechnungResponseDC.cs (90%) create mode 100644 Shared/DataContracts/GkvAbrechnung/GkvAbrechnungSendRequestDC.cs create mode 100644 Shared/DataContracts/GkvAbrechnung/GkvAbrechnungSendResponseDC.cs rename Shared/DataContracts/{ => GkvAbrechnung}/GkvAbrechnungViewFilterDC.cs (92%) create mode 100644 Shared/DataContracts/GkvAbrechnung/GkvApp8GetIKRequest.cs create mode 100644 Shared/DataContracts/GkvAbrechnung/GkvApp8GetIKResponse.cs create mode 100644 Shared/DataContracts/GkvAbrechnung/GkvApp8GetStatusRequest.cs create mode 100644 Shared/DataContracts/GkvAbrechnung/GkvApp8GetStatusResponse.cs create mode 100644 Shared/DataContracts/GkvAbrechnung/GkvApp8Request.cs create mode 100644 Shared/DataContracts/GkvAbrechnung/GkvApp8Response.cs create mode 100644 Shared/DataContracts/GkvAbrechnung/GkvApp8SendNewRequest.cs create mode 100644 Shared/Extensions/GkvAbrechnungExtensions.cs diff --git a/BeWo/ServiceProxy/Generated.cs b/BeWo/ServiceProxy/Generated.cs index 8dd9d2dfd..fec0e225d 100644 --- a/BeWo/ServiceProxy/Generated.cs +++ b/BeWo/ServiceProxy/Generated.cs @@ -2046,12 +2046,14 @@ namespace BeWo.ServiceProxy [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.ServiceInvoicePeriodDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.InvoiceNumberDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GkvAbrechnungDC))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GkvAbrechnungViewFilterDC))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GkvAbrechnungRequestDC))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GkvAbrechnungResponseDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.InvoiceType))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungDC))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungViewFilterDC))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungRequestDC))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungResponseDC))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungSendRequestDC))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungSendResponseDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.IO.MemoryStream))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.IO.Stream))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] @@ -6054,12 +6056,14 @@ namespace BeWo.ServiceProxy [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.ServiceInvoicePeriodDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.InvoiceNumberDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GkvAbrechnungDC))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GkvAbrechnungViewFilterDC))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GkvAbrechnungRequestDC))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GkvAbrechnungResponseDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.InvoiceType))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungDC))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungViewFilterDC))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungRequestDC))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungResponseDC))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungSendRequestDC))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungSendResponseDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.IO.MemoryStream))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.IO.Stream))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] @@ -9387,31 +9391,35 @@ namespace BeWo.ServiceProxy [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAccountingService/InsertNewGkvAbrechnungen", ReplyAction="http://tempuri.org/IAccountingService/InsertNewGkvAbrechnungenResponse")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IAccountingService/InsertNewGkvAbrechnungenBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] - System.Collections.Generic.List InsertNewGkvAbrechnungen(System.Collections.Generic.List dc); + System.Collections.Generic.List InsertNewGkvAbrechnungen(System.Collections.Generic.List dc); [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAccountingService/GetGkvAbrechnung", ReplyAction="http://tempuri.org/IAccountingService/GetGkvAbrechnungResponse")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IAccountingService/GetGkvAbrechnungBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] - BS.Shared.DataContracts.GkvAbrechnungDC GetGkvAbrechnung(long oid); + BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungDC GetGkvAbrechnung(long oid); [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAccountingService/GetAllGkvAbrechnungen", ReplyAction="http://tempuri.org/IAccountingService/GetAllGkvAbrechnungenResponse")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IAccountingService/GetAllGkvAbrechnungenBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] - System.Collections.Generic.List GetAllGkvAbrechnungen(); + System.Collections.Generic.List GetAllGkvAbrechnungen(); [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAccountingService/GetFilteredGkvAbrechnungen", ReplyAction="http://tempuri.org/IAccountingService/GetFilteredGkvAbrechnungenResponse")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IAccountingService/GetFilteredGkvAbrechnungenBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] - System.Collections.Generic.List GetFilteredGkvAbrechnungen(BS.Shared.DataContracts.GkvAbrechnungViewFilterDC gkvAbrechnungViewFilter); + System.Collections.Generic.List GetFilteredGkvAbrechnungen(BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungViewFilterDC gkvAbrechnungViewFilter); [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAccountingService/CreateNewGkvAbrechnung", ReplyAction="http://tempuri.org/IAccountingService/CreateNewGkvAbrechnungResponse")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IAccountingService/CreateNewGkvAbrechnungBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] - BS.Shared.DataContracts.GkvAbrechnungResponseDC CreateNewGkvAbrechnung(BS.Shared.DataContracts.GkvAbrechnungRequestDC request); + BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungResponseDC CreateNewGkvAbrechnung(BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungRequestDC request); [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAccountingService/UpdateGkvAbrechnung", ReplyAction="http://tempuri.org/IAccountingService/UpdateGkvAbrechnungResponse")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IAccountingService/UpdateGkvAbrechnungBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] - BS.Shared.DataContracts.GkvAbrechnungDC UpdateGkvAbrechnung(BS.Shared.DataContracts.GkvAbrechnungDC abrechnung); + BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungDC UpdateGkvAbrechnung(BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungDC abrechnung); [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAccountingService/DeleteGkvAbrechnung", ReplyAction="http://tempuri.org/IAccountingService/DeleteGkvAbrechnungResponse")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IAccountingService/DeleteGkvAbrechnungBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] - void DeleteGkvAbrechnung(BS.Shared.DataContracts.GkvAbrechnungDC abrechnung); + void DeleteGkvAbrechnung(BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungDC abrechnung); + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAccountingService/SendNewGkvAbrechnung", ReplyAction="http://tempuri.org/IAccountingService/SendNewGkvAbrechnungResponse")] + [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IAccountingService/SendNewGkvAbrechnungBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] + BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungSendResponseDC SendNewGkvAbrechnung(BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungSendRequestDC req); } [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")] @@ -9603,40 +9611,45 @@ namespace BeWo.ServiceProxy base.Channel.StorniereInvoiceBases(invoices); } - public System.Collections.Generic.List InsertNewGkvAbrechnungen(System.Collections.Generic.List dc) + public System.Collections.Generic.List InsertNewGkvAbrechnungen(System.Collections.Generic.List dc) { return base.Channel.InsertNewGkvAbrechnungen(dc); } - public BS.Shared.DataContracts.GkvAbrechnungDC GetGkvAbrechnung(long oid) + public BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungDC GetGkvAbrechnung(long oid) { return base.Channel.GetGkvAbrechnung(oid); } - public System.Collections.Generic.List GetAllGkvAbrechnungen() + public System.Collections.Generic.List GetAllGkvAbrechnungen() { return base.Channel.GetAllGkvAbrechnungen(); } - public System.Collections.Generic.List GetFilteredGkvAbrechnungen(BS.Shared.DataContracts.GkvAbrechnungViewFilterDC gkvAbrechnungViewFilter) + public System.Collections.Generic.List GetFilteredGkvAbrechnungen(BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungViewFilterDC gkvAbrechnungViewFilter) { return base.Channel.GetFilteredGkvAbrechnungen(gkvAbrechnungViewFilter); } - public BS.Shared.DataContracts.GkvAbrechnungResponseDC CreateNewGkvAbrechnung(BS.Shared.DataContracts.GkvAbrechnungRequestDC request) + public BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungResponseDC CreateNewGkvAbrechnung(BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungRequestDC request) { return base.Channel.CreateNewGkvAbrechnung(request); } - public BS.Shared.DataContracts.GkvAbrechnungDC UpdateGkvAbrechnung(BS.Shared.DataContracts.GkvAbrechnungDC abrechnung) + public BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungDC UpdateGkvAbrechnung(BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungDC abrechnung) { return base.Channel.UpdateGkvAbrechnung(abrechnung); } - public void DeleteGkvAbrechnung(BS.Shared.DataContracts.GkvAbrechnungDC abrechnung) + public void DeleteGkvAbrechnung(BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungDC abrechnung) { base.Channel.DeleteGkvAbrechnung(abrechnung); } + + public BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungSendResponseDC SendNewGkvAbrechnung(BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungSendRequestDC req) + { + return base.Channel.SendNewGkvAbrechnung(req); + } } [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")] diff --git a/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml b/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml index fa3747cc5..18c51db8e 100644 --- a/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml +++ b/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml @@ -55,10 +55,11 @@