diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj
index b297b3565..0312d6f50 100644
--- a/BeWo/BeWo.csproj
+++ b/BeWo/BeWo.csproj
@@ -275,6 +275,14 @@
Designer
MSBuild:Compile
+
+ MSBuild:Compile
+ Designer
+
+
+ MSBuild:Compile
+ Designer
+
MSBuild:Compile
Designer
@@ -287,6 +295,10 @@
MSBuild:Compile
Designer
+
+ MSBuild:Compile
+ Designer
+
MSBuild:Compile
Designer
@@ -834,12 +846,21 @@
+
+ ListboxSelectControl.xaml
+
+
+ ValueListEntryEditControl.xaml
+
NotizenKategorieView.xaml
BudgetView.xaml
+
+ IcfImportControl.xaml
+
FlexibleReportEntryDetail.xaml
diff --git a/BeWo/Core/BeWoUtils.cs b/BeWo/Core/BeWoUtils.cs
index 73b949058..4c7ec2377 100644
--- a/BeWo/Core/BeWoUtils.cs
+++ b/BeWo/Core/BeWoUtils.cs
@@ -52,6 +52,7 @@ using DevExpress.Xpf.Bars;
using DevExpress.Xpf.DocumentViewer;
using DevExpress.Xpf.Printing.PreviewControl.Bars;
using DevExpress.XtraScheduler;
+using Control = System.Windows.Controls.Control;
using Utils = BS.Shared.Core.Utils;
namespace BeWo.Core
@@ -104,14 +105,64 @@ namespace BeWo.Core
}
public static void NavigateToReportUriWithDocumentPreviewControl(string navigateUriString, string title, DocumentPreviewControl dp)
- {
- BeWoApp.MainControl.StartWaiting();
+ {
+ var reportTemplates = ServiceFacade.DoOperationsServiceSync(x => x.GetReportTemplates(navigateUriString));
- StartGetReportStreamAsync(GetReportStreamForWPFControl, navigateUriString, ms => BeWoApp.MainControl.Dispatch(delegate
- {
- ShowReportWindow(ms, title, dp);
- }));
- }
+ if (reportTemplates?.Count > 1)
+ {
+ var control = new ListboxSelectControl(reportTemplates.Cast