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

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

Browse Source
This commit is contained in:
Alexandra
2022-12-21 07:43:23 +01:00
parent fea5758fdc e4a7393eaa
commit e056f6be53
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Service/Dienstplanung/DienstplanungsManager.cs
View File

@@ -603,12 +603,16 @@ namespace BeWo.Service.Dienstplanung
x.EmployeeOid == empId &&
x.WohnheimOid == wohnId &&
x.Zeile == zeile &&
x.Datum == date);
x.Datum == date &&
x.IsActive == ActivationTypeId.Active);
//if (toDel != null)
// DAOFactory.GenericDAO.Delete(toDel);
if (toDel != null)
{
DAOFactory.GenericDAO.Deactivate(toDel);
}
}
public static bool DeleteDienstEintrag2(long empId, long wohnId, int zeile, DateTime date, DienstEintragDC dienstEintrag, List<DienstEintragDC> alleDiensteintraege,
List<DienstvertretungDC> alleDienstvertretungen, int day, DateTime pflichtStart, DateTime pflichtEnde)
@@ -618,8 +622,8 @@ namespace BeWo.Service.Dienstplanung
x.EmployeeOid == empId &&
x.WohnheimOid == wohnId &&
x.Zeile == zeile &&
x.Datum == date);
x.Datum == date &&
x.IsActive == ActivationTypeId.Active);
if (toDel != null)
DAOFactory.GenericDAO.Delete(toDel);
var eintrag = alleDiensteintraege.FirstOrDefault(e => e.EmployeeOid == empId && e.WohnheimOid == wohnId && e.Zeile == zeile && e.Datum == date);