diff --git a/.gitignore b/.gitignore index 8a1dc82a4..656aa610b 100644 --- a/.gitignore +++ b/.gitignore @@ -469,3 +469,4 @@ /ReportImp/DiakonischesWerkHerne/obj/Release /ReportImp/SabGmbH/obj/Debug /ReportImp/SabGmbH/obj/Release +/ReportImp/BeWoFlex/obj/Debug diff --git a/BeWo.sln b/BeWo.sln index 7e7d55a13..262bcba8d 100644 --- a/BeWo.sln +++ b/BeWo.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27130.2010 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.30523.141 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Client", "Client", "{E7543C39-A44C-40C9-82C9-E7FAA2D9A852}" EndProject @@ -391,6 +391,16 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PraxisPusteblume", "ReportI EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SawoReports", "ReportImp\SawoReports\SawoReports.csproj", "{E590CC37-E2A4-488F-BBA2-C70042BD488D}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BeWoFlex", "ReportImp\BeWoFlex\BeWoFlex.csproj", "{C1FED668-ADB9-47E0-B589-1389618E1B6E}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiePerspektive", "ReportImp\DiePerspektive\DiePerspektive.csproj", "{D4094646-4495-4FD8-AA8C-770E2EFCE7E8}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AsbRuhr", "ReportImp\AsbRuhr\AsbRuhr.csproj", "{08CB01F6-CD13-4A5A-9A50-7F503A49B7F8}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiakonischesWerkWesel", "ReportImp\DiakonischesWerkWesel\DiakonischesWerkWesel.csproj", "{062698EA-8477-4F07-BF2A-CE4FAE4DCFA3}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Humanitas", "ReportImp\Humanitas\Humanitas.csproj", "{DB03F765-7CE2-40A6-B469-BCEBE61ACF9E}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|.NET = Debug|.NET @@ -2902,6 +2912,86 @@ Global {E590CC37-E2A4-488F-BBA2-C70042BD488D}.Release|Mixed Platforms.Build.0 = Release|Any CPU {E590CC37-E2A4-488F-BBA2-C70042BD488D}.Release|x86.ActiveCfg = Release|Any CPU {E590CC37-E2A4-488F-BBA2-C70042BD488D}.Release|x86.Build.0 = Release|Any CPU + {C1FED668-ADB9-47E0-B589-1389618E1B6E}.Debug|.NET.ActiveCfg = Debug|Any CPU + {C1FED668-ADB9-47E0-B589-1389618E1B6E}.Debug|.NET.Build.0 = Debug|Any CPU + {C1FED668-ADB9-47E0-B589-1389618E1B6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C1FED668-ADB9-47E0-B589-1389618E1B6E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C1FED668-ADB9-47E0-B589-1389618E1B6E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {C1FED668-ADB9-47E0-B589-1389618E1B6E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {C1FED668-ADB9-47E0-B589-1389618E1B6E}.Debug|x86.ActiveCfg = Debug|Any CPU + {C1FED668-ADB9-47E0-B589-1389618E1B6E}.Debug|x86.Build.0 = Debug|Any CPU + {C1FED668-ADB9-47E0-B589-1389618E1B6E}.Release|.NET.ActiveCfg = Release|Any CPU + {C1FED668-ADB9-47E0-B589-1389618E1B6E}.Release|.NET.Build.0 = Release|Any CPU + {C1FED668-ADB9-47E0-B589-1389618E1B6E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C1FED668-ADB9-47E0-B589-1389618E1B6E}.Release|Any CPU.Build.0 = Release|Any CPU + {C1FED668-ADB9-47E0-B589-1389618E1B6E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {C1FED668-ADB9-47E0-B589-1389618E1B6E}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {C1FED668-ADB9-47E0-B589-1389618E1B6E}.Release|x86.ActiveCfg = Release|Any CPU + {C1FED668-ADB9-47E0-B589-1389618E1B6E}.Release|x86.Build.0 = Release|Any CPU + {D4094646-4495-4FD8-AA8C-770E2EFCE7E8}.Debug|.NET.ActiveCfg = Debug|Any CPU + {D4094646-4495-4FD8-AA8C-770E2EFCE7E8}.Debug|.NET.Build.0 = Debug|Any CPU + {D4094646-4495-4FD8-AA8C-770E2EFCE7E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D4094646-4495-4FD8-AA8C-770E2EFCE7E8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D4094646-4495-4FD8-AA8C-770E2EFCE7E8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {D4094646-4495-4FD8-AA8C-770E2EFCE7E8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {D4094646-4495-4FD8-AA8C-770E2EFCE7E8}.Debug|x86.ActiveCfg = Debug|Any CPU + {D4094646-4495-4FD8-AA8C-770E2EFCE7E8}.Debug|x86.Build.0 = Debug|Any CPU + {D4094646-4495-4FD8-AA8C-770E2EFCE7E8}.Release|.NET.ActiveCfg = Release|Any CPU + {D4094646-4495-4FD8-AA8C-770E2EFCE7E8}.Release|.NET.Build.0 = Release|Any CPU + {D4094646-4495-4FD8-AA8C-770E2EFCE7E8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D4094646-4495-4FD8-AA8C-770E2EFCE7E8}.Release|Any CPU.Build.0 = Release|Any CPU + {D4094646-4495-4FD8-AA8C-770E2EFCE7E8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {D4094646-4495-4FD8-AA8C-770E2EFCE7E8}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {D4094646-4495-4FD8-AA8C-770E2EFCE7E8}.Release|x86.ActiveCfg = Release|Any CPU + {D4094646-4495-4FD8-AA8C-770E2EFCE7E8}.Release|x86.Build.0 = Release|Any CPU + {08CB01F6-CD13-4A5A-9A50-7F503A49B7F8}.Debug|.NET.ActiveCfg = Debug|Any CPU + {08CB01F6-CD13-4A5A-9A50-7F503A49B7F8}.Debug|.NET.Build.0 = Debug|Any CPU + {08CB01F6-CD13-4A5A-9A50-7F503A49B7F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {08CB01F6-CD13-4A5A-9A50-7F503A49B7F8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {08CB01F6-CD13-4A5A-9A50-7F503A49B7F8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {08CB01F6-CD13-4A5A-9A50-7F503A49B7F8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {08CB01F6-CD13-4A5A-9A50-7F503A49B7F8}.Debug|x86.ActiveCfg = Debug|Any CPU + {08CB01F6-CD13-4A5A-9A50-7F503A49B7F8}.Debug|x86.Build.0 = Debug|Any CPU + {08CB01F6-CD13-4A5A-9A50-7F503A49B7F8}.Release|.NET.ActiveCfg = Release|Any CPU + {08CB01F6-CD13-4A5A-9A50-7F503A49B7F8}.Release|.NET.Build.0 = Release|Any CPU + {08CB01F6-CD13-4A5A-9A50-7F503A49B7F8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {08CB01F6-CD13-4A5A-9A50-7F503A49B7F8}.Release|Any CPU.Build.0 = Release|Any CPU + {08CB01F6-CD13-4A5A-9A50-7F503A49B7F8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {08CB01F6-CD13-4A5A-9A50-7F503A49B7F8}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {08CB01F6-CD13-4A5A-9A50-7F503A49B7F8}.Release|x86.ActiveCfg = Release|Any CPU + {08CB01F6-CD13-4A5A-9A50-7F503A49B7F8}.Release|x86.Build.0 = Release|Any CPU + {062698EA-8477-4F07-BF2A-CE4FAE4DCFA3}.Debug|.NET.ActiveCfg = Debug|Any CPU + {062698EA-8477-4F07-BF2A-CE4FAE4DCFA3}.Debug|.NET.Build.0 = Debug|Any CPU + {062698EA-8477-4F07-BF2A-CE4FAE4DCFA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {062698EA-8477-4F07-BF2A-CE4FAE4DCFA3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {062698EA-8477-4F07-BF2A-CE4FAE4DCFA3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {062698EA-8477-4F07-BF2A-CE4FAE4DCFA3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {062698EA-8477-4F07-BF2A-CE4FAE4DCFA3}.Debug|x86.ActiveCfg = Debug|Any CPU + {062698EA-8477-4F07-BF2A-CE4FAE4DCFA3}.Debug|x86.Build.0 = Debug|Any CPU + {062698EA-8477-4F07-BF2A-CE4FAE4DCFA3}.Release|.NET.ActiveCfg = Release|Any CPU + {062698EA-8477-4F07-BF2A-CE4FAE4DCFA3}.Release|.NET.Build.0 = Release|Any CPU + {062698EA-8477-4F07-BF2A-CE4FAE4DCFA3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {062698EA-8477-4F07-BF2A-CE4FAE4DCFA3}.Release|Any CPU.Build.0 = Release|Any CPU + {062698EA-8477-4F07-BF2A-CE4FAE4DCFA3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {062698EA-8477-4F07-BF2A-CE4FAE4DCFA3}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {062698EA-8477-4F07-BF2A-CE4FAE4DCFA3}.Release|x86.ActiveCfg = Release|Any CPU + {062698EA-8477-4F07-BF2A-CE4FAE4DCFA3}.Release|x86.Build.0 = Release|Any CPU + {DB03F765-7CE2-40A6-B469-BCEBE61ACF9E}.Debug|.NET.ActiveCfg = Debug|Any CPU + {DB03F765-7CE2-40A6-B469-BCEBE61ACF9E}.Debug|.NET.Build.0 = Debug|Any CPU + {DB03F765-7CE2-40A6-B469-BCEBE61ACF9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DB03F765-7CE2-40A6-B469-BCEBE61ACF9E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DB03F765-7CE2-40A6-B469-BCEBE61ACF9E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {DB03F765-7CE2-40A6-B469-BCEBE61ACF9E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {DB03F765-7CE2-40A6-B469-BCEBE61ACF9E}.Debug|x86.ActiveCfg = Debug|Any CPU + {DB03F765-7CE2-40A6-B469-BCEBE61ACF9E}.Debug|x86.Build.0 = Debug|Any CPU + {DB03F765-7CE2-40A6-B469-BCEBE61ACF9E}.Release|.NET.ActiveCfg = Release|Any CPU + {DB03F765-7CE2-40A6-B469-BCEBE61ACF9E}.Release|.NET.Build.0 = Release|Any CPU + {DB03F765-7CE2-40A6-B469-BCEBE61ACF9E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DB03F765-7CE2-40A6-B469-BCEBE61ACF9E}.Release|Any CPU.Build.0 = Release|Any CPU + {DB03F765-7CE2-40A6-B469-BCEBE61ACF9E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {DB03F765-7CE2-40A6-B469-BCEBE61ACF9E}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {DB03F765-7CE2-40A6-B469-BCEBE61ACF9E}.Release|x86.ActiveCfg = Release|Any CPU + {DB03F765-7CE2-40A6-B469-BCEBE61ACF9E}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -3093,6 +3183,11 @@ Global {8A83C4DC-A0B1-4A51-AE1D-366D7A05B298} = {E7543C39-A44C-40C9-82C9-E7FAA2D9A852} {A6E699B3-8399-4B8D-90F1-119B021F3D44} = {D8A691C5-146D-4613-86CC-438F02FE9106} {E590CC37-E2A4-488F-BBA2-C70042BD488D} = {D8A691C5-146D-4613-86CC-438F02FE9106} + {C1FED668-ADB9-47E0-B589-1389618E1B6E} = {D8A691C5-146D-4613-86CC-438F02FE9106} + {D4094646-4495-4FD8-AA8C-770E2EFCE7E8} = {D8A691C5-146D-4613-86CC-438F02FE9106} + {08CB01F6-CD13-4A5A-9A50-7F503A49B7F8} = {D8A691C5-146D-4613-86CC-438F02FE9106} + {062698EA-8477-4F07-BF2A-CE4FAE4DCFA3} = {D8A691C5-146D-4613-86CC-438F02FE9106} + {DB03F765-7CE2-40A6-B469-BCEBE61ACF9E} = {D8A691C5-146D-4613-86CC-438F02FE9106} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {FBE985BB-9F0F-4DBB-8F94-ABC37A803FF9} diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj index 54c9676bc..6d1210159 100644 --- a/BeWo/BeWo.csproj +++ b/BeWo/BeWo.csproj @@ -855,6 +855,7 @@ + @@ -1512,6 +1513,12 @@ MSBuild:Compile Designer + + Designer + MSBuild:Compile + MSBuild:Compile + Designer + Designer MSBuild:Compile @@ -2037,6 +2044,9 @@ ServiceRecordView2.xaml + + ServicesReportView.xaml + ServicesReportViewAlt.xaml diff --git a/BeWo/Core/BeWoUtils.cs b/BeWo/Core/BeWoUtils.cs index af5de27b2..b8e2f8805 100644 --- a/BeWo/Core/BeWoUtils.cs +++ b/BeWo/Core/BeWoUtils.cs @@ -103,10 +103,15 @@ namespace BeWo.Core public static void NavigateToReportUri(string navigateUriString, string title) { - NavigateToReportUriWithDocumentPreviewControl(navigateUriString, title, null); + NavigateToReportUri(navigateUriString, title, null); } - public static void NavigateToReportUriWithDocumentPreviewControl(string navigateUriString, string title, DocumentPreviewControl dp) + public static void NavigateToReportUri(string navigateUriString, string title, Action callback) + { + NavigateToReportUriWithDocumentPreviewControl(navigateUriString, title, null, callback); + } + + public static void NavigateToReportUriWithDocumentPreviewControl(string navigateUriString, string title, DocumentPreviewControl dp, Action callback) { var reportTemplates = ServiceFacade.DoOperationsServiceSync(x => x.GetReportTemplates(navigateUriString)); @@ -149,6 +154,10 @@ namespace BeWo.Core StartGetReportStreamAsync(GetReportStreamForWPFControl, newUri, ms => BeWoApp.MainControl.Dispatch(delegate { + if (callback != null) + { + callback(); + } ShowReportWindow(ms, title, dp); })); }; @@ -161,6 +170,10 @@ namespace BeWo.Core StartGetReportStreamAsync(GetReportStreamForWPFControl, navigateUriString, ms => BeWoApp.MainControl.Dispatch(delegate { + if (callback != null) + { + callback(); + } ShowReportWindow(ms, title, dp); })); } @@ -1305,7 +1318,7 @@ namespace BeWo.Core UpdateSearchViewObjectList(fls2.customerSearchView, updatedCustomer); } - var serv2 = serv as ServicesReportViewAlt; + var serv2 = serv as ServicesReportView; if(serv2 != null) { if(serv2.Customer != null) @@ -1371,7 +1384,7 @@ namespace BeWo.Core UpdateSearchViewObjectList(fls2.employeeSearchView, updatedEmployee); } - if(serv is ServicesReportViewAlt serv2) + if(serv is ServicesReportView serv2) { if(serv2.Employee != null) { @@ -1390,7 +1403,7 @@ namespace BeWo.Core var updatedOrganisation = new CompactOrganisationDC(); ServiceFacade.DoCustomerServiceSync(s => updatedOrganisation = s.LoadOrganisationCompact((pUpdatedObject as CompactOrganisationDC).OrganisationOid)); - if(serv is ServicesReportViewAlt serv2) + if(serv is ServicesReportView serv2) { if(serv2.Organisation != null) { diff --git a/BeWo/Scheduler/View/NewSchedulerView.xaml b/BeWo/Scheduler/View/NewSchedulerView.xaml index 2bad46b14..62f855f93 100644 --- a/BeWo/Scheduler/View/NewSchedulerView.xaml +++ b/BeWo/Scheduler/View/NewSchedulerView.xaml @@ -578,6 +578,7 @@ +