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

Meldung, wenn bei der Kilometerauswertung ein Klient ohne gefahrene Kilometer im ausgewählten Zeitraum ausgewertet werden soll.

Browse Source
This commit is contained in:
Lyndon Jetten
2020-07-08 16:51:11 +02:00
parent 5137406410
commit 52cf8b3f30
5 changed files with 1947 additions and 1908 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3821
BeWo/ServiceProxy/Generated.cs
View File

File diff suppressed because it is too large Load Diff

11
BeWoPlanerMobil/Controllers/SchedulerController.cs
View File

@@ -353,7 +353,7 @@ namespace BeWoPlanerMobil.Controllers
return Json(null, JsonRequestBehavior.AllowGet);
}
// TODO: Serientermine und Ressourcen berücksichtigen!
// TODO: Serientermine berücksichtigen!
[Authorize]
public JsonResult CheckForOverlappingAppointments(string startDateRaw, string endDateRaw, string startTimeRaw, string endTimeRaw)
{
@@ -385,6 +385,15 @@ namespace BeWoPlanerMobil.Controllers
var recurrenceIndex = Model.SelectedAppointment?.RecurrenceIndex ?? 0;
isOverlapping = KalenderService.OverlappingAppointmentsExist(startDate, endDate, employeeOidList, customerOidList, resourceOidList, originator.EmployeeOid, oid, recurrenceId, recurrenceIndex);
// Serientermine überprüfen
if(Model.Appointments != null)
{
foreach(var appointment in Model.Appointments.Where(app => app.SchedulerAppointmentOid == null && app.IsTask == false))
{
}
}
}
return Json(isOverlapping, JsonRequestBehavior.AllowGet);

5
Data/Access/SearchDAO.cs
View File

@@ -3250,5 +3250,10 @@ namespace BeWo.Data.Access
return result;
}
public bool CheckForAnyServiceRecordsWithDistanceValues(List<long> customerOids, DateTimeSpan span)
{
return FindListOfCustomerServiceRecordsForKilometerauswertung(customerOids, span).Any();
}
}
}

5
ReportService/ServiceContracts/IReportService.cs
View File

@@ -54,5 +54,10 @@ namespace ReportingService.ServiceContracts
[FaultContract(typeof(BeWoFault))]
[OperationContract]
MemoryStream CreateKilometerauswertungForAllCustomers(List<long> customerOids, DateTime rangeDate);
[FaultContract(typeof(BeWoFault))]
[OperationContract]
bool CheckForAnyServiceRecordsWithDistanceValues(List<long> customerOids, DateTimeSpan span);
}
}

13
ReportService/ServiceImplementations/ReportServiceImp.cs
View File

@@ -210,14 +210,23 @@ namespace ReportingService.ServiceImplementations
{
var reportCreator = GetReportCreator();
return CreateReportStream(reportCreator.CreateKilometerauswertung(customerOid, rangeDate));
var report = reportCreator.CreateKilometerauswertung(customerOid, rangeDate);
return report == null ? null : CreateReportStream(report);
}
public MemoryStream CreateKilometerauswertungForAllCustomers(List<long> customerOids, DateTime rangeDate)
{
var reportCreator = GetReportCreator();
return CreateReportStream(reportCreator.CreateKilometerauswertungForAllCustomers(customerOids, rangeDate));
var report = reportCreator.CreateKilometerauswertungForAllCustomers(customerOids, rangeDate);
return report == null ? null : CreateReportStream(report);
}
public bool CheckForAnyServiceRecordsWithDistanceValues(List<long> customerOids, DateTimeSpan span)
{
return DAOFactory.SearchDAO.CheckForAnyServiceRecordsWithDistanceValues(customerOids, span);
}
}
}