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/View/Detail/Accounting/GkvAbrechnungOverview.xaml b/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml index 4a1a6d0fe..3ed4a0096 100644 --- a/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml +++ b/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml @@ -11,10 +11,9 @@ Height="Auto" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" - Focusable="True" - Loaded="BeWoView_Loaded"> + Focusable="True"> - + _Viewmodel.DateTimeSpanFilter is null; - private void CheckRights() - { - - } private void RefreshGkvAbrechnungenList() { var test = datagrid_gkvAbrechnungen; @@ -388,6 +380,8 @@ namespace BeWo.View.Detail.Accounting private void BeWoView_Loaded(object sender, RoutedEventArgs e) { _Viewmodel.FirePropertyChangedItself(); - } + + RefreshGkvAbrechnungenList(); + } } } \ No newline at end of file diff --git a/BeWo/View/Detail/Accounting/NewGkvAbrechnungPopUpView.xaml b/BeWo/View/Detail/Accounting/NewGkvAbrechnungPopUpView.xaml index 8d4061b3a..80e3c6994 100644 --- a/BeWo/View/Detail/Accounting/NewGkvAbrechnungPopUpView.xaml +++ b/BeWo/View/Detail/Accounting/NewGkvAbrechnungPopUpView.xaml @@ -77,12 +77,13 @@ - - - - - - - - - - + diff --git a/BeWo/View/Master/FinanceView.xaml b/BeWo/View/Master/FinanceView.xaml index 144cee484..027211665 100644 --- a/BeWo/View/Master/FinanceView.xaml +++ b/BeWo/View/Master/FinanceView.xaml @@ -100,7 +100,8 @@ Name="tabitem_overviewinvoice" Header="Rechnungsübersicht" Selector.Selected="tabitem_overviewinvoice_Selected" /> - + - FirePropertyChanged(nameof(IsReady2Create)); + public bool IsReady2Create + => InvoiceBases?.Where(x => x.IsChecked).Any() ?? false; public GkvState GetState() { diff --git a/BeWo/ViewModel/ListViewModel/GkvAbrechnungListVM.cs b/BeWo/ViewModel/ListViewModel/GkvAbrechnungListVM.cs index 684aa512b..082b472e5 100644 --- a/BeWo/ViewModel/ListViewModel/GkvAbrechnungListVM.cs +++ b/BeWo/ViewModel/ListViewModel/GkvAbrechnungListVM.cs @@ -5,53 +5,56 @@ using BS.Shared.DataContracts.GkvAbrechnung; namespace BeWo.ViewModel.ListViewModel { - public class GkvAbrechnungListVM : AbstractDCListMapperVM - { - public static string PropertyName_DateTimeSpanFilter = "DateTimeSpanFilter"; + public class GkvAbrechnungListVM : AbstractDCListMapperVM + { + public static string PropertyName_DateTimeSpanFilter = "DateTimeSpanFilter"; - public static string PropertyName_FilterResultAmountSum = "FilterResultAmountSum"; - public static string PropertyName_FilterResultAmountNotPaidSum = "FilterResultAmountNotPaidSum"; + public static string PropertyName_FilterResultAmountSum = "FilterResultAmountSum"; + public static string PropertyName_FilterResultAmountNotPaidSum = "FilterResultAmountNotPaidSum"; - private DateTimeSpan _DateTimeSpanFilter; + private DateTimeSpan _DateTimeSpanFilter; - public GkvAbrechnungListVM(List pDCList) : base(pDCList) - { - this.VMList.ListChanged += (s, e) => this.FirePropertyChanged(PropertyName_FilterResultAmountSum); - this.VMList.ListChanged += (s, e) => this.FirePropertyChanged(PropertyName_FilterResultAmountNotPaidSum); - } - public GkvAbrechnungListVM() : this(null) - { + public GkvAbrechnungListVM(List pDCList) : base(pDCList) + { + this.VMList.ListChanged += (s, e) => this.FirePropertyChanged(PropertyName_FilterResultAmountSum); + this.VMList.ListChanged += (s, e) => this.FirePropertyChanged(PropertyName_FilterResultAmountNotPaidSum); + } + public GkvAbrechnungListVM() : this(null) + { - } + } - public DateTimeSpan DateTimeSpanFilter - { - get - { - return this._DateTimeSpanFilter; - } + public DateTimeSpan DateTimeSpanFilter + { + get + { + return this._DateTimeSpanFilter; + } - set - { - if (this.AreDifferent(this._DateTimeSpanFilter, value)) - { - this._DateTimeSpanFilter = value; - this.FirePropertyChanged(PropertyName_DateTimeSpanFilter); - } - } - } + set + { + if (this.AreDifferent(this._DateTimeSpanFilter, value)) + { + this._DateTimeSpanFilter = value; + this.FirePropertyChanged(PropertyName_DateTimeSpanFilter); + } + } + } - internal void UpdateList(IList dcList) - { - this.VMList.Clear(); + internal void UpdateList(IList dcList) + { + VMList.Clear(); - foreach (var dc in dcList) - { - VMList.Add(CreateVM(dc)); - } + if (dcList is object) + foreach (var dc in dcList) + { + VMList.Add(CreateVM(dc)); + } - this.FirePropertyChanged(PropertyName_FilterResultAmountSum); - this.FirePropertyChanged(PropertyName_FilterResultAmountNotPaidSum); - } - } + FirePropertyChanged(PropertyName_FilterResultAmountSum); + FirePropertyChanged(PropertyName_FilterResultAmountNotPaidSum); + } + + internal void ClearList() => UpdateList(null); + } } \ No newline at end of file diff --git a/Model/Changes_2024_10_16 Organisation Erprobungsverfahren Default.txt b/Model/Changes_2024_10_16 Organisation Erprobungsverfahren Default.txt index 910547095..061fb265f 100644 --- a/Model/Changes_2024_10_16 Organisation Erprobungsverfahren Default.txt +++ b/Model/Changes_2024_10_16 Organisation Erprobungsverfahren Default.txt @@ -1,2 +1,5 @@ ALTER TABLE `organisation` CHANGE COLUMN `Verfahrensstufe` `Verfahrensstufe` INT NULL DEFAULT '1' ; + +UPDATE `organisation` +SET `Verfahrensstufe` = 1; \ No newline at end of file diff --git a/Shared/Core/DakotaValidator.cs b/Shared/Core/DakotaValidator.cs index 09076489a..4675c1f23 100644 --- a/Shared/Core/DakotaValidator.cs +++ b/Shared/Core/DakotaValidator.cs @@ -10,6 +10,21 @@ namespace BS.Shared.Core { public static class DakotaValidator { + public static string ValidateCustomer(string insuranceNumber, string versichertenStatus) + { + bool valid_number = IsVersichertennummerValid(insuranceNumber); + bool valid_status = IsVersichertenstatusValid(versichertenStatus); + + if (!valid_number && !valid_status) + return $"Versichtertennummer & -status des {Translation.Translator.Translate("Klient/in")} ungültig."; + else if (!valid_number) + return $"Versichertennummer des {Translation.Translator.Translate("Klient/in")} ungültig"; + else if (!valid_status) + return $"Versichertenstatus des {Translation.Translator.Translate("Klient/in")} ungültig"; + + return null; + } + public static bool IsMandatorValid(string ik_leistungserbringer) => IsIKNumberValid(ik_leistungserbringer); public static bool IsOrganisationInformationValid(string ik_datenannahmestelle, string ik_kostentrager, string ik_krankenkasse, string bez_datenannahmestelle) @@ -62,20 +77,5 @@ namespace BS.Shared.Core return true; } - - public static string ValidateCustomer(string insuranceNumber, string versichertenStatus) - { - bool valid_number = IsVersichertennummerValid(insuranceNumber); - bool valid_status = IsVersichertenstatusValid(versichertenStatus); - - if (!valid_number && !valid_status) - return "Versichtertennummer & -status ungültig."; - else if (!valid_number) - return "Versichertennummer ungültig"; - else if (!valid_status) - return "Versichertenstatus ungültig"; - - return null; - } } }