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

History, FlexibleReport, Budget etc.

Browse Source
This commit is contained in:
rene
2019-07-10 10:11:10 +02:00
parent 3d8244c489
commit ea38c6676f
57 changed files with 10302 additions and 6502 deletions
Download Patch File Download Diff File Expand all files Collapse all files

127
BeWo.sln
View File

@@ -1,6 +1,8 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2012
# Visual Studio 15
VisualStudioVersion = 15.0.28307.329
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Client", "Client", "{E7543C39-A44C-40C9-82C9-E7FAA2D9A852}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Server", "Server", "{FEB0336B-F053-40B6-92DD-7DE56AB9408A}"
@@ -375,6 +377,18 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BeWoLeverkusen", "ReportImp
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SultanSahinReports", "ReportImp\SultanSahinReports\SultanSahinReports.csproj", "{888961E7-A394-4F3B-A667-09EA2F80ED4B}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CaritasAhlen", "ReportImp\CaritasAhlen\CaritasAhlen.csproj", "{96A3E6E3-3F9B-4CAB-B306-3F23DE6A40F9}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TabulaRasa", "ReportImp\TabulaRasa\TabulaRasa.csproj", "{8E7F125B-32E9-4D59-A47A-C0994A980CD3}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LandshuterNetzwerk", "LandshuterNetzwerk\LandshuterNetzwerk.csproj", "{17ED3D33-CA00-48F4-8542-AD3438BDF2FD}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SPZLeverkusen2", "SPZLeverkusen2\SPZLeverkusen2.csproj", "{74040CE0-1D24-4F47-91B9-7F166EADBC61}"
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}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|.NET = Debug|.NET
@@ -2770,19 +2784,113 @@ Global
{888961E7-A394-4F3B-A667-09EA2F80ED4B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{888961E7-A394-4F3B-A667-09EA2F80ED4B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{888961E7-A394-4F3B-A667-09EA2F80ED4B}.Release|x86.ActiveCfg = Release|Any CPU
{96A3E6E3-3F9B-4CAB-B306-3F23DE6A40F9}.Debug|.NET.ActiveCfg = Debug|Any CPU
{96A3E6E3-3F9B-4CAB-B306-3F23DE6A40F9}.Debug|.NET.Build.0 = Debug|Any CPU
{96A3E6E3-3F9B-4CAB-B306-3F23DE6A40F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{96A3E6E3-3F9B-4CAB-B306-3F23DE6A40F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{96A3E6E3-3F9B-4CAB-B306-3F23DE6A40F9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{96A3E6E3-3F9B-4CAB-B306-3F23DE6A40F9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{96A3E6E3-3F9B-4CAB-B306-3F23DE6A40F9}.Debug|x86.ActiveCfg = Debug|Any CPU
{96A3E6E3-3F9B-4CAB-B306-3F23DE6A40F9}.Debug|x86.Build.0 = Debug|Any CPU
{96A3E6E3-3F9B-4CAB-B306-3F23DE6A40F9}.Release|.NET.ActiveCfg = Release|Any CPU
{96A3E6E3-3F9B-4CAB-B306-3F23DE6A40F9}.Release|.NET.Build.0 = Release|Any CPU
{96A3E6E3-3F9B-4CAB-B306-3F23DE6A40F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{96A3E6E3-3F9B-4CAB-B306-3F23DE6A40F9}.Release|Any CPU.Build.0 = Release|Any CPU
{96A3E6E3-3F9B-4CAB-B306-3F23DE6A40F9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{96A3E6E3-3F9B-4CAB-B306-3F23DE6A40F9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{96A3E6E3-3F9B-4CAB-B306-3F23DE6A40F9}.Release|x86.ActiveCfg = Release|Any CPU
{96A3E6E3-3F9B-4CAB-B306-3F23DE6A40F9}.Release|x86.Build.0 = Release|Any CPU
{8E7F125B-32E9-4D59-A47A-C0994A980CD3}.Debug|.NET.ActiveCfg = Debug|Any CPU
{8E7F125B-32E9-4D59-A47A-C0994A980CD3}.Debug|.NET.Build.0 = Debug|Any CPU
{8E7F125B-32E9-4D59-A47A-C0994A980CD3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8E7F125B-32E9-4D59-A47A-C0994A980CD3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8E7F125B-32E9-4D59-A47A-C0994A980CD3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{8E7F125B-32E9-4D59-A47A-C0994A980CD3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{8E7F125B-32E9-4D59-A47A-C0994A980CD3}.Debug|x86.ActiveCfg = Debug|Any CPU
{8E7F125B-32E9-4D59-A47A-C0994A980CD3}.Debug|x86.Build.0 = Debug|Any CPU
{8E7F125B-32E9-4D59-A47A-C0994A980CD3}.Release|.NET.ActiveCfg = Release|Any CPU
{8E7F125B-32E9-4D59-A47A-C0994A980CD3}.Release|.NET.Build.0 = Release|Any CPU
{8E7F125B-32E9-4D59-A47A-C0994A980CD3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8E7F125B-32E9-4D59-A47A-C0994A980CD3}.Release|Any CPU.Build.0 = Release|Any CPU
{8E7F125B-32E9-4D59-A47A-C0994A980CD3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{8E7F125B-32E9-4D59-A47A-C0994A980CD3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{8E7F125B-32E9-4D59-A47A-C0994A980CD3}.Release|x86.ActiveCfg = Release|Any CPU
{8E7F125B-32E9-4D59-A47A-C0994A980CD3}.Release|x86.Build.0 = Release|Any CPU
{17ED3D33-CA00-48F4-8542-AD3438BDF2FD}.Debug|.NET.ActiveCfg = Debug|Any CPU
{17ED3D33-CA00-48F4-8542-AD3438BDF2FD}.Debug|.NET.Build.0 = Debug|Any CPU
{17ED3D33-CA00-48F4-8542-AD3438BDF2FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{17ED3D33-CA00-48F4-8542-AD3438BDF2FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{17ED3D33-CA00-48F4-8542-AD3438BDF2FD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{17ED3D33-CA00-48F4-8542-AD3438BDF2FD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{17ED3D33-CA00-48F4-8542-AD3438BDF2FD}.Debug|x86.ActiveCfg = Debug|Any CPU
{17ED3D33-CA00-48F4-8542-AD3438BDF2FD}.Debug|x86.Build.0 = Debug|Any CPU
{17ED3D33-CA00-48F4-8542-AD3438BDF2FD}.Release|.NET.ActiveCfg = Release|Any CPU
{17ED3D33-CA00-48F4-8542-AD3438BDF2FD}.Release|.NET.Build.0 = Release|Any CPU
{17ED3D33-CA00-48F4-8542-AD3438BDF2FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{17ED3D33-CA00-48F4-8542-AD3438BDF2FD}.Release|Any CPU.Build.0 = Release|Any CPU
{17ED3D33-CA00-48F4-8542-AD3438BDF2FD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{17ED3D33-CA00-48F4-8542-AD3438BDF2FD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{17ED3D33-CA00-48F4-8542-AD3438BDF2FD}.Release|x86.ActiveCfg = Release|Any CPU
{17ED3D33-CA00-48F4-8542-AD3438BDF2FD}.Release|x86.Build.0 = Release|Any CPU
{74040CE0-1D24-4F47-91B9-7F166EADBC61}.Debug|.NET.ActiveCfg = Debug|Any CPU
{74040CE0-1D24-4F47-91B9-7F166EADBC61}.Debug|.NET.Build.0 = Debug|Any CPU
{74040CE0-1D24-4F47-91B9-7F166EADBC61}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{74040CE0-1D24-4F47-91B9-7F166EADBC61}.Debug|Any CPU.Build.0 = Debug|Any CPU
{74040CE0-1D24-4F47-91B9-7F166EADBC61}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{74040CE0-1D24-4F47-91B9-7F166EADBC61}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{74040CE0-1D24-4F47-91B9-7F166EADBC61}.Debug|x86.ActiveCfg = Debug|Any CPU
{74040CE0-1D24-4F47-91B9-7F166EADBC61}.Debug|x86.Build.0 = Debug|Any CPU
{74040CE0-1D24-4F47-91B9-7F166EADBC61}.Release|.NET.ActiveCfg = Release|Any CPU
{74040CE0-1D24-4F47-91B9-7F166EADBC61}.Release|.NET.Build.0 = Release|Any CPU
{74040CE0-1D24-4F47-91B9-7F166EADBC61}.Release|Any CPU.ActiveCfg = Release|Any CPU
{74040CE0-1D24-4F47-91B9-7F166EADBC61}.Release|Any CPU.Build.0 = Release|Any CPU
{74040CE0-1D24-4F47-91B9-7F166EADBC61}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{74040CE0-1D24-4F47-91B9-7F166EADBC61}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{74040CE0-1D24-4F47-91B9-7F166EADBC61}.Release|x86.ActiveCfg = Release|Any CPU
{74040CE0-1D24-4F47-91B9-7F166EADBC61}.Release|x86.Build.0 = Release|Any CPU
{7C56D787-C6B1-43D5-9F3E-005FC9E633A3}.Debug|.NET.ActiveCfg = Debug|Any CPU
{7C56D787-C6B1-43D5-9F3E-005FC9E633A3}.Debug|.NET.Build.0 = Debug|Any CPU
{7C56D787-C6B1-43D5-9F3E-005FC9E633A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7C56D787-C6B1-43D5-9F3E-005FC9E633A3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7C56D787-C6B1-43D5-9F3E-005FC9E633A3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{7C56D787-C6B1-43D5-9F3E-005FC9E633A3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{7C56D787-C6B1-43D5-9F3E-005FC9E633A3}.Debug|x86.ActiveCfg = Debug|Any CPU
{7C56D787-C6B1-43D5-9F3E-005FC9E633A3}.Debug|x86.Build.0 = Debug|Any CPU
{7C56D787-C6B1-43D5-9F3E-005FC9E633A3}.Release|.NET.ActiveCfg = Release|Any CPU
{7C56D787-C6B1-43D5-9F3E-005FC9E633A3}.Release|.NET.Build.0 = Release|Any CPU
{7C56D787-C6B1-43D5-9F3E-005FC9E633A3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7C56D787-C6B1-43D5-9F3E-005FC9E633A3}.Release|Any CPU.Build.0 = Release|Any CPU
{7C56D787-C6B1-43D5-9F3E-005FC9E633A3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{7C56D787-C6B1-43D5-9F3E-005FC9E633A3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{7C56D787-C6B1-43D5-9F3E-005FC9E633A3}.Release|x86.ActiveCfg = Release|Any CPU
{7C56D787-C6B1-43D5-9F3E-005FC9E633A3}.Release|x86.Build.0 = Release|Any CPU
{8A83C4DC-A0B1-4A51-AE1D-366D7A05B298}.Debug|.NET.ActiveCfg = Debug|Any CPU
{8A83C4DC-A0B1-4A51-AE1D-366D7A05B298}.Debug|.NET.Build.0 = Debug|Any CPU
{8A83C4DC-A0B1-4A51-AE1D-366D7A05B298}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8A83C4DC-A0B1-4A51-AE1D-366D7A05B298}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8A83C4DC-A0B1-4A51-AE1D-366D7A05B298}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{8A83C4DC-A0B1-4A51-AE1D-366D7A05B298}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{8A83C4DC-A0B1-4A51-AE1D-366D7A05B298}.Debug|x86.ActiveCfg = Debug|Any CPU
{8A83C4DC-A0B1-4A51-AE1D-366D7A05B298}.Debug|x86.Build.0 = Debug|Any CPU
{8A83C4DC-A0B1-4A51-AE1D-366D7A05B298}.Release|.NET.ActiveCfg = Release|Any CPU
{8A83C4DC-A0B1-4A51-AE1D-366D7A05B298}.Release|.NET.Build.0 = Release|Any CPU
{8A83C4DC-A0B1-4A51-AE1D-366D7A05B298}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8A83C4DC-A0B1-4A51-AE1D-366D7A05B298}.Release|Any CPU.Build.0 = Release|Any CPU
{8A83C4DC-A0B1-4A51-AE1D-366D7A05B298}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{8A83C4DC-A0B1-4A51-AE1D-366D7A05B298}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{8A83C4DC-A0B1-4A51-AE1D-366D7A05B298}.Release|x86.ActiveCfg = Release|Any CPU
{8A83C4DC-A0B1-4A51-AE1D-366D7A05B298}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{3FEBB560-9275-413A-9767-BB68C44EEBC3} = {E7543C39-A44C-40C9-82C9-E7FAA2D9A852}
{D5E53B0F-BF5A-41E8-93E2-0F32845FC729} = {E7543C39-A44C-40C9-82C9-E7FAA2D9A852}
{094331C3-ECEE-4C89-BBFD-4C9DED89F0EF} = {FEB0336B-F053-40B6-92DD-7DE56AB9408A}
{B0D73E3D-4AE7-4024-93A6-DB1F46D7CCEE} = {FEB0336B-F053-40B6-92DD-7DE56AB9408A}
{D5E53B0F-BF5A-41E8-93E2-0F32845FC729} = {E7543C39-A44C-40C9-82C9-E7FAA2D9A852}
{40D8B312-EA64-49E3-A31A-5E57ED4D5654} = {FEB0336B-F053-40B6-92DD-7DE56AB9408A}
{E1154C7B-BB77-4155-9854-DAD8FC5A8BC3} = {FEB0336B-F053-40B6-92DD-7DE56AB9408A}
{663EFCB5-9E3E-4C76-97EE-3188E072634C} = {FEB0336B-F053-40B6-92DD-7DE56AB9408A}
{284B02ED-114A-426C-9162-31BB6CF05589} = {FEB0336B-F053-40B6-92DD-7DE56AB9408A}
{6556CD8E-1142-4B3C-A17E-082C44CAB0C1} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{4A7C1019-4AAC-48D3-B445-2AADF8B76303} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{36E7D251-2F15-4589-81C2-6BDDC67F16AE} = {D8A691C5-146D-4613-86CC-438F02FE9106}
@@ -2917,10 +3025,12 @@ Global
{EAD43B9B-A117-4ED1-993C-D969F70DC911} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{012458B9-D7EF-4A7F-841B-0DD5EE9DBA90} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{AC208F3D-2D64-49A8-A6EB-2EE49BABF3CA} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{663EFCB5-9E3E-4C76-97EE-3188E072634C} = {FEB0336B-F053-40B6-92DD-7DE56AB9408A}
{A10D7313-870C-4470-92EA-CD531D78C40B} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{A182A40F-16C4-4890-BD4C-336CB5B8F70D} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{2E4CFE97-3A0B-4170-95B1-D7EE0CA7DCAA} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{1F5D8784-4912-4D71-867F-ADE6D56C31BD} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{284B02ED-114A-426C-9162-31BB6CF05589} = {FEB0336B-F053-40B6-92DD-7DE56AB9408A}
{4E27E4D3-C184-4E10-AE73-7600D95FCE8E} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{B40CB768-8847-4D73-8AC6-EED34B6216CE} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{697CF63E-B065-491A-AEA7-909F01ECA6AB} = {D8A691C5-146D-4613-86CC-438F02FE9106}
@@ -2953,5 +3063,14 @@ Global
{0FDF87A6-B39E-4494-AE31-0CE302D8BA80} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{6490978C-CFE1-4A1E-BCC4-4B602C3F191A} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{888961E7-A394-4F3B-A667-09EA2F80ED4B} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{96A3E6E3-3F9B-4CAB-B306-3F23DE6A40F9} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{8E7F125B-32E9-4D59-A47A-C0994A980CD3} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{17ED3D33-CA00-48F4-8542-AD3438BDF2FD} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{74040CE0-1D24-4F47-91B9-7F166EADBC61} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{7C56D787-C6B1-43D5-9F3E-005FC9E633A3} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{8A83C4DC-A0B1-4A51-AE1D-366D7A05B298} = {E7543C39-A44C-40C9-82C9-E7FAA2D9A852}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {FBE985BB-9F0F-4DBB-8F94-ABC37A803FF9}
EndGlobalSection
EndGlobal

21
BeWo/BeWo.csproj
View File

@@ -110,6 +110,7 @@
<Reference Include="DevExpress.Xpf.Grid.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Xpf.Layout.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Xpf.LayoutControl.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Xpf.PivotGrid.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Xpf.Printing.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Xpf.Ribbon.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Xpf.RichEdit.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
@@ -134,9 +135,6 @@
<Reference Include="DevExpress.XtraScheduler.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraScheduler.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraScheduler.v17.1.Reporting, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="Microsoft.Office.Interop.Word, Version=14.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
<EmbedInteropTypes>True</EmbedInteropTypes>
</Reference>
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Newtonsoft.Json.6.0.5\lib\net40\Newtonsoft.Json.dll</HintPath>
@@ -276,6 +274,14 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="View\Detail\BudgetView.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\StundenplanView.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
@@ -606,7 +612,6 @@
<DependentUpon>ProxyLoginView.xaml</DependentUpon>
</Compile>
<Compile Include="Scheduler\Utils\AppointmentExtensions.cs" />
<Compile Include="Scheduler\Utils\Utils.cs" />
<Compile Include="Scheduler\ViewModel\CustomFieldStorage.cs" />
<Compile Include="SchulbegleitenderDienst\SchulbegleitenderDienstEmployeeView.xaml.cs">
<DependentUpon>SchulbegleitenderDienstEmployeeView.xaml</DependentUpon>
@@ -709,6 +714,8 @@
<Compile Include="ViewModel\AdditionalServiceGroupOfPeopleVM.cs" />
<Compile Include="ViewModel\AdditionalServiceRegionVM.cs" />
<Compile Include="ViewModel\AdditionalServiceVM.cs" />
<Compile Include="ViewModel\BudgetVM.cs" />
<Compile Include="ViewModel\ListViewModel\BudgetListVM.cs" />
<Compile Include="ViewModel\NotizenKategorieVM.cs" />
<Compile Include="ViewModel\NotizenEintragVM.cs" />
<Compile Include="ViewModel\FeiertagVM.cs" />
@@ -789,6 +796,12 @@
<Compile Include="ViewModel\OrganisationPersonRelationVM.cs" />
<Compile Include="ViewModel\TextModuleVM.cs" />
<Compile Include="ViewModel\VerordnungslistenVM.cs" />
<Compile Include="View\Detail\BudgetView.xaml.cs">
<DependentUpon>BudgetView.xaml</DependentUpon>
</Compile>
<Compile Include="View\Detail\Report\FlexibleReportView.xaml.cs">
<DependentUpon>FlexibleReportView.xaml</DependentUpon>
</Compile>
<Compile Include="View\StundenplanView.xaml.cs">
<DependentUpon>StundenplanView.xaml</DependentUpon>
</Compile>

1688
BeWo/Office/WordProcessor.cs
View File

File diff suppressed because it is too large Load Diff

1
BeWo/SchulbegleitenderDienst/VertretenderKlientSearchView.xaml.cs
View File

@@ -37,7 +37,6 @@ using DevExpress.Xpf.Core;
using DevExpress.Xpf.Editors;
using DevExpress.XtraPrinting.Native;
using DevExpress.XtraPrinting.XamlExport;
using Microsoft.Office.Interop.Word;
using Color = System.Drawing.Color;
using KeyEventArgs = System.Windows.Input.KeyEventArgs;
using MessageBox = System.Windows.MessageBox;

2813
BeWo/ServiceProxy/Generated.cs
View File

File diff suppressed because it is too large Load Diff

52
BeWo/View/Detail/BudgetView.xaml Normal file
View File

@@ -0,0 +1,52 @@
<localView:BeWoView xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors" x:Class="BeWo.View.Detail.BudgetView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:localView="clr-namespace:BeWo.View"
xmlns:val="clr-namespace:BeWo.Validation"
xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
xmlns:dxe2="clr-namespace:DevExpress.XtraEditors;assembly=DevExpress.XtraEditors.v17.1"
Height="Auto" Width="Auto" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch" Focusable="True">
<GroupBox Name="root" Header="Aktuell definierte Budgets" Style="{StaticResource ObjectEditGroupBox}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<Label>Bezeichnung</Label>
<TextBox Grid.Column="1" Margin="3" Height="23" Text="{val:ValidationBinding Path=NewVM.Name, UpdateSourceTrigger=PropertyChanged}" />
<Label Grid.Column="2">Betragshöhe</Label>
<dxe:TextEdit Grid.Column="3" MaskType="Numeric" Mask="########0.00" MaskUseAsDisplayFormat="True" Height="23" Margin="3" EditValue="{val:ValidationBinding Path=NewVM.Betragshoehe, UpdateSourceTrigger=PropertyChanged}" />
<Button Name="button_addBudget" Click="Button_addBudget_Click" Grid.Column="4" Height="25" Margin="3,3,3,3" Padding="5 0" IsDefault="True" Content="Hinzufügen" />
<dxg:GridControl x:Name="DatagridRegions" Margin="0,10,0,0" Grid.Column="0" Grid.Row="2" Grid.ColumnSpan="7" DataSource="{Binding VMList}">
<dxg:GridControl.Columns>
<dxg:GridColumn FieldName="IsDeleteable" Header="" FixedWidth="True" Width="24" ReadOnly="True">
<dxg:GridColumn.CellTemplate>
<DataTemplate>
<Button Content="r" IsEnabled="{Binding Path=EditValue}" FontFamily="Webdings" Click="DeleteButton_Click" Width="18" Height="18" VerticalAlignment="Center" />
</DataTemplate>
</dxg:GridColumn.CellTemplate>
</dxg:GridColumn>
<dxg:GridColumn FieldName="Name" Header="Bezeichnung" Width="200" />
<dxg:GridColumn FieldName="Betragshoehe" Header="Stunden" Width="200" SortOrder="Ascending" SortIndex="0">
<dxg:GridColumn.EditSettings>
<dxe:TextEditSettings DisplayFormat="##,###,##0.00" Mask="##,###,##0.00" MaskType="Numeric"></dxe:TextEditSettings>
</dxg:GridColumn.EditSettings>
</dxg:GridColumn>
</dxg:GridControl.Columns>
<dxg:GridControl.View>
<dxg:TableView AutoWidth="true" ShowGroupPanel="False" ShowGroupedColumns="false" ShowTotalSummary="False" NavigationStyle="Cell" />
</dxg:GridControl.View>
</dxg:GridControl>
</Grid>
</GroupBox>
</localView:BeWoView>

122
BeWo/View/Detail/BudgetView.xaml.cs Normal file
View File

@@ -0,0 +1,122 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Windows;
using BS.Shared.Core;
using BS.Shared.Extensions;
using BeWo.Core;
using BeWo.Core.Service;
using BeWo.ServiceProxy;
using BeWo.Validation;
using BeWo.ViewModel;
using BeWo.ViewModel.ListViewModel;
using DevExpress.Xpf.Editors.Settings;
using DevExpress.Xpf.Grid;
namespace BeWo.View.Detail
{
public partial class BudgetView : BeWoView
{
private BudgetListVM _ViewModel;
public BudgetView(BudgetListVM pViewModel)
{
InitializeComponent();
ViewModel = pViewModel;
}
public override bool IsDirty
{
get { return ViewModel != null && ViewModel.IsDirty; }
}
public override string Title
{
get { return "Budgets"; }
}
// TODO
internal override DependencyObject ValidationOnSaveRootElement
{
get { return button_addBudget; }
}
private BudgetListVM ViewModel
{
get { return _ViewModel; }
set
{
_ViewModel = value;
root.DataContext = value;
}
}
protected override void Save()
{
var lToDos = new List<Action<IOperationsService>>();
if (ViewModel.AddedCount > 0)
{
lToDos.Add(s => s.InsertNewBudget(ViewModel.CommitAdded()));
}
if (ViewModel.RemovedCount > 0)
{
lToDos.Add(s => s.DeactivateBudget(ViewModel.GetRemoved().ToDictionary(dc => dc.BudgetOid.Value, dc => dc.BudgetVersion.Value)));
}
if (ViewModel.ChangedCount > 0)
{
lToDos.Add(s => s.UpdateBudget(ViewModel.CommitChanged()));
}
ServiceFacade.DoMultipleOperationsServicesAsync(lToDos, ReloadViewModel);
}
private void DeleteButton_Click(object sender, RoutedEventArgs e)
{
ViewModel.VMList.Remove(DatagridRegions.GetCurrentValue<BudgetVM>());
BeWoWpfUtils.RefreshDXGrid(DatagridRegions);
}
private void ReloadViewModel()
{
VMFactory.CreateBudgetListVMAsync(r => this.Dispatch(delegate { ViewModel = r; }));
}
private void Button_addBudget_Click(object sender, RoutedEventArgs e)
{
if (ValidationTrigger.Validate(this))
{
ViewModel.AddNewVMToList();
}
}
private void PART_Editor_Click(object sender, RoutedEventArgs e)
{
RowData data = DatagridRegions.View.FocusedRowData;
if (data != null && data.RowHandle != null)
{
var vm = DatagridRegions.GetRow(data.RowHandle.Value) as BudgetVM;
if (vm != null)
{
ViewModel.EditVM = vm;
//popup_costrateperiods.IsOpen = true;
}
}
}
private void button_edit_Click(object sender, RoutedEventArgs e)
{
//this.ViewModel.EditVM.Values = this.ViewModel.PossibleValues.Where(i => i.IsEditSelected).ToList();
//popup_costrateperiods.IsOpen = false;
}
}
}

3305
BeWo/View/Detail/CustomerView.xaml
View File

File diff suppressed because it is too large Load Diff

1316
BeWo/View/Detail/EmployeeView.xaml
View File

File diff suppressed because it is too large Load Diff

78
BeWo/View/Detail/MailMergeWindow.xaml.cs
View File

@@ -227,56 +227,56 @@ namespace BeWo.View.Detail
private void PrintMailMerge(string path, ViewDestination viewDestination)
{
var wordProcessor = new WordProcessor
{
DocumentPath = path,
CreateFormLetter = true
};
//var wordProcessor = new WordProcessor
// {
// DocumentPath = path,
// CreateFormLetter = true
// };
List<CustomerDC> customers = null;
List<PersonDC> persons = null;
List<OrganisationDC> organisations = null;
List<SupportConceptDC> supportConcepts = null;
var contractIds = new List<long>();
//List<CustomerDC> customers = null;
//List<PersonDC> persons = null;
//List<OrganisationDC> organisations = null;
//List<SupportConceptDC> supportConcepts = null;
//var contractIds = new List<long>();
if (fileType == FileAttachmentType.CustomerTemplate)
{
contractIds.AddRange(SelectedForPrinting.Select(customer => ((CompactCustomerDC)customer).CustomerOid));
//if (fileType == FileAttachmentType.CustomerTemplate)
//{
// contractIds.AddRange(SelectedForPrinting.Select(customer => ((CompactCustomerDC)customer).CustomerOid));
ServiceFacade.DoCustomerServiceSync(cs => customers = cs.GetCustomersById(contractIds));
// ServiceFacade.DoCustomerServiceSync(cs => customers = cs.GetCustomersById(contractIds));
if (customers != null)
wordProcessor.TableModel = new CustomerTableModel {Customers = customers};
}
else if (fileType == FileAttachmentType.PersonTemplate)
{
contractIds.AddRange(SelectedForPrinting.Select(person => ((CompactPersonDC)person).PersonOid));
// if (customers != null)
// wordProcessor.TableModel = new CustomerTableModel {Customers = customers};
//}
//else if (fileType == FileAttachmentType.PersonTemplate)
//{
// contractIds.AddRange(SelectedForPrinting.Select(person => ((CompactPersonDC)person).PersonOid));
ServiceFacade.DoCustomerServiceSync(p => persons = p.GetPersonsById(contractIds));
// ServiceFacade.DoCustomerServiceSync(p => persons = p.GetPersonsById(contractIds));
if (persons != null)
wordProcessor.TableModel = new PersonTableModel { Persons = persons };
}
else if (fileType == FileAttachmentType.SupportConceptTemplate)
{
contractIds.AddRange(SelectedForPrinting.Select(supportConcept => ((CompactSupportConceptDC)supportConcept).SupportConceptOid));
// if (persons != null)
// wordProcessor.TableModel = new PersonTableModel { Persons = persons };
//}
//else if (fileType == FileAttachmentType.SupportConceptTemplate)
//{
// contractIds.AddRange(SelectedForPrinting.Select(supportConcept => ((CompactSupportConceptDC)supportConcept).SupportConceptOid));
ServiceFacade.DoCustomerServiceSync(s => supportConcepts = s.GetSupportConceptsById(contractIds));
// ServiceFacade.DoCustomerServiceSync(s => supportConcepts = s.GetSupportConceptsById(contractIds));
if (supportConcepts != null)
wordProcessor.TableModel = new SupportConceptTableModel { SupportConcepts = supportConcepts };
}
else if (fileType == FileAttachmentType.OrganisationTemplate)
{
contractIds.AddRange(SelectedForPrinting.Select(organistation => ((CompactOrganisationDC)organistation).OrganisationOid));
// if (supportConcepts != null)
// wordProcessor.TableModel = new SupportConceptTableModel { SupportConcepts = supportConcepts };
//}
//else if (fileType == FileAttachmentType.OrganisationTemplate)
//{
// contractIds.AddRange(SelectedForPrinting.Select(organistation => ((CompactOrganisationDC)organistation).OrganisationOid));
ServiceFacade.DoCustomerServiceSync(o => organisations = o.GetOrganisationsById(contractIds));
// ServiceFacade.DoCustomerServiceSync(o => organisations = o.GetOrganisationsById(contractIds));
if (organisations != null)
wordProcessor.TableModel = new OrganisationTableModel { Organisations = organisations };
}
// if (organisations != null)
// wordProcessor.TableModel = new OrganisationTableModel { Organisations = organisations };
//}
wordProcessor.CreateReport(viewDestination, null, null);
//wordProcessor.CreateReport(viewDestination, null, null);
}
protected override void OnClosing(CancelEventArgs e)

57
BeWo/View/Detail/Report/FlexibleReportView.xaml Normal file
View File

@@ -0,0 +1,57 @@
<localView:BeWoView
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
xmlns:localView="clr-namespace:BeWo.View"
xmlns:uc="clr-namespace:BeWo.Controls;assembly=BeWo.Controls"
xmlns:dxb="http://schemas.devexpress.com/winfx/2008/xaml/bars"
xmlns:dxpg="http://schemas.devexpress.com/winfx/2008/xaml/pivotgrid" x:Class="BeWo.View.Detail.Report.FlexibleReportView"
Height="Auto" Width="Auto" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch" Focusable="True">
<Grid>
<GroupBox Header="Flexibler Bericht" Style="{StaticResource ObjectEditGroupBox}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<Label Content="Startdatum:" Grid.Column="0" VerticalAlignment="Center" />
<dxe:DateEdit MaskType="DateTimeAdvancingCaret" Grid.Column="1" x:Name="datePickerStartDate" Width="120" HorizontalAlignment="Left" Margin="3,0,0,0" />
<Label Content="Enddatum:" Grid.Column="2" VerticalAlignment="Center" />
<dxe:DateEdit MaskType="DateTimeAdvancingCaret" Grid.Column="3" x:Name="datePickerEndDate" HorizontalAlignment="Left" Width="120" Margin="3,0,0,0" />
<Button Content="Aktualisieren" Grid.Column="4" Margin="5,0,0,0" x:Name="buttonRefresh" Click="buttonRefresh_Click" />
<Grid Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="6" >
<dxpg:PivotGridControl x:Name="GridControl" RowTreeWidth="225" Visibility="Hidden" DataProcessingEngine="LegacyOptimized" Margin="0,10,0,0" dx:ThemeManager.ThemeName="Office2010Black" CustomCellDisplayText="GridControl_CustomCellDisplayText" CustomFieldValueCells="GridControl_CustomFieldValueCells">
<dxpg:PivotGridControl.Fields>
<dxpg:PivotGridField x:Name="FlexibleTeam" FieldName="Team" Area="FilterArea" Width="200" Caption="Team" AllowedAreas="RowArea,FilterArea,ColumnArea" />
<dxpg:PivotGridField x:Name="FlexibleKlient" FieldName="Customer" Area="RowArea" Width="200" Caption="Klient" AllowedAreas="RowArea,FilterArea,ColumnArea" AreaIndex="2" />
<dxpg:PivotGridField x:Name="FlexibleMitarbeiter" FieldName="Employee" Area="RowArea" Width="200" Caption="Mitarbeiter" AllowedAreas="RowArea,FilterArea,ColumnArea" AreaIndex="1" />
<dxpg:PivotGridField x:Name="FlexibleSupportConcept" FieldName="SupportConcept" Area="FilterArea" Width="200" Caption="Hilfeplan" AllowedAreas="RowArea,FilterArea,ColumnArea" />
<dxpg:PivotGridField x:Name="FlexibleLeistungskategorie" FieldName="Leistungskategorie" Area="FilterArea" Width="200" Caption="Leistungskategorie" AllowedAreas="RowArea,FilterArea,ColumnArea" />
<dxpg:PivotGridField x:Name="FlexibleLeistung" FieldName="Leistung" Area="FilterArea" Width="200" Caption="Leistung" AllowedAreas="RowArea,FilterArea,ColumnArea" />
<dxpg:PivotGridField x:Name="FlexibleGefahreneKilometer" FieldName="Kilometer" Area="FilterArea" Width="200" Caption="Gefahrene Kilometer" AllowedAreas="DataArea,FilterArea" />
<dxpg:PivotGridField x:Name="FlexibleAnzahlMinIst" FieldName="AnzahlMinutenIst" Area="FilterArea" Width="60" Caption="Ist Min." AllowedAreas="DataArea,FilterArea" />
<dxpg:PivotGridField x:Name="FlexibleAnzahlStdIst" FieldName="AnzahlStundenIst" Area="DataArea" Width="80" Caption="Ist Std." AllowedAreas="DataArea,FilterArea" />
<dxpg:PivotGridField x:Name="FlexibleAnzahlMinSoll" FieldName="AnzahlMinutenSoll" Area="FilterArea" Width="60" Caption="Soll Min." AllowedAreas="DataArea,FilterArea" />
<dxpg:PivotGridField x:Name="FlexibleAnzahlStdSoll" FieldName="AnzahlStundenSoll" Area="DataArea" Width="80" Caption="Soll Std." AllowedAreas="DataArea,FilterArea" />
<dxpg:PivotGridField x:Name="FlexibleJahr" FieldName="Datum" Area="ColumnArea" Width="100" Caption="Jahr" AllowedAreas="RowArea,FilterArea,ColumnArea" GroupInterval="DateYear" />
<dxpg:PivotGridField x:Name="FlexibleMonat" FieldName="Datum" Area="ColumnArea" Width="80" Caption="Monat" AllowedAreas="RowArea,FilterArea,ColumnArea" GroupInterval="DateMonth" />
<dxpg:PivotGridField x:Name="FlexibleWeek" FieldName="Datum" Area="ColumnArea" Width="80" Caption="Woche" AllowedAreas="RowArea,FilterArea,ColumnArea" GroupInterval="DateWeekOfYear" ValueFormat="KW {0}" />
<dxpg:PivotGridField x:Name="FlexibleTag" FieldName="Datum" Area="FilterArea" Width="40" Caption="Tag" AllowedAreas="RowArea,FilterArea,ColumnArea" GroupInterval="DateDay" />
</dxpg:PivotGridControl.Fields>
</dxpg:PivotGridControl>
</Grid>
</Grid>
</GroupBox>
</Grid>
</localView:BeWoView>

222
BeWo/View/Detail/Report/FlexibleReportView.xaml.cs Normal file
View File

@@ -0,0 +1,222 @@
using System;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using System.Text;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Input;
using System.Windows.Forms;
using BeWo.Controls;
using BeWo.Core;
using BeWo.ServiceProxy;
using BeWo.ViewModel;
using BS.Shared;
using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact;
using BS.Shared.Extensions;
using BS.Shared.Translation;
using DevExpress.Xpf.Core;
using DevExpress.Xpf.Printing;
using DevExpress.Xpf.PivotGrid;
namespace BeWo.View.Detail.Report
{
/// <summary>
/// Interaction logic for FlexibleReportView.xaml
/// </summary>
public partial class FlexibleReportView : BeWoView
{
public FlexibleReportView()
{
InitializeComponent();
FlexibleAnzahlMinIst.CellFormat = "{0:N0}";
FlexibleAnzahlStdIst.CellFormat = "{0:N2}";
FlexibleAnzahlMinSoll.CellFormat = "{0:N0}";
FlexibleAnzahlStdSoll.CellFormat = "{0:N2}";
FlexibleKlient.TotalValueFormat = "{0}";
FlexibleMitarbeiter.TotalValueFormat = "{0}";
FlexibleLeistung.TotalValueFormat = "{0}";
FlexibleLeistungskategorie.TotalValueFormat = "{0}";
datePickerStartDate.DateTime = new DateTime(DateTime.Now.Year, DateTime.Now.Month, 1);
datePickerEndDate.DateTime = new DateTime(DateTime.Now.Year, DateTime.Now.Month, 1).AddMonths(1).AddDays(-1);
}
private void buttonRefresh_Click(object sender, RoutedEventArgs e)
{
if (GridControl.Visibility == Visibility.Hidden)
GridControl.Visibility = Visibility.Visible;
var filter = new FlexibleReportFilterDC()
{
StartDatum = datePickerStartDate.DateTime,
EndDatum = datePickerEndDate.DateTime
};
ServiceFacade.DoOperationsServiceAsync(
s => s.GetAllFlexibleReportEntrys(filter),
r =>
{
this.Dispatch(delegate
{
var liste = new List<FlexibleReportEntry>();
foreach (var item in r)
{
liste.Add(FlexibleReportEntry.InitByFlexibleReportEntryDC(item));
}
GridControl.DataSource = liste;
});
});
}
private void GridControl_CustomCellDisplayText(object sender, PivotCellDisplayTextEventArgs e)
{
if (e.DataField.Name == "FlexibleAnzahlStdSoll")
{
if (e.RowField != null && (e.RowField.Name == "FlexibleLeistungskategorie" || e.RowField.Name == "FlexibleLeistung"))
{
e.DisplayText = "";
}
}
if (e.Value != null && decimal.TryParse(e.Value.ToString(), out decimal d) && d == 0)
e.DisplayText = "";
}
private void GridControl_CustomFieldValueCells(object sender, PivotCustomFieldValueCellsEventArgs e)
{
PivotGridControl pivot = (PivotGridControl)sender;
if (pivot.DataSource == null)
return;
// Iterates through all row headers.
for (int i = e.GetCellCount(false) - 1; i >= 0; i--)
{
var cell = e.GetCell(false, i);
if (cell == null)
continue;
if (cell.ValueType == FieldValueType.Total)
{
}
// If the current header corresponds to the "Employee B"
// field value, and is not the Total Row header,
// it is removed with all corresponding rows.
if (Equals(cell.Value, null) && cell.ValueType == FieldValueType.Value)
e.Remove(cell);
if (string.IsNullOrWhiteSpace(cell.DisplayText) && cell.ValueType == FieldValueType.Total)
e.Remove(cell);
}
}
}
public class FlexibleReportEntry
{
public string Customer { get; set; }
public string Employee { get; set; }
public string Team { get; set; }
public string Leistungskategorie { get; set; }
public string Leistung { get; set; }
public string SupportConcept { get; set; }
public decimal AnzahlMinutenIst { get; set; }
public decimal AnzahlStundenIst
{
get
{
return AnzahlMinutenIst / 60;
}
}
public decimal? AnzahlMinutenSoll { get; set; }
public decimal? AnzahlStundenSoll
{
get
{
if (EintraegeProTag == 0)
{
return AnzahlMinutenSoll / 60;
}
return AnzahlMinutenSoll / 60 / EintraegeProTag;
}
}
public DateTime Datum { get; set; }
public int EintraegeProTag { get; set; }
public FlexibleReportEntryType Type { get; set; }
public int? Kilometer { get; set; }
public static FlexibleReportEntry InitByFlexibleReportEntryDC(FlexibleReportEntryDC entryDC)
{
var returnValue = new FlexibleReportEntry()
{
AnzahlMinutenIst = entryDC.AnzahlMinuten,
Datum = entryDC.Datum,
//Klient = entryDC.Customer == null ? "<Nicht angegeben>" : string.Format("{0}, {1}", entryDC.Customer.LastName, entryDC.Customer.FirstName),
SupportConcept = entryDC.SupportConcept == null ? "<Nicht angegeben>" : string.Format("{0:dd.MM.yyyy} - {1:dd.MM.yyyy}", entryDC.SupportConcept.StartDate, entryDC.SupportConcept.EndDate),
Leistung = entryDC.Leistung,
Leistungskategorie = entryDC.Leistungskategorie,
//Mitarbeiter = entryDC.Employee == null ? "<Nicht angegeben>" : string.Format("{0}, {1}", entryDC.Employee.LastName, entryDC.Employee.FirstName),
Team = entryDC.Team,
AnzahlMinutenSoll = entryDC.AnzahlMinutenSoll,
EintraegeProTag = entryDC.EintraegeProTag,
Type = entryDC.Type,
Kilometer = entryDC.Kilometer
};
if (entryDC.Customer == null)
{
if (entryDC.Type == FlexibleReportEntryType.FullEntry)
{
returnValue.Customer = "<Nicht angegeben>";
}
else
{
returnValue.Customer = null;
}
}
else
{
returnValue.Customer = string.Format("{0}, {1}", entryDC.Customer.LastName, entryDC.Customer.FirstName);
}
if (entryDC.Employee == null)
{
if (entryDC.Type == FlexibleReportEntryType.FullEntry)
{
returnValue.Employee = "<Nicht angegeben>";
}
else
{
returnValue.Employee = null;
}
}
else
{
returnValue.Employee = string.Format("{0}, {1}", entryDC.Employee.LastName, entryDC.Employee.FirstName);
}
return returnValue;
}
}
}

50
BeWo/View/Detail/WordDocumentTemplateView.xaml.cs
View File

@@ -614,34 +614,34 @@ namespace BeWo.View.Detail
private void OpenSerienBrief(ViewDestination viewDestination, string pPath, FileAttachmentType fileType, FileAttachmentDC file = null)
{
var wp = new WordProcessor
{
DocumentPath = pPath,
CreateFormLetter = true
};
//var wp = new WordProcessor
// {
// DocumentPath = pPath,
// CreateFormLetter = true
// };
if (fileType.Equals(FileAttachmentType.CustomerTemplate))
{
wp.TableModel = new CustomerTableModel { Customers = new List<CustomerDC>() };
}
else if (fileType.Equals(FileAttachmentType.PersonTemplate))
{
wp.TableModel = new PersonTableModel {Persons = new List<PersonDC>()};
}
else if (fileType.Equals(FileAttachmentType.OrganisationTemplate))
{
wp.TableModel = new OrganisationTableModel {Organisations = new List<OrganisationDC>()};
}
else if (fileType.Equals(FileAttachmentType.SupportConceptTemplate))
{
wp.TableModel = new SupportConceptTableModel { SupportConcepts = new List<SupportConceptDC>() };
}
//if (fileType.Equals(FileAttachmentType.CustomerTemplate))
//{
// wp.TableModel = new CustomerTableModel { Customers = new List<CustomerDC>() };
//}
//else if (fileType.Equals(FileAttachmentType.PersonTemplate))
//{
// wp.TableModel = new PersonTableModel {Persons = new List<PersonDC>()};
//}
//else if (fileType.Equals(FileAttachmentType.OrganisationTemplate))
//{
// wp.TableModel = new OrganisationTableModel {Organisations = new List<OrganisationDC>()};
//}
//else if (fileType.Equals(FileAttachmentType.SupportConceptTemplate))
//{
// wp.TableModel = new SupportConceptTableModel { SupportConcepts = new List<SupportConceptDC>() };
//}
if(viewDestination.Equals(ViewDestination.Edit) && file != null)
wp.FileAttachment = file;
//if(viewDestination.Equals(ViewDestination.Edit) && file != null)
// wp.FileAttachment = file;
wp.TemplateView = this;
wp.CreateReport(viewDestination, null, null);
//wp.TemplateView = this;
//wp.CreateReport(viewDestination, null, null);
}
}
}

1
BeWo/View/Master/AdministrationView.xaml
View File

@@ -73,6 +73,7 @@
<TabItem Header="Dokumentationsfelder" Name="tabitem_dokumenttype" Selector.Selected="tabitem_dokumenttype_Selected" />
<TabItem Header="{markup:Translate Schulbegleitender Dienst}" Name="tabitem_sbd" Selector.Selected="tabitem_sbd_Selected" />
<TabItem Header="{markup:Translate Vertragsarten}" Name="tabitem_contracttypes" Selector.Selected="tabitem_contracttypes_Selected" />
<TabItem Header="Budgets" Name="tabitem_Budgets" Selector.Selected="tabitem_Budgets_Selected" />
</TabControl>
</ScrollViewer>
<Border Grid.Row="2" Grid.ColumnSpan="3" Height="40" Margin="0,0,0,0" VerticalAlignment="Stretch"

10
BeWo/View/Master/AdministrationView.xaml.cs
View File

@@ -455,5 +455,13 @@ namespace BeWo.View.Master
VMFactory.CreateValueListVMAsync(ValueListEntryType.QualifikationsBedarf, r => this.Dispatch(() => AddView(tabitem_qualifikationsbedarf, new ValueListView(r))));
}
}
}
private void tabitem_Budgets_Selected(object sender, RoutedEventArgs e)
{
if (!_OpenViews.ContainsKey(tabitem_Budgets) || _SavePerformed)
{
VMFactory.CreateBudgetListVMAsync(r => this.Dispatch(() => AddView(tabitem_Budgets, new BudgetView(r))));
}
}
}
}

7
BeWo/View/Master/ReportView.xaml
View File

@@ -35,12 +35,13 @@
<TabItem Header="{markup:Translate Berichte}" IsSelected="True" Name="tabitem_queries" Selector.Selected="tabitem_queries_Selected" />
<!--<TabItem Header="Abrechnung" IsSelected="True" Name="tabitem_accountingreport" Selector.Selected="tabitem_accountingreport_Selected" />-->
<TabItem Header="{markup:Translate Stundenübersicht}" Name="tabitem_flsReport" Selector.Selected="tabitem_flsReport_Selected" />
<TabItem Header="{markup:Translate Mitarbeiterauswertung}" Name="tabitem_Mitarbeiter" Selector.Selected="tabitem_Mitarbeiter_Selected"/>
<TabItem Header="{markup:Translate Mitarbeiterauslastung}" Name="tabitem_maReport" Selector.Selected="tabitem_maReport_Selected"/>
<TabItem Header="{markup:Translate Mitarbeiterauswertung}" Name="tabitem_Mitarbeiter" Selector.Selected="tabitem_Mitarbeiter_Selected"/>
<TabItem Header="{markup:Translate Mitarbeiterauslastung}" Name="tabitem_maReport" Selector.Selected="tabitem_maReport_Selected"/>
<TabItem Header="{markup:Translate Mitarbeiterstundenkonto}" Name="tabitem_makonto" Selector.Selected="tabitem_maKonto_Selected"/>
<TabItem Header="{markup:Translate Hilfeplanübersicht}" Name="tabitem_supportConceptAnalysis" Selector.Selected="tabitem_supportConceptAnalysis_Selected" />
<TabItem Header="{markup:Translate Jahresbericht}" Name="tabitem_annualReport" Selector.Selected="tabitem_annualReport_Selected" />
<TabItem Header="{markup:Translate Jahresbericht}" Name="tabitem_annualReport" Selector.Selected="tabitem_annualReport_Selected" />
<TabItem Header="{markup:Translate Quittierungsbelege}" Name="tabitem_serviceOverview" Selector.Selected="tabitem_serviceOverview_Selected" />
<TabItem Header="{markup:Translate Flexibler Bericht}" Name="tabitem_flexibleReport" Selector.Selected="tabitem_flexibleReport_Selected" />
<!--<TabItem Header="Spitzabrechnung" Name="tabitem_settlement" Selector.Selected="tabitem_settlement_Selected"/>-->
</TabControl>

12
BeWo/View/Master/ReportView.xaml.cs
View File

@@ -200,8 +200,18 @@ namespace BeWo.View.Master
this.Show(this.tabitem_serviceOverview);
}
private void tabitem_flexibleReport_Selected(object sender, RoutedEventArgs e)
{
if (!this._OpenViews.ContainsKey(this.tabitem_flexibleReport))
{
this._OpenViews[this.tabitem_flexibleReport] = new FlexibleReportView();
}
private void tabitem_supportConceptAnalysis_Selected(object sender, RoutedEventArgs e)
this.Show(this.tabitem_flexibleReport);
}
private void tabitem_supportConceptAnalysis_Selected(object sender, RoutedEventArgs e)
{
if (!this._OpenViews.ContainsKey(this.tabitem_supportConceptAnalysis))
{

197
BeWo/ViewModel/BudgetVM.cs Normal file
View File

@@ -0,0 +1,197 @@
using BS.Shared;
using BS.Shared.DataContracts;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace BeWo.ViewModel
{
public class BudgetVM : AbstractDCMapperVM<BudgetDC>
{
public long? _BudgetOid;
public ActivationTypeId _BudgetIsActive;
public string _BudgetNotice;
public DateTime? _BudgetInsTs;
public string _BudgetInsUser;
public long? _BudgetVersion;
public string _BudgetUdpUser;
public SystemEntryID? _BudgetSystemEntryID;
public string _Name;
public decimal? _Betragshoehe;
public BudgetVM(BudgetDC budgetDC) : base(budgetDC, budgetDC.BudgetOid == null)
{ }
public long? BudgetOid
{
get { return _BudgetOid; }
set
{
if (AreDifferent(_BudgetOid, value))
{
_BudgetOid = value;
StoreDirtyInformation(AreDifferent(DataContract.BudgetOid, value), nameof(_BudgetOid));
FirePropertyChanged(nameof(_BudgetOid));
}
}
}
public ActivationTypeId BudgetIsActive
{
get { return _BudgetIsActive; }
set
{
if (AreDifferent(_BudgetIsActive, value))
{
_BudgetIsActive = value;
StoreDirtyInformation(AreDifferent(DataContract.BudgetIsActive, value), nameof(_BudgetIsActive));
FirePropertyChanged(nameof(_BudgetIsActive));
}
}
}
public string BudgetNotice
{
get { return _BudgetNotice; }
set
{
if (AreDifferent(_BudgetNotice, value))
{
_BudgetNotice = value;
StoreDirtyInformation(AreDifferent(DataContract.BudgetNotice, value), nameof(_BudgetNotice));
FirePropertyChanged(nameof(_BudgetNotice));
}
}
}
public DateTime? BudgetInsTs
{
get { return _BudgetInsTs; }
set
{
if (AreDifferent(_BudgetInsTs, value))
{
_BudgetInsTs = value;
StoreDirtyInformation(AreDifferent(DataContract.BudgetInsTs, value), nameof(_BudgetInsTs));
FirePropertyChanged(nameof(_BudgetInsTs));
}
}
}
public string BudgetInsUser
{
get { return _BudgetInsUser; }
set
{
if (AreDifferent(_BudgetInsUser, value))
{
_BudgetInsUser = value;
StoreDirtyInformation(AreDifferent(DataContract.BudgetInsUser, value), nameof(_BudgetInsUser));
FirePropertyChanged(nameof(_BudgetInsUser));
}
}
}
public long? BudgetVersion
{
get { return _BudgetVersion; }
set
{
if (AreDifferent(_BudgetVersion, value))
{
_BudgetVersion = value;
StoreDirtyInformation(AreDifferent(DataContract.BudgetVersion, value), nameof(_BudgetVersion));
FirePropertyChanged(nameof(_BudgetVersion));
}
}
}
public string BudgetUdpUser
{
get { return _BudgetUdpUser; }
set
{
if (AreDifferent(_BudgetUdpUser, value))
{
_BudgetUdpUser = value;
StoreDirtyInformation(AreDifferent(DataContract.BudgetUdpUser, value), nameof(_BudgetUdpUser));
FirePropertyChanged(nameof(_BudgetUdpUser));
}
}
}
public SystemEntryID? BudgetSystemEntryID
{
get { return _BudgetSystemEntryID; }
set
{
if (AreDifferent(_BudgetSystemEntryID, value))
{
_BudgetSystemEntryID = value;
StoreDirtyInformation(AreDifferent(DataContract.BudgetSystemEntryID, value), nameof(_BudgetSystemEntryID));
FirePropertyChanged(nameof(_BudgetSystemEntryID));
}
}
}
public string Name
{
get { return _Name; }
set
{
if (AreDifferent(_Name, value))
{
_Name = value;
StoreDirtyInformation(AreDifferent(DataContract.Name, value), nameof(_Name));
FirePropertyChanged(nameof(_Name));
}
}
}
public decimal? Betragshoehe
{
get { return _Betragshoehe; }
set
{
if (AreDifferent(_Betragshoehe, value))
{
_Betragshoehe = value;
StoreDirtyInformation(AreDifferent(DataContract.Betragshoehe, value), nameof(_Betragshoehe));
FirePropertyChanged(nameof(_Betragshoehe));
}
}
}
protected override void InitByDataContract(BudgetDC bDataContract)
{
_BudgetOid = bDataContract.BudgetOid;
_BudgetIsActive = bDataContract.BudgetIsActive;
_BudgetNotice = bDataContract.BudgetNotice;
_BudgetInsTs = bDataContract.BudgetInsTs;
_BudgetInsUser = bDataContract.BudgetInsUser;
_BudgetVersion = bDataContract.BudgetVersion;
_BudgetUdpUser = bDataContract.BudgetUdpUser;
_BudgetSystemEntryID = bDataContract.BudgetSystemEntryID;
Name = bDataContract.Name;
Betragshoehe = bDataContract.Betragshoehe;
}
protected override BudgetDC MapToDataContract(BudgetDC bDataContract, bool doCommit)
{
bDataContract.BudgetOid = _BudgetOid;
bDataContract.BudgetIsActive = _BudgetIsActive;
bDataContract.BudgetNotice = _BudgetNotice;
bDataContract.BudgetInsTs = _BudgetInsTs;
bDataContract.BudgetInsUser = _BudgetInsUser;
bDataContract.BudgetVersion = _BudgetVersion;
bDataContract.BudgetUdpUser = _BudgetUdpUser;
bDataContract.BudgetSystemEntryID = _BudgetSystemEntryID;
bDataContract.Name = _Name;
bDataContract.Betragshoehe = _Betragshoehe;
return bDataContract;
}
}
}

80
BeWo/ViewModel/CustomerVM.cs
View File

@@ -101,18 +101,18 @@ namespace BeWo.ViewModel
public static string PropertyName_Wohnheimbuchungen = "Wohnheimbuchungen";
public static string PropertyName_Pflegegrad = "Pflegegrad";
public static string PropertyName_CustomerImage = "CustomerImage";
public static string PropertyName_Nationalitaet = "Nationalitaet";
public static string PropertyName_AufenthaltsStatus = "AufenthaltsStatus";
public static string PropertyName_Nationalitaet = "Nationalitaet";
public static string PropertyName_AufenthaltsStatus = "AufenthaltsStatus";
public static string PropertyName_VertretungGewuenscht = "VertretungGewuenscht";
public static string PropertyName_AbWelchemKrankheitsTag = "AbWelchemKrankheitsTag";
public static string PropertyName_VertretungDringendErforderlich = "VertretungDringendErforderlich";
public static string PropertyName_Pflege = "Pflege";
public static string PropertyName_Toilettengang = "Toilettengang";
public static string PropertyName_Aggressiv = "Aggressiv";
public static string PropertyName_Schutzstufe = "Schutzstufe";
public static string PropertyName_Hygienebelehrung = "Hygienebelehrung";
public static string PropertyName_Pflege = "Pflege";
public static string PropertyName_Toilettengang = "Toilettengang";
public static string PropertyName_Aggressiv = "Aggressiv";
public static string PropertyName_Schutzstufe = "Schutzstufe";
public static string PropertyName_Hygienebelehrung = "Hygienebelehrung";
public static string PropertyName_ActivationType = "ActivationType";
public static string PropertyName_Arbeitszeiten = "Arbeitszeiten";
public static string PropertyName_Arbeitszeiten = "Arbeitszeiten";
#endregion
private readonly ObservableSortCollection<ValueListEntryDC> _PossibleCustomerCareTypes;
@@ -151,7 +151,7 @@ namespace BeWo.ViewModel
private string _InvoiceAddressTown;
private bool _IsAdvised;
private bool _IsArchived;
private bool _IsMigrant;
private bool _IsMigrant;
private bool _IsAttended;
private bool _IsFemale;
private bool _IsMale;
@@ -161,6 +161,7 @@ namespace BeWo.ViewModel
private string _LastName;
private StringBuilder _Log;
private string _Medication;
private string _Migrationshintergrund;
private string _MobilePhone;
private string _Notice;
private string _Phone;
@@ -194,18 +195,18 @@ namespace BeWo.ViewModel
private bool _VertretungGewuenscht;
private int _AbWelchemKrankheitsTag;
private bool _VertretungDringendErforderlich;
private bool _Pflege;
private bool _Toilettengang;
private bool _Aggressiv;
private bool _Hygienebelehrung;
private String _Schutzstufe;
private bool _Pflege;
private bool _Toilettengang;
private bool _Aggressiv;
private bool _Hygienebelehrung;
private String _Schutzstufe;
private ActivationTypeId _ActivationType;
private ArbeitszeitListVM _ArbeitszeitListe;
private ArbeitszeitListVM _ArbeitszeitListe;
private ValueListEntryDC _Nationalitaet;
private ValueListEntryDC _Nationalitaet;
private ObservableSortCollection<ValueListEntryDC> _Nationalitaeten;
private ValueListEntryDC _AufenthaltsStatus;
private ValueListEntryDC _AufenthaltsStatus;
private ObservableSortCollection<ValueListEntryDC> _AufenthaltsStatuse;
private ObservableSortCollection<ValueListEntryDC> _RoleInFamilys;
@@ -911,6 +912,23 @@ namespace BeWo.ViewModel
}
}
public string Migrationshintergrund
{
get { return this._Migrationshintergrund; }
set
{
if (this.AreDifferent(this._Migrationshintergrund, value))
{
this._Migrationshintergrund = value;
this.StoreDirtyInformation(this.AreDifferent(this.DataContract.Migrationshintergrund, value), nameof(_Migrationshintergrund));
this.FirePropertyChanged(nameof(_Migrationshintergrund));
}
}
}
public string Notice
{
get { return _Notice; }
@@ -1702,14 +1720,15 @@ namespace BeWo.ViewModel
_Pflegegrad = pDataContract.Pflegegrad;
_Nationalitaet = pDataContract.Nationalitaet;
_AufenthaltsStatus = pDataContract.AufenthaltsStatus;
_VertretungGewuenscht = pDataContract.VertretungGewuenscht;
_AbWelchemKrankheitsTag = pDataContract.AbWelchemKrankheitsTag;
_VertretungDringendErforderlich = pDataContract.VertretungDringendErforderlich;
_Pflege = pDataContract.Pflege;
_Toilettengang = pDataContract.Toilettengang;
_Aggressiv = pDataContract.Aggressiv;
_Schutzstufe = pDataContract.Schutzstufe;
_Hygienebelehrung = pDataContract.Hygienebelehrung;
_VertretungGewuenscht = pDataContract.VertretungGewuenscht;
_AbWelchemKrankheitsTag = pDataContract.AbWelchemKrankheitsTag;
_VertretungDringendErforderlich = pDataContract.VertretungDringendErforderlich;
_Pflege = pDataContract.Pflege;
_Toilettengang = pDataContract.Toilettengang;
_Aggressiv = pDataContract.Aggressiv;
_Schutzstufe = pDataContract.Schutzstufe;
_Hygienebelehrung = pDataContract.Hygienebelehrung;
_Migrationshintergrund = pDataContract.Migrationshintergrund;
if (pDataContract.Images != null && pDataContract.Images.Count > 0)
@@ -1877,11 +1896,12 @@ namespace BeWo.ViewModel
pDataContract.VertretungGewuenscht = _VertretungGewuenscht;
pDataContract.AbWelchemKrankheitsTag = _AbWelchemKrankheitsTag;
pDataContract.VertretungDringendErforderlich = _VertretungDringendErforderlich;
pDataContract.Pflege = _Pflege;
pDataContract.Toilettengang = _Toilettengang;
pDataContract.Aggressiv = _Aggressiv;
pDataContract.Schutzstufe = _Schutzstufe;
pDataContract.Hygienebelehrung = _Hygienebelehrung;
pDataContract.Pflege = _Pflege;
pDataContract.Toilettengang = _Toilettengang;
pDataContract.Aggressiv = _Aggressiv;
pDataContract.Schutzstufe = _Schutzstufe;
pDataContract.Hygienebelehrung = _Hygienebelehrung;
pDataContract.Migrationshintergrund = _Migrationshintergrund;
if (_MerkzeichenListe != null)
{

660
BeWo/ViewModel/EmployeeVM.cs
View File

@@ -20,137 +20,144 @@ namespace BeWo.ViewModel
{
#region Property Names
public static string PropertyName_Abbreviation = "Abbreviation";
public static string PropertyName_AbsenceTimes = "AbsenceTimes";
public static string PropertyName_AccountNumber = "AccountNumber";
public static string PropertyName_BankCode = "BankCode";
public static string PropertyName_BankName = "BankName";
public static string PropertyName_Bic = "Bic";
public static string PropertyName_CancellationPeriod = "CancellationPeriod";
public static string PropertyName_Contracts = "Contracts";
public static string PropertyName_CustomerRelations = "CustomerRelations";
public static string PropertyName_DateOfBirth = "DateOfBirth";
public static string PropertyName_EMail = "EMail";
public static string PropertyName_EmploymentType = "EmploymentType";
public static string PropertyName_EntryDate = "EntryDate";
public static string PropertyName_FamilyStatus = "FamilyStatus";
public static string PropertyName_Fax = "Fax";
public static string PropertyName_Female = "IsFemale";
public static string PropertyName_FirstName = "FirstName";
public static string PropertyName_Focuses = "Focuses";
public static string PropertyName_Gender = "Gender";
public static string PropertyName_HealthInsurance = "HealthInsurance";
public static string PropertyName_HourlyRate = "HourlyRate";
public static string PropertyName_IBAN = "IBAN";
public static string PropertyName_InsuranceNumber = "InsuranceNumber";
public static string PropertyName_IsArchived = "IsArchived";
public static string PropertyName_IsMarried = "IsMarried";
public static string PropertyName_IsQualified = "IsQualified";
public static string PropertyName_IsSingle = "IsSingle";
public static string PropertyName_LastName = "LastName";
public static string PropertyName_LeaveDays = "LeaveDays";
public static string PropertyName_Male = "IsMale";
public static string PropertyName_MobilePhone = "MobilePhone";
public static string PropertyName_Notice2 = "Notice2";
public static string PropertyName_Overtimes = "Overtimes";
public static string PropertyName_PersonnelNumber = "PersonnelNumber";
public static string PropertyName_Phone = "Phone";
public static string PropertyName_Abbreviation = "Abbreviation";
public static string PropertyName_AbsenceTimes = "AbsenceTimes";
public static string PropertyName_AccountNumber = "AccountNumber";
public static string PropertyName_BankCode = "BankCode";
public static string PropertyName_BankName = "BankName";
public static string PropertyName_Bic = "Bic";
public static string PropertyName_CancellationPeriod = "CancellationPeriod";
public static string PropertyName_Contracts = "Contracts";
public static string PropertyName_CustomerRelations = "CustomerRelations";
public static string PropertyName_DateOfBirth = "DateOfBirth";
public static string PropertyName_EMail = "EMail";
public static string PropertyName_EmploymentType = "EmploymentType";
public static string PropertyName_EntryDate = "EntryDate";
public static string PropertyName_FamilyStatus = "FamilyStatus";
public static string PropertyName_Fax = "Fax";
public static string PropertyName_Female = "IsFemale";
public static string PropertyName_FirstName = "FirstName";
public static string PropertyName_Focuses = "Focuses";
public static string PropertyName_Gender = "Gender";
public static string PropertyName_HealthInsurance = "HealthInsurance";
public static string PropertyName_HourlyRate = "HourlyRate";
public static string PropertyName_IBAN = "IBAN";
public static string PropertyName_InsuranceNumber = "InsuranceNumber";
public static string PropertyName_IsArchived = "IsArchived";
public static string PropertyName_IsMarried = "IsMarried";
public static string PropertyName_IsQualified = "IsQualified";
public static string PropertyName_IsSingle = "IsSingle";
public static string PropertyName_LastName = "LastName";
public static string PropertyName_LeaveDays = "LeaveDays";
public static string PropertyName_Male = "IsMale";
public static string PropertyName_MobilePhone = "MobilePhone";
public static string PropertyName_Nationalitaet = "Nationalitaet";
public static string PropertyName_Notice2 = "Notice2";
public static string PropertyName_Overtimes = "Overtimes";
public static string PropertyName_PersonnelNumber = "PersonnelNumber";
public static string PropertyName_Phone = "Phone";
public static string PropertyName_PossibleEmploymentTypes = "PossibleEmploymentTypes";
public static string PropertyName_PostalCode = "PostalCode";
public static string PropertyName_PrivateEMail = "PrivateEMail";
public static string PropertyName_ProbationPeriod = "ProbationPeriod";
public static string PropertyName_WeeklyDays = "WeeklyDays";
public static string PropertyName_Profession = "Profession";
public static string PropertyName_Qualifications = "Qualifications";
public static string PropertyName_Street = "Street";
public static string PropertyName_TaxNumber = "TaxNumber";
public static string PropertyName_Text1 = "Text1";
public static string PropertyName_Text2 = "Text2";
public static string PropertyName_Text3 = "Text3";
public static string PropertyName_Text4 = "Text4";
public static string PropertyName_Text5 = "Text5";
public static string PropertyName_Town = "Town";
public static string PropertyName_WeeklyFLS = "WeeklyFLS";
public static string PropertyName_WeeklyTotalHours = "WeeklyTotalHours";
public static string PropertyName_MonthlyTotalHours = "MonthlyTotalHours";
public static String PropertyName_EmployeeColor = "EmployeeColor";
public static String PropertyName_EmployeeBrush = "EmployeeBrush";
public static string PropertyName_EmployeeImage = "EmployeeImage";
public static string PropertyName_Arbeitszeiten = "Arbeitszeiten";
public static string PropertyName_Pflege = "Pflege";
public static string PropertyName_Toilettengang = "Toilettengang";
public static string PropertyName_Aggressiv = "Aggressiv";
public static string PropertyName_Schutzstufe = "Schutzstufe";
public static string PropertyName_Hygienebelehrung = "Hygienebelehrung";
public static string PropertyName_VarFields = "VarFields";
public static string PropertyName_PostalCode = "PostalCode";
public static string PropertyName_PrivateEMail = "PrivateEMail";
public static string PropertyName_ProbationPeriod = "ProbationPeriod";
public static string PropertyName_WeeklyDays = "WeeklyDays";
public static string PropertyName_Profession = "Profession";
public static string PropertyName_Qualifications = "Qualifications";
public static string PropertyName_Street = "Street";
public static string PropertyName_TaxNumber = "TaxNumber";
public static string PropertyName_Text1 = "Text1";
public static string PropertyName_Text2 = "Text2";
public static string PropertyName_Text3 = "Text3";
public static string PropertyName_Text4 = "Text4";
public static string PropertyName_Text5 = "Text5";
public static string PropertyName_Town = "Town";
public static string PropertyName_WeeklyFLS = "WeeklyFLS";
public static string PropertyName_WeeklyTotalHours = "WeeklyTotalHours";
public static string PropertyName_MonthlyTotalHours = "MonthlyTotalHours";
public static String PropertyName_EmployeeColor = "EmployeeColor";
public static String PropertyName_EmployeeBrush = "EmployeeBrush";
public static string PropertyName_EmployeeImage = "EmployeeImage";
public static string PropertyName_Arbeitszeiten = "Arbeitszeiten";
public static string PropertyName_Pflege = "Pflege";
public static string PropertyName_Toilettengang = "Toilettengang";
public static string PropertyName_Aggressiv = "Aggressiv";
public static string PropertyName_Schutzstufe = "Schutzstufe";
public static string PropertyName_Hygienebelehrung = "Hygienebelehrung";
public static string PropertyName_VarFields = "VarFields";
#endregion
#endregion
private readonly ObservableSortCollection<ValueListEntryDC> _PossibleFocuses;
private readonly ObservableSortCollection<ValueListEntryDC> _PossibleQualifications;
private string _Abbreviation;
private AbsenceTimeListVM _AbsenceTimes;
private string _AccountNumber;
private string _BankCode;
private string _BankName;
private string _Bic;
private ContractListVM _Contracts;
private CustomerEmployeeRelationListVM _CustomerRelations;
private DateTime? _DateOfBirth;
private string _EMail;
private FamilyStatus? _FamilyStatus;
private string _Fax;
private string _FirstName;
private readonly ObservableSortCollection<ValueListEntryDC> _PossibleFocuses;
private readonly ObservableSortCollection<ValueListEntryDC> _PossibleQualifications;
private string _Abbreviation;
private AbsenceTimeListVM _AbsenceTimes;
private string _AccountNumber;
private string _BankCode;
private string _BankName;
private string _Bic;
private ContractListVM _Contracts;
private CustomerEmployeeRelationListVM _CustomerRelations;
private DateTime? _DateOfBirth;
private string _EMail;
private FamilyStatus? _FamilyStatus;
private string _Fax;
private string _FirstName;
private ObservableSortCollection<ValueListEntryDC> _Focuses;
private string _HealthInsurance;
private string _IBAN;
private string _InsuranceNumber;
private bool _IsArchived;
private bool _IsFemale;
private bool _IsMale;
private bool _IsQualified = true;
private string _LastName;
private string _MobilePhone;
private string _Notice2;
private OvertimeListVM _Overtimes;
private string _PersonnelNumber;
private string _Phone;
private IList<AuszahlungsartDC> _PossibleAuszahlungsarten;
private IList<EmploymentTypeDC> _PossibleEmploymentTypes;
private string _PostalCode;
private string _PrivateEMail;
private string _Profession;
private string _HealthInsurance;
private string _IBAN;
private string _InsuranceNumber;
private bool _IsArchived;
private bool _IsFemale;
private bool _IsMale;
private bool _IsQualified = true;
private string _LastName;
private string _MobilePhone;
private string _Notice2;
private OvertimeListVM _Overtimes;
private string _PersonnelNumber;
private string _Phone;
private IList<AuszahlungsartDC> _PossibleAuszahlungsarten;
private IList<EmploymentTypeDC> _PossibleEmploymentTypes;
private string _PostalCode;
private string _PrivateEMail;
private string _Profession;
private ObservableSortCollection<ValueListEntryDC> _Qualifications;
private Sex? _Sex;
private string _Street;
private string _TaxNumber;
private string _Text1;
private string _Text2;
private string _Text3;
private string _Text4;
private string _Text5;
private string _Town;
private String _EmployeeColor;
private SolidColorBrush _EmployeeBrush;
private byte[] _EmployeeImage;
private bool _Pflege;
private bool _Toilettengang;
private bool _Aggressiv;
private bool _Hygienebelehrung;
private String _Schutzstufe;
private ArbeitszeitListVM _ArbeitszeitListe;
private VarFieldListVM _VarFields;
private Sex? _Sex;
private string _Street;
private string _TaxNumber;
private string _Text1;
private string _Text2;
private string _Text3;
private string _Text4;
private string _Text5;
private string _Town;
private String _EmployeeColor;
private SolidColorBrush _EmployeeBrush;
private byte[] _EmployeeImage;
private bool _Pflege;
private bool _Toilettengang;
private bool _Aggressiv;
private bool _Hygienebelehrung;
private String _Schutzstufe;
private ArbeitszeitListVM _ArbeitszeitListe;
private VarFieldListVM _VarFields;
public EmployeeVM(
EmployeeDC pEmployeeDC, IList<EmploymentTypeDC> pPossibleTypes, IEnumerable<ValueListEntryDC> pPossibleQualifications,
private ValueListEntryDC _Nationalitaet;
private ObservableSortCollection<ValueListEntryDC> _Nationalitaeten;
public EmployeeVM(
EmployeeDC pEmployeeDC, IList<EmploymentTypeDC> pPossibleTypes, IEnumerable<ValueListEntryDC> pValueList, IEnumerable<ValueListEntryDC> pPossibleQualifications,
IEnumerable<ValueListEntryDC> pPossibleFocusTypes, IEnumerable<AuszahlungsartDC> pPossibleAuszahlungsarten, List<ValueListEntryDC> allContractTypes, List<CostRatePeriodDC> allHourlyRateCostRatePeriods)
: base(pEmployeeDC, pEmployeeDC.EmployeeOid == null)
{
_PossibleEmploymentTypes = pPossibleTypes;
var possibleNationalitaeten = pValueList.Where(vle => vle.Type == ValueListEntryType.Nationality);
_Nationalitaeten = new ObservableSortCollection<ValueListEntryDC>(possibleNationalitaeten, Comparer.ValueListEntryDCComparer);
Contracts = new ContractListVM(_PossibleEmploymentTypes, allContractTypes, allHourlyRateCostRatePeriods, DataContract.Contracts ?? (DataContract.Contracts = new List<ContractDC>()));
Arbeitszeiten = new ArbeitszeitListVM(DataContract.Arbeitszeiten);
Arbeitszeiten = new ArbeitszeitListVM(DataContract.Arbeitszeiten);
_PossibleQualifications = DataContract.Qualifications != null
? new ObservableSortCollection<ValueListEntryDC>(pPossibleQualifications.Except(DataContract.Qualifications), Comparer.ValueListEntryDCComparer)
: new ObservableSortCollection<ValueListEntryDC>(pPossibleQualifications, Comparer.ValueListEntryDCComparer);
@@ -161,23 +168,23 @@ namespace BeWo.ViewModel
_PossibleAuszahlungsarten = new List<AuszahlungsartDC>(pPossibleAuszahlungsarten);
if(EmployeeBrush != null)
{
EmployeeBrush.Freeze();
}
if (EmployeeBrush != null)
{
EmployeeBrush.Freeze();
}
}
public List<SolidColorBrush> AllBrushes
{
get
{
var lTemp = typeof(Color).GetProperties(BindingFlags.GetProperty | BindingFlags.Public | BindingFlags.Static).Select(pi => (Color)pi.GetGetMethod().Invoke(null, null)).ToList();
public List<SolidColorBrush> AllBrushes
{
get
{
var lTemp = typeof(Color).GetProperties(BindingFlags.GetProperty | BindingFlags.Public | BindingFlags.Static).Select(pi => (Color)pi.GetGetMethod().Invoke(null, null)).ToList();
lTemp.Sort((x, y) => x.GetBrightness().CompareTo(y.GetBrightness()));
lTemp.Sort((x, y) => x.GetBrightness().CompareTo(y.GetBrightness()));
return lTemp.Where(w => (w.R * 0.299 + w.G * 0.587 + w.B * .114) > 75).Select(c => new SolidColorBrush(System.Windows.Media.Color.FromArgb(c.A, c.R, c.G, c.B))).ToList();
}
}
return lTemp.Where(w => (w.R * 0.299 + w.G * 0.587 + w.B * .114) > 75).Select(c => new SolidColorBrush(System.Windows.Media.Color.FromArgb(c.A, c.R, c.G, c.B))).ToList();
}
}
public bool IsArchived
{
@@ -213,21 +220,21 @@ namespace BeWo.ViewModel
}
}
public SolidColorBrush EmployeeBrush
{
get { return _EmployeeBrush; }
public SolidColorBrush EmployeeBrush
{
get { return _EmployeeBrush; }
set
{
if (AreDifferent(_EmployeeBrush, value))
{
_EmployeeBrush = value;
_EmployeeColor = value.ToString();
StoreDirtyInformation(AreDifferent(DataContract.EmployeeColor, value.ToString()), PropertyName_EmployeeBrush);
FirePropertyChanged(PropertyName_EmployeeBrush);
}
}
}
set
{
if (AreDifferent(_EmployeeBrush, value))
{
_EmployeeBrush = value;
_EmployeeColor = value.ToString();
StoreDirtyInformation(AreDifferent(DataContract.EmployeeColor, value.ToString()), PropertyName_EmployeeBrush);
FirePropertyChanged(PropertyName_EmployeeBrush);
}
}
}
public AbsenceTimeListVM AbsenceTimes
{
@@ -275,16 +282,16 @@ namespace BeWo.ViewModel
}
}
public ArbeitszeitListVM Arbeitszeiten
{
get { return _ArbeitszeitListe; }
public ArbeitszeitListVM Arbeitszeiten
{
get { return _ArbeitszeitListe; }
set
{
_ArbeitszeitListe = value;
FirePropertyChanged(PropertyName_Arbeitszeiten);
}
}
set
{
_ArbeitszeitListe = value;
FirePropertyChanged(PropertyName_Arbeitszeiten);
}
}
public ContractVM LastContract
{
@@ -621,8 +628,8 @@ namespace BeWo.ViewModel
{
get
{
return base.IsDirty || (CustomerRelations != null && CustomerRelations.IsDirty)
|| (_AbsenceTimes != null && _AbsenceTimes.IsDirty) || (_Contracts != null && _Contracts.IsDirty) || (_Overtimes != null && _Overtimes.IsDirty) || (_ArbeitszeitListe != null && _ArbeitszeitListe.IsDirty) || (_VarFields != null &&_VarFields.IsDirty);
return base.IsDirty || (CustomerRelations != null && CustomerRelations.IsDirty)
|| (_AbsenceTimes != null && _AbsenceTimes.IsDirty) || (_Contracts != null && _Contracts.IsDirty) || (_Overtimes != null && _Overtimes.IsDirty) || (_ArbeitszeitListe != null && _ArbeitszeitListe.IsDirty) || (_VarFields != null && _VarFields.IsDirty);
}
}
@@ -736,6 +743,37 @@ namespace BeWo.ViewModel
}
}
public ValueListEntryDC Nationalitaet
{
get { return this._Nationalitaet; }
set
{
if (this.AreDifferent(this._Nationalitaet, value))
{
this._Nationalitaet = value;
this.StoreDirtyInformation(this.AreDifferent(DataContract.Nationalitaet, value), PropertyName_Nationalitaet);
this.FirePropertyChanged(PropertyName_Nationalitaet);
}
}
}
public ObservableSortCollection<ValueListEntryDC> Nationalitaeten
{
get
{
if (_Nationalitaeten == null)
{
this._Nationalitaeten = new ObservableSortCollection<ValueListEntryDC>();
}
return this._Nationalitaeten;
}
}
public string PersonnelNumber
{
get { return _PersonnelNumber; }
@@ -1049,111 +1087,111 @@ namespace BeWo.ViewModel
}
}
public Byte[] EmployeeImage
{
get { return _EmployeeImage; }
public Byte[] EmployeeImage
{
get { return _EmployeeImage; }
set
{
if (AreDifferent(_EmployeeImage, value))
{
_EmployeeImage = value;
StoreDirtyInformation(AreDifferent(DataContract.Images, value), PropertyName_EmployeeImage);
FirePropertyChanged(PropertyName_EmployeeImage);
}
}
}
set
{
if (AreDifferent(_EmployeeImage, value))
{
_EmployeeImage = value;
StoreDirtyInformation(AreDifferent(DataContract.Images, value), PropertyName_EmployeeImage);
FirePropertyChanged(PropertyName_EmployeeImage);
}
}
}
public bool Pflege
{
get { return _Pflege; }
public bool Pflege
{
get { return _Pflege; }
set
{
if (AreDifferent(_Pflege, value))
{
_Pflege = value;
StoreDirtyInformation(AreDifferent(DataContract.Pflege, value), PropertyName_Pflege);
FirePropertyChanged(PropertyName_Pflege);
}
}
}
set
{
if (AreDifferent(_Pflege, value))
{
_Pflege = value;
StoreDirtyInformation(AreDifferent(DataContract.Pflege, value), PropertyName_Pflege);
FirePropertyChanged(PropertyName_Pflege);
}
}
}
public bool Toilettengang
{
get { return _Toilettengang; }
public bool Toilettengang
{
get { return _Toilettengang; }
set
{
if (AreDifferent(_Toilettengang, value))
{
_Toilettengang = value;
StoreDirtyInformation(AreDifferent(DataContract.Toilettengang, value), PropertyName_Toilettengang);
FirePropertyChanged(PropertyName_Toilettengang);
}
}
}
set
{
if (AreDifferent(_Toilettengang, value))
{
_Toilettengang = value;
StoreDirtyInformation(AreDifferent(DataContract.Toilettengang, value), PropertyName_Toilettengang);
FirePropertyChanged(PropertyName_Toilettengang);
}
}
}
public bool Aggressiv
{
get { return _Aggressiv; }
public bool Aggressiv
{
get { return _Aggressiv; }
set
{
if (AreDifferent(_Aggressiv, value))
{
_Aggressiv = value;
StoreDirtyInformation(AreDifferent(DataContract.Aggressiv, value), PropertyName_Aggressiv);
FirePropertyChanged(PropertyName_Aggressiv);
}
}
}
set
{
if (AreDifferent(_Aggressiv, value))
{
_Aggressiv = value;
StoreDirtyInformation(AreDifferent(DataContract.Aggressiv, value), PropertyName_Aggressiv);
FirePropertyChanged(PropertyName_Aggressiv);
}
}
}
public bool Hygienebelehrung
{
get { return _Hygienebelehrung; }
public bool Hygienebelehrung
{
get { return _Hygienebelehrung; }
set
{
if (AreDifferent(_Hygienebelehrung, value))
{
_Hygienebelehrung = value;
StoreDirtyInformation(AreDifferent(DataContract.Hygienebelehrung, value), PropertyName_Hygienebelehrung);
FirePropertyChanged(PropertyName_Hygienebelehrung);
}
}
}
set
{
if (AreDifferent(_Hygienebelehrung, value))
{
_Hygienebelehrung = value;
StoreDirtyInformation(AreDifferent(DataContract.Hygienebelehrung, value), PropertyName_Hygienebelehrung);
FirePropertyChanged(PropertyName_Hygienebelehrung);
}
}
}
public String Schutzstufe
{
get { return _Schutzstufe; }
public String Schutzstufe
{
get { return _Schutzstufe; }
set
{
if (AreDifferent(_Schutzstufe, value))
{
_Schutzstufe = value;
StoreDirtyInformation(AreDifferent(DataContract.Schutzstufe, value), PropertyName_Schutzstufe);
FirePropertyChanged(PropertyName_Schutzstufe);
}
}
}
set
{
if (AreDifferent(_Schutzstufe, value))
{
_Schutzstufe = value;
StoreDirtyInformation(AreDifferent(DataContract.Schutzstufe, value), PropertyName_Schutzstufe);
FirePropertyChanged(PropertyName_Schutzstufe);
}
}
}
public VarFieldListVM VarFields
{
get { return _VarFields; }
public VarFieldListVM VarFields
{
get { return _VarFields; }
set
{
if (AreDifferent(_VarFields, value))
{
_VarFields = value;
FirePropertyChanged(PropertyName_VarFields);
}
}
}
set
{
if (AreDifferent(_VarFields, value))
{
_VarFields = value;
FirePropertyChanged(PropertyName_VarFields);
}
}
}
protected override void InitByDataContract(EmployeeDC pDataContract)
protected override void InitByDataContract(EmployeeDC pDataContract)
{
if (!IsNew)
{
@@ -1186,19 +1224,20 @@ namespace BeWo.ViewModel
_Text4 = pDataContract.Text4;
_Text5 = pDataContract.Text5;
_Notice2 = pDataContract.Notice2;
_EmployeeColor = pDataContract.EmployeeColor;
_Pflege = pDataContract.Pflege;
_Toilettengang = pDataContract.Toilettengang;
_Aggressiv = pDataContract.Aggressiv;
_Schutzstufe = pDataContract.Schutzstufe;
_Hygienebelehrung = pDataContract.Hygienebelehrung;
_EmployeeColor = pDataContract.EmployeeColor;
_Pflege = pDataContract.Pflege;
_Toilettengang = pDataContract.Toilettengang;
_Aggressiv = pDataContract.Aggressiv;
_Schutzstufe = pDataContract.Schutzstufe;
_Hygienebelehrung = pDataContract.Hygienebelehrung;
_Nationalitaet = pDataContract.Nationalitaet;
if (pDataContract.Images != null && pDataContract.Images.Count > 0)
{
_EmployeeImage = pDataContract.Images[0];
}
if (pDataContract.Images != null && pDataContract.Images.Count > 0)
{
_EmployeeImage = pDataContract.Images[0];
}
_IsArchived = pDataContract.ActivationType == ActivationTypeId.Archived;
_IsArchived = pDataContract.ActivationType == ActivationTypeId.Archived;
//this._CancellationPeriod = pDataContract.CancellationPeriod;
//this._EntryDate = pDataContract.EntryDate;
@@ -1208,10 +1247,10 @@ namespace BeWo.ViewModel
//this._WeeklyTotalHours = pDataContract.WeeklyTotalHours.HasValue ? Math.Round(pDataContract.WeeklyTotalHours.Value, 2) : pDataContract.WeeklyTotalHours;
//this._LeaveDays = pDataContract.LeaveDays.HasValue ? Math.Round(pDataContract.LeaveDays.Value, 2) : pDataContract.LeaveDays;
if (!String.IsNullOrEmpty(pDataContract.EmployeeColor))
{
EmployeeBrush = (SolidColorBrush)new BrushConverter().ConvertFrom(_EmployeeColor);
}
if (!String.IsNullOrEmpty(pDataContract.EmployeeColor))
{
EmployeeBrush = (SolidColorBrush)new BrushConverter().ConvertFrom(_EmployeeColor);
}
VMFactory.CreateAbsenceTimeListVMAsync(pDataContract.AbsenceTimes ?? (pDataContract.AbsenceTimes = new List<AbsenceTimeDC>()), cb => AbsenceTimes = cb);
VMFactory.CreateOvertimeListVMAsync(pDataContract.Overtimes ?? (pDataContract.Overtimes = new List<OvertimeDC>()), cb => Overtimes = cb);
@@ -1261,8 +1300,8 @@ namespace BeWo.ViewModel
// this._EmploymentType = pDataContract.EmploymentType.TypeDescription;
//}
}
_VarFields = new VarFieldListVM(pDataContract.EmployeeVarFields);
Focuses.CollectionChanged += (s, e) => StoreDirtyInformation(!_Focuses.ContainsSameItemsAs(pDataContract.Focuses), PropertyName_Focuses);
_VarFields = new VarFieldListVM(pDataContract.EmployeeVarFields);
Focuses.CollectionChanged += (s, e) => StoreDirtyInformation(!_Focuses.ContainsSameItemsAs(pDataContract.Focuses), PropertyName_Focuses);
Qualifications.CollectionChanged += (s, e) => StoreDirtyInformation(!_Qualifications.ContainsSameItemsAs(pDataContract.Qualifications), PropertyName_Qualifications);
}
@@ -1294,38 +1333,39 @@ namespace BeWo.ViewModel
pDataContract.Text4 = _Text4;
pDataContract.Text5 = _Text5;
pDataContract.Notice2 = _Notice2;
pDataContract.EmployeeColor = _EmployeeColor;
pDataContract.Type = PersonType.Employee;
pDataContract.Pflege = _Pflege;
pDataContract.Toilettengang = _Toilettengang;
pDataContract.Aggressiv = _Aggressiv;
pDataContract.Schutzstufe = _Schutzstufe;
pDataContract.Hygienebelehrung = _Hygienebelehrung;
pDataContract.ActivationType = _IsArchived ? ActivationTypeId.Archived : ActivationTypeId.Active;
pDataContract.EmployeeColor = _EmployeeColor;
pDataContract.Type = PersonType.Employee;
pDataContract.Pflege = _Pflege;
pDataContract.Toilettengang = _Toilettengang;
pDataContract.Aggressiv = _Aggressiv;
pDataContract.Schutzstufe = _Schutzstufe;
pDataContract.Hygienebelehrung = _Hygienebelehrung;
pDataContract.ActivationType = _IsArchived ? ActivationTypeId.Archived : ActivationTypeId.Active;
pDataContract.Nationalitaet = _Nationalitaet;
if (pDataContract.Images != null)
{
pDataContract.Images.Clear();
}
if (pDataContract.Images != null)
{
pDataContract.Images.Clear();
}
if (_EmployeeImage != null)
{
if (pDataContract.Images == null)
{
pDataContract.Images = new List<byte[]>();
}
pDataContract.Images.Add(_EmployeeImage);
}
//pDataContract.CancellationPeriod = this._CancellationPeriod;
//pDataContract.EntryDate = this._EntryDate;
//pDataContract.ProbationPeriod = this._ProbationPeriod;
//pDataContract.HourlyRate = this._HourlyRate;
//pDataContract.LeaveDays = this._LeaveDays;
//pDataContract.WeeklyFLS = this._WeeklyFLS;
//pDataContract.WeeklyTotalHours = this._WeeklyTotalHours;
if (_EmployeeImage != null)
{
if (pDataContract.Images == null)
{
pDataContract.Images = new List<byte[]>();
}
pDataContract.Images.Add(_EmployeeImage);
}
//pDataContract.CancellationPeriod = this._CancellationPeriod;
//pDataContract.EntryDate = this._EntryDate;
//pDataContract.ProbationPeriod = this._ProbationPeriod;
//pDataContract.HourlyRate = this._HourlyRate;
//pDataContract.LeaveDays = this._LeaveDays;
//pDataContract.WeeklyFLS = this._WeeklyFLS;
//pDataContract.WeeklyTotalHours = this._WeeklyTotalHours;
CommitContact(_MobilePhone, ContactType.business_MobilePhone);
CommitContact(_MobilePhone, ContactType.business_MobilePhone);
CommitContact(_Phone, ContactType.business_Phone);
CommitContact(_Fax, ContactType.business_Fax);
CommitContact(_EMail, ContactType.business_Mail);
@@ -1353,30 +1393,30 @@ namespace BeWo.ViewModel
pDataContract.Contracts = _Contracts.CopyToDCList(doCommit);
}
if (_ArbeitszeitListe != null)
{
pDataContract.Arbeitszeiten = _ArbeitszeitListe.CopyToDCList(doCommit);
}
if (_ArbeitszeitListe != null)
{
pDataContract.Arbeitszeiten = _ArbeitszeitListe.CopyToDCList(doCommit);
}
if (_Overtimes != null)
{
pDataContract.Overtimes = _Overtimes.CopyToDCList(doCommit);
}
//if (this._PossibleEmploymentTypesBack != null)
//{
// ValueListEntryDC lEmplyomentType = this._PossibleEmploymentTypesBack.SingleOrDefault(empType => empType.TypeDescription == this._EmploymentType);
//if (this._PossibleEmploymentTypesBack != null)
//{
// ValueListEntryDC lEmplyomentType = this._PossibleEmploymentTypesBack.SingleOrDefault(empType => empType.TypeDescription == this._EmploymentType);
// if ((pDataContract.EmploymentType == null && lEmplyomentType != null) || pDataContract.EmploymentType != null)
// {
// pDataContract.EmploymentType = lEmplyomentType;
// }
//}
if (_VarFields != null)
{
pDataContract.EmployeeVarFields = _VarFields.CopyToDCList(doCommit);
}
// if ((pDataContract.EmploymentType == null && lEmplyomentType != null) || pDataContract.EmploymentType != null)
// {
// pDataContract.EmploymentType = lEmplyomentType;
// }
//}
if (_VarFields != null)
{
pDataContract.EmployeeVarFields = _VarFields.CopyToDCList(doCommit);
}
return pDataContract;
return pDataContract;
}
private void CommitContact(string pValue, ContactType pContactType)

15
BeWo/ViewModel/ListViewModel/BudgetListVM.cs Normal file
View File

@@ -0,0 +1,15 @@
using System.Collections.Generic;
using BS.Shared;
using BS.Shared.Core;
using BS.Shared.DataContracts;
namespace BeWo.ViewModel.ListViewModel
{
public class BudgetListVM : AbstractDCListMapperVM<BudgetDC, BudgetVM>
{
public BudgetListVM(List<BudgetDC> pDCs): base(pDCs)
{
}
}
}

4
BeWo/ViewModel/PersonVM.cs
View File

@@ -130,7 +130,7 @@ namespace BeWo.ViewModel
private bool _IsMigrant;
private ValueListEntryDC _Nationalitaet;
private ValueListEntryDC _Nationalitaet;
private ObservableSortCollection<ValueListEntryDC> _Nationalitaeten;
@@ -646,7 +646,7 @@ namespace BeWo.ViewModel
}
}
public ValueListEntryDC Nationalitaet
public ValueListEntryDC Nationalitaet
{
get { return this._Nationalitaet; }

1
BeWo/ViewModel/SupportConceptVM.cs
View File

@@ -17,7 +17,6 @@ using BS.Shared.DataContracts;
using BS.Shared.DataContracts.ClientPartials;
using BS.Shared.DataContracts.Compact;
using BS.Shared.Extensions;
using Microsoft.Office.Interop.Word;
namespace BeWo.ViewModel
{

29
BeWo/ViewModel/VMFactory.cs
View File

@@ -185,15 +185,18 @@ namespace BeWo.ViewModel
Cache.GetInstance()
.GetAllValueListEntrysByTypeAsync(ValueListEntryType.ContractType,
r4 =>
ServiceFacade.DoEmployeeServiceAsync(
e =>
e.GetAllAuszahlungsarten(),
r6 =>
ServiceFacade.DoOperationsServiceAsync(
s =>
s.GetSbdConfig(),
config =>
pCallBack(new EmployeeVM(pEmployeeDC, r1, r2, r3, r6, r4, config.Stundensaetze))))))));
Cache.GetInstance()
.GetAllValueListEntrysByTypeAsync(ValueListEntryType.Nationality,
nat =>
ServiceFacade.DoEmployeeServiceAsync(
e =>
e.GetAllAuszahlungsarten(),
r6 =>
ServiceFacade.DoOperationsServiceAsync(
s =>
s.GetSbdConfig(),
config =>
pCallBack(new EmployeeVM(pEmployeeDC, r1, nat, r2, r3, r6, r4, config.Stundensaetze)))))))));
}
public static void CreateEmployeeVMAsync(Action<EmployeeVM> pCallBack)
@@ -447,7 +450,13 @@ namespace BeWo.ViewModel
r => pCallBack(new AuszahlungsartListVM(r.ToList())));
}
public static void CreateTextModuleListVMAsync(Action<TextModuleListVM> pCallBack, bool pIsInAdministrationView = false, bool pIsInTextModuleEditor = false)
public static void CreateBudgetListVMAsync(Action<BudgetListVM> pCallBack)
{
ServiceFacade.DoOperationsServiceAsync(s => s.GetAllBudgets(),
r => pCallBack(new BudgetListVM(r.ToList())));
}
public static void CreateTextModuleListVMAsync(Action<TextModuleListVM> pCallBack, bool pIsInAdministrationView = false, bool pIsInTextModuleEditor = false)
{
ServiceFacade.DoOperationsServiceAsync(s1 => s1.GetTextModules(pIsInTextModuleEditor, BeWoApp.LoggedOnEmployee.EmployeeOid.Value, BeWoApp.LoggedOnUser.HasRight(UserRightType.TextbausteineAlleAnsehen), pIsInAdministrationView), r1 => ServiceFacade.DoOperationsServiceAsync(
s2 => s2.GetAllServiceCategories(),

22
Data/Data.csproj
View File

@@ -123,8 +123,11 @@
<Compile Include="Access\UserDAO.cs" />
<Compile Include="ASPHibernateSessionManager.cs" />
<Compile Include="DefaultHibernateSessionManager.cs" />
<Compile Include="Entities\AddressHistory.cs" />
<Compile Include="Entities\BuchungsExport.cs" />
<Compile Include="Entities\DeletionHistory.cs" />
<Compile Include="Entities\Budget.cs" />
<Compile Include="Entities\ContactHistory.cs" />
<Compile Include="Entities\EmployeeHistory.cs" />
<Compile Include="Entities\NotizenKategorie.cs" />
<Compile Include="Entities\NotizenEintrag.cs" />
<Compile Include="Entities\Feiertag.cs" />
@@ -174,6 +177,7 @@
<Compile Include="Entities\Customer2Token.cs" />
<Compile Include="Entities\Employee2Token.cs" />
<Compile Include="Entities\ChatBewoMessageSync.cs" />
<Compile Include="Entities\PersonHistory.cs" />
<Compile Include="Entities\QuittierungsCheck.cs" />
<Compile Include="Entities\Textbaustein.cs" />
<Compile Include="Entities\Token.cs" />
@@ -575,7 +579,15 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="ICD10\icd10gm2012syst_claml_20110923.xml" />
<EmbeddedResource Include="Mappings\DeletionHistory.hbm.xml" />
<EmbeddedResource Include="Mappings\ContactHistory.hbm.xml">
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Mappings\AddressHistory.hbm.xml">
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Mappings\EmployeeHistory.hbm.xml">
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Mappings\BuchungsExport.hbm.xml">
<SubType>Designer</SubType>
</EmbeddedResource>
@@ -588,6 +600,12 @@
<EmbeddedResource Include="Mappings\NotizenEintrag.hbm.xml">
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Mappings\PersonHistory.hbm.xml">
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Mappings\Budget.hbm.xml">
<SubType>Designer</SubType>
</EmbeddedResource>
<Content Include="Mappings\CustomerTeam.hbm.xml" />
<EmbeddedResource Include="Mappings\Textbaustein.hbm.xml">
<SubType>Designer</SubType>

291
Data/Entities/AddressHistory.cs Normal file
View File

@@ -0,0 +1,291 @@
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 AddressHistory : BeWoEntityBase
{
private StatementType _ChangeType;
private long? _Address_Oid;
private TableID _Address_Tid;
private string _Address_Street;
private string _Address_PostalCode;
private string _Address_Town;
private string _Address_State;
private string _Address_Country;
private string _Address_Notice;
private DateTime? _Address_InsTs;
private string _Address_InsUser;
private long? _Address_Version;
private string _Address_UdpUser;
private ActivationTypeId? _Address_IsActive;
private SystemEntryID? _Address_SystemEntryID;
private string _Address_AddressLine1;
private string _Address_AddressLine2;
public AddressHistory()
{
_Tid = TableID.AddressHistory;
}
public virtual StatementType ChangeType
{
get
{
return _ChangeType;
}
set
{
if (AreDifferent(_ChangeType, value))
{
_ChangeType = value;
}
}
}
public virtual long? Address_Oid
{
get
{
return _Address_Oid;
}
set
{
if (AreDifferent(_Address_Oid, value))
{
_Address_Oid = value;
}
}
}
public virtual TableID Address_Tid
{
get
{
return _Address_Tid;
}
set
{
if (AreDifferent(_Address_Tid, value))
{
_Address_Tid = value;
}
}
}
public virtual string Address_Street
{
get
{
return _Address_Street;
}
set
{
if (AreDifferent(_Address_Street, value))
{
_Address_Street = value;
}
}
}
public virtual string Address_PostalCode
{
get
{
return _Address_PostalCode;
}
set
{
if (AreDifferent(_Address_PostalCode, value))
{
_Address_PostalCode = value;
}
}
}
public virtual string Address_Town
{
get
{
return _Address_Town;
}
set
{
if (AreDifferent(_Address_Town, value))
{
_Address_Town = value;
}
}
}
public virtual string Address_State
{
get
{
return _Address_State;
}
set
{
if (AreDifferent(_Address_State, value))
{
_Address_State = value;
}
}
}
public virtual string Address_Country
{
get
{
return _Address_Country;
}
set
{
if (AreDifferent(_Address_Country, value))
{
_Address_Country = value;
}
}
}
public virtual string Address_Notice
{
get
{
return _Address_Notice;
}
set
{
if (AreDifferent(_Address_Notice, value))
{
_Address_Notice = value;
}
}
}
public virtual DateTime? Address_InsTs
{
get
{
return _Address_InsTs;
}
set
{
if (AreDifferent(_Address_InsTs, value))
{
_Address_InsTs = value;
}
}
}
public virtual string Address_InsUser
{
get
{
return _Address_InsUser;
}
set
{
if (AreDifferent(_Address_InsUser, value))
{
_Address_InsUser = value;
}
}
}
public virtual long? Address_Version
{
get
{
return _Address_Version;
}
set
{
if (AreDifferent(_Address_Version, value))
{
_Address_Version = value;
}
}
}
public virtual string Address_UdpUser
{
get
{
return _Address_UdpUser;
}
set
{
if (AreDifferent(_Address_UdpUser, value))
{
_Address_UdpUser = value;
}
}
}
public virtual ActivationTypeId? Address_IsActive
{
get
{
return _Address_IsActive;
}
set
{
if (AreDifferent(_Address_IsActive, value))
{
_Address_IsActive = value;
}
}
}
public virtual SystemEntryID? Address_SystemEntryID
{
get
{
return _Address_SystemEntryID;
}
set
{
if (AreDifferent(_Address_SystemEntryID, value))
{
_Address_SystemEntryID = value;
}
}
}
public virtual string Address_AddressLine1
{
get
{
return _Address_AddressLine1;
}
set
{
if (AreDifferent(_Address_AddressLine1, value))
{
_Address_AddressLine1 = value;
}
}
}
public virtual string Address_AddressLine2
{
get
{
return _Address_AddressLine2;
}
set
{
if (AreDifferent(_Address_AddressLine2, value))
{
_Address_AddressLine2 = value;
}
}
}
}
}

50
Data/Entities/Budget.cs Normal file
View File

@@ -0,0 +1,50 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using BS.Shared;
namespace BeWo.Data.Entities
{
public class Budget : BeWoEntityBase
{
private string _Name;
private decimal? _Betragshoehe;
public Budget()
{
_Tid = TableID.Budget;
}
public virtual string Name
{
get
{
return _Name;
}
set
{
if (AreDifferent(_Name, value))
{
_Name = value;
}
}
}
public virtual decimal? Betragshoehe
{
get
{
return _Betragshoehe;
}
set
{
if (AreDifferent(_Betragshoehe, value))
{
_Betragshoehe = value;
}
}
}
}
}

291
Data/Entities/ContactHistory.cs Normal file
View File

@@ -0,0 +1,291 @@
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 ContactHistory : BeWoEntityBase
{
private StatementType _ChangeType;
private long? _Contact_Oid;
private long? _Contact_Organisation2PersonOid;
private long? _Contact_PersonOid;
private long? _Contact_InvoiceBaseSenderOid;
private long? _Contact_OrganisationOid;
private long? _Contact_InvoiceBaseRecipientOid;
private TableID _Contact_Tid;
private ContactType _Contact_Type;
private string _Contact_Value;
private string _Contact_Notice;
private DateTime? _Contact_InsTs;
private string _Contact_InsUser;
private long? _Contact_Version;
private string _Contact_UdpUser;
private ActivationTypeId _Contact_IsActive;
private SystemEntryID? _Contact_SystemEntryID;
public ContactHistory()
{
_Tid = TableID.ContactHistory;
}
public virtual StatementType ChangeType
{
get
{
return _ChangeType;
}
set
{
if (AreDifferent(_ChangeType, value))
{
_ChangeType = value;
}
}
}
public virtual long? Contact_Oid
{
get
{
return _Contact_Oid;
}
set
{
if (AreDifferent(_Contact_Oid, value))
{
_Contact_Oid = value;
}
}
}
public virtual long? Contact_Organisation2PersonOid
{
get
{
return _Contact_Organisation2PersonOid;
}
set
{
if (AreDifferent(_Contact_Organisation2PersonOid, value))
{
_Contact_Organisation2PersonOid = value;
}
}
}
public virtual long? Contact_PersonOid
{
get
{
return _Contact_PersonOid;
}
set
{
if (AreDifferent(_Contact_PersonOid, value))
{
_Contact_PersonOid = value;
}
}
}
public virtual long? Contact_InvoiceBaseSenderOid
{
get
{
return _Contact_InvoiceBaseSenderOid;
}
set
{
if (AreDifferent(_Contact_InvoiceBaseSenderOid, value))
{
_Contact_InvoiceBaseSenderOid = value;
}
}
}
public virtual long? Contact_OrganisationOid
{
get
{
return _Contact_OrganisationOid;
}
set
{
if (AreDifferent(_Contact_OrganisationOid, value))
{
_Contact_OrganisationOid = value;
}
}
}
public virtual long? Contact_InvoiceBaseRecipientOid
{
get
{
return _Contact_InvoiceBaseRecipientOid;
}
set
{
if (AreDifferent(_Contact_InvoiceBaseRecipientOid, value))
{
_Contact_InvoiceBaseRecipientOid = value;
}
}
}
public virtual TableID Contact_Tid
{
get
{
return _Contact_Tid;
}
set
{
if (AreDifferent(_Contact_Tid, value))
{
_Contact_Tid = value;
}
}
}
public virtual ContactType Contact_Type
{
get
{
return _Contact_Type;
}
set
{
if (AreDifferent(_Contact_Type, value))
{
_Contact_Type = value;
}
}
}
public virtual string Contact_Value
{
get
{
return _Contact_Value;
}
set
{
if (AreDifferent(_Contact_Value, value))
{
_Contact_Value = value;
}
}
}
public virtual string Contact_Notice
{
get
{
return _Contact_Notice;
}
set
{
if (AreDifferent(_Contact_Notice, value))
{
_Contact_Notice = value;
}
}
}
public virtual DateTime? Contact_InsTs
{
get
{
return _Contact_InsTs;
}
set
{
if (AreDifferent(_Contact_InsTs, value))
{
_Contact_InsTs = value;
}
}
}
public virtual string Contact_InsUser
{
get
{
return _Contact_InsUser;
}
set
{
if (AreDifferent(_Contact_InsUser, value))
{
_Contact_InsUser = value;
}
}
}
public virtual long? Contact_Version
{
get
{
return _Contact_Version;
}
set
{
if (AreDifferent(_Contact_Version, value))
{
_Contact_Version = value;
}
}
}
public virtual string Contact_UdpUser
{
get
{
return _Contact_UdpUser;
}
set
{
if (AreDifferent(_Contact_UdpUser, value))
{
_Contact_UdpUser = value;
}
}
}
public virtual ActivationTypeId Contact_IsActive
{
get
{
return _Contact_IsActive;
}
set
{
if (AreDifferent(_Contact_IsActive, value))
{
_Contact_IsActive = value;
}
}
}
public virtual SystemEntryID? Contact_SystemEntryID
{
get
{
return _Contact_SystemEntryID;
}
set
{
if (AreDifferent(_Contact_SystemEntryID, value))
{
_Contact_SystemEntryID = value;
}
}
}
}
}

2
Data/Entities/Customer.cs
View File

@@ -102,7 +102,7 @@ namespace BeWo.Data.Entities
private bool _VertretungGewuenscht;
private int _AbWelchemKrankheitsTag;
private bool _VertretungDringendErforderlich;
private IList<Arbeitszeit> _Arbeitszeit;
private IList<Arbeitszeit> _Arbeitszeit;
public Customer()
{

612
Data/Entities/EmployeeHistory.cs Normal file
View File

@@ -0,0 +1,612 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using BS.Shared;
namespace BeWo.Data.Entities
{
public class EmployeeHistory : BeWoEntityBase
{
private StatementType _ChangeType;
private long? _Employee_Oid;
private long _Employee_PersonOid;
private long _Employee_ApplicationUserOid;
private TableID _Employee_Tid;
private string _Employee_PersonnelNumber;
private string _Employee_TaxNumber;
private string _Employee_HealthInsurance;
private string _Employee_InsuranceNumber;
private decimal _Employee_HourlyRate;
private DateTime _Employee_EntryDate;
private int _Employee_CancellationPeriod;
private int _Employee_ProbationPeriod;
private int _Employee_Sequence;
private ActivationTypeId _Employee_IsActive;
private string _Employee_Notice;
private DateTime? _Employee_InsTs;
private string _Employee_InsUser;
private long? _Employee_Version;
private string _Employee_UdpUser;
private SystemEntryID? _Employee_SystemEntryID;
private decimal _Employee_weeklyfls;
private decimal _Employee_weeklytotalhours;
private decimal _Employee_leavedays;
private bool? _Employee_IsQualified;
private string _Employee_Text1;
private string _Employee_Text2;
private string _Employee_Text3;
private string _Employee_Text4;
private string _Employee_Text5;
private string _Employee_Notice2;
private string _Employee_EmployeeColor;
private bool _Employee_Pflege;
private bool _Employee_Toilettengang;
private bool _Employee_Aggressiv;
private string _Employee_Schutzstufe;
private bool _Employee_Hygienebelehrung;
public EmployeeHistory()
{
_Tid = TableID.EmployeeHistory;
}
public virtual StatementType ChangeType
{
get
{
return _ChangeType;
}
set
{
if (AreDifferent(_ChangeType, value))
{
_ChangeType = value;
}
}
}
public virtual long? Employee_Oid
{
get
{
return _Employee_Oid;
}
set
{
if (AreDifferent(_Employee_Oid, value))
{
_Employee_Oid = value;
}
}
}
public virtual long Employee_PersonOid
{
get
{
return _Employee_PersonOid;
}
set
{
if (AreDifferent(_Employee_PersonOid, value))
{
_Employee_PersonOid = value;
}
}
}
public virtual long Employee_ApplicationUserOid
{
get
{
return _Employee_ApplicationUserOid;
}
set
{
if (AreDifferent(_Employee_ApplicationUserOid, value))
{
_Employee_ApplicationUserOid = value;
}
}
}
public virtual TableID Employee_Tid
{
get
{
return _Employee_Tid;
}
set
{
if (AreDifferent(_Employee_Tid, value))
{
_Employee_Tid = value;
}
}
}
public virtual string Employee_PersonnelNumber
{
get
{
return _Employee_PersonnelNumber;
}
set
{
if (AreDifferent(_Employee_PersonnelNumber, value))
{
_Employee_PersonnelNumber = value;
}
}
}
public virtual string Employee_TaxNumber
{
get
{
return _Employee_TaxNumber;
}
set
{
if (AreDifferent(_Employee_TaxNumber, value))
{
_Employee_TaxNumber = value;
}
}
}
public virtual string Employee_HealthInsurance
{
get
{
return _Employee_HealthInsurance;
}
set
{
if (AreDifferent(_Employee_HealthInsurance, value))
{
_Employee_HealthInsurance = value;
}
}
}
public virtual string Employee_InsuranceNumber
{
get
{
return _Employee_InsuranceNumber;
}
set
{
if (AreDifferent(_Employee_InsuranceNumber, value))
{
_Employee_InsuranceNumber = value;
}
}
}
public virtual decimal Employee_HourlyRate
{
get
{
return _Employee_HourlyRate;
}
set
{
if (AreDifferent(_Employee_HourlyRate, value))
{
_Employee_HourlyRate = value;
}
}
}
public virtual DateTime Employee_EntryDate
{
get
{
return _Employee_EntryDate;
}
set
{
if (AreDifferent(_Employee_EntryDate, value))
{
_Employee_EntryDate = value;
}
}
}
public virtual int Employee_CancellationPeriod
{
get
{
return _Employee_CancellationPeriod;
}
set
{
if (AreDifferent(_Employee_CancellationPeriod, value))
{
_Employee_CancellationPeriod = value;
}
}
}
public virtual int Employee_ProbationPeriod
{
get
{
return _Employee_ProbationPeriod;
}
set
{
if (AreDifferent(_Employee_ProbationPeriod, value))
{
_Employee_ProbationPeriod = value;
}
}
}
public virtual int Employee_Sequence
{
get
{
return _Employee_Sequence;
}
set
{
if (AreDifferent(_Employee_Sequence, value))
{
_Employee_Sequence = value;
}
}
}
public virtual ActivationTypeId Employee_IsActive
{
get
{
return _Employee_IsActive;
}
set
{
if (AreDifferent(_Employee_IsActive, value))
{
_Employee_IsActive = value;
}
}
}
public virtual string Employee_Notice
{
get
{
return _Employee_Notice;
}
set
{
if (AreDifferent(_Employee_Notice, value))
{
_Employee_Notice = value;
}
}
}
public virtual DateTime? Employee_InsTs
{
get
{
return _Employee_InsTs;
}
set
{
if (AreDifferent(_Employee_InsTs, value))
{
_Employee_InsTs = value;
}
}
}
public virtual string Employee_InsUser
{
get
{
return _Employee_InsUser;
}
set
{
if (AreDifferent(_Employee_InsUser, value))
{
_Employee_InsUser = value;
}
}
}
public virtual long? Employee_Version
{
get
{
return _Employee_Version;
}
set
{
if (AreDifferent(_Employee_Version, value))
{
_Employee_Version = value;
}
}
}
public virtual string Employee_UdpUser
{
get
{
return _Employee_UdpUser;
}
set
{
if (AreDifferent(_Employee_UdpUser, value))
{
_Employee_UdpUser = value;
}
}
}
public virtual SystemEntryID? Employee_SystemEntryID
{
get
{
return _Employee_SystemEntryID;
}
set
{
if (AreDifferent(_Employee_SystemEntryID, value))
{
_Employee_SystemEntryID = value;
}
}
}
public virtual decimal Employee_weeklyfls
{
get
{
return _Employee_weeklyfls;
}
set
{
if (AreDifferent(_Employee_weeklyfls, value))
{
_Employee_weeklyfls = value;
}
}
}
public virtual decimal Employee_weeklytotalhours
{
get
{
return _Employee_weeklytotalhours;
}
set
{
if (AreDifferent(_Employee_weeklytotalhours, value))
{
_Employee_weeklytotalhours = value;
}
}
}
public virtual decimal Employee_leavedays
{
get
{
return _Employee_leavedays;
}
set
{
if (AreDifferent(_Employee_leavedays, value))
{
_Employee_leavedays = value;
}
}
}
public virtual bool? Employee_IsQualified
{
get
{
return _Employee_IsQualified;
}
set
{
if (AreDifferent(_Employee_IsQualified, value))
{
_Employee_IsQualified = value;
}
}
}
public virtual string Employee_Text1
{
get
{
return _Employee_Text1;
}
set
{
if (AreDifferent(_Employee_Text1, value))
{
_Employee_Text1 = value;
}
}
}
public virtual string Employee_Text2
{
get
{
return _Employee_Text2;
}
set
{
if (AreDifferent(_Employee_Text2, value))
{
_Employee_Text2 = value;
}
}
}
public virtual string Employee_Text3
{
get
{
return _Employee_Text3;
}
set
{
if (AreDifferent(_Employee_Text3, value))
{
_Employee_Text3 = value;
}
}
}
public virtual string Employee_Text4
{
get
{
return _Employee_Text4;
}
set
{
if (AreDifferent(_Employee_Text4, value))
{
_Employee_Text4 = value;
}
}
}
public virtual string Employee_Text5
{
get
{
return _Employee_Text5;
}
set
{
if (AreDifferent(_Employee_Text5, value))
{
_Employee_Text5 = value;
}
}
}
public virtual string Employee_Notice2
{
get
{
return _Employee_Notice2;
}
set
{
if (AreDifferent(_Employee_Notice2, value))
{
_Employee_Notice2 = value;
}
}
}
public virtual string Employee_EmployeeColor
{
get
{
return _Employee_EmployeeColor;
}
set
{
if (AreDifferent(_Employee_EmployeeColor, value))
{
_Employee_EmployeeColor = value;
}
}
}
public virtual bool Employee_Pflege
{
get
{
return _Employee_Pflege;
}
set
{
if (AreDifferent(_Employee_Pflege, value))
{
_Employee_Pflege = value;
}
}
}
public virtual bool Employee_Toilettengang
{
get
{
return _Employee_Toilettengang;
}
set
{
if (AreDifferent(_Employee_Toilettengang, value))
{
_Employee_Toilettengang = value;
}
}
}
public virtual bool Employee_Aggressiv
{
get
{
return _Employee_Aggressiv;
}
set
{
if (AreDifferent(_Employee_Aggressiv, value))
{
_Employee_Aggressiv = value;
}
}
}
public virtual string Employee_Schutzstufe
{
get
{
return _Employee_Schutzstufe;
}
set
{
if (AreDifferent(_Employee_Schutzstufe, value))
{
_Employee_Schutzstufe = value;
}
}
}
public virtual bool Employee_Hygienebelehrung
{
get
{
return _Employee_Hygienebelehrung;
}
set
{
if (AreDifferent(_Employee_Hygienebelehrung, value))
{
_Employee_Hygienebelehrung = value;
}
}
}
}
}

20
Data/Entities/Person.cs
View File

@@ -82,6 +82,8 @@ namespace BeWo.Data.Entities
private bool _IsMigrant;
private string _Migrationshintergrund;
private ValueListEntry _Nationalitaet;
private ValueListEntry _AufenthaltsStatus;
@@ -377,7 +379,23 @@ namespace BeWo.Data.Entities
}
}
public virtual ValueListEntry Nationalitaet
public virtual string Migrationshintergrund
{
get
{
return this._Migrationshintergrund;
}
set
{
if (this.AreDifferent(this._Migrationshintergrund, value))
{
this._Migrationshintergrund = value;
}
}
}
public virtual ValueListEntry Nationalitaet
{
get
{

436
Data/Entities/PersonHistory.cs Normal file
View File

@@ -0,0 +1,436 @@
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 PersonHistory : BeWoEntityBase
{
private StatementType _ChangeType;
private long? _Person_Oid;
private long _Person_BankAccountOid;
private long _Person_AddressOid;
private long _Person_InvoiceAddressOid;
private TableID _Person_Tid;
private string _Person_FirstName;
private string _Person_LastName;
private string _Person_Abbreviation;
private DateTime? _Person_DateOfBirth;
private Sex? _Person_Sex;
private FamilyStatus? _Person_FamilyStatus;
private string _Person_Profession;
private PersonType _Person_Type;
private string _Person_Notice;
private DateTime? _Person_InsTs;
private string _Person_InsUser;
private long? _Person_Version;
private string _Person_UdpUser;
private ActivationTypeId _Person_IsActive;
private SystemEntryID? _Person_SystemEntryID;
private string _Person_TitleValueListEntryOid;
private string _Person_FunctionValueListEntryOid;
private bool _Person_IsMigrant;
private string _Person_NationalitaetValueListEntryOid;
private string _Person_AufenthaltsStatusValueListEntryOid;
public PersonHistory()
{
_Tid = TableID.PersonHistory;
_Person_Type = PersonType.Others;
}
public virtual StatementType ChangeType
{
get
{
return _ChangeType;
}
set
{
if (AreDifferent(_ChangeType, value))
{
_ChangeType = value;
}
}
}
public virtual long? Person_Oid
{
get
{
return _Person_Oid;
}
set
{
if (AreDifferent(_Person_Oid, value))
{
_Person_Oid = value;
}
}
}
public virtual long Person_BankAccountOid
{
get
{
return _Person_BankAccountOid;
}
set
{
if (AreDifferent(_Person_BankAccountOid, value))
{
_Person_BankAccountOid = value;
}
}
}
public virtual long Person_AddressOid
{
get
{
return _Person_AddressOid;
}
set
{
if (AreDifferent(_Person_AddressOid, value))
{
_Person_AddressOid = value;
}
}
}
public virtual long Person_InvoiceAddressOid
{
get
{
return _Person_InvoiceAddressOid;
}
set
{
if (AreDifferent(_Person_InvoiceAddressOid, value))
{
_Person_InvoiceAddressOid = value;
}
}
}
public virtual TableID Person_Tid
{
get
{
return _Person_Tid;
}
set
{
if (AreDifferent(_Person_Tid, value))
{
_Person_Tid = value;
}
}
}
public virtual string Person_FirstName
{
get
{
return _Person_FirstName;
}
set
{
if (AreDifferent(_Person_FirstName, value))
{
_Person_FirstName = value;
}
}
}
public virtual string Person_LastName
{
get
{
return _Person_LastName;
}
set
{
if (AreDifferent(_Person_LastName, value))
{
_Person_LastName = value;
}
}
}
public virtual string Person_Abbreviation
{
get
{
return _Person_Abbreviation;
}
set
{
if (AreDifferent(_Person_Abbreviation, value))
{
_Person_Abbreviation = value;
}
}
}
public virtual DateTime? Person_DateOfBirth
{
get
{
return _Person_DateOfBirth;
}
set
{
if (AreDifferent(_Person_DateOfBirth, value))
{
_Person_DateOfBirth = value;
}
}
}
public virtual Sex? Person_Sex
{
get
{
return _Person_Sex;
}
set
{
if (AreDifferent(_Person_Sex, value))
{
_Person_Sex = value;
}
}
}
public virtual FamilyStatus? Person_FamilyStatus
{
get
{
return _Person_FamilyStatus;
}
set
{
if (AreDifferent(_Person_FamilyStatus, value))
{
_Person_FamilyStatus = value;
}
}
}
public virtual string Person_Profession
{
get
{
return _Person_Profession;
}
set
{
if (AreDifferent(_Person_Profession, value))
{
_Person_Profession = value;
}
}
}
public virtual PersonType Person_Type
{
get
{
return _Person_Type;
}
set
{
if (AreDifferent(_Person_Type, value))
{
_Person_Type = value;
}
}
}
public virtual string Person_Notice
{
get
{
return _Person_Notice;
}
set
{
if (AreDifferent(_Person_Notice, value))
{
_Person_Notice = value;
}
}
}
public virtual DateTime? Person_InsTs
{
get
{
return _Person_InsTs;
}
set
{
if (AreDifferent(_Person_InsTs, value))
{
_Person_InsTs = value;
}
}
}
public virtual string Person_InsUser
{
get
{
return _Person_InsUser;
}
set
{
if (AreDifferent(_Person_InsUser, value))
{
_Person_InsUser = value;
}
}
}
public virtual long? Person_Version
{
get
{
return _Person_Version;
}
set
{
if (AreDifferent(_Person_Version, value))
{
_Person_Version = value;
}
}
}
public virtual string Person_UdpUser
{
get
{
return _Person_UdpUser;
}
set
{
if (AreDifferent(_Person_UdpUser, value))
{
_Person_UdpUser = value;
}
}
}
public virtual ActivationTypeId Person_IsActive
{
get
{
return _Person_IsActive;
}
set
{
if (AreDifferent(_Person_IsActive, value))
{
_Person_IsActive = value;
}
}
}
public virtual SystemEntryID? Person_SystemEntryID
{
get
{
return _Person_SystemEntryID;
}
set
{
if (AreDifferent(_Person_SystemEntryID, value))
{
_Person_SystemEntryID = value;
}
}
}
public virtual string Person_Title
{
get
{
return _Person_TitleValueListEntryOid;
}
set
{
if (AreDifferent(_Person_TitleValueListEntryOid, value))
{
_Person_TitleValueListEntryOid = value;
}
}
}
public virtual string Person_Function
{
get
{
return _Person_FunctionValueListEntryOid;
}
set
{
if (AreDifferent(_Person_FunctionValueListEntryOid, value))
{
_Person_FunctionValueListEntryOid = value;
}
}
}
public virtual bool Person_IsMigrant
{
get
{
return _Person_IsMigrant;
}
set
{
if (AreDifferent(_Person_IsMigrant, value))
{
_Person_IsMigrant = value;
}
}
}
public virtual string Person_Nationalitaet
{
get
{
return _Person_NationalitaetValueListEntryOid;
}
set
{
if (AreDifferent(_Person_NationalitaetValueListEntryOid, value))
{
_Person_NationalitaetValueListEntryOid = value;
}
}
}
public virtual string Person_AufenthaltsStatus
{
get
{
return _Person_AufenthaltsStatusValueListEntryOid;
}
set
{
if (AreDifferent(_Person_AufenthaltsStatusValueListEntryOid, value))
{
_Person_AufenthaltsStatusValueListEntryOid = value;
}
}
}
}
}

36
Data/Mappings/AddressHistory.hbm.xml Normal file
View File

@@ -0,0 +1,36 @@
<?xml version="1.0" encoding="utf-8" ?>
<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2">
<class name="BeWo.Data.Entities.AddressHistory,BeWo.Data" table="AddressHistory">
<id name="Oid" column="Oid" type="Int64" unsaved-value="null">
<generator class="identity" />
</id>
<version column="Version" type="Int64" 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="ChangeType" type="BS.Shared.StatementType, BS.Shared" name="ChangeType" />
<property column="Address_Oid" type="Int64" name="Address_Oid" />
<property column="Address_Tid" type="BS.Shared.TableID, BS.Shared" name="Address_Tid" />
<property column="Address_Street" type="string" name="Address_Street" />
<property column="Address_PostalCode" type="string" name="Address_PostalCode" />
<property column="Address_Town" type="string" name="Address_Town" />
<property column="Address_State" type="string" name="Address_State" />
<property column="Address_Country" type="string" name="Address_Country" />
<property column="Address_Notice" type="string" name="Address_Notice" />
<property column="Address_InsTs" type="DateTime" name="Address_InsTs" />
<property column="Address_InsUser" type="string" name="Address_InsUser" />
<property column="Address_Version" type="Int64" name="Address_Version" />
<property column="Address_UdpUser" type="string" name="Address_UdpUser" />
<property column="Address_IsActive" type="BS.Shared.ActivationTypeId, BS.Shared" name="Address_IsActive" />
<property column="Address_SystemEntryID" type="BS.Shared.SystemEntryID, BS.Shared" name="Address_SystemEntryID" />
<property column="Address_AddressLine1" type="string" name="Address_AddressLine1" />
<property column="Address_AddressLine2" type="string" name="Address_AddressLine2" />
</class>
</hibernate-mapping>

21
Data/Mappings/Budget.hbm.xml Normal file
View File

@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8" ?>
<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2">
<class name="BeWo.Data.Entities.Budget,BeWo.Data" table="Budget">
<id name="Oid" column="Oid" type="Int64" unsaved-value="null">
<generator class="identity" />
</id>
<version column="Version" type="Int64" 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="Name" type="string" name="Name" />
<property column="Betragshoehe" type="decimal" name="Betragshoehe" />
</class>
</hibernate-mapping>

36
Data/Mappings/ContactHistory.hbm.xml Normal file
View File

@@ -0,0 +1,36 @@
<?xml version="1.0" encoding="utf-8" ?>
<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2">
<class name="BeWo.Data.Entities.ContactHistory,BeWo.Data" table="ContactHistory">
<id name="Oid" column="Oid" type="Int64" unsaved-value="null">
<generator class="identity" />
</id>
<version column="Version" type="Int64" 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="ChangeType" type="BS.Shared.StatementType, BS.Shared" name="ChangeType" />
<property column="Contact_Oid" type="Int64" name="Contact_Oid" />
<property column="Contact_Organisation2PersonOid" type="Int64" name="Contact_Organisation2PersonOid" />
<property column="Contact_PersonOid" type="Int64" name="Contact_PersonOid" />
<property column="Contact_InvoiceBaseSenderOid" type="Int64" name="Contact_InvoiceBaseSenderOid" />
<property column="Contact_OrganisationOid" type="Int64" name="Contact_OrganisationOid" />
<property column="Contact_InvoiceBaseRecipientOid" type="Int64" name="Contact_InvoiceBaseRecipientOid" />
<property column="Contact_Tid" type="BS.Shared.TableID, BS.Shared" name="Contact_Tid" />
<property column="Contact_Type" type="BS.Shared.ContactType, BS.Shared" name="Contact_Type" />
<property column="Contact_Value" type="string" name="Contact_Value" />
<property column="Contact_Notice" type="string" name="Contact_Notice" />
<property column="Contact_InsTs" type="DateTime" name="Contact_InsTs" />
<property column="Contact_InsUser" type="string" name="Contact_InsUser" />
<property column="Contact_Version" type="Int64" name="Contact_Version" />
<property column="Contact_UdpUser" type="string" name="Contact_UdpUser" />
<property column="Contact_IsActive" type="BS.Shared.ActivationTypeId, BS.Shared" name="Contact_IsActive" />
<property column="Contact_SystemEntryID" type="BS.Shared.SystemEntryID, BS.Shared" name="Contact_SystemEntryID" />
</class>
</hibernate-mapping>

57
Data/Mappings/EmployeeHistory.hbm.xml Normal file
View File

@@ -0,0 +1,57 @@
<?xml version="1.0" encoding="utf-8" ?>
<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2">
<class name="BeWo.Data.Entities.EmployeeHistory,BeWo.Data" table="EmployeeHistory">
<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="ChangeType" type="BS.Shared.StatementType, BS.Shared" name="ChangeType" />
<property column="Employee_Oid" type="Int64" name="Employee_Oid" />
<property column="Employee_PersonOid" type="Int64" name="Employee_PersonOid" />
<property column="Employee_ApplicationUserOid" type="Int64" name="Employee_ApplicationUserOid" />
<property column="Employee_Tid" type="BS.Shared.TableID, BS.Shared" name="Employee_Tid" />
<property column="Employee_PersonnelNumber" type="string" name="Employee_PersonnelNumber" />
<property column="Employee_TaxNumber" type="string" name="Employee_TaxNumber" />
<property column="Employee_HealthInsurance" type="string" name="Employee_HealthInsurance" />
<property column="Employee_InsuranceNumber" type="string" name="Employee_InsuranceNumber" />
<property column="Employee_HourlyRate" type="decimal" name="Employee_HourlyRate" />
<property column="Employee_EntryDate" type="DateTime" name="Employee_EntryDate" />
<property column="Employee_CancellationPeriod" type="Int32" name="Employee_CancellationPeriod" />
<property column="Employee_ProbationPeriod" type="Int32" name="Employee_ProbationPeriod" />
<property column="Employee_Sequence" type="Int32" name="Employee_Sequence" />
<property column="Employee_IsActive" type="BS.Shared.ActivationTypeId, BS.Shared" name="Employee_IsActive" />
<property column="Employee_Notice" type="string" name="Employee_Notice" />
<property column="Employee_InsTs" type="DateTime" name="Employee_InsTs" />
<property column="Employee_InsUser" type="string" name="Employee_InsUser" />
<property column="Employee_Version" type="Int64" name="Employee_Version" />
<property column="Employee_UdpUser" type="string" name="Employee_UdpUser" />
<property column="Employee_SystemEntryID" type="BS.Shared.SystemEntryID, BS.Shared" name="Employee_SystemEntryID" />
<property column="Employee_weeklyfls" type="decimal" name="Employee_weeklyfls" />
<property column="Employee_weeklytotalhours" type="decimal" name="Employee_weeklytotalhours" />
<property column="Employee_leavedays" type="decimal" name="Employee_leavedays" />
<property column="Employee_IsQualified" type="bool" name="Employee_IsQualified" />
<property column="Employee_Text1" type="string" name="Employee_Text1" />
<property column="Employee_Text2" type="string" name="Employee_Text2" />
<property column="Employee_Text3" type="string" name="Employee_Text3" />
<property column="Employee_Text4" type="string" name="Employee_Text4" />
<property column="Employee_Text5" type="string" name="Employee_Text5" />
<property column="Employee_Notice2" type="string" name="Employee_Notice2" />
<property column="Employee_EmployeeColor" type="string" name="Employee_EmployeeColor" />
<property column="Employee_Pflege" type="bool" name="Employee_Pflege" />
<property column="Employee_Toilettengang" type="bool" name="Employee_Toilettengang" />
<property column="Employee_Aggressiv" type="bool" name="Employee_Aggressiv" />
<property column="Employee_Schutzstufe" type="string" name="Employee_Schutzstufe" />
<property column="Employee_Hygienebelehrung" type="bool" name="Employee_Hygienebelehrung" />
</class>
</hibernate-mapping>

1
Data/Mappings/Person.hbm.xml
View File

@@ -20,6 +20,7 @@
<property column="InsUser" type="String" name="InsUser" length="256" />
<property column="UdpUser" type="String" name="UdpUser" length="256" />
<property column="IsMigrant" name="IsMigrant" />
<property column="Migrationshintergrund" type="String" name="Migrationshintergrund" />
<property column="IsActive" type="BS.Shared.ActivationTypeId, BS.Shared" name="IsActive" />
<property column="SystemEntryID" type="BS.Shared.SystemEntryID, BS.Shared" name="SystemEntryID" />
<many-to-one name="Title" column="TitleValueListEntryOid" class="BeWo.Data.Entities.ValueListEntry,BeWo.Data" cascade="none" fetch="join"/>

54
Data/Mappings/PersonHistory.hbm.xml Normal file
View File

@@ -0,0 +1,54 @@
<?xml version="1.0" encoding="utf-8" ?>
<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2">
<class name="BeWo.Data.Entities.PersonHistory,BeWo.Data" table="PersonHistory">
<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="ChangeType" type="BS.Shared.StatementType, BS.Shared" name="ChangeType" />
<property column="Person_Oid" type="Int64" name="Person_Oid" />
<property column="Person_BankAccountOid" type="Int64" name="Person_BankAccountOid" />
<property column="Person_AddressOid" type="Int64" name="Person_AddressOid" />
<property column="Person_InvoiceAddressOid" type="Int64" name="Person_InvoiceAddressOid" />
<property column="Person_Tid" type="BS.Shared.TableID, BS.Shared" name="Person_Tid" />
<property column="Person_FirstName" type="string" name="Person_FirstName" />
<property column="Person_LastName" type="string" name="Person_LastName" />
<property column="Person_Abbreviation" type="string" name="Person_Abbreviation" />
<property column="Person_DateOfBirth" type="DateTime" name="Person_DateOfBirth" />
<property column="Person_Sex" type="BS.Shared.Sex, BS.Shared" name="Person_Sex" />
<property column="Person_FamilyStatus" type="BS.Shared.FamilyStatus, BS.Shared" name="Person_FamilyStatus" />
<property column="Person_Profession" type="string" name="Person_Profession" />
<property column="Person_Type" type="BS.Shared.PersonType, BS.Shared" name="Person_Type" />
<property column="Person_Notice" type="string" name="Person_Notice" />
<property column="Person_InsTs" type="DateTime" name="Person_InsTs" />
<property column="Person_InsUser" type="string" name="Person_InsUser" />
<property column="Person_Version" type="Int64" name="Person_Version" />
<property column="Person_UdpUser" type="string" name="Person_UdpUser" />
<property column="Person_IsActive" type="BS.Shared.ActivationTypeId, BS.Shared" name="Person_IsActive" />
<property column="Person_SystemEntryID" type="BS.Shared.SystemEntryID, BS.Shared" name="Person_SystemEntryID" />
<property column="Person_IsMigrant" type="bool" name="Person_IsMigrant" />
<property column="Person_Title" type="string" name="Person_Title" />
<property column="Person_Function" type="string" name="Person_Function" />
<property column="Person_Nationalitaet" type="string" name="Person_Nationalitaet" />
<property column="Person_AufenthaltsStatus" type="string" name="Person_AufenthaltsStatus" />
<!--<many-to-one name="Person_Title" column="Person_TitleValueListEntryOid" class="BeWo.Data.Entities.ValueListEntry,BeWo.Data" cascade="none" />
<many-to-one name="Person_Function" column="Person_FunctionValueListEntryOid" class="BeWo.Data.Entities.ValueListEntry,BeWo.Data" cascade="none" />
<many-to-one name="Person_Nationalitaet" column="Person_NationalitaetValueListEntryOid" class="BeWo.Data.Entities.ValueListEntry,BeWo.Data" cascade="none" />
<many-to-one name="Person_AufenthaltsStatus" column="Person_AufenthaltsStatusValueListEntryOid" class="BeWo.Data.Entities.ValueListEntry,BeWo.Data" cascade="none" />-->
<!--<many-to-one name="Jugendamt" column="OrganisationOid" class="BeWo.Data.Entities.Organisation, BeWo.Data" cascade="none" />
<many-to-one name="Ansprechpartner" column="AnsprechpartnerOid" class="BeWo.Data.Entities.Person, BeWo.Data" cascade="none" />-->
</class>
</hibernate-mapping>

92
Model/Changes_2019_06_05 PersonHistory und EmployeeHistory Tabelle erstellt.txt Normal file
View File

@@ -0,0 +1,92 @@
CREATE TABLE `personhistory` (
`Oid` bigint(19) PRIMARY KEY 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,
`ChangeType` int(10) DEFAULT NULL,
`Person_Oid` bigint(19) NOT NULL,
`Person_BankAccountOid` bigint(19) DEFAULT NULL,
`Person_AddressOid` bigint(19) DEFAULT NULL,
`Person_InvoiceAddressOid` bigint(19) DEFAULT NULL,
`Person_Tid` int(10) NOT NULL,
`Person_FirstName` varchar(256) DEFAULT NULL,
`Person_LastName` varchar(256) DEFAULT NULL,
`Person_Abbreviation` varchar(16) DEFAULT NULL,
`Person_DateOfBirth` datetime DEFAULT NULL,
`Person_Sex` int(10) DEFAULT NULL,
`Person_FamilyStatus` int(10) DEFAULT NULL,
`Person_Profession` varchar(256) DEFAULT NULL,
`Person_Type` int(10) DEFAULT NULL,
`Person_Notice` mediumtext,
`Person_InsTs` datetime DEFAULT NULL,
`Person_InsUser` varchar(256) DEFAULT NULL,
`Person_Version` bigint(19) DEFAULT NULL,
`Person_UdpUser` varchar(256) DEFAULT NULL,
`Person_IsActive` tinyint(4) DEFAULT NULL,
`Person_SystemEntryID` int(10) DEFAULT NULL,
`Person_Title` varchar(2048) DEFAULT NULL,
`Person_FunctionV` varchar(2048) DEFAULT NULL,
`Person_IsMigrant` tinyint(4) DEFAULT NULL,
`Person_Nationalitaet` varchar(2048) DEFAULT NULL,
`Person_AufenthaltsStatus` varchar(2048) DEFAULT NULL
)ENGINE=InnoDB DEFAULT CHARSET=latin1;
CREATE TABLE `employeehistory` (
`Oid` bigint(19) PRIMARY KEY 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,
`ChangeType` int(10) DEFAULT NULL,
`Employee_Oid` bigint(19) NOT NULL,
`Employee_PersonOid` bigint(19) NOT NULL,
`Employee_ApplicationUserOid` bigint(19) DEFAULT NULL,
`Employee_Tid` int(10) NOT NULL,
`Employee_PersonnelNumber` varchar(128) DEFAULT NULL,
`Employee_TaxNumber` varchar(128) DEFAULT NULL,
`Employee_HealthInsurance` varchar(128) DEFAULT NULL,
`Employee_InsuranceNumber` varchar(128) DEFAULT NULL,
`Employee_HourlyRate` decimal(18,10) DEFAULT NULL,
`Employee_EntryDate` datetime DEFAULT NULL,
`Employee_CancellationPeriod` int(10) DEFAULT NULL,
`Employee_ProbationPeriod` int(10) DEFAULT NULL,
`Employee_Sequence` int(10) DEFAULT NULL,
`Employee_IsActive` tinyint(4) DEFAULT NULL,
`Employee_Notice` varchar(1024) DEFAULT NULL,
`Employee_InsTs` datetime DEFAULT NULL,
`Employee_InsUser` varchar(256) DEFAULT NULL,
`Employee_Version` bigint(19) DEFAULT NULL,
`Employee_UdpUser` varchar(256) DEFAULT NULL,
`Employee_SystemEntryID` int(10) DEFAULT NULL,
`Employee_weeklyfls` decimal(18,10) DEFAULT NULL,
`Employee_weeklytotalhours` decimal(18,10) DEFAULT NULL,
`Employee_leavedays` decimal(18,10) DEFAULT NULL,
`Employee_IsQualified` tinyint(4) DEFAULT NULL,
`Employee_Text1` varchar(128) DEFAULT NULL,
`Employee_Text2` varchar(128) DEFAULT NULL,
`Employee_Text3` varchar(128) DEFAULT NULL,
`Employee_Text4` varchar(128) DEFAULT NULL,
`Employee_Text5` varchar(128) DEFAULT NULL,
`Employee_Notice2` mediumtext,
`Employee_EmployeeColor` varchar(9) DEFAULT NULL,
`Employee_EmployeeImage` longblob,
`Employee_EmployeeThumbnail` longblob,
`Employee_Pflege` tinyint(4) DEFAULT NULL,
`Employee_Toilettengang` tinyint(4) DEFAULT NULL,
`Employee_Aggressiv` tinyint(4) DEFAULT NULL,
`Employee_Schutzstufe` varchar(1024) DEFAULT NULL,
`Employee_Hygienebelehrung` tinyint(4) DEFAULT NULL
) ENGINE=InnoDB DEFAULT CHARSET=latin1;

61
Model/Changes_2019_06_06 AddressHistory und ContactHistory Tabelle erstellt.txt Normal file
View File

@@ -0,0 +1,61 @@
CREATE TABLE `contacthistory` (
`Oid` bigint(19) PRIMARY KEY 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,
`ChangeType` int(10) DEFAULT NULL,
`Contact_Oid` bigint(19) NOT NULL,
`Contact_Organisation2PersonOid` bigint(19) DEFAULT NULL,
`Contact_PersonOid` bigint(19) DEFAULT NULL,
`Contact_InvoiceBaseSenderOid` bigint(19) DEFAULT NULL,
`Contact_OrganisationOid` bigint(19) DEFAULT NULL,
`Contact_InvoiceBaseRecipientOid` bigint(19) DEFAULT NULL,
`Contact_Tid` int(10) NOT NULL,
`Contact_Type` int(10) DEFAULT NULL,
`Contact_Value` varchar(1024) DEFAULT NULL,
`Contact_Notice` varchar(1024) DEFAULT NULL,
`Contact_InsTs` datetime DEFAULT NULL,
`Contact_InsUser` varchar(256) DEFAULT NULL,
`Contact_Version` bigint(19) DEFAULT NULL,
`Contact_UdpUser` varchar(256) DEFAULT NULL,
`Contact_IsActive` tinyint(4) DEFAULT NULL,
`Contact_SystemEntryID` int(10) DEFAULT NULL
)ENGINE=InnoDB DEFAULT CHARSET=latin1;
CREATE TABLE `addresshistory` (
`Oid` bigint(19) PRIMARY KEY 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,
`ChangeType` int(10) DEFAULT NULL,
`Address_Oid` bigint(19) NOT NULL,
`Address_Tid` int(10) NOT NULL,
`Address_Street` varchar(256) DEFAULT NULL,
`Address_PostalCode` varchar(128) DEFAULT NULL,
`Address_Town` varchar(256) DEFAULT NULL,
`Address_State` varchar(256) DEFAULT NULL,
`Address_Country` varchar(256) DEFAULT NULL,
`Address_Notice` varchar(1024) DEFAULT NULL,
`Address_InsTs` datetime DEFAULT NULL,
`Address_InsUser` varchar(256) DEFAULT NULL,
`Address_Version` bigint(19) DEFAULT NULL,
`Address_UdpUser` varchar(256) DEFAULT NULL,
`Address_IsActive` tinyint(4) DEFAULT NULL,
`Address_SystemEntryID` int(10) DEFAULT NULL,
`Address_AddressLine1` varchar(64) DEFAULT NULL,
`Address_AddressLine2` varchar(64) DEFAULT NULL
) ENGINE=InnoDB DEFAULT CHARSET=latin1;

16
Model/Changes_2019_06_07 Budget Tabelle erstellt.txt Normal file
View File

@@ -0,0 +1,16 @@
CREATE TABLE `budget` (
`Oid` bigint(19) PRIMARY KEY 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,
`Name` varchar(512) DEFAULT NULL,
`Betragshoehe` decimal(18,10) DEFAULT NULL
)ENGINE=InnoDB DEFAULT CHARSET=latin1;

2
Model/Changes_2019_06_14 Customer.Migrationshintergrund (string) hinzugefügt.txt Normal file
View File

@@ -0,0 +1,2 @@
ALTER TABLE `bewodemo`.`person`
ADD COLUMN `Migrationshintergrund` VARCHAR(1024) NULL AFTER `AufenthaltsStatusValueListEntryOid`;

61
Service/DCEntityMapper/BudgetDC_Budget.cs Normal file
View File

@@ -0,0 +1,61 @@
using System.Linq;
using BeWo.Data.Access;
using BeWo.Data.Entities;
using BS.Shared;
using BS.Shared.DataContracts;
using System.Collections.Generic;
using BS.Shared.Core;
namespace BeWo.Service.DCEntityMapper
{
public class BudgetDC_Budget : AbstractIDCEntityMapper<Budget, BudgetDC>
{
public override BudgetDC MergeWithDC(Budget bEntity, BudgetDC bDataContract)
{
bDataContract.BudgetOid = bEntity.Oid;
bDataContract.BudgetIsActive = bEntity.IsActive;
bDataContract.BudgetNotice = bEntity.Notice;
bDataContract.BudgetInsTs = bEntity.InsTs;
bDataContract.BudgetInsUser = bEntity.InsUser;
bDataContract.BudgetVersion = bEntity.Version;
bDataContract.BudgetUdpUser = bEntity.UdpUser;
bDataContract.BudgetSystemEntryID = bEntity.SystemEntryID;
bDataContract.Name = bEntity.Name;
bDataContract.Betragshoehe = bEntity.Betragshoehe;
//var defs = DAOFactory.SearchDAO.GetVarFieldDefs(TableID.Person);
//pDataContract.VarFields = MapperFactory.VarFieldDC_VarField.VarFieldMapToDCs(defs, pEntity.VarFieldValueList);
//if (pEntity.Images != null)
//{
// pDataContract.Images = pEntity.Images.Select(i => i.Original).ToList();
//}
return bDataContract;
}
public override Budget MergeWithEntity(BudgetDC bDataContract, Budget bEntity)
{
this.ConcurrencyCheck(bDataContract.BudgetVersion, bEntity);
bEntity.Oid = bDataContract.BudgetOid;
bEntity.Notice = bDataContract.BudgetNotice;
bEntity.SystemEntryID = bDataContract.BudgetSystemEntryID;
bEntity.Name = bDataContract.Name;
bEntity.Betragshoehe = bDataContract.Betragshoehe;
return bEntity;
}
protected override bool AreDCAndEntityEqual(BudgetDC bDC, Budget bEntity)
{
if (bDC.BudgetOid == null)
{
return false;
}
return bDC.BudgetOid == bEntity.Oid;
}
}
}

12
Service/DCEntityMapper/MapperFactory.cs
View File

@@ -234,6 +234,8 @@ namespace BeWo.Service.DCEntityMapper
private static MedRecordDC_MedRecord _MedRecordDC_MedRecord;
private static FeiertagDC_Feiertag _FeiertagDC_Feiertag;
private static BudgetDC_Budget _BudgetDC_Budget;
public static MedRecordDC_MedRecord MedRecordDC_MedRecord
@@ -1207,5 +1209,13 @@ namespace BeWo.Service.DCEntityMapper
return _FeiertagDC_Feiertag ?? (_FeiertagDC_Feiertag = new FeiertagDC_Feiertag());
}
}
}
public static BudgetDC_Budget BudgetDC_Budget
{
get
{
return _BudgetDC_Budget ?? (_BudgetDC_Budget = new BudgetDC_Budget());
}
}
}
}

4
Service/DCEntityMapper/PersonDC_Person.cs
View File

@@ -26,6 +26,7 @@ namespace BeWo.Service.DCEntityMapper
pDataContract.ActivationType = pEntity.IsActive;
pDataContract.Type = pEntity.Type;
pDataContract.IsMigrant = pEntity.IsMigrant;
pDataContract.Migrationshintergrund = pEntity.Migrationshintergrund;
if (pEntity.Title != null)
@@ -111,8 +112,9 @@ namespace BeWo.Service.DCEntityMapper
pEntity.Abbreviation = pDataContract.Abbreviation;
pEntity.IsActive = pDataContract.ActivationType;
pEntity.IsMigrant = pDataContract.IsMigrant;
pEntity.Migrationshintergrund = pDataContract.Migrationshintergrund;
if (pDataContract.Title == null)
if (pDataContract.Title == null)
{
pEntity.Title = null;
}

13
Service/Plugins/PluginLoader.cs
View File

@@ -95,7 +95,7 @@ namespace BeWo.Service.Plugins
//t = "2727001973"; // SD Julia Schönberg
//t = "5653806613"; // Feid und Kollegen
//t = "3830114427"; // FiZ Familie im Zentrum Hof
t = "7138297573"; // Tagwerk betreutes wohnen
//t = "7138297573"; // Tagwerk betreutes wohnen
//t = "1008896531"; // BeWo Auxilio
//t = "9383760246"; // Die Kette
//t = "5915565037"; // LH Remscheid
@@ -177,7 +177,7 @@ namespace BeWo.Service.Plugins
//t = "2331203795"; // BeWo für dich
//t = "5426234256"; // SKM Leverkusen
//t = "4137042939"; // MLG Lebengestalten / Haus Müllestumpe
t = "5260936181"; // LORI
//t = "5260936181"; // LORI
//t = "1931553444"; // HIBA
//t = "7185338722"; // BeWo Walz & Paiva
//t = "3196643272"; // Betreutes Wohnen Lisa Wöll
@@ -199,10 +199,11 @@ namespace BeWo.Service.Plugins
//t = "8407321888"; // AWO Wesel
//t = "8454426692"; // Mit-Menschen
//t = "0629004412"; // BeWo-Colonia Basaran
//t = "7668701607"; // Wohnstätten Essen
//t = "3833058951"; // Aids Hilfe Duisburg (Self)
//t = "9463879250"; // ABW Dziallas und Muhrin
//t = "7668701607"; // Wohnstätten Essen
//t = "3833058951"; // Aids Hilfe Duisburg (Self)
//t = "9463879250"; // ABW Dziallas und Muhrin
//t = "5022131330"; // Tabula Rasa
t = "4189934785"; // Landshuter Netzwerke
return t;
#else
if (MultitenancyOperationContextExt.Current != null)

1
Service/Service.csproj
View File

@@ -237,6 +237,7 @@
<Compile Include="DCEntityMapper\EmployeeTokenRelationDC_Employee2Token.cs" />
<Compile Include="DCEntityMapper\CompactTokenDC_Token.cs" />
<Compile Include="DCEntityMapper\ChatBewoMessageSyncDC_ChatBewoMessageSync.cs" />
<Compile Include="DCEntityMapper\BudgetDC_Budget.cs" />
<Compile Include="DCEntityMapper\QuittierungsCheckDC_QuittierungsCheck.cs" />
<Compile Include="DCEntityMapper\TextbausteinDC_Textbaustein.cs" />
<Compile Include="DCEntityMapper\TokenDC_Token.cs" />

24
Service/ServiceContracts/IOperationsService.cs
View File

@@ -101,7 +101,11 @@ namespace BeWo.Service.ServiceContracts
[OperationContract]
List<ServiceCategoryDC> GetAllServiceCategories();
[FaultContract(typeof(BeWoFault))]
[FaultContract(typeof(BeWoFault))]
[OperationContract]
List<BudgetDC> GetAllBudgets();
[FaultContract(typeof(BeWoFault))]
[OperationContract]
List<ServiceDescriptionDC> GetAllServiceDescriptions();
@@ -791,5 +795,21 @@ namespace BeWo.Service.ServiceContracts
[FaultContract(typeof(BeWoFault))]
[OperationContract]
SignatureDC GetSignature(long pSignatureOid);
}
[FaultContract(typeof(BeWoFault))]
[OperationContract]
void InsertNewBudget(List<BudgetDC> budgets);
[FaultContract(typeof(BeWoFault))]
[OperationContract]
void DeactivateBudget(Dictionary<long, long> pOid2Version);
[FaultContract(typeof(BeWoFault))]
[OperationContract]
void UpdateBudget(List<BudgetDC> budgets);
[FaultContract(typeof(BeWoFault))]
[OperationContract]
IList<FlexibleReportEntryDC> GetAllFlexibleReportEntrys(FlexibleReportFilterDC filter);
}
}

3153
Service/ServiceImplementations/CustomerServiceImp.cs
View File

File diff suppressed because it is too large Load Diff

78
Service/ServiceImplementations/EmployeeServiceImp.cs
View File

@@ -30,8 +30,11 @@ namespace BeWo.Service.ServiceImplementations
{
var e = DAOFactory.GenericDAO.LoadByID<Employee>(pOid);
e.Person.IsActive = ActivationTypeId.Archived;
MakeNewEmployeeHistoryEntry(e, StatementType.Archived);
ServiceLogic.SetActivationType<Employee>(pOid, pVersion, ActivationTypeId.Archived);
}
catch (Exception e)
{
@@ -87,9 +90,10 @@ namespace BeWo.Service.ServiceImplementations
e.Person.IsActive = ActivationTypeId.Deleted;
ServiceLogic.SetActivationType<Employee>(pOid, pVersion, ActivationTypeId.Deleted);
DeleteEmployeeCustomerRelationForEmployee(pOid);
MakeNewEmployeeHistoryEntry(e, StatementType.Delete);
}
DeleteEmployeeCustomerRelationForEmployee(pOid);
}
catch (Exception e)
{
throw Utils.CreateBeWoFaultException(e);
@@ -205,6 +209,11 @@ namespace BeWo.Service.ServiceImplementations
var lOriginals = DAOFactory.GenericDAO.LoadByIDs<Employee>(pOid2Version.Select(e => e.Key));
lOriginals.DoForEach(or => MapperFactory.EmployeeDC_Employee.ConcurrencyCheck(pOid2Version[or.Oid.Value], or));
foreach (Employee e in lOriginals)
{
MakeNewEmployeeHistoryEntry(e, StatementType.Delete);
}
DAOFactory.GenericDAO.Delete(lOriginals);
}
catch (Exception e)
@@ -676,7 +685,13 @@ namespace BeWo.Service.ServiceImplementations
}
var es = PluginLoader.FindClass<EmployeeService>();
return es.InsertNewEmployee(pEmployeeDC);
var id = es.InsertNewEmployee(pEmployeeDC);
var temp = DAOFactory.GenericDAO.LoadByID<Employee>(id);
MakeNewEmployeeHistoryEntry(temp, StatementType.Insert);
return id;
}
catch (Exception e)
{
@@ -846,6 +861,9 @@ namespace BeWo.Service.ServiceImplementations
{
var lOriginal = DAOFactory.GenericDAO.LoadByID<Employee>(pEmployeeDC.EmployeeOid.Value);
MapperFactory.EmployeeDC_Employee.MergeWithEntity(pEmployeeDC, lOriginal);
MakeNewEmployeeHistoryEntry(lOriginal, StatementType.Update);
DAOFactory.GenericDAO.Update(lOriginal);
return lOriginal.Oid.Value;
}
@@ -1475,6 +1493,9 @@ namespace BeWo.Service.ServiceImplementations
{
try
{
var e = DAOFactory.GenericDAO.LoadByID<Employee>(pOid);
MakeNewEmployeeHistoryEntry(e, StatementType.Reactivate);
ServiceLogic.SetActivationType<Employee>(pOid, pVersion, ActivationTypeId.Active);
}
catch(Exception e)
@@ -1496,5 +1517,54 @@ namespace BeWo.Service.ServiceImplementations
throw Utils.CreateBeWoFaultException(e);
}
}
public void MakeNewEmployeeHistoryEntry(Employee employee, StatementType statementType)
{
var employeeHistory = new EmployeeHistory
{
ChangeType = statementType,
Employee_Aggressiv = employee.Aggressiv,
//Employee_ApplicationUserOid,
//Employee_CancellationPeriod,
Employee_EmployeeColor = employee.EmployeeColor,
//Employee_EntryDate,
Employee_HealthInsurance = employee.HealthInsurance,
//Employee_HourlyRate,
Employee_Hygienebelehrung = employee.Hygienebelehrung,
Employee_InsTs = employee.InsTs,
Employee_InsuranceNumber = employee.InsuranceNumber,
Employee_InsUser = employee.InsUser,
Employee_IsActive = employee.IsActive,
Employee_IsQualified = employee.IsQualified,
//Employee_leavedays,
Employee_Notice = employee.Notice,
Employee_Notice2 = employee.Notice2,
Employee_Oid = employee.Oid,
Employee_PersonnelNumber = employee.PersonnelNumber,
//Employee_PersonOid,
Employee_Pflege = employee.Pflege,
//Employee_ProbationPeriod,
Employee_Schutzstufe = employee.Schutzstufe,
//Employee_Sequence,
Employee_SystemEntryID = employee.SystemEntryID,
Employee_TaxNumber = employee.TaxNumber,
Employee_Text1 = employee.Text1,
Employee_Text2 = employee.Text2,
Employee_Text3 = employee.Text3,
Employee_Text4 = employee.Text4,
Employee_Text5 = employee.Text5,
Employee_Tid = employee.Tid,
Employee_Toilettengang = employee.Toilettengang,
Employee_UdpUser = employee.UdpUser,
Employee_Version = employee.Version,
//Employee_weeklyfls = employee,
//Employee_weeklytotalhours,
};
CustomerServiceImp.MakeNewPersonHistoryEntry(employee.Person, statementType);
DAOFactory.GenericDAO.Insert(employeeHistory);
}
}
}

335
Service/ServiceImplementations/OperationsServiceImp.cs
View File

@@ -5563,5 +5563,340 @@ namespace BeWo.Service.ServiceImplementations
throw Utils.CreateBeWoFaultException(e);
}
}
public List<BudgetDC> GetAllBudgets()
{
try
{
var list = DAOFactory.GenericDAO.GetAllActive<Budget>();
return MapperFactory.BudgetDC_Budget.MapToNewDCs(list);
}
catch (Exception e)
{
throw Utils.CreateBeWoFaultException(e);
}
}
public void InsertNewBudget(List<BudgetDC> budgets)
{
try
{
var budget = MapperFactory.BudgetDC_Budget.MapToNewEntities(budgets);
DAOFactory.GenericDAO.Insert(budget);
}
catch (Exception e)
{
throw Utils.CreateBeWoFaultException(e);
}
}
public void DeactivateBudget(Dictionary<long, long> pOid2Version)
{
try
{
ServiceLogic.SetActivationType<Budget>(pOid2Version, ActivationTypeId.Deleted);
}
catch (Exception e)
{
throw Utils.CreateBeWoFaultException(e);
}
}
public void UpdateBudget(List<BudgetDC> budgets)
{
try
{
var lOriginals = DAOFactory.GenericDAO.LoadByIDs<Budget>(budgets.Select(sc => sc.BudgetOid.Value));
MapperFactory.BudgetDC_Budget.MergeWithEntitys(budgets, lOriginals);
DAOFactory.GenericDAO.Update(lOriginals);
}
catch (Exception e)
{
throw Utils.CreateBeWoFaultException(e);
}
}
public IList<FlexibleReportEntryDC> GetAllFlexibleReportEntrys(FlexibleReportFilterDC filter)
{
try
{
var calc = PluginLoader.FindClass<Calculations>();
var dict = new Dictionary<string, FlexibleReportEntryDC>();
var result = new List<FlexibleReportEntryDC>();
var span = new DateTimeSpan() { StartDateTime = filter.StartDatum.Date, EndDateTime = filter.EndDatum.Date.AddDays(1).AddTicks(-1) };
var alleHps = DAOFactory.SearchDAO.FindSupportConceptsInSpan(span);
var alleEmps = DAOFactory.GenericDAO.GetAllActive<Employee>();
#region Erzeuge leere Daten
foreach (var item in alleHps)
{
var resultEntry = new FlexibleReportEntryDC();
var added = false;
if (span.StartDate <= item.EndDate && span.EndDate >= item.StartDate)
{
foreach (var c2s in item.CostBearer2SupportConceptList)
{
if (span.StartDate <= c2s.EndDate && span.EndDate >= c2s.StartDate)
{
foreach (var e2c in item.Customer.Employee2CustomerList)
{
if (IstHauptbetreuer(item.Customer, e2c.Employee))
{
added = true;
result.AddRange(GetEmptyFlexibleReportsInTimeSpan(span, e2c.Employee, item, FlexibleReportEntryType.CustomerEmployeeNullEntry));
}
}
}
}
if (!added)
{
result.AddRange(GetEmptyFlexibleReportsInTimeSpan(span, null, item, FlexibleReportEntryType.CustomerNullEntry));
}
}
}
foreach (var item in alleEmps)
{
for (DateTime date = span.StartDate; date <= span.EndDate; date = date.AddDays(1))
{
result.Add(new FlexibleReportEntryDC()
{
Employee = MapperFactory.CompactEmployeeDC_Employee.MapToNewDC(item),
Type = FlexibleReportEntryType.EmployeeNullEntry,
Datum = date
});
}
}
#endregion
var list = DAOFactory.SearchDAO.FindServiceRecordsInSpan(span, null).ToList();
foreach (var serviceRecordListEntry in list)
{
FlexibleReportEntryDC resultEntry;
if (serviceRecordListEntry.Customer != null)
resultEntry = result.Where(x => x.CustomerOid == serviceRecordListEntry.CustomerOid && x.Type == FlexibleReportEntryType.CustomerNullEntry).FirstOrDefault() ?? new FlexibleReportEntryDC();
else
resultEntry = new FlexibleReportEntryDC();
if (serviceRecordListEntry.CustomerOid != null)
{
var key = CreateFlexibleDictionaryKey(
serviceRecordListEntry.CustomerOid.Value,
serviceRecordListEntry.Start.Value,
serviceRecordListEntry.EmployeeOid ?? 0,
GetTeamNameByTeam2CustomerList(serviceRecordListEntry.Customer.Team2CustomerList));//,
//serviceRecordListEntry.ServiceDescription.Name,
//serviceRecordListEntry.ServiceDescription.ServiceCategory.Name);
// Wenn sich noch kein Eintrag in der Liste befindet
if (!dict.ContainsKey(key))
{
DateTime start = span.StartDate.Date;
DateTime ende = span.EndDate.Date;
if (serviceRecordListEntry.SupportConcept != null)
{
// Holt sich den Hilfeplan und erstellt den Solltermin
resultEntry.SupportConcept = MapperFactory.CompactSupportConceptDC_SupportConcept.MapToNewDC(serviceRecordListEntry.SupportConcept);
CreateFlexibleReportSoll(resultEntry, serviceRecordListEntry, serviceRecordListEntry.Start.Value, calc);
// Schaut, ob der Hilfeplan nach dem ausgewählten Startdatum anfängt
if (resultEntry.SupportConcept.StartDate.HasValue)
if (span.StartDate.Date < resultEntry.SupportConcept.StartDate.Value)
start = resultEntry.SupportConcept.StartDate.Value;
// Schaut, ob der Hilfeplan vor dem ausgewählten Endzeitpunkt ausläuft
if (resultEntry.SupportConcept.EndDate.HasValue)
if (span.EndDate.Date > resultEntry.SupportConcept.EndDate.Value)
ende = resultEntry.SupportConcept.EndDate.Value;
}
if (serviceRecordListEntry.Customer != null)
{
// Erstellt die leeren Objekte zur Berechnung der Sollanzahl
foreach (var nullEntry in CreateFlexibleNullEntries(serviceRecordListEntry, start, ende, resultEntry.AnzahlMinutenSoll))
{
CreateFlexibleReportSoll(nullEntry, serviceRecordListEntry, nullEntry.Datum, calc);
var newKey = CreateFlexibleDictionaryKey(
serviceRecordListEntry.CustomerOid.Value,
nullEntry.Datum,
serviceRecordListEntry.EmployeeOid ?? 0,
GetTeamNameByTeam2CustomerList(serviceRecordListEntry.Customer.Team2CustomerList));
//,
// serviceRecordListEntry.ServiceDescription.Name,
// serviceRecordListEntry.ServiceDescription.ServiceCategory.Name);
// Schaut, ob sich der Schlüssel bereits in dem Dict befindet
if (!dict.ContainsKey(newKey))
{
// Schaut, ob das Objekt direkt in die Liste geworfen wird oder vorher noch bearbeitet werden muss
if (nullEntry.Datum != serviceRecordListEntry.Start.Value.Date)
{
dict.Add(newKey, nullEntry);
result.Add(nullEntry);
}
else
{
dict.Add(newKey, resultEntry);
}
}
}
}
}
// Wenn sich bereits eine Zeiterfassung oder ein Platzhalter des Klientens an dem Tag in der Liste befindet
else
{
var existingEntry = dict[key];
// Platzhalter
if (existingEntry.EintraegeProTag == 0)
{
// Entfernt den Eintrag temporär aus der Liste (wird am Ende hinzugefügt)
result.Remove(existingEntry);
resultEntry = existingEntry;
}
// Existierende Zeiterfassung
else
{
resultEntry.EintraegeProTag = existingEntry.EintraegeProTag;
existingEntry.EintraegeProTag += 1;
}
}
}
// Überträgt Daten
resultEntry.EintraegeProTag++;
resultEntry.AnzahlMinuten = serviceRecordListEntry.RoundedDuration;
resultEntry.Kilometer = serviceRecordListEntry.DistanceInMeter;
resultEntry.Datum = serviceRecordListEntry.Start.Value;
resultEntry.Employee = MapperFactory.CompactEmployeeDC_Employee.MapToNewDC(serviceRecordListEntry.Employee);
resultEntry.Leistung = serviceRecordListEntry.ServiceDescription.Name;
resultEntry.Leistungskategorie = serviceRecordListEntry.ServiceDescription.ServiceCategory.Name;
resultEntry.Type = FlexibleReportEntryType.FullEntry;
if (serviceRecordListEntry.Customer != null)
{
resultEntry.Customer = MapperFactory.CompactCustomerDC_Customer.MapToNewDC(serviceRecordListEntry.Customer);
}
result.Add(resultEntry);
}
return result;
}
catch (Exception e)
{
throw Utils.CreateBeWoFaultException(e);
}
}
private IEnumerable<FlexibleReportEntryDC> CreateFlexibleNullEntries(ServiceRecord sr, DateTime start, DateTime ende, decimal? soll)
{
for (DateTime date = start; date <= ende; date = date.AddDays(1.0))
{
var flex = new FlexibleReportEntryDC()
{
Customer = sr.Customer != null ? MapperFactory.CompactCustomerDC_Customer.MapToNewDC(sr.Customer) : null,
Employee = sr.Employee != null ? MapperFactory.CompactEmployeeDC_Employee.MapToNewDC(sr.Employee) : null,
Datum = date,
AnzahlMinuten = 0,
AnzahlMinutenSoll = soll,
Leistung = sr.ServiceDescription.Name,
Leistungskategorie = sr.ServiceDescription.ServiceCategory.Name,
SupportConcept = MapperFactory.CompactSupportConceptDC_SupportConcept.MapToNewDC(sr.SupportConcept) ?? null,
EintraegeProTag = 0,
};
if (sr.Customer != null)
{
flex.Customer = MapperFactory.CompactCustomerDC_Customer.MapToNewDC(sr.Customer);
flex.Team = "";
foreach (var t2c in sr.Customer.Team2CustomerList)
{
if (flex.Team.Length > 0)
flex.Team += ", ";
flex.Team = t2c.Team.Name;
}
}
yield return flex;
}
}
private string CreateFlexibleDictionaryKey(long customerOid, DateTime date, long employeeOid, string team) //, string leistung, string leistungskategorie)
{
return string.Format("{0}_{1:dd.MM.yyyy}_{2}_{3}", customerOid, date, employeeOid, team); //, leistung, leistungskategorie);
}
private string GetTeamNameByTeam2CustomerList(IList<Team2Customer> team2Customers)
{
string name = "";
foreach (var t2c in team2Customers)
{
if (name.Length > 0)
name += ", ";
name = t2c.Team.Name;
}
return name;
}
private void CreateFlexibleReportSoll(FlexibleReportEntryDC entry, ServiceRecord item, DateTime datum, Calculations calc)
{
if (item.CostBearer2SupportConcept != null && IstHauptbetreuer(item.Customer, item.Employee))
{
var c2sDc = MapperFactory.SupportConceptCostBearerRelDC_CostBearer2SupportConcept.MapToNewDC(item.CostBearer2SupportConcept);
var sollPerDay = calc.GetApprovedHoursPerDay(c2sDc, datum);
entry.AnzahlMinutenSoll = sollPerDay * 60;
}
}
private bool IstHauptbetreuer(Customer c, Employee e)
{
foreach (Employee2Customer e2c in c.Employee2CustomerList)
{
foreach (ValueListEntry2Object vle2o in e2c.ValueList)
{
ValueListEntry vle = vle2o.Entry;
if (vle.SystemEntryID != null && vle.SystemEntryID.Value == SystemEntryID.EmployeeRoleMainAttendant && e2c.EmployeeOid == e.Oid.Value)
{
return true;
}
}
}
return false;
}
private IEnumerable<FlexibleReportEntryDC> GetEmptyFlexibleReportsInTimeSpan(DateTimeSpan span, Employee employee, SupportConcept supportConcept, FlexibleReportEntryType type)
{
for (DateTime date = span.StartDate; date <= span.EndDate; date = date.AddDays(1))
{
yield return new FlexibleReportEntryDC()
{
Employee = employee != null ? MapperFactory.CompactEmployeeDC_Employee.MapToNewDC(employee) : null,
Customer = supportConcept.Customer != null ? MapperFactory.CompactCustomerDC_Customer.MapToNewDC(supportConcept.Customer) : null,
Type = type,
Datum = date,
SupportConcept = MapperFactory.CompactSupportConceptDC_SupportConcept.MapToNewDC(supportConcept)
};
}
}
}
}

22
Shared/BeWoEntityEnums.cs
View File

@@ -130,11 +130,15 @@ namespace BS.Shared
QuittierungsCheck = 123,
CustomerTeam = 124,
ChatBewoMessageSync = 125,
Feiertag = 126,
NotizenKategorie = 127,
NotizenEintrag = 128,
BuchungsExport = 129,
DeletionHistory = 130
Feiertag = 126,
NotizenKategorie = 127,
NotizenEintrag = 128,
BuchungsExport = 129,
PersonHistory = 130,
EmployeeHistory = 131,
AddressHistory = 132,
ContactHistory = 133,
Budget = 134,
}
public enum SystemEntryID
@@ -990,4 +994,12 @@ namespace BS.Shared
Edit,
Create
}
public enum FlexibleReportEntryType
{
EmployeeNullEntry,
CustomerNullEntry,
CustomerEmployeeNullEntry,
FullEntry
}
}

41
Shared/DataContracts/BudgetDC.cs Normal file
View File

@@ -0,0 +1,41 @@
using System;
using System.Collections.Generic;
using System.Runtime.Serialization;
using BS.Shared.Core;
namespace BS.Shared.DataContracts
{
public class BudgetDC : IDataContract
{
[DataMember]
public long? BudgetOid { get; set; }
[DataMember]
public ActivationTypeId BudgetIsActive { get; set; }
[DataMember]
public string BudgetNotice { get; set; }
[DataMember]
public DateTime? BudgetInsTs { get; set; }
[DataMember]
public string BudgetInsUser { get; set; }
[DataMember]
public long? BudgetVersion { get; set; }
[DataMember]
public string BudgetUdpUser { get; set; }
[DataMember]
public SystemEntryID? BudgetSystemEntryID { get; set; }
[DataMember]
public string Name { get; set; }
[DataMember]
public decimal? Betragshoehe { get; set; }
}
}

58
Shared/DataContracts/FlexibleReportEntryDC.cs Normal file
View File

@@ -0,0 +1,58 @@
using BS.Shared.DataContracts.Compact;
using BS.Shared;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Runtime.Serialization;
using System.Text;
using System.Threading.Tasks;
namespace BS.Shared.DataContracts
{
[DataContract]
public class FlexibleReportEntryDC : IDataContract
{
[DataMember]
public CompactCustomerDC Customer { get; set; }
[DataMember]
public CompactSupportConceptDC SupportConcept { get; set; }
[DataMember]
public CompactEmployeeDC Employee { get; set; }
[DataMember]
public string Team { get; set; }
[DataMember]
public string Leistungskategorie { get; set; }
[DataMember]
public string Leistung { get; set; }
[DataMember]
public decimal AnzahlMinuten { get; set; }
[DataMember]
public decimal? AnzahlMinutenSoll { get; set; }
[DataMember]
public int? Kilometer { get; set; }
[DataMember]
public DateTime Datum { get; set; }
[DataMember]
public int EintraegeProTag { get; set; }
[DataMember]
public FlexibleReportEntryType Type { get; set; }
public long? CustomerOid
{
get
{
return Customer != null ? Customer.Oid : null;
}
}
}
}

26
Shared/DataContracts/FlexibleReportFilterDC.cs Normal file
View File

@@ -0,0 +1,26 @@
using BS.Shared.DataContracts.Compact;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Runtime.Serialization;
using System.Text;
using System.Threading.Tasks;
namespace BS.Shared.DataContracts
{
[DataContract]
public class FlexibleReportFilterDC : IDataContract
{
[DataMember]
public DateTime StartDatum { get; set; }
[DataMember]
public DateTime EndDatum { get; set; }
[DataMember]
public IList<ValueListEntryDC> Ziele { get; set; }
[DataMember]
public IList<ServiceDescriptionDC> Leistungen { get; set; }
}
}

5
Shared/DataContracts/PersonDC.cs
View File

@@ -141,7 +141,10 @@ namespace BS.Shared.DataContracts
[DataMember]
public bool IsMigrant { get; set; }
[DataMember]
[DataMember]
public string Migrationshintergrund { get; set; }
[DataMember]
public ValueListEntryDC Nationalitaet { get; set; }
[DataMember]

3
Shared/Shared.csproj
View File

@@ -150,7 +150,10 @@
<Compile Include="DataContracts\AdditionalServiceGroupOfPeopleDC.cs" />
<Compile Include="DataContracts\AdditionalServiceGroupOfPeopleRelationDC.cs" />
<Compile Include="DataContracts\AdditionalServiceRegionDC.cs" />
<Compile Include="DataContracts\BudgetDC.cs" />
<Compile Include="DataContracts\FerienDC.cs" />
<Compile Include="DataContracts\FlexibleReportFilterDC.cs" />
<Compile Include="DataContracts\FlexibleReportEntryDC.cs" />
<Compile Include="DataContracts\NotizenKategorieDC.cs" />
<Compile Include="DataContracts\NotizenEintragDC.cs" />
<Compile Include="DataContracts\ClientPartials\CostRatePeriodDC.cs" />