From 03cd4c59052ebd6b54eb37aafac723cbcd8297de Mon Sep 17 00:00:00 2001 From: Lyndon Jetten Date: Mon, 31 Aug 2020 17:44:05 +0200 Subject: [PATCH 1/3] Qlik-Reporte eingebaut --- BeWo/BeWo.csproj | 15 ++++- BeWoPlanerMobil/BeWoPlanerMobil.csproj | 30 ++++----- .../Controllers/LoginController.cs | 2 +- Data/Data.csproj | 12 ++-- Host/Host.csproj | 9 +-- Host/Host.csproj.user | 6 ++ Report/DefaultReports/Finanzauswertung.cs | 11 ---- Report/Report.csproj | 63 ++++++++----------- .../AdditionalServiceBookingRO.cs | 1 - Report/ReportObjects/FLSReportRO.cs | 1 - Report/ReportObjects/FinanceRO.cs | 5 -- .../MitarbeiterstundenkontoRO.cs | 26 +++++--- .../ReportObjects/SbdStundenaufstellungRO.cs | 3 - .../ReportObjects/UrlaubskontoBerechnung.cs | 9 --- ReportImp/demo_reports/demo_reports.csproj | 55 ++++++++++------ Service/Plugins/PluginLoader.cs | 7 ++- Service/Service.csproj | 19 +++--- .../DownloadServiceImp.cs | 2 +- Shared/Extensions/DateTimeExtensions.cs | 5 ++ 19 files changed, 145 insertions(+), 136 deletions(-) diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj index 4884438c6..c6351ac84 100644 --- a/BeWo/BeWo.csproj +++ b/BeWo/BeWo.csproj @@ -94,6 +94,9 @@ False ..\Lib\Blacklight.Wpf.Controls.dll + + ..\packages\CsvHelper.15.0.5\lib\net45\CsvHelper.dll + @@ -137,6 +140,7 @@ + ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll @@ -160,12 +164,21 @@ + + ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll + 3.0 3.0 + + ..\packages\System.Threading.Tasks.Extensions.4.5.2\lib\portable-net45+win8+wp8+wpa81\System.Threading.Tasks.Extensions.dll + + + ..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll + @@ -994,7 +1007,7 @@ KilometerauslastungsView.xaml - + RatingReportView.xaml diff --git a/BeWoPlanerMobil/BeWoPlanerMobil.csproj b/BeWoPlanerMobil/BeWoPlanerMobil.csproj index 271135a23..1ecba736f 100644 --- a/BeWoPlanerMobil/BeWoPlanerMobil.csproj +++ b/BeWoPlanerMobil/BeWoPlanerMobil.csproj @@ -54,14 +54,6 @@ ..\packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll - - False - ..\Data\bin\Debug\BeWo.Data.dll - - - False - ..\Service\bin\Debug\BeWo.Service.dll - False @@ -425,12 +417,6 @@ - - - {2f50b83d-a3f0-4ec4-979a-3f9b7e3d8ed4} - Shared - - @@ -581,6 +567,20 @@ + + + {b0d73e3d-4ae7-4024-93a6-db1f46d7ccee} + Data + + + {094331c3-ecee-4c89-bbfd-4c9ded89f0ef} + Service + + + {2f50b83d-a3f0-4ec4-979a-3f9b7e3d8ed4} + Shared + + 10.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) @@ -596,7 +596,7 @@ - False + True False 8808 / diff --git a/BeWoPlanerMobil/Controllers/LoginController.cs b/BeWoPlanerMobil/Controllers/LoginController.cs index 8027344fd..449533008 100644 --- a/BeWoPlanerMobil/Controllers/LoginController.cs +++ b/BeWoPlanerMobil/Controllers/LoginController.cs @@ -60,7 +60,7 @@ namespace BeWoPlanerMobil.Controllers Tenant = MobileSessionFacade.Tenant }; - OperationsService.InsertBeWoMobilBrowserInfo(brauserInfoDC); + //OperationsService.InsertBeWoMobilBrowserInfo(brauserInfoDC); AbstractModel.TimeOfLastAction = $"{DateTime.Now:yyyy-MM-dd}T{DateTime.Now:HH:mm:ss}"; diff --git a/Data/Data.csproj b/Data/Data.csproj index 81812bc0a..855ce7421 100644 --- a/Data/Data.csproj +++ b/Data/Data.csproj @@ -438,12 +438,6 @@ Designer - - - {2F50B83D-A3F0-4EC4-979A-3F9B7E3D8ED4} - Shared - - @@ -790,6 +784,12 @@ Designer + + + {2f50b83d-a3f0-4ec4-979a-3f9b7e3d8ed4} + Shared + + diff --git a/Host/Host.csproj b/Host/Host.csproj index 706049dc0..5495b0b1f 100644 --- a/Host/Host.csproj +++ b/Host/Host.csproj @@ -25,6 +25,7 @@ + true @@ -240,7 +241,7 @@ - {B0D73E3D-4AE7-4024-93A6-DB1F46D7CCEE} + {b0d73e3d-4ae7-4024-93a6-db1f46d7ccee} Data @@ -248,15 +249,15 @@ ReportingService - {40D8B312-EA64-49E3-A31A-5E57ED4D5654} + {40d8b312-ea64-49e3-a31a-5e57ed4d5654} Report - {094331C3-ECEE-4C89-BBFD-4C9DED89F0EF} + {094331c3-ecee-4c89-bbfd-4c9ded89f0ef} Service - {2F50B83D-A3F0-4EC4-979A-3F9B7E3D8ED4} + {2f50b83d-a3f0-4ec4-979a-3f9b7e3d8ed4} Shared diff --git a/Host/Host.csproj.user b/Host/Host.csproj.user index fdd817a24..4b21acef4 100644 --- a/Host/Host.csproj.user +++ b/Host/Host.csproj.user @@ -4,6 +4,12 @@ BeWo2.0 true Debug|Any CPU + + + + + + diff --git a/Report/DefaultReports/Finanzauswertung.cs b/Report/DefaultReports/Finanzauswertung.cs index 3c9743e19..f35961841 100644 --- a/Report/DefaultReports/Finanzauswertung.cs +++ b/Report/DefaultReports/Finanzauswertung.cs @@ -1,16 +1,5 @@ using System; -using System.Linq; -using BS.Shared; -using BeWo.Report; using BeWo.Report.ReportObjects; -using BeWo.Data.Entities; -using BeWo.Data.Access; -using System.Collections.Generic; -using BS.Shared.Core; -using BS.Shared.Services; -using BS.Shared.DataContracts; -using BeWo.Service.DCEntityMapper; -using BeWo.Service.ServiceImplementations; namespace BeWo.Report.DefaultReports { diff --git a/Report/Report.csproj b/Report/Report.csproj index 6a4de1935..26dd233ff 100644 --- a/Report/Report.csproj +++ b/Report/Report.csproj @@ -74,9 +74,6 @@ false - - ..\BeWoPlanerMobil\bin\BS.Shared.dll - @@ -103,11 +100,17 @@ + + False + ..\..\..\..\Program Files (x86)\DevExpress 17.1\Components\Bin\Framework\DevExpress.XtraScheduler.v17.1.dll + + + False + ..\..\..\..\Program Files (x86)\DevExpress 17.1\Components\Bin\Framework\DevExpress.XtraScheduler.v17.1.Core.dll + - - ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll @@ -131,29 +134,6 @@ - - ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.Helpers.dll - True - - - ..\packages\Microsoft.AspNet.Mvc.4.0.20710.0\lib\net40\System.Web.Mvc.dll - - - ..\packages\Microsoft.AspNet.Razor.2.0.20715.0\lib\net40\System.Web.Razor.dll - True - - - ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.dll - True - - - ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Deployment.dll - True - - - ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Razor.dll - True - 3.5 @@ -574,16 +554,6 @@ Designer - - - {B0D73E3D-4AE7-4024-93A6-DB1F46D7CCEE} - Data - - - {094331C3-ECEE-4C89-BBFD-4C9DED89F0EF} - Service - - @@ -617,6 +587,23 @@ true + + + + + + {b0d73e3d-4ae7-4024-93a6-db1f46d7ccee} + Data + + + {094331c3-ecee-4c89-bbfd-4c9ded89f0ef} + Service + + + {2f50b83d-a3f0-4ec4-979a-3f9b7e3d8ed4} + Shared + +