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

Merge branch 'master' of ssh://float.beyondsoft.de/git/beyondSoft/BeWo

Browse Source 
# Conflicts:
#	BeWo/View/Detail/Report/FlexibleReportView.xaml.cs
#	Host/Multitenancy/demo.config
#	Service/ServiceImplementations/OperationsServiceImp.cs
This commit is contained in:
Lyndon
2019-07-19 20:00:56 +02:00
parent 0be172163c 7759770dec
commit c2f0fa9dc6
20 changed files with 2577 additions and 2089 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BeWo.sln
View File

@@ -385,7 +385,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SPZLeverkusen2", "SPZLeverk
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Diakonie Landshut", "Diakonie Landshut\Diakonie Landshut.csproj", "{7C56D787-C6B1-43D5-9F3E-005FC9E633A3}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ChatController", "..\..\Chat\ChatController\ChatController.csproj", "{8A83C4DC-A0B1-4A51-AE1D-366D7A05B298}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ChatController", "..\Chat\ChatController\ChatController.csproj", "{8A83C4DC-A0B1-4A51-AE1D-366D7A05B298}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution

14
BeWo/BeWo.csproj
View File

@@ -282,10 +282,18 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="View\Detail\Report\FlexibleReportLayoutLoadControl.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="View\Detail\Report\FlexibleReportView.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="View\Detail\Report\FlexibleReportLayoutSaveControl.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="View\Detail\Report\TestEMailControl.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
@@ -815,9 +823,15 @@
<Compile Include="View\Detail\Report\EMailStatusLogControl.xaml.cs">
<DependentUpon>EMailStatusLogControl.xaml</DependentUpon>
</Compile>
<Compile Include="View\Detail\Report\FlexibleReportLayoutLoadControl.xaml.cs">
<DependentUpon>FlexibleReportLayoutLoadControl.xaml</DependentUpon>
</Compile>
<Compile Include="View\Detail\Report\FlexibleReportView.xaml.cs">
<DependentUpon>FlexibleReportView.xaml</DependentUpon>
</Compile>
<Compile Include="View\Detail\Report\FlexibleReportLayoutSaveControl.xaml.cs">
<DependentUpon>FlexibleReportLayoutSaveControl.xaml</DependentUpon>
</Compile>
<Compile Include="View\Detail\Report\TestEMailControl.xaml.cs">
<DependentUpon>TestEMailControl.xaml</DependentUpon>
</Compile>

3242
BeWo/ServiceProxy/Generated.cs
View File

File diff suppressed because it is too large Load Diff

28
BeWo/View/Detail/Report/FlexibleReportLayoutLoadControl.xaml Normal file
View File

@@ -0,0 +1,28 @@
<UserControl
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:Controls="clr-namespace:BeWo.Controls;assembly=BeWo.Controls" x:Class="BeWo.View.Detail.Report.FlexibleReportLayoutLoadControl"
mc:Ignorable="d"
d:DesignHeight="200" d:DesignWidth="300">
<Grid Background="{StaticResource ObjectEditBackgroundBrush}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="*"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<Label Grid.Row="0" Grid.Column="0" Content="Layout Name:" Margin="3"/>
<!--<TextBox x:Name="TextLayoutString" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="4" Margin="5" AcceptsReturn="True" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto"/>-->
<Button x:Name="CancelButton" Grid.Row="2" Grid.Column="3" Content="Abbrechen" Margin="3" Click="CancelButton_OnClick" Width="80"/>
<Button x:Name="LoadButton" Grid.Row="2" Grid.Column="2" Content="Laden" Margin="3" Click="LoadButton_OnClick" HorizontalAlignment="Right" Width="80"/>
<ListBox x:Name="ListLayout" Grid.ColumnSpan="4" Grid.Row="1" HorizontalAlignment="Left" HorizontalContentAlignment="Stretch" Height="111" Margin="3" VerticalAlignment="Top" VerticalContentAlignment="Stretch" Width="100"/>
</Grid>
</UserControl>

50
BeWo/View/Detail/Report/FlexibleReportLayoutLoadControl.xaml.cs Normal file
View File

@@ -0,0 +1,50 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
namespace BeWo.View.Detail.Report
{
/// <summary>
/// Interaktionslogik für TestEMailControl.xaml
/// </summary>
public partial class FlexibleReportLayoutLoadControl : UserControl
{
public event Action CancelButtonClicked;
public event Action LoadButtonClicked;
public FlexibleReportLayoutLoadControl()
{
InitializeComponent();
}
public FlexibleReportLayout SelectedLayout
{
get
{
if(ListLayout.SelectedItem is FlexibleReportLayout flexibleReportLayout)
return flexibleReportLayout;
return null;
}
}
private void LoadButton_OnClick(object sender, RoutedEventArgs e)
{
LoadButtonClicked?.Invoke();
}
private void CancelButton_OnClick(object sender, RoutedEventArgs e)
{
CancelButtonClicked?.Invoke();
}
}
}

27
BeWo/View/Detail/Report/FlexibleReportLayoutSaveControl.xaml Normal file
View File

@@ -0,0 +1,27 @@
<UserControl x:Class="BeWo.View.Detail.Report.FlexibleReportLayoutSaveControl"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
mc:Ignorable="d"
d:DesignHeight="200" d:DesignWidth="300">
<Grid Background="{StaticResource ObjectEditBackgroundBrush}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="*"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<Label Grid.Row="0" Grid.Column="0" Content="Layout Name:" Margin="3"/>
<TextBox x:Name="TextLayoutName" Grid.Row="0" Grid.Column="1" Grid.ColumnSpan="4" Margin="3"/>
<!--<TextBox x:Name="TextLayoutString" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="4" Margin="5" AcceptsReturn="True" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto"/>-->
<Button x:Name="CancelButton" Grid.Row="2" Grid.Column="3" Content="Abbrechen" Margin="3" Click="CancelButton_OnClick" Width="80"/>
<Button x:Name="SaveButton" Grid.Row="2" Grid.Column="2" Content="Speichern" Margin="3" Click="SaveButton_OnClick" HorizontalAlignment="Right" Width="80"/>
</Grid>
</UserControl>

48
BeWo/View/Detail/Report/FlexibleReportLayoutSaveControl.xaml.cs Normal file
View File

@@ -0,0 +1,48 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
namespace BeWo.View.Detail.Report
{
/// <summary>
/// Interaktionslogik für TestEMailControl.xaml
/// </summary>
public partial class FlexibleReportLayoutSaveControl : UserControl
{
public event Action CancelButtonClicked;
public event Action SaveButtonClicked;
public FlexibleReportLayoutSaveControl()
{
InitializeComponent();
}
public string LayoutName
{
get { return TextLayoutName.Text; }
set { TextLayoutName.Text = value; }
}
private void SaveButton_OnClick(object sender, RoutedEventArgs e)
{
SaveButtonClicked?.Invoke();
}
private void CancelButton_OnClick(object sender, RoutedEventArgs e)
{
CancelButtonClicked?.Invoke();
}
}
}

4
Data/Data.csproj
View File

@@ -129,6 +129,7 @@
<Compile Include="Entities\ContactHistory.cs" />
<Compile Include="Entities\DeletionHistory.cs" />
<Compile Include="Entities\EmployeeHistory.cs" />
<Compile Include="Entities\FlexibleReportLayout.cs" />
<Compile Include="Entities\NotizenKategorie.cs" />
<Compile Include="Entities\NotizenEintrag.cs" />
<Compile Include="Entities\Feiertag.cs" />
@@ -582,6 +583,9 @@
</Content>
<Content Include="ICD10\icd10gm2012syst_claml_20110923.xml" />
<Content Include="Mappings\DeletionHistory.hbm.xml" />
<EmbeddedResource Include="Mappings\FlexibleReportLayout.hbm.xml">
<SubType>Designer</SubType>
</EmbeddedResource>
<Content Include="Mappings\Timesheet2Mail.hbm.xml" />
<EmbeddedResource Include="Mappings\ContactHistory.hbm.xml">
<SubType>Designer</SubType>

66
Data/Entities/FlexibleReportLayout.cs Normal file
View File

@@ -0,0 +1,66 @@
using BS.Shared;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace BeWo.Data.Entities
{
public class FlexibleReportLayout : BeWoEntityBase
{
private long _CreatorOid;
private string _LayoutName;
private string _LayoutString;
public FlexibleReportLayout()
{
_Tid = TableID.FlexibleReportLayout;
}
public virtual long CreatorOid
{
get
{
return _CreatorOid;
}
set
{
if (AreDifferent(_CreatorOid, value))
{
_CreatorOid = value;
}
}
}
public virtual string LayoutName
{
get
{
return _LayoutName;
}
set
{
if (AreDifferent(_LayoutName, value))
{
_LayoutName = value;
}
}
}
public virtual string LayoutString
{
get
{
return _LayoutString;
}
set
{
if (AreDifferent(_LayoutString, value))
{
_LayoutString = value;
}
}
}
}
}

22
Data/Mappings/FlexibleReportLayout.hbm.xml Normal file
View File

@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8" ?>
<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2">
<class name="BeWo.Data.Entities.FlexibleReportLayout,BeWo.Data" table="FlexibleReportLayout">
<id name="Oid" column="Oid" type="Int64" unsaved-value="null">
<generator class="identity" />
</id>
<version type="Int64" column="Version" name="Version" />
<property column="Tid" type="BS.Shared.TableID, BS.Shared" name="_Tid" access="field" />
<property column="IsActive" type="BS.Shared.ActivationTypeId, BS.Shared" name="IsActive" />
<property column="Notice" type="String" name="Notice" length="1024" />
<property column="InsTs" type="DateTime" name="InsTs" />
<property column="InsUser" type="String" name="InsUser" length="256" />
<property column="UdpUser" type="String" name="UdpUser" length="256" />
<property column="SystemEntryID" type="BS.Shared.SystemEntryID, BS.Shared" name="SystemEntryID" />
<property column="CreatorOid" type="Int64" name="CreatorOid" />
<property column="LayoutName" type="String" name="LayoutName" />
<property column="LayoutString" type="String" name="LayoutString" />
</class>
</hibernate-mapping>

15
Host/Multitenancy/demo.config
View File

@@ -16,25 +16,14 @@
</property>
<property name="connection.connection_string">
Server=localhost;Password=root;User ID= root; Initial Catalog=bewodemo
Server=localhost;Password=root;User ID=root; Initial Catalog=bewodemo
</property>
<!--<property name="connection.connection_string">
Server=localhost;Password=root;User ID=root; Initial Catalog=dakonielandshut
</property>-->
<!--<property name="connection.connection_string">
Server=localhost;Password=root;User ID=root;Initial Catalog=delete_for_good_database
</property>-->
<!--<property name="connection.connection_string">
Server=localhost;Password=root;User ID=root;Initial Catalog=betreuwo
</property>-->
<!--<property name="connection.connection_string">
Server=localhost;Password=root;User ID=root;Initial Catalog=caritasaachen
</property>-->
<property name="dialect">
NHibernate.Dialect.MySQLDialect
</property>

17
Model/Changes_2019_07_12 FlexibleReportLayout hinzugefügt.txt Normal file
View File

@@ -0,0 +1,17 @@
CREATE TABLE `flexiblereportlayout` (
`Oid` bigint(19) NOT NULL AUTO_INCREMENT,
`Tid` int(10) DEFAULT NULL,
`IsActive` tinyint(4) DEFAULT NULL,
`Notice` varchar(1024) DEFAULT NULL,
`InsTs` datetime DEFAULT NULL,
`InsUser` varchar(256) DEFAULT NULL,
`Version` bigint(19) DEFAULT NULL,
`UdpUser` varchar(256) DEFAULT NULL,
`SystemEntryID` int(10) DEFAULT NULL,
`CreatorOid` bigint(19) NOT NULL,
`LayoutName` varchar(1024) NOT NULL,
`LayoutString` mediumtext NOT NULL,
PRIMARY KEY (`Oid`),
CONSTRAINT FOREIGN KEY (`CreatorOid`) REFERENCES `applicationuser` (`oid`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1

55
Service/DCEntityMapper/FlexibleReportLayoutDC_FlexibleReportLayout.cs Normal file
View File

@@ -0,0 +1,55 @@
using BeWo.Data.Entities;
using BS.Shared.DataContracts;
namespace BeWo.Service.DCEntityMapper
{
public class FlexibleReportLayoutDC_FlexibleReportLayout : AbstractIDCEntityMapper<FlexibleReportLayout, FlexibleReportLayoutDC>
{
public override FlexibleReportLayoutDC MergeWithDC(FlexibleReportLayout pEntity, FlexibleReportLayoutDC pDataContract)
{
pDataContract.CreatorOid = pEntity.CreatorOid;
pDataContract.FlexibleReportInsTs = pEntity.InsTs;
pDataContract.FlexibleReportInsUser = pEntity.InsUser;
pDataContract.FlexibleReportIsActive = pEntity.IsActive;
pDataContract.FlexibleReportNotice = pEntity.Notice;
pDataContract.FlexibleReportOid = pEntity.Oid;
pDataContract.FlexibleReportSystemEntryID = pEntity.SystemEntryID;
pDataContract.FlexibleReportUdpUser = pEntity.UdpUser;
pDataContract.FlexibleReportVersion = pEntity.Version;
pDataContract.LayoutName = pEntity.LayoutName;
pDataContract.LayoutString = pEntity.LayoutString;
return pDataContract;
}
public override FlexibleReportLayout MergeWithEntity(FlexibleReportLayoutDC pDataContract, FlexibleReportLayout pEntity)
{
ConcurrencyCheck(pDataContract.FlexibleReportVersion, pEntity);
pEntity.CreatorOid = pDataContract.CreatorOid;
pEntity.InsTs = pDataContract.FlexibleReportInsTs;
pEntity.InsUser = pDataContract.FlexibleReportInsUser;
pEntity.IsActive = pDataContract.FlexibleReportIsActive;
pEntity.Notice = pDataContract.FlexibleReportNotice;
pEntity.Oid = pDataContract.FlexibleReportOid;
pEntity.SystemEntryID = pDataContract.FlexibleReportSystemEntryID;
pEntity.UdpUser = pDataContract.FlexibleReportUdpUser;
pEntity.Version = pDataContract.FlexibleReportVersion;
pEntity.LayoutName = pDataContract.LayoutName;
pEntity.LayoutString = pDataContract.LayoutString;
return pEntity;
}
protected override bool AreDCAndEntityEqual(FlexibleReportLayoutDC pDC, FlexibleReportLayout pEntity)
{
if (pDC.FlexibleReportOid == null)
{
return false;
}
return pDC.FlexibleReportOid == pEntity.Oid;
}
}
}

13
Service/DCEntityMapper/MapperFactory.cs
View File

@@ -236,7 +236,10 @@ namespace BeWo.Service.DCEntityMapper
private static FeiertagDC_Feiertag _FeiertagDC_Feiertag;
private static BudgetDC_Budget _BudgetDC_Budget;
private static FlexibleReportLayoutDC_FlexibleReportLayout _FlexibleReportLayoutDC_FlexibleReportLayout;
public static MedRecordDC_MedRecord MedRecordDC_MedRecord
{
@@ -1217,5 +1220,13 @@ namespace BeWo.Service.DCEntityMapper
return _BudgetDC_Budget ?? (_BudgetDC_Budget = new BudgetDC_Budget());
}
}
public static FlexibleReportLayoutDC_FlexibleReportLayout FlexibleReportLayoutDC_FlexibleReportLayout
{
get
{
return _FlexibleReportLayoutDC_FlexibleReportLayout ?? (_FlexibleReportLayoutDC_FlexibleReportLayout = new FlexibleReportLayoutDC_FlexibleReportLayout());
}
}
}
}

3
Service/Service.csproj
View File

@@ -165,6 +165,7 @@
<Compile Include="Core\ServiceLogic.cs" />
<Compile Include="Core\SettingsLogic.cs" />
<Compile Include="Core\Utils.cs" />
<Compile Include="DCEntityMapper\FlexibleReportLayoutDC_FlexibleReportLayout.cs" />
<Compile Include="DCEntityMapper\NotizenKategorieDC_NotizenKategorie.cs" />
<Compile Include="DCEntityMapper\NotizenEintragDC_NotizenEintrag.cs" />
<Compile Include="DCEntityMapper\FeiertagDC_Feiertag.cs" />
@@ -389,7 +390,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Data\Data.csproj">
<Project>{B0D73E3D-4AE7-4024-93A6-DB1F46D7CCEE}</Project>
<Project>{b0d73e3d-4ae7-4024-93a6-db1f46d7ccee}</Project>
<Name>Data</Name>
</ProjectReference>
<ProjectReference Include="..\Shared\Shared.csproj">

8
Service/ServiceContracts/IOperationsService.cs
View File

@@ -815,5 +815,13 @@ namespace BeWo.Service.ServiceContracts
[FaultContract(typeof(BeWoFault))]
[OperationContract]
IList<FlexibleReportEntryDC> GetAllFlexibleReportEntrys(FlexibleReportFilterDC filter);
[FaultContract(typeof(BeWoFault))]
[OperationContract]
IList<FlexibleReportLayoutDC> GetFlexibleReportLayouts();
[FaultContract(typeof(BeWoFault))]
[OperationContract]
void InsertNewFlexibleReportLayout(FlexibleReportLayoutDC flexibleReportLayoutDC);
}
}

1000
Service/ServiceImplementations/OperationsServiceImp.cs
View File

File diff suppressed because it is too large Load Diff

7
Shared/BeWoEntityEnums.cs
View File

@@ -134,14 +134,15 @@ namespace BS.Shared
NotizenKategorie = 127,
NotizenEintrag = 128,
BuchungsExport = 129,
Timesheet2Mail = 130,
Timesheet2Mail = 130,
PersonHistory = 131,
EmployeeHistory = 132,
AddressHistory = 133,
ContactHistory = 134,
Budget = 135,
DeletionHistory = 136
DeletionHistory = 136,
FlexibleReportLayout = 137
}
public enum SystemEntryID

44
Shared/DataContracts/FlexibleReportLayoutDC.cs Normal file
View File

@@ -0,0 +1,44 @@
using System;
using System.Collections.Generic;
using System.Runtime.Serialization;
using BS.Shared.Core;
namespace BS.Shared.DataContracts
{
public class FlexibleReportLayoutDC : IDataContract
{
[DataMember]
public long? FlexibleReportOid { get; set; }
[DataMember]
public ActivationTypeId FlexibleReportIsActive { get; set; }
[DataMember]
public string FlexibleReportNotice { get; set; }
[DataMember]
public DateTime? FlexibleReportInsTs { get; set; }
[DataMember]
public string FlexibleReportInsUser { get; set; }
[DataMember]
public long? FlexibleReportVersion { get; set; }
[DataMember]
public string FlexibleReportUdpUser { get; set; }
[DataMember]
public SystemEntryID? FlexibleReportSystemEntryID { get; set; }
[DataMember]
public long CreatorOid { get; set; }
[DataMember]
public string LayoutName { get; set; }
[DataMember]
public string LayoutString { get; set; }
}
}

1
Shared/Shared.csproj
View File

@@ -154,6 +154,7 @@
<Compile Include="DataContracts\FerienDC.cs" />
<Compile Include="DataContracts\FlexibleReportFilterDC.cs" />
<Compile Include="DataContracts\FlexibleReportEntryDC.cs" />
<Compile Include="DataContracts\FlexibleReportLayoutDC.cs" />
<Compile Include="DataContracts\NotizenKategorieDC.cs" />
<Compile Include="DataContracts\NotizenEintragDC.cs" />
<Compile Include="DataContracts\ClientPartials\CostRatePeriodDC.cs" />