diff --git a/BeWo/BeWo.csproj.user b/BeWo/BeWo.csproj.user
index c3f5d6713..5b9016668 100644
--- a/BeWo/BeWo.csproj.user
+++ b/BeWo/BeWo.csproj.user
@@ -9,7 +9,7 @@
de-DE
false
- ShowAllFiles
+ ProjectFiles
false
diff --git a/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml b/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml
index 88c01f2c6..9442fd504 100644
--- a/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml
+++ b/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml
@@ -259,7 +259,7 @@
@@ -305,8 +305,8 @@
x:Name="UrbelegeColumn"
Width="Auto"
FieldName="UrbelegeGesendet"
- IsEnabledBinding="{Binding IsUrbelegeEditEnabled}"
- Header="Urbelege gesendet">
+ Header="Urbelege gesendet"
+ IsEnabledBinding="{Binding IsUrbelegeEditEnabled}">
@@ -317,8 +317,8 @@
x:Name="PaidColumn"
Width="Auto"
FieldName="Bezahlt"
- IsEnabledBinding="{Binding IsBezahltEditEnabled}"
- Header="Bezahlt">
+ Header="Bezahlt"
+ IsEnabledBinding="{Binding IsBezahltEditEnabled}">
diff --git a/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml.cs b/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml.cs
index 404065f5e..8d6c33b79 100644
--- a/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml.cs
+++ b/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml.cs
@@ -78,8 +78,6 @@ namespace BeWo.View.Detail.Accounting
datagrid_gkvAbrechnungen.Visibility = Visibility.Visible;
UpdateDataGridFilter();
-
- gridView.BestFitColumn(ColumnButtons);
});
}
@@ -112,6 +110,9 @@ namespace BeWo.View.Detail.Accounting
CriteriaOperator.FromLambda(gkv => gkv.AbrechnungsZeitraumStart <= filter_start && filter_ende <= gkv.AbrechnungsZeitraumEnde));
}
}
+
+ gridView.BestFitColumns();
+ gridView.BestFitColumn(ColumnButtons);
}
private void NewGkvAbrechnungPopUpViewCancelButtonClicked(object sender, EventArgs e)
@@ -252,10 +253,14 @@ namespace BeWo.View.Detail.Accounting
private void NewButton_OnClick(object sender, RoutedEventArgs e)
{
GkvAbrechnungDC gkvAbrechnungDC = new GkvAbrechnungDC();
- int year = DateTime.Now.Year;
- int month = DateTime.Now.Month - 1;
- gkvAbrechnungDC.AbrechnungsZeitraumStart = new DateTime(year, month, 1);
- gkvAbrechnungDC.AbrechnungsZeitraumEnde = new DateTime(year, month, DateTime.DaysInMonth(year, month));
+
+ var start = DateTime.Today.AddMonths(-1);
+ var first = new DateTime(start.Year, start.Month, 1);
+ var last = first.AddMonths(1).AddDays(-1);
+
+ gkvAbrechnungDC.AbrechnungsZeitraumStart = first;
+ gkvAbrechnungDC.AbrechnungsZeitraumEnde = last;
+
GkvAbrechnungVM gkvAbrechnungVM = new GkvAbrechnungVM(gkvAbrechnungDC);
_NewGkvAbrechnungPopUpView.Clear();
_NewGkvAbrechnungPopUpView.ViewModel = gkvAbrechnungVM;
diff --git a/BeWo/View/Navigation/MainNavigationView.xaml b/BeWo/View/Navigation/MainNavigationView.xaml
index c3783df33..2838e41ac 100644
--- a/BeWo/View/Navigation/MainNavigationView.xaml
+++ b/BeWo/View/Navigation/MainNavigationView.xaml
@@ -1,119 +1,310 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Excel Export
+
+
+
+
+ Liste drucken
+
-
-
-
-
-
+
+
+
+
+
\ No newline at end of file
diff --git a/BeWo/ViewModel/GkvAbrechnungVM.cs b/BeWo/ViewModel/GkvAbrechnungVM.cs
index b0cf0e57a..e9513c296 100644
--- a/BeWo/ViewModel/GkvAbrechnungVM.cs
+++ b/BeWo/ViewModel/GkvAbrechnungVM.cs
@@ -97,14 +97,16 @@ namespace BeWo.ViewModel
set
{
- if (this.AreDifferent(this._ErstelltAm, value))
+ if (AreDifferent(_ErstelltAm, value))
{
- this._ErstelltAm = value;
- this.StoreDirtyInformation(this.AreDifferent(this.DataContract.ErstelltAm, value), nameof(ErstelltAm));
- this.FirePropertyChanged(nameof(ErstelltAm));
+ _ErstelltAm = value;
+ StoreDirtyInformation(AreDifferent(DataContract.ErstelltAm, value), nameof(ErstelltAm));
+ FirePropertyChanged(nameof(ErstelltAm));
+ FirePropertyChanged(nameof(ErstelltAmDate));
}
}
}
+ public DateTime ErstelltAmDate => ErstelltAm.Date;
public long? GkvAbrechnungOid
{
get { return this._GkvAbrechnungOid; }
@@ -310,7 +312,7 @@ namespace BeWo.ViewModel
get
{
if (LastTransferProtokoll is GkvTransferProtokollDC last)
- return last.ErstelltAm;
+ return last.ErstelltAm?.Date;
return null;
}
diff --git a/Service/DCEntityMapper/CompactOrganisationDC_Organisation.cs b/Service/DCEntityMapper/CompactOrganisationDC_Organisation.cs
index 444c442c9..4ab4652a5 100644
--- a/Service/DCEntityMapper/CompactOrganisationDC_Organisation.cs
+++ b/Service/DCEntityMapper/CompactOrganisationDC_Organisation.cs
@@ -21,6 +21,9 @@ namespace BeWo.Service.DCEntityMapper
pDataContract.ActivationType = pEntity.IsActive;
pDataContract.DebitorNumber = pEntity.DebitorNumber;
pDataContract.BusinessPartnerId = pEntity.BusinessPartnerId;
+ pDataContract.IKDatenannahmestelle = pEntity.IKDatenannahmestelle;
+ pDataContract.IKKostentrager = pEntity.IKKostentrager;
+ pDataContract.IKKrankenkasse = pEntity.IKKrankenkasse;
if (pEntity.CostBearer != null)
{
diff --git a/Shared/DataContracts/Compact/ClientPartials/CompactOrganisationDC.cs b/Shared/DataContracts/Compact/ClientPartials/CompactOrganisationDC.cs
index 2b174a8a5..9679715aa 100644
--- a/Shared/DataContracts/Compact/ClientPartials/CompactOrganisationDC.cs
+++ b/Shared/DataContracts/Compact/ClientPartials/CompactOrganisationDC.cs
@@ -97,7 +97,7 @@ namespace BS.Shared.DataContracts.Compact
public string DetailDescription => Name;
- public string FilterRelevants => Name + " " + Function + " " + AddressSummaryInfo;
+ public string FilterRelevants => $"{Name} {Function} {AddressSummaryInfo} {IKKrankenkasse} {IKKostentrager} {IKDatenannahmestelle}";
public string IconPath => @"..\..\Ressources\Icons\OfficeBulidingBlackDisabled.png";