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

Merge branch 'master' into feature_rene_18_ai - kein kommentar...

Browse Source 
# Conflicts:
#	BeWo/BeWo.csproj
#	BeWo/BeWoApp.xaml.cs
#	BeWo/ServiceProxy/GeneratedAiEnhancedService.cs
#	BeWo/Services/BeWoControlFactory.cs
#	BeWo/Services/BeWoWindowFactory.cs
#	BeWo/Services/BeWoWindowService.cs
#	BeWo/Services/IControlFactory.cs
#	BeWo/Services/IWindowFactory.cs
#	BeWo/Services/IWindowService.cs
#	BeWo/View/BeWoFileView.xaml
#	BeWo/View/Detail/Report/AbwesenheitsView.xaml
#	BeWo/View/Windows/AnimatedBeWoWindow.xaml.cs
#	BeWo/app.config
#	BeWoAllReports.sln
#	BeWoPlanerMobil.sln
#	BeWoPlanerMobil/.vs/BeWoPlanerMobil.csproj.dtbcache.json
#	BeWoTests.sln
#	Dakota/DakotaUtils.cs
#	Dakota/Logic/DakotaInfoCreator.cs
#	Dakota/Models/DakotaFile.cs
#	Data/Access/GenericDAO.cs
#	Data/Access/SearchDAO.cs
#	Data/Data.csproj
#	Host/Web.config
#	Server/Components/ServerUtils/ApiFacade/WebClientFacade.cs
#	Service/BeWoServiceEnums.cs
#	Service/Core/ServiceHelper.cs
#	Service/Core/ServiceValidator.cs
#	Service/Extensions/ServiceEnumExtension.cs
#	Service/Service.csproj
#	Service/ServiceContracts/Enhanced/IAiEnhancedService.cs
#	Service/ServiceContracts/Enhanced/IOperationsEnhancedService.cs
#	Service/ServiceImplementations/EmployeeServiceImp.cs
#	Service/ServiceImplementations/Enhanced/AiEnhancedServiceImp.cs
#	Service/ServiceImplementations/Enhanced/OperationsEnhancedServiceImp.cs
#	Service/ServiceProxy/OpenWebUIFacade.cs
#	Service/ServiceProxy/ServiceFacade.cs
#	Service/ServiceUtils/DistanceCalculator/GoogleDistanceMatrixAPI.cs
#	Shared/BeWoEntityEnums.cs
#	Shared/Core/AppError.cs
#	Shared/Core/Facade/WebClientFacade.cs
#	Shared/Core/WebClientFacade.cs
#	Shared/Shared.csproj
This commit is contained in:
Rene Evertz
2025-11-28 12:07:35 +01:00
parent d1b928f0b7 fa55db3647
commit 2832bb9c5e
1059 changed files with 112727 additions and 175550 deletions
Download Patch File Download Diff File Expand all files Collapse all files

131
Service/ServiceImplementations/EmployeeServiceImp.cs
View File

@@ -21,6 +21,8 @@ using BS.Shared.Extensions;
using NHibernate;
using BeWo.ServiceUtils.History;
using BeWoFault = BS.Shared.Core.BeWoFault;
using BeWoFaultType = BS.Shared.Core.BeWoFaultType;
namespace BeWo.Service.ServiceImplementations
{
@@ -475,18 +477,33 @@ namespace BeWo.Service.ServiceImplementations
{
var s = PluginLoader.FindClass<EmployeeService>();
return s.GetAllTeamsCompact();
return s.GetAllTeamsCompact(false);
}
catch (Exception e)
{
throw Utils.CreateBeWoFaultException(e);
}
}
}
catch (Exception e)
{
throw Utils.CreateBeWoFaultException(e);
}
}
public List<AssessmentSheetEntryDC> GetAssessmentSheetEntriesForCustomer(long customerOid, DateTime startDt, DateTime endDt)
{
public List<CompactTeamDC> GetAllTeamsIncludingOwnChatCompact()
{
try
{
var s = PluginLoader.FindClass<EmployeeService>();
return s.GetAllTeamsCompact(true);
}
catch (Exception e)
{
throw Utils.CreateBeWoFaultException(e);
}
}
public List<AssessmentSheetEntryDC> GetAssessmentSheetEntriesForCustomer(long customerOid, DateTime startDt, DateTime endDt)
{
try
{
@@ -498,29 +515,29 @@ namespace BeWo.Service.ServiceImplementations
}
}
public EmployeeDC GetEmployeeWithPersonOid(long pPersonOid)
{
try
{
return MapperFactory.EmployeeDC_Employee.MapToNewDC(DAOFactory.SearchDAO.FindEmployeeWithPersonOid(pPersonOid));
}
catch (Exception e)
{
throw new FaultException<BeWoFault>(new BeWoFault(String.Format("Mitarbeiter mit Id {0} wurde nicht gefunden!", pPersonOid)));
}
}
public List<CompactEmployeeDC> GetLastOpenedEmployees()
{
try
{
return MapperFactory.CompactEmployeeDC_Employee.MapToNewDCs(SettingsLogic.GetLastOpened<Employee>());
}
catch (Exception e)
{
throw Utils.CreateBeWoFaultException(e);
}
}
public EmployeeDC GetEmployeeWithPersonOid(long pPersonOid)
{
try
{
return MapperFactory.EmployeeDC_Employee.MapToNewDC(DAOFactory.SearchDAO.FindEmployeeWithPersonOid(pPersonOid));
}
catch (Exception e)
{
throw new FaultException<BS.Shared.Core.BeWoFault>(new BS.Shared.Core.BeWoFault(String.Format("Mitarbeiter mit Id {0} wurde nicht gefunden!", pPersonOid)));
}
}
public List<CompactEmployeeDC> GetLastOpenedEmployees()
{
try
{
return MapperFactory.CompactEmployeeDC_Employee.MapToNewDCs(SettingsLogic.GetLastOpened<Employee>());
}
catch (Exception e)
{
throw Utils.CreateBeWoFaultException(e);
}
}
public List<CompactTeamDC> GetLastOpenedTeams()
{
@@ -786,17 +803,17 @@ namespace BeWo.Service.ServiceImplementations
}
}
public EmployeeDC LoadLoggedOnEmployee(long pEmployeeOid)
{
try
{
return MapperFactory.EmployeeDC_Employee.MapToNewDC(DAOFactory.GenericDAO.LoadByID<Employee>(pEmployeeOid));
}
catch (Exception e)
{
throw new FaultException<BeWoFault>(new BeWoFault(e), e.Message);
}
}
public EmployeeDC LoadLoggedOnEmployee(long pEmployeeOid)
{
try
{
return MapperFactory.EmployeeDC_Employee.MapToNewDC(DAOFactory.GenericDAO.LoadByID<Employee>(pEmployeeOid));
}
catch (Exception e)
{
throw new FaultException<BS.Shared.Core.BeWoFault>(new BeWoFault(e), e.Message);
}
}
public EmployeeDC LoadEmployee(long pEmployeeOid)
@@ -805,13 +822,13 @@ namespace BeWo.Service.ServiceImplementations
{
var es = PluginLoader.FindClass<EmployeeService>();
return es.LoadEmployee(pEmployeeOid);
}
catch (Exception e)
{
throw new FaultException<BeWoFault>(new BeWoFault(e), e.Message);
}
}
return es.LoadEmployee(pEmployeeOid);
}
catch (Exception e)
{
throw new FaultException<BS.Shared.Core.BeWoFault>(new BS.Shared.Core.BeWoFault(e), e.Message);
}
}
public CompactEmployeeDC LoadCompactEmployee(long pEmployeeOid)
{
@@ -1346,13 +1363,13 @@ namespace BeWo.Service.ServiceImplementations
{
var employees = DAOFactory.SearchDAO.FindAllChatActiveEmployees();
return MapperFactory.CompactEmployeeDC_Employee.MapToNewDCs(employees);
}
catch (Exception e)
{
throw Utils.CreateBeWoFaultException(e);
}
}
return MapperFactory.CompactEmployeeDC_Employee.MapToNewDCs(employees).OrderBy(e => e.ToString()).ToList();
}
catch (Exception e)
{
throw Utils.CreateBeWoFaultException(e);
}
}
public List<EmployeeAPPCodeDC> GetAllEmployeeAppCodes(long pEmployeeOid)
{