ownSoft/BeWoPlaner
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tooltip bei dem ComboBoxTreeViewControl - Beim Auswählen von Ziele und Maßnahmen wird ein "Hover" Effekt mit der Beschreibung angezeigt

Browse Source 
ReportTemplate hinzugefügt
This commit is contained in:
rene
2019-08-29 12:38:48 +02:00
parent b28d69e43d
commit e2a0d4fac2
12 changed files with 93 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
BeWo/Core/BeWoUtils.cs
View File

@@ -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,13 +105,59 @@ 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<object>().ToList());
var beWoWindow = new BeWoWindow
{
Height = 200,
Width = 500,
WindowStartupLocation = WindowStartupLocation.CenterOwner,
GroupBoxContent = control,
Owner = BeWoApp.CurrentBeWo.MainWindow,
rootGroupBox = {Header = "Layout speichern"}
};
control.CancelButtonClicked += () => beWoWindow.Close();
control.SelectButtonClicked += () =>
{
if (control.SelectedItem == null) return;
beWoWindow.Close();
var selectedTemplate = (ReportTemplateDC)control.SelectedItem;
var start = navigateUriString.IndexOf("type=");
var end = navigateUriString.IndexOf('&', start);
if (end == -1) end = navigateUriString.Length - 1;
var typeString = navigateUriString.Substring(start, end - start + 1);
var newUri = navigateUriString.Replace(typeString, "template=" + (selectedTemplate.Oid.HasValue ? selectedTemplate.Oid.Value.ToString() : "-1"));
BeWoApp.MainControl.StartWaiting();
StartGetReportStreamAsync(GetReportStreamForWPFControl, newUri, ms => BeWoApp.MainControl.Dispatch(delegate
{
ShowReportWindow(ms, title, dp);
}));
};
beWoWindow.ShowDialog();
}
else
{
BeWoApp.MainControl.StartWaiting();
StartGetReportStreamAsync(GetReportStreamForWPFControl, navigateUriString, ms => BeWoApp.MainControl.Dispatch(delegate
{
ShowReportWindow(ms, title, dp);
}));
}
}
public static void CustomizeReportPreviewToolBar(object s, RoutedEventArgs e)

9
BeWo/ServiceProxy/Generated.cs
View File

@@ -4249,6 +4249,10 @@ namespace BeWo.ServiceProxy
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetIcfBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
System.Collections.Generic.List<BS.Shared.DataContracts.ValueListEntryDC> GetIcf();
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/GetReportTemplates", ReplyAction="http://tempuri.org/IOperationsService/GetReportTemplatesResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetReportTemplatesBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
System.Collections.Generic.List<BS.Shared.DataContracts.ReportTemplateDC> GetReportTemplates(string url);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/UpdateIsChatActiveCustomerAPPCodeDC", ReplyAction="http://tempuri.org/IOperationsService/UpdateIsChatActiveCustomerAPPCodeDCResponse" +
"")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/UpdateIsChatActiveCustomerAPPCodeDCBeWoFaul" +
@@ -5184,6 +5188,11 @@ namespace BeWo.ServiceProxy
return base.Channel.GetIcf();
}
public System.Collections.Generic.List<BS.Shared.DataContracts.ReportTemplateDC> GetReportTemplates(string url)
{
return base.Channel.GetReportTemplates(url);
}
public void UpdateIsChatActiveCustomerAPPCodeDC(long customerOid, int activeType)
{
base.Channel.UpdateIsChatActiveCustomerAPPCodeDC(customerOid, activeType);

2
BeWo/View/Controls/ComboBoxTreeViewControl.xaml
View File

@@ -69,7 +69,7 @@
Grid.Column="1" Margin="3 2"
Text="{Binding Path=DetailDescription}"
VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="Black"
MouseDown="BdText_OnMouseDown" TextAlignment="Left" />
MouseDown="BdText_OnMouseDown" TextAlignment="Left" ToolTip="{Binding Path=GoalEntryDC.Notice}" />
</Grid>
</HierarchicalDataTemplate>
</TreeView.Resources>

3
BeWo/View/Controls/ListboxSelectControl.xaml.cs
View File

@@ -22,6 +22,8 @@ namespace BeWo.View.Controls
public ListboxSelectControl(List<object> items)
{
InitializeComponent();
if (!items.Any()) throw new ArgumentOutOfRangeException();
Listbox.ItemsSource = items;
Listbox.SelectedItem = items.First();
@@ -34,7 +36,6 @@ namespace BeWo.View.Controls
private void CancelButton_Click(object sender, RoutedEventArgs e)
{
CancelButtonClicked?.Invoke();
}
private void SelectButton_Click(object sender, RoutedEventArgs e)

5
Data/Entities/ReportTemplate.cs
View File

@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using BS.Shared;
using BS.Shared.DataContracts;
namespace BeWo.Data.Entities
{
@@ -12,7 +13,7 @@ namespace BeWo.Data.Entities
#region Fields
private ReportTemplateType _ReportTemplateType;
private ReportTypes _ReportTemplateType;
private string _DisplayName;
private string _ReferenceClass;
@@ -45,7 +46,7 @@ namespace BeWo.Data.Entities
#region Properties
public virtual ReportTemplateType ReportTemplateType
public virtual ReportTypes ReportTemplateType
{
get => _ReportTemplateType;
set

2
Data/Mappings/ReportTemplate.hbm.xml
View File

@@ -15,7 +15,7 @@
<property column="UdpUser" type="String" name="UdpUser" length="256" />
<property column="SystemEntryID" type="BS.Shared.SystemEntryID, BS.Shared" name="SystemEntryID" />
<property column="DisplayName" type="string" name="DisplayName" length="1024" />
<property column="ReportTemplateType" type="BS.Shared.ReportTemplateType, BS.Shared" name="ReportTemplateType" />
<property column="ReportType" type="BS.Shared.DataContracts.ReportTypes, BS.Shared" name="ReportTemplateType" />
<property column="ReferenceClass" type="string" name="ReferenceClass" length="1024" />
</class>
</hibernate-mapping>

2
Host/Multitenancy/demo.config
View File

@@ -16,7 +16,7 @@
</property>
<property name="connection.connection_string">
Server=localhost;Password=root;User ID=root; Initial Catalog=alpha
Server=localhost;Password=root;User ID=root; Initial Catalog=bewodemo
</property>
<property name="dialect">

5
Service/DCEntityMapper/MapperFactory.cs
View File

@@ -258,6 +258,8 @@ namespace BeWo.Service.DCEntityMapper
private static NotizenEintragDC_NotizenEintrag _NotizenEintragDC_NotizenEintrag;
private static ReportTemplateDC_ReportTemplate _ReportTemplateDC_ReportTemplate;
public static MedRecordDC_MedRecord MedRecordDC_MedRecord =>
_MedRecordDC_MedRecord ?? (_MedRecordDC_MedRecord = new MedRecordDC_MedRecord());
@@ -648,5 +650,8 @@ namespace BeWo.Service.DCEntityMapper
public static HomeViewPanelDC_HomeViewPanel HomeViewPanelDC_HomeViewPanel =>
_HomeViewPanelDC_HomeViewPanel ?? (_HomeViewPanelDC_HomeViewPanel = new HomeViewPanelDC_HomeViewPanel());
public static ReportTemplateDC_ReportTemplate ReportTemplateDC_ReportTemplate =>
_ReportTemplateDC_ReportTemplate ?? (_ReportTemplateDC_ReportTemplate = new ReportTemplateDC_ReportTemplate());
}
}

2
Service/ServiceContracts/IOperationsService.cs
View File

@@ -842,6 +842,6 @@ namespace BeWo.Service.ServiceContracts
[FaultContract(typeof(BeWoFault))]
[OperationContract]
IList<ReportTemplate> GetReportTemplates(ReportTemplateType reportTemplateType);
IList<ReportTemplateDC> GetReportTemplates(string url);
}
}

15
Service/ServiceImplementations/OperationsServiceImp.cs
View File

@@ -5771,12 +5771,21 @@ namespace BeWo.Service.ServiceImplementations
}
}
public IList<ReportTemplate> GetReportTemplates(ReportTemplateType reportTemplateType)
public IList<ReportTemplateDC> GetReportTemplates(string url)
{
try
{
return DAOFactory.GenericDAO.GetAllActive<ReportTemplate>()
.Where(x => x.ReportTemplateType == reportTemplateType).ToList();
if (url.IsNullOrEmpty())
return null;
var index = url.IndexOf("type=") + 5;
var typeString = url.Substring(index);
if (!Enum.TryParse(typeString, out ReportTypes reportType))
return null;
return MapperFactory.ReportTemplateDC_ReportTemplate.MapToNewDCs(DAOFactory.GenericDAO
.GetAllActive<ReportTemplate>().Where(x => x.ReportTemplateType == reportType));
}
catch (Exception e)
{

6
Shared/BeWoEntityEnums.cs
View File

@@ -1030,10 +1030,4 @@ namespace BS.Shared
CustomReportPanel,
CustomXamlPanel
}
public enum ReportTemplateType
{
Test1,
Test2
}
}

10
Shared/DataContracts/ReportTemplateDC.cs
View File

@@ -36,15 +36,15 @@ namespace BS.Shared.DataContracts
public string DisplayName { get; set; }
[DataMember]
public ReportTemplateType ReportTemplateType { get; set; }
public ReportTypes ReportTemplateType { get; set; }
[DataMember]
public string ReferenceClass { get; set; }
//public override string ToString()
//{
// return DisplayName;
//}
public override string ToString()
{
return DisplayName;
}
//public override bool Equals(object obj)
//{