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:
Waldi
2017-04-20 13:00:54 +02:00
parent f1c63136c1 ffaf04e558
commit 704e8becb2
21 changed files with 257 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Service/ServiceImplementations/ResourceServiceImp.cs
View File

@@ -849,20 +849,6 @@ namespace BeWo.Service.ServiceImplementations
var offeneTermine = DAOFactory.SearchDAO.GetAllOpenAppointmentsForEmployee(pEmployeeOid);
offeneTermine.AddRange(DAOFactory.SearchDAO.GetAllParticipationNotificationsForEmployee(pEmployeeOid));
//var offeneTermineInZukunft = new List<SchedulerAppointmentDC>();
//foreach (var termin in offeneTermine)
//{
// if (String.IsNullOrEmpty(termin.RecurrenceInfo))
// {
// if (termin.EndDate.HasValue && termin.EndDate < DateTime.Now.Date)
// {
// offeneTermineInZukunft.Add(termin);
// }
// }
//}
return MapperFactory.SchedulerAppointmentDCSchedulerAppointment.MapToNewDCs(offeneTermine);
}
catch (Exception e)