diff --git a/AsbCloudInfrastructure/CommonLibs/AsbSaubReport.deps.json b/AsbCloudInfrastructure/CommonLibs/AsbSaubReport.deps.json deleted file mode 100644 index 7242b363..00000000 --- a/AsbCloudInfrastructure/CommonLibs/AsbSaubReport.deps.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "runtimeTarget": { - "name": ".NETCoreApp,Version=v6.0", - "signature": "" - }, - "compilationOptions": {}, - "targets": { - ".NETCoreApp,Version=v6.0": { - "AsbSaubReport/1.0.0": { - "runtime": { - "AsbSaubReport.dll": {} - } - } - } - }, - "libraries": { - "AsbSaubReport/1.0.0": { - "type": "project", - "serviceable": false, - "sha512": "" - } - } -} \ No newline at end of file diff --git a/AsbCloudInfrastructure/CommonLibs/AsbSaubReport.dll b/AsbCloudInfrastructure/CommonLibs/AsbSaubReport.dll index d4617aeb..e03f8c34 100644 Binary files a/AsbCloudInfrastructure/CommonLibs/AsbSaubReport.dll and b/AsbCloudInfrastructure/CommonLibs/AsbSaubReport.dll differ diff --git a/AsbCloudInfrastructure/CommonLibs/AsbSaubReportLas.deps.json b/AsbCloudInfrastructure/CommonLibs/AsbSaubReportLas.deps.json deleted file mode 100644 index 50ba6522..00000000 --- a/AsbCloudInfrastructure/CommonLibs/AsbSaubReportLas.deps.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "runtimeTarget": { - "name": ".NETCoreApp,Version=v6.0", - "signature": "" - }, - "compilationOptions": {}, - "targets": { - ".NETCoreApp,Version=v6.0": { - "AsbSaubReportLas/1.0.0": { - "dependencies": { - "AsbSaubReport": "1.0.0" - }, - "runtime": { - "AsbSaubReportLas.dll": {} - } - }, - "AsbSaubReport/1.0.0": { - "runtime": { - "AsbSaubReport.dll": {} - } - } - } - }, - "libraries": { - "AsbSaubReportLas/1.0.0": { - "type": "project", - "serviceable": false, - "sha512": "" - }, - "AsbSaubReport/1.0.0": { - "type": "project", - "serviceable": false, - "sha512": "" - } - } -} \ No newline at end of file diff --git a/AsbCloudInfrastructure/CommonLibs/AsbSaubReportLas.dll b/AsbCloudInfrastructure/CommonLibs/AsbSaubReportLas.dll index 34d137ce..5f24ee69 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 05fe81d6..a478be7c 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 963eb8db..cde86686 100644 --- a/AsbCloudInfrastructure/ReportDataSourcePgCloud.cs +++ b/AsbCloudInfrastructure/ReportDataSourcePgCloud.cs @@ -123,6 +123,11 @@ namespace AsbCloudInfrastructure RotorSpeed = d.RotorSpeed, Flow = d.Flow, PressureSpDevelop = d.PressureSpDevelop, + IdFeedRegulator = d.IdFeedRegulator, + Pump0Flow = d.Pump0Flow, + Pump1Flow = d.Pump1Flow, + Pump2Flow = d.Pump2Flow, + }); return query; }