ownSoft/BeWoPlaner
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Lädt nur noch aktuelle GKV Abrechnung -> Verbesserungfähig

Browse Source 
Muss mit aktueller DB getestet werden
This commit is contained in:
Rene Evertz
2025-11-24 10:28:48 +01:00
parent 4f0fb00b0a
commit 77adfa32e9
5 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
BeWo/DebugConfig.cs
View File

@@ -136,9 +136,9 @@ namespace BeWo
AutoLogin = true,
//SelectView = UIContext.Organisation,
//SelectIndex = 8,
DefaultLoginUsername = "admin",
DefaultLoginPassword = "bewobewo",
DefaultProfilename = "5000000000",
//DefaultLoginUsername = "admin",
//DefaultLoginPassword = "bewobewo",
//DefaultProfilename = "5000000000",
EnableAutoRemoteDebugging = true
});

12
BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml.cs
View File

@@ -81,9 +81,17 @@ namespace BeWo.View.Detail.Accounting
{
_IsRequesting = true;
var gkv = ServiceFacade.DoGkvAccountingServiceSync(x => x.GetAllGkvAbrechnungen());
var filter = new GkvAbrechnungViewFilterDC();
UpdateGkvAbrechnungList(gkv);
filter.FilterTime = true;
filter.Start = _Viewmodel.DateTimeSpanFilter.StartDate;
filter.End = _Viewmodel.DateTimeSpanFilter.EndDate;
filter.FilterForCreationDate = true;
ServiceFacade.DoGkvAccountingServiceAsync(
x => x.GetAllGkvAbrechnungenBy(filter),
cb => UpdateGkvAbrechnungList(cb),
exp => _IsRequesting = false);
}
catch (Exception e)
{

4
Data/Access/FinanceDAO.cs
View File

@@ -34,13 +34,13 @@ namespace BeWo.Data.Access
return false;
}
public IEnumerable<GkvAbrechnungLight> GetGkvAbrechnungen(DateTime? startDate, DateTime? endDate, bool useInvoiceDate = true)
public IEnumerable<GkvAbrechnungLight> GetGkvAbrechnungen(DateTime? startDate, DateTime? endDate, bool useInvoiceCreationDate = true)
{
if (endDate.HasValue)
endDate = endDate.Value.Date.AddDays(1).AddMilliseconds(-1);
var lCriteria = CreateCriteriaIsActive<GkvAbrechnungLight>();
if (useInvoiceDate)
if (useInvoiceCreationDate)
{
if (startDate.HasValue)
lCriteria.Add(Restrictions.Ge(nameof(GkvAbrechnungLight.ErstelltAm), startDate));

2
Service/ServiceImplementations/GkvAccountingServiceImp.cs
View File

@@ -82,7 +82,7 @@ namespace BeWo.Service.ServiceImplementations
{
var start = gkvAbrechnungViewFilter.Start;
var end = gkvAbrechnungViewFilter.End;
var filter = gkvAbrechnungViewFilter.FilterForInvoiceDate;
var filter = gkvAbrechnungViewFilter.FilterForCreationDate;
return GetGkvAbrechnungen(() => DAOFactory.FinanceDAO.GetGkvAbrechnungen(start, end, filter));
}

2
Shared/DataContracts/Invoicing/GkvAbrechnung/GkvAbrechnungViewFilterDC.cs
View File

@@ -15,6 +15,6 @@ namespace BS.Shared.DataContracts.GkvAbrechnung
[DataMember] public bool FilterTime { get; set; }
[DataMember] public DateTime? Start { get; set; }
[DataMember] public DateTime? End { get; set; }
[DataMember] public bool FilterForInvoiceDate { get; set; }
[DataMember] public bool FilterForCreationDate { get; set; }
}
}