From e59ae79399f577223bbec0c4a72c26596f6e5460 Mon Sep 17 00:00:00 2001 From: HirschleM Date: Thu, 16 Jan 2025 09:26:04 +0100 Subject: [PATCH] =?UTF-8?q?MH:=20LH=20Stade=20Mid=20Verf=C3=BCgungszeit?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/CustomSaveInterceptor.cs | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/ReportImp/LebenshilfeStadeMID/Service/CustomSaveInterceptor.cs b/ReportImp/LebenshilfeStadeMID/Service/CustomSaveInterceptor.cs index d7f203b07..739ef61aa 100644 --- a/ReportImp/LebenshilfeStadeMID/Service/CustomSaveInterceptor.cs +++ b/ReportImp/LebenshilfeStadeMID/Service/CustomSaveInterceptor.cs @@ -67,7 +67,7 @@ namespace LebenshilfeStadeMID.Service ServiceRecordType = BS.Shared.ServiceRecordTypeId.DefaultActivity, SupportConcept = serviceRecord.SupportConcept, RoundedDuration = 30, - ServiceDescription = DAOFactory.SearchDAO.FindServiceDescriptionForCategory(serviceRecord.ServiceDescription.ServiceCategory.Oid.Value).FirstOrDefault(sr => sr.Name == "Verfügungszeit"), + //ServiceDescription = DAOFactory.SearchDAO.FindServiceDescriptionForCategory(serviceRecord.ServiceDescription.ServiceCategory.Oid.Value).FirstOrDefault(sr => sr.Name == "Verfügungszeit"), //Start = serviceRecord.Start.Value.AddMinutes((int)serviceRecord.RoundedDuration), //End = serviceRecord.Start.Value.AddMinutes((int)serviceRecord.RoundedDuration + 30), Start = serviceRecord.Start.Value.Date.AddSeconds(1), @@ -75,6 +75,13 @@ namespace LebenshilfeStadeMID.Service DurationInStunden = BS.Shared.ZeiterfassungsDauer.Minuten, }; + if (serviceRecord.ServiceDescription.Name.ToLower().Contains("nachqualifiziert")) + verfuegungszeit.ServiceDescription = DAOFactory.SearchDAO.FindServiceDescriptionForCategory(serviceRecord.ServiceDescription.ServiceCategory.Oid.Value).FirstOrDefault(sr => sr.Name.ToLower().Contains("verfügungszeit nachqualifiziert (jas)")); + else + verfuegungszeit.ServiceDescription = DAOFactory.SearchDAO.FindServiceDescriptionForCategory(serviceRecord.ServiceDescription.ServiceCategory.Oid.Value).FirstOrDefault(sr => sr.Name.ToLower().Contains("verfügungszeit fachlich (jas)")); + + + DAOFactory.GenericDAO.Insert(verfuegungszeit); } @@ -103,7 +110,6 @@ namespace LebenshilfeStadeMID.Service ServiceRecordType = BS.Shared.ServiceRecordTypeId.DefaultActivity, SupportConcept = serviceRecord.SupportConcept, RoundedDuration = 30, - ServiceDescription = DAOFactory.SearchDAO.FindServiceDescriptionForCategory(serviceRecord.ServiceDescription.ServiceCategory.Oid.Value).FirstOrDefault(sr => sr.Name == "Verfügungszeit"), //Start = serviceRecord.Start.Value.AddMinutes((int)serviceRecord.RoundedDuration), //End = serviceRecord.Start.Value.AddMinutes((int)serviceRecord.RoundedDuration + 30), Start = serviceRecord.Start.Value.Date.AddSeconds(1), @@ -111,6 +117,11 @@ namespace LebenshilfeStadeMID.Service DurationInStunden = BS.Shared.ZeiterfassungsDauer.Minuten, }; + if (serviceRecord.ServiceDescription.Name.ToLower().Contains("nachqualifiziert")) + verfuegungszeit.ServiceDescription = DAOFactory.SearchDAO.FindServiceDescriptionForCategory(serviceRecord.ServiceDescription.ServiceCategory.Oid.Value).FirstOrDefault(sr => sr.Name.ToLower().Contains("verfügungszeit nachqualifiziert (jas)")); + else + verfuegungszeit.ServiceDescription = DAOFactory.SearchDAO.FindServiceDescriptionForCategory(serviceRecord.ServiceDescription.ServiceCategory.Oid.Value).FirstOrDefault(sr => sr.Name.ToLower().Contains("verfügungszeit fachlich (jas)")); + return verfuegungszeit; } }