diff --git a/AsbCloudInfrastructure/CommonLibs/AsbSaubReport.dll b/AsbCloudInfrastructure/CommonLibs/AsbSaubReport.dll index e03f8c34..b9260919 100644 Binary files a/AsbCloudInfrastructure/CommonLibs/AsbSaubReport.dll and b/AsbCloudInfrastructure/CommonLibs/AsbSaubReport.dll differ diff --git a/AsbCloudInfrastructure/CommonLibs/AsbSaubReportLas.dll b/AsbCloudInfrastructure/CommonLibs/AsbSaubReportLas.dll index 5f24ee69..0c88a822 100644 Binary files a/AsbCloudInfrastructure/CommonLibs/AsbSaubReportLas.dll and b/AsbCloudInfrastructure/CommonLibs/AsbSaubReportLas.dll differ diff --git a/AsbCloudInfrastructure/CommonLibs/AsbSaubReportPdf.dll b/AsbCloudInfrastructure/CommonLibs/AsbSaubReportPdf.dll index a478be7c..4fd8d906 100644 Binary files a/AsbCloudInfrastructure/CommonLibs/AsbSaubReportPdf.dll and b/AsbCloudInfrastructure/CommonLibs/AsbSaubReportPdf.dll differ diff --git a/AsbCloudInfrastructure/ReportDataSourcePgCloud.cs b/AsbCloudInfrastructure/ReportDataSourcePgCloud.cs index 13a44914..d292e812 100644 --- a/AsbCloudInfrastructure/ReportDataSourcePgCloud.cs +++ b/AsbCloudInfrastructure/ReportDataSourcePgCloud.cs @@ -1,6 +1,7 @@ using AsbCloudApp.Exceptions; using AsbCloudDb.Model; using AsbSaubReport.Model; +using iText.Forms.Xfdf; using Microsoft.EntityFrameworkCore; using System; using System.Collections.Generic; @@ -129,6 +130,26 @@ namespace AsbCloudInfrastructure return query; } + public IQueryable GetDataSpinItems(DateTime begin, DateTime end) + { + var beginUtc = begin.ToUtcDateTimeOffset(timezoneOffset); + var endUtc = end.ToUtcDateTimeOffset(timezoneOffset); + + var query = context.TelemetryDataSpin + .Where(d => d.IdTelemetry == idTelemetry + && d.DateTime >= beginUtc + && d.DateTime <= endUtc) + .OrderBy(d => d.DateTime) + .Select(d => new DataSpinReport + { + Date = d.DateTime.DateTime.AddHours(timezoneOffset), + Mode = d.Mode, + IsWorkingSpinMaster = (d.State != 0 && d.State != 5 && d.State != 6 && d.State != 7), + IsWorkingTorqueMaster = (d.State == 7 && (d.Mode & 2) > 0), + }); + return query; + } + public IQueryable GetMessages(DateTime begin, DateTime end) { var beginUtc = begin.ToUtcDateTimeOffset(timezoneOffset);