diff --git a/.gitignore b/.gitignore index 38bbc6ca1..a5a13d40e 100644 --- a/.gitignore +++ b/.gitignore @@ -636,3 +636,4 @@ obj /BeWoPlanerMobil/node_modules/.bin/pegjs /BeWoPlanerMobil/node_modules/.bin/pegjs.cmd /BeWoPlanerMobil/node_modules/.bin/pegjs.ps1 +/BeWoDatabaseTerminator/BeWoDatabaseTerminator/bin/Debug diff --git a/BeWo/ServiceProxy/Generated.cs b/BeWo/ServiceProxy/Generated.cs index 26162173d..db334954b 100644 --- a/BeWo/ServiceProxy/Generated.cs +++ b/BeWo/ServiceProxy/Generated.cs @@ -342,6 +342,15 @@ namespace BeWo.ServiceProxy [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/GetAbsenceOverviewBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] System.Collections.Generic.List GetAbsenceOverview(BS.Shared.DataContracts.AbsenceOverviewFilterDC filter); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/LoadCompactTeamsByOid", ReplyAction="http://tempuri.org/IEmployeeService/LoadCompactTeamsByOidResponse")] + [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/LoadCompactTeamsByOidBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] + System.Collections.Generic.List LoadCompactTeamsByOid(System.Collections.Generic.List teamOids); + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/FindLeadingCompactTeamsOfEmployee", ReplyAction="http://tempuri.org/IEmployeeService/FindLeadingCompactTeamsOfEmployeeResponse")] + [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/FindLeadingCompactTeamsOfEmployeeBeWoFaultFau" + + "lt", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] + System.Collections.Generic.List FindLeadingCompactTeamsOfEmployee(long employeeOid); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/ArchiveEmployee", ReplyAction="http://tempuri.org/IEmployeeService/ArchiveEmployeeResponse")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/ArchiveEmployeeBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] void ArchiveEmployee(long pOid, long pVersion); @@ -935,6 +944,16 @@ namespace BeWo.ServiceProxy return base.Channel.GetAbsenceOverview(filter); } + public System.Collections.Generic.List LoadCompactTeamsByOid(System.Collections.Generic.List teamOids) + { + return base.Channel.LoadCompactTeamsByOid(teamOids); + } + + public System.Collections.Generic.List FindLeadingCompactTeamsOfEmployee(long employeeOid) + { + return base.Channel.FindLeadingCompactTeamsOfEmployee(employeeOid); + } + public void ArchiveEmployee(long pOid, long pVersion) { base.Channel.ArchiveEmployee(pOid, pVersion); @@ -1400,8 +1419,8 @@ namespace BeWo.ServiceProxy [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary, decimal>))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ActivationTypeId))] @@ -1878,6 +1897,11 @@ namespace BeWo.ServiceProxy [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/GetAllAuthorizedCompactPersonsBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] System.Collections.Generic.List GetAllAuthorizedCompactPersons(); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/GetActiveMedListByTypeForCustomer", ReplyAction="http://tempuri.org/ICustomerService/GetActiveMedListByTypeForCustomerResponse")] + [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/GetActiveMedListByTypeForCustomerBeWoFaultFau" + + "lt", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] + System.Nullable GetActiveMedListByTypeForCustomer(long customerOid, bool isBedarfsmedikation); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/GetAllActiveCustomers", ReplyAction="http://tempuri.org/ICustomerService/GetAllActiveCustomersResponse")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/GetAllActiveCustomersBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] System.Collections.Generic.List GetAllActiveCustomers(); @@ -2721,6 +2745,11 @@ namespace BeWo.ServiceProxy return base.Channel.GetAllAuthorizedCompactPersons(); } + public System.Nullable GetActiveMedListByTypeForCustomer(long customerOid, bool isBedarfsmedikation) + { + return base.Channel.GetActiveMedListByTypeForCustomer(customerOid, isBedarfsmedikation); + } + public System.Collections.Generic.List GetAllActiveCustomers() { return base.Channel.GetAllActiveCustomers(); @@ -5484,6 +5513,11 @@ namespace BeWo.ServiceProxy [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetRootAppointmentBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] BS.Shared.DataContracts.SchedulerAppointmentDC GetRootAppointment(string recurrenceId); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/GetDiagiosisStringsForICD10Codes", ReplyAction="http://tempuri.org/IOperationsService/GetDiagiosisStringsForICD10CodesResponse")] + [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetDiagiosisStringsForICD10CodesBeWoFaultFa" + + "ult", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] + System.Collections.Generic.Dictionary GetDiagiosisStringsForICD10Codes(System.Collections.Generic.List icd10Codes); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/VertretungsMitarbeiterListeWoechentlich", ReplyAction="http://tempuri.org/IOperationsService/VertretungsMitarbeiterListeWoechentlichResp" + "onse")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/VertretungsMitarbeiterListeWoechentlichBeWo" + @@ -6929,6 +6963,11 @@ namespace BeWo.ServiceProxy return base.Channel.GetRootAppointment(recurrenceId); } + public System.Collections.Generic.Dictionary GetDiagiosisStringsForICD10Codes(System.Collections.Generic.List icd10Codes) + { + return base.Channel.GetDiagiosisStringsForICD10Codes(icd10Codes); + } + public System.Collections.Generic.List VertretungsMitarbeiterListeWoechentlich(System.DateTime start, System.DateTime ende) { return base.Channel.VertretungsMitarbeiterListeWoechentlich(start, ende); @@ -8581,6 +8620,10 @@ namespace BeWo.ServiceProxy [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IAccountingService/GetInvoiceBasesBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] System.Collections.Generic.List GetInvoiceBases(System.Nullable startDate, System.Nullable endDate); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAccountingService/GetInvoiceBases2", ReplyAction="http://tempuri.org/IAccountingService/GetInvoiceBases2Response")] + [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IAccountingService/GetInvoiceBases2BeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] + System.Collections.Generic.List GetInvoiceBases2(System.Nullable startDate, System.Nullable endDate, bool filterByInvoiceDate); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAccountingService/GetGeneralInvoiceBasesForCustomer", ReplyAction="http://tempuri.org/IAccountingService/GetGeneralInvoiceBasesForCustomerResponse")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IAccountingService/GetGeneralInvoiceBasesForCustomerBeWoFaultF" + "ault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] @@ -8750,6 +8793,11 @@ namespace BeWo.ServiceProxy return base.Channel.GetInvoiceBases(startDate, endDate); } + public System.Collections.Generic.List GetInvoiceBases2(System.Nullable startDate, System.Nullable endDate, bool filterByInvoiceDate) + { + return base.Channel.GetInvoiceBases2(startDate, endDate, filterByInvoiceDate); + } + public System.Collections.Generic.List GetGeneralInvoiceBasesForCustomer(long customerOid) { return base.Channel.GetGeneralInvoiceBasesForCustomer(customerOid); diff --git a/BeWo/View/Controls/YearMonthFilter.xaml b/BeWo/View/Controls/YearMonthFilter.xaml index 311bdd776..8bd21459e 100644 --- a/BeWo/View/Controls/YearMonthFilter.xaml +++ b/BeWo/View/Controls/YearMonthFilter.xaml @@ -1,25 +1,19 @@  - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/BeWo/View/Detail/Accounting/InvoiceOverview.xaml b/BeWo/View/Detail/Accounting/InvoiceOverview.xaml index db4b2d78e..62f2b2b70 100644 --- a/BeWo/View/Detail/Accounting/InvoiceOverview.xaml +++ b/BeWo/View/Detail/Accounting/InvoiceOverview.xaml @@ -3,20 +3,27 @@ - + - + + - -