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

Bugfix Sonntagszuschläge im Stundenkonto, div. Anpassungen (LH Frankfurt Oder, HPH Bersenbrück, PariSozial, Frau Hildmann)

Browse Source
This commit is contained in:
Christian
2024-06-07 14:34:27 +02:00
parent a897572990
commit 3f7c4d85f1
36 changed files with 732 additions and 576 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
BeWo/ViewModel/ServiceRecordVM.cs
View File

@@ -1583,7 +1583,12 @@ namespace BeWo.ViewModel
get
{
//CB: Ich muss das hier so kompliziert machen, weil ich eine unsortierte Liste von Zielen und Maßnahmen in ein sortierte Liste innerhalb der Ziele/Maßnahmen Baumstruktur überführen muss
var goals = new List<ValueListEntryDC>();
var firstLevelGoals = new List<ValueListEntryDC>();
Dictionary<long, ValueListEntryDC> oid2Entry = new Dictionary<long, ValueListEntryDC>();
Dictionary<long, List<ValueListEntryDC>> oid2ChildList = new Dictionary<long, List<ValueListEntryDC>>();
foreach (var goal in SelectedGoals)
{
if (goal.Type == ValueListEntryType.SupportConceptGoalCategoryType || goal.Type == ValueListEntryType.SupportConceptIndividualGoalCategoryType)
@@ -1606,8 +1611,36 @@ namespace BeWo.ViewModel
}
}
foreach (var item in goals)
{
if (!oid2Entry.ContainsKey(item.ValueListEntryOid.Value))
{
oid2Entry.Add(item.ValueListEntryOid.Value, item);
}
}
foreach (var item in goals)
{
if (!item.ParentOid.HasValue || !oid2Entry.ContainsKey(item.ParentOid.Value))
{
firstLevelGoals.Add(item);
}
if (item.ParentOid.HasValue)
{
if (!oid2ChildList.ContainsKey(item.ParentOid.Value))
{
oid2ChildList.Add(item.ParentOid.Value, new List<ValueListEntryDC>());
}
oid2ChildList[item.ParentOid.Value].Add(item);
}
}
var sortedGoals = new List<ValueListEntryDC>();
foreach (var item in firstLevelGoals.OrderBy(g => g.DisplayName))
{
AddGoalWithChildren(item, oid2ChildList, sortedGoals);
}
var goalString = "";
foreach (var goal in goals)
foreach (var goal in sortedGoals)
{
if (goalString.Length > 0)
@@ -1619,6 +1652,18 @@ namespace BeWo.ViewModel
}
}
private void AddGoalWithChildren(ValueListEntryDC item, Dictionary<long, List<ValueListEntryDC>> oid2ChildList, List<ValueListEntryDC> sortedGoals)
{
sortedGoals.Add(item);
if (oid2ChildList.ContainsKey(item.ValueListEntryOid.Value))
{
foreach (var child in oid2ChildList[item.ValueListEntryOid.Value].OrderBy(g => g.DisplayName))
{
AddGoalWithChildren(child, oid2ChildList, sortedGoals);
}
}
}
public String MassnahmenString
{
get