diff --git a/BeWoAllReports.sln b/BeWoAllReports.sln index 02c5755b7..dbe08f95c 100644 --- a/BeWoAllReports.sln +++ b/BeWoAllReports.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.31424.327 +# Visual Studio Version 17 +VisualStudioVersion = 17.13.35913.81 d17.13 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Client", "Client", "{E7543C39-A44C-40C9-82C9-E7FAA2D9A852}" EndProject @@ -11,6 +11,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ReportImp", "ReportImp", "{ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BeWo", "BeWo\BeWo.csproj", "{3FEBB560-9275-413A-9767-BB68C44EEBC3}" ProjectSection(ProjectDependencies) = postProject + {094331C3-ECEE-4C89-BBFD-4C9DED89F0EF} = {094331C3-ECEE-4C89-BBFD-4C9DED89F0EF} {E1154C7B-BB77-4155-9854-DAD8FC5A8BC3} = {E1154C7B-BB77-4155-9854-DAD8FC5A8BC3} EndProjectSection EndProject diff --git a/BeWoPlanerMobil/Controllers/MainController.cs b/BeWoPlanerMobil/Controllers/MainController.cs index 52953dead..9ae13b6e8 100644 --- a/BeWoPlanerMobil/Controllers/MainController.cs +++ b/BeWoPlanerMobil/Controllers/MainController.cs @@ -30,6 +30,7 @@ using FormCollection = System.Web.Mvc.FormCollection; using GoalRating = BeWoPlanerMobil.Util.GoalRating; using Image = System.Drawing.Image; using ServiceRecordDC = BS.Shared.DataContracts.ServiceRecordDC; +using BeWo.Data.Entities; /* * ToDo: Bug, wenn man auf "bearbeiten" bei einem Eintrag klickt, wird die Leistung nicht geladen @@ -2487,6 +2488,7 @@ namespace BeWoPlanerMobil.Controllers sr.SupportConcept = rel.SupportConcept; sr.CostBearer = rel.CostBearer; sr.CostBearer2SupportConceptOid = rel.CostBearer2SupportConceptOid; + sr.Customer = rel.SupportConcept?.Customer; var result = OperationsService.ValidateServiceRecord(sr, null, maxDaysEditSRsAllowed, employeeOids, costBearer2SupportConceptOids); dateRangeString = rel.DateRangeString; @@ -2503,6 +2505,7 @@ namespace BeWoPlanerMobil.Controllers sr.SupportConcept = serviceRecord.SupportConcept; sr.CostBearer = serviceRecord.CostBearer; sr.CostBearer2SupportConceptOid = serviceRecord.CostBearer2SupportConceptOid; + sr.Customer = serviceRecord.SupportConcept?.Customer; var result = OperationsService.ValidateServiceRecord(sr, null, maxDaysEditSRsAllowed, employeeOids, costBearer2SupportConceptOids); var node = CreateFlatSupportConceptItem(CustomerService.LoadCompactSupportConceptDC(sr.SupportConcept.SupportConceptOid, Model.SelectedEmployee.EmployeeOid), null); @@ -2684,7 +2687,15 @@ namespace BeWoPlanerMobil.Controllers newResult.KannTrotzdemGespeichertWerden = vr.Allow; break; case SignatureExists: - newResult.Message += vr.Message + "

"; + case ConfirmationReceiptSignatureExists: + var klient3 = "diesem Hilfeplan"; + if(!string.IsNullOrEmpty(vr.CustomerName)) + { + klient3 = "Klient " + vr.CustomerName; + } + + newResult.Message += $"Für den ausgewählten Zeitraum existiert bereits eine Monatsunterschrift bei {klient3}, die mit dem Anliegen dieses Eintrags verfällt und neu geleistet werden muss.

"; + exitLoop = false; newResult.KannTrotzdemGespeichertWerden = true; break; @@ -2700,7 +2711,7 @@ namespace BeWoPlanerMobil.Controllers if(!string.IsNullOrEmpty(newResult.Message)) { - newResult.Message += newResult.KannTrotzdemGespeichertWerden ? "
Möchten Sie trotzdem speichern?

" : "
Speichern nicht möglich.

"; + newResult.Message += newResult.KannTrotzdemGespeichertWerden ? newResult.Message.Contains("Möchten Sie trotzdem speichern?") ? string.Empty : "
Möchten Sie trotzdem speichern?

" : "
Speichern nicht möglich.

"; Model.SelectedServiceRecord = checkServiceRecord; } @@ -4493,7 +4504,14 @@ namespace BeWoPlanerMobil.Controllers { records = Model.ServiceRecordTimeInterval == ServiceRecordTimeInterval.ZeitraumWaehlen || Model.ServiceRecordTimeInterval == ServiceRecordTimeInterval.Monatsauswahl ? //Zeitraum oder Monat gewählt - OperationsService.GetCustomerServiceRecordsWithStartEndDatePaginated(Model.SelectedSupportConcept.Customer.CustomerOid, Model.CostBearer2SupportConceptOid.Value, Model.SelectedZeitraum.StartDate.Value, Model.SelectedZeitraum.EndDate.Value, firstResult, Model.MaxResults, out totalServiceRecords) : + OperationsService + .GetCustomerServiceRecordsWithStartEndDatePaginated( + Model.SelectedSupportConcept.Customer.CustomerOid, + Model.CostBearer2SupportConceptOid.Value, + Model.SelectedZeitraum.StartDate.Value, + Model.SelectedZeitraum.EndDate.Value, + firstResult, Model.MaxResults, + out totalServiceRecords) : OperationsService.FindServiceRecordsForLastDaysPaginated(Model.CostBearer2SupportConceptOid, Model.SelectedDayCount, Model.Employee?.EmployeeOid, firstResult, Model.MaxResults, out totalServiceRecords).ToList(); } diff --git a/BeWoPlanerMobil/Views/Main/SingleBookingPartial.cshtml b/BeWoPlanerMobil/Views/Main/SingleBookingPartial.cshtml index b49f1e662..edfaa5d83 100644 --- a/BeWoPlanerMobil/Views/Main/SingleBookingPartial.cshtml +++ b/BeWoPlanerMobil/Views/Main/SingleBookingPartial.cshtml @@ -459,7 +459,7 @@ -