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

Merge branch 'master' into feature_rene_18_ai

Browse Source 
# Conflicts:
#	BeWo/BeWo.csproj
#	BeWo/BeWoApp.xaml.cs
#	BeWo/View/Detail/EmployeeView.xaml
#	Report/app.config
#	ReportService/app.config
#	Service/ServiceImplementations/EmployeeServiceImp.cs
#	Service/app.config
#	Shared/BeWoEntityEnums.cs
#	Shared/Core/EnumTranslations.cs
This commit is contained in:
Rene Evertz
2025-09-18 14:26:33 +02:00
parent 81c04fbc0a 17ac34a242
commit 68866e8f28
978 changed files with 103693 additions and 57198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Data/Access/GenericDAO.cs
View File

@@ -6,7 +6,6 @@ using BeWo.Data.Entities;
using BeWo.Data.Entities.Light;
using BS.Shared;
using BS.Shared.Extensions;
using BS.Shared.DataContracts.Light;
using NHibernate;
using NHibernate.Criterion;
using NHibernate.Proxy;

34
Data/Access/SearchDAO.cs
View File

@@ -79,6 +79,26 @@ namespace BeWo.Data.Access
return x.Count > 0 ? DAOFactory.GenericDAO.GetByID<Wohnheim>(x.First()) : null;
}
public virtual IList<WohneinheitBelegung> FindWohneinheitBelegungForCustomer(long customerOid, DateTime datum)
{
var criteria = CreateCriteriaIsActive<WohneinheitBelegung>()
.Add(Restrictions.Eq(WohneinheitBelegung.PropertyName_Customer, customerOid))
.Add(
Restrictions.Or(
Restrictions.And(
Restrictions.Le(WohneinheitBelegung.PropertyName_StartDate, datum.Date),
Restrictions.Ge(WohneinheitBelegung.PropertyName_EndDate, datum.Date)
),
Restrictions.And(
Restrictions.Le(WohneinheitBelegung.PropertyName_StartDate, datum.Date),
Restrictions.IsNull(WohneinheitBelegung.PropertyName_EndDate)
)
)
);
return criteria.List<WohneinheitBelegung>();
}
public virtual IEnumerable<Customer> FindCustomer(string pFirstName, string pLastName, string pReferenceNumber)
{
return CreateCriteria<Customer>()
@@ -5976,7 +5996,7 @@ WHERE sc.Billable = 1 and sr.StartDate >= '{0:yyyy-MM-dd}' and sr.StartDate < '{
if(days is object)
{
var intervalStart = DateTime.Today;
var intervalStart = DateTime.Now.GetShortDateTime().AddDays(-days.Value);
var intervalEnd = intervalStart.AddDays(days.Value + 1).AddSeconds(-1);
var timesCriterion = CreateBetweenDateTimesCriterion(intervalStart, intervalEnd, nameof(ServiceRecord.Start), nameof(ServiceRecord.End));
@@ -6019,11 +6039,8 @@ WHERE sc.Billable = 1 and sr.StartDate >= '{0:yyyy-MM-dd}' and sr.StartDate < '{
rowCount = rowCountCirteria.SetProjection(Projections.RowCount()).FutureValue<int>().Value;
var result = criteria
.CreateAlias(nameof(ServiceRecord.ValueList), "vl", JoinType.LeftOuterJoin)
.CreateAlias(nameof(ServiceRecord.ServiceDescription), "sd", JoinType.InnerJoin)
.CreateAlias($"sd.{nameof(ServiceDescription.ServiceCategory)}", "sc", JoinType.InnerJoin)
//.CreateAlias(ServiceRecord.PropertyName_Employee, "e", JoinType.InnerJoin)
//.CreateCriteria("e." + Employee.PropertyName_Person, JoinType.InnerJoin)
.SetFirstResult(firstResult)
.SetMaxResults(maxResults)
.Future<ServiceRecord>();
@@ -6360,7 +6377,8 @@ WHERE sc.Billable = 1 and sr.StartDate >= '{0:yyyy-MM-dd}' and sr.StartDate < '{
SignatureType = bargeldtransaktion is null ? SignatureTable.SingleSignature : SignatureTable.BargeldkasseneinzahlungsSignature,
TimeSpanStart = signatureTimeSpanStart,
TimeSpanEnd = signatureTimeSpanEnd,
SignatureEventType = signatureEventType
SignatureEventType = signatureEventType,
DataBild = signature.DataBild
};
if(serviceRecord?.Oid is object)
@@ -6436,7 +6454,8 @@ WHERE sc.Billable = 1 and sr.StartDate >= '{0:yyyy-MM-dd}' and sr.StartDate < '{
SignatureInsTs = sig.InsTs,
SignatureType = SignatureTable.BargeldkasseneinzahlungsSignature,
TimeSpanStart = transaktion.Zahlungsdatum,
TimeSpanEnd = transaktion.Zahlungsdatum
TimeSpanEnd = transaktion.Zahlungsdatum,
DataBild = sig.DataBild
});
});
@@ -6468,7 +6487,8 @@ WHERE sc.Billable = 1 and sr.StartDate >= '{0:yyyy-MM-dd}' and sr.StartDate < '{
SignatureOid = signature.Oid,
TimeSpanStart = transaktion.Zahlungsdatum,
TimeSpanEnd = transaktion.Zahlungsdatum,
SignatureType = SignatureTable.BargeldkasseneinzahlungsSignature
SignatureType = SignatureTable.BargeldkasseneinzahlungsSignature,
DataBild = signature.DataBild
};
}

144
Data/Access/UserDAO.cs
View File

@@ -17,6 +17,7 @@ using System.Net;
using System.Collections.Specialized;
using System.Web;
using Newtonsoft.Json;
using System.Linq;
namespace BeWo.Data.Access
{
@@ -110,26 +111,16 @@ namespace BeWo.Data.Access
public ApplicationUser GetBSUser(string pUserName, string pPassword, string ip)
{
//var test = GetToolUser();
bool isValid = false;
//var all = GetToolUser();
//var pwd = "asFdgAE5ERfdsew4!";
//foreach (var item in test.BeWoToolUserList)
//var user = all.BeWoToolUserList.FirstOrDefault(u => u.Login == pUserName);
//if (user != null && BCrypt.CheckPassword(pPassword, user.Password))
//{
// if (item.FirstName == "Christian")
// {
// var bc = BCrypt.CheckPassword(pwd, item.Password);
// }
// isValid = true;
//}
var sha256 = pPassword;
if (sha256 != bsPwd)
{
sha256 = GetSHA256(pPassword);
}
/*
@@ -148,73 +139,80 @@ Wenn ein Login erfolgt ist, dann kannst du das mit folgendem Aufruf protokollier
https://support.bewoplaner.de/api/bsadmin.php?k=[KUNDENNUMMER]&EmployeeOID=[EMPLOYEEOID]&Pin=[PIN]
*/
if (pUserName == "BSAdmin" && sha256 == bsPwd)
var sha256 = pPassword;
if (sha256 != bsPwd)
{
if (this.ValidBSIp(ip))
sha256 = GetSHA256(pPassword);
}
isValid = pUserName == "BSAdmin" && sha256 == bsPwd;
if (isValid && this.ValidBSIp(ip))
{
var list = DAOFactory.GenericDAO.GetAllActive<ApplicationUser>();
foreach (var iUser in list)
{
var list = DAOFactory.GenericDAO.GetAllActive<ApplicationUser>();
foreach (var iUser in list)
if (iUser.IsActive == ActivationTypeId.Active && iUser.UserGroups != null)
{
if (iUser.IsActive == ActivationTypeId.Active && iUser.UserGroups != null)
foreach (var iUserGroup in iUser.UserGroups)
{
foreach (var iUserGroup in iUser.UserGroups)
if (iUserGroup.Name.IndexOf("admin", StringComparison.OrdinalIgnoreCase) >= 0)
{
if (iUserGroup.Name.IndexOf("admin", StringComparison.OrdinalIgnoreCase) >= 0)
{
return iUser;
}
return iUser;
}
}
}
foreach (var iUser in list)
{
if (iUser.IsActive == ActivationTypeId.Active && iUser.UserGroups != null)
{
foreach (var iUserGroup in iUser.UserGroups)
{
if (iUserGroup.Name.IndexOf("verwaltung", StringComparison.OrdinalIgnoreCase) >= 0)
{
return iUser;
}
}
}
}
foreach (var iUser in list)
{
if (iUser.IsActive == ActivationTypeId.Active && iUser.UserGroups != null)
{
foreach (var iUserGroup in iUser.UserGroups)
{
if (iUserGroup.Name.IndexOf("leitung", StringComparison.OrdinalIgnoreCase) >= 0)
{
return iUser;
}
}
}
}
foreach (var iUser in list)
{
if (iUser.UserGroups != null)
{
foreach (var iUserGroup in iUser.UserGroups)
{
if (iUserGroup.Name.IndexOf("führung", StringComparison.OrdinalIgnoreCase) >= 0)
{
return iUser;
}
}
}
}
if (list.Count > 0)
{
return list[0];
}
}
foreach (var iUser in list)
{
if (iUser.IsActive == ActivationTypeId.Active && iUser.UserGroups != null)
{
foreach (var iUserGroup in iUser.UserGroups)
{
if (iUserGroup.Name.IndexOf("verwaltung", StringComparison.OrdinalIgnoreCase) >= 0)
{
return iUser;
}
}
}
}
foreach (var iUser in list)
{
if (iUser.IsActive == ActivationTypeId.Active && iUser.UserGroups != null)
{
foreach (var iUserGroup in iUser.UserGroups)
{
if (iUserGroup.Name.IndexOf("leitung", StringComparison.OrdinalIgnoreCase) >= 0)
{
return iUser;
}
}
}
}
foreach (var iUser in list)
{
if (iUser.UserGroups != null)
{
foreach (var iUserGroup in iUser.UserGroups)
{
if (iUserGroup.Name.IndexOf("führung", StringComparison.OrdinalIgnoreCase) >= 0)
{
return iUser;
}
}
}
}
if (list.Count > 0)
{
return list[0];
}
}
return null;

36
Data/App.config
View File

@@ -22,43 +22,59 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
<bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.2" newVersion="9.0.0.2" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.7" newVersion="9.0.0.7" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.2" newVersion="9.0.0.2" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.7" newVersion="9.0.0.7" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
<bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
<bindingRedirect oldVersion="0.0.0.0-6.0.3.0" newVersion="6.0.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Composition.AttributedModel" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.2" newVersion="9.0.0.2" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.7" newVersion="9.0.0.7" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Composition.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.2" newVersion="9.0.0.2" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.7" newVersion="9.0.0.7" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Composition.TypedParts" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.2" newVersion="9.0.0.2" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.7" newVersion="9.0.0.7" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Composition.Hosting" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.2" newVersion="9.0.0.2" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.7" newVersion="9.0.0.7" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Text.Encoding.CodePages" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.2" newVersion="9.0.0.2" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.7" newVersion="9.0.0.7" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.4.0" newVersion="4.2.4.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.7" newVersion="9.0.0.7" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Threading.Channels" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.7" newVersion="9.0.0.7" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.IO.Pipelines" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.7" newVersion="9.0.0.7" />
</dependentAssembly>
</assemblyBinding>
</runtime>

96
Data/Data.csproj
View File

@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\EntityFramework.6.5.1\build\EntityFramework.props" Condition="Exists('..\packages\EntityFramework.6.5.1\build\EntityFramework.props')" />
<Import Project="..\packages\Microsoft.CodeAnalysis.Analyzers.2.9.6\build\Microsoft.CodeAnalysis.Analyzers.props" Condition="Exists('..\packages\Microsoft.CodeAnalysis.Analyzers.2.9.6\build\Microsoft.CodeAnalysis.Analyzers.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -48,6 +47,7 @@
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
<NoWarn>CS0659, CS0162, CS0168, CS0169</NoWarn>
<PlatformTarget>AnyCPU</PlatformTarget>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -58,6 +58,7 @@
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
<PlatformTarget>x64</PlatformTarget>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugRemote|AnyCPU'">
<DebugSymbols>true</DebugSymbols>
@@ -95,27 +96,33 @@
<Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<HintPath>..\packages\EntityFramework.6.5.1\lib\net45\EntityFramework.SqlServer.dll</HintPath>
</Reference>
<Reference Include="Humanizer, Version=2.14.0.0, Culture=neutral, PublicKeyToken=979442b78dfc278e, processorArchitecture=MSIL">
<HintPath>..\packages\Humanizer.Core.2.14.1\lib\netstandard2.0\Humanizer.dll</HintPath>
</Reference>
<Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\Lib\log4net.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CodeAnalysis, Version=3.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.CodeAnalysis.Common.3.4.0\lib\netstandard2.0\Microsoft.CodeAnalysis.dll</HintPath>
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=9.0.0.7, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.7\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CodeAnalysis.CSharp, Version=3.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.3.4.0\lib\netstandard2.0\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
<Reference Include="Microsoft.CodeAnalysis, Version=4.14.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.CodeAnalysis.Common.4.14.0\lib\netstandard2.0\Microsoft.CodeAnalysis.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CodeAnalysis.CSharp.Workspaces, Version=3.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.3.4.0\lib\netstandard2.0\Microsoft.CodeAnalysis.CSharp.Workspaces.dll</HintPath>
<Reference Include="Microsoft.CodeAnalysis.CSharp, Version=4.14.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.4.14.0\lib\netstandard2.0\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CodeAnalysis.VisualBasic, Version=3.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.CodeAnalysis.VisualBasic.3.4.0\lib\netstandard2.0\Microsoft.CodeAnalysis.VisualBasic.dll</HintPath>
<Reference Include="Microsoft.CodeAnalysis.CSharp.Workspaces, Version=4.14.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.4.14.0\lib\netstandard2.0\Microsoft.CodeAnalysis.CSharp.Workspaces.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces, Version=3.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.CodeAnalysis.VisualBasic.Workspaces.3.4.0\lib\netstandard2.0\Microsoft.CodeAnalysis.VisualBasic.Workspaces.dll</HintPath>
<Reference Include="Microsoft.CodeAnalysis.VisualBasic, Version=4.14.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.CodeAnalysis.VisualBasic.4.14.0\lib\netstandard2.0\Microsoft.CodeAnalysis.VisualBasic.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CodeAnalysis.Workspaces, Version=3.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.CodeAnalysis.Workspaces.Common.3.4.0\lib\netstandard2.0\Microsoft.CodeAnalysis.Workspaces.dll</HintPath>
<Reference Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces, Version=4.14.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.CodeAnalysis.VisualBasic.Workspaces.4.14.0\lib\netstandard2.0\Microsoft.CodeAnalysis.VisualBasic.Workspaces.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CodeAnalysis.Workspaces, Version=4.14.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.CodeAnalysis.Workspaces.Common.4.14.0\lib\netstandard2.0\Microsoft.CodeAnalysis.Workspaces.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="MySql.Data, Version=8.0.21.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
@@ -134,29 +141,29 @@
<HintPath>..\Lib\NHibernate.ByteCode.Castle.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
<Reference Include="System.Buffers, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Buffers.4.6.1\lib\net462\System.Buffers.dll</HintPath>
</Reference>
<Reference Include="System.Collections.Immutable, Version=9.0.0.2, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Collections.Immutable.9.0.2\lib\net462\System.Collections.Immutable.dll</HintPath>
<Reference Include="System.Collections.Immutable, Version=9.0.0.7, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Collections.Immutable.9.0.7\lib\net462\System.Collections.Immutable.dll</HintPath>
</Reference>
<Reference Include="System.ComponentModel" />
<Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Composition.AttributedModel, Version=9.0.0.2, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Composition.AttributedModel.9.0.2\lib\net462\System.Composition.AttributedModel.dll</HintPath>
<Reference Include="System.Composition.AttributedModel, Version=9.0.0.7, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Composition.AttributedModel.9.0.7\lib\net462\System.Composition.AttributedModel.dll</HintPath>
</Reference>
<Reference Include="System.Composition.Convention, Version=9.0.0.2, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Composition.Convention.9.0.2\lib\net462\System.Composition.Convention.dll</HintPath>
<Reference Include="System.Composition.Convention, Version=9.0.0.7, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Composition.Convention.9.0.7\lib\net462\System.Composition.Convention.dll</HintPath>
</Reference>
<Reference Include="System.Composition.Hosting, Version=9.0.0.2, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Composition.Hosting.9.0.2\lib\net462\System.Composition.Hosting.dll</HintPath>
<Reference Include="System.Composition.Hosting, Version=9.0.0.7, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Composition.Hosting.9.0.7\lib\net462\System.Composition.Hosting.dll</HintPath>
</Reference>
<Reference Include="System.Composition.Runtime, Version=9.0.0.2, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Composition.Runtime.9.0.2\lib\net462\System.Composition.Runtime.dll</HintPath>
<Reference Include="System.Composition.Runtime, Version=9.0.0.7, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Composition.Runtime.9.0.7\lib\net462\System.Composition.Runtime.dll</HintPath>
</Reference>
<Reference Include="System.Composition.TypedParts, Version=9.0.0.2, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Composition.TypedParts.9.0.2\lib\net462\System.Composition.TypedParts.dll</HintPath>
<Reference Include="System.Composition.TypedParts, Version=9.0.0.7, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Composition.TypedParts.9.0.7\lib\net462\System.Composition.TypedParts.dll</HintPath>
</Reference>
<Reference Include="System.Configuration" />
<Reference Include="System.Configuration.Install" />
@@ -165,19 +172,23 @@
</Reference>
<Reference Include="System.Drawing" />
<Reference Include="System.Drawing.Design" />
<Reference Include="System.IO.Pipelines, Version=9.0.0.7, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.IO.Pipelines.9.0.7\lib\net462\System.IO.Pipelines.dll</HintPath>
</Reference>
<Reference Include="System.Management" />
<Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
<Reference Include="System.Memory, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Memory.4.6.3\lib\net462\System.Memory.dll</HintPath>
</Reference>
<Reference Include="System.Numerics" />
<Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
<Reference Include="System.Numerics.Vectors, Version=4.1.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Numerics.Vectors.4.6.1\lib\net462\System.Numerics.Vectors.dll</HintPath>
</Reference>
<Reference Include="System.Reflection.Metadata, Version=9.0.0.2, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Reflection.Metadata.9.0.2\lib\net462\System.Reflection.Metadata.dll</HintPath>
<Reference Include="System.Reflection.Metadata, Version=9.0.0.7, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Reflection.Metadata.9.0.7\lib\net462\System.Reflection.Metadata.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\Lib\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.Serialization">
<RequiredTargetFramework>3.0</RequiredTargetFramework>
@@ -185,11 +196,12 @@
<Reference Include="System.ServiceModel">
<RequiredTargetFramework>3.0</RequiredTargetFramework>
</Reference>
<Reference Include="System.Text.Encoding.CodePages, Version=9.0.0.2, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Text.Encoding.CodePages.9.0.2\lib\net462\System.Text.Encoding.CodePages.dll</HintPath>
<Reference Include="System.Text.Encoding.CodePages, Version=9.0.0.7, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Text.Encoding.CodePages.9.0.7\lib\net462\System.Text.Encoding.CodePages.dll</HintPath>
</Reference>
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.3\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\Lib\System.Threading.Tasks.Extensions.dll</HintPath>
</Reference>
<Reference Include="System.Transactions" />
<Reference Include="System.Web" />
@@ -992,16 +1004,14 @@
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.2.9.6\analyzers\dotnet\cs\Microsoft.CodeAnalysis.Analyzers.dll" />
<Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.2.9.6\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.Analyzers.dll" />
<Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.4.14.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.Analyzers.dll" />
<Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.4.14.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.Analyzers.dll" />
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\Microsoft.CodeAnalysis.Analyzers.2.9.6\build\Microsoft.CodeAnalysis.Analyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeAnalysis.Analyzers.2.9.6\build\Microsoft.CodeAnalysis.Analyzers.props'))" />
<Error Condition="!Exists('..\packages\EntityFramework.6.5.1\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.5.1\build\EntityFramework.props'))" />
<Error Condition="!Exists('..\packages\EntityFramework.6.5.1\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.5.1\build\EntityFramework.targets'))" />
</Target>

12
Data/Entities/Contract.cs
View File

@@ -17,6 +17,7 @@ namespace BeWo.Data.Entities
public static string PropertyName_EntryDate = "EntryDate";
public static string PropertyName_ContractEndDate = "ContractEndDate";
public static string PropertyName_HourlyRate = "HourlyRate";
public static string PropertyName_GrossSalary = "GrossSalary";
public static string PropertyName_WeeklyFLS = "WeeklyFLS";
public static string PropertyName_MonthlyFLS = "MonthlyFLS";
public static string PropertyName_WeeklyTotalHours = "WeeklyTotalHours";
@@ -31,6 +32,7 @@ namespace BeWo.Data.Entities
private decimal? _WeeklyFLS;
private decimal? _MonthlyFLS;
private decimal? _HourlyRate;
private decimal? _GrossSalary;
private DateTime? _EntryDate;
private DateTime? _ContractEndDate;
private int _CancellationPeriod;
@@ -170,6 +172,16 @@ namespace BeWo.Data.Entities
}
}
public virtual decimal? GrossSalary
{
get { return _GrossSalary; }
set
{
if (base.AreDifferent(_GrossSalary, value))
_GrossSalary = value;
}
}
public virtual long EmployeeOid
{
get { return _EmployeeOid; }

12
Data/Entities/ContractHistory.cs
View File

@@ -15,6 +15,7 @@ namespace BeWo.Data.Entities
public static string PropertyName_ContractHistoryEntryDate = "ContractHistoryEntryDate";
public static string PropertyName_ContractHistoryContractEndDate = "ContractHistoryContractEndDate";
public static string PropertyName_ContractHistoryHourlyRate = "ContractHistoryHourlyRate";
public static string PropertyName_ContractHistoryGrossSalary = "ContractHistoryGrossSalary";
public static string PropertyName_ContractHistoryWeeklyFLS = "ContractHistoryWeeklyFLS";
public static string PropertyName_ContractHistoryMonthlyFLS = "ContractHistoryMonthlyFLS";
public static string PropertyName_ContractHistoryWeeklyTotalHours = "ContractHistoryWeeklyTotalHours";
@@ -31,6 +32,7 @@ namespace BeWo.Data.Entities
private decimal? _WeeklyFLS;
private decimal? _MonthlyFLS;
private decimal? _HourlyRate;
private decimal? _GrossSalary;
private DateTime? _EntryDate;
private DateTime? _ContractEndDate;
private int _CancellationPeriod;
@@ -173,6 +175,16 @@ namespace BeWo.Data.Entities
}
}
public virtual decimal? ContractHistoryGrossSalary
{
get { return _GrossSalary; }
set
{
if (base.AreDifferent(_GrossSalary, value))
_GrossSalary = value;
}
}
public virtual long ContractHistoryEmployeeOid
{
get { return _EmployeeOid; }

36
Data/Entities/CostBearer2SupportConcept.cs
View File

@@ -62,6 +62,10 @@ namespace BeWo.Data.Entities
private string _AuswahlBezeichnung;
private string _KontoHilfeplan;
private string _KostenstelleHilfeplan;
private decimal? _MonthlyPayment;
private DateTime? _RequestedEndDate;
@@ -247,6 +251,38 @@ namespace BeWo.Data.Entities
}
}
public virtual string KontoHilfeplan
{
get
{
return this._KontoHilfeplan;
}
set
{
if (this.AreDifferent(this._KontoHilfeplan, value))
{
this._KontoHilfeplan = value;
}
}
}
public virtual string KostenstelleHilfeplan
{
get
{
return this._KostenstelleHilfeplan;
}
set
{
if (this.AreDifferent(this._KostenstelleHilfeplan, value))
{
this._KostenstelleHilfeplan = value;
}
}
}
public virtual decimal? MonthlyPayment
{
get

26
Data/Entities/CostBearer2SupportConceptHistory.cs
View File

@@ -17,6 +17,8 @@ namespace BeWo.Data.Entities
private long? _CostBearer2SupportConcept_CostBearerContactPersonOid;
private string _CostBearer2SupportConcept_CustomerReferenceNumber;
private string _CostBearer2SupportConcept_AuswahlBezeichnung;
private string _CostBearer2SupportConcept_KontoHilfeplan;
private string _CostBearer2SupportConcept_KostenstelleHilfeplan;
private decimal? _CostBearer2SupportConcept_MonthlyPayment;
private DateTime? _CostBearer2SupportConcept_RequestedEndDate;
private DateTime? _CostBearer2SupportConcept_RequestedStartDate;
@@ -110,8 +112,28 @@ namespace BeWo.Data.Entities
if (AreDifferent(_CostBearer2SupportConcept_AuswahlBezeichnung, value))
_CostBearer2SupportConcept_AuswahlBezeichnung = value;
}
}
}
public string CostBearer2SupportConcept_KontoHilfeplan
{
get { return _CostBearer2SupportConcept_KontoHilfeplan; }
set
{
if (AreDifferent(_CostBearer2SupportConcept_KontoHilfeplan, value))
_CostBearer2SupportConcept_KontoHilfeplan = value;
}
}
public string CostBearer2SupportConcept_KostenstelleHilfeplan
{
get { return _CostBearer2SupportConcept_KostenstelleHilfeplan; }
set
{
if (AreDifferent(_CostBearer2SupportConcept_KostenstelleHilfeplan, value))
_CostBearer2SupportConcept_KostenstelleHilfeplan = value;
}
}
public decimal? CostBearer2SupportConcept_MonthlyPayment
{
get { return _CostBearer2SupportConcept_MonthlyPayment; }

11
Data/Entities/CustomerVermittlungArbeit.cs
View File

@@ -13,9 +13,12 @@ namespace BeWo.Data.Entities
{
_Tid = TableID.CustomerGemeinnutzigeArbeit;
}
public virtual VgaTypeEnum VgaType { get; set; }
public virtual Customer Customer { get; set; }
public virtual Organisation Auftraggeber { get; set; }
public virtual Person AuftraggeberAnsprechpartner { get; set; }
public virtual Organisation Einsatzstelle { get; set; }
public virtual Person EinsatzstelleAnsprechpartner { get; set; }
public virtual string AktenzeichenGericht { get; set; }
public virtual string EigenesAktenzeichen { get; set; }
public virtual DateTime? Auftragseingang { get; set; }
@@ -28,8 +31,8 @@ namespace BeWo.Data.Entities
public virtual string Hinweis { get; set; }
public virtual DateTime? Termin { get; set; }
public virtual CustomerVermittlungBearbeitungsstatus? CustomerVermittlungBearbeitungsstatus { get; set; }
public virtual string Auftragsruckgabe { get; set; }
public virtual string Verlauf { get; set; }
public virtual DateTime? Auftragsruckgabe { get; set; }
public virtual ValueListEntry Verlauf { get; set; }
public virtual decimal? AbgeleisteteStunden { get; set; }
public virtual decimal? ErsparteHafttage { get; set; }
public virtual decimal? GeleisteteRatenzahlung { get; set; }

42
Data/Entities/Employee.cs
View File

@@ -11,6 +11,8 @@ namespace BeWo.Data.Entities
{
public static string PropertyName_AbsenceTimes = "AbsenceTimes";
public static string PropertyName_ChildCount = "ChildCount";
public static string PropertyName_Employee2CustomerList = "Employee2CustomerList";
public static string PropertyName_HealthInsurance = "HealthInsurance";
@@ -31,6 +33,8 @@ namespace BeWo.Data.Entities
public static string PropertyName_ServiceRecordList = "ServiceRecordList";
public static string PropertyName_TaxClass = "TaxClass";
public static string PropertyName_TaxNumber = "TaxNumber";
public static string PropertyName_ValueList = "ValueList";
@@ -61,7 +65,9 @@ namespace BeWo.Data.Entities
private IList<Contract> _Contracts;
private IList<Arbeitszeit> _Arbeitszeiten;
private string _ChildCount;
private IList<Arbeitszeit> _Arbeitszeiten;
private IList<Employee2Customer> _Employee2CustomerList;
@@ -87,6 +93,8 @@ namespace BeWo.Data.Entities
private IList<ServiceRecord> _ServiceRecordList;
private string _TaxClass;
private string _TaxNumber;
private string _Text1;
@@ -175,6 +183,19 @@ namespace BeWo.Data.Entities
}
}
public virtual string ChildCount
{
get { return _ChildCount; }
set
{
if (AreDifferent(_ChildCount, value))
{
_ChildCount = value;
}
}
}
public virtual IList<Employee2Customer> Employee2CustomerList
{
get { return _Employee2CustomerList ?? (_Employee2CustomerList = new List<Employee2Customer>()); }
@@ -307,6 +328,19 @@ namespace BeWo.Data.Entities
}
}
public virtual string TaxClass
{
get { return _TaxClass; }
set
{
if (AreDifferent(_TaxClass, value))
{
_TaxClass = value;
}
}
}
public virtual string TaxNumber
{
get { return _TaxNumber; }
@@ -399,6 +433,12 @@ namespace BeWo.Data.Entities
public virtual bool Hygienebelehrung { get; set; }
public virtual String Schutzstufe { get; set; }
public virtual string BemerkungenSbd { get; set; }
public virtual DateTime? AusweisGueltigVon { get; set; }
public virtual DateTime? AusweisGueltigBis { get; set; }
public virtual string GradDerBehinderung { get; set; }
public virtual string AusweisBemerkung { get; set; }
public virtual IList<VarFieldValue> VarFieldValueList
{
get { return _VarFieldValueList ?? (_VarFieldValueList = new List<VarFieldValue>()); }

32
Data/Entities/EmployeeHistory.cs
View File

@@ -17,6 +17,8 @@ namespace BeWo.Data.Entities
private TableID _Employee_Tid;
private string _Employee_PersonnelNumber;
private string _Employee_TaxNumber;
private string _Employee_TaxClass;
private string _Employee_ChildCount;
private string _Employee_HealthInsurance;
private string _Employee_InsuranceNumber;
private decimal _Employee_HourlyRate;
@@ -158,6 +160,36 @@ namespace BeWo.Data.Entities
}
}
public virtual string Employee_TaxClass
{
get
{
return _Employee_TaxClass;
}
set
{
if (AreDifferent(_Employee_TaxClass, value))
{
_Employee_TaxClass = value;
}
}
}
public virtual string Employee_ChildCount
{
get
{
return _Employee_ChildCount;
}
set
{
if (AreDifferent(_Employee_ChildCount, value))
{
_Employee_ChildCount = value;
}
}
}
public virtual string Employee_HealthInsurance
{
get

15
Data/Entities/Mandator.cs
View File

@@ -26,6 +26,7 @@ namespace BeWo.Data.Entities
public static string Setting_MaxDaysEditServiceRecordsAllowed = "MaxDaysEditServiceRecordsAllowed";
public static string Setting_HilfeplanAuslaufAuswahl = "HilfeplanAuslaufAuswahl";
public static string Setting_AnzTageZeiterfassErfolgt = "AnzTageZeiterfassErfolgt";
public static string Setting_AnzTageUnterschriftErfolgt = "AnzTageUnterschriftErfolgt";
public static string Setting_ZeiterfassungsSchwellwert = "ZeiterfassungsSchwellwert";
public static string Setting_IKLeistungserbringer = "IKLeistungserbringer";
@@ -220,6 +221,20 @@ namespace BeWo.Data.Entities
return null;
}
}
public virtual int? AnzTageUnterschriftErfolgt
{
get
{
var val = this.GetSettingValue(Setting_AnzTageUnterschriftErfolgt);
int result;
if (Int32.TryParse(val, out result))
{
return result;
}
return null;
}
}
public virtual int? ZeiterfassungsSchwellwert
{
get

2
Data/Entities/Person.cs
View File

@@ -175,6 +175,8 @@ namespace BeWo.Data.Entities
}
}
public virtual String PlaceOfBirth { get; set; }
public virtual FamilyStatus? FamilyStatus
{
get

2
Data/Entities/PersonHistory.cs
View File

@@ -193,6 +193,8 @@ namespace BeWo.Data.Entities
}
}
public virtual String Person_PlaceOfBirth { get; set; }
public virtual Sex? Person_Sex
{
get

3
Data/Entities/SignatureHistory.cs
View File

@@ -17,7 +17,6 @@ namespace BeWo.Data.Entities
private DateTime? _SignatureInsTs;
private SignatureEventType _SignatureEventType;
public SignatureHistory()
{
_Tid = TableID.SignatureHistory;
@@ -142,5 +141,7 @@ namespace BeWo.Data.Entities
}
}
}
public virtual string DataBild { get; set; }
}
}

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

@@ -15,6 +15,7 @@
<property column="SystemEntryID" type="BS.Shared.SystemEntryID, BS.Shared" name="SystemEntryID" />
<property column="EmployeeOid" type="Int64" name="EmployeeOid" update="false" insert="false"/>
<property column="HourlyRate" type="Decimal" name="HourlyRate" />
<property column="GrossSalary" type="Decimal" name="GrossSalary" />
<property column="WeeklyFLS" type="Decimal" name="WeeklyFLS" />
<property column="MonthlyFLS" type="Decimal" name="MonthlyFLS" />
<property column="WeeklyTotalHours" type="Decimal" name="WeeklyTotalHours" />

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

@@ -17,6 +17,7 @@
<property column="ChangeType" type="BS.Shared.StatementType, BS.Shared" name="ChangeType" />
<property column="ContractHistoryEmployeeOid" type="Int64" name="ContractHistoryEmployeeOid"/>
<property column="ContractHistoryHourlyRate" type="Decimal" name="ContractHistoryHourlyRate" />
<property column="ContractHistoryGrossSalary" type="Decimal" name="ContractHistoryGrossSalary" />
<property column="ContractHistoryWeeklyFLS" type="Decimal" name="ContractHistoryWeeklyFLS" />
<property column="ContractHistoryMonthlyFLS" type="Decimal" name="ContractHistoryMonthlyFLS" />
<property column="ContractHistoryWeeklyTotalHours" type="Decimal" name="ContractHistoryWeeklyTotalHours" />

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

@@ -17,6 +17,8 @@
<property column="ApprovedEndDate" type="DateTime" name="ApprovedEndDate" />
<property column="CustomerRefenrenceNumber" type="String" name="CustomerReferenceNumber" length="512" />
<property column="AuswahlBezeichnung" type="String" name="AuswahlBezeichnung" length="512" />
<property column="KontoHilfeplan" type="String" name="KontoHilfeplan" length="512" />
<property column="KostenstelleHilfeplan" type="String" name="KostenstelleHilfeplan" length="512" />
<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" />

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

@@ -25,6 +25,8 @@
<property name="CostBearer2SupportConcept_MonthlyPayment" type="System.Decimal"/>
<property name="CostBearer2SupportConcept_CostBearerContactPersonOid" type="System.Decimal"/>
<property name="CostBearer2SupportConcept_AuswahlBezeichnung" type="String"/>
<property name="CostBearer2SupportConcept_KontoHilfeplan" type="String"/>
<property name="CostBearer2SupportConcept_KostenstelleHilfeplan" type="String"/>
</class>
</hibernate-mapping>

7
Data/Mappings/CustomerVermittlungArbeit.hbm.xml
View File

@@ -13,6 +13,7 @@
<property name="IsActive" type="BS.Shared.ActivationTypeId, BS.Shared" />
<property name="SystemEntryID" type="BS.Shared.SystemEntryID, BS.Shared" />
<property name="Notice"/>
<property name="VgaType" type="BS.Shared.VgaTypeEnum, BS.Shared" />
<many-to-one name="Customer" column="CustomerOid" class="BeWo.Data.Entities.Customer, BeWo.Data" cascade="none"/>
<property name="AktenzeichenGericht"/>
<property name="EigenesAktenzeichen"/>
@@ -27,7 +28,7 @@
<property name="Termin"/>
<property name="CustomerVermittlungBearbeitungsstatus" type="BS.Shared.DataContracts.CustomerVermittlungBearbeitungsstatus, BS.Shared" />
<property name="Auftragsruckgabe"/>
<property name="Verlauf"/>
<many-to-one name="Verlauf" column="Verlauf" class="BeWo.Data.Entities.ValueListEntry, BeWo.Data" cascade="none" />
<property name="AbgeleisteteStunden"/>
<property name="ErsparteHafttage"/>
<property name="GeleisteteRatenzahlung"/>
@@ -49,5 +50,9 @@
<property name="BesonderheitMehrfacheVermittlung"/>
<property name="BesonderheitVermittlungAusHaft"/>
<property name="BesonderheitDurchBGBWAufgesucht"/>
<many-to-one name="Auftraggeber" column="AuftraggeberOid" class="BeWo.Data.Entities.Organisation, BeWo.Data" cascade="none"/>
<many-to-one name="AuftraggeberAnsprechpartner" column="AuftraggeberAnsprechpartnerOid" class="BeWo.Data.Entities.Person, BeWo.Data" cascade="none"/>
<many-to-one name="Einsatzstelle" column="EinsatzstelleOid" class="BeWo.Data.Entities.Organisation, BeWo.Data" cascade="none"/>
<many-to-one name="EinsatzstelleAnsprechpartner" column="EinsatzstelleAnsprechpartnerOid" class="BeWo.Data.Entities.Person, BeWo.Data" cascade="none"/>
</class>
</hibernate-mapping>

6
Data/Mappings/Employee.hbm.xml
View File

@@ -9,6 +9,12 @@
<property column="Tid" type="BS.Shared.TableID, BS.Shared" name="_Tid" access="field" />
<property column="PersonnelNumber" type="String" name="PersonnelNumber" length="128" />
<property column="TaxNumber" type="String" name="TaxNumber" length="128" />
<property column="TaxClass" type="String" name="TaxClass" />
<property column="ChildCount" type="String" name="ChildCount" />
<property column="AusweisGueltigVon" type="DateTime" name="AusweisGueltigVon" />
<property column="AusweisGueltigBis" type="DateTime" name="AusweisGueltigBis" />
<property column="GradDerBehinderung" type="String" name="GradDerBehinderung" />
<property column="AusweisBemerkung" type="String" name="AusweisBemerkung" />
<property column="HealthInsurance" type="String" name="HealthInsurance" length="128" />
<property column="InsuranceNumber" type="String" name="InsuranceNumber" length="128" />
<property column="IsQualified" type="Boolean" name="IsQualified" />

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

@@ -22,6 +22,8 @@
<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_TaxClass" type="string" name="Employee_TaxClass" />
<property column="Employee_ChildCount" type="string" name="Employee_ChildCount" />
<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" />

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

@@ -11,6 +11,7 @@
<property column="LastName" type="String" name="LastName" length="256" />
<property column="Abbreviation" type="String" name="Abbreviation" length="16" />
<property column="DateOfBirth" type="DateTime" name="DateOfBirth" />
<property column="PlaceOfBirth" type="String" name="PlaceOfBirth" />
<property column="Sex" type="BS.Shared.Sex, BS.Shared" name="Sex" />
<property column="Type" type="BS.Shared.PersonType, BS.Shared" name="Type" />
<property column="FamilyStatus" type="BS.Shared.FamilyStatus, BS.Shared" name="FamilyStatus" />

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

@@ -25,6 +25,7 @@
<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_PlaceOfBirth" type="String" name="Person_PlaceOfBirth" />
<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" />

3
Data/Mappings/SignatureHistory.hbm.xml
View File

@@ -22,7 +22,8 @@
<property column="SignatureTimeSpanEnd" type="DateTime" name="TimeSpanEnd" />
<property column="SignatureInsTs" type="DateTime" name="SignatureInsTs" />
<property column="SignatureEventType" type="BS.Shared.SignatureEventType, BS.Shared" name="SignatureEventType"/>
<property name="DataBild" type="String" />
<bag name="ServiceRecordOidList" table="servicerecord2signaturehistory" generic="true" cascade="none" batch-size="250">
<key column="SignatureHistoryOid" />
<element column="ServiceRecordOid" type="Int64" />

48
Data/packages.config
View File

@@ -2,27 +2,31 @@
<packages>
<package id="ClrHeapAllocationAnalyzer" version="3.0.0" targetFramework="net472" />
<package id="EntityFramework" version="6.5.1" targetFramework="net472" />
<package id="Humanizer.Core" version="2.14.1" targetFramework="net472" />
<package id="Microsoft.AspNet.Providers.Core" version="2.0.0" targetFramework="net45" />
<package id="Microsoft.CodeAnalysis" version="3.4.0" targetFramework="net472" />
<package id="Microsoft.CodeAnalysis.Analyzers" version="2.9.6" targetFramework="net472" developmentDependency="true" />
<package id="Microsoft.CodeAnalysis.Common" version="3.4.0" targetFramework="net472" />
<package id="Microsoft.CodeAnalysis.CSharp" version="3.4.0" targetFramework="net472" />
<package id="Microsoft.CodeAnalysis.CSharp.Workspaces" version="3.4.0" targetFramework="net472" />
<package id="Microsoft.CodeAnalysis.VisualBasic" version="3.4.0" targetFramework="net472" />
<package id="Microsoft.CodeAnalysis.VisualBasic.Workspaces" version="3.4.0" targetFramework="net472" />
<package id="Microsoft.CodeAnalysis.Workspaces.Common" version="3.4.0" targetFramework="net472" />
<package id="System.Buffers" version="4.5.1" targetFramework="net472" />
<package id="System.Collections.Immutable" version="9.0.2" targetFramework="net472" />
<package id="System.Composition" version="9.0.2" targetFramework="net472" />
<package id="System.Composition.AttributedModel" version="9.0.2" targetFramework="net472" />
<package id="System.Composition.Convention" version="9.0.2" targetFramework="net472" />
<package id="System.Composition.Hosting" version="9.0.2" targetFramework="net472" />
<package id="System.Composition.Runtime" version="9.0.2" targetFramework="net472" />
<package id="System.Composition.TypedParts" version="9.0.2" targetFramework="net472" />
<package id="System.Memory" version="4.5.5" targetFramework="net472" />
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net472" />
<package id="System.Reflection.Metadata" version="9.0.2" targetFramework="net472" />
<package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net472" />
<package id="System.Text.Encoding.CodePages" version="9.0.2" targetFramework="net472" />
<package id="System.Threading.Tasks.Extensions" version="4.5.3" targetFramework="net472" />
<package id="Microsoft.Bcl.AsyncInterfaces" version="9.0.7" targetFramework="net472" />
<package id="Microsoft.CodeAnalysis" version="4.14.0" targetFramework="net472" />
<package id="Microsoft.CodeAnalysis.Analyzers" version="4.14.0" targetFramework="net472" developmentDependency="true" />
<package id="Microsoft.CodeAnalysis.Common" version="4.14.0" targetFramework="net472" />
<package id="Microsoft.CodeAnalysis.CSharp" version="4.14.0" targetFramework="net472" />
<package id="Microsoft.CodeAnalysis.CSharp.Workspaces" version="4.14.0" targetFramework="net472" />
<package id="Microsoft.CodeAnalysis.VisualBasic" version="4.14.0" targetFramework="net472" />
<package id="Microsoft.CodeAnalysis.VisualBasic.Workspaces" version="4.14.0" targetFramework="net472" />
<package id="Microsoft.CodeAnalysis.Workspaces.Common" version="4.14.0" targetFramework="net472" />
<package id="System.Buffers" version="4.6.1" targetFramework="net472" />
<package id="System.Collections.Immutable" version="9.0.7" targetFramework="net472" />
<package id="System.Composition" version="9.0.7" targetFramework="net472" />
<package id="System.Composition.AttributedModel" version="9.0.7" targetFramework="net472" />
<package id="System.Composition.Convention" version="9.0.7" targetFramework="net472" />
<package id="System.Composition.Hosting" version="9.0.7" targetFramework="net472" />
<package id="System.Composition.Runtime" version="9.0.7" targetFramework="net472" />
<package id="System.Composition.TypedParts" version="9.0.7" targetFramework="net472" />
<package id="System.IO.Pipelines" version="9.0.7" targetFramework="net472" />
<package id="System.Memory" version="4.6.3" targetFramework="net472" />
<package id="System.Numerics.Vectors" version="4.6.1" targetFramework="net472" />
<package id="System.Reflection.Metadata" version="9.0.7" targetFramework="net472" />
<package id="System.Runtime.CompilerServices.Unsafe" version="6.1.2" targetFramework="net472" />
<package id="System.Text.Encoding.CodePages" version="9.0.7" targetFramework="net472" />
<package id="System.Threading.Channels" version="9.0.7" targetFramework="net472" />
<package id="System.Threading.Tasks.Extensions" version="4.6.3" targetFramework="net472" />
</packages>