diff --git a/ReportImp/DerKarren/DerKarren.csproj b/ReportImp/DerKarren/DerKarren.csproj
index 4050a6b74..1be06d733 100644
--- a/ReportImp/DerKarren/DerKarren.csproj
+++ b/ReportImp/DerKarren/DerKarren.csproj
@@ -90,6 +90,7 @@
ServicesOverviewReport.cs
+
Component
diff --git a/ReportImp/DerKarren/KarrenHomeContentGenerator.cs b/ReportImp/DerKarren/KarrenHomeContentGenerator.cs
index 2b3cab8c5..dea8d60d5 100644
--- a/ReportImp/DerKarren/KarrenHomeContentGenerator.cs
+++ b/ReportImp/DerKarren/KarrenHomeContentGenerator.cs
@@ -8,7 +8,7 @@ using BeWo.Service.DCEntityMapper;
using BeWo.Service.Plugins;
using BS.Shared.DataContracts.Compact;
-namespace SozialeDiensteNiederrhein
+namespace BeWo.DerKarren
{
class KarrenHomeContentGenerator : HomeContentGenerator
{
@@ -94,8 +94,6 @@ namespace SozialeDiensteNiederrhein
liste.Add(sc);
}
}
-
-
return MapperFactory.CompactSupportConceptDC_SupportConcept.MapToNewDCs(liste);
}
}
diff --git a/ReportImp/DerKarren/Properties/licenses.licx b/ReportImp/DerKarren/Properties/licenses.licx
index e69de29bb..d59547a61 100644
--- a/ReportImp/DerKarren/Properties/licenses.licx
+++ b/ReportImp/DerKarren/Properties/licenses.licx
@@ -0,0 +1 @@
+DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
diff --git a/ReportImp/DerKarren/Service/UserService.cs b/ReportImp/DerKarren/Service/UserService.cs
new file mode 100644
index 000000000..2321b9b98
--- /dev/null
+++ b/ReportImp/DerKarren/Service/UserService.cs
@@ -0,0 +1,65 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using BeWo.Data.Access;
+using BeWo.Data.Entities;
+using BeWo.Service.Core;
+using BeWo.Service.DCEntityMapper;
+using BeWo.Service.MessageContracts;
+using BeWo.Service.Plugins;
+using BS.Shared;
+using BS.Shared.Core;
+using BS.Shared.DataContracts;
+using BS.Shared.Extensions;
+using BS.Shared.Services;
+using Utils = BS.Shared.Core.Utils;
+
+namespace BeWo.DerKarren.Service
+{
+ public class CustomUserService : UserService
+ {
+ public override UserDC LoadUserByLoginName(string pUserName, string password)
+ {
+ var user = base.LoadUserByLoginName(pUserName, password);
+
+ bool isTeamleiter = false;
+ foreach (var group in user.UserGroups)
+ {
+ if (group.Name.Contains("Teamleitung"))
+ {
+ isTeamleiter = true;
+ }
+ }
+
+ if (isTeamleiter)
+ {
+ var emp = user.Employee;
+
+ var teams = DAOFactory.SearchDAO.FindAllActiveTeamsOfEmployee(emp.EmployeeOid);
+ emp.TeamOids = new List();
+ foreach (var t in teams)
+ {
+ emp.TeamOids.Add(t.Oid.Value);
+
+ foreach (var member in t.MemberList)
+ {
+ emp.AllTeamMemberOids.Add(member.Oid.Value);
+ }
+ }
+ foreach (var toid in user.Employee.TeamOids)
+ {
+ if (user.Employee.LeadingTeamOids == null)
+ {
+ user.Employee.LeadingTeamOids = new List();
+ }
+ if (!user.Employee.LeadingTeamOids.Contains(toid))
+ {
+ user.Employee.LeadingTeamOids.Add(toid);
+ }
+ }
+ }
+ return user;
+ }
+ }
+}