diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj index 8e6c8f02a..4d8324890 100644 --- a/BeWo/BeWo.csproj +++ b/BeWo/BeWo.csproj @@ -962,7 +962,6 @@ BSLogoControl.xaml - @@ -994,7 +993,8 @@ - + + @@ -1180,6 +1180,7 @@ + @@ -2800,7 +2801,7 @@ Controls - {2F50B83D-A3F0-4EC4-979A-3F9B7E3D8ED4} + {2f50b83d-a3f0-4ec4-979a-3f9b7e3d8ed4} Shared diff --git a/BeWo/BeWoApp.xaml b/BeWo/BeWoApp.xaml index 8ae49c75d..92ae98733 100644 --- a/BeWo/BeWoApp.xaml +++ b/BeWo/BeWoApp.xaml @@ -73,15 +73,6 @@ - - - - - - - - - @@ -90,9 +81,15 @@ - - - + + + + + + + + + diff --git a/BeWo/BeWoApp.xaml.cs b/BeWo/BeWoApp.xaml.cs index e0e3ec839..bcd7a3e6c 100644 --- a/BeWo/BeWoApp.xaml.cs +++ b/BeWo/BeWoApp.xaml.cs @@ -605,6 +605,8 @@ namespace BeWo AppSettings.ShowWorktime = true; AppSettings.ShowPersehImport = true; AppSettings.ShowWohnhilfe = true; + //AppSettings.AllowGkvAbrechnung = true; + //AppSettings.AllowGkvAbrechnung = false; //showInfoButtonInCalender = true; #endif @@ -654,7 +656,7 @@ namespace BeWo { String url = ""; #if DEBUG - url = String.Format("http://localhost:3777/Host"); + //url = String.Format("http://localhost:3777/Host"); //return new Uri("https://app5.bewoplaner.de/service"); //url = String.Format("app1.bewoplaner.de/service"); #endif diff --git a/BeWo/Converter/GkvState2StringConverter.cs b/BeWo/Converter/GkvState2StringConverter.cs index f38075ceb..b6b4f9ab0 100644 --- a/BeWo/Converter/GkvState2StringConverter.cs +++ b/BeWo/Converter/GkvState2StringConverter.cs @@ -18,18 +18,19 @@ namespace BeWo.Converter if (state is null) return null; - switch (state.Value) - { - case GkvState.NoSend: return "Erstellt"; - case GkvState.Waiting: return "Gesendet"; - case GkvState.Waiting4Urbelege: return "Urbelege per Post"; - case GkvState.Error: return "Fehler"; - case GkvState.ErrorFatal: return "Fataler Fehler"; - case GkvState.Paid: return "Bezahlt"; - case GkvState.OldAndNoFeedback: return "Keine Antwort"; - } + switch (state.Value) + { + case GkvState.NoSend: return "Erstellt"; + case GkvState.ErrorSoft: return "Fehler"; + case GkvState.ErrorFatal: return "Fataler Fehler"; + case GkvState.Paid: return "Bezahlt"; + case GkvState.WaitingForDakota: return "Warte auf Übertragung"; + case GkvState.WaitingForKrankenkasse: return "Warte auf Gkv"; + case GkvState.WaitingForKrankenkasseTooLong: return "Keine Antwort von Gkv"; + case GkvState.WaitingForUrbelege: return "Sende Urbelege"; + } - return state.ToString(); + return state.ToString(); } public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) diff --git a/BeWo/Converter/TestDebugConverter.cs b/BeWo/Converter/TestDebugConverter.cs index 05ba470b9..9bff02a21 100644 --- a/BeWo/Converter/TestDebugConverter.cs +++ b/BeWo/Converter/TestDebugConverter.cs @@ -1,4 +1,5 @@ -using System; +using BeWo.ViewModel; +using System; using System.Globalization; using System.Windows.Data; @@ -8,7 +9,10 @@ namespace BeWo.Converter { public object Convert(object value, Type targetType, object parameter, CultureInfo culture) { - return value; + if (value is null) + return null; + + return "Test"; } public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) diff --git a/BeWo/Converter/TooltipTextConverter.cs b/BeWo/Converter/TooltipTextConverter.cs new file mode 100644 index 000000000..d3dd67712 --- /dev/null +++ b/BeWo/Converter/TooltipTextConverter.cs @@ -0,0 +1,40 @@ +using BeWo.ViewModel; +using System; +using System.Collections.Generic; +using System.Globalization; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Data; + +namespace BeWo.Converter +{ + public class TooltipTextConverter : IValueConverter + { + public object Convert(object value, Type targetType, object parameter, CultureInfo culture) + { + if(value is GkvAbrechnungVM gkv) + { + if (parameter is string s) + { + if (s == "Send") + { + return gkv.SendTooltip; + } + } + } + + if (value is InvoiceBaseVM invoice) + { + return invoice.IsGkvValidError; + } + + return "xxx"; + } + + public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) + { + throw new NotImplementedException(); + } + } +} diff --git a/BeWo/Converter/AppSettingsConverter.cs b/BeWo/Converter/UserPermission2BoolConverter.cs similarity index 63% rename from BeWo/Converter/AppSettingsConverter.cs rename to BeWo/Converter/UserPermission2BoolConverter.cs index 527f1601d..a4a18ae83 100644 --- a/BeWo/Converter/AppSettingsConverter.cs +++ b/BeWo/Converter/UserPermission2BoolConverter.cs @@ -1,4 +1,4 @@ -using BeWo.Core.Config; +using BS.Shared; using BS.Shared.Core; using System; using System.Collections.Generic; @@ -10,17 +10,22 @@ using System.Windows.Data; namespace BeWo.Converter { - public class AppSettingsConverter : IValueConverter + public class UserPermission2BoolConverter : IValueConverter { public object Convert(object value, Type targetType, object parameter, CultureInfo culture) { - if (parameter == null) - return false; - - if(parameter is string setting) + if (value is UserRightType type) + { + return BeWoApp.HasLoggedOnUserRight(type); + } + + if (parameter is UserRightType type2) + { + return BeWoApp.HasLoggedOnUserRight(type2); + } + + if (parameter is string setting && !string.IsNullOrWhiteSpace(setting)) { - // Kann gerne erweitert werden - // Achtung! Verwende bei Parameter SettingsKeys if (setting == SettingsKeys.AllowGkvAbrechnung) return BeWoApp.AppSettings.AllowGkvAbrechnung; } diff --git a/BeWo/Converter/UserRightType2BoolConverter.cs b/BeWo/Converter/UserRightType2BoolConverter.cs deleted file mode 100644 index e078f19ca..000000000 --- a/BeWo/Converter/UserRightType2BoolConverter.cs +++ /dev/null @@ -1,34 +0,0 @@ -using BS.Shared; -using System; -using System.Collections.Generic; -using System.Globalization; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Data; - -namespace BeWo.Converter -{ - public class UserRightType2BoolConverter : IValueConverter - { - public object Convert(object value, Type targetType, object parameter, CultureInfo culture) - { - if (value is UserRightType type) - { - return BeWoApp.HasLoggedOnUserRight(type); - } - - if (parameter is UserRightType type2) - { - return BeWoApp.HasLoggedOnUserRight(type2); - } - - return false; - } - - public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) - { - throw new NotImplementedException(); - } - } -} diff --git a/BeWo/DebugConfig.cs b/BeWo/DebugConfig.cs index c7dde3a75..90b9c8475 100644 --- a/BeWo/DebugConfig.cs +++ b/BeWo/DebugConfig.cs @@ -32,9 +32,12 @@ namespace BeWo } } - public DebugConfigMode DebugConfigMode { get; set; } + public static string Username { get; set; } = "m1"; + public static string Password { get; set; } = "bewobewo"; + public static string Profilename { get; set; } = "5000000000"; + public bool AutoLogin { get; set; } public UIContext? SelectView { get; set; } /// diff --git a/BeWo/LoginControl.xaml.cs b/BeWo/LoginControl.xaml.cs index 1a3069b74..5cbb008a5 100644 --- a/BeWo/LoginControl.xaml.cs +++ b/BeWo/LoginControl.xaml.cs @@ -31,6 +31,7 @@ using BeWo.View; using BeWo.View.Detail; using BS.Shared.Translation; using Path = System.IO.Path; +using System.Linq; namespace BeWo { @@ -198,6 +199,11 @@ namespace BeWo { #if DEBUG //selectedProfile = ReadSelectedProfile(); + + if (DebugConfig.CurrentConfig is DebugConfig current && !string.IsNullOrWhiteSpace(DebugConfig.Profilename)) + { + selectedProfile = ProfileList.FirstOrDefault(x => x.Name == DebugConfig.Profilename); + } #else selectedProfile = ReadSelectedProfile(); #endif @@ -712,9 +718,18 @@ namespace BeWo } #if DEBUG - if (DebugConfig.CurrentConfig is object && DebugConfig.CurrentConfig.AutoLogin) + + + if (DebugConfig.CurrentConfig is DebugConfig current) { - button_login_Click(this, new RoutedEventArgs()); + if (!string.IsNullOrWhiteSpace(DebugConfig.Username)) + TextBox_Username.Text = DebugConfig.Username; + + if (!string.IsNullOrWhiteSpace(DebugConfig.Password)) + PasswordBox_Password.Password = DebugConfig.Password; + + if (current.AutoLogin) + button_login_Click(this, new RoutedEventArgs()); } #endif } @@ -957,7 +972,7 @@ namespace BeWo { return s.IsUserValid(tempUsername, lPassword, lPin); } - catch (Exception) + catch (Exception e) { return UserValidationResult.UnkownError; } diff --git a/BeWo/MainControl.xaml.cs b/BeWo/MainControl.xaml.cs index 36edd416c..1b36e8300 100644 --- a/BeWo/MainControl.xaml.cs +++ b/BeWo/MainControl.xaml.cs @@ -491,7 +491,7 @@ namespace BeWo Grid.SetRowSpan(_WaitLayer, 3); grid_main.Children.Add(_WaitLayer); Panel.SetZIndex(_WaitLayer, int.MaxValue); - _WaitLayer.RefreshUI(); + //_WaitLayer.RefreshUI(); } } diff --git a/BeWo/Ressources/Icons/ownsoft_logo.png b/BeWo/Ressources/Icons/ownsoft_logo.png new file mode 100644 index 000000000..a73cd2d11 Binary files /dev/null and b/BeWo/Ressources/Icons/ownsoft_logo.png differ diff --git a/BeWo/ServiceProxy/Generated.cs b/BeWo/ServiceProxy/Generated.cs index 1a9131af4..f6c9ac647 100644 --- a/BeWo/ServiceProxy/Generated.cs +++ b/BeWo/ServiceProxy/Generated.cs @@ -1385,6 +1385,10 @@ namespace BeWo.ServiceProxy public interface ICustomerService { + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/GetAllActiveWohnheimbuchungen", ReplyAction="http://tempuri.org/ICustomerService/GetAllActiveWohnheimbuchungenResponse")] + [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/GetAllActiveWohnheimbuchungenBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] + System.Collections.Generic.List GetAllActiveWohnheimbuchungen(); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/GetWohnheimbuchung", ReplyAction="http://tempuri.org/ICustomerService/GetWohnheimbuchungResponse")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/GetWohnheimbuchungBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] BS.Shared.DataContracts.WohnheimbuchungDC GetWohnheimbuchung(long oid); @@ -1789,6 +1793,7 @@ namespace BeWo.ServiceProxy [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Wohnhilfe.Staatsangehorigkeit))] [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(BS.Shared.DataContracts.WohnheimbuchungDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Wohnheimbuchung2Costbearer2SupportConceptRelationDC))] @@ -1855,7 +1860,6 @@ namespace BeWo.ServiceProxy [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.List))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.WohnheimDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] @@ -2094,17 +2098,21 @@ 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(BS.Shared.DataContracts.AppResponseDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.InvoiceType))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.GkvTransferFehlerlevel))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.GkvTransferResultType))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GkvAbrechnung.GkvTransferProtokollDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] [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.GkvAbrechnungCreateRequestDC))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungCreateResponseDC))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GkvAbrechnung.GkvResponseDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungSendRequestDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungSendResponseDC))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungGetIKRequestDC))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungGetIKResponseDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.IO.MemoryStream))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.IO.Stream))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] @@ -2170,6 +2178,10 @@ namespace BeWo.ServiceProxy [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/ImportSupportConceptBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] BS.Shared.DataContracts.ImportSupportConceptResultDC ImportSupportConcept(BS.Shared.DataContracts.HilfeplanImportDC hidc); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/UpdateCustomer", ReplyAction="http://tempuri.org/ICustomerService/UpdateCustomerResponse")] + [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/UpdateCustomerBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] + long UpdateCustomer(BS.Shared.DataContracts.CustomerDC pCustomerDC); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/UpdateCustomersAbsenceTimes", ReplyAction="http://tempuri.org/ICustomerService/UpdateCustomersAbsenceTimesResponse")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/UpdateCustomersAbsenceTimesBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] void UpdateCustomersAbsenceTimes(long pCustomerOid, System.Collections.Generic.List pAbsenceTimes); @@ -2438,10 +2450,6 @@ namespace BeWo.ServiceProxy [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/GetAllActiveWohnheimeCompactBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] System.Collections.Generic.List GetAllActiveWohnheimeCompact(); - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/GetAllActiveWohnheimbuchungen", ReplyAction="http://tempuri.org/ICustomerService/GetAllActiveWohnheimbuchungenResponse")] - [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/GetAllActiveWohnheimbuchungenBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] - System.Collections.Generic.List GetAllActiveWohnheimbuchungen(); - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/ArchiveCustomer", ReplyAction="http://tempuri.org/ICustomerService/ArchiveCustomerResponse")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/ArchiveCustomerBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] void ArchiveCustomer(long pOid, long pVersion); @@ -2596,6 +2604,11 @@ namespace BeWo.ServiceProxy "WoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] System.Collections.Generic.List GetAllActiveAndArchivedOrganisationsCompact(); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/GetAllGkvValidOrganisationsCompact", ReplyAction="http://tempuri.org/ICustomerService/GetAllGkvValidOrganisationsCompactResponse")] + [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/GetAllGkvValidOrganisationsCompactBeWoFaultFa" + + "ult", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] + System.Collections.Generic.List GetAllGkvValidOrganisationsCompact(); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/ArchiveWohnheim", ReplyAction="http://tempuri.org/ICustomerService/ArchiveWohnheimResponse")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/ArchiveWohnheimBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] void ArchiveWohnheim(long pOid, long pVersion); @@ -2713,10 +2726,6 @@ namespace BeWo.ServiceProxy [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/AllowSavingCustomer", ReplyAction="http://tempuri.org/ICustomerService/AllowSavingCustomerResponse")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/AllowSavingCustomerBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] string AllowSavingCustomer(BS.Shared.DataContracts.CustomerDC pCustomerDC); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/UpdateCustomer", ReplyAction="http://tempuri.org/ICustomerService/UpdateCustomerResponse")] - [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/UpdateCustomerBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] - long UpdateCustomer(BS.Shared.DataContracts.CustomerDC pCustomerDC); } [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")] @@ -2753,6 +2762,11 @@ namespace BeWo.ServiceProxy { } + public System.Collections.Generic.List GetAllActiveWohnheimbuchungen() + { + return base.Channel.GetAllActiveWohnheimbuchungen(); + } + public BS.Shared.DataContracts.WohnheimbuchungDC GetWohnheimbuchung(long oid) { return base.Channel.GetWohnheimbuchung(oid); @@ -3048,6 +3062,11 @@ namespace BeWo.ServiceProxy return base.Channel.ImportSupportConcept(hidc); } + public long UpdateCustomer(BS.Shared.DataContracts.CustomerDC pCustomerDC) + { + return base.Channel.UpdateCustomer(pCustomerDC); + } + public void UpdateCustomersAbsenceTimes(long pCustomerOid, System.Collections.Generic.List pAbsenceTimes) { base.Channel.UpdateCustomersAbsenceTimes(pCustomerOid, pAbsenceTimes); @@ -3363,11 +3382,6 @@ namespace BeWo.ServiceProxy return base.Channel.GetAllActiveWohnheimeCompact(); } - public System.Collections.Generic.List GetAllActiveWohnheimbuchungen() - { - return base.Channel.GetAllActiveWohnheimbuchungen(); - } - public void ArchiveCustomer(long pOid, long pVersion) { base.Channel.ArchiveCustomer(pOid, pVersion); @@ -3543,6 +3557,11 @@ namespace BeWo.ServiceProxy return base.Channel.GetAllActiveAndArchivedOrganisationsCompact(); } + public System.Collections.Generic.List GetAllGkvValidOrganisationsCompact() + { + return base.Channel.GetAllGkvValidOrganisationsCompact(); + } + public void ArchiveWohnheim(long pOid, long pVersion) { base.Channel.ArchiveWohnheim(pOid, pVersion); @@ -3682,11 +3701,6 @@ namespace BeWo.ServiceProxy { return base.Channel.AllowSavingCustomer(pCustomerDC); } - - public long UpdateCustomer(BS.Shared.DataContracts.CustomerDC pCustomerDC) - { - return base.Channel.UpdateCustomer(pCustomerDC); - } } [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")] @@ -6022,6 +6036,7 @@ namespace BeWo.ServiceProxy [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Wohnhilfe.Staatsangehorigkeit))] [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(BS.Shared.DataContracts.WohnheimbuchungDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Wohnheimbuchung2Costbearer2SupportConceptRelationDC))] @@ -6088,7 +6103,6 @@ namespace BeWo.ServiceProxy [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.List))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.WohnheimDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] @@ -6327,17 +6341,21 @@ 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(BS.Shared.DataContracts.AppResponseDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.InvoiceType))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.GkvTransferFehlerlevel))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.GkvTransferResultType))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GkvAbrechnung.GkvTransferProtokollDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] [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.GkvAbrechnungCreateRequestDC))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungCreateResponseDC))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GkvAbrechnung.GkvResponseDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungSendRequestDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungSendResponseDC))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungGetIKRequestDC))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungGetIKResponseDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.IO.MemoryStream))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.IO.Stream))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] @@ -9589,6 +9607,12 @@ namespace BeWo.ServiceProxy "ault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] System.Collections.Generic.List GetInvoiceBasesForCostBearerAndId(System.Nullable startDate, System.Nullable endDate, long costBearerOid, string invoiceId); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAccountingService/GetInvoiceBasesForCostBearerAndIdAndIsUsed", ReplyAction="http://tempuri.org/IAccountingService/GetInvoiceBasesForCostBearerAndIdAndIsUsedR" + + "esponse")] + [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IAccountingService/GetInvoiceBasesForCostBearerAndIdAndIsUsedB" + + "eWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] + System.Collections.Generic.List GetInvoiceBasesForCostBearerAndIdAndIsUsed(System.Nullable startDate, System.Nullable endDate, long costBearerOid, string invoiceId); + [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")] @@ -9707,7 +9731,7 @@ namespace BeWo.ServiceProxy [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.GkvAbrechnung.GkvAbrechnungResponseDC CreateNewGkvAbrechnung(BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungRequestDC request); + BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungCreateResponseDC CreateNewGkvAbrechnung(BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungCreateRequestDC 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")] @@ -9720,6 +9744,10 @@ namespace BeWo.ServiceProxy [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.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAccountingService/SendGetIKRequest", ReplyAction="http://tempuri.org/IAccountingService/SendGetIKRequestResponse")] + [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IAccountingService/SendGetIKRequestBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] + BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungGetIKResponseDC SendGetIKRequest(BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungGetIKRequestDC req); } [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")] @@ -9796,6 +9824,11 @@ namespace BeWo.ServiceProxy return base.Channel.GetInvoiceBasesForCostBearerAndId(startDate, endDate, costBearerOid, invoiceId); } + public System.Collections.Generic.List GetInvoiceBasesForCostBearerAndIdAndIsUsed(System.Nullable startDate, System.Nullable endDate, long costBearerOid, string invoiceId) + { + return base.Channel.GetInvoiceBasesForCostBearerAndIdAndIsUsed(startDate, endDate, costBearerOid, invoiceId); + } + public System.Collections.Generic.List GetGeneralInvoiceBasesForCustomer(long customerOid) { return base.Channel.GetGeneralInvoiceBasesForCustomer(customerOid); @@ -9926,7 +9959,7 @@ namespace BeWo.ServiceProxy return base.Channel.GetFilteredGkvAbrechnungen(gkvAbrechnungViewFilter); } - public BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungResponseDC CreateNewGkvAbrechnung(BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungRequestDC request) + public BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungCreateResponseDC CreateNewGkvAbrechnung(BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungCreateRequestDC request) { return base.Channel.CreateNewGkvAbrechnung(request); } @@ -9945,6 +9978,11 @@ namespace BeWo.ServiceProxy { return base.Channel.SendNewGkvAbrechnung(req); } + + public BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungGetIKResponseDC SendGetIKRequest(BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungGetIKRequestDC req) + { + return base.Channel.SendGetIKRequest(req); + } } [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")] diff --git a/BeWo/Styles/ControlStyles/ButtonStyles.xaml b/BeWo/Styles/ControlStyles/ButtonStyles.xaml index 74e604440..5e01c9139 100644 --- a/BeWo/Styles/ControlStyles/ButtonStyles.xaml +++ b/BeWo/Styles/ControlStyles/ButtonStyles.xaml @@ -136,4 +136,18 @@ + + + + \ No newline at end of file diff --git a/BeWo/Styles/ModernOrangeBlack.xaml b/BeWo/Styles/ModernOrangeBlack.xaml index 357934f1f..72279e02c 100644 --- a/BeWo/Styles/ModernOrangeBlack.xaml +++ b/BeWo/Styles/ModernOrangeBlack.xaml @@ -40,5 +40,4 @@ + + + + + + + - + - + - + - + + - - + + - - - + + + - - - + - + + + + - + Bez. Datenannahmeste... + + + + + + - Test - Erprobung - Echt - - - - - - - - - - - - - + + + + + - - + @@ -1155,18 +1180,27 @@ HorizontalAlignment="Right" VerticalAlignment="Center" Orientation="Horizontal"> + + + + + + +