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

Merge branch 'master' of ssh://float.beyondsoft.de/git/beyondSoft/BeWo

Browse Source
This commit is contained in:
Christian
2017-12-18 00:11:23 +01:00
parent a10b61d53e 41a9e2c64f
commit e9ce34fe11
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Data/Access/SearchDAO.cs
View File

@@ -2318,7 +2318,7 @@ namespace BeWo.Data.Access
return criteria.List<SchedulerAppointment>();
}
public IEnumerable<SchedulerAppointment> LoadFilteredAppointmentsForEmployee(bool pHasRightToSeeAllEmployeeAppointments, long pEmployeeOid, DateTime pIntervalStart, DateTime pIntervalEnd, List<long> pSelectedEmployees, List<long> pSelectedCustomers, List<long> pSelectedResources, bool pEmployeesOnly, bool pCustomersOnly, bool pResourcesOnly, bool pPrivateAppointmentsOnly, bool pOnlyMyAppointments)
public IEnumerable<SchedulerAppointment> LoadFilteredAppointmentsForEmployee(long pEmployeeOid, DateTime pIntervalStart, DateTime pIntervalEnd, List<long> pSelectedEmployees, List<long> pSelectedCustomers, List<long> pSelectedResources, bool pEmployeesOnly, bool pCustomersOnly, bool pResourcesOnly, bool pPrivateAppointmentsOnly, bool pOnlyMyAppointments)
{
var detachedCriteria = DetachedCriteria.For<Employee2SchedulerAppointment>()
.Add(Restrictions.And(Restrictions.Eq(Employee2SchedulerAppointment.PropertyName_Employee + ".Oid", pEmployeeOid),

9
Service/ServiceImplementations/ResourceServiceImp.cs
View File

@@ -971,9 +971,12 @@ namespace BeWo.Service.ServiceImplementations
{
try
{
var appointments = pHasRightToSeeAllEmployeeAppointments
? DAOFactory.SearchDAO.LoadFilteredAppointments(pHasRightToSeeAllEmployeeAppointments, pEmployeeOid, pIntervalStart, pIntervalEnd, pSelectedEmployees, pSelectedCustomer, pSelectedResources, pEmployeesOnly, pCustomersOnly, pResourcesOnly, pPrivateAppointmentsOnly, pOnlyMyAppointments)
: DAOFactory.SearchDAO.LoadFilteredAppointmentsForEmployee(pHasRightToSeeAllEmployeeAppointments, pEmployeeOid, pIntervalStart, pIntervalEnd, pSelectedEmployees, pSelectedCustomer, pSelectedResources, pEmployeesOnly, pCustomersOnly, pResourcesOnly, pPrivateAppointmentsOnly, pOnlyMyAppointments);
var appointments = DAOFactory.SearchDAO.LoadFilteredAppointmentsForEmployee(pEmployeeOid, pIntervalStart, pIntervalEnd, pSelectedEmployees, pSelectedCustomer, pSelectedResources, pEmployeesOnly, pCustomersOnly, pResourcesOnly, pPrivateAppointmentsOnly, pOnlyMyAppointments).ToList();
var nichtAnzuzeigendeTermineFuerAndereMitarbeiter = appointments.Where(w =>
w.Originator.Oid.Value.Equals(pEmployeeOid) && w.EmployeeList.Count > 0 && !w.EmployeeList.Select(s => s.Employee.Oid.Value).Contains(pEmployeeOid) && w.EmployeeList.Select(s => s.Employee.Oid.Value).Intersect(pSelectedEmployees).ToList().Count == 0).ToList();
appointments = appointments.Where(w => !nichtAnzuzeigendeTermineFuerAndereMitarbeiter.Select(s => s.Oid.Value).Contains(w.Oid.Value)).ToList();
return MapperFactory.SchedulerAppointmentDCSchedulerAppointment.MapToNewDCs(appointments).OrderBy(a => a.StartDate).ToList();
}