cb

2021-04-07 16:18:38 +02:00
parent f55dd3a805
commit d7168e7fa6
18 changed files with 1829 additions and 664 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1,8 @@
+/BeWoAdmin/bin/Debug
+/BeWoAdmin/obj/Debug
+/DBAdminService/bin
+/DBAdminService/obj/Debug
+/DBToolControls/bin/Debug
+/DBToolControls/obj/Debug
+/.vs/BeWoAdmin/v15
+/.vs/config
--- a/BeWoAdmin/DBTool.csproj
+++ b/BeWoAdmin/DBTool.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,7 +10,7 @@
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>BeWoAdmin</RootNamespace>
    <AssemblyName>BeWoAdmin</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
    <WarningLevel>4</WarningLevel>
@@ -19,6 +19,7 @@
    <UpgradeBackupLocation>
    </UpgradeBackupLocation>
    <OldToolsVersion>3.5</OldToolsVersion>
+    <TargetFrameworkProfile />
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <DebugSymbols>true</DebugSymbols>
@@ -29,6 +30,7 @@
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
    <PlatformTarget>x86</PlatformTarget>
+    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    <DebugType>pdbonly</DebugType>
@@ -37,6 +39,7 @@
    <DefineConstants>TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="GrayscaleEffect, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
@@ -53,6 +56,7 @@
    </Reference>
    <Reference Include="System.EnterpriseServices" />
    <Reference Include="System.Web.Services" />
+    <Reference Include="System.Xaml" />
    <Reference Include="System.Xml.Linq">
      <RequiredTargetFramework>3.5</RequiredTargetFramework>
    </Reference>
--- a/BeWoAdmin/Properties/Resources.Designer.cs
+++ b/BeWoAdmin/Properties/Resources.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     Dieser Code wurde von einem Tool generiert.
-//     Laufzeitversion:4.0.30319.17929
+//     Laufzeitversion:4.0.30319.42000
 //
 //     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
 //     der Code erneut generiert wird.
@@ -19,7 +19,7 @@ namespace BeWoAdmin.Properties {
    // -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
    // Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
    // mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
    internal class Resources {
--- a/BeWoAdmin/Properties/Settings.Designer.cs
+++ b/BeWoAdmin/Properties/Settings.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     Dieser Code wurde von einem Tool generiert.
-//     Laufzeitversion:4.0.30319.17929
+//     Laufzeitversion:4.0.30319.42000
 //
 //     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
 //     der Code erneut generiert wird.
@@ -12,7 +12,7 @@ namespace BeWoAdmin.Properties {
    
    
    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0")]
    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
        
        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
--- a/BeWoAdmin/Server.cs
+++ b/BeWoAdmin/Server.cs
@@ -107,8 +107,14 @@ namespace BeWoAdmin {

        // private methods

-        private static string Decrypt(string s) {
-            return EncryptionHelper.DecryptString(App.TransportEncryptionKey, s);
+        private static string Decrypt(string s)
+        {
+            if (s.Length > 20)
+            {
+                return EncryptionHelper.DecryptString(App.TransportEncryptionKey, s);
+            }
+
+            return s;
        }
    }

--- a/BeWoAdmin/Tenant.cs
+++ b/BeWoAdmin/Tenant.cs
@@ -146,7 +146,7 @@ namespace BeWoAdmin {
        public XElement ToXElement(string pw) {
            return new XElement("Tenant",
                new XElement("Name", name),
-                new XElement("Database", Encrypt(database)),
+                new XElement("Database", database),
                new XElement("IsChecked", isChecked.ToString()),
                HasOwnUser ? user.ToXElement(pw) : null);
        }
@@ -167,7 +167,7 @@ namespace BeWoAdmin {
                    DBAdminServiceReturnValue result;
                    MySqlService dbService = new MySqlService();
                    dbService.Url = SUri.AbsoluteUri;
-
+                    
                    if (method == RemoteMethods.DatabaseIsReachable)
                        result = dbService.DatabaseIsReachable(Encrypt(User.Username), Encrypt(User.PasswordAsInsecureString), Encrypt(Database), Encrypt(Server.Port));
                    else if (method == RemoteMethods.ExecuteUpdateOnDatabase)
--- a/References/DBAdminService/DBAdminServiceReturnValue1.datasource
+++ b/References/DBAdminService/DBAdminServiceReturnValue1.datasource
@@ -6,5 +6,5 @@
    cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="DBAdminServiceReturnValue" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>BeWoAdmin.DBAdminService.DBAdminServiceReturnValue, Web References.DBAdminService.Reference.cs, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>BeWoAdmin.DBAdminService.DBAdminServiceReturnValue, Web References.DBAdminService.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
--- a/References/DBAdminService/Reference.cs
+++ b/References/DBAdminService/Reference.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     Dieser Code wurde von einem Tool generiert.
-//     Laufzeitversion:4.0.30319.17929
+//     Laufzeitversion:4.0.30319.42000
 //
 //     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
 //     der Code erneut generiert wird.
@@ -9,7 +9,7 @@
 //------------------------------------------------------------------------------

 // 
-// Der Quellcode wurde automatisch mit Microsoft.VSDesigner generiert. Version 4.0.30319.17929.
+// Der Quellcode wurde automatisch mit Microsoft.VSDesigner generiert. Version 4.0.30319.42000.
 // 
 #pragma warning disable 1591

@@ -23,7 +23,7 @@ namespace BeWoAdmin.DBAdminService {
    
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.17929")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
    [System.Web.Services.WebServiceBindingAttribute(Name="MySqlServiceSoap", Namespace="http://tempuri.org")]
@@ -363,7 +363,7 @@ namespace BeWoAdmin.DBAdminService {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.17929")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
    [System.SerializableAttribute()]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -408,11 +408,11 @@ namespace BeWoAdmin.DBAdminService {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.17929")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
    public delegate void createDatabaseCompletedEventHandler(object sender, createDatabaseCompletedEventArgs e);
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.17929")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
    public partial class createDatabaseCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -434,11 +434,11 @@ namespace BeWoAdmin.DBAdminService {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.17929")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
    public delegate void GetDatabaseListCompletedEventHandler(object sender, GetDatabaseListCompletedEventArgs e);
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.17929")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
    public partial class GetDatabaseListCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -460,11 +460,11 @@ namespace BeWoAdmin.DBAdminService {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.17929")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
    public delegate void ExecuteUpdateOnDatabaseCompletedEventHandler(object sender, ExecuteUpdateOnDatabaseCompletedEventArgs e);
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.17929")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
    public partial class ExecuteUpdateOnDatabaseCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -486,11 +486,11 @@ namespace BeWoAdmin.DBAdminService {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.17929")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
    public delegate void ExecuteHiddenUpdateOnDatabaseCompletedEventHandler(object sender, ExecuteHiddenUpdateOnDatabaseCompletedEventArgs e);
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.17929")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
    public partial class ExecuteHiddenUpdateOnDatabaseCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -512,11 +512,11 @@ namespace BeWoAdmin.DBAdminService {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.17929")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
    public delegate void DatabaseIsReachableCompletedEventHandler(object sender, DatabaseIsReachableCompletedEventArgs e);
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.17929")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
    public partial class DatabaseIsReachableCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -538,11 +538,11 @@ namespace BeWoAdmin.DBAdminService {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.17929")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
    public delegate void GetTablesCompletedEventHandler(object sender, GetTablesCompletedEventArgs e);
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.17929")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
    public partial class GetTablesCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -564,11 +564,11 @@ namespace BeWoAdmin.DBAdminService {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.17929")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
    public delegate void CreateNewTenantIDCompletedEventHandler(object sender, CreateNewTenantIDCompletedEventArgs e);
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.17929")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
    public partial class CreateNewTenantIDCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
--- a/BeWoAdmin/Window1.xaml.cs
+++ b/BeWoAdmin/Window1.xaml.cs
@@ -19,6 +19,8 @@ using Microsoft.Win32;
 using DBToolControls;
 using System.Diagnostics;
 using System.Reflection;
+using BeWoAdmin.DBAdminService;
+
 namespace BeWoAdmin {
    /// <summary>
    /// Interaktionslogik für Window1.xaml
@@ -277,7 +279,9 @@ namespace BeWoAdmin {
                });
            }).Start();
        }
-        private void AddDatabase_Executed(object sender, ExecutedRoutedEventArgs e) {
+        private void AddDatabase_Executed(object sender, ExecutedRoutedEventArgs e)
+        {
+            Test();
            bool createDB = true;
            if (selectedServer != null) {
                MakeDark();
@@ -341,6 +345,23 @@ namespace BeWoAdmin {
                ShowMessage("Es ist kein Server ausgewählt.");
        }

+        private void Test()
+        {
+            try
+            {
+
+                MySqlService webService = new MySqlService();
+                webService.Url = selectedServer.Uri.ToString();
+                var test = webService.CreateNewTenantID();
+            }
+            catch (Exception ex)
+            {
+                //
+            }
+           
+            
+        }
+
        private void AddDatabase_CanExecute(object sender, CanExecuteRoutedEventArgs e) {
            e.CanExecute = selectedServer != null;
        }
--- a/BeWoAdmin/app.config
+++ b/BeWoAdmin/app.config
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
    <configSections>
-        <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
-            <section name="BeWoAdmin.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+        <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+            <section name="BeWoAdmin.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
        </sectionGroup>
    </configSections>
    <applicationSettings>
@@ -15,4 +15,4 @@
            </setting>
        </BeWoAdmin.Properties.Settings>
    </applicationSettings>
-</configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/></startup></configuration>
--- a/DBAdminService/DBAdminService.csproj
+++ b/DBAdminService/DBAdminService.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -12,12 +12,20 @@
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>WebService1</RootNamespace>
    <AssemblyName>WebService1</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
    <FileUpgradeFlags>
    </FileUpgradeFlags>
    <UpgradeBackupLocation>
    </UpgradeBackupLocation>
    <OldToolsVersion>3.5</OldToolsVersion>
+    <TargetFrameworkProfile />
+    <UseIISExpress>false</UseIISExpress>
+    <Use64BitIISExpress />
+    <IISExpressSSLPort />
+    <IISExpressAnonymousAuthentication />
+    <IISExpressWindowsAuthentication />
+    <IISExpressUseClassicPipelineMode />
+    <UseGlobalApplicationHostFile />
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <DebugSymbols>true</DebugSymbols>
@@ -27,6 +35,7 @@
    <DefineConstants>DEBUG;TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    <DebugType>pdbonly</DebugType>
@@ -35,6 +44,7 @@
    <DefineConstants>TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="MySql.Data, Version=5.2.3.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
@@ -43,26 +53,20 @@
    </Reference>
    <Reference Include="System" />
    <Reference Include="System.Data" />
+    <Reference Include="System.Data.DataSetExtensions" />
    <Reference Include="System.Drawing" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data.DataSetExtensions">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Web.Extensions">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
+    <Reference Include="System.Web.ApplicationServices" />
+    <Reference Include="System.Web.DynamicData" />
+    <Reference Include="System.Web.Entity" />
+    <Reference Include="System.Web.Extensions" />
    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml.Linq">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
    <Reference Include="System.Web" />
    <Reference Include="System.Xml" />
    <Reference Include="System.Configuration" />
    <Reference Include="System.Web.Services" />
    <Reference Include="System.EnterpriseServices" />
    <Reference Include="System.Web.Mobile" />
+    <Reference Include="System.Xml.Linq" />
  </ItemGroup>
  <ItemGroup>
    <Content Include="MySqlService.asmx" />
--- a/DBAdminService/DBAdminService.csproj.user
+++ b/DBAdminService/DBAdminService.csproj.user
@@ -1,5 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <PropertyGroup>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <UseIISExpress>false</UseIISExpress>
+    <Use64BitIISExpress />
+    <IISExpressSSLPort />
+    <IISExpressAnonymousAuthentication />
+    <IISExpressWindowsAuthentication />
+    <IISExpressUseClassicPipelineMode />
+    <UseGlobalApplicationHostFile />
+  </PropertyGroup>
  <ProjectExtensions>
    <VisualStudio>
      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
@@ -8,12 +18,9 @@
          </StartPageUrl>
          <StartAction>CurrentPage</StartAction>
          <AspNetDebugging>True</AspNetDebugging>
+          <SilverlightDebugging>False</SilverlightDebugging>
          <NativeDebugging>False</NativeDebugging>
          <SQLDebugging>False</SQLDebugging>
-          <PublishCopyOption>RunFiles</PublishCopyOption>
-          <PublishTargetLocation>C:\Projects\beyondSoft\BeWoPlaner\BeWoAdmin\Publish\</PublishTargetLocation>
-          <PublishDeleteAllFiles>False</PublishDeleteAllFiles>
-          <PublishCopyAppData>True</PublishCopyAppData>
          <ExternalProgram>
          </ExternalProgram>
          <StartExternalURL>
--- a/DBAdminService/Web.config
+++ b/DBAdminService/Web.config
@@ -1,42 +1,30 @@
 <?xml version="1.0"?>
 <configuration>
-	<configSections>
-		<sectionGroup name="system.web.extensions" type="System.Web.Configuration.SystemWebExtensionsSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
-			<sectionGroup name="scripting" type="System.Web.Configuration.ScriptingSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
-				<section name="scriptResourceHandler" type="System.Web.Configuration.ScriptingScriptResourceHandlerSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication"/>
-				<sectionGroup name="webServices" type="System.Web.Configuration.ScriptingWebServicesSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
-					<section name="jsonSerialization" type="System.Web.Configuration.ScriptingJsonSerializationSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="Everywhere"/>
-					<section name="profileService" type="System.Web.Configuration.ScriptingProfileServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication"/>
-					<section name="authenticationService" type="System.Web.Configuration.ScriptingAuthenticationServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication"/>
-					<section name="roleService" type="System.Web.Configuration.ScriptingRoleServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication"/>
-				</sectionGroup>
-			</sectionGroup>
-		</sectionGroup>
-	</configSections>
-	<appSettings/>
-	<connectionStrings/>
-	<system.web>
-		<!-- 
+  <appSettings/>
+  <connectionStrings/>
+  <!--
+    Eine Beschreibung der Änderungen von 'web.config' finden Sie unter 'http://go.microsoft.com/fwlink/?LinkId=235367'.
+
+    Die folgenden Attribute können für die <httpRuntime>-Kennung festgelegt werden.
+      <system.Web>
+        <httpRuntime targetFramework="4.7.2" />
+      </system.Web>
+  -->
+  <system.web>
+    <!-- 
            Legen Sie beim Kompilieren debug="true" fest, um 
            Debugsymbole in die kompilierte Seite einzufügen. 
            Da dies die Leistung beeinträchtigt, sollte der 
            Wert nur beim Entwickeln auf "True" gesetzt werden.
        -->
-		<compilation debug="true">
-			<assemblies>
-				<add assembly="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
-				<add assembly="System.Data.DataSetExtensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
-				<add assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
-				<add assembly="System.Xml.Linq, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
-			</assemblies>
-		</compilation>
-		<!--
+    <compilation debug="true" targetFramework="4.7.2"/>
+    <!--
            Der Abschnitt <authentication> ermöglicht die Konfiguration 
            des Sicherheitsauthentifizierungsmodus, mit dem 
            ASP.NET eingehende Benutzer identifiziert. 
        -->
-		<authentication mode="Windows"/>
-		<!--
+    <authentication mode="Windows"/>
+    <!--
            Der Abschnitt <customErrors> ermöglicht die Konfiguration 
            der Vorgehensweise bei unbehandelten Fehlern während 
            der Anforderungsausführung. Insbesondere können 
@@ -48,61 +36,11 @@
            <error statusCode="404" redirect="FileNotFound.htm" />
        </customErrors>
        -->
-		<pages>
-			<controls>
-				<add tagPrefix="asp" namespace="System.Web.UI" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
-				<add tagPrefix="asp" namespace="System.Web.UI.WebControls" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
-			</controls>
-		</pages>
-		<httpHandlers>
-			<remove verb="*" path="*.asmx"/>
-			<add verb="*" path="*.asmx" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
-			<add verb="*" path="*_AppService.axd" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
-			<add verb="GET,HEAD" path="ScriptResource.axd" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" validate="false"/>
-		</httpHandlers>
-		<httpModules>
-			<add name="ScriptModule" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
-		</httpModules>
-	</system.web>
-	<system.codedom>
-		<compilers>
-			<compiler language="c#;cs;csharp" extension=".cs" warningLevel="4" type="Microsoft.CSharp.CSharpCodeProvider, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-				<providerOption name="CompilerVersion" value="v3.5"/>
-				<providerOption name="WarnAsError" value="false"/>
-			</compiler>
-		</compilers>
-	</system.codedom>
-	<!-- 
+    <pages controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID"/>
+  </system.web>
+  <!-- 
        Der system.webServer-Abschnitt ist zum Ausführen von ASP.NET-AJAX unter
        Internetinformationsdienste 7.0 erforderlich. Für frühere Versionen von
        IIS ist er nicht erforderlich.
    -->
-	<system.webServer>
-		<validation validateIntegratedModeConfiguration="false"/>
-		<modules>
-			<remove name="ScriptModule"/>
-			<add name="ScriptModule" preCondition="managedHandler" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
-		</modules>
-		<handlers>
-			<remove name="WebServiceHandlerFactory-Integrated"/>
-			<remove name="ScriptHandlerFactory"/>
-			<remove name="ScriptHandlerFactoryAppServices"/>
-			<remove name="ScriptResource"/>
-			<add name="ScriptHandlerFactory" verb="*" path="*.asmx" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
-			<add name="ScriptHandlerFactoryAppServices" verb="*" path="*_AppService.axd" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
-			<add name="ScriptResource" preCondition="integratedMode" verb="GET,HEAD" path="ScriptResource.axd" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
-		</handlers>
-	</system.webServer>
-	<runtime>
-		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-			<dependentAssembly>
-				<assemblyIdentity name="System.Web.Extensions" publicKeyToken="31bf3856ad364e35"/>
-				<bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="3.5.0.0"/>
-			</dependentAssembly>
-			<dependentAssembly>
-				<assemblyIdentity name="System.Web.Extensions.Design" publicKeyToken="31bf3856ad364e35"/>
-				<bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="3.5.0.0"/>
-			</dependentAssembly>
-		</assemblyBinding>
-	</runtime>
-</configuration>
+</configuration>
--- a/SQL/create_Empty_MySQL.sql
+++ b/SQL/create_Empty_MySQL.sql
@@ -89,6 +89,9 @@ CREATE TABLE `person` (
  `SystemEntryID` INTEGER(10) DEFAULT NULL,
  `TitleValueListEntryOid` BIGINT(19) DEFAULT NULL,
  `FunctionValueListEntryOid` BIGINT(19) DEFAULT NULL,
+  `IsMigrant` TINYINT(4) NULL DEFAULT NULL,
+  `NationalitaetValueListEntryOid` BIGINT(19) NULL DEFAULT NULL,
+  `AufenthaltsStatusValueListEntryOid` BIGINT(19) NULL DEFAULT NULL,
  PRIMARY KEY (`Oid`),
  KEY `RESIDENT_FK` (`AddressOid`),
  KEY `WAGES_FK` (`BankAccountOid`),
@@ -101,6 +104,7 @@ CREATE TABLE `person` (
 )ENGINE=InnoDB
 AUTO_INCREMENT=1 CHARACTER SET 'latin1' COLLATE 'latin1_swedish_ci';

+
 CREATE TABLE `customer` (
  `Oid` BIGINT(19) NOT NULL AUTO_INCREMENT,
  `PersonOid` BIGINT(19) NOT NULL,
@@ -138,6 +142,14 @@ CREATE TABLE `customer` (
  `Pflegegrad` INTEGER(10) DEFAULT NULL,
  `CustomerImage` longblob DEFAULT NULL,
  `CustomerAlias` VARCHAR(256) DEFAULT NULL,
+  `VertretungGewuenscht` TINYINT(4) NULL DEFAULT 1 COMMENT '',
+  `AbWelchemKrankheitsTag` INT(10) NULL DEFAULT 0,
+  `VertretungDringendErforderlich` TINYINT(4) NULL DEFAULT 1,
+  `Pflege` tinyint(4) DEFAULT NULL,
+  `Toilettengang` tinyint(4) DEFAULT NULL,
+  `Aggressiv` tinyint(4) DEFAULT NULL,
+  `Schutzstufe` varchar(1024) DEFAULT NULL,
+  `Hygienebelehrung` tinyint(4) DEFAULT NULL,
  PRIMARY KEY (`Oid`),
  KEY `CUSTOMERSMASTERDATA_FK` (`PersonOid`),
  KEY `TERMINATION_FK` (`TerminationValueListEntryOid`),
@@ -149,6 +161,7 @@ CREATE TABLE `customer` (
 AUTO_INCREMENT=1 CHARACTER SET 'latin1' COLLATE 'latin1_swedish_ci';


+
 CREATE TABLE `absencetime` (
  `Oid` BIGINT(19) NOT NULL AUTO_INCREMENT,
  `AbsenceReasonOid` BIGINT(19) DEFAULT NULL,
@@ -164,6 +177,7 @@ CREATE TABLE `absencetime` (
  `IsActive` TINYINT(4) DEFAULT NULL,
  `SystemEntryID` INTEGER(10) DEFAULT NULL,
  `EmployeeOid` BIGINT(19) DEFAULT NULL,
+  `KrankheitsMeldung` DATETIME NULL DEFAULT NULL,
  PRIMARY KEY (`Oid`),
  KEY `CUSTOMERSABSENCES_FK` (`CustomerOid`),
  KEY `REASON_FK` (`AbsenceReasonOid`),
@@ -174,6 +188,7 @@ CREATE TABLE `absencetime` (
 )ENGINE=InnoDB
 AUTO_INCREMENT=1 CHARACTER SET 'latin1' COLLATE 'latin1_swedish_ci';

+
 CREATE TABLE `costbearer` (
  `Oid` BIGINT(19) NOT NULL AUTO_INCREMENT,
  `Tid` INTEGER(10) NOT NULL,
@@ -210,6 +225,7 @@ CREATE TABLE `applicationuser` (
  `SystemEntryID` INTEGER(10) DEFAULT NULL,
  `Salt` VARCHAR(128) DEFAULT NULL,
  `CreationDate` DATETIME DEFAULT NULL,
+  `PasswordHash` VARCHAR(1024) NULL DEFAULT NULL,
  PRIMARY KEY (`Oid`),
  KEY `LOGIN_FK` (`EmployeeOid`),
  CONSTRAINT `FK_ASPNET_U_LOGIN_EMPLOYEE` FOREIGN KEY (`EmployeeOid`) REFERENCES `employee` (`Oid`) ON DELETE NO ACTION ON UPDATE NO ACTION
@@ -248,6 +264,11 @@ CREATE TABLE `employee` (
  `Text5` varchar(128) DEFAULT NULL,
  `Notice2` MEDIUMTEXT DEFAULT NULL,
  `EmployeeColor` VARCHAR(9),
+  `Pflege` tinyint(4) DEFAULT NULL,
+  `Toilettengang` tinyint(4) DEFAULT NULL,
+  `Aggressiv` tinyint(4) DEFAULT NULL,
+  `Schutzstufe` varchar(1024) DEFAULT NULL,
+  `Hygienebelehrung` tinyint(4) DEFAULT NULL,
  PRIMARY KEY (`Oid`),
  KEY `EMPLOYEESMASTERDATA_FK` (`PersonOid`),
  KEY `LOGIN2_FK` (`ApplicationUserOid`),
@@ -265,7 +286,7 @@ CREATE TABLE `supportconcept` (
  `Conference` TINYINT(4) DEFAULT NULL,
  `Originator` VARCHAR(256) COLLATE latin1_swedish_ci DEFAULT NULL,
  `IsActive` TINYINT(4) DEFAULT NULL,
-  `Notice` VARCHAR(1024) COLLATE latin1_swedish_ci DEFAULT NULL,
+  `Notice` MEDIUMTEXT COLLATE latin1_swedish_ci DEFAULT NULL,
  `InsTs` DATETIME DEFAULT NULL,
  `InsUser` VARCHAR(256) COLLATE latin1_swedish_ci DEFAULT NULL,
  `Version` BIGINT(19) DEFAULT NULL,
@@ -286,6 +307,7 @@ CREATE TABLE `supportconcept` (
 )ENGINE=InnoDB
 AUTO_INCREMENT=1 CHARACTER SET 'latin1' COLLATE 'latin1_swedish_ci';

+
 CREATE TABLE `costbearer2supportconcept` (
  `Oid` BIGINT(19) NOT NULL AUTO_INCREMENT,
  `CostBearerOid` BIGINT(19) DEFAULT NULL,
@@ -332,11 +354,13 @@ CREATE TABLE `organisation` (
  `Version` BIGINT(19) DEFAULT NULL,
  `UdpUser` VARCHAR(256) COLLATE latin1_swedish_ci DEFAULT NULL,
  `Name` VARCHAR(256) COLLATE latin1_swedish_ci DEFAULT NULL,
+  `Name2` VARCHAR(256) COLLATE latin1_swedish_ci DEFAULT NULL,
  `IsActive` TINYINT(4) DEFAULT NULL,
  `SystemEntryID` INTEGER(10) DEFAULT NULL,
  `DebitorNumber` VARCHAR(128) COLLATE latin1_swedish_ci DEFAULT NULL,
  `CostCenter` VARCHAR(128) COLLATE latin1_swedish_ci DEFAULT NULL,
  `AccountNumber` VARCHAR(32) COLLATE latin1_swedish_ci DEFAULT NULL,
+  `FunctionValueListEntryOid` BIGINT(19) NULL DEFAULT NULL,
  PRIMARY KEY (`Oid`),
  KEY `LOCATION_FK` (`AddressOid`),
  KEY `PAYMENTS_FK` (`BankAccountOid`),
@@ -347,6 +371,7 @@ CREATE TABLE `organisation` (
 )ENGINE=InnoDB
 AUTO_INCREMENT=1 CHARACTER SET 'latin1' COLLATE 'latin1_swedish_ci';

+
 CREATE TABLE `accountingtransaction` (
  `Oid` BIGINT(19) NOT NULL AUTO_INCREMENT,
  `SupportConceptOid` BIGINT(19) DEFAULT NULL,
@@ -364,6 +389,7 @@ CREATE TABLE `accountingtransaction` (
  `IsActive` TINYINT(4) DEFAULT NULL,
  `SystemEntryID` INTEGER(10) DEFAULT NULL,
  `ValidityDate` DATETIME DEFAULT NULL,
+  `ImportNotice` VARCHAR(256) NULL DEFAULT NULL,
  PRIMARY KEY (`Oid`),
  KEY `CONCERNS_FK` (`SupportConceptOid`),
  KEY `CUSTOMERPAID_FK` (`CustomerOid`),
@@ -410,6 +436,7 @@ CREATE TABLE `organisation2person` (
  `UdpUser` VARCHAR(256) COLLATE latin1_swedish_ci DEFAULT NULL,
  `IsActive` TINYINT(4) DEFAULT NULL,
  `SystemEntryID` INTEGER(10) DEFAULT NULL,
+  `RolleInOrganisationValueListOid` BIGINT(19) NULL DEFAULT NULL,
  PRIMARY KEY (`Oid`),
  KEY `ORGANISATIONORGANISATION2PERSON` (`OrganisationOid`),
  KEY `PERSONORGANISATION2PERSON_FK` (`PersonOid`),
@@ -418,6 +445,9 @@ CREATE TABLE `organisation2person` (
 )ENGINE=InnoDB
 AUTO_INCREMENT=1 CHARACTER SET 'latin1' COLLATE 'latin1_swedish_ci';

+
+
+
 CREATE TABLE `contact` (
  `Oid` BIGINT(19) NOT NULL AUTO_INCREMENT,
  `Organisation2PersonOid` BIGINT(19) DEFAULT NULL,
@@ -477,6 +507,8 @@ CREATE TABLE `customer2person` (
  `UdpUser` VARCHAR(256) COLLATE latin1_swedish_ci DEFAULT NULL,
  `IsActive` TINYINT(4) DEFAULT NULL,
  `SystemEntryID` INTEGER(10) DEFAULT NULL,
+  `IstFamilie` TINYINT(4) NULL DEFAULT NULL,
+  `OrganisationOid` BIGINT(19) NULL DEFAULT NULL,
  PRIMARY KEY (`Oid`),
  KEY `CUSTOMERCUSTOMER2PERSON_FK` (`CustomerOid`),
  KEY `PERSONCUSTOMER2PERSON_FK` (`PersonOid`),
@@ -485,6 +517,8 @@ CREATE TABLE `customer2person` (
 )ENGINE=InnoDB
 AUTO_INCREMENT=1 CHARACTER SET 'latin1' COLLATE 'latin1_swedish_ci';

+
+
 CREATE TABLE `employee2customer` (
  `Oid` BIGINT(19) NOT NULL AUTO_INCREMENT,
  `CustomerOid` BIGINT(19) DEFAULT NULL,
@@ -497,6 +531,7 @@ CREATE TABLE `employee2customer` (
  `UdpUser` VARCHAR(256) COLLATE latin1_swedish_ci DEFAULT NULL,
  `IsActive` TINYINT(4) DEFAULT NULL,
  `SystemEntryID` INTEGER(10) DEFAULT NULL,
+  `Chatpartner` TINYINT(4) NULL DEFAULT 0,
  PRIMARY KEY (`Oid`),
  KEY `EMPLOYEE2CUSTOMERCUSTOMER_FK` (`CustomerOid`),
  KEY `EMPLOYEEEMPLOYEE2CUSTOMER_FK` (`EmployeeOid`),
@@ -505,6 +540,9 @@ CREATE TABLE `employee2customer` (
 )ENGINE=InnoDB
 AUTO_INCREMENT=1 CHARACTER SET 'latin1' COLLATE 'latin1_swedish_ci';

+
+
+
 CREATE TABLE `employee2team` (
  `TeamOid` BIGINT(19) NOT NULL,
  `EmployeeOid` BIGINT(19) NOT NULL,
@@ -561,6 +599,8 @@ CREATE TABLE `query` (
  `SystemEntryID` INTEGER(10) DEFAULT NULL,
  `UserGroupOids` VARCHAR(1024) DEFAULT NULL,
  `ReportTypeName` VARCHAR(1024) DEFAULT NULL,
+  `FileName` VARCHAR(256) NULL DEFAULT NULL,
+  `ExportTitle` VARCHAR(256) NULL DEFAULT NULL,
  PRIMARY KEY (`Oid`)
 )ENGINE=InnoDB
 AUTO_INCREMENT=1 CHARACTER SET 'latin1' COLLATE 'latin1_swedish_ci';
@@ -814,6 +854,13 @@ CREATE TABLE `servicerecord` (
  `Notice3` MEDIUMTEXT DEFAULT NULL,
  `Notice4` MEDIUMTEXT DEFAULT NULL,
  `Notice5` MEDIUMTEXT DEFAULT NULL,
+  `DurationInStunden` INT(10) NULL DEFAULT NULL,
+  `ServiceRecordFormat` INT(10) NULL DEFAULT NULL,
+  `RTFNotice1` MEDIUMTEXT NULL DEFAULT NULL,
+  `RTFNotice2` MEDIUMTEXT NULL DEFAULT NULL,
+  `RTFNotice3` MEDIUMTEXT NULL DEFAULT NULL,
+  `RTFNotice4` MEDIUMTEXT NULL DEFAULT NULL,
+  `RTFNotice5` MEDIUMTEXT NULL DEFAULT NULL,
  PRIMARY KEY (`Oid`),
  KEY `COSTBEARING_FK` (`CostBearer2SupportConceptOid`),
  KEY `DESCRIPTION_FK` (`ServiceDescriptionOid`),
@@ -833,6 +880,8 @@ CREATE TABLE `servicerecord` (
 )ENGINE=InnoDB
 AUTO_INCREMENT=1 CHARACTER SET 'latin1' COLLATE 'latin1_swedish_ci';

+
+
 CREATE TABLE `settings` (
  `Oid` BIGINT(19) NOT NULL AUTO_INCREMENT,
  `Tid` INTEGER(10) DEFAULT NULL,
@@ -1047,19 +1096,28 @@ CREATE TABLE `diagnosis2customer` (
 AUTO_INCREMENT=1 CHARACTER SET 'latin1' COLLATE 'latin1_swedish_ci';

 CREATE TABLE `timesheet` (
-  `Oid` BIGINT(19) NOT NULL AUTO_INCREMENT,
-  `SupportConceptOid` BIGINT(19) DEFAULT NULL,
-  `CostBearer2SupportConceptOid` BIGINT(19) DEFAULT NULL,
-  `Tid` INTEGER(10) DEFAULT NULL,
-  `CreationDate` DATETIME DEFAULT NULL,
-  `SignDate` DATETIME DEFAULT NULL,
-  `Notice` MEDIUMTEXT COLLATE latin1_swedish_ci DEFAULT NULL,
-  `InsTs` DATETIME DEFAULT NULL,
-  `InsUser` VARCHAR(256) COLLATE latin1_swedish_ci DEFAULT NULL,
-  `Version` BIGINT(19) DEFAULT NULL,
-  `UdpUser` VARCHAR(256) COLLATE latin1_swedish_ci DEFAULT NULL,
-  `IsActive` TINYINT(4) DEFAULT NULL,
-  `SystemEntryID` INTEGER(10) DEFAULT NULL,
+	`Oid` bigint(19) NOT NULL AUTO_INCREMENT,
+  `SupportConceptOid` bigint(19) DEFAULT NULL,
+  `CostBearer2SupportConceptOid` bigint(19) DEFAULT NULL,
+  `Tid` int(10) DEFAULT NULL,
+  `CreationDate` datetime DEFAULT NULL,
+  `SignDate` datetime DEFAULT NULL,
+  `Notice` mediumtext,
+  `InsTs` datetime DEFAULT NULL,
+  `InsUser` varchar(256) DEFAULT NULL,
+  `Version` bigint(19) DEFAULT NULL,
+  `UdpUser` varchar(256) DEFAULT NULL,
+  `IsActive` tinyint(4) DEFAULT NULL,
+  `SystemEntryID` int(10) DEFAULT NULL,
+  `EmployeeOid` bigint(19) DEFAULT NULL,
+  `CustomerOid` bigint(19) DEFAULT NULL,
+  `StartDate` datetime DEFAULT NULL,
+  `EndDate` datetime DEFAULT NULL,
+  `PrintedDate` datetime DEFAULT NULL,
+  `PrintedByEmployeeOid` bigint(19) DEFAULT NULL,
+  `SignedByEmployeeOid` bigint(19) DEFAULT NULL,
+  `UpdTs` datetime DEFAULT NULL,
+  `Status` varchar(1024) DEFAULT NULL,
  PRIMARY KEY (`Oid`),
  KEY `TIMESHEET_SUPPORTCONCEPT_FK` (`SupportConceptOid`),
  KEY `TIMESHEET_CB2SUPPORTCONCEPT_FK` (`CostBearer2SupportConceptOid`),
@@ -1090,10 +1148,12 @@ CREATE TABLE `mandator` (
  `SystemEntryID` INTEGER(10) DEFAULT NULL,
 	`IsSchedulerAllowed` tinyint(1) DEFAULT NULL,
 	`IsMedicationAllowed` tinyint(1) DEFAULT NULL,
+	`ApiKey` VARCHAR(256) NULL DEFAULT NULL,
  PRIMARY KEY (`Oid`)
 )ENGINE=InnoDB
 AUTO_INCREMENT=1 CHARACTER SET 'latin1' COLLATE 'latin1_swedish_ci';

+
 CREATE TABLE `placement` (
  `Oid` BIGINT(19) NOT NULL AUTO_INCREMENT,
  `Tid` INTEGER(10) NOT NULL,
@@ -1126,7 +1186,7 @@ CREATE  TABLE `InvoiceBase` (
  `RecipientCostBearerOid` BIGINT(19) NULL DEFAULT NULL ,
  `RecipientAddressOid` BIGINT(19) NULL DEFAULT NULL ,
  `RecipientOrganisation` VARCHAR(256) NULL DEFAULT NULL ,
-  `RecipientDivision` VARCHAR(45) NULL DEFAULT NULL ,
+  `RecipientDivision` VARCHAR(256) NULL DEFAULT NULL ,
  `RecipientPersonFirstName` VARCHAR(256) NULL DEFAULT NULL ,
  `RecipientPersonLastName` VARCHAR(256) NULL DEFAULT NULL ,
  `InvoiceNumber` VARCHAR(256) NULL DEFAULT NULL ,
@@ -1815,6 +1875,12 @@ CREATE TABLE `contract` (
  `IsActive` tinyint(4) DEFAULT NULL,
  `SystemEntryID` int(10) DEFAULT NULL,
  `WeeklyDays` int(10) DEFAULT NULL,
+  `MonthlyTotalHours` DECIMAL(18,10) NULL DEFAULT NULL,
+  `MonthlyFLS` DECIMAL(18,10) NULL DEFAULT NULL,
+  `HourlyRateCostRateValueOid` bigint(19) NULL DEFAULT NULL,
+  `ProbationPeriod2` decimal(18,10) NULL DEFAULT NULL,
+  `ContractTypeValueListEntryOid` bigint(10) NULL DEFAULT NULL,
+  `QualifikationsBedarfValueListEntryOid` bigint(10) NULL DEFAULT NULL,
  PRIMARY KEY (`Oid`),
  KEY `CONTRACTEMPLOYEE_FK` (`EmployeeOid`),
  KEY `CONTRACT_EMPLOYMENTTYPE_FK` (`EmploymentTypeOid`),
@@ -1823,9 +1889,6 @@ CREATE TABLE `contract` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;


-
-
-
 CREATE  TABLE `AppointmentCategory` (
  `Oid` BIGINT(19) NOT NULL AUTO_INCREMENT ,
  `Tid` INT(10) NOT NULL ,
@@ -1890,6 +1953,7 @@ CREATE TABLE `customer2organisation` (
  `UdpUser` VARCHAR(256) COLLATE latin1_swedish_ci DEFAULT NULL,
  `IsActive` TINYINT(4) DEFAULT NULL,
  `SystemEntryID` INTEGER(10) DEFAULT NULL,
+  `PersonOid` BIGINT(19) NULL DEFAULT NULL,
  PRIMARY KEY (`Oid`),
  KEY `CUSTOMERCUSTOMER2ORGANISATION_FK` (`CustomerOid`),
  KEY `PERSONCUSTOMER2ORGANISATION_FK` (`OrganisationOid`),
@@ -2410,7 +2474,7 @@ CREATE TABLE `overtime` (
  `SystemEntryID` int(10) DEFAULT NULL,
  `EmployeeOid` bigint(19) DEFAULT NULL,
  `Datum` datetime DEFAULT NULL,
-  `Betrag` float(7,4) DEFAULT NULL,
+  `Betrag` DECIMAL(18,10) DEFAULT NULL,
  `AuszahlungsartOid` bigint(19) DEFAULT NULL,
  PRIMARY KEY (`Oid`),
  KEY `FK_EMPLOYEE2OVERTIME` (`EmployeeOid`),
@@ -2507,7 +2571,7 @@ CREATE TABLE `medart`(
 	`Bezeichnung` varchar(1024) DEFAULT NULL,
 	`BezeichnungLang` varchar(1024) DEFAULT NULL,
 	PRIMARY KEY (`Oid`)
-) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=latin2;
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;

 CREATE TABLE `medikamentenverordnung` (
  `Oid` bigint(19) NOT NULL AUTO_INCREMENT,
@@ -2543,7 +2607,7 @@ CREATE TABLE `medikamentenverordnung` (
  CONSTRAINT `FK_DARFORM2MEDVERORDNUNG` FOREIGN KEY (`DarreichungsformOid`) REFERENCES `medverorddarform` (`Oid`)  ON DELETE NO ACTION ON UPDATE NO ACTION,
  CONSTRAINT `FK_DEPRHYTHM2MEDVERORDNUNG` FOREIGN KEY (`DepotRhythmusOid`) REFERENCES `medverorddepotrhythmus` (`Oid`)  ON DELETE NO ACTION ON UPDATE NO ACTION,
  CONSTRAINT `FK_MEDART2MEDVERORDNUNG` FOREIGN KEY (`MedArtOid`) REFERENCES `medart` (`Oid`) ON DELETE NO ACTION ON UPDATE NO ACTION
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=latin2;
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=latin1;


 CREATE TABLE `resetpassword` (
@@ -2648,7 +2712,7 @@ CREATE TABLE MedVerordDarForm (
 	`Wert` int(10) DEFAULT NULL,
 	CONSTRAINT UCWERT UNIQUE (`Wert`),
 	PRIMARY KEY (`Oid`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin2;
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;

 CREATE TABLE MedVerordDepotRhythmus (
 	`Oid` bigint(19) NOT NULL AUTO_INCREMENT,
@@ -2664,7 +2728,7 @@ CREATE TABLE MedVerordDepotRhythmus (
 	`Wert` int(10) DEFAULT NULL,
 	CONSTRAINT UCWERT UNIQUE (`Wert`),
 	PRIMARY KEY (`Oid`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin2;
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;

 CREATE TABLE `textbaustein` (
 	`Oid` BIGINT(19) NOT NULL AUTO_INCREMENT,
@@ -2682,11 +2746,15 @@ CREATE TABLE `textbaustein` (
 	`ServiceCategoryOid` BIGINT(19) DEFAULT NULL,
 	`EmployeeOid` BIGINT(19) DEFAULT NULL,
 	`IsOnlyForEmployee` TINYINT(1) DEFAULT NULL,
+	`IsParent` TINYINT(1) DEFAULT NULL,
+	`ParentOid` BIGINT(19) DEFAULT NULL,
+	`IsExpanded` TINYINT(4) DEFAULT NULL,
 	PRIMARY KEY (`Oid`),
 	KEY `SERVICECATEGORY_TEXTBAUSTEIN_FK` (`ServiceCategoryOid`),
 	KEY `EMPLOYEE_TEXTBAUSTEIN_FK` (`EmployeeOid`),
 	CONSTRAINT `FK_SERVICECATEGORY_TEXTBAUSTEIN` FOREIGN KEY (`ServiceCategoryOid`) REFERENCES `ServiceCategory` (`Oid`) ON DELETE NO ACTION ON UPDATE NO ACTION,
-	CONSTRAINT `FK_EMPLOYEE_TEXTBAUSTEIN` FOREIGN KEY (`EmployeeOid`) REFERENCES `Employee` (`Oid`) ON DELETE NO ACTION ON UPDATE NO ACTION
+	CONSTRAINT `FK_EMPLOYEE_TEXTBAUSTEIN` FOREIGN KEY (`EmployeeOid`) REFERENCES `Employee` (`Oid`) ON DELETE NO ACTION ON UPDATE NO ACTION,
+	CONSTRAINT FK_TEXTBAUSTEIN2PARENT FOREIGN KEY (ParentOid) REFERENCES textbaustein(Oid) ON DELETE NO ACTION ON UPDATE NO ACTION
 )ENGINE=INNODB AUTO_INCREMENT=1 DEFAULT CHARSET=LATIN1;

 CREATE TABLE bargeldtransaktion(
@@ -2874,12 +2942,14 @@ CREATE TABLE supportconceptapprovalperiod2employee (
 	`SupportConceptApprovalPeriodOid` BIGINT(19) DEFAULT NULL,
 	`EmployeeOid` BIGINT(19) DEFAULT NULL,
 	`Betreuungsschluessel` DECIMAL(18, 10) DEFAULT NULL,
+	`IsAbsolut` INT(10) NULL DEFAULT 0,
 	PRIMARY KEY (`Oid`),
 	KEY `SUPPORTCONCEPTAPPROVALPERIOD2EMPLOYEE_PERIOD_FK` (`SupportConceptApprovalPeriodOid`),
    CONSTRAINT `FK_SUPPORTCONCEPTAPPROVALPERIOD2EMPLOYEE_PERIOD` FOREIGN KEY (`SupportConceptApprovalPeriodOid`) REFERENCES `SupportConceptApprovalPeriod` (`Oid`) ON DELETE NO ACTION ON UPDATE NO ACTION,
 	KEY `SUPPORTCONCEPTAPPROVALPERIOD2EMPLOYEE_EMPLOYEE_FK` (`EmployeeOid`),
    CONSTRAINT `FK_SUPPORTCONCEPTAPPROVALPERIOD2EMPLOYEE_EMPLOYEE` FOREIGN KEY (`EmployeeOid`) REFERENCES `Employee` (`Oid`) ON DELETE NO ACTION ON UPDATE NO ACTION
-) ENGINE=INNODB AUTO_INCREMENT=1 DEFAULT CHARSET=LATIN1;
+) ENGINE=InnoDB AUTO_INCREMENT=1 CHARACTER SET 'latin1' COLLATE 'latin1_swedish_ci';
+

 CREATE TABLE bargeldkasse (
    `Oid` BIGINT(19) NOT NULL AUTO_INCREMENT,
@@ -2896,7 +2966,380 @@ CREATE TABLE bargeldkasse (
    `Kassenname` VARCHAR(256) DEFAULT NULL,
    `Auszahlungsintervall` TINYINT(10) DEFAULT NULL,
    PRIMARY KEY (`Oid`)
-) ENGINE=INNODB AUTO_INCREMENT=1 DEFAULT CHARSET=LATIN1;
+) ENGINE=InnoDB AUTO_INCREMENT=1 CHARACTER SET 'latin1' COLLATE 'latin1_swedish_ci';
+
+CREATE TABLE `image` (
+  `Oid` bigint(19) NOT NULL AUTO_INCREMENT,
+  `CustomerOid` bigint(19) DEFAULT NULL,
+  `EmployeeOid` bigint(19) DEFAULT NULL,
+  `InsTs` datetime DEFAULT NULL,
+  `InsUser` varchar(256) DEFAULT NULL,
+  `Notice` varchar(1024) DEFAULT NULL,
+  `Tid` int(10) DEFAULT NULL,
+  `UpdUser` varchar(256) DEFAULT NULL,
+  `Version` bigint(19) DEFAULT NULL,
+  `IsActive` tinyint(4) DEFAULT NULL,
+  `SystemEntryID` int(10) DEFAULT NULL,
+  `Original` longblob,
+  `MediumThumbnail` longblob,
+  `SmallThumbnail` longblob,
+  `PersonOid` bigint(19) DEFAULT NULL,
+  PRIMARY KEY (`Oid`),
+  KEY `KEY_CUSTOMER` (`CustomerOid`),
+  KEY `KEY_EMPLOYEE` (`EmployeeOid`),
+  CONSTRAINT `FK_CUSTOMER` FOREIGN KEY (`CustomerOid`) REFERENCES `customer` (`Oid`) ON DELETE NO ACTION ON UPDATE NO ACTION,
+  CONSTRAINT `FK_EMPLOYEE` FOREIGN KEY (`EmployeeOid`) REFERENCES `employee` (`Oid`) ON DELETE NO ACTION ON UPDATE NO ACTION
+) ENGINE=InnoDB AUTO_INCREMENT=1 CHARACTER SET 'latin1' COLLATE 'latin1_swedish_ci';
+
+
+CREATE TABLE `chatbewomessagesync` (
+  `Oid` BIGINT(19) NOT NULL AUTO_INCREMENT COMMENT '',
+  `EmployeeOid` BIGINT(19) NULL COMMENT '',
+  `Tid` INT(10) NULL COMMENT '',
+  `Notice` VARCHAR(1024) NULL COMMENT '',
+  `InsTs` DATETIME NULL COMMENT '',
+  `InsUser` VARCHAR(1024) NULL COMMENT '',
+  `Version` BIGINT(19) NULL COMMENT '',
+  `UdpUser` VARCHAR(256) NULL COMMENT '',
+  `isActive` TINYINT(4) NULL COMMENT '',
+  `SystemEntryID` INT(10) NULL COMMENT '',
+  `MessageSyncText` VARCHAR(1024) NULL COMMENT '',
+   PRIMARY KEY (`Oid`)  COMMENT '')
+   ENGINE=InnoDB AUTO_INCREMENT=1 CHARACTER SET 'latin1' COLLATE 'latin1_swedish_ci';
+
+CREATE TABLE `chatmessages` (
+  `Oid` bigint(19) NOT NULL AUTO_INCREMENT,
+  `SenderPersonOid` bigint(19) DEFAULT NULL,
+  `EmpfaengerPersonOid` bigint(19) DEFAULT NULL,
+  `Tid` int(10) DEFAULT NULL,
+  `Notice` varchar(1024) DEFAULT NULL,
+  `InsTs` datetime DEFAULT NULL,
+  `InsUser` varchar(1024) DEFAULT NULL,
+  `Version` bigint(19) DEFAULT NULL,
+  `UdpUser` varchar(256) DEFAULT NULL,
+  `isActive` tinyint(4) DEFAULT NULL,
+  `SystemEntryID` int(10) DEFAULT NULL,
+  `ChatText` longblob,
+  `Uhrzeit` datetime DEFAULT NULL,
+  `IstZugestellt` tinyint(4) DEFAULT NULL,
+  `IstGelesen` tinyint(4) DEFAULT NULL,
+  `TeamOid` bigint(19) DEFAULT NULL,
+  `MessageId` VARCHAR(1024) DEFAULT NULL,
+  `MediaTyp` INT(10) NULL DEFAULT NULL COMMENT '',
+  PRIMARY KEY (`Oid`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 CHARACTER SET 'latin1' COLLATE 'latin1_swedish_ci';
+
+
+CREATE TABLE `chatmediamessage` (
+  `Oid` BIGINT(19) AUTO_INCREMENT COMMENT '',
+  `ChatMessageOid` BIGINT(19) NULL COMMENT '',
+  `Tid` INT(10) NULL COMMENT '',
+  `Notice` VARCHAR(1024) NULL COMMENT '',
+  `InsTs` DATETIME NULL COMMENT '',
+  `InsUser` VARCHAR(1024) NULL COMMENT '',
+  `Version` BIGINT(19) NULL COMMENT '',
+  `UdpUser` VARCHAR(256) NULL COMMENT '',
+  `isActive` TINYINT(4) NULL COMMENT '',
+  `SystemEntryID` INT(10) NULL COMMENT '',
+  `Media` LONGBLOB NULL DEFAULT NULL COMMENT '',
+  `ImageThumpNail` LONGBLOB NULL DEFAULT NULL COMMENT '',
+ 	PRIMARY KEY (`Oid`),
+ 	INDEX `ChatMessage_IDX` (`ChatMessageOid` ASC)
+ 	)ENGINE=InnoDB AUTO_INCREMENT=1 CHARACTER SET 'latin1' COLLATE 'latin1_swedish_ci';
+
+
+CREATE TABLE `employeeappcode` (
+  `Oid` BIGINT(19) NOT NULL AUTO_INCREMENT,
+  `Employeeoid` BIGINT(19) NULL,
+  `Tid` INT(10) NULL,
+  `Notice` VARCHAR(1024) NULL,
+  `InsTs` DATETIME NULL,
+  `InsUser` VARCHAR(1024) NULL,
+  `Version` BIGINT(19) NULL,
+  `UdpUser` VARCHAR(256) NULL,
+  `IsActive` TINYINT(4) NULL,
+  `SystemEntryID` INT(10) NULL,
+  `EmployeeCode` VARCHAR(512) NULL,
+  `EmployeeCodegenDate` DATETIME NULL,
+  `IsChatActive` INT DEFAULT 0,
+  `NotfallStatement` VARCHAR(1024) NULL,
+  PRIMARY KEY (`Oid`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 CHARACTER SET 'latin1' COLLATE 'latin1_swedish_ci';
+
+
+CREATE TABLE `customerappcode` (
+  `Oid` bigint(19) NOT NULL AUTO_INCREMENT,
+  `CustomerOid` bigint(19) DEFAULT NULL,
+  `Tid` int(10) DEFAULT NULL,
+  `Notice` varchar(1024) DEFAULT NULL,
+  `InsTs` datetime DEFAULT NULL,
+  `InsUser` varchar(1024) DEFAULT NULL,
+  `Version` bigint(19) DEFAULT NULL,
+  `UdpUser` varchar(256) DEFAULT NULL,
+  `IsActive` tinyint(4) DEFAULT NULL,
+  `SystemEntryID` int(10) DEFAULT NULL,
+  `CustomerCodeGenDate` datetime DEFAULT NULL,
+  `CustomerCode` varchar(512) DEFAULT NULL,
+  `IsChatActive` INT DEFAULT 0,
+  `BenutzerName` VARCHAR(1024) NULL DEFAULT NULL,
+  `Passwort` VARCHAR(1024) NULL DEFAULT NULL,
+  `PasswordHash` VARCHAR(1024) NULL DEFAULT NULL,
+   PRIMARY KEY (`Oid`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 CHARACTER SET 'latin1' COLLATE 'latin1_swedish_ci';
+
+
+
+CREATE TABLE `passwortverlauf` (
+  `Oid` BIGINT(19) NOT NULL AUTO_INCREMENT COMMENT '',
+  `ApplicationUserOid` BIGINT(19) NULL COMMENT '',
+  `Tid` INT(10) NULL COMMENT '',
+  `Notice` VARCHAR(1024) NULL COMMENT '',
+  `InsTs` DATETIME NULL COMMENT '',
+  `InsUser` VARCHAR(1024) NULL COMMENT '',
+  `Version` BIGINT(19) NULL COMMENT '',
+  `UdpUser` VARCHAR(256) NULL COMMENT '',
+  `isActive` TINYINT(4) NULL COMMENT '',
+  `SystemEntryID` INT(10) NULL COMMENT '',
+  `ErstellDatum` DATETIME NULL COMMENT '',
+  `Passwort` VARCHAR(64) NULL COMMENT '',
+  `Salt` VARCHAR(128) NULL COMMENT '',
+ PRIMARY KEY (`Oid`)  COMMENT '')
+ENGINE=InnoDB AUTO_INCREMENT=1 CHARACTER SET 'latin1' COLLATE 'latin1_swedish_ci';
+
+
+CREATE TABLE `newestchatmessage` (
+	`Oid` BIGINT(19) NOT NULL AUTO_INCREMENT,
+	`Tid` INT(10) DEFAULT NULL,
+	`IsActive` TINYINT(1) 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,
+	`RecipientPersonOid` BIGINT(19) DEFAULT NULL,
+	`SenderPersonOid` BIGINT(19) DEFAULT NULL,
+	`ChatMessageOid` BIGINT(19) DEFAULT NULL,
+	`IsTeam` TINYINT(1) DEFAULT NULL,
+	PRIMARY KEY (`Oid`),
+	KEY `NEWESTCHATMESSAGE_RECIPIENT_FK` (`RecipientPersonOid`),
+	CONSTRAINT `FK_NEWESTCHATMESSAGE_RECIPIENT` FOREIGN KEY (`RecipientPersonOid`) REFERENCES `Person` (`Oid`) ON DELETE NO ACTION ON UPDATE NO ACTION,
+	KEY `NEWESTCHATMESSAGE_SENDER_FK` (`SenderPersonOid`),
+	CONSTRAINT `FK_NEWESTCHATMESSAGE_SENDER` FOREIGN KEY (`SenderPersonOid`) REFERENCES `Person` (`Oid`) ON DELETE NO ACTION ON UPDATE NO ACTION,
+	KEY `NEWESTCHATMESSAGE_CHATMESSAGE_FK` (`ChatMessageOid`),
+	CONSTRAINT `FK_NEWESTCHATMESSAGE_CHATMESSAGE` FOREIGN KEY (`ChatMessageOid`) REFERENCES `ChatMessages` (`Oid`) ON DELETE NO ACTION ON UPDATE NO ACTION
+) ENGINE=InnoDB AUTO_INCREMENT=1 CHARACTER SET 'latin1' COLLATE 'latin1_swedish_ci';
+
+CREATE TABLE `vertretung`
+ (
+  `Oid` BIGINT(19) NOT NULL AUTO_INCREMENT COMMENT '',
+  `MitarbeiterOid` BIGINT(19) NULL COMMENT '',
+  `KlientOid` BIGINT(19) NULL COMMENT '',
+  `Tid` INT(10) NULL COMMENT '',
+  `Notice` VARCHAR(1024) NULL COMMENT '',
+  `InsTs` DATETIME NULL COMMENT '',
+  `InsUser` VARCHAR(1024) NULL COMMENT '',
+  `Version` BIGINT(19) NULL COMMENT '',
+  `UdpUser` VARCHAR(256) NULL COMMENT '',
+  `IsActive` TINYINT(4) NULL COMMENT '',
+  `SystemEntryID` INT(10) NULL COMMENT '',
+  `VertretungsZeitraumVon` DATETIME NULL COMMENT '',
+  `VertretungsZeitraumBis` DATETIME NULL COMMENT '',
+  `VertretenderMitarbeiterOid` BIGINT(19) NULL DEFAULT 0 COMMENT '',
+  `AbsenceTimeOid` BIGINT(19) NULL DEFAULT NULL COMMENT '',
+  PRIMARY KEY (`Oid`)  COMMENT '')
+  ENGINE=InnoDB AUTO_INCREMENT=1 CHARACTER SET 'latin1' COLLATE 'latin1_swedish_ci';
+  
+  CREATE TABLE `kriterien` (
+  `Oid` BIGINT(19) NOT NULL AUTO_INCREMENT COMMENT '',
+  `KlientenOid` BIGINT(19) NULL DEFAULT NULL COMMENT '',
+  `Tid` INT(10) NULL DEFAULT NULL COMMENT '',
+  `Notice` VARCHAR(1024) NULL DEFAULT NULL COMMENT '',
+  `InsTs` DATETIME NULL COMMENT '',
+  `InsUser` VARCHAR(1024) NULL COMMENT '',
+  `Version` BIGINT(19) NULL COMMENT '',
+  `UdpUser` VARCHAR(256) NULL COMMENT '',
+  `IsActive` TINYINT(4) NULL COMMENT '',
+  `SystemEntryID` INT(10) NULL COMMENT '',
+  `AusschlussKriterien` VARCHAR(1024) NULL COMMENT '',
+  `WunschKriterien` VARCHAR(1024) NULL COMMENT '',
+  PRIMARY KEY (`Oid`)  COMMENT '')
+  ENGINE=InnoDB AUTO_INCREMENT=1 CHARACTER SET 'latin1' COLLATE 'latin1_swedish_ci';
+
+
+CREATE TABLE `arbeitszeit` (
+  `Oid` BIGINT(19) NOT NULL AUTO_INCREMENT COMMENT '',
+  `EmployeeOid` BIGINT(19) NULL COMMENT '',
+  `Tid` INT(10) NULL COMMENT '',
+  `Notice` VARCHAR(1024) NULL COMMENT '',
+  `InsTs` DATETIME NULL COMMENT '',
+  `InsUser` VARCHAR(1024) NULL COMMENT '',
+  `Version` BIGINT(19) NULL COMMENT '',
+  `UdpUser` VARCHAR(256) NULL COMMENT '',
+  `isActive` TINYINT(4) NULL COMMENT '',
+  `SystemEntryID` INT(10) NULL COMMENT '',
+  `GueltigVon` DATETIME NULL COMMENT '',
+  `GueltigBis` DATETIME NULL COMMENT '',
+  `CustomerOid` bigint(19) DEFAULT NULL,
+  `OrganisationOid` bigint(19) DEFAULT NULL,
+  PRIMARY KEY (`Oid`)  COMMENT '')
+  ENGINE=InnoDB AUTO_INCREMENT=1 CHARACTER SET 'latin1' COLLATE 'latin1_swedish_ci';
+
+
+CREATE TABLE `arbeitszeiteintrag` (
+  `Oid` BIGINT(19) NOT NULL AUTO_INCREMENT COMMENT '',
+  `ArbeitszeitOid` BIGINT(19) NULL COMMENT '',
+  `Tid` INT(10) NULL COMMENT '',
+  `Notice` VARCHAR(1024) NULL COMMENT '',
+  `InsTs` DATETIME NULL COMMENT '',
+  `InsUser` VARCHAR(1024) NULL COMMENT '',
+  `Version` BIGINT(19) NULL COMMENT '',
+  `UdpUser` VARCHAR(256) NULL COMMENT '',
+  `isActive` TINYINT(4) NULL COMMENT '',
+  `SystemEntryID` INT(10) NULL COMMENT '',
+  `Tag` INT(10) NULL COMMENT '',
+  `UhrzeitVon` VARCHAR(256) NULL COMMENT '',
+  `UhrzeitBis` VARCHAR(256) NULL COMMENT '',
+  `CustomerOid` BIGINT(19) NULL DEFAULT NULL,
+  `EmployeeOid` BIGINT(19) NULL DEFAULT NULL,
+  PRIMARY KEY (`Oid`)  COMMENT '')
+  ENGINE=InnoDB AUTO_INCREMENT=1 CHARACTER SET 'latin1' COLLATE 'latin1_swedish_ci';
+  
+  
+  CREATE TABLE customerteam (
+	`Oid` bigint(19) NOT NULL AUTO_INCREMENT,
+	`Tid` int(10) DEFAULT NULL,
+	`Name` varchar(256) DEFAULT NULL,
+	`IsActive` tinyint(4) DEFAULT NULL,
+	`Notice` varchar(1024) DEFAULT NULL,
+	`InsTs` datetime DEFAULT NULL,
+	`InsUser` varchar(256) DEFAULT NULL,
+	`UdpUser` varchar(256) DEFAULT NULL,
+	`Version` bigint(19) DEFAULT NULL,
+	`SystemEntryID` int(10) DEFAULT NULL,
+	PRIMARY KEY (`Oid`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 CHARACTER SET 'latin1' COLLATE 'latin1_swedish_ci';
+
+
+
+CREATE TABLE `token` (
+  `Oid` BIGINT(19) NOT NULL AUTO_INCREMENT COMMENT '',
+  `Tid` INT(10) NULL COMMENT '',
+  `Notice` VARCHAR(1024) NULL COMMENT '',
+  `InsTs` DATETIME NULL COMMENT '',
+  `InsUser` VARCHAR(1024) NULL COMMENT '',
+  `Version` BIGINT(19) NULL COMMENT '',
+  `UdpUser` VARCHAR(256) NULL COMMENT '',
+  `isActive` TINYINT(4) NULL COMMENT '',
+  `SystemEntryID` INT(10) NULL COMMENT '',
+  `Beschreibung` VARCHAR(1024) NULL COMMENT '',
+  `Typ` TINYINT(4) NULL COMMENT '',
+  PRIMARY KEY (`Oid`)  COMMENT '')
+  ENGINE=InnoDB AUTO_INCREMENT=1 CHARACTER SET 'latin1' COLLATE 'latin1_swedish_ci';
+
+
+
+CREATE TABLE `customer2token` (
+  `Oid` BIGINT(19) NOT NULL AUTO_INCREMENT COMMENT '',
+  `CustomerOid` BIGINT(19) NULL COMMENT '',
+  `TokenOid` BIGINT(19) NULL COMMENT '',
+  `Tid` INT(10) NULL COMMENT '',
+  `Notice` VARCHAR(1024) NULL COMMENT '',
+  `InsTs` DATETIME NULL COMMENT '',
+  `InsUser` VARCHAR(1024) NULL COMMENT '',
+   `Version` BIGINT(19) NULL COMMENT '',
+  `UdpUser` VARCHAR(256) NULL COMMENT '',
+  `isActive` TINYINT(4) NULL COMMENT '',
+  `SystemEntryID` INT(10) NULL COMMENT '',
+  PRIMARY KEY (`Oid`)  COMMENT '')
+  ENGINE=InnoDB AUTO_INCREMENT=1 CHARACTER SET 'latin1' COLLATE 'latin1_swedish_ci';
+
+
+
+
+CREATE TABLE `employee2token` (
+  `Oid` BIGINT(19) NOT NULL AUTO_INCREMENT COMMENT '',
+  `EmployeeOid` BIGINT(19) NULL COMMENT '',
+  `TokenOid` BIGINT(19) NULL COMMENT '',
+  `Tid` INT(10) NULL COMMENT '',
+  `Notice` VARCHAR(1024) NULL COMMENT '',
+  `InsTs` DATETIME NULL COMMENT '',
+  `InsUser` VARCHAR(1024) NULL COMMENT '',
+  `Version` BIGINT(19) NULL COMMENT '',
+  `UdpUser` VARCHAR(256) NULL COMMENT '',
+  `isActive` TINYINT(4) NULL COMMENT '',
+  `SystemEntryID` INT(10) NULL COMMENT '',
+  PRIMARY KEY (`Oid`)  COMMENT '')
+  ENGINE=InnoDB AUTO_INCREMENT=1 CHARACTER SET 'latin1' COLLATE 'latin1_swedish_ci';
+  
+  CREATE TABLE `quittierungscheck` (
+  `Oid` BIGINT(19) NOT NULL AUTO_INCREMENT COMMENT '',
+  `CustomerOid` BIGINT(19) NULL COMMENT '',
+  `Tid` INT(10) NULL COMMENT '',
+  `Notice` VARCHAR(1024) NULL COMMENT '',
+  `InsTs` DATETIME NULL COMMENT '',
+  `InsUser` VARCHAR(1024) NULL COMMENT '',
+  `Version` BIGINT(19) NULL COMMENT '',
+  `UdpUser` VARCHAR(256) NULL COMMENT '',
+  `isActive` TINYINT(4) NULL COMMENT '',
+  `SystemEntryID` INT(10) NULL COMMENT '',
+  `Monat` DATETIME NULL COMMENT '',
+  `QuittierungsbelegGedruckt` TINYINT(4) NULL COMMENT '',
+  `QuittierungsbelegUnterschrieben` TINYINT(4) NULL COMMENT '',
+  `QuittierungsbelegGedrucktAm` DATETIME NULL DEFAULT NULL,
+  `QuittierungsbelegUnterschriebenVon` BIGINT(19) NULL DEFAULT NULL,
+  `QuittierungsbelegGedrucktVon` BIGINT(19) NULL DEFAULT NULL,
+  PRIMARY KEY (`Oid`)  COMMENT '')
+  ENGINE=InnoDB AUTO_INCREMENT=1 CHARACTER SET 'latin1' COLLATE 'latin1_swedish_ci';
+
+CREATE TABLE `feiertag` (
+  `Oid` bigint(19) NOT NULL AUTO_INCREMENT,
+  `Tid` int(10) DEFAULT NULL,
+  `Datum` datetime DEFAULT NULL,
+  `Name` varchar(256) DEFAULT NULL,
+  `Notice` varchar(1024) DEFAULT NULL,
+  `Version` bigint(19) DEFAULT NULL,
+  `UdpUser` varchar(256) DEFAULT NULL,
+  `InsUser` varchar(256) DEFAULT NULL,
+  `InsTs` datetime DEFAULT NULL,
+  `IsActive` tinyint(4) DEFAULT NULL,
+  `SystemEntryID` int(10) DEFAULT NULL,
+  PRIMARY KEY (`Oid`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
+
+CREATE TABLE `NotizenKategorie` (
+  `Oid` bigint(19) NOT NULL AUTO_INCREMENT,
+  `Tid` int(10) DEFAULT NULL,
+  `IsActive` tinyint(1) 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,
+  `ObjectOid` bigint(19) DEFAULT NULL,
+  `ObjectTid` int(10) DEFAULT NULL,
+  `KategorieName` varchar(256) DEFAULT NULL,
+  PRIMARY KEY (`Oid`)
+) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=latin1;
+
+
+CREATE TABLE `NotizenEintrag` (
+  `Oid` bigint(19) NOT NULL AUTO_INCREMENT,
+  `Datum` datetime DEFAULT NULL,
+  `Tid` int(10) DEFAULT NULL,
+  `IsActive` tinyint(1) DEFAULT NULL,
+  `Notice` mediumtext 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,
+  `NotizenKategorieOid` bigint(19) DEFAULT NULL,
+  PRIMARY KEY (`Oid`),
+  KEY `NOTIZENEINTRAG_KATEGORIE_FK` (`NotizenKategorieOid`),
+  CONSTRAINT `FK_NOTIZENEINTRAG_KATEGORIE` FOREIGN KEY (`NotizenKategorieOid`) REFERENCES `NotizenKategorie` (`Oid`) ON DELETE NO ACTION ON UPDATE NO ACTION
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;

 CREATE VIEW `listedsupportconcept` AS 
  select 
--- a/SQL/insertFolderStruktur.sql
+++ b/SQL/insertFolderStruktur.sql
@@ -0,0 +1,13 @@
+INSERT INTO `bewofolder` (tid, objectoid, objecttid, name, insts, insuser, version, udpuser, isactive) select 20, oid, 8, '1 LVR / Jugendamt', '2018-02-28 13:00:00', 'BS', 1, 'BS', 1 from customer;
+INSERT INTO `bewofolder` (tid, objectoid, objecttid, name, insts, insuser, version, udpuser, isactive) select 20, oid, 8, '2 ARGE / Agentur für Arbeit / Jobcenter', '2018-02-28 13:00:00', 'BS', 1, 'BS', 1 from customer;
+INSERT INTO `bewofolder` (tid, objectoid, objecttid, name, insts, insuser, version, udpuser, isactive) select 20, oid, 8, '3 Individueller Hilfeplan (IHP)', '2018-02-28 13:00:00', 'BS', 1, 'BS', 1 from customer;
+INSERT INTO `bewofolder` (tid, objectoid, objecttid, name, insts, insuser, version, udpuser, isactive) select 20, oid, 8, '4 Medizinische Unterlagen', '2018-02-28 13:00:00', 'BS', 1, 'BS', 1 from customer;
+INSERT INTO `bewofolder` (tid, objectoid, objecttid, name, insts, insuser, version, udpuser, isactive) select 20, oid, 8, '5 Stadt Düsseldorf / Stadt Köln (z.B.Stadtwerke / OEZ)', '2018-02-28 13:00:00', 'BS', 1, 'BS', 1 from customer;
+INSERT INTO `bewofolder` (tid, objectoid, objecttid, name, insts, insuser, version, udpuser, isactive) select 20, oid, 8, '6 Rentenversicherung/Versicherung/Krankenkasse', '2018-02-28 13:00:00', 'BS', 1, 'BS', 1 from customer;
+INSERT INTO `bewofolder` (tid, objectoid, objecttid, name, insts, insuser, version, udpuser, isactive) select 20, oid, 8, '7 Konto- Finanzunterlagen', '2018-02-28 13:00:00', 'BS', 1, 'BS', 1 from customer;
+INSERT INTO `bewofolder` (tid, objectoid, objecttid, name, insts, insuser, version, udpuser, isactive) select 20, oid, 8, '8 Rechtliche Unterlagen', '2018-02-28 13:00:00', 'BS', 1, 'BS', 1 from customer;
+INSERT INTO `bewofolder` (tid, objectoid, objecttid, name, insts, insuser, version, udpuser, isactive) select 20, oid, 8, '9 Wohnung inkl. Mietvertrag', '2018-02-28 13:00:00', 'BS', 1, 'BS', 1 from customer;
+INSERT INTO `bewofolder` (tid, objectoid, objecttid, name, insts, insuser, version, udpuser, isactive) select 20, oid, 8, '10 Erklärung Schweigepflicht / Mitteilung über', '2018-02-28 13:00:00', 'BS', 1, 'BS', 1 from customer;
+INSERT INTO `bewofolder` (tid, objectoid, objecttid, name, insts, insuser, version, udpuser, isactive) select 20, oid, 8, '11 Betreuungsvertrag / Protokoll des Erstgesprächs', '2018-02-28 13:00:00', 'BS', 1, 'BS', 1 from customer;
+INSERT INTO `bewofolder` (tid, objectoid, objecttid, name, insts, insuser, version, udpuser, isactive) select 20, oid, 8, '12 Aktenvermerke', '2018-02-28 13:00:00', 'BS', 1, 'BS', 1 from customer;
+INSERT INTO `bewofolder` (tid, objectoid, objecttid, name, insts, insuser, version, udpuser, isactive) select 20, oid, 8, '13 Sonstiges', '2018-02-28 13:00:00', 'BS', 1, 'BS', 1 from customer;
--- a/SQL/inserts.sql
+++ b/SQL/inserts.sql
@@ -35,8 +35,8 @@ INSERT INTO `address` (`Oid`, `Tid`, `Street`, `PostalCode`, `Town`, `State`, `C
  (1,5,'Kennedy-Ufer 2','50663 ','Köln',NULL,NULL,NULL,'2008-11-10 11:18:42','Max Mustermann',1,'Max Mustermann',1,NULL);
 COMMIT;

-INSERT INTO `costbearer` (`Oid`, `Tid`, `HourlyRate`, `RateFactor`, `Notice`, `InsTs`, `InsUser`, `UdpUser`, `Version`, `IsActive`, `MinutesIntervall`, `ReferenceNumber`, `SystemEntryID`) VALUES 
-  (1,22,49.9000000000,20.0000000000,NULL,'2008-10-05 19:12:11','Max Mustermann','Max Mustermann',1,1,10,NULL,0);
+INSERT INTO `costbearer` (`Oid`, `Tid`, `HourlyRate`, `RateFactor`, `Notice`, `InsTs`, `InsUser`, `UdpUser`, `Version`, `IsActive`, `MinutesIntervall`, `ReferenceNumber`, `SystemEntryID`, `IsSingleInvoicePerCustomer`) VALUES 
+  (1,22,56.6000000000,20.0000000000,NULL,'2008-10-05 19:12:11','Max Mustermann','Max Mustermann',1,1,10,NULL,0,0);
 COMMIT;

 INSERT INTO `organisation` (`Oid`, `BankAccountOid`, `AddressOid`, `CostBearerOid`, `Tid`, `Notice`, `InsTs`, `InsUser`, `Version`, `UdpUser`, `Name`, `IsActive`, `SystemEntryID`) VALUES 
@@ -44,7 +44,7 @@ INSERT INTO `organisation` (`Oid`, `BankAccountOid`, `AddressOid`, `CostBearerOi
 COMMIT;

 INSERT INTO `costrateperiod` (`Oid`, `ObjectOid`, `ObjectTid`, `CostRateType`, `CostRateValue`, `StartDate`, `EndDate`, `Notice`, `InsTs`, `InsUser`, `Version`, `UdpUser`, `IsActive`, `SystemEntryID`, `UnitName`) VALUES 
-  (1,1,22,0,50.4000000000,NULL,NULL,NULL,'2009-09-30 00:00:00','BS',1,'BS',1,NULL, NULL),
+  (1,1,22,0,56.6000000000,NULL,NULL,NULL,'2009-09-30 00:00:00','BS',1,'BS',1,NULL, NULL),
  (2,1,22,1,10.0000000000,NULL,NULL,NULL,'2009-09-30 00:00:00','BS',1,'BS',1,NULL, NULL),
  (3,1,22,2,20.0000000000,NULL,NULL,NULL,'2009-09-30 00:00:00','BS',1,'BS',1,NULL, NULL),
  (4,1,22,3,60.0000000000,NULL,NULL,NULL,'2009-09-30 00:00:00','BS',1,'BS',1,NULL, 'FLS');
@@ -58,8 +58,8 @@ INSERT INTO `address` (`Oid`, `Tid`, `Street`, `PostalCode`, `Town`, `State`, `C
  (2,5,'Warendorfer Straße 26-28','48145 ','Münster',NULL,NULL,NULL,'2008-11-10 11:18:42','Max Mustermann',1,'Max Mustermann',1,NULL);
 COMMIT;

-INSERT INTO `costbearer` (`Oid`, `Tid`, `HourlyRate`, `RateFactor`, `Notice`, `InsTs`, `InsUser`, `UdpUser`, `Version`, `IsActive`, `MinutesIntervall`, `ReferenceNumber`, `SystemEntryID`, `IsCalculatingWithFactor`, `ID`) VALUES 
-  (2,22,NULL,NULL,NULL,'2008-10-05 19:12:11','Max Mustermann','Max Mustermann',1,1,10,NULL,0,1,'LWLNEU');
+INSERT INTO `costbearer` (`Oid`, `Tid`, `HourlyRate`, `RateFactor`, `Notice`, `InsTs`, `InsUser`, `UdpUser`, `Version`, `IsActive`, `MinutesIntervall`, `ReferenceNumber`, `SystemEntryID`, `IsCalculatingWithFactor`, `IsSingleInvoicePerCustomer`, `ID`) VALUES 
+  (2,22,NULL,NULL,NULL,'2008-10-05 19:12:11','Max Mustermann','Max Mustermann',1,1,10,NULL,0,1,0,'LWLNEU');
 COMMIT;

 INSERT INTO `organisation` (`Oid`, `BankAccountOid`, `AddressOid`, `CostBearerOid`, `Tid`, `Notice`, `InsTs`, `InsUser`, `Version`, `UdpUser`, `Name`, `IsActive`, `SystemEntryID`) VALUES 
@@ -85,8 +85,7 @@ INSERT INTO `query` (`Oid`, `Tid`, `Type`, `Title`, `Sql`, `Notice`, `InsTs`, `I
  (8,24,0,'Hilfepläne ohne Bewilligung','select p.LastName as Nachname, p.FirstName as Vorname,  ROUND(DATEDIFF(CURDATE(), cb2sc.`RequestedStartDate`) / 30, 2) as ''Monate seit Beginn der Betreuung'', cb2sc.`RequestedStartDate` as ''Beantragt von'', cb2sc.`RequestedEndDate` as ''Beantragt bis'', o.`Name` as ''Kostentraeger'', (select CONCAT(emp1p.`FirstName`, '' '', emp1p.`LastName`) from employee emp1 join `person` emp1p on emp1p.`Oid` = emp1.`PersonOid` where emp1.`Oid` in (select employeeoid from `employee2customer` e2c1 join `valuelistentry2object` vl2o on e2c1.`Oid` = vl2o.`ObjectOid` join `valuelistentry` vle on vl2o.`ValueListEntryOid` = vle.`Oid` where e2c1.`CustomerOid` = cust.`Oid` and vle.`SystemEntryID` = 3) LIMIT 1) as ''Bezugsbetreuung'' from `person` p join `customer` cust on p.Oid = cust.PersonOid join `supportconcept` sc on cust.Oid = sc.CustomerOid join `costbearer2supportconcept` cb2sc on sc.Oid = cb2sc.SupportConceptOid join `costbearer` cb on cb2sc.`CostBearerOid` = cb.`Oid` join `organisation` o on cb.`Oid` = o.`CostBearerOid` WHERE cb2sc.`Status` <> 2 and cust.IsActive = 1 and sc.IsActive = 1 order by Bezugsbetreuung;',NULL,NULL,NULL,NULL,1,1,NULL,NULL,NULL),
  (9,24,0,'Abwesenheiten der Mitarbeiter','select p.`FirstName` as Vorname, p.`LastName` as Nachname, ar.`Description` as Kategorie, at.`Start` as von, at.`EndTime` as bis, at.`Notice` as Bemerkung from `person` p inner join `employee` emp on p.`Oid` = emp.`PersonOid` inner join `absencetime` at on emp.`Oid` = at.`EmployeeOid` inner join `absencereason` ar on at.`AbsenceReasonOid` = ar.`Oid` where emp.`IsActive` = 1 order by p.`LastName`;',NULL,NULL,NULL,NULL,1,1,NULL,NULL,NULL),
  (10,24,0,'Abwesenheiten der Klienten','select p.`FirstName` as Vorname, p.`LastName` as Nachname, ar.`Description` as Kategorie, at.`Start` as von, at.`EndTime` as bis, at.`Notice` as Bemerkung from `person` p inner join `customer` c on p.`Oid` = c.`PersonOid` inner join `absencetime` at on c.`Oid` = at.`CustomerOid` inner join `absencereason` ar on at.`AbsenceReasonOid` = ar.`Oid` where c.`IsActive` = 1 order by p.`LastName`;',NULL,NULL,NULL,NULL,1,1,NULL,NULL,NULL);
-COMMIT;
-
+COMMIT;


 update person set isactive = 1 where type = 1 and oid in (select personoid from employee where isactive = 1);
--- a/2.xml
+++ b/2.xml
--- a/bewo.xml
+++ b/bewo.xml