Undo Feature Finish

Button eingeführt, lassen sich mit Pfeilen navigieren.
Tree Sortierung eindeutiger, Anzahl der Kinder als 2tes Sortkriterium. Zukunft: rekursiv sortieren
Add Undo und Redo implementiert, fehlt nur noch import, move, del und copy

.gitignore

@@ -7,7 +7,6 @@
 /BeWoPlanerAndroid/obj
 /BeWoPlanerMobil/bin
 /BeWoPlanerMobil/obj
-/BeWoPlanerMobil/node_modules
 /Host/bin
 /Host/obj
 /Controls/bin
@@ -416,4 +415,182 @@
 /ReportImp/KuhringBetreuung/obj/Release
 /ReportImp/LebenshilfeFrankfurtOder/obj/Debug
 /ReportImp/LebenshilfeFrankfurtOder/obj/Release
-/BeWoPlanerMobil/delete_and_ignore_file.txt
+/ReportImp/AbwKlassen/bin/Debug
+/ReportImp/AbwKlassen/bin/Release
+/ReportImp/AbwKlassen/obj/Debug
+/ReportImp/AbwKlassen/obj/Release
+/ReportImp/DiakonischesWerkMuelheimTwg/bin/Debug
+/ReportImp/DiakonischesWerkMuelheimTwg/obj/Debug
+/ReportImp/DiakonischesWerkMuelheimTwg/obj/Release
+/ReportImp/Inkomm/obj/Debug
+/ReportImp/Inkomm/obj/Release
+/ReportImp/LebenshilfeDorsten/obj/Debug
+/ReportImp/LebenshilfeDorsten/obj/Release
+/ReportImp/QuerFaelltEin/obj/Debug
+/ReportImp/QuerFaelltEin/obj/Release
+/ReportImp/AsbRuhr/obj/Debug
+/ReportImp/AsbRuhr/obj/Release
+/ReportImp/DiePerspektive/obj/Debug
+/ReportImp/DiePerspektive/obj/Release
+/ReportImp/PhoenixBeWo/obj/Debug
+/ReportImp/PhoenixBeWo/obj/Release
+/ReportImp/EvangelischeKirchengemeindeBottrop/obj/Debug
+/ReportImp/EvangelischeKirchengemeindeBottrop/obj/Release
+/ReportImp/InputFamilienhilfe/obj/Debug
+/ReportImp/InputFamilienhilfe/obj/Release
+/ReportImp/LebenshilfeWolfsburg/obj/Debug
+/ReportImp/LebenshilfeWolfsburg/obj/Release
+/ReportImp/SichtWeise/obj/Debug
+/ReportImp/SichtWeise/obj/Release
+/packages
+/ReportImp/BfpDus/obj/Debug
+/ReportImp/BfpDus/obj/Release
+/ReportImp/DiakonischesWerkWesel/obj/Debug
+/ReportImp/DiakonischesWerkWesel/obj/Release
+/ReportImp/KcmGmbH/obj/Debug
+/ReportImp/KcmGmbH/obj/Release
+/ReportImp/LebenshilfeRodenkirchen2Reports/obj/Debug
+/ReportImp/LebenshilfeRodenkirchen2Reports/obj/Release
+/ReportImp/PraunheimerWerkstaetten3/obj/Debug
+/ReportImp/PraunheimerWerkstaetten3/obj/Release
+/ReportImp/PraunheimerWerkstaetten2/obj/Release
+/ReportImp/PraunheimerWerkstaetten2/obj/Debug
+/ReportImp/RosegGmbH/obj/Debug
+/ReportImp/RosegGmbH/obj/Release
+/ReportImp/VkmHamm2/obj/Debug
+/ReportImp/VkmHamm2/obj/Release
+/ReportImp/BellaDonna/obj/Debug
+/ReportImp/BellaDonna/obj/Release
+/ReportImp/PsychosozialeHilfenBochum/obj/Debug
+/ReportImp/PsychosozialeHilfenBochum/obj/Release
+/ReportImp/DieBrueckeHilfeUndHalt/obj/Debug
+/ReportImp/DieBrueckeHilfeUndHalt/obj/Release
+/ReportImp/DiakonischesWerkHerne/obj/Debug
+/ReportImp/DiakonischesWerkHerne/obj/Release
+/ReportImp/SabGmbH/obj/Debug
+/ReportImp/SabGmbH/obj/Release
+/ReportImp/BeWoFlex/obj/Debug
+/ReportImp/BeWoFlex/obj/Release
+/ReportImp/Neustart/obj/Debug
+/ReportImp/VerbandEvKirchengemeindenDorsten/obj/Debug
+/ReportImp/FabEvBerlin/obj/Debug
+/ReportImp/FabEvBerlin/obj/Release
+/ReportImp/Neustart/obj/Release
+/ReportImp/VerbandEvKirchengemeindenDorsten/obj/Release
+/ReportImp/MVZMedikusGmbH/obj
+/ReportImp/BetreuungsbueroFrankRoehrig/obj
+/ReportImp/BeWoMundo/obj/Debug
+/ReportImp/BeWoMundo/obj/Release
+/ReportImp/Kimm/obj/Debug
+/ReportImp/Kimm/obj/Release
+/ReportImp/KommAmbulanteDienste/obj/Debug
+/ReportImp/KommAmbulanteDienste/obj/Release
+/ReportImp/PassgenauUG/obj/Debug
+/ReportImp/PassgenauUG/obj/Release
+/ReportImp/KompassBeWoWesel/obj/Debug
+/ReportImp/MobiloAmbulant/obj/Debug
+/ReportImp/KompassBeWoWesel/obj/Release
+/ReportImp/MobiloAmbulant/obj/Release
+/ReportImp/EmpathieFachassistenz/obj/Debug
+/ReportImp/EmpathieFachassistenz/obj/Release
+/ReportImp/LebenUndWohnenChristianWilke/obj/Debug
+/ReportImp/CaritasverbandDuerenJuelichEV/obj/Debug
+/ReportImp/KoelnerBeWoSelbstbestimmtLeben/obj/Debug
+/ReportImp/BewegtSystemischeBeratung/obj/Debug
+/ReportImp/TeamPfeil/obj/Debug
+/ReportImp/AsbFassbacherHof/obj/Debug
+/ReportImp/AsbFassbacherHof/obj/Release
+/ReportImp/VereinSozialmedizinStade/obj/Release
+/ReportImp/VereinSozialmedizinStade/obj/Debug
+/ReportImp/BewegtSystemischeBeratung/obj/Release
+/ReportImp/TeamPfeil/obj/Release
+/ReportImp/Bewolonia/obj/Debug
+/ReportImp/AlzeyTeilhabe/obj/Debug
+/ReportImp/AlzeyTeilhabe/obj/Release
+/ReportImp/Bewolonia/obj/Release
+/ReportImp/ForumEV/obj/Release
+/ReportImp/Kette2/obj/Debug
+/ReportImp/Kette2/obj/Release
+/ReportImp/ForumEV/obj/Debug
+/ReportImp/LebenshilfeDuisburgAtz/obj/Debug
+/ReportImp/LebenshilfeDuisburgAtz/obj/Release
+/ReportImp/VaroSozialagentur/obj/Debug
+/ReportImp/AmbulantBetreutesWohnenAstridPulm/obj/Debug
+/ReportImp/VaroSozialagentur/obj/Release
+/ReportImp/LebenshilfeDuisburg2/obj/Debug
+/ReportImp/LebenshilfeDuisburg2/obj/Release
+/ReportImp/LebenshilfeDuisburgAtz6860475645/obj/Debug
+/ReportImp/LebenshilfeDuisburgAtz6860475645/obj/Release
+/ReportImp/Kette2/obj/DebugRemote
+/ReportImp/DomizielAnsbach/obj/Debug
+/ReportImp/DomizielAnsbach/obj/Release
+/ReportImp/AbwMuenster/obj/Debug
+/ReportImp/AbwMuenster/obj/Release
+/ReportImp/InFamiliaGbr/obj/Debug
+/ReportImp/InFamiliaGbr/obj/Release
+/ReportImp/LebenshilfeDuisburgBeWo/obj/Debug
+/ReportImp/LebenshilfeDuisburgBeWo/obj/Release
+/ReportImp/LebenshilfeDuisburgHPFH/obj/Debug
+/ReportImp/LebenshilfeDuisburgHPFH/obj/Release
+/ReportImp/LebenshilfeDuisburgHPTG/obj/Debug
+/ReportImp/LebenshilfeDuisburgHPTG/obj/Release
+/ReportImp/ProIntegra/obj/Debug
+/ReportImp/ZuhauseWohnenIrisThimm/obj/Debug
+/ReportImp/FAMRheinSiegGbr/obj/Debug
+/ReportImp/ProIntegra/obj/Release
+/ReportImp/AmbulantBetreutesWohnenAstridPulm/obj/Release
+/ReportImp/SozialwerkAachenerChristen/obj/Debug
+/ReportImp/SicherlebenMichaelVoß/obj/Debug
+/ReportImp/DiakonischesWerkPassau/obj/Debug
+/ReportImp/BeWoRimbach/obj/Debug
+/ReportImp/Wichernhaus/obj
+/ReportImp/FAMRheinSiegGbr/obj/Release
+/ReportImp/KoelnerBeWoSelbstbestimmtLeben/obj/Release
+/ReportImp/DiakonischesWerkPassau/obj/Release
+/ReportImp/DiakonischesWerkRegensburg/obj/Debug
+/ReportImp/DiakonischesWerkRegensburg/obj/Release
+/ReportImp/CarlSonnenscheinHaus/obj/Debug
+/ReportImp/CarlSonnenscheinHaus/obj/Release
+/ReportImp/SozialwerkAachenerChristen/obj/Release
+/ReportImp/LebensWert/obj/Debug
+/ReportImp/PZDDuesseldorf/obj/Debug
+/ReportImp/PZDDuesseldorf/obj/Release
+/ReportImp/LebensWert/obj/Release
+/ReportImp/BehindertenhilfeMenden/obj/Debug
+/ReportImp/BehindertenhilfeMenden/obj/Release
+/ReportImp/ChristopherusHausFamilienhilfe/obj
+/ReportImp/RatPlusTat/obj
+obj
+/BeWoAllReports - Kopie.sln
+/BeWoAllReports.sln.BASE.sln
+/BeWoAllReports.sln.LOCAL.sln
+/BeWoAllReports.sln.REMOTE.sln
+/ReportImp/KundeArbeitszeit
+*.user
+/ReportImp/KundeMuster
+/ReportImp/DiakonieKKKleve/Mitarbeiterarbeitszeitkonto.designer.cs
+/ReportImp/DiakonieKKKleve/Mitarbeiterarbeitszeitkonto.resx
+/ReportImp/DiakonieKKKleve/Mitarbeiterarbeitszeitkonto.cs
+/ReportImp/DiakonieKKKleve/CustomMitarbeiterstundenkontoBerechnungTagesansicht.cs
+/ReportImp/AMBEWO/Endabrechnung Beispiel.jpg
+/ReportImp/AutismusKoelnBonn/Hintergrund.jpg
+/ReportImp/AutismusKoelnBonn/Briefpapier.jpg
+/ReportImp/RatPlusTat/CustomBudgetnachweisAnhangRO.cs
+/ReportImp/MusterArbeitszeit
+/BeWoDatabaseTerminator/.vs
+/LauncherHost/bin
+/LauncherHost/obj
+/SharedLauncher/bin
+/SharedLauncher/obj
+/BeWoLauncher/bin
+/BeWoLauncher/obj
+/UnitTests/bin
+/UnitTests/obj
+/DownloadServer/bin
+/DownloadServer/obj
+/BeWoTest/bin
+/BeWoTest/obj
+/UnitTestProject472/bin
+/UnitTestProject472/obj
+/UnitTestProject45/bin
+/UnitTestProject45/obj

BeWo/BeWo.csproj

@@ -16,10 +16,10 @@
     <EnableSecurityDebugging>true</EnableSecurityDebugging>
     <TargetZone>Internet</TargetZone>
     <GenerateManifests>true</GenerateManifests>
-    <SignManifests>false</SignManifests>
+    <SignManifests>true</SignManifests>
     <ManifestKeyFile>
     </ManifestKeyFile>
-    <ManifestCertificateThumbprint>D9ACF3EBC5E47956B8D786361F7061E3F6D6F286</ManifestCertificateThumbprint>
+    <ManifestCertificateThumbprint>8CA4066C36C87B745E4016FDA715A6DB16FCFFA9</ManifestCertificateThumbprint>
     <IsWebBootstrapper>true</IsWebBootstrapper>
     <SignAssembly>false</SignAssembly>
     <ExpressionBlendVersion>3.0.1927.0</ExpressionBlendVersion>
@@ -39,16 +39,16 @@
     <UpdatePeriodically>false</UpdatePeriodically>
     <UpdateRequired>true</UpdateRequired>
     <MapFileExtensions>false</MapFileExtensions>
-    <InstallUrl>http://app.beyondsoft.de/dev/</InstallUrl>
+    <InstallUrl>https://app.ownsoft.de/</InstallUrl>
     <TargetCulture>de-DE</TargetCulture>
     <ProductName>BeWoPlaner</ProductName>
     <PublisherName>beyondSoft GmbH</PublisherName>
-    <MinimumRequiredVersion>2.0.1.172</MinimumRequiredVersion>
+    <MinimumRequiredVersion>2.0.1.220</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.htm</WebPage>
     <OpenBrowserOnPublish>false</OpenBrowserOnPublish>
     <TrustUrlParameters>true</TrustUrlParameters>
-    <ApplicationRevision>173</ApplicationRevision>
+    <ApplicationRevision>221</ApplicationRevision>
     <ApplicationVersion>2.0.1.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
@@ -89,6 +89,10 @@
     <ManifestTimestampUrl>
     </ManifestTimestampUrl>
   </PropertyGroup>
+  <PropertyGroup>
+    <StartupObject>
+    </StartupObject>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Blacklight.Wpf.Controls, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -100,8 +104,10 @@
     <Reference Include="DevExpress.Data.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.Office.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.RichEdit.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.RichEdit.v17.1.Export, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.Utils.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.Mvvm.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Web.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.Xpf.Accordion.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.Xpf.Core.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.Xpf.Charts.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
@@ -115,30 +121,26 @@
     <Reference Include="DevExpress.Xpf.Printing.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.Xpf.Ribbon.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.Xpf.RichEdit.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.Images.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.Xpf.Scheduler.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.Xpf.Themes.LightGray.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.Xpf.Themes.Office2007Black.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.Xpf.Themes.Office2010Black.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.Xpf.Themes.Office2013.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.Xpf.Themes.Office2016White.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.XtraBars.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.XtraEditors.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.XtraPivotGrid.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.XtraPrinting.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.XtraCharts.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.PivotGrid.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.Sparkline.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.CodeParser.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.RichEdit.v17.1.Export, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.XtraReports.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.XtraScheduler.v17.1.Reporting.Extensions, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.XtraGrid.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.XtraScheduler.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.XtraScheduler.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.XtraScheduler.v17.1.Reporting, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\Lib\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="PresentationFramework.Aero">
       <RequiredTargetFramework>3.0</RequiredTargetFramework>
@@ -153,6 +155,7 @@
       <HintPath>..\packages\RestSharp.105.2.3\lib\net45\RestSharp.dll</HintPath>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Activities" />
     <Reference Include="System.Core">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
     </Reference>
@@ -278,6 +281,26 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="View\Controls\DPCtrlEmployeeContractTooltip.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="View\Controls\DPCtrlEmployeeTooltip.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="View\Controls\DPCtrlDienstTooltip.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="View\Controls\MonthPicker.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="View\Controls\DienstplanerControl.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="View\Controls\GoalRatingControl.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -290,6 +313,66 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="View\Detail\DebugMessageLogView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="View\Detail\Zeiterfassung\ServiceRecordCreationView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="View\Detail\UrlaubskontoView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="View\Detail\OwnChatSettingsView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="View\Detail\InformationView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="View\Detail\DateiBearbeiten.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="View\Detail\PreisView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="View\Detail\Urlaubsuebersicht.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="View\Detail\UrlaubstagSchenkenView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="View\Detail\Suchergebnis.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="View\Detail\TemplatePrintSelection.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="View\Detail\VorlageEditView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="View\Detail\RatingTypeView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="View\Detail\DienstView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="View\Detail\GoalImportControl.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="View\Detail\NotizenKategorieView.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -306,11 +389,23 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="View\Detail\Report\AbwesenheitsEmployeeHeaderTooltip.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="View\Detail\Report\AbwesenheitsEmployeeHeader.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="View\Detail\Report\DienstplanerView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="View\Detail\Report\EMailStatusLogControl.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="View\Detail\Report\AbwesenheitstabelleView.xaml">
+    <Page Include="View\Detail\Report\AbwesenheitsView.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
@@ -318,6 +413,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="View\Detail\Report\AbwesenheitsPrintControl.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="View\Detail\Report\IcfImportControl.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -346,14 +445,33 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="View\Detail\RatingEditView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="View\Detail\SupportConceptGoalRatingView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="View\HomeView.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="View\Master\DokumenteView.xaml">
+      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+    </Page>
+    <Page Include="View\TwoFactorAuthMessageDialog.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="View\Report\Kilometerauswertung\KilometerauslastungsView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="View\Report\Rating\RatingReportView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="View\StundenplanView.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -382,7 +500,7 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="View\Detail\ServiceRecordRTFWindowView.xaml">
+    <Page Include="View\Detail\Zeiterfassung\ServiceRecordRTFWindowView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
@@ -526,7 +644,7 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="View\Detail\ServiceRecordRebookingView.xaml">
+    <Page Include="View\Detail\Zeiterfassung\ServiceRecordRebookingView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
@@ -534,7 +652,7 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="View\Detail\ServiceRecordHistoryView.xaml">
+    <Page Include="View\Detail\Zeiterfassung\ServiceRecordHistoryView.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
@@ -658,6 +776,7 @@
     <Compile Include="Converter\BoolVisibilityMultiConverter.cs" />
     <Compile Include="Converter\NullableBoolToBoolConverter.cs" />
     <Compile Include="Converter\ParticipationBrushConverter.cs" />
+    <Compile Include="Converter\ArchiveRight2VisibilityConverter.cs" />
     <Compile Include="Converter\ReactivationRight2VisibilityConverter.cs" />
     <Compile Include="Converter\Rights2DefaultBooleanConverter.cs" />
     <Compile Include="Converter\StringLengthVisibilityConverter.cs" />
@@ -687,6 +806,7 @@
     <Compile Include="ProxyLoginView.xaml.cs">
       <DependentUpon>ProxyLoginView.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Scheduler\Converter\AptToServRecsIconVisibilityConverter.cs" />
     <Compile Include="Scheduler\Utils\AppointmentExtensions.cs" />
     <Compile Include="Scheduler\Utils\Utils.cs" />
     <Compile Include="Scheduler\ViewModel\CustomFieldStorage.cs" />
@@ -724,6 +844,7 @@
     </Compile>
     <Compile Include="SchulbegleitenderDienst\WochenansichtVM.cs" />
     <Compile Include="SchulbegleitenderDienst\WochenVertretung.cs" />
+    <Compile Include="Security\EncryptionUtils.cs" />
     <Compile Include="UploadDialog.xaml.cs">
       <DependentUpon>UploadDialog.xaml</DependentUpon>
     </Compile>
@@ -798,8 +919,21 @@
     <Compile Include="ViewModel\AdditionalServiceGroupOfPeopleVM.cs" />
     <Compile Include="ViewModel\AdditionalServiceRegionVM.cs" />
     <Compile Include="ViewModel\AdditionalServiceVM.cs" />
+    <Compile Include="ViewModel\DienstInfoVM.cs" />
     <Compile Include="ViewModel\BudgetVM.cs" />
+    <Compile Include="ViewModel\DocumentTreeItemVM.cs" />
+    <Compile Include="ViewModel\DokumentvorlageVM.cs" />
+    <Compile Include="ViewModel\GeschenkterUrlaubstagVM.cs" />
+    <Compile Include="ViewModel\ListViewModel\PreisListVM.cs" />
+    <Compile Include="ViewModel\PreisVM.cs" />
+    <Compile Include="ViewModel\PrintSelectionVM.cs" />
+    <Compile Include="ViewModel\QuittierungsbelegsstatusVM.cs" />
+    <Compile Include="ViewModel\RatingTypeVM.cs" />
+    <Compile Include="ViewModel\ListViewModel\GoalRatingListVM.cs" />
+    <Compile Include="ViewModel\ListViewModel\RatingTypeListVM.cs" />
+    <Compile Include="ViewModel\ListViewModel\DienstListVM.cs" />
     <Compile Include="ViewModel\ListViewModel\BudgetListVM.cs" />
+    <Compile Include="ViewModel\ListViewModel\RatingListVM.cs" />
     <Compile Include="ViewModel\NotizenKategorieVM.cs" />
     <Compile Include="ViewModel\NotizenEintragVM.cs" />
     <Compile Include="ViewModel\FeiertagVM.cs" />
@@ -822,6 +956,10 @@
     <Compile Include="ViewModel\ListViewModel\NotizenEintragListVM.cs" />
     <Compile Include="ViewModel\ListViewModel\FeiertagListVM.cs" />
     <Compile Include="ViewModel\QuittierungsCheckVM.cs" />
+    <Compile Include="ViewModel\GoalRatingVM.cs" />
+    <Compile Include="ViewModel\RatingVM.cs" />
+    <Compile Include="ViewModel\RegelmaessigerDienstVM.cs" />
+    <Compile Include="ViewModel\SuchergebnisVM.cs" />
     <Compile Include="ViewModel\TokenVM.cs" />
     <Compile Include="ViewModel\ListViewModel\ArbeitszeitListVM.cs" />
     <Compile Include="ViewModel\ListViewModel\ArbeitszeitEintragListVM.cs" />
@@ -880,6 +1018,31 @@
     <Compile Include="ViewModel\OrganisationPersonRelationVM.cs" />
     <Compile Include="ViewModel\TextModuleVM.cs" />
     <Compile Include="ViewModel\VerordnungslistenVM.cs" />
+    <Compile Include="View\Controls\DPCtrlEmployeeContractTooltip.xaml.cs">
+      <DependentUpon>DPCtrlEmployeeContractTooltip.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\Controls\DPCtrlEmployeeTooltip.xaml.cs">
+      <DependentUpon>DPCtrlEmployeeTooltip.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\Controls\DPCtrlDienstTooltip.xaml.cs">
+      <DependentUpon>DPCtrlDienstTooltip.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\Controls\DPCtrlIst.cs" />
+    <Compile Include="View\Controls\DPCtrlMonth.cs" />
+    <Compile Include="View\Controls\DPCtrlSaldo.cs" />
+    <Compile Include="View\Controls\DPCtrlSoll.cs" />
+    <Compile Include="View\Controls\DPCtrlUrlaubKrankheit.cs" />
+    <Compile Include="View\Controls\DPCtrlZeitkonto.cs" />
+    <Compile Include="View\Controls\MonthPicker.xaml.cs">
+      <DependentUpon>MonthPicker.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\Controls\DienstplanerControl.xaml.cs">
+      <DependentUpon>DienstplanerControl.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\Controls\DPCtrlDay.cs" />
+    <Compile Include="View\Controls\DPCtrlEmployee.cs" />
+    <Compile Include="View\Controls\DPCtrlIcon.cs" />
+    <Compile Include="View\Controls\DPCtrlWeek.cs" />
     <Compile Include="View\Controls\GoalRatingControl.xaml.cs">
       <DependentUpon>GoalRatingControl.xaml</DependentUpon>
     </Compile>
@@ -889,6 +1052,55 @@
     <Compile Include="View\Controls\ValueListEntryEditControl.xaml.cs">
       <DependentUpon>ValueListEntryEditControl.xaml</DependentUpon>
     </Compile>
+    <Compile Include="View\Detail\DebugMessageLogView.xaml.cs">
+      <DependentUpon>DebugMessageLogView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\Detail\MassnahmenHistoryRecord.cs" />
+    <Compile Include="View\Detail\MassnahmenHistory.cs" />
+    <Compile Include="View\Detail\MassnahmenTreeTrimmer.cs" />
+    <Compile Include="View\Detail\Zeiterfassung\ServiceRecordCreationView.xaml.cs">
+      <DependentUpon>ServiceRecordCreationView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\Detail\UrlaubskontoView.xaml.cs">
+      <DependentUpon>UrlaubskontoView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\Detail\OwnChatSettingsView.xaml.cs">
+      <DependentUpon>OwnChatSettingsView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\Detail\InformationView.xaml.cs">
+      <DependentUpon>InformationView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\Detail\DateiBearbeiten.xaml.cs">
+      <DependentUpon>DateiBearbeiten.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\Detail\PreisView.xaml.cs">
+      <DependentUpon>PreisView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\Detail\Urlaubsuebersicht.xaml.cs">
+      <DependentUpon>Urlaubsuebersicht.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\Detail\UrlaubstagSchenkenView.xaml.cs">
+      <DependentUpon>UrlaubstagSchenkenView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\Detail\SuchergebnisMasterMenuItem.cs" />
+    <Compile Include="View\Detail\Suchergebnis.xaml.cs">
+      <DependentUpon>Suchergebnis.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\Detail\TemplatePrintSelection.xaml.cs">
+      <DependentUpon>TemplatePrintSelection.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\Detail\VorlageEditView.xaml.cs">
+      <DependentUpon>VorlageEditView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\Detail\RatingTypeView.xaml.cs">
+      <DependentUpon>RatingTypeView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\Detail\DienstView.xaml.cs">
+      <DependentUpon>DienstView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\Detail\GoalImportControl.xaml.cs">
+      <DependentUpon>GoalImportControl.xaml</DependentUpon>
+    </Compile>
     <Compile Include="View\Detail\NotizenKategorieView.xaml.cs">
       <DependentUpon>NotizenKategorieView.xaml</DependentUpon>
     </Compile>
@@ -898,12 +1110,24 @@
     <Compile Include="View\Detail\AbsenceTimesView.xaml.cs">
       <DependentUpon>AbsenceTimesView.xaml</DependentUpon>
     </Compile>
-    <Compile Include="View\Detail\Report\AbwesenheitstabelleView.xaml.cs">
-      <DependentUpon>AbwesenheitstabelleView.xaml</DependentUpon>
+    <Compile Include="View\Detail\Report\AbwesenheitsEmployeeHeaderTooltip.xaml.cs">
+      <DependentUpon>AbwesenheitsEmployeeHeaderTooltip.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\Detail\Report\AbwesenheitsEmployeeHeader.xaml.cs">
+      <DependentUpon>AbwesenheitsEmployeeHeader.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\Detail\Report\DienstplanerView.xaml.cs">
+      <DependentUpon>DienstplanerView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\Detail\Report\AbwesenheitsView.xaml.cs">
+      <DependentUpon>AbwesenheitsView.xaml</DependentUpon>
     </Compile>
     <Compile Include="View\Detail\Report\AbwesenheitsEditView.xaml.cs">
       <DependentUpon>AbwesenheitsEditView.xaml</DependentUpon>
     </Compile>
+    <Compile Include="View\Detail\Report\AbwesenheitsPrintControl.xaml.cs">
+      <DependentUpon>AbwesenheitsPrintControl.xaml</DependentUpon>
+    </Compile>
     <Compile Include="View\Detail\Report\IcfImportControl.xaml.cs">
       <DependentUpon>IcfImportControl.xaml</DependentUpon>
     </Compile>
@@ -934,13 +1158,29 @@
     <Compile Include="View\Detail\Report\TimeSheetMailView.xaml.cs">
       <DependentUpon>TimeSheetMailView.xaml</DependentUpon>
     </Compile>
+    <Compile Include="View\Detail\RatingEditView.xaml.cs">
+      <DependentUpon>RatingEditView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\Detail\SupportConceptGoalRatingView.xaml.cs">
+      <DependentUpon>SupportConceptGoalRatingView.xaml</DependentUpon>
+    </Compile>
     <Compile Include="View\HomeView.xaml.cs">
       <DependentUpon>HomeView.xaml</DependentUpon>
     </Compile>
+    <Compile Include="View\Master\DokumenteView.xaml.cs">
+      <DependentUpon>DokumenteView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\Navigation\Filter\PersonNavigationFilter.cs" />
+    <Compile Include="View\TwoFactorAuthMessageDialog.xaml.cs">
+      <DependentUpon>TwoFactorAuthMessageDialog.xaml</DependentUpon>
+    </Compile>
     <Compile Include="View\Navigation\Sorter\UserSorter.cs" />
     <Compile Include="View\Report\Kilometerauswertung\KilometerauslastungsView.xaml.cs">
       <DependentUpon>KilometerauslastungsView.xaml</DependentUpon>
     </Compile>
+    <Compile Include="View\Report\Rating\RatingReportView.xaml.cs">
+      <DependentUpon>RatingReportView.xaml</DependentUpon>
+    </Compile>
     <Compile Include="View\StundenplanView.xaml.cs">
       <DependentUpon>StundenplanView.xaml</DependentUpon>
     </Compile>
@@ -962,7 +1202,7 @@
     <Compile Include="View\Controls\TextModuleTreeViewControl.xaml.cs">
       <DependentUpon>TextModuleTreeViewControl.xaml</DependentUpon>
     </Compile>
-    <Compile Include="View\Detail\ServiceRecordRTFWindowView.xaml.cs">
+    <Compile Include="View\Detail\Zeiterfassung\ServiceRecordRTFWindowView.xaml.cs">
       <DependentUpon>ServiceRecordRTFWindowView.xaml</DependentUpon>
     </Compile>
     <Compile Include="View\Detail\TextbausteinView.xaml.cs">
@@ -1073,13 +1313,13 @@
     <Compile Include="View\Detail\ProfileEditView.xaml.cs">
       <DependentUpon>ProfileEditView.xaml</DependentUpon>
     </Compile>
-    <Compile Include="View\Detail\ServiceRecordRebookingView.xaml.cs">
+    <Compile Include="View\Detail\Zeiterfassung\ServiceRecordRebookingView.xaml.cs">
       <DependentUpon>ServiceRecordRebookingView.xaml</DependentUpon>
     </Compile>
     <Compile Include="View\Detail\Report\AccountingReportView.xaml.cs">
       <DependentUpon>AccountingReportView.xaml</DependentUpon>
     </Compile>
-    <Compile Include="View\Detail\ServiceRecordHistoryView.xaml.cs">
+    <Compile Include="View\Detail\Zeiterfassung\ServiceRecordHistoryView.xaml.cs">
       <DependentUpon>ServiceRecordHistoryView.xaml</DependentUpon>
     </Compile>
     <Compile Include="View\Detail\SchedulerSettingsView.xaml.cs">
@@ -1112,7 +1352,6 @@
     <Compile Include="View\MiniChatView.xaml.cs">
       <DependentUpon>MiniChatView.xaml</DependentUpon>
     </Compile>
-    <Compile Include="View\Navigation\Filter\CustomerFilterEnum.cs" />
     <Compile Include="View\Navigation\Sorter\WohnheimSorter.cs" />
     <Compile Include="View\Navigation\WohnheimNavigationView.xaml.cs">
       <DependentUpon>WohnheimNavigationView.xaml</DependentUpon>
@@ -1162,7 +1401,6 @@
     <Compile Include="View\Master\ReportView.xaml.cs">
       <DependentUpon>ReportView.xaml</DependentUpon>
     </Compile>
-    <Reference Include="WindowsFormsIntegration" />
     <Resource Include="Ressources\Icons\Search.png" />
     <Reference Include="System.Xaml" />
   </ItemGroup>
@@ -1347,7 +1585,7 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="View\Detail\ServiceRecordGroupEditView.xaml">
+    <Page Include="View\Detail\Zeiterfassung\ServiceRecordGroupEditView.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -1389,13 +1627,13 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="View\Detail\ServiceRecordEditView.xaml">
+    <Page Include="View\Detail\Zeiterfassung\ServiceRecordEditView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="View\Detail\ServiceRecordView2.xaml">
+    <Page Include="View\Detail\Zeiterfassung\ServiceRecordView2.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
       <Generator>MSBuild:Compile</Generator>
@@ -1407,6 +1645,12 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="View\Detail\Report\ServicesReportViewAlt.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="View\Detail\ViewMailView.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -1899,7 +2143,7 @@
     <Compile Include="View\Detail\NewsItemView.xaml.cs">
       <DependentUpon>NewsItemView.xaml</DependentUpon>
     </Compile>
-    <Compile Include="View\Detail\ServiceRecordGroupEditView.xaml.cs">
+    <Compile Include="View\Detail\Zeiterfassung\ServiceRecordGroupEditView.xaml.cs">
       <DependentUpon>ServiceRecordGroupEditView.xaml</DependentUpon>
     </Compile>
     <Compile Include="View\Detail\MandatorView.xaml.cs">
@@ -1920,15 +2164,18 @@
     <Compile Include="View\Detail\BookingView.xaml.cs">
       <DependentUpon>BookingView.xaml</DependentUpon>
     </Compile>
-    <Compile Include="View\Detail\ServiceRecordEditView.xaml.cs">
+    <Compile Include="View\Detail\Zeiterfassung\ServiceRecordEditView.xaml.cs">
       <DependentUpon>ServiceRecordEditView.xaml</DependentUpon>
     </Compile>
-    <Compile Include="View\Detail\ServiceRecordView2.xaml.cs">
+    <Compile Include="View\Detail\Zeiterfassung\ServiceRecordView2.xaml.cs">
       <DependentUpon>ServiceRecordView2.xaml</DependentUpon>
     </Compile>
     <Compile Include="View\Detail\Report\ServicesReportView.xaml.cs">
       <DependentUpon>ServicesReportView.xaml</DependentUpon>
     </Compile>
+    <Compile Include="View\Detail\Report\ServicesReportViewAlt.xaml.cs">
+      <DependentUpon>ServicesReportViewAlt.xaml</DependentUpon>
+    </Compile>
     <Compile Include="View\Detail\ViewMailView.xaml.cs">
       <DependentUpon>ViewMailView.xaml</DependentUpon>
     </Compile>
@@ -2206,18 +2453,6 @@
       <Project>{D5E53B0F-BF5A-41E8-93E2-0F32845FC729}</Project>
       <Name>Controls</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Data\Data.csproj">
-      <Project>{B0D73E3D-4AE7-4024-93A6-DB1F46D7CCEE}</Project>
-      <Name>Data</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Report\Report.csproj">
-      <Project>{40D8B312-EA64-49E3-A31A-5E57ED4D5654}</Project>
-      <Name>Report</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Service\Service.csproj">
-      <Project>{094331C3-ECEE-4C89-BBFD-4C9DED89F0EF}</Project>
-      <Name>Service</Name>
-    </ProjectReference>
     <ProjectReference Include="..\Shared\Shared.csproj">
       <Project>{2F50B83D-A3F0-4EC4-979A-3F9B7E3D8ED4}</Project>
       <Name>Shared</Name>
@@ -2383,6 +2618,16 @@
       <IncludeHash>True</IncludeHash>
       <FileType>Assembly</FileType>
     </PublishFile>
+    <PublishFile Include="DevExpress.RichEdit.v17.1.Export">
+      <Visible>False</Visible>
+      <Group>
+      </Group>
+      <TargetPath>
+      </TargetPath>
+      <PublishState>Include</PublishState>
+      <IncludeHash>True</IncludeHash>
+      <FileType>Assembly</FileType>
+    </PublishFile>
     <PublishFile Include="DevExpress.Sparkline.v17.1.Core">
       <Visible>False</Visible>
       <Group>
@@ -2403,6 +2648,16 @@
       <IncludeHash>True</IncludeHash>
       <FileType>Assembly</FileType>
     </PublishFile>
+    <PublishFile Include="DevExpress.Xpf.Accordion.v17.1">
+      <Visible>False</Visible>
+      <Group>
+      </Group>
+      <TargetPath>
+      </TargetPath>
+      <PublishState>Include</PublishState>
+      <IncludeHash>True</IncludeHash>
+      <FileType>Assembly</FileType>
+    </PublishFile>
     <PublishFile Include="DevExpress.Xpf.Charts.v17.1">
       <Visible>False</Visible>
       <Group>
@@ -2778,7 +3033,26 @@
   <ItemGroup>
     <Resource Include="Ressources\Icons\Paste24.png" />
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Resource Include="Ressources\Icons\Favorites16.png" />
+    <Resource Include="Ressources\Icons\Favorites32.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Ressources\Icons\FavoritesDisabled32.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Ressources\Icons\ziel.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Ressources\Icons\massnahme.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Ressources\Icons\imassnahme.png" />
+    <Resource Include="Ressources\Icons\iziel.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Ressources\Icons\Copy24.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>

BeWo/BeWo.csproj.user

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <PublishUrlHistory>D:\Projects\beyondsoft\BeWoPlaner\Publish\|D:\Projects\beyondsoft\BeWoPlaner\PublishTest\|D:\Projects\beyondsoft\BeWoPlaner\PublishDev\|D:\Projects\beyondsoft\BeWoPlaner\Publish45\|C:\Projects\beyondsoft\BeWoPlaner\Publish\</PublishUrlHistory>
-    <InstallUrlHistory>http://app.beyondsoft.de/sbdtest/|http://app.beyondsoft.de/dev/|http://app.beyondsoft.de/sbd/|http://app.beyondsoft.de/lha/|http://fortis-bewoplaner.fortis-ev.org.local/</InstallUrlHistory>
+    <PublishUrlHistory>D:\Projects\beyondsoft\BeWoPlaner\Publish\|publish\|D:\Projects\beyondsoft\BeWoPlaner\PublishTest\|D:\Projects\beyondsoft\BeWoPlaner\PublishDev\|D:\Projects\beyondsoft\BeWoPlaner\Publish45\</PublishUrlHistory>
+    <InstallUrlHistory>https://app.ownsoft.de/|http://app.beyondsoft.de/|http://app.beyondsoft.de/test/|http://app.beyondsoft.de/dev/|http://app.beyondsoft.de/sbdtest/</InstallUrlHistory>
     <SupportUrlHistory />
-    <UpdateUrlHistory />
+    <UpdateUrlHistory>https://app.ownsoft.de/|https://app.ownsoft.de/bewoplaner.application/</UpdateUrlHistory>
     <BootstrapperUrlHistory />
     <ErrorReportUrlHistory />
     <FallbackCulture>de-DE</FallbackCulture>

BeWo/BeWoApp.xaml

@@ -60,6 +60,7 @@
             <conv:UserRightTypeConverter x:Key="UserRightTypeConverter" />
             <conv:ValueEqualsParamVisibilityConverter x:Key="ValueEqualsParamVisibilityConverter" />
             <conv:ReactivationRight2VisibilityConverter x:Key="ReactivationRight2VisibilityConverter" />
+            <conv:ArchiveRight2VisibilityConverter x:Key="ArchiveRight2VisibilityConverter" />
             <conv:BoolReverseConverter x:Key="BoolReverseConverter" />
             <conv:IndividualGoalMassnahmeUncheckPreventConverter x:Key="IndividualGoalMassnahmeUncheckPreventConverter" />
             <conv:Rights2DefaultBooleanConverter x:Key="Rights2DefaultBooleanConverter"/>
@@ -92,6 +93,7 @@
                                             <ColumnDefinition Width="*" />
                                             <ColumnDefinition Width="Auto" />
                                             <ColumnDefinition Width="Auto" />
+                                            <ColumnDefinition Width="Auto" />
                                         </Grid.ColumnDefinitions>
                                         <Grid.RowDefinitions>
                                             <RowDefinition Height="Auto" />
@@ -107,10 +109,13 @@
                                                 </DataTemplate>
                                             </ListBox.ItemTemplate>
                                         </ListBox>
-                                        <TextBlock VerticalAlignment="Center" Grid.Column="3" Grid.Row="0" Grid.RowSpan="2" Margin="0,0,3,0" Visibility="{Binding Path=IsDeleted, Converter={StaticResource ReactivationRight2VisibilityConverter}, ConverterParameter=SupportConcept}">
+                                        <TextBlock VerticalAlignment="Center" Grid.Column="3" Grid.Row="0" Grid.RowSpan="2" Margin="0,0,3,0" Visibility="{Binding Path=IsArchived, Converter={StaticResource ArchiveRight2VisibilityConverter}, ConverterParameter=SupportConcept}">
+                                            <Hyperlink TargetName="_NewWindow" Foreground="#FFFFFFFF" Click="Hyperlink_Hilfeplan_AusArchivHolen_Click" Tag="{Binding}">Aus Archiv holen</Hyperlink>
+                                        </TextBlock>
+                                        <TextBlock VerticalAlignment="Center" Grid.Column="4" Grid.Row="0" Grid.RowSpan="2" Margin="0,0,3,0" Visibility="{Binding Path=IsDeleted, Converter={StaticResource ReactivationRight2VisibilityConverter}, ConverterParameter=SupportConcept}">
                                             <Hyperlink TargetName="_NewWindow" Foreground="#FFFFFFFF" Click="Hyperlink_Hilfeplan_Reaktivieren_Click" Tag="{Binding}">Reaktivieren</Hyperlink>
                                         </TextBlock>
-                                        <Button x:Name="btnOpenServiceRecordView" Grid.Column="4" Grid.Row="0" Grid.RowSpan="2" Width="25" Height="25" Style="{DynamicResource TransparentButtonStyle}" ToolTip="{markup:Translate In Zeiterfassung öffnen}" Tag="{Binding}" Margin="0,0,2,0" Click="BtnOpenServiceRecordView_Click">
+                                        <Button x:Name="btnOpenServiceRecordView" Grid.Column="5" Grid.Row="0" Grid.RowSpan="2" Width="25" Height="25" Style="{DynamicResource TransparentButtonStyle}" ToolTip="{markup:Translate In Zeiterfassung öffnen}" Tag="{Binding}" Margin="0,0,2,0" Click="BtnOpenServiceRecordView_Click">
                                             <Image Source="Ressources\Icons\HistoryDisabled.png" />
                                         </Button>
                                     </Grid>

BeWo/ConfirmDemoDialog.xaml

@@ -26,15 +26,16 @@
                         <RowDefinition Height="*" ></RowDefinition>
                         <RowDefinition Height="Auto" ></RowDefinition>
                     </Grid.RowDefinitions>
+
                     <TextBlock TextWrapping="Wrap" Margin="3" FontSize="14">WICHTIG! Bitte tragen Sie keine echten Daten bei Ihren Tests ein, da es sich um einen öffentlichen Testzugang handelt, auf den jeder Zugriff hat!</TextBlock>
-                    <Button x:Name="CountButton" Grid.Row="2" Grid.Column ="1" Width="120" Margin="3,25,3,3" IsDefault="True" HorizontalAlignment="Right" Click="ButtonBase_OnClick">OK</Button>
+                    <Button x:Name="CountButton" Grid.Row="2" Grid.Column="1" Width="120" Margin="3,25,3,3" IsDefault="True" HorizontalAlignment="Right" Click="ButtonBase_OnClick">OK</Button>
                     <!--<Button Grid.Row="2" Grid.Column ="2" Width="100" Margin="3" IsCancel="True" IsEnabled="False" HorizontalAlignment="Right">Abbrechen</Button>-->
                 </Grid>
             </Grid>
         </Border>
+
         <Line Grid.ColumnSpan="4" Stroke="#FFADADAD" X1="14" Y1="70" X2="585" Y2="70" StrokeThickness="1"></Line>
         <Line x:Name="linkLine" Stroke="#FFADADAD" X1="14" Y1="340" X2="585" Y2="340" StrokeThickness="1" Margin="0,30,0,-30"></Line>
-
     </Grid>
             
         

BeWo/Converter/ArchiveRight2VisibilityConverter.cs

@@ -0,0 +1,47 @@
+using System;
+using System.Globalization;
+using System.Windows;
+using System.Windows.Data;
+using BS.Shared;
+
+namespace BeWo.Converter
+{
+	public class ArchiveRight2VisibilityConverter : IValueConverter
+	{
+		public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+		{
+			if (parameter == null)
+			{
+				return Visibility.Collapsed;
+			}
+
+			var hasRight = false;
+
+			switch (parameter.ToString())
+			{
+				case "Person":
+					hasRight = BeWoApp.LoggedOnUser.HasRight(UserRightType.Person_AllowArchiving);
+					break;
+				case "Organisation":
+					hasRight = BeWoApp.LoggedOnUser.HasRight(UserRightType.Organisation_AllowArchiving);
+					break;
+				case "SupportConcept":
+					hasRight = BeWoApp.LoggedOnUser.HasRight(UserRightType.SupportConceptView_AllowArchiving);
+					break;
+				case "Customer":
+					hasRight = BeWoApp.LoggedOnUser.HasRight(UserRightType.Customer_AllowArchiving);
+					break;
+				case "Employee":
+				    hasRight = BeWoApp.LoggedOnUser.HasRight(UserRightType.Employee_AllowArchiving);
+				    break;
+			}
+
+			return (bool)value && hasRight ? Visibility.Visible : Visibility.Collapsed;
+		}
+
+		public object ConvertBack(object value, Type targetTypes, object parameter, CultureInfo culture)
+		{
+			throw new NotImplementedException();
+		}
+	}
+}

BeWo/Converter/BoolReverseConverter.cs

@@ -8,9 +8,9 @@ namespace BeWo.Converter
     {
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            if (value is bool)
+            if (value is bool buhl)
             {
-                return !(bool) value;
+                return !buhl;
             }
 
             return false;

BeWo/Converter/CellColorConverter.cs

@@ -5,7 +5,9 @@ using System.Linq;
 using System.Windows.Data;
 using System.Windows.Markup;
 using System.Windows.Media;
+using BeWo.View.Detail;
 using BeWo.ViewModel;
+using BS.Shared.DataContracts;
 using DevExpress.Xpf.Grid;
 
 namespace BeWo.Converter
@@ -23,9 +25,49 @@ namespace BeWo.Converter
             var viewTag = cellData.View.Tag as List<AdditionalServiceBookingVM>;
             var date = int.Parse(value[1].ToString().Split('.')[0], NumberStyles.Integer);
 
+            
+            if (viewTag != null && viewTag.Count > 0 && value.Length > 2 && value[2] is Teilnehmer)
+            {
+                var booking = viewTag[0];
+
+                if (date <= DateTime.DaysInMonth(booking.Date.Year, booking.Date.Month))
+                {
+
+                    var dt = new DateTime(booking.Date.Year, booking.Date.Month, date);
+
+                    if (dt.DayOfWeek == DayOfWeek.Saturday || dt.DayOfWeek == DayOfWeek.Sunday)
+                    {
+                        return Brushes.CornflowerBlue;
+                    }
+
+                    var t = (Teilnehmer) value[2];
+
+                    if (IsAbsence(dt, t.Customer.AbsenceTimes))
+                    {
+                        return Brushes.LightGray;
+                    }
+                }
+            }
             return viewTag.Any(v => v.Date.Day.Equals(date)) ? Brushes.White : b;
         }
 
+        private bool IsAbsence(DateTime dt, List<AbsenceTimeDC> absenceTimes)
+        {
+            if (absenceTimes == null)
+            {
+                return false;
+            }
+            foreach (var at in absenceTimes)
+            {
+                if ((!at.Start.HasValue || at.Start.Value <= dt) && (!at.End.HasValue || at.End.Value >= dt))
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+        
         public object[] ConvertBack(object value, Type[] targetType, object parameter, CultureInfo culture) { throw new NotImplementedException(); }
 
         public override object ProvideValue(IServiceProvider serviceProvider) { return this; }

BeWo/Core/BeWoUtils.cs

@@ -45,9 +45,12 @@ using Image = System.Windows.Controls.Image;
 using MessageBox = System.Windows.MessageBox;
 using Panel = System.Windows.Controls.Panel;
 using System.Windows.Media;
+using System.Windows.Threading;
+using BeWo.Core.Service;
 using BeWo.ownChat;
 using BeWo.PasswortSecurity;
 using BeWo.Scheduler.Utils;
+using BeWo.ViewModel.ListViewModel;
 using DevExpress.Xpf.Bars;
 using DevExpress.Xpf.DocumentViewer;
 using DevExpress.Xpf.Printing.PreviewControl.Bars;
@@ -55,6 +58,8 @@ using DevExpress.XtraScheduler;
 using RestSharp;
 using Control = System.Windows.Controls.Control;
 using Utils = BS.Shared.Core.Utils;
+using Brush = System.Windows.Media.Brush;
+using BeWo.View.Detail.Zeiterfassung;
 
 namespace BeWo.Core
 {
@@ -102,10 +107,15 @@ namespace BeWo.Core
 
 		public static void NavigateToReportUri(string navigateUriString, string title)
 		{
-			NavigateToReportUriWithDocumentPreviewControl(navigateUriString, title, null);
+            NavigateToReportUri(navigateUriString, title, null);
 		}
 
-		public static void NavigateToReportUriWithDocumentPreviewControl(string navigateUriString, string title, DocumentPreviewControl dp)
+        public static void NavigateToReportUri(string navigateUriString, string title, Action callback)
+        {
+            NavigateToReportUriWithDocumentPreviewControl(navigateUriString, title, null, callback);
+        }
+
+        public static void NavigateToReportUriWithDocumentPreviewControl(string navigateUriString, string title, DocumentPreviewControl dp, Action callback)
         {
             var reportTemplates = ServiceFacade.DoOperationsServiceSync(x => x.GetReportTemplates(navigateUriString));
 
@@ -120,7 +130,7 @@ namespace BeWo.Core
                     WindowStartupLocation = WindowStartupLocation.CenterOwner,
                     GroupBoxContent = control,
                     Owner = BeWoApp.CurrentBeWo.MainWindow,
-                    rootGroupBox = { Header = "Layout speichern" }
+                    rootGroupBox = { Header = "Bericht auswählen" }
                 };
 
                 control.CancelButtonClicked += () => beWoWindow.Close();
@@ -148,6 +158,10 @@ namespace BeWo.Core
 
                     StartGetReportStreamAsync(GetReportStreamForWPFControl, newUri, ms => BeWoApp.MainControl.Dispatch(delegate
                     {
+                        if (callback != null)
+                        {
+                            callback();
+                        }
                         ShowReportWindow(ms, title, dp);
                     }));
                 };
@@ -160,6 +174,10 @@ namespace BeWo.Core
 
                 StartGetReportStreamAsync(GetReportStreamForWPFControl, navigateUriString, ms => BeWoApp.MainControl.Dispatch(delegate
                 {
+                    if (callback != null)
+                    {
+                        callback();
+                    }
                     ShowReportWindow(ms, title, dp);
                 }));
             }
@@ -1305,7 +1323,7 @@ namespace BeWo.Core
                 }
 
                 var serv2 = serv as ServicesReportView;
-                if(serv != null)
+                if(serv2 != null)
                 {
                     if(serv2.Customer != null)
                     {
@@ -1660,93 +1678,48 @@ namespace BeWo.Core
 				cbDc = node.SupportConceptTreeNodeDC.CostBearer;
 				relDc = node.SupportConceptTreeNodeDC.SupportConceptCostBearerRelDC;
 			}
-			
 
             var dc = vm.CommitToDataContract();
             dc.Employee = selectedEmployee ?? BeWoApp.LoggedOnUser.Employee;
             dc.SupportConcept = scDc;
 			dc.CostBearer = cbDc;
-
-            if(vm.ServiceRecordFormat != ServiceRecordFormate.ZeiterfassungMitMonatJahr && vm.Date.HasValue && vm.DateAndTime.HasValue && vm.StartDate.HasValue) {
-
-                dc.Start = new DateTime(vm.Date.Value.Year,
-                                        vm.Date.Value.Month,
-                                        vm.Date.Value.Day,
-                                        vm.StartTime == null ? vm.DateAndTime.Value.Hour : vm.StartDate.Value.Hour,
-                                        vm.StartTime == null ? vm.DateAndTime.Value.Minute : vm.StartDate.Value.Minute,
-                                        vm.StartTime == null ? vm.DateAndTime.Value.Second : vm.StartDate.Value.Second);
-                
-
-
-                if(vm.DurationInStunden == ZeiterfassungsDauer.Minuten)
-                {
-                    if (vm.ServiceRecordFormat == ServiceRecordFormate.ZeiterfassungMitEndDatum)
-                    {
-                        dc.End = dc.Start.Value.AddMinutes(Convert.ToDouble(vm.DurationSTD));
-                    }
-                    else
-                    {
-                        dc.End = dc.Start.Value.AddMinutes(Convert.ToDouble(vm.Duration));
-                    }
-                }
-                else
-                {
-                    if (vm.ServiceRecordFormat == ServiceRecordFormate.ZeiterfassungMitEndDatum)
-                    {
-                        dc.End = dc.Start.Value.AddHours(Convert.ToDouble(vm.DurationSTD));
-                    }
-                    else 
-                    {
-                        dc.End = dc.Start.Value.AddHours(Convert.ToDouble(vm.Duration));
-                    }
-                }
-
-            }
-            else
-            {
-                var dates = DateTime.Parse("1." + vm.OnlyMonth + vm.OnlyYear);
-
-                var StartDatetime = new DateTime(dates.Year, dates.Month, 1, 0, 0, 0);
-         
-                dc.Start = StartDatetime;
-                dc.End = StartDatetime.AddHours((double)vm.DurationMonthYearGes);
-            }
-
             
             if (relDc != null)
-				dc.CostBearer2SupportConceptOid = relDc.CostBearer2SupportConceptOid;
+            {
+                dc.CostBearer2SupportConceptOid = relDc.CostBearer2SupportConceptOid;
+            }
 
-            var r = new List<ServiceRecordValidationResultDC>();
+            var validationResults = new List<ServiceRecordValidationResultDC>();
 
             var maxdays = BeWoApp.AppSettings.MaxDaysEditServiceRecordsAllowed;
 
             if (withoutClient && BeWoApp.AppSettings.MaxDaysEditServiceRecordsAllowed <= 0)
+            {
                 maxdays = -1;
+            }
 
             if (BeWoApp.LoggedOnUser.HasRight(UserRightType.ServiceRecord_AllowEditAfterMaxDaysInNextMonth))
+            {
                 maxdays = -1;
+            }
 
-	        var test = dc.Start;
-	        var test2 = vm.DateAndTime;
+			ServiceFacade.DoOperationsServiceSync(o => validationResults = o.ValidateServiceRecord(dc, statistics, maxdays, employeeOids, cb2ScOids));
 
-			ServiceFacade.DoOperationsServiceSync(o => r = o.ValidateServiceRecord(dc, statistics, maxdays, employeeOids, cb2ScOids));
-
-
-            if (r.Count > 0)
+            if (validationResults.Count > 0)
             {
                 var exitLoop = false;
                 
-                foreach (var result in r)
+                foreach (var result in validationResults)
                 {
                     switch (result.ResultType)
                     {
                         case ServiceRecordValidationResult.OutsideOfSupportConcept:
-                            MessageBox.Show("Das gewählte Datum '" + vm.DateAndTime.Value.ToShortDateString() + "' liegt außerhalb des Zeitraums des gewählten Hilfeplans (" + relDc.DateRangeString + ").\nDas Speichern ist nicht möglich.", "Speichern", MessageBoxButton.OK, MessageBoxImage.Information);
+                            MessageBox.Show($"Das gewählte Datum '{vm.StartDate.ToShortDateString()}' liegt außerhalb des Zeitraums des gewählten Hilfeplans ({relDc.DateRangeString}).\nDas Speichern ist nicht möglich.", "Speichern", MessageBoxButton.OK, MessageBoxImage.Information);
                             lValid = false;
                             exitLoop = true;
                             break;
                         case ServiceRecordValidationResult.OutOfEditLimit:
-                            MessageBox.Show("Sie können keine neuen Leistungen für den " + vm.DateAndTime.Value.ToShortDateString() + " dokumentieren, da bereits der " + BeWoApp.AppSettings.MaxDaysEditServiceRecordsAllowed + ". des nachfolgenden Monats überschritten ist.", "Speichern", MessageBoxButton.OK, MessageBoxImage.Information);
+                            MessageBox.Show($"Sie können keine neuen Leistungen für den {vm.StartDate.ToShortDateString()} dokumentieren, da bereits der {BeWoApp.AppSettings.MaxDaysEditServiceRecordsAllowed}. des nachfolgenden Monats überschritten ist.", "Speichern", MessageBoxButton.OK, MessageBoxImage.Information);
                             lValid = false;
                             exitLoop = true;
                             break;
@@ -1755,11 +1728,11 @@ namespace BeWo.Core
 							{
 								if (BeWoApp.AppSettings.AnzTageZeiterfassErfolgt == 1)
 								{
-									MessageBox.Show("Sie können keine neuen Leistungen für den " + vm.DateAndTime.Value.ToShortDateString() + " dokumentieren, da die Zeiterfassung innerhalb von einem Tag erfolgen muss.", "Speichern", MessageBoxButton.OK, MessageBoxImage.Information);
+									MessageBox.Show($"Sie können keine neuen Leistungen für den {vm.StartDate.ToShortDateString()} dokumentieren, da die Zeiterfassung innerhalb von einem Tag erfolgen muss.", "Speichern", MessageBoxButton.OK, MessageBoxImage.Information);
 								}
 								else
 								{
-									MessageBox.Show("Sie können keine neuen Leistungen für den " + vm.DateAndTime.Value.ToShortDateString() + " dokumentieren, da die Zeiterfassung innerhalb von " + BeWoApp.AppSettings.AnzTageZeiterfassErfolgt + " Tagen erfolgen muss.", "Speichern", MessageBoxButton.OK, MessageBoxImage.Information);
+									MessageBox.Show($"Sie können keine neuen Leistungen für den {vm.StartDate.ToShortDateString()} dokumentieren, da die Zeiterfassung innerhalb von {BeWoApp.AppSettings.AnzTageZeiterfassErfolgt} Tagen erfolgen muss.", "Speichern", MessageBoxButton.OK, MessageBoxImage.Information);
 								}
 
 								lValid = false;
@@ -1775,10 +1748,10 @@ namespace BeWo.Core
                         case ServiceRecordValidationResult.ServiceRecordOverlapping:
 							if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.ServiceRecord_AllowCreateOverlappingFLS))
                             {
-                                MessageBox.Show("An dem gewählten Datum '" + vm.DateAndTime.Value.ToShortDateString() + " " + vm.DateAndTime.Value.ToShortTimeString() + "' existiert bereits ein Eintrag (" + result.Message + " bei Klient/in " + result.CustomerName + ") .\nSpeichern nicht möglich.", "Speichern nicht möglich", MessageBoxButton.OK, MessageBoxImage.Information);
+                                MessageBox.Show($"An dem gewählten Datum '{vm.StartDate.ToShortDateString()} {vm.StartDate.ToShortTimeString()}' existiert bereits ein Eintrag ({result.Message} bei " + BS.Shared.Translation.Translator.Translate("Klient/in") + " " + result.CustomerName + ") .\nSpeichern nicht möglich.", "Speichern nicht möglich", MessageBoxButton.OK, MessageBoxImage.Information);
                                 lValid = false;
                             }
-							else if (MessageBox.Show("An dem gewählten Datum '" + vm.DateAndTime.Value.ToShortDateString() + " " + vm.DateAndTime.Value.ToShortTimeString() + "' existiert bereits ein Eintrag (" + result.Message + " bei Klient/in " + result.CustomerName + ").\nMöchten Sie trotzdem speichern?", "Speichern", MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.No)
+							else if (MessageBox.Show($"An dem gewählten Datum '{vm.StartDate.ToShortDateString()} {vm.StartDate.ToShortTimeString()}' existiert bereits ein Eintrag ({result.Message} bei " + BS.Shared.Translation.Translator.Translate("Klient/in") + " " + result.CustomerName + ").\nMöchten Sie trotzdem speichern?", "Speichern", MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.No)
                             {
                                 lValid = false;
                                 exitLoop = true;
@@ -1788,25 +1761,23 @@ namespace BeWo.Core
 		                   
                             if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.ServiceRecord_AllowCreateOverlappingFLSForEmployee))
                             {
-								MessageBox.Show("An dem gewählten Datum '" + vm.DateAndTime.Value.ToShortDateString() + " " + vm.DateAndTime.Value.ToShortTimeString() + "' existiert bereits ein Eintrag von " + result.EmployeeName + "\n(" + result.Message + ").\nSpeichern nicht möglich.", "Speichern nicht möglich", MessageBoxButton.OK, MessageBoxImage.Information);
+								MessageBox.Show($"An dem gewählten Datum '{vm.StartDate.ToShortDateString()} {vm.StartDate.ToShortTimeString()}' existiert bereits ein Eintrag von {result.EmployeeName}\n({result.Message}).\nSpeichern nicht möglich.", "Speichern nicht möglich", MessageBoxButton.OK, MessageBoxImage.Information);
                                 lValid = false;
                             }
-							else if (MessageBox.Show("An dem gewählten Datum '" + vm.DateAndTime.Value.ToShortDateString() + " " + vm.DateAndTime.Value.ToShortTimeString() + "' existiert bereits ein Eintrag von " + result.EmployeeName + "\n(" + result.Message + ").\n\nMöchten Sie trotzdem speichern?", "Speichern", MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.No)
+							else if (MessageBox.Show($"An dem gewählten Datum '{vm.StartDate.ToShortDateString()} {vm.StartDate.ToShortTimeString()}' existiert bereits ein Eintrag von {result.EmployeeName}\n({result.Message}).\n\nMöchten Sie trotzdem speichern?", "Speichern", MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.No)
                             {
                                 lValid = false;
                                 exitLoop = true;
                             }
                             break;
                         case ServiceRecordValidationResult.ApprovedFLSOverspending:
-                            String klient = "diesen Hilfeplan";
-                            if (!String.IsNullOrEmpty(result.CustomerName))
+                            var klient = "diesen Hilfeplan";
+                            if (!string.IsNullOrEmpty(result.CustomerName))
                             {
-                                klient = "Klient/in " + result.CustomerName;
+                                klient = BS.Shared.Translation.Translator.Translate("Klient/in") + " " + result.CustomerName;
                             }
-                            String msg =
-                                String.Format(
-                                    "Die für {2} genehmigten FLS ({0:N}) werden mit diesem Eintrag überschritten. ({1:N}).",
-                                    result.ApprovedHours, result.HoursNew, klient);
+
+                            var msg = string.Format("Die für {2} genehmigten FLS ({0:N}) werden mit diesem Eintrag überschritten. ({1:N}).", result.ApprovedHours, result.HoursNew, klient);
 
                             if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.ServiceRecord_AllowCreateMoreFLSThanApproved))
                             {
@@ -1820,17 +1791,17 @@ namespace BeWo.Core
                             }
                             break;
                         case ServiceRecordValidationResult.SettlementInvoiceAlreadyExisting:
-                            String klient2 = "diesen Hilfeplan";
-                            if (!String.IsNullOrEmpty(result.CustomerName))
+                            var klient2 = "diesen Hilfeplan";
+                            if (!string.IsNullOrEmpty(result.CustomerName))
                             {
-                                klient2 = "Klient/in " + result.CustomerName;
+                                klient2 = BS.Shared.Translation.Translator.Translate("Klient/in") + " " + result.CustomerName;
                             }
                             if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.BookServiceRecordAfterSettlementInvoice))
                             {
-                                MessageBox.Show(String.Format("Sie können den Eintrag nicht bearbeiten, da bereits eine Spitzabrechnung für {0} erstellt wurde.", klient2), "Speichern nicht möglich", MessageBoxButton.OK, MessageBoxImage.Warning);
+                                MessageBox.Show($"Sie können den Eintrag nicht bearbeiten, da bereits eine Spitzabrechnung für {klient2} erstellt wurde.", "Speichern nicht möglich", MessageBoxButton.OK, MessageBoxImage.Warning);
                                 lValid = false;
                             }
-							else if (MessageBox.Show(String.Format("Es existiert bereits eine Spitzabrechnung für {0}. Um diesen Eintrag zu berücksichtigen, muss eventuell eine neue Spitzabrechnung erstellt werden.\nMöchten Sie trotzdem speichern?", klient2), "Speichern", MessageBoxButton.YesNo, MessageBoxImage.Warning).Equals(MessageBoxResult.No))
+							else if (MessageBox.Show($"Es existiert bereits eine Spitzabrechnung für {klient2}. Um diesen Eintrag zu berücksichtigen, muss eventuell eine neue Spitzabrechnung erstellt werden.\nMöchten Sie trotzdem speichern?", "Speichern", MessageBoxButton.YesNo, MessageBoxImage.Warning).Equals(MessageBoxResult.No))
                             {
                                 lValid = false;
                                 exitLoop = true;
@@ -1851,14 +1822,23 @@ namespace BeWo.Core
                                 lValid = false;
                                 exitLoop = true;
                             }
-							
 							break;
+                        case ServiceRecordValidationResult.SignatureExists:
+                            if(MessageBox.Show(result.Message, "Speichern", MessageBoxButton.YesNo, MessageBoxImage.Warning).Equals(MessageBoxResult.No))
+                            {
+                                lValid = false;
+                                exitLoop = true;
+                            }
+                            break;
                     }
 
-                    if (exitLoop) break;
+                    if (exitLoop)
+                    {
+                        break;
+                    }
                 }
             }
-            
+
             return lValid;
         }
 
@@ -1911,7 +1891,7 @@ namespace BeWo.Core
             else
             {
                 var msg = vm.GroupOid != null
-                    ? "ACHTUNG, wenn Sie fortfahren, löschen Sie die gesamte Gruppenbuchung.\nWenn Sie nur einzelne Klienten aus der Gruppe entfernen möchten,\neditieren Sie die Gruppe und entfernen den Klienten aus der Liste aller Hilfepläne.\nSind Sie sicher, dass Sie dem gesamten Gruppeneintrag löschen möchten?"
+                    ? "ACHTUNG, wenn Sie fortfahren, löschen Sie die gesamte Gruppenbuchung.\nWenn Sie nur einzelne " + BS.Shared.Translation.Translator.Translate("Klienten") + " aus der Gruppe entfernen möchten,\neditieren Sie die Gruppe und entfernen den Klienten aus der Liste aller Hilfepläne.\nSind Sie sicher, dass Sie den gesamten Gruppeneintrag löschen möchten?"
                     : "Sind Sie sicher, dass Sie den gewählten Eintrag löschen möchten?";
 
                 if (MessageBox.Show(msg, "Eintrag löschen", MessageBoxButton.YesNo, MessageBoxImage.Warning) !=
@@ -1940,8 +1920,18 @@ namespace BeWo.Core
 					var employeeOid        = Convert.ToInt64(variablen["employeeOid"]);
 					var serienTermine      = (List<SchedulerAppointmentDC>)variablen["serienTermine"];
 					var mehrtaegigeTermine = (List<SchedulerAppointmentDC>)variablen["mehrtaegigeTermine"];
+                    var nullableAbsenceTimeOids = (List<long?>) variablen["absenceTimeOids"] ?? new List<long?>();
 
-					ServiceFacade.DoReportServiceAsync(strom => strom.CreateKalenderReport(appointmentIds, employeeOid, serienTermine, selectedDays, mehrtaegigeTermine), ms => BeWoApp.MainControl.Dispatch(() => ShowReportWindow(ms, title)));
+                    var absenceTimeOids = new List<long>();
+                    foreach(var absenceTimeOid in nullableAbsenceTimeOids)
+                    {
+                        if(absenceTimeOid.HasValue)
+                        {
+                            absenceTimeOids.AddIfNotIn(absenceTimeOid.Value);
+                        }
+                    }
+
+					ServiceFacade.DoReportServiceAsync(strom => strom.CreateKalenderReportWithAbsenceTimes(appointmentIds, employeeOid, serienTermine, selectedDays, mehrtaegigeTermine, absenceTimeOids), ms => BeWoApp.MainControl.Dispatch(() => ShowReportWindow(ms, title)));
 
 					break;
 				case ReportEnum.KassenbuchReportEnum:
@@ -2070,25 +2060,26 @@ namespace BeWo.Core
             }
         }
 
-        public static void CreateZeiterfassung(DateTime start, DateTime end, List<CompactCustomerDC> customer, List<CompactEmployeeDC> employees, String notice, Appointment appointment, Action schedulerCallback)
+        public static void CreateZeiterfassung(DateTime start, DateTime end, List<CompactCustomerDC> customer, List<CompactEmployeeDC> employees, string notice, Appointment appointment, Action<List<ServiceRecordDC>> schedulerCallback)
         {
             ChatDokumentationsView newView;
 
-            if (customer.Count == 0)
+            if(customer.Count == 0)
             {
                 // Normale Buchung
-                newView = new ChatDokumentationsView(notice, null, start, end, schedulerCallback, appointment);
+                newView = new ChatDokumentationsView(notice, null, start, end, null, schedulerCallback, appointment);
             }
-            else if (customer.Count == 1 && employees.Count == 0)
+            else if(customer.Count == 1 && employees.Count < 2)
             {
                 var compactKlient = ServiceFacade.DoCustomerServiceSync(s => s.GetCompactCustomerDC(customer[0].CustomerOid));
 
                 // Normale Buchung
-                newView = new ChatDokumentationsView(notice, compactKlient, start, end, schedulerCallback, appointment);
+                
+                newView = new ChatDokumentationsView(notice, compactKlient, start, end, employees.Count == 1 ? employees[0] : null, schedulerCallback, appointment);
             }
             else
             {
-                if (employees.Count == 0)
+                if(employees.Count == 0)
                 {
                     employees.Add(BeWoApp.CompactLoggedOnEmployee);
                 }
@@ -2107,14 +2098,14 @@ namespace BeWo.Core
             if(customer.Count == 0)
             {
                 // Normale Buchung
-                newView = new ChatDokumentationsView(notice, null, start, end);
+                newView = new ChatDokumentationsView(notice, null, start, end, null);
             }
-            else if(customer.Count == 1 && employees.Count == 0)
+            else if(customer.Count == 1 && employees.Count < 2)
             {
                 var compactKlient = ServiceFacade.DoCustomerServiceSync(s => s.GetCompactCustomerDC(customer[0].CustomerOid));
 
                 // Normale Buchung
-                newView = new ChatDokumentationsView(notice, compactKlient, start, end);
+                newView = new ChatDokumentationsView(notice, compactKlient, start, end, employees.Count == 1 ? employees[0] : null);
             }
             else
             {
@@ -2131,7 +2122,7 @@ namespace BeWo.Core
         }
 
         public static void OwnChatSynchronisationVeranlassen()
-        {       
+        {
             if (!BeWoApp.Mandator.Apikey.IsNullOrEmpty())
             {
                 try
@@ -2167,11 +2158,11 @@ namespace BeWo.Core
                         
 //                        response.Close();
 //                        response.Dispose();
-                    //}
+
                 }
                 catch (Exception exception)
                 {
-                   // MessageBox.Show("Die Verbindung konnte nicht aufgebaut werden.", "ownChat Fehler ", MessageBoxButton.OK);
+                    // MessageBox.Show("Die Verbindung konnte nicht aufgebaut werden.", "ownChat Fehler ", MessageBoxButton.OK);
 
                 }
             }
@@ -2187,11 +2178,169 @@ namespace BeWo.Core
             return BeWoApp.LoggedOnUser.HasRight(pUserRightType);
         }
         
-        public static bool CheckSchedulerRights(Appointment pAppointment, bool pIsNew, SchedulerRightsCheckType pCheckType)
+        public static bool CheckSchedulerRights(Appointment pAppointment, bool pIsNew, SchedulerRightsCheckType pCheckType, List<long> teamMemberCustomerOids, bool ignoreViewEditCreateAllRights)
         {
             var storage = pAppointment.GetCustomFieldStorage();
 
-            return Utils.CheckSchedulerRights(storage.CustomerList, storage.ResourceList, storage.EmployeeList.ToList(), storage.Originator, pIsNew, pCheckType, BeWoApp.LoggedOnUser);
+            return Utils.CheckSchedulerRights(storage.CustomerList, storage.ResourceList, storage.EmployeeList.ToList(), storage.Originator, pIsNew, pCheckType, BeWoApp.LoggedOnUser, teamMemberCustomerOids, ignoreViewEditCreateAllRights);
+        }
+
+        public static void EditServiceRecord(ServiceRecordDC dc, DispatcherObject p)
+        {
+            
+            var record = ServiceFacade.DoOperationsServiceSync(s => s.GetServiceRecordById(dc.ServiceRecordOid.Value));
+
+
+            //var allgoalsCopy = GoalService.CopyGoals(selectedRecord.AllGoals, false);
+
+            //var sr = new ServiceRecordVM(record, ViewModel.PrototypeVM.Category2Services,
+                //selectedRecord.AllGoalCategories, allgoalsCopy);
+
+            VMFactory.CreateServiceRecordVMAsync(
+                BeWoApp.LoggedOnUser.Employee.EmployeeOid,
+                vmList =>  p.Dispatch(
+                    delegate
+                    {
+                        vmList.DispatcherObject = p;
+
+                        if (record.Customer != null && record.SupportConcept != null)
+                        {
+                            vmList.InitPrototypeVM(record.Customer.CustomerOid, record.SupportConcept.SupportConceptOid, record.CostBearer2SupportConceptOid);
+                        }
+                        //var allgoalsCopy = GoalService.CopyGoals(selectedRecord.AllGoals, false);
+
+                        //var sr = new ServiceRecordVM(record, ViewModel.PrototypeVM.Category2Services,
+                        //    selectedRecord.AllGoalCategories, allgoalsCopy);
+                        
+                        var vm = new ServiceRecordVM(record, vmList.PrototypeVM.Category2Services, vmList.PrototypeVM.AllGoalCategories, vmList.PrototypeVM.AllGoals);
+
+                        EditServiceRecord(vmList, vm);
+                    }));
+        }
+        public static void EditServiceRecord(ServiceRecordListVM listvm, ServiceRecordVM vm)
+        {
+            if (vm == null)
+            {
+                return;
+            }
+
+            BeWoView serviceRecordEditView;
+
+            if (vm.GroupOid != null)
+            {
+                serviceRecordEditView = new ServiceRecordGroupEditView();
+            }
+            else
+            {
+                serviceRecordEditView = new ServiceRecordEditView();
+            }
+            double height = BeWoApp.MainControl.ActualHeight * 0.8;
+            double width = 710;
+
+            if (BeWoApp.AppSettings.ShowRtfTextfield)
+            {
+                height = BeWoApp.MainControl.ActualHeight - 120;
+                width = 1000;
+            }
+            if (BeWoApp.MainControl.ActualWidth < width)
+            {
+                width = BeWoApp.MainControl.ActualWidth;
+            }
+            if (height < 600)
+            {
+                height = 600;
+            }
+
+            var beWoWindow = new BeWoWindow
+            {
+                Height = height,
+                Width = width,
+                WindowStartupLocation = WindowStartupLocation.CenterOwner,
+                GroupBoxContent = serviceRecordEditView,
+                Owner = BeWoApp.CurrentBeWo.MainWindow
+            };
+
+            beWoWindow.rootGroupBox.Style = null;
+            beWoWindow.rootGroupBox.Visibility = Visibility.Visible;
+            beWoWindow.rootGroupBox.Margin = new Thickness(-10);
+            beWoWindow.rootGroupBox.Padding = new Thickness(0);
+
+            if (serviceRecordEditView.CommandBindings.Count == 0)
+            {
+                serviceRecordEditView.CommandBindings.Add(
+                    new CommandBinding(
+                        ApplicationCommands.Close,
+                        (s, e) =>
+                        {
+                            var result = ServiceRecordDialogResult.ClosedWithoutSaving;
+
+                            if (vm.EditAllowed)
+                            {
+                                if (serviceRecordEditView is ServiceRecordEditView view)
+                                {
+                                    result = view.CloseAndDoSaveCheck();
+                                }
+                                else
+                                {
+                                    result = ((ServiceRecordGroupEditView)serviceRecordEditView).CloseAndDoSaveCheck();
+                                }
+                            }
+
+                            beWoWindow.Close();
+                        }));
+                serviceRecordEditView.CommandBindings.Add(
+                    new CommandBinding(
+                        ApplicationCommands.Save,
+                        (s, e) =>
+                        {
+                            if (vm.EditAllowed)
+                            {
+                                bool save;
+                                if (serviceRecordEditView is ServiceRecordEditView)
+                                {
+                                    save = ((ServiceRecordEditView)serviceRecordEditView).IsValid() &&
+                                           ((ServiceRecordEditView)serviceRecordEditView).IsCustomerChangeAllowed();
+                                }
+                                else
+                                {
+                                    save = ((ServiceRecordGroupEditView)serviceRecordEditView).IsValid() &&
+                                           ((ServiceRecordGroupEditView)serviceRecordEditView)
+                                           .IsCustomerChangeAllowed();
+                                }
+
+                                if (!save)
+                                {
+                                    return;
+                                }
+
+                                serviceRecordEditView.SaveData();
+                            }
+                            beWoWindow.Close();
+                        }));
+            }
+
+            if (serviceRecordEditView is ServiceRecordEditView)
+            {
+                ((ServiceRecordEditView)serviceRecordEditView).InitView(listvm, vm, vm.SupportConcept == null);
+                
+            }
+            else
+            {
+                var group = ServiceFacade.DoOperationsServiceSync(s => s.GetServiceRecordGroup(vm.GroupOid.Value));
+
+                ((ServiceRecordGroupEditView)serviceRecordEditView).InitView(listvm, vm, group);
+
+                beWoWindow.Width += 190;
+            }
+
+            beWoWindow.ShowDialog();
+        }
+
+        public static bool CheckForExistingSignatures(ServiceRecordDC serviceRecord)
+        {
+            var validationResult = ServiceFacade.DoOperationsServiceSync(s => s.CheckForExistingSignature(serviceRecord));
+
+            return validationResult != null && MessageBox.Show(validationResult.Message, "Speichern", MessageBoxButton.YesNo, MessageBoxImage.Warning).Equals(MessageBoxResult.Yes) || validationResult == null;
         }
     }
 }

BeWo/Core/Config/AppSettings.cs

@@ -1,6 +1,8 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using BeWo.View.Navigation.Filter;
 using BS.Shared;
+using DevExpress.XtraScheduler;
 
 namespace BeWo.Core.Config
 {
@@ -16,7 +18,7 @@ namespace BeWo.Core.Config
 
         private bool misZeiterfassDateNormal = true;
 
-        private bool misZeiterfassungInStdMin = true;
+        private String einheitZeiterfassung = "0";
 
         private CustomerFilterEnum _CustomerFilterInZeiterfassung = CustomerFilterEnum.All;
         private CustomerFilterEnum _CustomerFilterSupportConcepts = CustomerFilterEnum.All;
@@ -31,6 +33,12 @@ namespace BeWo.Core.Config
 
         private int mLastSelectedServiceRecordTimeIntervalDays = 7;
 
+        private int mServiceRecordAllowChangeHours = 24;
+
+        private DateTime mLastSelectedServiceRecordMonth = new DateTime(DateTime.Now.Year, DateTime.Now.Month, 1);
+
+
+
         private ZeiterfassungsDauer mLetzteZeiterfassungsDauer = ZeiterfassungsDauer.Minuten;
 
         public enum WindowStateType
@@ -38,7 +46,11 @@ namespace BeWo.Core.Config
             Default,
             Maximised
         }
-        
+
+        public AppSettings()
+        {
+            DienstplanungStandardZeilenAnzahl = 1;
+        }
 
         public bool IsServiceRecordNoticeMandatory
         {
@@ -74,10 +86,10 @@ namespace BeWo.Core.Config
             set { misZeiterfassDateNormal = value; }
         }
 
-        public bool IsZeiterfassungInStdMin
+        public String EinheitZeiterfassung
         {
-            get { return misZeiterfassungInStdMin; }
-            set { misZeiterfassungInStdMin = value; }
+            get { return einheitZeiterfassung; }
+            set { einheitZeiterfassung = value; }
         }
 
         public ZeiterfassungsDauer LetzteZeiterfassungsDauer
@@ -181,7 +193,6 @@ namespace BeWo.Core.Config
 
         public bool ShowLargeCustomerNotice { get; set; }
 
-        
         public bool ZeigeNurMeineTermine
         {
             get { return mZeigeNurMeineTermine; }
@@ -309,12 +320,44 @@ namespace BeWo.Core.Config
             }
         }
 
+        public DateTime LastSelectedServiceRecordMonth
+        {
+            get { return mLastSelectedServiceRecordMonth; }
+
+            set
+            {
+                if (mLastSelectedServiceRecordMonth != value)
+                {
+                    mLastSelectedServiceRecordMonth = value;
+                    IsDirty = true;
+                }
+            }
+
+            
+        }
+
+        public int ServiceRecordAllowChangeHours
+        {
+            get { return mServiceRecordAllowChangeHours; }
+
+            set
+            {
+                if (mServiceRecordAllowChangeHours != value)
+                {
+                    mServiceRecordAllowChangeHours = value;
+                    IsDirty = true;
+                }
+            }
+        }
+
         public bool IsDirty { get; set; }
 
         public string TimeRecordingMenuName { get; set; }
 
 		public bool ShowDistanceFields { get; set; }
 
+        public bool ShowBetrag { get; set; }
+
         public bool ShowHilfeplanBezeichnung { get; set; }
 
         public bool ShowArbeitszeiten { get; set; }
@@ -341,7 +384,9 @@ namespace BeWo.Core.Config
 
 		public bool IsWohnheimAllowed { get; set; }
 
-        public bool IsChatAllowed { get; set; }
+        public bool ShowOwnChat { get; set; }
+
+        public bool ShowOwnChatSettings { get; set; }
 
         public bool IsMedicationAllowed { get; set; }
 
@@ -351,8 +396,69 @@ namespace BeWo.Core.Config
 
 		public bool PrinterSettingsUseMargins { get; set; }
 
+        public bool ShowMultipleResourceColors { get; set; }
+
         public bool ShowPivotGrid { get; set; }
 
         public string ExpandedAdministrationItems { get; set; }
+        public bool ShowUrlaubsplanung { get; set; }
+        public bool DontShowSpitzabrechnung { get; set; }
+        public bool ShowDienstplanung { get; set; }
+
+        public int DienstplanungStandardZeilenAnzahl { get; set; }
+
+        public bool ShowInfoButtonInCalender{ get; set; }
+
+        public bool AllowStorno { get; set; }
+        
+        public bool ShowEmployeeSignature { get; set; }
+
+        public bool SetStartTimeToEndTimeAfterSave { get; set; }
+
+        public bool ShowHilfeplanStatistikReport { get; set; }
+
+        private SchedulerViewType _SchedulerViewType;
+        public SchedulerViewType SchedulerViewType
+        {
+            get => _SchedulerViewType;
+            set
+            {
+                if(_SchedulerViewType != value)
+                {
+                    _SchedulerViewType = value;
+                    IsDirty = true;
+                }
+            }
+        }
+
+        private int _SchedulerTimelineViewDayCount;
+        public int SchedulerTimelineViewDayCount
+        {
+            get => _SchedulerTimelineViewDayCount == 0 ? 10 : _SchedulerTimelineViewDayCount;
+            set
+            {
+                if(_SchedulerTimelineViewDayCount != value)
+                {
+                    _SchedulerTimelineViewDayCount = value > 0 ? value : 10;
+                    IsDirty = true;
+                }
+            }
+        }
+
+        private int _SchedulerDayViewDayCount;
+        public int SchedulerDayViewDayCount
+        {
+            get => _SchedulerDayViewDayCount == 0 ? 5 : _SchedulerDayViewDayCount;
+            set
+            {
+                if(_SchedulerDayViewDayCount != value)
+                {
+                    _SchedulerDayViewDayCount = value > 0 ? value : 5;
+                    IsDirty = true;
+                }
+            }
+        }
+
+        public bool ShowKlientenBetreuungszeiten { get; set; }
     }
 }

BeWo/Core/Service/Cache.cs

@@ -38,7 +38,9 @@ namespace BeWo.Core.Service
 
         private List<CompactEmployeeDC> mTeamMembers;
 
-		private Dictionary<ValueListEntryDC, List<ResourceDC>> mCats2ResInDic;
+        private List<RatingTypeDC> mRatingTypes;
+
+        private Dictionary<ValueListEntryDC, List<ResourceDC>> mCats2ResInDic;
 
         private Cache()
         {
@@ -63,6 +65,7 @@ namespace BeWo.Core.Service
 			this.ClearCustomers();
             this.ClearWohnheims();
 			ClearResources();
+            ClearRatingTypes();
         }
 
         public void ClearAllValueListEntries()
@@ -115,7 +118,12 @@ namespace BeWo.Core.Service
 		    mCats2ResInDic = null;
 	    }
 
-		public void GetActiveSupportConceptCostbearer(Action<List<CompactSupportConceptDC>> callback)
+        public void ClearRatingTypes()
+        {
+            mRatingTypes = null;
+        }
+
+        public void GetActiveSupportConceptCostbearer(Action<List<CompactSupportConceptDC>> callback)
         {
             if (this.mActiveSupportConceptCostbearerList == null)
             {
@@ -247,6 +255,16 @@ namespace BeWo.Core.Service
 			}
 		}
 
+        public List<RatingTypeDC> GetAllRatingTypeList()
+        {
+            if(mRatingTypes == null)
+            {
+                ServiceFacade.DoOperationsServiceSync(cs => mRatingTypes = cs.GetAllRatingTypes());
+            }
+
+            return mRatingTypes;
+        }
+
         public void GetServiceCategoryDescriptionDict(Action<Dictionary<ServiceCategoryDC, List<ServiceDescriptionDC>>> callback)
         {
             if (this.mServiceCategoryDescriptionDict == null)
@@ -334,6 +352,28 @@ namespace BeWo.Core.Service
             return ve;
         }
 
+        public void AddGoalEntry(ValueListEntryDC newdc)
+        {
+            if (newdc.ValueListEntryOid.HasValue)
+            {
+                var ve = GetGoalEntry(newdc.ValueListEntryOid.Value);
+                if (ve == null || !ve.ValueListEntryOid.HasValue)
+                {
+                    if (mValueListEntryDict != null)
+                    {
+                        if (!mValueListEntryDict.ContainsKey(newdc.Type))
+                        {
+                            mValueListEntryDict[newdc.Type] = new List<ValueListEntryDC>();
+                        }
+                        mValueListEntryDict[newdc.Type].Add(newdc);
+                        
+                    }
+                }
+            }
+            
+            
+        }
+
         public ValueListEntryDC GetValueListEntry(ValueListEntryType type, long oid)
         {
             if (mValueListEntryDict == null || !mValueListEntryDict.ContainsKey(type))

BeWo/Core/Service/GoalService.cs

@@ -41,8 +41,8 @@ namespace BeWo.Core.Service
 		        }
 	        }
 
-			var sortedCategories = allCategories.OrderBy(s => s.TypeDescription).ToList();
-            var sortedGoals      = pAllGoals.OrderBy(s => s.TypeDescription).ToList();
+			var sortedCategories = allCategories.OrderBy(s => s.DisplayName).ToList();
+            var sortedGoals      = pAllGoals.OrderBy(s => s.DisplayName).ToList();
 
             var allCatList      = new List<SupportConceptGoalDC>();
 			var allGoalList = new List<SupportConceptGoalDC>();
@@ -284,6 +284,7 @@ namespace BeWo.Core.Service
         public static void RecursiveSynchronousSCValueListEntrySave(SupportConceptGoalTreeItem treeItem)
         {
             var neuerDC = ServiceFacade.DoValueListServiceSync(s => s.InsertNewValueListEntry(treeItem.GoalEntryVM.CommitToDataContract()));
+            Cache.GetInstance().AddGoalEntry(neuerDC);
             InsertedGoals.Add(neuerDC);
             treeItem.GoalEntryVM = new ValueListEntryVM(neuerDC);
             treeItem.GoalEntryDC = neuerDC;
@@ -302,7 +303,7 @@ namespace BeWo.Core.Service
         {
             ValueListEntryDC copyVe = new ValueListEntryDC();
             copyVe.Abbreviation = ve.Abbreviation;
-            copyVe.Rating = copyRating ? ve.Rating : null;
+            copyVe.RatingTypeOid = copyRating ? ve.RatingTypeOid : null;
             copyVe.Notice = ve.Notice;
             copyVe.IsSystemEntry = ve.IsSystemEntry;
             copyVe.ParentOid = ve.ParentOid;
@@ -310,7 +311,9 @@ namespace BeWo.Core.Service
             copyVe.TypeDescription = ve.TypeDescription;
             copyVe.ValueListEntryOid = ve.ValueListEntryOid;
             copyVe.ValueListEntryVersion = ve.ValueListEntryVersion;
-            if (ve.Parent != null)
+			copyVe.CatalogOid = ve.CatalogOid;
+			copyVe.CatalogItem = ve.CatalogItem;
+			if (ve.Parent != null)
             {
                 copyVe.Parent = ve.Parent;
             }

BeWo/Core/Service/SupportConceptService.cs

@@ -17,6 +17,14 @@ namespace BeWo.Core.Service
 
             if (allGoalsAndCategories != null)
             {
+                foreach (var goal in allGoalsAndCategories)
+                {
+                    if (goal.CatalogOid.HasValue)
+                    {
+                        var catalogItem = Cache.GetInstance().GetValueListEntry(ValueListEntryType.MassnahmenKatalog, goal.CatalogOid.Value);
+                        goal.CatalogItem = catalogItem;
+                    }
+                }
                 var ziele            = allGoalsAndCategories.Where(w => w.Type.Equals(ValueListEntryType.SupportConceptGoalCategoryType) || w.Type.Equals(ValueListEntryType.SupportConceptIndividualGoalCategoryType)).OrderBy(s => s.DisplayName).ToList();
                 var massnahmen       = allGoalsAndCategories.Where(w => w.Type.Equals(ValueListEntryType.SupportConceptGoalType) || w.Type.Equals(ValueListEntryType.SupportConceptIndividualGoalType)).OrderBy(s => s.DisplayName).ToList();
                 var goalCategoryDict = new Dictionary<long, SupportConceptGoalDC>();
@@ -26,6 +34,7 @@ namespace BeWo.Core.Service
                 {
                     var treeItem = new SupportConceptGoalDC
                     {
+                        CheckRecursive = false,
                         GoalEntryDC = goalCat, 
                         IsExpanded  = allGoalsAndCategories.Count <= 30
                     };
@@ -57,16 +66,21 @@ namespace BeWo.Core.Service
 	                }
                 }
 
-				var zieleOhneKinder = goalCategoryDict.Values.Where(w => w.Children.Count == 0).ToList();
-				foreach (var ziel in zieleOhneKinder)
-				{
-					CheckIfSelected(ziel, selectedGoals);
-				}
+                //var zieleOhneKinder = goalCategoryDict.Values.Where(w => w.Children.Count == 0).ToList();
+                //foreach (var ziel in zieleOhneKinder)
+                //{
+                //	CheckIfSelected(ziel, selectedGoals);
+                //}
+                var alleZiele = goalCategoryDict.Values.ToList();
+                foreach (var ziel in alleZiele)
+                {
+                    CheckIfSelected(ziel, selectedGoals);
+                }
 
                 foreach (var goal in massnahmen)
                 {
-                    var kind = new SupportConceptGoalDC { GoalEntryDC = goal };
-
+                    var kind = new SupportConceptGoalDC { GoalEntryDC = goal, CheckRecursive = false };
+                    
 	                CheckIfSelected(kind, selectedGoals);
 
                     if (goal.ParentOid != null && goalCategoryDict.ContainsKey(goal.ParentOid.Value))
@@ -91,29 +105,38 @@ namespace BeWo.Core.Service
 					if (existingGoal.Equals(goal.GoalEntryDC))
 					{
 						goal.IsChecked = true;
-                        goal.GoalEntryDC.Rating = existingGoal.Rating;
+                        goal.GoalEntryDC.RatingTypeOid = existingGoal.RatingTypeOid;
+					    if (existingGoal.RatingTypeOid.HasValue)
+					    {
+					        var rdc = Cache.GetInstance().GetAllRatingTypeList()
+					            .FirstOrDefault(r => r.RatingTypeOid == existingGoal.RatingTypeOid);
+					        if (rdc != null)
+					        {
+					            goal.RatingName = rdc.DisplayName;
+					        }
+					    }
 					}
 				}
 
-				goal.PropertyChanged += (s, e) =>
-				{
-					var selectedGoal = s as SupportConceptGoalDC;
-					if (selectedGoal != null)
-					{
-						if (selectedGoal.IsChecked)
-						{
-						    if (!selectedGoals.Contains(selectedGoal.GoalEntryDC))
-						    {
-						        selectedGoals.Add(selectedGoal.GoalEntryDC);
-						    }
+				//goal.PropertyChanged += (s, e) =>
+				//{
+				//	var selectedGoal = s as SupportConceptGoalDC;
+				//	if (selectedGoal != null)
+				//	{
+				//		if (selectedGoal.IsChecked)
+				//		{
+				//		    if (!selectedGoals.Contains(selectedGoal.GoalEntryDC))
+				//		    {
+				//		        selectedGoals.Add(selectedGoal.GoalEntryDC);
+				//		    }
                             
-						}
-						else
-						{
-							selectedGoals.Remove(selectedGoal.GoalEntryDC);
-						}
-					}
-				};
+				//		}
+				//		else
+				//		{
+				//			selectedGoals.Remove(selectedGoal.GoalEntryDC);
+				//		}
+				//	}
+				//};
 			}
 		}
 

BeWo/Core/SupportConceptGoalTreeItem.cs

@@ -1,29 +1,81 @@
-using System.ComponentModel;
-
+using BeWo.ViewModel;
 using BS.Shared;
-
-using BeWo.ViewModel;
 using BS.Shared.DataContracts.ClientPartials;
-using BS.Shared.Extensions;
+using System.ComponentModel;
+using System.Diagnostics;
 
 namespace BeWo.Core
 {
+    [DebuggerDisplay("{GoalEntryVM.Abbreviation}: {GoalEntryVM.Description}")]
     public class SupportConceptGoalTreeItem : SupportConceptGoalDC
     {
         private ValueListEntryVM _GoalEntryVM;
         private BindingList<SupportConceptGoalTreeItem> _Children;
         private bool _ShowNotice;
 
+        public SupportConceptGoalTreeItem() { }
+
         public ValueListEntryVM GoalEntryVM
         {
             get => _GoalEntryVM;
             set => _GoalEntryVM = value;
         }
 
+        //CB Das ist doch genau falsch herum?
         public bool IsGoal => GoalEntryVM != null ?
                 GoalEntryVM.Type.Equals(ValueListEntryType.SupportConceptGoalType) || GoalEntryVM.Type.Equals(ValueListEntryType.SupportConceptIndividualGoalType) :
                 GoalEntryDC.Type.Equals(ValueListEntryType.SupportConceptGoalType) || GoalEntryDC.Type.Equals(ValueListEntryType.SupportConceptIndividualGoalType);
 
+        public bool IsZiel
+        {
+            get
+            {
+                return IsOfType(ValueListEntryType.SupportConceptGoalCategoryType);
+            }
+        }
+
+        public bool IsIndZiel
+        {
+            get
+            {
+                return IsOfType(ValueListEntryType.SupportConceptIndividualGoalCategoryType);
+            }
+        }
+
+        public bool IsMassnahme
+        {
+            get
+            {
+                return IsOfType(ValueListEntryType.SupportConceptGoalType);
+            }
+        }
+
+        public bool IsIndMassnahme
+        {
+            get
+            {
+                return IsOfType(ValueListEntryType.SupportConceptIndividualGoalType);
+            }
+        }
+
+        public bool IsOfType(ValueListEntryType t)
+        {
+
+            if (GoalEntryVM != null)
+            {
+                return GoalEntryVM.Type == t;
+            }
+            else if (GoalEntryDC != null)
+            {
+                return GoalEntryDC.Type == t;
+            }
+
+            return false;
+        }
+        //public bool IsGoal => GoalEntryVM != null ?
+        //        GoalEntryVM.Type.Equals(ValueListEntryType.SupportConceptGoalType) || GoalEntryVM.Type.Equals(ValueListEntryType.SupportConceptIndividualGoalType) :
+        //        GoalEntryDC.Type.Equals(ValueListEntryType.SupportConceptGoalType) || GoalEntryDC.Type.Equals(ValueListEntryType.SupportConceptIndividualGoalType);
+
 
 
         public bool ShowNotice
@@ -36,6 +88,8 @@ namespace BeWo.Core
             }
         }
 
+        public bool IsHidden { get; set; }
+
         public BindingList<SupportConceptGoalTreeItem> Items
         {
             get => _Children ?? (_Children = new BindingList<SupportConceptGoalTreeItem>());

BeWo/CustomDXLocalizer.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using DevExpress.Xpf.Editors;
+using DevExpress.Xpf.Grid;
 using DevExpress.Xpf.Scheduler;
 
 namespace BeWo
@@ -17,6 +18,22 @@ namespace BeWo
         }
     }
 
+    //class CustomGridLocalizer : GridControlLocalizer
+    //{
+    //    protected override void PopulateStringTable()
+    //    {
+    //        base.PopulateStringTable();
+
+    //        for (int i = 0; i < 10000; i++)
+    //        {
+    //            var enumInt = (GridControlStringId)i;
+    //            AddString(enumInt, enumInt.ToString());
+    //        }
+    //        ;
+    //    }
+    //}
+
+
     //class CustomSchedulerResXLocalizer : SchedulerControlResXLocalizer
     //{
     //    public override string GetLocalizedString(SchedulerControlStringId id)
@@ -28,7 +45,7 @@ namespace BeWo
     //    {
     //        base.PopulateStringTable();
 
-            
+
     //    }
     //}
 

BeWo/LockedPage.xaml

@@ -4,6 +4,7 @@
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+      xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup"
       mc:Ignorable="d" Width="Auto" Background="{StaticResource LoginBackground}" SnapsToDevicePixels="False" Focusable="True">
     <Page.Resources>
         <Storyboard x:Key="OnLoaded1">
@@ -49,14 +50,14 @@
                             <Label x:Name="lblGesperrt" Content="Gesperrt" Foreground="#FF000000" FontSize="12" FontWeight="Bold" Margin="0,30,0,0" HorizontalAlignment="Center" />
                             <TextBlock Text="Bitte melden Sie sich an, um den BeWoPlaner zu entsperren." TextWrapping="Wrap" Foreground="#FF000000" FontSize="12" />
                         </StackPanel>
-                        <Label Grid.Column="1" Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Right" Content="Benutzername:" Foreground="#FF000000" Background="#00000000" />
+                        <Label Grid.Column="1" Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Right" Content="{markup:Translate Benutzername:}" Foreground="#FF000000" Background="#00000000" />
                         <Label Grid.Column="1" Grid.Row="2" VerticalAlignment="Center" HorizontalAlignment="Left" Content="Passwort:" Foreground="#FF000000" Background="#00000000" />
                         <TextBox TabIndex="0" SnapsToDevicePixels="True" Grid.Column="2" Grid.Row="1" Margin="10,10,20,10" Height="24" x:Name="TextBoxUsername" HorizontalAlignment="Stretch" Text="" />
                         <PasswordBox Margin="10,0,20,0" Height="24" Grid.Column="2" Grid.Row="2" x:Name="PasswordBoxPassword" Password="" HorizontalAlignment="Stretch" TabIndex="1" />
                         <Button Margin="10,30,20,50" Height="30" x:Name="ButtonLogin" Grid.Column="2" Grid.Row="3" HorizontalAlignment="Stretch" Content="Anmelden" IsDefault="True" Foreground="White" TabIndex="2" />
-                        <Label VerticalAlignment="Bottom" HorizontalAlignment="Left" Content="Copyright 2010 | beyondSoft GmbH" Foreground="#FF818181" Margin="5,0,0,3" Grid.Row="3" Grid.ColumnSpan="3" Grid.Column="0" FontSize="10" />
+                        <Label VerticalAlignment="Bottom" HorizontalAlignment="Left" Content="Copyright 2010 | ownSoft GmbH" Foreground="#FF818181" Margin="5,0,0,3" Grid.Row="3" Grid.ColumnSpan="3" Grid.Column="0" FontSize="10" />
                         <TextBlock Grid.Row="3" Grid.Column="3" HorizontalAlignment="Right" VerticalAlignment="Bottom" FontSize="10" Margin="0,0,12,10">
-							<Hyperlink TargetName="newWindow" Foreground="#FF818181" NavigateUri="http://www.beyondsoft.de">www.beyondsoft.de</Hyperlink>
+							<Hyperlink TargetName="newWindow" Foreground="#FF818181" NavigateUri="https://www.ownsoft.de/">www.ownsoft.de</Hyperlink>
                         </TextBlock>
                     </Grid>
                 </Border>

BeWo/LockedPage.xaml.cs

@@ -10,7 +10,7 @@ namespace BeWo
             Loaded += LockedPage_Loaded;
 
             LblVersion.Content = BeWoApp.Version;
-            lblGesperrt.Content = $"Gesperrt von Benutzer {BeWoApp.LoggedOnUser.Employee.FirstName} {BeWoApp.LoggedOnUser.Employee.LastName}";
+            lblGesperrt.Content = $"Gesperrt von " + BS.Shared.Translation.Translator.Translate("BenutzerSingular") + " " + BeWoApp.LoggedOnUser.Employee.FirstName + " " + BeWoApp.LoggedOnUser.Employee.LastName;
         }
 
         private void LockedPage_Loaded(object sender, RoutedEventArgs e)

BeWo/LoginControl.xaml

@@ -3,6 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup"
              mc:Ignorable="d"
              Width="Auto" Background="{StaticResource LoginBackground}"
              d:DesignHeight="600" d:DesignWidth="800">
@@ -17,7 +18,7 @@
                         <TranslateTransform X="0" Y="0" />
                     </TransformGroup>
                 </Grid.RenderTransform>
-                <Border CornerRadius="7,7,7,7" BorderThickness="2,2,2,2" Padding="5,5,5,5" BorderBrush="#FF606060" Background="{DynamicResource LoginBackgroundColor}">
+                <Border CornerRadius="7,7,7,7" BorderThickness="2,2,2,2" Padding="5,5,5,5" BorderBrush="#FF606060" Background="{DynamicResource LoginBackgroundColor}" KeyDown="UIElement_OnKeyDown">
                     <Grid Opacity="1">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="100" />
@@ -35,20 +36,20 @@
                             <RowDefinition Height="Auto" />
 							<RowDefinition Height="Auto" />
                         </Grid.RowDefinitions>
-                        
-                        <Image Grid.Row="0" Grid.ColumnSpan="4" HorizontalAlignment="Left" VerticalAlignment="Top" Source="Ressources\Icons\bewoplaner_logo_big.png"  Height="45" Margin="7,7,0,0"/>
+
+                        <Image Grid.Row="0" Grid.ColumnSpan="4" HorizontalAlignment="Left" VerticalAlignment="Top" Source="Ressources\Icons\bewoplaner_logo_small.png" Height="44" Margin="7,7,0,0"/>
                         <Label VerticalAlignment="Top" HorizontalAlignment="Right" Content="Version x.x.x" Foreground="#FF818181" Margin="5,7,3,0" Grid.Row="0" Grid.ColumnSpan="4"
                                Grid.Column="0" FontSize="10" x:Name="lblVersion" />
                         <StackPanel Grid.Column="1" Grid.Row="0" Grid.ColumnSpan="2" Margin="0,80,0,0">
                             <Label Content="Herzlich willkommen beim BeWoPlaner!" Foreground="#FF000000" FontSize="12" FontWeight="Bold" Margin="0,30,0,0" />
-                            <Label Content="Bitte geben Sie Ihren Benutzernamen und Ihr Passwort ein." Foreground="#FF000000" FontSize="12" />
+                            <Label Content="{markup:Translate Bitte geben Sie Ihren Benutzernamen und Ihr Passwort ein.}" Foreground="#FF000000" FontSize="12" />
                         </StackPanel>
 
 
-                        <Label Content="PIN:" Grid.Column="1" Grid.Row="1" Foreground="#FF000000" Background="#00000000" VerticalAlignment="Center" Visibility="{Binding Path=IsTechSupport, Converter={StaticResource BoolVisibilityConverter}}"/>
-                        <TextBox x:Name="PINTextBox" Grid.Column="2" Grid.Row="1" Margin="10,0,20,0" Height="24" SnapsToDevicePixels="True" HorizontalAlignment="Stretch" Visibility="{Binding Path=IsTechSupport, Converter={StaticResource BoolVisibilityConverter}}"/>
+                        <Label x:Name="lblPin" Content="PIN:" Grid.Column="1" Grid.Row="1" Foreground="#FF000000" Background="#00000000" VerticalAlignment="Center" Visibility="Collapsed"/>
+                        <TextBox x:Name="PINTextBox" Grid.Column="2" Grid.Row="1" Margin="10,0,20,0" Height="24" SnapsToDevicePixels="True" HorizontalAlignment="Stretch" Visibility="Collapsed"/>
 
-                        <Label Grid.Column="1" Grid.Row="2" VerticalAlignment="Center" HorizontalAlignment="Right" Content="Benutzername:" Foreground="#FF000000" Background="#00000000" />
+                        <Label Grid.Column="1" Grid.Row="2" VerticalAlignment="Center" HorizontalAlignment="Right" Content="{markup:Translate Benutzername:}" Foreground="#FF000000" Background="#00000000" />
                         <Label Grid.Column="1" Grid.Row="3" VerticalAlignment="Center" HorizontalAlignment="Left" Content="Passwort:" Foreground="#FF000000" Background="#00000000" />
 
                         <TextBox TabIndex="0" SnapsToDevicePixels="True" Grid.Column="2" Grid.Row="2" Margin="10,10,20,10" Height="24" x:Name="TextBox_Username" HorizontalAlignment="Stretch" Text="" GotFocus="TextBox_Username_OnGotFocus" />
@@ -163,10 +164,10 @@
 								</Hyperlink>
 							</TextBlock>
 						</StackPanel>
-                        <TextBlock x:Name="txtCopyright" Grid.Row="7" Grid.Column="0" Grid.ColumnSpan="3" HorizontalAlignment="Left" VerticalAlignment="Bottom" FontSize="10" Margin="10,5,0,5" Text="Copyright 2017 | beyondSoft GmbH"  Foreground="#FF818181"/>
+                        <TextBlock x:Name="txtCopyright" Grid.Row="7" Grid.Column="0" Grid.ColumnSpan="3" HorizontalAlignment="Left" VerticalAlignment="Bottom" FontSize="10" Margin="10,5,0,5" Text="Copyright 2022 | ownSoft GmbH"  Foreground="#FF818181"/>
                             
                         <TextBlock Grid.Row="7" Grid.Column="3" HorizontalAlignment="Right" VerticalAlignment="Bottom" FontSize="10" Margin="0,5,12,5">
-                            <Hyperlink x:Name="hyperlink" TargetName="newWindow" Foreground="#FF818181" NavigateUri="http://www.beyondsoft.de" RequestNavigate="Hyperlink_OnRequestNavigate">www.beyondsoft.de</Hyperlink>
+                            <Hyperlink x:Name="hyperlink" TargetName="newWindow" Foreground="#FF818181" NavigateUri="https://www.ownsoft.de" RequestNavigate="Hyperlink_OnRequestNavigate">www.ownsoft.de</Hyperlink>
                         </TextBlock>
                     </Grid>
                 </Border>

BeWo/LoginControl.xaml.cs

@@ -25,9 +25,11 @@ using BS.Shared;
 using BS.Shared.Extensions;
 
 using BeWo.Core;
+using BeWo.Security;
 using BeWo.ServiceProxy;
 using BeWo.View;
 using BeWo.View.Detail;
+using BS.Shared.Translation;
 using Path = System.IO.Path;
 
 namespace BeWo
@@ -39,18 +41,11 @@ namespace BeWo
     {
         private readonly Stack<Control> _ModalPopUpControls = new Stack<Control>();
 
-        private String GETSERVER_URL = "https://support.bewoplaner.de/api/getserver.php?k={0}&t=1";
+        private String GETSERVER_URL = "https://support.bewoplaner.de/api/getserver.php?k={0}&t=0";
 
-        private String GETSTATUSMESSAGE_URL = "https://support.bewoplaner.de/api/getstate.php?k={0}&t=1";
+        private String GETSTATUSMESSAGE_URL = "https://support.bewoplaner.de/api/getstate.php?k={0}&t=0&v={1}";
 
-        private String GETNETMESSAGE_URL = "https://support.bewoplaner.de/api/getxmlstate.php?k={0}&t=1";
-
-        private bool _IsTechSupport;
-        public bool IsTechSupport
-        {
-            get { return _IsTechSupport; }
-            set { _IsTechSupport = value; OnPropertyChanged("IsTechSupport"); }
-        }
+        private String GETNETMESSAGE_URL = "https://support.bewoplaner.de/api/getxmlstate.php?k={0}&t=0";
 
         private Control _CurrentModalPopUp;
 
@@ -83,7 +78,7 @@ namespace BeWo
             if (DateTime.Now > dt)
                 dt = DateTime.Now;
             
-            txtCopyright.Text = String.Format("Copyright {0:yyyy} | beyondSoft GmbH", dt);
+            txtCopyright.Text = String.Format("Copyright {0:yyyy} | ownSoft GmbH", dt);
             
             var checkPath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\profiles.txt";
 			if (File.Exists(checkPath))
@@ -181,65 +176,10 @@ namespace BeWo
             {
                 
             }
-
-			
-			if (ProfileList.Count == 0 || String.IsNullOrEmpty(ProfileList[0].Tenant))
-			{
-				//LH Würzburg Hack:
-				if (ApplicationDeployment.IsNetworkDeployed)
-				{
-					Uri uri = ApplicationDeployment.CurrentDeployment.ActivationUri;
-					if (uri == null)
-					{
-						uri = ApplicationDeployment.CurrentDeployment.UpdateLocation;
-					}
-					if (uri != null)
-					{
-						if (uri.Host.IndexOf("10.0.116.4") >= 0 || uri.Host.IndexOf("lebenshilfe-wuerzburg") >= 0)
-						{
-							BeWoProfile bp = new BeWoProfile("Lebenshilfe Würzburg", "10.0.116.4", "1");
-							ProfileList.Add(bp);
-							SaveProfileListToFile();
-						}
-						else if (uri.Host.IndexOf("fortis") >= 0)
-						{
-                            BeWoProfile bp = new BeWoProfile("Fortis", "fortis-bewoplaner.fortis-ev.org.local", "4526293996");
-                            ProfileList.Add(bp);
-							SaveProfileListToFile();
-						}
-					}
-				}
-
-			}
-
             
-            // IP-Adresse holen
-            try
-	        {
-				var adminUrl = GetAdminUrl();
-				if (!String.IsNullOrEmpty(adminUrl))
-				{
-				    using (var wc = new WebClient())
-				    {
-				        Uri path = new Uri(adminUrl);
-
-				        BeWoApp.IpAddress = Encoding.UTF8.GetString(wc.DownloadData(path));
-				    }
-				}
-	        }
-	        catch (Exception e)
-	        {
-
-				BeWoApp.IpAddress = String.Empty;
-	        }
 			
 	        //string ipaddress = "";
 
-#if DEBUG
-            IsTechSupport = true;
-#else
-			IsTechSupport = !String.IsNullOrEmpty(BeWoApp.IpAddress) && BeWoApp.IpAddress.Equals("87.79.89.65");
-#endif
 			// --------------
 
             if (ProfileList.Count == 0 || String.IsNullOrEmpty(ProfileList[0].Tenant))
@@ -272,32 +212,28 @@ namespace BeWo
             //if (profileSelectionComboBox.SelectedItem == null)
                 profileSelectionComboBox.SelectedItem = selectedProfile;
 
-			if (selectedProfile != null && selectedProfile.Tenant == "demo")
+            TextBox_Username.Focus();
+
+            if (selectedProfile != null && selectedProfile.Tenant == "demo")
             {
                 TextBox_Username.Text = "demo";
                 PasswordBox_Password.Password = "demo";
-                button_login.Focus();
+                
             }
-            else
-            {
-                TextBox_Username.Focus();
-            }
-
+            
             //this.lblTenant.Content = BeWoApp.Tenant;
             lblVersion.Content = BeWoApp.Version;
 
             Loaded += LoginControl_Loaded;
 
-            if (!IsTechSupport) 
-                return;
-
-            linkLine.Margin = new Thickness(linkLine.Margin.Left, linkLine.Margin.Top + 25, linkLine.Margin.Right, linkLine.Margin.Bottom);
-            gridLogin.Height += 25;
-
-
             ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12;
 
             PinCertificate();
+
+
+            //linkLine.Margin = new Thickness(linkLine.Margin.Left, linkLine.Margin.Top + 25, linkLine.Margin.Right, linkLine.Margin.Bottom);
+            //gridLogin.Height += 25;
+            
         }
         
 
@@ -306,30 +242,31 @@ namespace BeWo
             ServicePointManager.ServerCertificateValidationCallback = PinPublicKey;
         }
 
-        private static String PUB_KEY = "3082010A02820101009CD30CF05AE52E47B7725D3783B3686330EAD735261925E1BDBE35F170922FB7B84B4105ABA99E350858ECB12AC468870BA3E375E4E6F3A76271BA7981601FD7919A9FF3D0786771C8690E9591CFFEE699E9603C48CC7ECA4D7712249D471B5AEBB9EC1E37001C9CAC7BA705EACE4AEBBD41E53698B9CBFD6D3C9668DF232A42900C867467C87FA59AB8526114133F65E98287CBDBFA0E56F68689F3853F9786AFB0DC1AEF6B0D95167DC42BA065B299043675806BAC4AF31B9049782FA2964F2A20252904C674C0D031CD8F31389516BAA833B843F1B11FC3307FA27931133D2D36F8E3FCF2336AB93931C5AFC48D0D1D641633AAFA8429B6D40BC0D87DC3930203010001";
+        private static String PUB_KEY_X3 = "3082010A02820101009CD30CF05AE52E47B7725D3783B3686330EAD735261925E1BDBE35F170922FB7B84B4105ABA99E350858ECB12AC468870BA3E375E4E6F3A76271BA7981601FD7919A9FF3D0786771C8690E9591CFFEE699E9603C48CC7ECA4D7712249D471B5AEBB9EC1E37001C9CAC7BA705EACE4AEBBD41E53698B9CBFD6D3C9668DF232A42900C867467C87FA59AB8526114133F65E98287CBDBFA0E56F68689F3853F9786AFB0DC1AEF6B0D95167DC42BA065B299043675806BAC4AF31B9049782FA2964F2A20252904C674C0D031CD8F31389516BAA833B843F1B11FC3307FA27931133D2D36F8E3FCF2336AB93931C5AFC48D0D1D641633AAFA8429B6D40BC0D87DC3930203010001";
 
+        private static String PUB_KEY_R3 = "3082010A0282010100BB021528CCF6A094D30F12EC8D5592C3F882F199A67A4288A75D26AAB52BB9C54CB1AF8E6BF975C8A3D70F4794145535578C9EA8A23919F5823C42A94E6EF53BC32EDB8DC0B05CF35938E7EDCF69F05A0B1BBEC094242587FA3771B313E71CACE19BEFDBE43B45524596A9C153CE34C852EEB5AEED8FDE6070E2A554ABB66D0E97A540346B2BD3BC66EB66347CFA6B8B8F572999F830175DBA726FFB81C5ADD286583D17C7E709BBF12BF786DCC1DA715DD446E3CCAD25C188BC60677566B3F118F7A25CE653FF3A88B647A5FF1318EA9809773F9D53F9CF01E5F5A6701714AF63A4FF99B3939DDC53A706FE48851DA169AE2575BB13CC5203F5ED51A18BDB150203010001";
 
+        private static String PUB_KEY_E1 = "04245C2DA22AFD1C4BA65D97732731ACB2A06962EF65E8A6B0F0AC4B9FFF1C0B700FD3982F4DFC0F009B37F074055732972E05EF2A4325A3FB6E342713F64F7E69D302995EEB244792C1249BE6B1218FC12481FC68CC1F69BA58F51922F774C616";
 
 
         private bool PinPublicKey(object sender, X509Certificate certificate, X509Chain chain, SslPolicyErrors sslpolicyerrors)
         {
             try
             {
-                if (null == certificate || chain == null)
+                if (certificate == null || chain == null)
                     return false;
-                ;
+                
                 bool chainContainsPk = false;
-
+                
                 foreach (var element in chain.ChainElements)
                 {
                     String pk = element.Certificate.GetPublicKeyString();
-                    if (pk == PUB_KEY)
+                    if (pk == PUB_KEY_X3 || pk == PUB_KEY_R3 || pk == PUB_KEY_E1)
                     {
                         chainContainsPk = true;
                     }
                 }
 
-                //bool subjectAccepted = Regex.IsMatch(certificate.Subject, @"app[\d]*.bewoplaner.de");
                 bool subjectAccepted = certificate.Subject.Trim().ToLower().EndsWith(".bewoplaner.de") ||
                                        certificate.Subject.Trim().ToLower().EndsWith(".ownchat.de");
                 return chainContainsPk && subjectAccepted;
@@ -347,11 +284,45 @@ namespace BeWo
             return Type.GetType("System.Reflection.ReflectionContext", false) != null;
         }
 
-        private bool CheckStatusMessage(BeWoProfile profile, String url)
+        private bool CheckStatusMessage(String url)
         {
 #if DEBUG
+
+            //String message = @"Sehr geehrte Kundin, sehr geehrter Kunde,
+
+            //    Ihr BeWoPlaner Nutzungszeitraum endet automatisch am 31.01.2020.
+            //    Bitte wenden Sie sich an den BeWoPlaner - Support, sofern Sie den Nutzungszeitraum verlängern möchten.
+
+            //    Vielen Dank.
+            //    Ihr BeWoPlaner-Team;1";
+            //if (!String.IsNullOrWhiteSpace(message) && message.Trim().Length > 2)
+            //{
+            //    String ende = message.Substring(message.Length - 2);
+
+            //    message = message.Replace("\\n", "\n");
+            //    message = message.Substring(0, message.Length - 2);
+            //    MessageDialog dlg = new MessageDialog();
+
+            //    if (message.Contains("<") && message.Contains(">"))
+            //    {
+            //        dlg.SetXaml(message);
+            //    }
+            //    else
+            //    {
+            //        dlg.Message = message;
+            //    }
+
+            //    dlg.Visibility = Visibility.Visible;
+
+            //    dlg.ShowDialog();
+            //    if (ende.EndsWith(";0"))
+            //    {
+            //        return false;
+            //    }
+
+            //}
             return true;
-#endif
+#else
             try
             {
                 using (WebClient client = new WebClient())
@@ -404,6 +375,7 @@ namespace BeWo
             }
 
             return true;
+#endif
         }
 
         private BeWoProfile ReadSelectedProfile()
@@ -460,9 +432,9 @@ namespace BeWo
 
 		            while (!myFile.EndOfStream)
 		            {
-		                var data = myFile.ReadLine().Split('|');
+		                var data = myFile.ReadLine()?.Split('|');
 
-		                if (data.Length >= 3)
+		                if (data?.Length >= 3)
 		                {
 		                    if (!String.IsNullOrEmpty(data[1]) && !String.IsNullOrEmpty(data[2]))
 		                        ProfileList.Add(new BeWoProfile(data[0], data[1], data[2]));
@@ -474,7 +446,6 @@ namespace BeWo
 		    catch (Exception e)
 		    {
 		    }
-			
 		}
 
 		private string GetNumericServerName(string serverName)
@@ -533,31 +504,6 @@ namespace BeWo
             }
         }
 
-        private string GetServerFromTenantAlt(string tenant)
-        {
-	        try
-	        {
-		        using (WebClient client = new WebClient())
-		        {
-			        //MessageBox.Show(hostAddress);
-			        byte[] response = client.UploadValues(GetAdminUrl(), "POST", new NameValueCollection()
-			        {
-				        {"k", tenant},
-				        {"p", "6ca793d9e460"}
-			        });
-
-			        String server = System.Text.Encoding.ASCII.GetString(response);
-
-			        return server;
-		        }
-	        }
-	        catch (Exception ex)
-	        {
-		        MessageBox.Show(String.Format("Fehler beim Prüfen der Kundennummer: {0}\n\n{1}", ex.Message, ex.StackTrace));
-	        }
-
-	        return null;
-        }
 
 		private string GetServerFromTenant(string tenant)
 		{
@@ -596,33 +542,6 @@ namespace BeWo
 			return null;
 		}
 
-	    private string GetAdminUrl()
-	    {
-		    String address = String.Empty;
-
-#if DEBUG
-		    if (true)
-		    {
-			    address = "http://localhost/Host";
-
-			    //Uri uri = new Uri("http://app.beyondsoft.de/bewo.application");
-			    //hostAddress = String.Format("{0}://{1}", uri.Scheme, uri.Host);
-#else
-            if (ApplicationDeployment.IsNetworkDeployed && ApplicationDeployment.CurrentDeployment.UpdateLocation != null)
-            {
-	            Uri uri = ApplicationDeployment.CurrentDeployment.UpdateLocation;
-	            address = String.Format("{0}://{1}", uri.Scheme, uri.Host);
-#endif
-
-		    }
-		    if (String.IsNullOrEmpty(address))
-		    {
-			    return null;
-		    }
-
-		    return String.Format("{0}/{1}", address, "Admin.aspx");
-	    }
-
 		
         private BeWoProfile GenerateProfileFromUri(Uri uri)
         {
@@ -771,26 +690,25 @@ namespace BeWo
 
 			    if (!isNet45OrNewer)
 			    {
-			        if (!CheckStatusMessage(profile, String.Format(GETNETMESSAGE_URL, profile.Tenant)))
+			        if (!CheckStatusMessage(String.Format(GETNETMESSAGE_URL, profile.Tenant, BeWoApp.Version)))
 			        {
 			            return;
 			        }
 			    }
 
 #if DEBUG
-                //if (!CheckStatusMessage(profile, String.Format(GETNETMESSAGE_URL, profile.Tenant)))
-                //{
-                //    return;
-                //}
-#else
-                if (!CheckStatusMessage(profile, String.Format(GETSTATUSMESSAGE_URL, profile.Tenant)))
+                if (!CheckStatusMessage(String.Format(GETSTATUSMESSAGE_URL, profile.Tenant, BeWoApp.ShortVersion)))
                 {
                     return;
-                }   
+                }
+#else
+                if (!CheckStatusMessage(String.Format(GETSTATUSMESSAGE_URL + "&pre", profile.Tenant, BeWoApp.ShortVersion)))
+                {
+                    return;
+                }
 #endif
 
 
-
                 ChangeServerAndTenant(profile);
 				var lWaitLayer = new WaitLayer2();
 				grid_root.Children.Add(lWaitLayer);
@@ -815,7 +733,7 @@ namespace BeWo
             try
             {
                 //1. Versuch
-                UserValidationResult result = TryLogin(lWaitLayer, lUserName, lPassword, lPIN );
+                UserValidationResult result = TryLogin(lWaitLayer, lUserName, lPassword, lTenant, lPIN );
 
                 //2. Versuch
                 if (result == UserValidationResult.UnkownError)
@@ -823,7 +741,7 @@ namespace BeWo
                     ServiceFacade.DoOperationsServiceAsync(op => op.ResetTenant(lTenant),
                                     delegate
                                     {
-                                        result = TryLogin(lWaitLayer ,lUserName, lPassword, lPIN);
+                                        result = TryLogin(lWaitLayer ,lUserName, lPassword, lTenant, lPIN);
 
                                         if (result == UserValidationResult.UnkownError)
                                         {
@@ -831,7 +749,7 @@ namespace BeWo
                                             ServiceFacade.DoOperationsServiceAsync(op => op.ResetAllTenants(),
                                                     delegate
                                                     {
-                                                        result = TryLogin(lWaitLayer,lUserName, lPassword, lPIN);
+                                                        result = TryLogin(lWaitLayer,lUserName, lPassword, lTenant, lPIN);
 
                                                         if (result == UserValidationResult.UnkownError)
                                                         {
@@ -851,7 +769,15 @@ namespace BeWo
                     this.Dispatch(delegate
                     {
                         grid_root.Children.Remove(lWaitLayer);
-                        MessageBox.Show("Anmeldeinformationen nicht bekannt. Bitte überprüfen Sie den Benutzernamen und das Passwort!", "Fehler bei der Anmeldung", MessageBoxButton.OK, MessageBoxImage.Exclamation);
+                        MessageBox.Show("Anmeldeinformationen nicht bekannt. Bitte überprüfen Sie den " + BS.Shared.Translation.Translator.Translate("Benutzernamen") + "  und das Passwort!", "Fehler bei der Anmeldung", MessageBoxButton.OK, MessageBoxImage.Exclamation);
+                    });
+                }
+                if (result == UserValidationResult.EmployeeDeleted)
+                {
+                    this.Dispatch(delegate
+                    {
+                        grid_root.Children.Remove(lWaitLayer);
+                        MessageBox.Show("Der zugeordnete " + Translator.Translate("Mitarbeiterdatensatz") + " wurde gelöscht oder archiviert! Anmeldung nicht möglich.", "Fehler bei der Anmeldung", MessageBoxButton.OK, MessageBoxImage.Exclamation);
                     });
                 }
                 if (result == UserValidationResult.TenantUnknown)
@@ -916,7 +842,7 @@ namespace BeWo
             }
         }
 
-        private UserValidationResult TryLogin(WaitLayer2 lWaitLayer, string lUserName, string lPassword, string lPIN = "")
+        private UserValidationResult TryLogin(WaitLayer2 lWaitLayer, string lUserName, string lPassword, string tenant, string lPin)
         {
             UserValidationResult? result = null;
 	        
@@ -953,7 +879,7 @@ namespace BeWo
                     {
                         try
                         {
-							return s.IsUserValid(tempUsername, lPassword, lPIN);
+							return s.IsUserValid(tempUsername, lPassword, lPin);
                         }
                         catch (Exception)
                         {
@@ -963,7 +889,13 @@ namespace BeWo
                     r =>
                     {
                         result = r;
-                        LoginResult(lWaitLayer,r, lUserName, lPassword, lPIN );
+
+                        this.Dispatch(delegate
+                        {
+                            LoginResult(lWaitLayer, r, lUserName, lPassword, tenant, lPin);
+                        });
+
+                        
                     }, true);
                 }
                 catch (FaultException<BeWoFault>)
@@ -985,26 +917,45 @@ namespace BeWo
             return result.Value;
         }
 
-        private void LoginResult( WaitLayer2 lWaitLayer, UserValidationResult result, String lUserName, String lPassword, String lPIN = "")
+        private void LoginResult( WaitLayer2 lWaitLayer, UserValidationResult result, String lUserName, String lPassword, String tenant, String lPIN)
         {
-            if (result == UserValidationResult.UserValid)
+            
+            if (result == UserValidationResult.UserValid || result == UserValidationResult.UserValidTwoFactorAuthenticationNeeded)
             {
-				//this.Dispatch(delegate
-				//{
-				//    if (BeWoApp.Tenant == "demo")
-				//    {
-				//        var dlg = new ConfirmDemoDialog();
-				//        dlg.Topmost = true;
-				//        dlg.Show();
-				//    }
-				//});
-				
+                if (result == UserValidationResult.UserValidTwoFactorAuthenticationNeeded)
+                {
+                    grid_root.Children.Remove(lWaitLayer);
+                    var dlg = new TwoFactorAuthMessageDialog(lUserName, lPassword);
+                    var message = Translator.Translate("Zwei Faktor Authentifizierung erforderlich");
+                    if (message.Contains("<") && message.Contains(">"))
+                    {
+                        dlg.SetXaml(message);
+                    }
+                    else
+                    {
+                        dlg.Message = message;
+                    }
+
+
+                    var dr = dlg.ShowDialog();
+
+                    if (!dr.HasValue || !dr.Value)
+                    {
+                        return;
+                    }
+                }
+                if (!CheckStatusMessage(String.Format(GETSTATUSMESSAGE_URL, tenant, BeWoApp.ShortVersion)))
+                {
+                    grid_root.Children.Remove(lWaitLayer);
+                    return;
+                }
+
                 BeWoApp.UserName = lUserName;
                 BeWoApp.UserPassword = lPassword;
                              
                 BeWoApp.PasswortStrength = BeWoUtils.CheckPasswordSecurity(lPassword);
 
-                ServiceFacade.DoUserServiceAsync(s2 => s2.LoadUserByLoginName(lUserName),
+                ServiceFacade.DoUserServiceAsync(s2 => s2.LoadUserByNameAndPassword(lUserName, lPassword),
                     r2 =>
                     {
                         BeWoApp.LoggedOnUser = r2;
@@ -1020,12 +971,12 @@ namespace BeWo
                             });
                     }, true);
             }
-            else if (result == UserValidationResult.PasswordExpired)
+            else if (result == UserValidationResult.PasswordExpired || result == UserValidationResult.BeWoPasswordNotAllowed)
             {
                 BeWoApp.UserName = lUserName;
                 BeWoApp.UserPassword = lPassword;
 
-                ServiceFacade.DoUserServiceAsync(s2 => s2.LoadUserByLoginName(lUserName),
+                ServiceFacade.DoUserServiceAsync(s2 => s2.LoadUserByNameAndPassword(lUserName, lPassword),
                     r2 =>
                     {
                         BeWoApp.LoggedOnUser = r2;
@@ -1036,8 +987,13 @@ namespace BeWo
                                 BeWoApp.Mandator = m;
                                 this.Dispatch(delegate
                                 {
+                                    String msg = Translator.Translate("Das Passwort ist abgelaufen!");
+                                    if (result == UserValidationResult.BeWoPasswordNotAllowed)
+                                    {
+                                        msg = Translator.Translate("Das Passwort ist leider unsicher und muss zwingend geändert werden!");
+                                    }
                                     grid_root.Children.Remove(lWaitLayer);
-                                    MessageBox.Show("Das Passwort ist abgelaufen!", "Fehler bei der Anmeldung", MessageBoxButton.OK, MessageBoxImage.Exclamation);
+                                    MessageBox.Show(msg, "Fehler bei der Anmeldung", MessageBoxButton.OK, MessageBoxImage.Exclamation);
                                         
                                     var pav = new PasswortAenderungsView();
                                     pav.ShowDialog();
@@ -1122,6 +1078,7 @@ namespace BeWo
 			ReadProxyName();
 	    }
 
+        // TODO: Verschlüsselung einbauen!
         private void ReadProxyName()
         {
             int counter = 0;
@@ -1136,17 +1093,24 @@ namespace BeWo
 					filePath = Path.Combine(BeWoApp.GetAndCreateUserAppDataPath(), "proxy.dat");
 				}
 
-                var file = new System.IO.StreamReader(filePath);
-                while ((line = file.ReadLine()) != null)
-                {
-                    byte[] decbuff = Convert.FromBase64String(line);
-                    var x = System.Text.Encoding.UTF8.GetString(decbuff);
+                var allLines = File.ReadAllLines(filePath);
 
-                    datai[counter] = x;
+                foreach(var linex in allLines)
+                {
+                    var decryptedLine = EncryptionUtils.DecryptString(linex);
+                    datai[counter] = decryptedLine;
                     counter++;
                 }
 
-                file.Close();
+
+                //var file = new StreamReader(filePath);
+                //while ((line = file.ReadLine()) != null)
+                //{
+                //    datai[counter] = Encoding.UTF8.GetString(Convert.FromBase64String(line));
+                //    counter++;
+                //}
+
+                //file.Close();
                 
                 proxyname = datai[0];
                 proxyUsername = datai[1];
@@ -1160,6 +1124,7 @@ namespace BeWo
             
         }
 
+        
         private void SaveSelectedProfile(BeWoProfile profile)
         {
             try
@@ -1183,7 +1148,6 @@ namespace BeWo
             }
         }
 
-
         private void SaveProfileListToFile()
         {
             try
@@ -1388,6 +1352,33 @@ namespace BeWo
 
 		    pwvViewOffen = true;
 	    }
+
+        private void UIElement_OnKeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.Key == Key.P)
+            {
+                if (Keyboard.IsKeyDown(Key.LeftCtrl) || Keyboard.IsKeyDown(Key.RightCtrl) && Keyboard.IsKeyDown(Key.LeftAlt))
+                {
+                    PinEinblenden();
+                }
+                
+            }
+        }
+
+        private void PinEinblenden()
+        {
+            if (PINTextBox.Visibility != Visibility.Visible)
+            {
+                PINTextBox.Visibility = Visibility.Visible;
+                lblPin.Visibility = Visibility.Visible;
+
+                linkLine.Margin = new Thickness(linkLine.Margin.Left, linkLine.Margin.Top + 25, linkLine.Margin.Right,
+                    linkLine.Margin.Bottom);
+                gridLogin.Height += 25;
+
+                PINTextBox.Focus();
+            }
+        }
     }
 
     public class BeWoProfile

BeWo/MainControl.xaml

@@ -51,9 +51,9 @@
         </Grid.RowDefinitions>
         <!--<Frame x:Name="chatFrame" Grid.Column="2" Grid.Row="0" />-->
         <TextBlock HorizontalAlignment="Center" Width="Auto" Margin="5,2,0,0">
-            <Hyperlink NavigateUri="http://www.bewoplaner.de" TargetName="newWindow" Foreground="Transparent" RequestNavigate="Hyperlink_OnRequestNavigate">
+            <Hyperlink NavigateUri="https://www.bewoplaner.de" TargetName="newWindow" Foreground="Transparent" RequestNavigate="Hyperlink_OnRequestNavigate">
                 <InlineUIContainer>
-                    <Image HorizontalAlignment="Left" Source="Ressources\Icons\bewoplaner_logo_small.png"
+                    <Image HorizontalAlignment="Left" Source="Ressources\Icons\bewoplaner_logo_small.png" Width="130"
                             Style="{StaticResource toolbarImageStyle}" RenderTransformOrigin="0.5,0.5" x:Name="image">
                         <Image.RenderTransform>
                             <TransformGroup>
@@ -148,7 +148,7 @@
                     </Canvas>
                 </Viewbox>
             </Border>
-			<Grid x:Name="toolbarContent" RenderTransformOrigin="0.5,0.5" MouseEnter="UIElement_OnMouseEnter" Loaded="ToolbarContent_OnLoaded">
+			<Grid x:Name="toolbarContent" RenderTransformOrigin="0.5,0.5" Loaded="ToolbarContent_OnLoaded">
                 <Grid.RenderTransform>
                     <TransformGroup>
                         <ScaleTransform ScaleX="1" ScaleY="1" />
@@ -246,7 +246,7 @@
                             </Button.RenderTransform>
                           </localView:ImageButton>
 
-                          <localView:ImageButton r:DemandUserRight.VisibleDemands="ViewAll, AccountingTransactionView_View"
+                            <localView:ImageButton r:DemandUserRight.VisibleDemands="ViewAll, AccountingTransactionView_View, BargeldverwaltungFinanzenAnsehen, DokumenteFinanzen"
                                     ImageSource="Ressources\Icons\CoinsDisabled.png" x:Name="button_AccountingTransacation"
                                     Click="button_AccountingTransacation_Click" Style="{StaticResource NavBarButton}"
                                     Content="{t:Translate FinanzenMenuItem}" Background="{StaticResource AccountingContentBrush}"
@@ -448,6 +448,20 @@
                                     </TransformGroup>
                                 </Button.RenderTransform>
                             </localView:ImageButton>
+                            <localView:ImageButton r:DemandUserRight.VisibleDemands="ViewAll, TeamView_ViewAll, TeamView_ViewMyTeams"
+                                    x:Name="button_Dokumente" Click="button_Dokumente_Click" Style="{StaticResource NavBarButton}"
+                                    Content="{t:Translate DokumenteMenuItem}" Background="{StaticResource DokumenteContentBrush}"
+                                    RenderTransformOrigin="0.5,0.5"
+                                    ImageSource="Ressources\Icons\Folder.png" Width="90">
+                                <Button.RenderTransform>
+                                    <TransformGroup>
+                                        <ScaleTransform ScaleX="1" ScaleY="1" />
+                                        <SkewTransform AngleX="0" AngleY="0" />
+                                        <RotateTransform Angle="0" />
+                                        <TranslateTransform X="0" Y="0" />
+                                    </TransformGroup>
+                                </Button.RenderTransform>
+                            </localView:ImageButton>
                             <localView:ImageButton r:DemandUserRight.VisibleDemands="ViewAll, UserView_View"
                                     x:Name="button_User" Click="button_User_Click" Style="{StaticResource NavBarButton}"
                                     Content="{t:Translate BenutzerMenuItem}" Background="{StaticResource UserContentBrush}"

BeWo/MainControl.xaml.cs

@@ -21,6 +21,7 @@ using BeWo.SchulbegleitenderDienst;
 using BeWo.ServiceProxy;
 using BeWo.View;
 using BeWo.View.Detail;
+using BeWo.View.Detail.Zeiterfassung;
 using BeWo.View.Master;
 using BeWo.View.Navigation;
 using BeWo.ViewModel;
@@ -28,8 +29,7 @@ using BeWo.ViewModel;
 using BS.Shared;
 using BS.Shared.DataContracts;
 using BS.Shared.Extensions;
-using DevExpress.Xpf.Editors;
-using DevExpress.Xpf.Scheduler;
+using BS.Shared.Translation;
 using Hyperlink = System.Windows.Documents.Hyperlink;
 
 namespace BeWo
@@ -42,6 +42,7 @@ namespace BeWo
 		Employee,
 		Organisation,
 		Team,
+		Dokumente,
 		User,
 		UserGroup,
 		Report,
@@ -49,7 +50,7 @@ namespace BeWo
         Wohnheim,
         Vertretungen,
         CustomerTeam
-    }
+	}
 
 	public partial class MainControl
 	{
@@ -76,8 +77,10 @@ namespace BeWo
 			KeyDown += MainControl_KeyDown;
 			NavigateToHomeView();
 
-			EditorLocalizer.Active = new CustomDXEditorLocalizer();
-			SchedulerControlLocalizer.Active = new CustomSchedulerLocalizer();
+			//EditorLocalizer.Active = new CustomDXEditorLocalizer();
+			//SchedulerControlLocalizer.Active = new CustomSchedulerLocalizer();
+		    //GridControlLocalizer.Active = new CustomGridLocalizer();
+            
 
 			OpenedModalViewWindows = new List<ModalViewWindow>();
 
@@ -88,7 +91,9 @@ namespace BeWo
 
 		    BeWoApp.InitAutoUILocking();
 
-		    BeWoApp.InitBlubb();
+			AufOffeneTerminePruefen();
+
+		    //BeWoApp.InitBlubb();
 
 #if !DEBUG
             if (this.button_Scheduler.Visibility == Visibility.Visible && !BeWoApp.AppSettings.IsSchedulerAllowed)
@@ -108,8 +113,13 @@ namespace BeWo
 		    {
 		        this.button_SchulbegleitenderDienst.Visibility = Visibility.Collapsed;
 		    }
+			this.button_Dokumente.Visibility = Visibility.Collapsed;
 #endif
-		}
+
+			#if DEBUG
+            //DebugHelperViewButton.Visibility = Visibility.Visible;
+#endif
+        }
 
         public List<ModalViewWindow> OpenedModalViewWindows { get; set; }
 
@@ -205,7 +215,10 @@ namespace BeWo
 					case UIContext.Team:
 						view = new TeamNavigationView();
 						break;
-					case UIContext.User:
+                    case UIContext.Dokumente:
+                        view = new DokumenteView();
+                        break;
+                    case UIContext.User:
 						view = new UserNavigationView();
 						break;
 					case UIContext.UserGroup:
@@ -1025,7 +1038,15 @@ namespace BeWo
 			}
 		}
 
-        private void button_CustomerTeam_Click(object sender, RoutedEventArgs e)
+		private void button_Dokumente_Click(object sender, RoutedEventArgs e)
+		{
+			if (DoSaveCheck())
+			{
+				NavigateTo(GetViewForUIContext(UIContext.Dokumente));
+			}
+		}
+
+		private void button_CustomerTeam_Click(object sender, RoutedEventArgs e)
         {
             if (DoSaveCheck())
             {
@@ -1171,7 +1192,7 @@ namespace BeWo
 			};
 			var phoneLabel = new Label
 			{
-				Content = "PIN für Support-Anruf erhalten",
+				Content = "PIN für Support erhalten",
 				FontWeight = FontWeights.Bold,
 				Margin = new Thickness(5),
 				HorizontalContentAlignment = HorizontalAlignment.Center,
@@ -1184,17 +1205,31 @@ namespace BeWo
 				Margin = new Thickness(45, 5, 5, 5),
 				Text = "Wenn Sie auf das PIN-Symbol klicken, wird Ihnen eine zufällige Support-PIN angezeigt.\n\n" +
 				       "Benötigen wir zur Lösung einer Support-Anfrage den Zugriff auf Ihre Datenbank,\n" +
-				       "werden Sie vom Support-Mitarbeiter gebeten, ihm eine solche Support-PIN zu übermitteln.\n" +
+				       "werden Sie " + Translator.Translate("vom Support-Mitarbeiter") + " gebeten, ihm eine solche Support-PIN zu übermitteln.\n" +
 				       "Diese PIN ist nur einmalig nutzbar/gültig. Sie wird nicht automatisch an den Support übermittelt.\n" +
-				       "Dies stellt sicher, dass ein Support-Mitarbeiter nicht ohne Ihre Einwilligung auf Ihre Datenbank zugreifen kann.\n" +
+				       "Dies stellt sicher, dass " + Translator.Translate("ein Support-Mitarbeiter") + " nicht ohne Ihre Einwilligung auf Ihre Datenbank zugreifen kann.\n" +
 				       "Jeder Support-Zugriff auf Ihre Datenbank wird zudem mit Hilfe der PIN protokolliert."
 			};
 
             /*
              * <TextBlock Grid.Row="7" Grid.Column="3" HorizontalAlignment="Right" VerticalAlignment="Bottom" FontSize="10" Margin="0,5,12,5">
-                            <Hyperlink x:Name="hyperlink" TargetName="newWindow" Foreground="#FF818181" NavigateUri="http://www.beyondsoft.de" RequestNavigate="Hyperlink_OnRequestNavigate">www.beyondsoft.de</Hyperlink>
+                            <Hyperlink x:Name="hyperlink" TargetName="newWindow" Foreground="#FF818181" NavigateUri="https://www.ownsoft.de" RequestNavigate="Hyperlink_OnRequestNavigate">www.ownsoft.de</Hyperlink>
                         </TextBlock>
              */
+		    var tvLabel = new Label
+		    {
+		        Content = "Support per Fernwartung",
+		        FontWeight = FontWeights.Bold,
+		        Margin = new Thickness(40, 5, 5, 5)
+		    };
+
+		    var textBlockTeamViewer = new TextBlock
+		    {
+		        Foreground = Brushes.Black,
+		        Margin = new Thickness(45, 5, 5, 5),
+		        Text = "Wenn Sie in einem Telefonat mit " + Translator.Translate("einem unserer Support-Mitarbeiter") + " aufgefordert werden\nden Teamviewer zu installieren, so können Sie ihn hier herunterladen."
+            };
+
             var supportToolLink = new TextBlock
 		    {
 		        Foreground = Brushes.Black,
@@ -1275,21 +1310,24 @@ namespace BeWo
 			var centeredStackPanel = new StackPanel {Orientation = Orientation.Vertical, VerticalAlignment = VerticalAlignment.Center, HorizontalAlignment = HorizontalAlignment.Center};
 			var mailStackPanel = new StackPanel {Orientation = Orientation.Horizontal};
 			var phoneStackPanel = new StackPanel {Orientation = Orientation.Horizontal};
+		    var tvStackPanel = new StackPanel { Orientation = Orientation.Horizontal };
 
 
-			mailStackPanel.Children.Add(mailButton);
+            mailStackPanel.Children.Add(mailButton);
 			mailStackPanel.Children.Add(mailLabel);
 
-
 			phoneStackPanel.Children.Add(phoneButton);
 			phoneStackPanel.Children.Add(phoneLabel);
 
 
+            
 			centeredStackPanel.Children.Add(mailStackPanel);
 			centeredStackPanel.Children.Add(textBlockMail);
 			centeredStackPanel.Children.Add(phoneStackPanel);
 			centeredStackPanel.Children.Add(textBlockPhone);
-		    centeredStackPanel.Children.Add(supportToolLink);
+		    centeredStackPanel.Children.Add(tvLabel);
+		    centeredStackPanel.Children.Add(textBlockTeamViewer);
+            centeredStackPanel.Children.Add(supportToolLink);
             centeredStackPanel.Children.Add(cancelButton);
 
 
@@ -1657,18 +1695,18 @@ namespace BeWo
 			}
 		}
 
-		private void UIElement_OnMouseEnter(object sender, MouseEventArgs e)
-		{
-			AufOffeneTerminePruefen();
-		}
+		//private void UIElement_OnMouseEnter(object sender, MouseEventArgs e)
+		//{
+		//	AufOffeneTerminePruefen();
+		//}
 
 		public void InitOffeneTermine()
 		{
-			if (!_TermineInitialized && BeWoApp.LoggedOnEmployee != null)
-			{
-				AufOffeneTerminePruefen();
-				_TermineInitialized = true;
-			}
+			//if (!_TermineInitialized && BeWoApp.LoggedOnEmployee != null)
+			//{
+			//	AufOffeneTerminePruefen();
+			//	_TermineInitialized = true;
+			//}
 		}
 
 		public void AufOffeneTerminePruefen()
@@ -1692,5 +1730,5 @@ namespace BeWo
                 NavigateTo(GetViewForUIContext(UIContext.Vertretungen));
             }
         }
-	}
+    }
 }

BeWo/MainWindow.xaml.cs

@@ -1,5 +1,6 @@
 using System;
 using System.ComponentModel;
+using System.Threading;
 using System.Windows;
 using BeWo.Core.Config;
 using BeWo.MultiLanguage;
@@ -18,7 +19,6 @@ namespace BeWo
             InitializeComponent();
 
             ApplicationThemeHelper.ApplicationThemeName = "Office2010Black";
-
             ShowLoginControl();
         }
 

BeWo/MultiLanguage/ServiceTranslator.cs

@@ -54,5 +54,25 @@ namespace BeWo.MultiLanguage
             }
             return String.Format(this.currentCulture, input, args);
         }
+
+        public String TranslateKey(String key, String defaultText)
+        {
+            if (key != null && this.dict != null && this.dict.TryGetValue(key, out var translation))
+            {
+                return translation;
+            }
+            
+            return defaultText;
+        }
+
+        public String TranslateKey(String key, String defaultText, params Object[] args)
+        {
+            String translation;
+            if (!String.IsNullOrEmpty(key) && this.dict.TryGetValue(key, out translation))
+            {
+                return String.Format(this.currentCulture, translation, args);
+            }
+            return String.Format(this.currentCulture, defaultText, args);
+        }
     }
 }

BeWo/Properties/AssemblyInfo.cs

@@ -8,9 +8,9 @@ using System.Windows;
 [assembly: AssemblyTitle("BeWoPlaner")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("beyondSoft GmbH")]
+[assembly: AssemblyCompany("ownSoft GmbH")]
 [assembly: AssemblyProduct("BeWoPlaner")]
-[assembly: AssemblyCopyright("Copyright © 2013 beyondSoft GmbH")]
+[assembly: AssemblyCopyright("Copyright © 2022 ownSoft GmbH")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

BeWo/ProxyLoginView.xaml

@@ -1,6 +1,7 @@
 <Window x:Class="BeWo.ProxyLoginView"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup"
         Title="Proxy Einstellungen" Height="200" Width="300">
     <Grid>
         <Button x:Name="proxyOK" Content="OK" HorizontalAlignment="Left" Margin="75,120,0,0" VerticalAlignment="Top" Width="100" Click="proxyOK_Click"/>
@@ -8,7 +9,7 @@
         
       
       <Label Content="Proxyname:" HorizontalAlignment="Left" Margin="10,15,0,0" VerticalAlignment="Top"  Width="100"/>
-      <Label Content="Benutzername:" HorizontalAlignment="Left" Margin="10,45,0,0" VerticalAlignment="Top" Width="100"/>
+      <Label Content="{markup:Translate Benutzername:}" HorizontalAlignment="Left" Margin="10,45,0,0" VerticalAlignment="Top" Width="100"/>
       <Label Content="Passwort:" HorizontalAlignment="Left" Margin="10,75,0,0" VerticalAlignment="Top" Width="100"/>
         
       <TextBox x:Name="proxynametxt" HorizontalAlignment="Left" Height="23" Margin="120,15,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="160" SelectionOpacity="0.5" />

BeWo/ProxyLoginView.xaml.cs

@@ -1,36 +1,22 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Reflection;
-using System.Security.Cryptography;
-using System.Text;
 using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
+using BeWo.Security;
 
 namespace BeWo
 {
-    /// <summary>
-    /// Interaktionslogik für ProxyLoginView.xaml
-    /// </summary>
-    public partial class ProxyLoginView : Window
+    public partial class ProxyLoginView
     {
         public ProxyLoginView()
         {
             InitializeComponent();
 
-
-            überprüfe();
+            CheckBeWoProfile();
         }
 
-
-        private void überprüfe() {
+        private void CheckBeWoProfile() {
 
             if (proxynametxt.Text.Equals("") && proxybenutzer.Text.Equals("") && proxypasswort.Password.Equals("")) {
 
@@ -41,24 +27,34 @@ namespace BeWo
 
                 try
                 {
-					var filePath = System.IO.Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\proxy.dat";
+					var filePath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\proxy.dat";
 					if (!File.Exists(filePath))
 					{
-						filePath = System.IO.Path.Combine(BeWoApp.GetAndCreateUserAppDataPath(), "proxy.dat");
+						filePath = Path.Combine(BeWoApp.GetAndCreateUserAppDataPath(), "proxy.dat");
 					}
 
-                    var file = new System.IO.StreamReader(filePath);
-                    while ((line = file.ReadLine()) != null)
-                    {
+                    var allLines = File.ReadAllLines(filePath);
 
-                        byte[] decbuff = Convert.FromBase64String(line);
-                        var x= System.Text.Encoding.UTF8.GetString(decbuff);
-                        datai[counter] = x;
+                    foreach(var linex in allLines)
+                    {
+                        var decryptedLine = EncryptionUtils.DecryptString(linex);
+                        datai[counter] = decryptedLine;
 
                         counter++;
                     }
 
-                    file.Close();
+                    //var file = new StreamReader(filePath);
+                    //while ((line = file.ReadLine()) != null)
+                    //{
+
+                    //    byte[] decbuff = Convert.FromBase64String(line);
+                    //    var x= System.Text.Encoding.UTF8.GetString(decbuff);
+                    //    datai[counter] = x;
+
+                    //    counter++;
+                    //}
+
+                    //file.Close();
 
                     proxynametxt.Text = datai[0];
                     proxybenutzer.Text = datai[1];
@@ -70,50 +66,53 @@ namespace BeWo
         
         }
 
+        // TODO: Verschlüsselung einbauen!
         private void proxyOK_Click(object sender, RoutedEventArgs e)
         {
-            string ptname = proxynametxt.Text;
-            string ptbenutzer = proxybenutzer.Text;
-			string ptpasswd = proxypasswort.Password;
-
-            string[] lines = { ptname, ptbenutzer, ptpasswd };
+            string[] lines = { proxynametxt.Text, proxybenutzer.Text, proxypasswort.Password };
+            var encryptedLines = new List<string>();
 
             try
             {
-				var filePath = System.IO.Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\proxy.dat";
+				var filePath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\proxy.dat";
 				if (!File.Exists(filePath))
 				{
-					filePath = System.IO.Path.Combine(BeWoApp.GetAndCreateUserAppDataPath(), "proxy.dat");
+					filePath = Path.Combine(BeWoApp.GetAndCreateUserAppDataPath(), "proxy.dat");
 				}
 
-                using (System.IO.StreamWriter file =
-				new System.IO.StreamWriter(filePath))
+                foreach(var line in lines)
                 {
-                    foreach (string line in lines)
-                    {
-                        byte[] encData_byte = new byte[line.Length];
-                        encData_byte = System.Text.Encoding.UTF8.GetBytes(line);
-                        string encodedData = Convert.ToBase64String(encData_byte);
-
-                        file.WriteLine(encodedData);
-                    }
+                    encryptedLines.Add(EncryptionUtils.EncryptString(line));
                 }
 
-                ptname = "";
-                ptbenutzer = "";
-                ptpasswd = "";
+                File.WriteAllLines(filePath, encryptedLines);
 
-                this.Close();
 
-            }catch(IOException i){
+
+
+
+                //using (var file =  new StreamWriter(filePath))
+                //{
+                //    foreach (string line in lines)
+                //    {
+                //        byte[] encData_byte = new byte[line.Length];
+                //        encData_byte = System.Text.Encoding.UTF8.GetBytes(line);
+                //        string encodedData = Convert.ToBase64String(encData_byte);
+
+                //        file.WriteLine(encodedData);
+                //    }
+                //}
+
+                Close();
+
+            }catch(IOException){
                 //Fehlermeldung
             }
         }
 
-
         private void proxyAbbr_Click(object sender, RoutedEventArgs e)
         {
-            this.Close();
+            Close();
         }
     }
 }

BeWo/PwVergessenView.xaml

@@ -1,6 +1,7 @@
 <Window x:Class="BeWo.PwVergessenView"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup"
         Title="PwVergessenView" Height="135" Width="322" WindowStartupLocation="CenterScreen" WindowStyle="None" 
 		AllowsTransparency="True"
         Background="Transparent"
@@ -18,7 +19,7 @@
 					<ColumnDefinition Width="*" />
 				</Grid.ColumnDefinitions>
 				<TextBlock Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="2" Height="20" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="Red" Margin="3,8,3,3"/>
-				<Label Grid.Row="1" Grid.Column="0" Margin="3" Content="Benutzername" />
+                <Label Grid.Row="1" Grid.Column="0" Margin="3" Content="{markup:Translate Benutzername}" />
 				<TextBox x:Name="BenutzernamenTextBox" Grid.Row="1" Grid.Column="1" MaxLines="1" Margin="3" />
 				<StackPanel Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" Orientation="Horizontal" HorizontalAlignment="Stretch">
 					<Button Margin="3" Content="Neues Passwort anfordern" Width="150" Click="AnfordernClick" IsDefault="True" VerticalContentAlignment="Center" />

BeWo/PwVergessenView.xaml.cs

@@ -31,7 +31,7 @@ namespace BeWo
 			var benutzername = BenutzernamenTextBox.Text;
 			if (benutzername.Equals(""))
 			{
-				MessageBox.Show("Bitte geben Sie einen Benutzernamen an", "Passwort anfordern fehlgeschlagen", MessageBoxButton.OK, MessageBoxImage.Information);
+				MessageBox.Show("Bitte geben Sie einen " + BS.Shared.Translation.Translator.Translate("Benutzernamen") + " an", "Passwort anfordern fehlgeschlagen", MessageBoxButton.OK, MessageBoxImage.Information);
 				return;
 			}
 
@@ -42,7 +42,7 @@ namespace BeWo
 		{
 			if(email.Equals("") || !hatEmail)
 			{
-				MessageBox.Show("Es konnte kein Benutzer mit diesem Namen gefunden werden oder der Benutzer hat keine E-Mail Adresse hinterlegt\nBitte wenden Sie sich an Ihren Systemadministrator", "Passwort anfordern fehlgeschlagen", MessageBoxButton.OK, MessageBoxImage.Information);
+				MessageBox.Show("Es konnte " + BS.Shared.Translation.Translator.Translate("kein Benutzer") + " mit diesem Namen gefunden werden oder " + BS.Shared.Translation.Translator.Translate("der Benutzer") + " hat keine E-Mail Adresse hinterlegt\nBitte wenden Sie sich an " + BS.Shared.Translation.Translator.Translate("Ihren Systemadministrator") + ".", "Passwort anfordern fehlgeschlagen", MessageBoxButton.OK, MessageBoxImage.Information);
 				return;
 			}
 

BeWo/Scheduler/Converter/AptToServRecsIconVisibilityConverter.cs

@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Windows;
+using System.Windows.Data;
+using BeWo.Scheduler.ViewModel;
+using BS.Shared.DataContracts;
+
+namespace BeWo.Scheduler.Converter
+{
+    public class AptToServRecsIconVisibilityConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if(value is CustomFieldStorage customFieldStorage)
+            {
+                return customFieldStorage.ServiceRecordList.Any() || customFieldStorage.HasServiceRecordEntry ? Visibility.Visible : Visibility.Collapsed;
+            }
+
+            return Visibility.Collapsed;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

BeWo/Scheduler/IBeWoAppointment.cs

@@ -11,8 +11,6 @@ namespace BeWo.Scheduler
 
         DateTime End { get; set;}
 
-        int LabelId { get; set;}
-        
         string Subject { get; set;}
 
 		string Description { get; set; }
@@ -26,5 +24,7 @@ namespace BeWo.Scheduler
         string RecurrenceInfo { get; set; }
 
         Dictionary<string, object> CustomFields { get; }
+
+        long? LabelKey { get; set; }
     }
 }

BeWo/Scheduler/Utils/AppointmentExtensions.cs

@@ -13,6 +13,8 @@ namespace BeWo.Scheduler.Utils
 {
     public static class AppointmentExtensions
     {
+        #region CustomField Getters
+
         public static CustomFieldStorage GetCustomFieldStorage(this Appointment appointment)
         {
             return appointment.CustomFields[nameof(CustomFieldStorage)] as CustomFieldStorage;
@@ -37,7 +39,6 @@ namespace BeWo.Scheduler.Utils
         {
             return appointment.GetCustomFieldStorage()?.IsAllDay ?? false;
         }
-
         
         public static ObservableCollection<Employee2SchedulerAppointmentDC> CF_EmployeeList(this Appointment appointment)
         {
@@ -95,8 +96,37 @@ namespace BeWo.Scheduler.Utils
             return appointment.GetCustomFieldStorage()?.HasServiceRecordEntry ?? false;
         }
 
-        
-        
+        public static bool CF_CanBeEdited(this Appointment appointment)
+        {
+            return appointment.GetCustomFieldStorage()?.CanBeEdited ?? false;
+        }
+
+
+        public static long? CF_AbsenceTimeOid(this Appointment appointment)
+        {
+            return appointment.GetCustomFieldStorage()?.AbsenceTimeOid;
+        }
+
+        public static bool CF_IsCustomerAbsenceTime(this Appointment appointment)
+        {
+            return appointment.GetCustomFieldStorage()?.IsCustomerAbsenceTime ?? false;
+        }
+
+        public static List<ServiceRecordDC> CF_ServiceRecordList(this Appointment appointment)
+        {
+            return appointment.GetCustomFieldStorage()?.ServiceRecordList ?? new List<ServiceRecordDC>();
+        }
+
+        public static string CF_CompletedUser(this Appointment appointment)
+        {
+            return appointment.GetCustomFieldStorage()?.CompletedUser;
+        }
+
+        #endregion
+
+
+        #region CustomField Setters
+
         public static void CF_IsTask(this Appointment appointment, bool pIsTask)
         {
             appointment.GetCustomFieldStorage().IsTask = pIsTask;
@@ -117,8 +147,15 @@ namespace BeWo.Scheduler.Utils
             appointment.GetCustomFieldStorage().IsAllDay = pIsAllDay;
         }
 
-        
-        
+        public static void CF_AbsenceTimeOid(this Appointment appointment, long? absenceTimeOid)
+        {
+            appointment.GetCustomFieldStorage().AbsenceTimeOid = absenceTimeOid;
+        }
+
+        public static void CF_IsCustomerAbsenceTime(this Appointment appointment, bool isCustomerAbsenceTime)
+        {
+            appointment.GetCustomFieldStorage().IsCustomerAbsenceTime = isCustomerAbsenceTime;
+        }
 
         public static void CF_EmployeeList(this Appointment appointment, ObservableCollection<Employee2SchedulerAppointmentDC> pEmployeeList)
         {
@@ -140,15 +177,11 @@ namespace BeWo.Scheduler.Utils
             appointment.GetCustomFieldStorage().SupportConceptList = pSupportConceptList;
         }
 
-
         public static void CF_Originator(this Appointment appointment, CompactEmployeeDC pOriginator)
         {
             appointment.GetCustomFieldStorage().Originator = pOriginator;
         }
         
-        
-        
-        
         public static void CF_DueDate(this Appointment appointment, DateTime? pDueDate)
         {
             appointment.GetCustomFieldStorage().DueDate = pDueDate;
@@ -173,5 +206,17 @@ namespace BeWo.Scheduler.Utils
         {
             appointment.GetCustomFieldStorage().HasServiceRecordEntry = hasServiceRecordEntry;
         }
+
+        public static void CF_ServiceRecordList(this Appointment appointment, List<ServiceRecordDC> serviceRecords)
+        {
+            appointment.GetCustomFieldStorage().ServiceRecordList = serviceRecords;
+        }
+
+        public static void CF_CompletedUser(this Appointment appointment, string completedUser)
+        {
+            appointment.GetCustomFieldStorage().CompletedUser = completedUser;
+        }
+
+        #endregion
     }
 }

BeWo/Scheduler/Utils/Utils.cs

@@ -4,19 +4,19 @@ namespace BeWo.Scheduler.Utils
 {
     public static class Utils
     {
-        private static readonly Regex indexRegex = new Regex("(?:Index=\"){1}([0-9]+)\"{1}");
-        private static readonly Regex idRegex = new Regex("(?:Id=\")(([a-z0-9]{8})-{1}([a-z0-9]{4})-{1}([a-z0-9]{4})-{1}([a-z0-9]{4})-{1}([a-z0-9]{12}))(?=\"{1})");
+        private static readonly Regex _IndexRegex = new Regex("(?:Index=\"){1}([0-9]+)\"{1}");
+        private static readonly Regex _IdRegex = new Regex("(?:Id=\")(([a-z0-9]{8})-{1}([a-z0-9]{4})-{1}([a-z0-9]{4})-{1}([a-z0-9]{4})-{1}([a-z0-9]{12}))(?=\"{1})");
 
         public static string ExtractIdFromRecurrenceInfo(string pRecurrenceInfo)
         {
-            return pRecurrenceInfo != null ? idRegex.Match(pRecurrenceInfo).Groups[1].Value : null;
+            return pRecurrenceInfo != null ? _IdRegex.Match(pRecurrenceInfo).Groups[1].Value : null;
         }
 
         public static int ExtractIndexFromRecurrenceInfo(string pRecurrenceInfo)
         {
             if(pRecurrenceInfo != null)
             {
-                var indexString = indexRegex.Match(pRecurrenceInfo).Groups[1].Value;
+                var indexString = _IndexRegex.Match(pRecurrenceInfo).Groups[1].Value;
 
                 var index = !string.IsNullOrEmpty(indexString) ? int.Parse(indexString) : 0;
 

BeWo/Scheduler/View/AbstractAppointmentEditForm.cs

@@ -40,7 +40,7 @@ namespace BeWo.Scheduler.View
 	    public string TimeEditMask => CultureInfo.CurrentCulture.DateTimeFormat.LongTimePattern;
 	    public RecurrenceVisualController RecurrenceVisualController { get; }
 
-	    protected internal bool IsNewAppointment => Controller == null || Controller.IsNewAppointment;
+	    protected internal bool IsNewAppointment => Controller is null || Controller.IsNewAppointment;
 
 	    protected bool ShouldShowRecurrence => !Appointment.IsOccurrence && Controller.ShouldShowRecurrenceButton;
 
@@ -51,8 +51,11 @@ namespace BeWo.Scheduler.View
                 return false;
             }
 
+            // TODO: Endzeit und Startzeit werden als Dauer auf das Start-Objekt addiert
             if (ShouldShowRecurrence)
             {
+                var rvcStart = RecurrenceVisualController.Start;
+                
                 RecurrenceVisualController.ApplyRecurrence();
             }
 

BeWo/Scheduler/View/MitarbeiterverfuegbarkeitsinfoView.xaml

@@ -6,11 +6,13 @@
       xmlns:view="clr-namespace:BeWo.View"
       xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
       xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
+      xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup"
+      xmlns:t="clr-namespace:BeWo.MultiLanguage.Markup"
       mc:Ignorable="d" 
       Height="Auto" Width="Auto" HorizontalAlignment="Stretch"  VerticalAlignment="Stretch" Focusable="True">
 
 	<Grid Width="Auto" Height="Auto" x:Name="root">
-		<GroupBox x:Name="rootGroupBox" Style="{StaticResource PopUpWindowStyle}" Header="Mitarbeiterverfügbarkeit">
+        <GroupBox x:Name="rootGroupBox" Style="{StaticResource PopUpWindowStyle}" Header="{markup:Translate Mitarbeiterverfügbarkeit}">
 			<Grid Margin="0,3,0,0" Background="{StaticResource ObjectEditBackgroundBrush}">
 				<Grid.RowDefinitions>
 					<RowDefinition Height="*" />
@@ -18,7 +20,7 @@
 				</Grid.RowDefinitions>
 				<dxg:GridControl DataSource="{Binding Verfuegbarkeiten}">
 					<dxg:GridControl.Columns>
-						<dxg:GridColumn FieldName="Mitarbeiter" Header="Mitarbeiter" AllowEditing="False" />
+                        <dxg:GridColumn FieldName="Mitarbeiter" Header="{t:Translate MitarbeiterSingular}" AllowEditing="False" />
 						<dxg:GridColumn FieldName="Ueberstunden" Header="Überstunden" AllowEditing="False">
 							<dxg:GridColumn.EditSettings>
 								<dxe:TextEditSettings MaskUseAsDisplayFormat="True" Mask="########0.00" MaskType="Numeric" />

BeWo/Scheduler/View/NewSchedulerView.xaml

@@ -1,21 +1,21 @@
 <localView:BeWoView x:Class="BeWo.Scheduler.View.NewSchedulerView"
-					          xmlns:localView="clr-namespace:BeWo.View"
+					xmlns:localView="clr-namespace:BeWo.View"
                     xmlns:localSchConv="clr-namespace:BeWo.Scheduler.Converter"
-					          xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-					          xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-					          xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
+				    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+				    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+				    xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
                     xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
                     xmlns:dxsch="http://schemas.devexpress.com/winfx/2008/xaml/scheduler"
                     xmlns:dxschint="http://schemas.devexpress.com/winfx/2008/xaml/scheduler/internal"
-					          xmlns:dxscht="http://schemas.devexpress.com/winfx/2008/xaml/scheduler/themekeys"
+					xmlns:dxscht="http://schemas.devexpress.com/winfx/2008/xaml/scheduler/themekeys"
                     xmlns:view="clr-namespace:BeWo.Scheduler.View"
-                    xmlns:converter="clr-namespace:BeWo.Converter"
                     xmlns:dxb="http://schemas.devexpress.com/winfx/2008/xaml/bars"
-                    xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup"
+                    xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup" xmlns:t="clr-namespace:BeWo.MultiLanguage.Markup" 
+					Loaded="NewSchedulerView_OnLoaded"
                     Height="Auto" Width="Auto" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Focusable="True">
-	<localView:BeWoView.Resources>
-		<ResourceDictionary>
-			<dxschint:ToolTipVisibilityToVisibilityConverter x:Key="ToolTipVisibilityConverter" />
+    <localView:BeWoView.Resources>
+        <ResourceDictionary>
+            <dxschint:ToolTipVisibilityToVisibilityConverter x:Key="ToolTipVisibilityConverter" />
 			<dx:BooleanToVisibilityConverter x:Key="boolToVisibilityConverter" />
 			<localSchConv:CheckBoxConverter x:Key="CheckBoxConverter" />
 			<localSchConv:NewCalendarBackgroundConverter x:Key="NewCalendarBackgroundConverter" />
@@ -23,11 +23,12 @@
 			<view:AppointmentToolTipConverter x:Key="AppointmentToolTipConverter" />
 			<view:WidthAdditionMultiConverter x:Key="WidthAdditionMultiConverter" />
 			<view:FilterBackgroundConverter x:Key="DickbuttConverter" />
-        <view:EmployeeBrushConverter x:Key="EmployeeBrushConverter" />
+            <view:EmployeeBrushConverter x:Key="EmployeeBrushConverter" />
 			<view:AppointmentBorderZusageConverter x:Key="AppointmentBorderZusageConverter" />
 			<view:NichtNochEinConverter x:Key="NichtNochEinConverter" />
-			
-		  <!-- Region Appointment Templates -->
+            <view:InformationButtonVisibilityConverter x:Key="InformationButtonVisibilityConverter" />
+			<localSchConv:AptToServRecsIconVisibilityConverter x:Key="AptToServRecsIconVisibilityConverter" />
+            <!-- Region Appointment Templates -->
 
             <!-- Region VerticalAppointmentTemplate -->
 		    <ControlTemplate x:Key="{dxscht:SchedulerViewThemeKey ResourceKey=VerticalAppointmentTemplate, IsThemeIndependent=true}" TargetType="{x:Type dxschint:VisualVerticalAppointmentControl}">
@@ -70,7 +71,7 @@
 									 Visibility="{Binding ViewInfo.View.AppointmentToolTipVisibility, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ToolTipVisibilityConverter}}">
 							</ToolTip>
 						</ToolTipService.ToolTip>
-            <!-- Endregion -->
+						<!-- Endregion -->
 						<dxschint:AppointmentBorder x:Name="back" DefaultCornerRadius="4" Opacity="1" ViewInfo="{TemplateBinding ViewInfo}" Background="{Binding Path=ViewInfo.CustomViewInfo, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource AppointmentBorderZusageConverter}}">
                             <dxschint:AppointmentBorder DefaultCornerRadius="3" DefaultMargin="2" ViewInfo="{TemplateBinding ViewInfo}" Background="{Binding Path=ViewInfo.CustomViewInfo[CustomFieldStorage].BackgroundColor, RelativeSource={RelativeSource TemplatedParent}}" BorderThickness="1" DefaultBorderThickness="1">
 								<dxschint:AppointmentBorder x:Name="AppointmentBorder" DefaultCornerRadius="2" DefaultMargin="0" ViewInfo="{TemplateBinding ViewInfo}" Background="Transparent">
@@ -106,9 +107,9 @@
 							<ContentPresenter x:Name="PART_Content" Grid.Column="0" Margin="5,4,5,0" Content="{TemplateBinding ViewInfo}" ContentTemplate="{TemplateBinding ContentTemplate}" />
 						</Grid>
 						<dxschint:AppointmentBorder x:Name="Selection" DefaultCornerRadius="4" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
-												                DefaultBorderThickness="2" ViewInfo="{TemplateBinding ViewInfo}"
-													              BorderBrush="Black"
-												                Visibility="{Binding ViewInfo.Selected, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource boolToVisibilityConverter}}" />
+												    DefaultBorderThickness="2" ViewInfo="{TemplateBinding ViewInfo}"
+													BorderBrush="Black"
+												    Visibility="{Binding ViewInfo.Selected, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource boolToVisibilityConverter}}" />
 						<!--ResizingHitTest Obere und untere Kanten-->
 						<Rectangle Fill="Transparent" Height="5" VerticalAlignment="Top" HorizontalAlignment="Stretch"
 								   Visibility="{Binding Path=ViewInfo.CanResizeStart, RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource boolToVisibilityConverter}}"
@@ -145,16 +146,18 @@
                         <TextBlock Grid.Row="0" Text="{Binding Subject}" TextWrapping="NoWrap" Margin="6,0,0,3" Foreground="{Binding Path=CustomViewInfo[CustomFieldStorage].ForegroundColor}" />
                         <TextBlock Grid.Row="1" Text="{Binding Location}" TextWrapping="Wrap" Margin="6,0,0,3" Foreground="{Binding Path=CustomViewInfo[CustomFieldStorage].ForegroundColor}" />
 					</Grid>
-					<dxschint:AppointmentImagesControl Grid.Column="1" ViewInfo="{Binding}" Orientation="Vertical" SnapsToDevicePixels="True" />
-					<Image Grid.Row="0" Grid.Column="2" Visibility="{Binding Path=CustomViewInfo[CustomFieldStorage].HasServiceRecordEntry, Converter={StaticResource BoolVisibilityConverter}}"  Source="/BeWoPlaner;component/Ressources/Icons/HistoryDisabled.png" SnapsToDevicePixels="True" Height="20" Width="20" VerticalAlignment="Top" />
+					<dxschint:AppointmentImagesControl Grid.Column="1" Margin="0,0,4,0"  ViewInfo="{Binding}" Orientation="Vertical" SnapsToDevicePixels="True" />
+					<!-- ToDo: Neuen Converter schreiben, der prüft, ob in der Liste ServiceRecords sind -->
+                    <Image Grid.Row="0" Grid.Column="2" Margin="-4,-2,6,0"
+                           Visibility="{Binding Path=CustomViewInfo[CustomFieldStorage], Converter={StaticResource AptToServRecsIconVisibilityConverter}}" Source="/BeWoPlaner;component/Ressources/Icons/HistoryDisabled.png" 
+                           SnapsToDevicePixels="True" Height="20" Width="20" VerticalAlignment="Top" />
                 </Grid>
 			</DataTemplate>
 			<!--Endregion-->
 
-			<!-- Region Horizontal -->
+			<!-- Region Horizontal (Monatsanzeige, etc.) -->
             <!-- HorizontalAppointmentTemplate -->
-			<ControlTemplate x:Key="{dxscht:SchedulerViewThemeKey ResourceKey=HorizontalAppointmentTemplate, IsThemeIndependent=true}" 
-							         TargetType="{x:Type dxschint:VisualHorizontalAppointmentControl}">
+			<ControlTemplate x:Key="{dxscht:SchedulerViewThemeKey ResourceKey=HorizontalAppointmentTemplate, IsThemeIndependent=true}" TargetType="{x:Type dxschint:VisualHorizontalAppointmentControl}">
                 <dxschint:AppointmentColorConvertControl x:Name="clrConvCtrl" SnapsToDevicePixels="True" ControlColor="{Binding Path=ViewInfo.CustomViewInfo[CustomFieldStorage].BackgroundColor.GradientStops[0].Color, RelativeSource={RelativeSource TemplatedParent}}">
 					<VisualStateManager.VisualStateGroups>
 						<VisualStateGroup x:Name="DraggedStates">
@@ -188,60 +191,62 @@
 					<Grid x:Name="PART_ToolTipContainer" dxsch:SchedulerControl.HitTestType="AppointmentContent" dxsch:SchedulerControl.SelectableIntervalViewInfo="{TemplateBinding ViewInfo}">
                         <ToolTipService.ToolTip>
                             <ToolTip Content="{TemplateBinding ViewInfo}" ContentTemplate="{Binding ViewInfo.View.AppointmentToolTipContentTemplate, RelativeSource={RelativeSource TemplatedParent}, UpdateSourceTrigger=PropertyChanged}"
-									                   Visibility="{Binding ViewInfo.View.AppointmentToolTipVisibility, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ToolTipVisibilityConverter}}">
+									 Visibility="{Binding ViewInfo.View.AppointmentToolTipVisibility, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ToolTipVisibilityConverter}}">
                             </ToolTip>
                         </ToolTipService.ToolTip>
                         <dxschint:AppointmentBorder x:Name="back" DefaultCornerRadius="4" Opacity="1" ViewInfo="{TemplateBinding ViewInfo}"
-													                          Background="{Binding Path=ViewInfo.CustomViewInfo, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource AppointmentBorderZusageConverter}}">
-                        <dxschint:AppointmentBorder DefaultCornerRadius="3" DefaultMargin="1" ViewInfo="{TemplateBinding ViewInfo}" Background="{Binding Path=ViewInfo.CustomViewInfo[CustomFieldStorage].BackgroundColor, RelativeSource={RelativeSource TemplatedParent}}" DefaultBorderThickness="1">
-								<dxschint:AppointmentBorder x:Name="AppointmentBorder" DefaultCornerRadius="2" DefaultMargin="0" ViewInfo="{TemplateBinding ViewInfo}" Background="Transparent">
-                  <Grid>
-                      <Grid.ColumnDefinitions>
-                          <ColumnDefinition Width="Auto" />
-                          <ColumnDefinition Width="*" />
-                          <ColumnDefinition Width="Auto" />
-                      </Grid.ColumnDefinitions>
-                      <Border Width="10" CornerRadius="4,0,0,4" HorizontalAlignment="Left" SnapsToDevicePixels="True">
-                          <Border.Background>
-                              <MultiBinding Converter="{StaticResource EmployeeBrushConverter}">
-                                  <Binding Path="AllItems" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type view:NewSchedulerView}}" UpdateSourceTrigger="PropertyChanged" />
-                                  <Binding Path="ViewInfo.CustomViewInfo" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type dxschint:AppointmentBorder}}" />
-                                  <Binding Path="IsEmployeeBrushVisible" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type view:NewSchedulerView}}" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged" />
-                              </MultiBinding>
-                          </Border.Background>
-                      </Border>
-                      <Border SnapsToDevicePixels="True" Background="Transparent" Grid.Column="1" />
-                      <Border Width="10" CornerRadius="0,4,4,0" HorizontalAlignment="Right" SnapsToDevicePixels="True" Grid.Column="2">
-                          <Border.Background>
-                              <MultiBinding Converter="{StaticResource DickbuttConverter}">
-                                  <Binding Path="AllItems" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type view:NewSchedulerView}}" UpdateSourceTrigger="PropertyChanged" />
-                                  <Binding Path="ViewInfo.CustomViewInfo" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type dxschint:AppointmentBorder}}" />
-                              </MultiBinding>
-                          </Border.Background>
-                      </Border>
-                  </Grid>
-              </dxschint:AppointmentBorder>
+													Background="{Binding Path=ViewInfo.CustomViewInfo, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource AppointmentBorderZusageConverter}}">
+                            <dxschint:AppointmentBorder DefaultCornerRadius="3" DefaultMargin="1" ViewInfo="{TemplateBinding ViewInfo}" Background="{Binding Path=ViewInfo.CustomViewInfo[CustomFieldStorage].BackgroundColor, RelativeSource={RelativeSource TemplatedParent}}" DefaultBorderThickness="1">
+						        <dxschint:AppointmentBorder x:Name="AppointmentBorder" DefaultCornerRadius="2" DefaultMargin="0" ViewInfo="{TemplateBinding ViewInfo}" Background="Transparent">
+                                    <Grid>
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="Auto" />
+                                            <ColumnDefinition Width="*" />
+                                            <ColumnDefinition Width="Auto" />
+                                        </Grid.ColumnDefinitions>
+                                        <Border Width="10" CornerRadius="4,0,0,4" HorizontalAlignment="Left" SnapsToDevicePixels="True">
+                                            <Border.Background>
+                                                <MultiBinding Converter="{StaticResource EmployeeBrushConverter}">
+                                                    <Binding Path="AllItems" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type view:NewSchedulerView}}" UpdateSourceTrigger="PropertyChanged" />
+                                                    <Binding Path="ViewInfo.CustomViewInfo" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type dxschint:AppointmentBorder}}" />
+                                                    <Binding Path="IsEmployeeBrushVisible" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type view:NewSchedulerView}}" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged" />
+                                                </MultiBinding>
+                                            </Border.Background>
+                                        </Border>
+                                        <Border SnapsToDevicePixels="True" Background="Transparent" Grid.Column="1" />
+                                        <!-- TODO: Mehrere Farben für Ressourcen anzeigen -->
+                                        <Border Width="10" CornerRadius="0,4,4,0" HorizontalAlignment="Right" SnapsToDevicePixels="True" Grid.Column="2">
+                                            <Border.Background>
+                                                <MultiBinding Converter="{StaticResource DickbuttConverter}">
+                                                    <Binding Path="AllItems" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type view:NewSchedulerView}}" UpdateSourceTrigger="PropertyChanged" />
+                                                    <Binding Path="ViewInfo.CustomViewInfo" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type dxschint:AppointmentBorder}}" />
+                                                </MultiBinding>
+                                            </Border.Background>
+                                        </Border>
+                                    </Grid>
+                                </dxschint:AppointmentBorder>
 							</dxschint:AppointmentBorder>
 						</dxschint:AppointmentBorder>
 						<Grid x:Name="ContentContainer" Margin="0,0,0,3">
 							<ContentPresenter x:Name="PART_Content" Grid.Row="0" Margin="3,0,3,0" Content="{TemplateBinding ViewInfo}" ContentTemplate="{TemplateBinding ContentTemplate}" />
 						</Grid>
+						<!-- Rahmen bei ausgewähltem Termin -->
 						<dxschint:AppointmentBorder x:Name="Selection" DefaultCornerRadius="4" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
-												                DefaultBorderThickness="2" ViewInfo="{TemplateBinding ViewInfo}"
-													              BorderBrush="Black"
-												                Visibility="{Binding ViewInfo.Selected, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource boolToVisibilityConverter}}" />
+												    DefaultBorderThickness="2" ViewInfo="{TemplateBinding ViewInfo}"
+                                                    BorderBrush="Black"
+												    Visibility="{Binding ViewInfo.Selected, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource boolToVisibilityConverter}}" />
 						<Rectangle Fill="Transparent" Width="5" HorizontalAlignment="Left"
-								       Visibility="{Binding ViewInfo.CanResizeStart, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource boolToVisibilityConverter}}"
-								       IsHitTestVisible="True"
-								       dxsch:SchedulerControl.HitTestType="AppointmentResizingLeftEdge"
-								       dxsch:SchedulerControl.SelectableIntervalViewInfo="{TemplateBinding ViewInfo}"
-								       Cursor="SizeWE">
+								   Visibility="{Binding ViewInfo.CanResizeStart, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource boolToVisibilityConverter}}"
+								   IsHitTestVisible="True"
+								   dxsch:SchedulerControl.HitTestType="AppointmentResizingLeftEdge"
+								   dxsch:SchedulerControl.SelectableIntervalViewInfo="{TemplateBinding ViewInfo}"
+								   Cursor="SizeWE">
 						</Rectangle>
 						<Rectangle Fill="Transparent" Width="5" HorizontalAlignment="Right" IsHitTestVisible="True"
-								       Visibility="{Binding Path=ViewInfo.CanResizeEnd, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource boolToVisibilityConverter}}"
-								       dxsch:SchedulerControl.HitTestType="AppointmentResizingRightEdge"
-							         dxsch:SchedulerControl.SelectableIntervalViewInfo="{TemplateBinding ViewInfo}"
-								       Cursor="SizeWE">
+                                   Visibility="{Binding Path=ViewInfo.CanResizeEnd, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource boolToVisibilityConverter}}"
+								   dxsch:SchedulerControl.HitTestType="AppointmentResizingRightEdge"
+							       dxsch:SchedulerControl.SelectableIntervalViewInfo="{TemplateBinding ViewInfo}"
+								   Cursor="SizeWE">
 						</Rectangle>
 					</Grid>
 				</dxschint:AppointmentColorConvertControl>
@@ -257,6 +262,7 @@
                             <ColumnDefinition Width="Auto" />
                             <ColumnDefinition Width="*" />
                             <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="Auto" />
                         </Grid.ColumnDefinitions>
                         <Grid.RowDefinitions>
                             <RowDefinition Height="Auto" />
@@ -270,18 +276,23 @@
 			                       dxschint:VerticalAppointmentContentPanel.AlwaysOnNewRow="True" TextWrapping="Wrap" Margin="11,6,0,0"
 			                       Foreground="{Binding Path=CustomViewInfo[CustomFieldStorage].ForegroundColor}" />
 
-                        <dxschint:AppointmentImagesControl Grid.Row="0" Grid.Column="4" Margin="0,4,10,0" ViewInfo="{Binding}" Orientation="Horizontal" VerticalAlignment="Top" HorizontalAlignment="Right" />
+                        <dxschint:AppointmentImagesControl Grid.Row="0" Grid.Column="4" Margin="0,4,10,0" ViewInfo="{Binding}" 
+                                                           Orientation="Horizontal" VerticalAlignment="Top" HorizontalAlignment="Right" />
+                        <Image Grid.Row="0" Grid.Column="5" Margin="0,4,10,0"
+                               Visibility="{Binding Path=CustomViewInfo[CustomFieldStorage], Converter={StaticResource AptToServRecsIconVisibilityConverter}}" 
+                               Source="/BeWoPlaner;component/Ressources/Icons/HistoryDisabled.png" SnapsToDevicePixels="True" Height="20" Width="20" VerticalAlignment="Top" />
                     </Grid>
                 </dxschint:HorizontalAppointmentContentPanel>
 			</DataTemplate>
 
-			<!-- HorizontalAppointmentContentTemplate wird auf ganztägige Termine angewandt -->
+			<!-- HorizontalAppointmentContentTemplate wird auf ganztägige Termine und Abwesenheiten angewandt -->
 			<DataTemplate x:Key="{dxscht:SchedulerViewThemeKey ResourceKey=HorizontalAppointmentLongerThanADayContentTemplate, IsThemeIndependent=true}">
 				<Grid SnapsToDevicePixels="True" HorizontalAlignment="Stretch" VerticalAlignment="Center">
 					<Grid.ColumnDefinitions>
 						<ColumnDefinition Width="Auto" />
 						<ColumnDefinition Width="*" />
 						<ColumnDefinition Width="Auto" />
+						<ColumnDefinition Width="Auto" />
 					</Grid.ColumnDefinitions>
 					<StackPanel Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center">
                     <dxschint:AppointmentContinueStartDateControl ViewInfo="{Binding}" Margin="12, 4, 0, 2" Foreground="{Binding Path=CustomViewInfo[CustomFieldStorage].ForegroundColor}" VerticalAlignment="Center" />
@@ -290,12 +301,15 @@
 					<dxschint:HorizontalAppointmentContentPanel Grid.Column="1" ClipToBounds="True" VerticalAlignment="Center" Margin="2,0,2,0">
 						<dxschint:AppointmentImagesControl HorizontalAlignment="Center" ViewInfo="{Binding}" Orientation="Horizontal" />
                         <TextBlock Text="{Binding Subject}" VerticalAlignment="Center" TextWrapping="Wrap" Foreground="{Binding Path=CustomViewInfo[CustomFieldStorage].ForegroundColor}" Margin="8, 2, 0, 0" />
-					</dxschint:HorizontalAppointmentContentPanel>
+                        </dxschint:HorizontalAppointmentContentPanel>
 					<StackPanel Grid.Column="2" Orientation="Horizontal" VerticalAlignment="Center">
 						<dxschint:HorizontalAppointmentEndClockControl ViewInfo="{Binding}" Margin="0, 4, 12, 2" VerticalAlignment="Center" />
                         <dxschint:AppointmentContinueEndDateControl ViewInfo="{Binding}" Margin="0, 4, 12, 2" Foreground="{Binding Path=CustomViewInfo[CustomFieldStorage].ForegroundColor}" VerticalAlignment="Center" />
 					</StackPanel>
-				</Grid>
+                    <Image Grid.Column="3" Grid.Row="0" Margin="0,0,4,0"
+                        Visibility="{Binding Path=CustomViewInfo[CustomFieldStorage], Converter={StaticResource AptToServRecsIconVisibilityConverter}}" 
+                        Source="/BeWoPlaner;component/Ressources/Icons/HistoryDisabled.png" SnapsToDevicePixels="True" Height="17" Width="17" VerticalAlignment="Center" />
+                </Grid>
 			</DataTemplate>
 			<!-- Endregion-->
 
@@ -309,6 +323,8 @@
 						<RowDefinition Height="Auto" />
 						<RowDefinition Height="Auto" />
 						<RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
 					</Grid.RowDefinitions>
 					<Grid.ColumnDefinitions>
 						<ColumnDefinition Width="Auto" />
@@ -326,7 +342,7 @@
 						    <TextBlock Text="{Binding Path=EndTimeText}" />
 							<TextBlock Text=" Uhr" Margin="0,0,4,0" />
 						</StackPanel>
-                        <TextBlock Grid.Column="1" Text="{Binding Path=CustomViewInfo[CustomFieldStorage].ToolTip}" TextWrapping="Wrap" MaxWidth="{Binding ElementName=Scheduler, Path=ActualWidth}" />
+                        <TextBlock Grid.Column="1" Text="{Binding Path=CustomViewInfo[CustomFieldStorage].ToolTip}" TextWrapping="Wrap" MaxWidth="{Binding Path=ActualWidth, Source={x:Reference Scheduler}}" />
 					</Grid>
 					<Separator Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" Height="1" Background="DimGray" Visibility="{Binding Path=CustomViewInfo[CustomFieldStorage].ToolTipTrennstrichVisibility}" />
 					
@@ -334,7 +350,7 @@
 					<TextBlock Grid.Row="2" Grid.Column="1" Text="{Binding Path=CustomViewInfo, Converter={StaticResource AppointmentToolTipConverter}, ConverterParameter=Ressourcen}"
 							   Visibility="{Binding Path=CustomViewInfo[CustomFieldStorage].ToolTipResourcesVisibility}" />
 
-					<TextBlock Margin="0,0,3,0" Grid.Row="3" Grid.Column="0" Text="{markup:Translate Mitarbeiter:}" Visibility="{Binding Path=CustomViewInfo[CustomFieldStorage].ToolTipEmployeesVisibility}" />
+					<TextBlock Margin="0,0,3,0" Grid.Row="3" Grid.Column="0" Text="{t:Translate MitarbeiterPlural:}" Visibility="{Binding Path=CustomViewInfo[CustomFieldStorage].ToolTipEmployeesVisibility}" />
 
 					<ListView Margin="-6,-3,0,0" Grid.Row="3" Background="Transparent" BorderThickness="0" ItemsSource="{Binding Path=CustomViewInfo[CustomFieldStorage].EmployeeList}" Grid.Column="1" Visibility="{Binding Path=CustomViewInfo[CustomFieldStorage].ToolTipEmployeesVisibility}" Name="ToolTipEmployeeList">
 						<ListView.ItemsPanel>
@@ -352,7 +368,6 @@
 										<ColumnDefinition Width="Auto" />
 										<ColumnDefinition Width="*" />
 									</Grid.ColumnDefinitions>
-									<!--<Border Grid.Column="0" Background="{Binding Converter={StaticResource NichtNochEinConverter}}" BorderThickness="1" BorderBrush="DimGray" Width="5" Margin="0,0,3,0" />-->
 									<Border Grid.Column="0" Background="{Binding Converter={StaticResource NichtNochEinConverter}}" BorderThickness="1" BorderBrush="DimGray" Width="5" Margin="0,0,3,0" Visibility="{Binding Path=DataContext.CustomViewInfo[CustomFieldStorage].ToolTipZusageVisibility, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ListView}}}" />
 									<TextBlock Grid.Column="1" Foreground="DimGray" Text="{Binding Converter={StaticResource NichtNochEinConverter}, ConverterParameter=GibName}" />
 								</Grid>
@@ -363,7 +378,11 @@
 					<TextBlock Margin="0,0,3,0" Grid.Row="4" Grid.Column="0" Text="{markup:Translate Klienten:}" Visibility="{Binding Path=CustomViewInfo[CustomFieldStorage].ToolTipCustomersVisibility}" />
 					<TextBlock Grid.Row="4" Grid.Column="1" Text="{Binding Path=CustomViewInfo, Converter={StaticResource AppointmentToolTipConverter}, ConverterParameter=Klienten}"
 							       Visibility="{Binding Path=CustomViewInfo[CustomFieldStorage].ToolTipCustomersVisibility}" />
-				</Grid>
+                    <!-- Separator und "Angelegt von: " mit dem Namen des Originators -->
+                    <Separator Grid.Row="5" Grid.ColumnSpan="2" Height="1" Background="DimGray" Visibility="{Binding Path=CustomViewInfo[CustomFieldStorage].CanBeEdited, Converter={StaticResource BoolVisibilityConverter}}" />
+                    <TextBlock Margin="0,0,3,0" Grid.Row="6" Grid.Column="0" Text="Angelegt von:" Visibility="{Binding Path=CustomViewInfo[CustomFieldStorage].CanBeEdited, Converter={StaticResource BoolVisibilityConverter}}" />
+                    <TextBlock Margin="0,0,3,0" Grid.Row="6" Grid.Column="1" Text="{Binding Path=CustomViewInfo[CustomFieldStorage].Originator}" Visibility="{Binding Path=CustomViewInfo[CustomFieldStorage].CanBeEdited, Converter={StaticResource BoolVisibilityConverter}}" />
+                </Grid>
 			</DataTemplate>
 
 			<!-- DragDropHoverTimeCellsStyle -->
@@ -451,7 +470,6 @@
 					</Setter.Value>
 				</Setter>
 			</Style>
-
 			<Style x:Key="MitarbeiterTabItemStyle" TargetType="{x:Type TabItem}">
 				<Setter Property="Template">
 					<Setter.Value>
@@ -557,11 +575,11 @@
                 </Button>
 				<StackPanel x:Name="DayViewOptions" Orientation="Horizontal" Visibility="Visible">
 					<Label VerticalAlignment="Center" Content="anz Tage:" />
-					<dxe:SpinEdit MaxValue="100" VerticalAlignment="Center" x:Name="SpinEditDayViewDayCount" AllowNullInput="False" Height="23" Width="50" IsFloatValue="False" EditValueChanged="SpinEditDayViewDayCount_EditValueChanged" />
+					<dxe:SpinEdit MaxValue="100" LostFocus="SpinEditDayViewDayCount_OnLostFocus" VerticalAlignment="Center" x:Name="SpinEditDayViewDayCount" AllowNullInput="False" Height="23" Width="50" IsFloatValue="False" EditValueChanged="SpinEditDayViewDayCount_EditValueChanged" />
 				</StackPanel>
 				<StackPanel x:Name="TimelineViewOptions" Orientation="Horizontal" Visibility="Collapsed">
 					<Label VerticalAlignment="Center" Content="anz Tage:" />
-					<dxe:SpinEdit MaxValue="100" VerticalAlignment="Center" x:Name="SpinEditTimelineViewDayCount" AllowNullInput="False" Height="23" Width="50" IsFloatValue="False" EditValueChanged="SpinEditTimelineViewDayCount_EditValueChanged" />
+					<dxe:SpinEdit MaxValue="100" LostFocus="SpinEditTimelineViewDayCount_OnLostFocus" VerticalAlignment="Center" x:Name="SpinEditTimelineViewDayCount" AllowNullInput="False" Height="23" Width="50" IsFloatValue="False" EditValueChanged="SpinEditTimelineViewDayCount_EditValueChanged" />
 				</StackPanel>
 				<Button Click="ReloadButton_OnClick" Margin="5,1,1,1" ToolTip="Kalender aktualisieren" Width="24" Height="24">
 					<Button.Template>
@@ -578,14 +596,15 @@
 						</ControlTemplate>
 					</Button.Template>
 				</Button>
+        <Button Click="ExportButton_OnClick" Margin="5,1,1,1" ToolTip="Exportieren" Width="24" Height="24" Visibility="Collapsed"/>
 			</StackPanel>
 			<Grid Grid.Column="2" Grid.Row="0" Margin="6,0,0,0" VerticalAlignment="Center">
 				<Grid.ColumnDefinitions>
 					<ColumnDefinition Width="Auto" />
                     <ColumnDefinition Width="Auto" />
+				    <ColumnDefinition Width="Auto" />
 					<ColumnDefinition Width="*" />
 					<ColumnDefinition Width="Auto" />
-					<ColumnDefinition Width="Auto" />
 				</Grid.ColumnDefinitions>
 				<CheckBox Grid.Column="0" Content="{markup:Translate Mitarbeiterfarben}" x:Name="MitarbeiterfarbenEinAusCheckBox" Checked="MitarbeiterfarbenEinAusCheckBox_OnChecked" 
 							Unchecked="MitarbeiterfarbenEinAusCheckBox_OnChecked"
@@ -593,13 +612,13 @@
 				<CheckBox Grid.Column="1" Content="Abwesenheiten" Margin="10,0,0,0" x:Name="AbwesenheitenEinAusCheckBox" Checked="AbwesenheitenEinAusCheckBox_OnChecked" 
 						  Unchecked="AbwesenheitenEinAusCheckBox_OnChecked" 
 						  IsChecked="{Binding Path=IsAbsenceTimeVisible, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type view:NewSchedulerView}}, Mode=TwoWay}" />
-                <CheckBox Grid.Column="2" Margin="10,0,0,0"  VerticalAlignment="Center" Content="Aufgaben" x:Name="ShowTasksCheckBox" Click="ShowTasksCheckBox_OnClick" />
-                <TextBlock IsEnabled="{Binding Enabled, UpdateSourceTrigger=PropertyChanged}" Grid.Column="0" Grid.ColumnSpan="3" VerticalAlignment="Center" HorizontalAlignment="Center">
+                <CheckBox Grid.Column="2" VerticalAlignment="Center" Margin="10,0,0,0" Content="Aufgaben" x:Name="ShowTasksCheckBox" Click="ShowTasksCheckBox_OnClick" />
+                <TextBlock IsEnabled="{Binding Enabled, UpdateSourceTrigger=PropertyChanged}" Grid.Column="3" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="10,0,0,0">
 					<Hyperlink RequestNavigate="ShowAppointmentRequests" NavigateUri="#" IsEnabled="{Binding Enabled, UpdateSourceTrigger=PropertyChanged}">
 						<TextBlock Text="{Binding Requests, UpdateSourceTrigger=PropertyChanged}" />
 					</Hyperlink>
 				</TextBlock>
-                <CheckBox Grid.Column="3" HorizontalAlignment="Right" VerticalAlignment="Center" Content="Nur private Termine anzeigen" x:Name="ShowPrivateAppointmentsCheckBox" Click="ShowPrivateAppointmentsCheckBox_OnClick" />
+                <CheckBox Grid.Column="4" HorizontalAlignment="Right" VerticalAlignment="Center" Content="Nur private Termine anzeigen" x:Name="ShowPrivateAppointmentsCheckBox" Click="ShowPrivateAppointmentsCheckBox_OnClick" />
             </Grid>
 			<Border Grid.Row="0" Grid.Column="3" Width="{Binding ElementName=RightExpanderButton, Path=ActualWidth}" />
 			<Border Grid.Row="0" Grid.Column="4" Width="{Binding ElementName=DateNavigator, Path=ActualWidth}">
@@ -626,9 +645,10 @@
                 <CheckBox x:Name="ZeigeNurMeineTermineCheckBox" Grid.Row="0" Content="Nur meine Termine anzeigen" Margin="3, 3, 3, 3" IsChecked="{Binding Path=ZeigeNurMeineTermine, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" Checked="NurMeineTermineEinAusCheckBox_OnChecked" Unchecked="NurMeineTermineEinAusCheckBox_OnChecked" />
                 <UniformGrid Grid.Column="0" x:Name="AuswahlGrid" Rows="2" Columns="1" Width="270" Grid.Row="1">
                     <TabControl SelectionChanged="Selector_OnSelectionChanged" x:Name="TabControl">
-                        <TabItem Header="{markup:Translate Mitarbeiter}" Style="{StaticResource MitarbeiterTabItemStyle}" x:Name="MitarbeiterTabItem">
+                        <TabItem Header="{t:Translate MitarbeiterPlural}" Style="{StaticResource MitarbeiterTabItemStyle}" x:Name="MitarbeiterTabItem">
                             <Grid x:Name="MitarbeiterTabGrid">
                                 <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="Auto" />
                                     <ColumnDefinition Width="*" />
                                     <ColumnDefinition Width="Auto" />
                                 </Grid.ColumnDefinitions>
@@ -638,8 +658,9 @@
                                     <RowDefinition Height="*" />
                                 </Grid.RowDefinitions>
                                 <CheckBox Grid.Column="0" Content="Alle auswählen" Margin="3" x:Name="AlleMitarbeiterCB" Click="AlleMitarbeiterCB_OnClick" />
-                                <ToggleButton Margin="3" Grid.Row="0" Grid.Column="1" Height="17" Width="36" Style="{StaticResource LupenToggleButtonStyle}" x:Name="MeinTB" Checked="MeinTB_OnChecked" Unchecked="MeinTB_OnChecked" />
-                                <Grid x:Name="MitarbeiterSuchGrid" Margin="0,1,0,3" Grid.Column="0" Grid.ColumnSpan="2" Background="Black" Grid.Row="1" Visibility="Collapsed">
+                                <CheckBox Grid.Column="1" Grid.Row="0" Content="Meine Teams" Click="MyTeamsCheckBox_OnClick" Margin="3" x:Name="TeamMembersCheckBox" HorizontalAlignment="Left" />
+                                <ToggleButton Margin="3" Grid.Row="0" Grid.Column="2" Height="17" Width="36" Style="{StaticResource LupenToggleButtonStyle}" x:Name="MeinTB" Checked="MeinTB_OnChecked" Unchecked="MeinTB_OnChecked" />
+                                <Grid x:Name="MitarbeiterSuchGrid" Margin="0,1,0,3" Grid.Column="0" Grid.ColumnSpan="3" Background="Black" Grid.Row="1" Visibility="Collapsed">
                                     <Grid.ColumnDefinitions>
                                         <ColumnDefinition Width="Auto" />
                                         <ColumnDefinition Width="*" />
@@ -647,7 +668,7 @@
                                     <Label Content="Suche:" Grid.Column="0" Foreground="White" />
                                     <TextBox x:Name="MitarbeiterSuchTextBox" Grid.Column="1" TextChanged="TextBoxEmployees_OnTextChanged" Margin="3" VerticalContentAlignment="Center" />
                                 </Grid>
-                                <ListView Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="2" Margin="0" ItemsSource="{Binding Path=GefilterteMitarbeiter, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" Background="Transparent" BorderThickness="0">
+                                <ListView Grid.Column="0" Grid.ColumnSpan="3" Grid.Row="2" Margin="0" ItemsSource="{Binding Path=GefilterteMitarbeiter, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" Background="Transparent" BorderThickness="0" PreviewMouseRightButtonDown="ListView_PreviewMouseRightButtonDown">
                                     <ListView.ItemContainerStyle>
                                         <Style TargetType="{x:Type ListViewItem}">
                                             <Setter Property="HorizontalContentAlignment" Value="{Binding Path=HorizontalContentAlignment, RelativeSource={RelativeSource AncestorLevel=1, AncestorType={x:Type ItemsControl}, Mode=FindAncestor}}" />
@@ -671,16 +692,20 @@
                                                                     <Grid.ColumnDefinitions>
                                                                         <ColumnDefinition Width="*" />
                                                                         <ColumnDefinition Width="Auto" />
+                                                                        <ColumnDefinition Width="Auto" />
                                                                     </Grid.ColumnDefinitions>
-                                                                    <CheckBox Content="{Binding Path=DetailDescription}" PreviewMouseDown="MitarbeiterListe_OnClick" Checked="ListItemCheckedEvent" Unchecked="ListItemCheckedEvent" VerticalAlignment="Center" FontSize="12" Foreground="#FFD2D2D2" FontFamily="Microsoft Sans Serif">
+                                                                    <CheckBox Content="{Binding Path=DetailDescription}" PreviewMouseLeftButtonDown="MitarbeiterListe_OnClick" Checked="ListItemCheckedEvent" Unchecked="ListItemCheckedEvent" VerticalAlignment="Center" FontSize="11" Foreground="#FFD2D2D2" FontFamily="Microsoft Sans Serif">
                                                                         <CheckBox.IsChecked>
                                                                             <MultiBinding Converter="{StaticResource CheckBoxConverter}" ConverterParameter="Mitarbeiter">
                                                                                 <Binding Path="EmployeeOid" Mode="OneWay" />
-                                                                                <Binding Path="SelectedEmployees" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type view:NewSchedulerView}}" />
+                                                                                <Binding Path="SelectedEmployees" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged" 
+                                                                                    RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type view:NewSchedulerView}}" />
                                                                             </MultiBinding>
                                                                         </CheckBox.IsChecked>
+
                                                                     </CheckBox>
                                                                     <Border Width="15" Height="15" Grid.Column="1" Background="{Binding Path=FilterableBrush}" CornerRadius="3" />
+                                                                    <Button x:Name="btn_showEmployeeInformation" Width="15" Height="15" Grid.Column="2" Margin="5 0 5 0" Click="btn_showEmployeeInformation_Click" FontFamily="Microsoft Sans Serif" Content="i" Visibility="{Binding Converter={StaticResource InformationButtonVisibilityConverter}}"/>
                                                                 </Grid>
                                                             </Border>
                                                         </Grid>
@@ -736,8 +761,8 @@
                                 </Grid.RowDefinitions>
                                 <Grid Grid.Row="0">
                                     <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="*" />
                                         <ColumnDefinition Width="Auto" />
+                                        <ColumnDefinition Width="*" />
                                         <ColumnDefinition Width="Auto" />
                                     </Grid.ColumnDefinitions>
                                     <Grid.RowDefinitions>
@@ -745,7 +770,7 @@
                                         <RowDefinition Height="*" />
                                     </Grid.RowDefinitions>
                                     <CheckBox Grid.Row="0" Grid.Column="0" Content="Alle auswählen" Margin="3" x:Name="AlleKlientenCB" Click="AlleKlientennCB_OnClick" HorizontalAlignment="Left" HorizontalContentAlignment="Center" />
-                                    <CheckBox Grid.Row="0" Grid.Column="1" Content="{markup:Translate Nur meine Klienten}" Margin="3" x:Name="NurMeineKlientenCB" HorizontalAlignment="Right" Click="NurEigeneKlientenAnzeigen" IsThreeState="False" HorizontalContentAlignment="Center" />
+                                    <CheckBox Grid.Row="0" Grid.Column="1" Content="{markup:Translate Nur meine Klienten}" Margin="3" x:Name="NurMeineKlientenCB" HorizontalAlignment="Left" Click="NurEigeneKlientenAnzeigen" IsThreeState="False" HorizontalContentAlignment="Center" />
                                     <ToggleButton Margin="3" Grid.Row="0" Grid.Column="2" Height="17" Width="36" Style="{StaticResource LupenToggleButtonStyle}" x:Name="MeinTB2" Checked="MeinTB2_OnChecked" Unchecked="MeinTB2_OnChecked" />
                                     <Grid x:Name="KlientenSuchGrid" Margin="0,1,0,3" Grid.Column="0" Grid.ColumnSpan="3" Background="Black" Grid.Row="1" Visibility="Collapsed">
                                         <Grid.ColumnDefinitions>
@@ -777,6 +802,10 @@
                                                             </Border>
                                                             <Border x:Name="ItemContent" CornerRadius="5" MinHeight="25">
                                                                 <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="5,3,5,3" OpacityMask="{x:Null}" SnapsToDevicePixels="True">
+                                                                    <Grid.ColumnDefinitions>
+                                                                        <ColumnDefinition Width="*" />
+                                                                        <ColumnDefinition Width="Auto" />
+                                                                    </Grid.ColumnDefinitions>
                                                                     <CheckBox Content="{Binding Path=DetailDescription}" PreviewMouseDown="KlientenListe_OnClick" Checked="ListItemCheckedEvent" Unchecked="ListItemCheckedEvent" VerticalAlignment="Center" FontSize="12" Foreground="#FFD2D2D2" FontFamily="Microsoft Sans Serif">
                                                                         <CheckBox.IsChecked>
                                                                             <MultiBinding Converter="{StaticResource CheckBoxConverter}" ConverterParameter="Klienten">
@@ -785,6 +814,8 @@
                                                                             </MultiBinding>
                                                                         </CheckBox.IsChecked>
                                                                     </CheckBox>
+
+                                                                    <Button x:Name="btn_showCustomerInformation" Width="15" Height="15" Grid.Column="1" Margin="5 0 5 0" Click="btn_showCustomerInformation_Click"  FontFamily="Microsoft Sans Serif" Content="i" Visibility="{Binding Converter={StaticResource InformationButtonVisibilityConverter}}"/>
                                                                 </Grid>
                                                             </Border>
                                                         </Grid>
@@ -853,7 +884,8 @@
                                                                 <CheckBox.IsChecked>
                                                                     <MultiBinding Converter="{StaticResource CheckBoxConverter}" ConverterParameter="Ressourcen" UpdateSourceTrigger="PropertyChanged" NotifyOnSourceUpdated="True">
                                                                         <Binding Path="ResourceOid" Mode="OneWay" />
-                                                                        <Binding Path="SelectedResources" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type view:NewSchedulerView}}" />
+                                                                        <Binding Path="SelectedResources" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged" 
+                                                                            RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type view:NewSchedulerView}}" />
                                                                     </MultiBinding>
                                                                 </CheckBox.IsChecked>
                                                             </CheckBox>
@@ -916,7 +948,9 @@
 			<dxsch:SchedulerControl Grid.Column="2" x:Name="Scheduler" dx:ThemeManager.ThemeName="Office2010Black"
                                     FormCustomizationUsingMVVMLocal="False"
                                     InplaceEditorShowing="Scheduler_OnInplaceEditorShowing"
-							        GroupType="None" AppointmentDrag="Scheduler_OnAppointmentDrag"
+							        GroupType="None" 
+                                    AppointmentDrag="Scheduler_OnAppointmentDrag" 
+                                    AppointmentDrop="Scheduler_OnAppointmentDrop" 
                                     VerticalAlignment="Stretch"
 							        EditAppointmentFormShowing="Scheduler_EditAppointmentFormShowing"
 							        EditRecurrentAppointmentFormShowing="SchedulerControl_EditRecurrentAppointmentFormShowing"
@@ -960,7 +994,7 @@
 															          End="End"
 															          Subject="Subject"
 															          Description="Description"
-															          Label="LabelId"
+															          Label="LabelKey"
 															          AllDay="AllDay"
 															          ResourceId="ResourceId"
 															          RecurrenceInfo="RecurrenceInfo"
@@ -985,9 +1019,9 @@
 					<dxb:RemoveBarItemAndLinkAction ItemName="{x:Static dxsch:SchedulerMenuItemName.NewRecurringAppointment}" />
 					<dxb:RemoveBarItemAndLinkAction ItemName="{x:Static dxsch:SchedulerMenuItemName.NewRecurringEvent}" />
 
-                    <dxb:AddBarItemAction>
+                    <!--<dxb:AddBarItemAction>
                         <dxb:BarButtonItem Name="AufgabeAnlegenButtonItem" Content="{markup:Translate Neue Aufgabe}" ItemClick="AufgabeAnlegen_OnItemClick" />
-                    </dxb:AddBarItemAction>
+                    </dxb:AddBarItemAction>-->
 
 					<dxb:AddBarItemAction>
 						<dxb:BarButtonItem Name="MitarbeiterVerfuegbarkeitPruefenButtonItem" 
@@ -1000,19 +1034,19 @@
 				<dxsch:SchedulerControl.AppointmentMenuCustomizations>
 				    <dxb:RemoveBarItemAndLinkAction ItemName="{x:Static dxsch:SchedulerMenuItemName.RestoreOccurrence}" />
 				    <dxb:AddBarItemAction>
-				    <dxb:BarButtonItem Name="RestoreAppointmentButtonItem" Content="Serientermin wiederherstellen" ItemClick="RestoreAppointmentButtonItem_OnItemClick" />
+				        <dxb:BarButtonItem Name="RestoreAppointmentButtonItem" Content="Serientermin wiederherstellen" ItemClick="RestoreAppointmentButtonItem_OnItemClick" />
 				    </dxb:AddBarItemAction>
 				    <dxb:BarItemSeparator Name="ZusagenStackSeperatorTop"></dxb:BarItemSeparator>
 					<dxb:AddBarItemAction>
-					<dxb:BarButtonItem Name="ZusagenButtonItem" Content="Zusagen" ItemClick="ZusagenButtonItem_OnItemClick" />
+					    <dxb:BarButtonItem Name="ZusagenButtonItem" Content="Zusagen" ItemClick="ZusagenButtonItem_OnItemClick" />
 					</dxb:AddBarItemAction>
 					<dxb:AddBarItemAction>
-					<dxb:BarButtonItem Name="MitVorbehaltButtonItem" Content="Mit Vorbehalt zusagen" ItemClick="MitVorbehaltButtonItem_OnItemClick" />
+					    <dxb:BarButtonItem Name="MitVorbehaltButtonItem" Content="Mit Vorbehalt zusagen" ItemClick="MitVorbehaltButtonItem_OnItemClick" />
 					</dxb:AddBarItemAction>
 					<dxb:AddBarItemAction>
-					  <dxb:BarButtonItem Name="AbsagenButtonItem" Content="Absagen" ItemClick="AbsagenButtonItem_OnItemClick" />
+                        <dxb:BarButtonItem Name="AbsagenButtonItem" Content="Absagen" ItemClick="AbsagenButtonItem_OnItemClick" />
 					</dxb:AddBarItemAction>
-				  <dxb:BarItemSeparator Name="ZusagenStackSeperatorBottom"></dxb:BarItemSeparator>
+                    <dxb:BarItemSeparator Name="ZusagenStackSeperatorBottom"></dxb:BarItemSeparator>
           <dxb:AddBarItemAction>
             <dxb:BarButtonItem Name="ZeiterfassungButtonItem" Content="{markup:Translate In Zeiterfassung übertragen}" ItemClick="ZeiterfassungButtonItem_OnItemClick" />
           </dxb:AddBarItemAction>
@@ -1039,7 +1073,7 @@
 			</dxe:DateNavigator>
 		</Grid>
 	    
-		<Border Grid.Row="0" Grid.RowSpan="2" x:Name="PopupContent" />
+		<Border Grid.Row="0" Grid.RowSpan="2" x:Name="PopupContent" Margin="0,-10,0,10" />
     <Popup Grid.Row="0" StaysOpen="True" Placement="MousePoint" Width="290" Height="80" Closed="popup_Closed" Opened="popup_Opened" x:Name="DeleteAppointmentsPopup">
       <Grid Background="{StaticResource ControlBackground}" Margin="2,2,2,2">
           <Grid.ColumnDefinitions>

BeWo/Scheduler/View/RequestAnswerView.xaml

@@ -147,14 +147,25 @@
 				<Label Grid.Column="0" Grid.Row="7" Margin="3" Content="Notiz"/>
 				<TextBox Grid.Column="1" Grid.Row="7" Grid.ColumnSpan="3" AcceptsReturn="True" VerticalScrollBarVisibility="Auto" VerticalAlignment="Stretch" HorizontalScrollBarVisibility="Disabled" Margin="3" TextWrapping="Wrap" Text="{Binding Path=SelektierterTermin.Description}" IsReadOnly="True" />
 
-				<StackPanel x:Name="ZusagenStack" Grid.Row="8" Grid.Column="0" Grid.ColumnSpan="4" HorizontalAlignment="Right" Orientation="Horizontal" Visibility="{Binding Path=SelektierterTermin, Converter={StaticResource Int2VisibilityConverter}, ConverterParameter=ZusagenStack}">
-					<Button Margin="3" Content="Zusagen" Click="Zusagen_OnClick" IsEnabled="{Binding SelektierterTermin, Converter={StaticResource ObjectBoolConverter}}" />
-					<Button Margin="3" Content="Mit Vorbehalt" Click="MitVorbehalt_OnClick" IsEnabled="{Binding SelektierterTermin, Converter={StaticResource ObjectBoolConverter}}" />
-					<Button Margin="3" Content="Absagen" Click="Absagen_OnClick" IsEnabled="{Binding SelektierterTermin, Converter={StaticResource ObjectBoolConverter}}" />
-				</StackPanel>
-				<Button x:Name="OkButton" Grid.Row="8" Grid.Column="0" Grid.ColumnSpan="4" HorizontalAlignment="Right" Margin="3" Content="OK" Click="OK_OnClick" Visibility="{Binding Path=SelektierterTermin, Converter={StaticResource Int2VisibilityConverter}, ConverterParameter=OKBtn}" />
+                <Grid Grid.Row="8" Grid.Column="0" Grid.ColumnSpan="4">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="*" />
+                    </Grid.ColumnDefinitions>
+                    <Button x:Name="AlleBestaetigen" Grid.Column="0" Content="Alle bestätigen" Margin="3" Click="ButtonBase_OnClick" Width="100" />
+                    <StackPanel x:Name="ZusagenStack" Grid.Column="1" HorizontalAlignment="Right" Orientation="Horizontal" Visibility="{Binding Path=SelektierterTermin, Converter={StaticResource Int2VisibilityConverter}, ConverterParameter=ZusagenStack}">
+                        <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
+                            <Button Margin="3" Content="Zusagen" Click="Zusagen_OnClick" IsEnabled="{Binding SelektierterTermin, Converter={StaticResource ObjectBoolConverter}}" />
+                            <Button Margin="3" Content="Mit Vorbehalt" Click="MitVorbehalt_OnClick" IsEnabled="{Binding SelektierterTermin, Converter={StaticResource ObjectBoolConverter}}" />
+                            <Button Margin="3" Content="Absagen" Click="Absagen_OnClick" IsEnabled="{Binding SelektierterTermin, Converter={StaticResource ObjectBoolConverter}}" />
+                        </StackPanel>
+
+                    </StackPanel>
+                </Grid>
+				
+				<Button x:Name="OkButton" Grid.Row="8" Grid.Column="0" Grid.ColumnSpan="4" HorizontalAlignment="Right" Margin="3" Width="100" Content="OK" Click="OK_OnClick" Visibility="{Binding Path=SelektierterTermin, Converter={StaticResource Int2VisibilityConverter}, ConverterParameter=OKBtn}" />
 			</Grid>
 		</Grid>
-		<Button Grid.Row="1" x:Name="CloseBtn" Content="Schließen" HorizontalAlignment="Right" Margin="3" Click="CloseButton_Click" />
+		<Button Grid.Row="1" x:Name="CloseBtn" Content="Schließen" HorizontalAlignment="Right" Margin="3" Width="100" Click="CloseButton_Click" />
     </Grid>
 </dx:DXWindow>

BeWo/Scheduler/View/RequestAnswerView.xaml.cs

@@ -14,7 +14,6 @@ using BeWo.ServiceProxy;
 
 using BS.Shared;
 using BS.Shared.DataContracts;
-using BS.Shared.DataContracts.Compact;
 using BS.Shared.Extensions;
 
 using DevExpress.Xpf.Editors;
@@ -25,6 +24,8 @@ namespace BeWo.Scheduler.View
 {
 	public partial class RequestAnswerView : INotifyPropertyChanged
 	{
+	    private bool raiseChangeEvent = true;
+
 		public static readonly RoutedEvent ParticipationChangedEvent = EventManager.RegisterRoutedEvent(nameof(ParticipationChanged), RoutingStrategy.Bubble, typeof(RoutedEventHandler), typeof(RequestAnswerView));
 		public event RoutedEventHandler ParticipationChanged
 		{
@@ -48,13 +49,13 @@ namespace BeWo.Scheduler.View
 
 		public ObservableCollection<IBeWoAppointment> OffeneTermine { get; set; }
 
-		private IBeWoAppointment _selektierterTermin;
+		private IBeWoAppointment _SelektierterTermin;
 		public IBeWoAppointment SelektierterTermin
 		{
-			get => _selektierterTermin;
+			get => _SelektierterTermin;
 		    set
 			{
-				_selektierterTermin = value;
+				_SelektierterTermin = value;
 				OnPropertyChanged(nameof(SelektierterTermin));
 			}
 		}
@@ -68,7 +69,7 @@ namespace BeWo.Scheduler.View
 			    var item = (SchedulerAppointmentVM) beWoAppointment;
 			    foreach(var relation in item.EmployeeList.Where(emp => emp.IsPChanged && emp.ParticipationAnswer != ParticipationAnswer.Offen && emp.ParticipationAnswer != ParticipationAnswer.Verstrichen && !emp.Employee.EmployeeOid.Equals(BeWoApp.LoggedOnEmployee.EmployeeOid)))
 		        {
-		            if(statusUpdatesAsAppointments.All(a => a.LabelId != relation.Employee2SchedulerAppointmentOid))
+		            if(statusUpdatesAsAppointments.All(a => a.LabelKey != relation.Employee2SchedulerAppointmentOid))
 		            {
 		                if(relation.Employee2SchedulerAppointmentOid != null)
 		                {
@@ -88,11 +89,11 @@ namespace BeWo.Scheduler.View
 	    private static SchedulerAppointmentVM BuildNewVMFromOldVM(SchedulerAppointmentVM item, long emp2AppOid)
 	    {
 	        var customFieldStorage = (CustomFieldStorage) item.CustomFields[nameof(CustomFieldStorage)];
-	        
+	        var dc = item.CommitToDataContract();
             return new SchedulerAppointmentVM(new SchedulerAppointmentDC
             {
-                SchedulerAppointmentOid        = item.CommitToDataContract().SchedulerAppointmentOid,
-                NewSchedulerAppointmentVersion = item.CommitToDataContract().NewSchedulerAppointmentVersion,
+                SchedulerAppointmentOid        = dc.SchedulerAppointmentOid,
+                NewSchedulerAppointmentVersion = dc.NewSchedulerAppointmentVersion,
                 IsPrivate                      = item.IsPrivate,
                 RecurrenceInfo                 = item.RecurrenceInfo,
                 Type                           = item.EventType,
@@ -108,9 +109,13 @@ namespace BeWo.Scheduler.View
                 Status                         = 1,
                 Originator                     = customFieldStorage.Originator,
                 IsTeilnahmeBestaetigung        = true,
-                SupportConceptList             = customFieldStorage.SupportConceptList
+                SupportConceptList             = customFieldStorage.SupportConceptList,
+                ActivationType                 = dc.ActivationType,
+                ServiceRecordList              = customFieldStorage.ServiceRecordList
             })
-            { CustomFields                     = item.CustomFields, LabelId = Convert.ToInt32(emp2AppOid)};
+            {
+                CustomFields = item.CustomFields, LabelKey = emp2AppOid
+            };
 	    }
 
 		private void CloseButton_Click(object sender, RoutedEventArgs e)
@@ -153,6 +158,7 @@ namespace BeWo.Scheduler.View
 			});
 
 		    ToggleControls();
+		    raiseChangeEvent = true;
             ServiceFacade.DoResourceServiceAsync(s => s.UpdateSchedulerAppointments(new List<SchedulerAppointmentDC> { termin.CommitToDataContract() }), UpdateView);
 		}
 
@@ -175,25 +181,32 @@ namespace BeWo.Scheduler.View
 
 					vm.UpdateCustomFields();
                     
-				    if (vm.LabelId == 0)
+				    if (vm.LabelKey is null)
 				    {
 				        this.Dispatch(() =>
 				        {
 				            OffeneTermine = OffeneTermine.Where(w => !w.Equals(vm)).ToObservableCollection();
-				            OnPropertyChanged(nameof(OffeneTermine));
 
-				            RaiseParticipationChangedEventEvent();
+				            if (raiseChangeEvent)
+				            {
+				                OnPropertyChanged(nameof(OffeneTermine));
+
+				                RaiseParticipationChangedEventEvent();
+				            }
 				        });
 				    }
 				    else
 				    {
-                        var test = (SchedulerAppointmentVM) OffeneTermine.FirstOrDefault(f => dc.EmployeeList.Any(a => a.Employee2SchedulerAppointmentOid.HasValue && a.Employee2SchedulerAppointmentOid.Value == f.LabelId));
+                        var test = (SchedulerAppointmentVM) OffeneTermine.FirstOrDefault(f => dc.EmployeeList.Any(a => a.Employee2SchedulerAppointmentOid.HasValue && a.Employee2SchedulerAppointmentOid.Value == f.LabelKey));
                         this.Dispatch(() =>
                         {
                             OffeneTermine = OffeneTermine.Where(w => !w.Equals(test)).ToObservableCollection();
-                            OnPropertyChanged(nameof(OffeneTermine));
+                            if (raiseChangeEvent)
+                            {
+                                OnPropertyChanged(nameof(OffeneTermine));
 
-                            RaiseParticipationChangedEventEvent();
+                                RaiseParticipationChangedEventEvent();
+                            }
                         });
                     }
 				}
@@ -205,27 +218,35 @@ namespace BeWo.Scheduler.View
 
 			    ToggleControls();
 
-                if (OffeneTermine.Count == 0 && OTListView.Items.Count == 0)
-				{
-				    Close();
-				}
-				else
-				{
-				    OTListView.SelectedIndex = 0;
-				}
+			    if (!raiseChangeEvent)
+			    {
+                    //Close();
+			    }
+			    else
+			    {
+			        if (OffeneTermine.Count == 0 && OTListView.Items.Count == 0)
+			        {
+			            Close();
+			        }
+			        else
+			        {
+			            OTListView.SelectedIndex = 0;
+			        }
+                }
+                
 			});
 		}
 
 		private void OK_OnClick(object sender, RoutedEventArgs e)
 		{
 			SelektierterTermin = OTListView.SelectedItem as IBeWoAppointment;
-            if(_selektierterTermin != null && _selektierterTermin.Start < DateTime.Now && _selektierterTermin.End < DateTime.Now)
+            if(_SelektierterTermin != null && _SelektierterTermin.Start < DateTime.Now && _SelektierterTermin.End < DateTime.Now)
             {
                 if(SelektierterTermin != null && BeWoApp.LoggedOnEmployee.EmployeeOid.HasValue)
                 {
                     var customFieldStorage = (CustomFieldStorage) SelektierterTermin.CustomFields[nameof(CustomFieldStorage)];
                     
-                    var emp2App = customFieldStorage.EmployeeList.ToList().Find(f => f.Employee2SchedulerAppointmentOid == SelektierterTermin.LabelId) ??
+                    var emp2App = customFieldStorage.EmployeeList.ToList().Find(f => f.Employee2SchedulerAppointmentOid == SelektierterTermin.LabelKey) ??
                                   customFieldStorage.EmployeeList.ToList().Find(f => f.Employee.EmployeeOid == BeWoApp.LoggedOnEmployee.EmployeeOid.Value);
 
                     if(emp2App.Employee.EmployeeOid == BeWoApp.LoggedOnEmployee.EmployeeOid.Value)
@@ -238,22 +259,24 @@ namespace BeWo.Scheduler.View
                 }
 
                 ToggleControls();
+                raiseChangeEvent = true;
                 ServiceFacade.DoResourceServiceAsync(s => s.UpdateSchedulerAppointments(new List<SchedulerAppointmentDC> { ((SchedulerAppointmentVM)SelektierterTermin).DataContract }), UpdateView);
 
                 return;
             }
 
-            if(SelektierterTermin == null || SelektierterTermin.LabelId <= 0)
+            if(SelektierterTermin?.LabelKey is null)
 		    {
 		        return;
 		    }
 
 		    var customFieldStorage2 = (CustomFieldStorage)SelektierterTermin.CustomFields[nameof(CustomFieldStorage)];
 
-		    customFieldStorage2.EmployeeList.ToList().Find(f => f.Employee2SchedulerAppointmentOid == SelektierterTermin.LabelId).IsPC_CheckedTs = DateTime.Now;
-		    customFieldStorage2.EmployeeList.ToList().Find(f => f.Employee2SchedulerAppointmentOid == SelektierterTermin.LabelId).IsPChanged = false;
+		    customFieldStorage2.EmployeeList.ToList().Find(f => f.Employee2SchedulerAppointmentOid == SelektierterTermin.LabelKey).IsPC_CheckedTs = DateTime.Now;
+		    customFieldStorage2.EmployeeList.ToList().Find(f => f.Employee2SchedulerAppointmentOid == SelektierterTermin.LabelKey).IsPChanged = false;
 
 		    ToggleControls();
+		    raiseChangeEvent = true;
             ServiceFacade.DoResourceServiceAsync(s => s.UpdateSchedulerAppointments(new List<SchedulerAppointmentDC> {((SchedulerAppointmentVM) SelektierterTermin).DataContract}), UpdateView);
 		}
 
@@ -267,7 +290,9 @@ namespace BeWo.Scheduler.View
 	        ZusagenStack.IsEnabled = !ZusagenStack.IsEnabled;
 	        OkButton.IsEnabled = !OkButton.IsEnabled;
 	        CloseBtn.IsEnabled = !CloseBtn.IsEnabled;
-        }
+	        AlleBestaetigen.IsEnabled = !AlleBestaetigen.IsEnabled;
+
+	    }
 
 	    private void PopupBaseEdit_OnPopupOpening(object sender, OpenPopupEventArgs e)
 	    {
@@ -279,7 +304,57 @@ namespace BeWo.Scheduler.View
 	    {
 	        BeWoApp.MainControl.AufOffeneTerminePruefen();
 	    }
-	}
+
+        private void ButtonBase_OnClick(object sender, RoutedEventArgs e)
+        {
+            var appointmentsToUpdate = new List<SchedulerAppointmentDC>();
+
+            foreach(var appointment in OffeneTermine)
+            {
+                if(appointment.CustomFields["CustomFieldStorage"] is CustomFieldStorage customFieldStorage)
+                {
+                    var employeeList = customFieldStorage.EmployeeList ?? new ObservableCollection<Employee2SchedulerAppointmentDC>();
+
+                    foreach(var e2Sa in employeeList)
+                    {
+                        e2Sa.IsPC_CheckedTs = DateTime.Now;
+                        
+                        if (e2Sa.Employee.EmployeeOid == BeWoApp.LoggedOnEmployee.EmployeeOid)
+                        {
+                            if(appointment.Start < DateTime.Now && appointment.End < DateTime.Now)
+                            {
+                                e2Sa.ParticipationAnswer = ParticipationAnswer.Verstrichen;
+                                e2Sa.IsPC_CheckedTs = DateTime.Now;
+                                e2Sa.IsPChanged = false;
+                            }
+                            else
+                            {
+                                e2Sa.IsPChanged = true;
+                                e2Sa.ParticipationAnswer = ParticipationAnswer.Zusage;
+                            }
+                        }
+                        else
+                        {
+                            e2Sa.IsPChanged = false;
+                        }
+
+                    }
+
+                    if (employeeList.Any())
+                    {
+                        if(appointment is SchedulerAppointmentVM vm)
+                        {
+                            appointmentsToUpdate.AddIfNotIn(vm.CommitToDataContract());
+                        }
+                    }
+                }
+            }
+            ToggleControls();
+            raiseChangeEvent = false;
+            ServiceFacade.DoResourceServiceAsync(s => s.UpdateSchedulerAppointments(appointmentsToUpdate), UpdateView);
+            Close();
+        }
+    }
 
 	public class LVItemConverter : IValueConverter
 	{
@@ -292,7 +367,7 @@ namespace BeWo.Scheduler.View
 		        return string.Empty;
 		    }
 
-			if(app.LabelId <= 0)
+			if(app.LabelKey is null)
 			{
                 return $"{app.Start.ToShortDateString()}: {app.Subject}";
 			}
@@ -301,7 +376,7 @@ namespace BeWo.Scheduler.View
 
 		    var customFieldStorage = (CustomFieldStorage) app.CustomFields[nameof(CustomFieldStorage)];
 		    
-			var l = customFieldStorage.EmployeeList.ToList().Find(f => f.Employee2SchedulerAppointmentOid == app.LabelId);
+			var l = customFieldStorage.EmployeeList.ToList().Find(f => f.Employee2SchedulerAppointmentOid == app.LabelKey);
 
 			switch(l.ParticipationAnswer)
 			{

BeWo/Scheduler/View/SchedulerAppointmentEditForm.xaml

@@ -1,17 +1,19 @@
 <localSchView:AbstractAppointmentEditForm x:Class="BeWo.Scheduler.View.SchedulerAppointmentEditForm"
-										                      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-										                      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-										                      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-										                      xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-										                      xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
-                                          xmlns:dxschint="http://schemas.devexpress.com/winfx/2008/xaml/scheduler/internal"
-                                          xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
-                                          xmlns:dxsch="http://schemas.devexpress.com/winfx/2008/xaml/scheduler"
-                                          xmlns:converter="clr-namespace:BeWo.Scheduler.Converter"
-										                      xmlns:bewoConverter="clr-namespace:BeWo.Converter"
-										                      xmlns:localSchView="clr-namespace:BeWo.Scheduler.View"
-										                      xmlns:search="clr-namespace:BeWo.View.Search"
-                                          mc:Ignorable="d" d:DesignHeight="300" d:DesignWidth="300" Width="420">
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+    xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
+    xmlns:dxschint="http://schemas.devexpress.com/winfx/2008/xaml/scheduler/internal"
+    xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
+    xmlns:dxsch="http://schemas.devexpress.com/winfx/2008/xaml/scheduler"
+    xmlns:converter="clr-namespace:BeWo.Scheduler.Converter"
+    xmlns:bewoConverter="clr-namespace:BeWo.Converter"
+    xmlns:localSchView="clr-namespace:BeWo.Scheduler.View"
+    xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup"
+    xmlns:search="clr-namespace:BeWo.View.Search"
+    xmlns:t="clr-namespace:BeWo.MultiLanguage.Markup"
+    mc:Ignorable="d" d:DesignHeight="300" d:DesignWidth="300" Width="420">
 	<localSchView:AbstractAppointmentEditForm.Resources>
 		<dxschint:TimeSpanToDateTimeConverter x:Key="TimeSpanToDateTimeConverter"/>
 		<converter:Recurrence2GermanConverter x:Key="Recurrence2GermanConverter"/>
@@ -19,42 +21,42 @@
 		<converter:NewCalendarBackgroundConverter x:Key="NewCalendarBackgroundConverter" />
 		<bewoConverter:BoolVisibilityConverter x:Key="BoolVisibilityConverter" />
 		<bewoConverter:ParticipationBrushConverter x:Key="ParticipationBrushConverter" />
-    <localSchView:RemoveElementVisibilityConverter x:Key="RemoveElementVisibilityConverter" />
+        <localSchView:RemoveElementVisibilityConverter x:Key="RemoveElementVisibilityConverter" />
+        <localSchView:InformationVisibilityConverter x:Key="InformationVisibilityConverter" />
 	    
-	  <Style x:Key="MultiSupportConceptSelectionControlStyle" TargetType="{x:Type ListBoxItem}">
-          <Setter Property="HorizontalContentAlignment" Value="{Binding Path=HorizontalContentAlignment, RelativeSource={RelativeSource AncestorLevel=1, AncestorType={x:Type ItemsControl}, Mode=FindAncestor}}" />
-          <Setter Property="VerticalContentAlignment" Value="{Binding Path=VerticalContentAlignment, RelativeSource={RelativeSource AncestorLevel=1, AncestorType={x:Type ItemsControl}, Mode=FindAncestor}}" />
-          <Setter Property="Margin" Value="2,2,2,0" />
-          <Setter Property="Template">
-              <Setter.Value>
-                  <ControlTemplate>
-                      <Grid>
-                          <Border x:Name="ItemBorder" CornerRadius="5" MinHeight="25" Background="#FF000000">
-                              <Border.OpacityMask>
-                                  <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
-                                      <GradientStop Color="#19000000" Offset="0" />
-                                      <GradientStop Color="#26000000" Offset="1" />
-                                  </LinearGradientBrush>
-                              </Border.OpacityMask>
+        <Style x:Key="MultiSupportConceptSelectionControlStyle" TargetType="{x:Type ListBoxItem}">
+            <Setter Property="HorizontalContentAlignment" Value="{Binding Path=HorizontalContentAlignment, RelativeSource={RelativeSource AncestorLevel=1, AncestorType={x:Type ItemsControl}, Mode=FindAncestor}}" />
+            <Setter Property="VerticalContentAlignment" Value="{Binding Path=VerticalContentAlignment, RelativeSource={RelativeSource AncestorLevel=1, AncestorType={x:Type ItemsControl}, Mode=FindAncestor}}" />
+            <Setter Property="Margin" Value="2,2,2,0" />
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate>
+                        <Grid>
+                            <Border x:Name="ItemBorder" CornerRadius="5" MinHeight="25" Background="#FF000000">
+                                <Border.OpacityMask>
+                                    <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+                                        <GradientStop Color="#19000000" Offset="0" />
+                                        <GradientStop Color="#26000000" Offset="1" />
+                                    </LinearGradientBrush>
+                                </Border.OpacityMask>
+                            </Border>
 
-                          </Border>
+                            <Border x:Name="ItemContent" CornerRadius="5" MinHeight="25" Background="{StaticResource SupportConceptContentBrush}">
+                                <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="5,3,5,3" OpacityMask="{x:Null}" SnapsToDevicePixels="True">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="*" />
+                                        <ColumnDefinition Width="Auto" />
+                                    </Grid.ColumnDefinitions>
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                    </Grid.RowDefinitions>
 
-                          <Border x:Name="ItemContent" CornerRadius="5" MinHeight="25" Background="{StaticResource SupportConceptContentBrush}">
-                              <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="5,3,5,3" OpacityMask="{x:Null}" SnapsToDevicePixels="True">
-                                  <Grid.ColumnDefinitions>
-                                      <ColumnDefinition Width="*" />
-                                      <ColumnDefinition Width="Auto" />
-                                  </Grid.ColumnDefinitions>
-                                  <Grid.RowDefinitions>
-                                      <RowDefinition Height="Auto" />
-                                      <RowDefinition Height="Auto" />
-                                  </Grid.RowDefinitions>
-
-                                  <TextBlock x:Name="txtDetail1" Grid.Column="0" Grid.Row="0" Text="{Binding Path=CustomerName}" FontSize="12" Foreground="#FFD2D2D2" FontFamily="Microsoft Sans Serif" />
-                                  <TextBlock x:Name="txtDetail2" Grid.Column="0" Grid.Row="1" ToolTip="{Binding Path=FirstCostBearerDetailString}" Text="{Binding Path=FirstCostBearerDetailString}" FontSize="10" Foreground="{Binding ForegroundBrush}" FontFamily="Microsoft Sans Serif" />
-                                  <Button x:Name="btnRemoveSupportConcept" Grid.Column="1" Grid.Row="0" Grid.RowSpan="2" Width="20" Height="20" ToolTip="Hilfeplan aus der Liste entfernen" Tag="{Binding}" Style="{DynamicResource CloseButtonStyle}" Click="BtnRemoveSupportConcept_Click" Margin="3,0,0,0" />
-                              </Grid>
-                          </Border>
+                                    <TextBlock x:Name="txtDetail1" Grid.Column="0" Grid.Row="0" Text="{Binding Path=CustomerName}" FontSize="12" Foreground="#FFD2D2D2" FontFamily="Microsoft Sans Serif" />
+                                    <TextBlock x:Name="txtDetail2" Grid.Column="0" Grid.Row="1" ToolTip="{Binding Path=FirstCostBearerDetailString}" Text="{Binding Path=FirstCostBearerDetailString}" FontSize="10" Foreground="{Binding ForegroundBrush}" FontFamily="Microsoft Sans Serif" />
+                                    <Button x:Name="btnRemoveSupportConcept" Grid.Column="1" Grid.Row="0" Grid.RowSpan="2" Width="20" Height="20" ToolTip="Hilfeplan aus der Liste entfernen" Tag="{Binding}" Style="{DynamicResource CloseButtonStyle}" Click="BtnRemoveSupportConcept_Click" Margin="3,0,0,0" />
+                                </Grid>
+                            </Border>
                       </Grid>
 
                       <ControlTemplate.Triggers>
@@ -101,8 +103,8 @@
                       </ControlTemplate.Triggers>
                   </ControlTemplate>
               </Setter.Value>
-          </Setter>
-      </Style>
+            </Setter>
+        </Style>
 
 		<Style x:Key="MultiElementSelectionControlStyle" TargetType="{x:Type ListBoxItem}">
 			<Setter Property="HorizontalContentAlignment" Value="{Binding Path=HorizontalContentAlignment, RelativeSource={RelativeSource AncestorLevel=1, AncestorType={x:Type ItemsControl}, Mode=FindAncestor}}" />
@@ -127,10 +129,12 @@
 										<ColumnDefinition Width="Auto" />
 										<ColumnDefinition Width="*" />
 										<ColumnDefinition Width="Auto" />
+										<ColumnDefinition Width="Auto" />
 									</Grid.ColumnDefinitions>
 									<Border Grid.Column="0" CornerRadius="2" Width="5" Height="15" Background="{Binding Converter={StaticResource ParticipationBrushConverter}}" BorderThickness="1" BorderBrush="{Binding Converter={StaticResource ParticipationBrushConverter}, ConverterParameter=Border}" />
 									<TextBlock VerticalAlignment="Center" Grid.Column="1" Text="{Binding Converter={StaticResource TextFromIDataContractConverter}}" Margin="3,0,0,0" FontSize="12" Foreground="#FFD2D2D2" FontFamily="Microsoft Sans Serif" />
-									<Button x:Name="btnRemoveElement" Grid.Column="2" Grid.RowSpan="2" Width="15" Height="15" ToolTip="Element aus der Liste entfernen" Tag="{Binding}" Visibility="{Binding Converter={StaticResource RemoveElementVisibilityConverter}}" Style="{DynamicResource CloseButtonStyleSmall}" Click="BtnRemoveElement_Click" Margin="3,0,0,0" />
+                                    <Button x:Name="btnInformation" Grid.Column="2" Grid.RowSpan="2" Width="15" Height="15" ToolTip="Informationen zur Auslastung anzeigen" Tag="{Binding}" Visibility="{Binding Converter={StaticResource InformationVisibilityConverter}}" Content="i" Click="btnInformation_Click" Margin="3,0,0,0" />
+                                    <Button x:Name="btnRemoveElement" Grid.Column="3" Grid.RowSpan="2" Width="15" Height="15" ToolTip="Element aus der Liste entfernen" Tag="{Binding}" Visibility="{Binding Converter={StaticResource RemoveElementVisibilityConverter}}" Style="{DynamicResource CloseButtonStyleSmall}" Click="BtnRemoveElement_Click" Margin="3,0,0,0" />
 								</Grid>
 							</Border>
 						</Grid>
@@ -248,7 +252,7 @@
 			</Setter>
 		</Style>
 	</localSchView:AbstractAppointmentEditForm.Resources>
-    <Grid>
+    <Grid x:Name="FormContainer">
 		<Grid HorizontalAlignment="Stretch" Background="#0C000000">
 			<Grid.RowDefinitions>
 				<RowDefinition Height="Auto"/> <!-- 0 -->
@@ -290,33 +294,44 @@
 			<!-- Endregion -->
 				
 			<!-- Region Start -->
-            <Label x:Name="StartLabel" Grid.Column="0" Grid.Row="2" VerticalAlignment="Center" Content="Start"/>
-            <dxe:DateEdit Grid.Column="1" Grid.Row="2" MaskType="DateTimeAdvancingCaret" Background="White" Height="23" MinWidth="80" Margin="3" EditValue="{Binding Controller.DisplayStartDate}" x:Name="StartDate"/>
-            <dxe:TextEdit Grid.Column="2" Grid.Row="2" MaskType="DateTime" Mask="t" MaskUseAsDisplayFormat="True" Margin="3" Height="23" EditValue ="{Binding Controller.DisplayStartTime, Converter={StaticResource TimeSpanToDateTimeConverter}}" x:Name="StartTime"/>
-            <dxe:CheckEdit x:Name="AllDay" Grid.Column="3" Grid.Row="2" Content="Ganztägig" EditValue ="{Binding Controller.AllDay}" HorizontalAlignment="Right" Margin="3" />
+            <Label x:Name="StartLabel" Grid.Column="0" Grid.Row="2" VerticalAlignment="Center" Content="Start" />
+            <dxe:DateEdit Grid.Column="1" Grid.Row="2" MaskType="DateTimeAdvancingCaret" Background="White" 
+                          Height="23" MinWidth="80" Margin="3" EditValue="{Binding Controller.DisplayStartDate}" x:Name="StartDateDateEdit"
+                          EditValueChanged="StartDate_OnChange" />
+            <dxe:TextEdit Grid.Column="2" Grid.Row="2" IsEnabled="{Binding Path=Controller.AllDay, Converter={StaticResource BoolReverseConverter}}" 
+                          MaskType="DateTime" Mask="t" MaskUseAsDisplayFormat="True" Margin="3" Height="23" EditValueChanged="StartTimeTextEdit_OnEditValueChanged"
+                          EditValue ="{Binding Controller.DisplayStartTime, Converter={StaticResource TimeSpanToDateTimeConverter}}" x:Name="StartTimeTextEdit"/>
+            <dxe:CheckEdit x:Name="AllDay" Grid.Column="3" Grid.Row="2" Content="Ganztägig" EditValueChanged="AllDay_OnEditValueChanged" EditValue ="{Binding Controller.AllDay}" HorizontalAlignment="Right" Margin="3" />
 			<!-- Endregion -->
 
 			<!-- Region Ende -->
 			<Label x:Name="EndLabel" Grid.Column="0" Grid.Row="3" VerticalAlignment="Center" Content="Ende"/>
-			<dxe:DateEdit Grid.Column="1" Grid.Row="3" MaskType="DateTimeAdvancingCaret" Background="White" Height="23" MinWidth="80" Margin="3" EditValue="{Binding Controller.DisplayEndDate}" x:Name="EndDate"/>
-			<dxe:TextEdit Grid.Column="2" Grid.Row="3" MaskType="DateTime" Mask="t" MaskUseAsDisplayFormat="True" Margin="3" Height="23" EditValue ="{Binding Controller.DisplayEndTime, Converter={StaticResource TimeSpanToDateTimeConverter}}" x:Name="EndTime"/>
+			<dxe:DateEdit Grid.Column="1" Grid.Row="3" MaskType="DateTimeAdvancingCaret" Background="White" Height="23" MinWidth="80" 
+                          Margin="3" EditValue="{Binding Controller.DisplayEndDate}" x:Name="EndDate"
+                          EditValueChanged="EndDate_OnChange" />
+            <dxe:TextEdit Grid.Column="2" Grid.Row="3" IsEnabled="{Binding Path=Controller.AllDay, Converter={StaticResource BoolReverseConverter}}" 
+                          MaskType="DateTime" Mask="t" MaskUseAsDisplayFormat="True" Margin="3" Height="23" EditValueChanged="EndTimeTextEdit_OnEditValueChanged"
+                          EditValue ="{Binding Controller.DisplayEndTime, Converter={StaticResource TimeSpanToDateTimeConverter}}" x:Name="EndTime"/>
 			<!-- Endregion -->
 
-	        <!-- Region Zu erledigen bis -->
+            <!-- Region Zu erledigen bis (Aufgabe) -->
             <Label Visibility="Collapsed" Grid.Column="0" Grid.Row="4" x:Name="DueDateLabel" VerticalAlignment="Center" Content="Zu erledigen bis" />
-            <dxe:DateEdit Visibility="Collapsed" Grid.Column="1" Grid.ColumnSpan="2" Grid.Row="4" AllowNullInput="True" x:Name="DueDate" MaskType="DateTimeAdvancingCaret" Background="White" Height="23" MinWidth="80" Margin="3" EditValue="{Binding Controller.DisplayDueDateDate}" />
-            <dxe:TextEdit Visibility="Collapsed" Grid.Column="3" Grid.ColumnSpan="2" Grid.Row="4" Width="38" AllowNullInput="True" x:Name="DueDateTime" MaskType="DateTime" Mask="t" MaskUseAsDisplayFormat="True" Margin="3" Height="23" EditValue ="{Binding Controller.DisplayDueDateTime}" />
+            <dxe:DateEdit Visibility="Collapsed" Grid.Column="1" Grid.ColumnSpan="2" Grid.Row="4" AllowNullInput="True" x:Name="DueDate" 
+						  EditValueChanged="DueDate_OnEditValueChanged"
+                          MaskType="DateTimeAdvancingCaret" Background="White" Height="23" MinWidth="80" Margin="3" EditValue="{Binding Controller.DisplayDueDateDate}" />
+            <dxe:TextEdit Visibility="Collapsed" Grid.Column="3" Grid.ColumnSpan="2" Grid.Row="4" Width="38" AllowNullInput="True" 
+                          x:Name="DueDateTime" MaskType="DateTime" Mask="t" MaskUseAsDisplayFormat="True" Margin="3" Height="23" EditValue ="{Binding Controller.DisplayDueDateTime}" />
 		    <!-- Endregion -->
 
             <!-- Region Mitarbeiter -->
-			<Label Grid.Row="5" Grid.Column="0" VerticalAlignment="Center" Content="Mitarbeiter"/>
+            <Label Grid.Row="5" Grid.Column="0" VerticalAlignment="Center" Content="{t:Translate MitarbeiterPlural}"/>
 			<Grid Grid.Column="1" Grid.Row="5" Height="23" Margin="3,3,0,3" Grid.ColumnSpan="3">
 				<Grid.ColumnDefinitions>
 					<ColumnDefinition Width="*" />
 					<ColumnDefinition Width="Auto" />
 				</Grid.ColumnDefinitions>
 				<TextBox IsReadOnly="True" Grid.Column="0" Grid.ColumnSpan="2" Text="{Binding CountSelectedEmployees, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" Margin="0" />
-				<ToggleButton Grid.Column="1" x:Name="MitarbeiterToggleButton" IsThreeState="False" Margin="0,0,2,0" Height="19" Width="19" ToolTip="Ausgewählte Mitarbeiter anzeigen" Style="{StaticResource ExpanderLookAlikeToggleBotton}"/>
+                <ToggleButton Grid.Column="1" x:Name="MitarbeiterToggleButton" IsThreeState="False" Margin="0,0,2,0" Height="19" Width="19" ToolTip="{markup:Translate Ausgewählte Mitarbeiter anzeigen}" Style="{StaticResource ExpanderLookAlikeToggleBotton}"/>
 			</Grid>
 			<Popup Grid.Column="1" Grid.Row="5" Margin="10" Name="PopupEmployee" StaysOpen="False" Placement="MousePoint" Width="450" Height="300" >
 				<search:MultiEmployeeSearch x:Name="MultiEmployeeSearch" ResultListBackground="{StaticResource EmployeeListBrush}" SelectionChanged="MultiEmployeeSearch_OnSelectionChanged" SelectedEmployees="{Binding Controller.EmployeeList, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
@@ -344,14 +359,14 @@
 			<!-- Endregion -->
 				
 			<!-- Region Klienten -->
-			<Label x:Name="CustomersLabel" Grid.Column="0" Grid.Row="7" VerticalAlignment="Center" Content="Klienten"/>
+            <Label x:Name="CustomersLabel" Grid.Column="0" Grid.Row="7" VerticalAlignment="Center" Content="{markup:Translate Klienten}"/>
             <Grid x:Name="CustomersGrid" Grid.Column="1" Grid.Row="7" Height="23" Margin="3,3,0,3" Grid.ColumnSpan="3">
 				<Grid.ColumnDefinitions>
 					<ColumnDefinition Width="*" />
 					<ColumnDefinition Width="Auto" />
 				</Grid.ColumnDefinitions>
 				<TextBox IsReadOnly="True" Grid.Column="0" Grid.ColumnSpan="2" Text="{Binding CountSelectedCustomers, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
-				<ToggleButton Grid.Column="1" x:Name="KlientenToggleButton" IsThreeState="False" Margin="0,0,2,0" Height="19" Width="19" ToolTip="Ausgewählte Klienten anzeigen" Style="{StaticResource ExpanderLookAlikeToggleBotton}"/>
+                <ToggleButton Grid.Column="1" x:Name="KlientenToggleButton" IsThreeState="False" Margin="0,0,2,0" Height="19" Width="19" ToolTip="{markup:Translate Ausgewählte Klienten anzeigen}" Style="{StaticResource ExpanderLookAlikeToggleBotton}"/>
 			</Grid>
 			<Button x:Name="KlientenPopUpOeffnenBtn" Grid.Column="4" Grid.Row="7" Width="20" Height="20" Margin="3,0,3,0" VerticalAlignment="Center" Click="CustomerPopUpEditClick">
 				<Grid Width="18" HorizontalAlignment="Center" VerticalAlignment="Center">
@@ -375,12 +390,17 @@
 						</Border>
 					</ControlTemplate>
 				</ListBox.Template>
+                <!--<ListBox.ItemTemplate>
+                    <DataTemplate>
+                        <Button Content="i"></Button>
+                    </DataTemplate>
+                </ListBox.ItemTemplate>-->
 			</ListBox>
 			<!-- Endregion -->
 				
 			<!-- Region Ressourcen -->
-			<Label Grid.Column="0" Grid.Row="9" VerticalAlignment="Center" Content="Ressourcen"/>
-			<Grid Grid.Column="1" Grid.Row="9" Height="23" Margin="3,3,0,3" Grid.ColumnSpan="3">
+			<Label Grid.Column="0" Grid.Row="9" VerticalAlignment="Center" Content="Ressourcen" x:Name="ResourceLabel" />
+			<Grid Grid.Column="1" Grid.Row="9" Height="23" Margin="3,3,0,3" Grid.ColumnSpan="3" x:Name="ResourceToggleButtonGrid" >
 				<Grid.ColumnDefinitions>
 					<ColumnDefinition Width="*" />
 					<ColumnDefinition Width="Auto" />
@@ -397,7 +417,7 @@
 			<Popup Grid.Column="1" Grid.Row="9" Margin="10" Name="PopupResource" StaysOpen="False" Placement="MousePoint" Width="450" Height="300">
 				<search:ResourcesTreeSearchView x:Name="ResourcesTreeSearchView" ResultListBackground="{StaticResource ResourceContentBrush}" SelectionChanged="ResourcesTreeSearchView_OnSelectionChanged" SelectedResources="{Binding Controller.ResourceList}" />
 			</Popup>
-			<ListBox Grid.Column="1" Grid.Row="10" Background="{StaticResource ObjectEditBackgroundBrush}" Margin="4,0,1,4" ItemsSource="{Binding Path=SelectedResources}" IsSynchronizedWithCurrentItem="True"
+			<ListBox x:Name="ResourceListBox" Grid.Column="1" Grid.Row="10" Background="{StaticResource ObjectEditBackgroundBrush}" Margin="4,0,1,4" ItemsSource="{Binding Path=SelectedResources}" IsSynchronizedWithCurrentItem="True"
 						HorizontalAlignment="Stretch" VerticalAlignment="Stretch" HorizontalContentAlignment="Stretch" Grid.ColumnSpan="3" 
 						ItemContainerStyle="{StaticResource MultiResourceSelectionControlStyle}" MaxHeight="70" Height="70"
 						Visibility="{Binding IsChecked, ElementName=RessourcenToggleButton, Converter={StaticResource BoolVisibilityConverter}}">
@@ -413,7 +433,7 @@
 			</ListBox>
 			<!-- Endregion -->
 
-            <!-- Region Hilfeplan -->
+            <!-- Region Hilfeplan (Aufgabe) -->
             <Label Grid.Column="0" Grid.Row="11" VerticalAlignment="Center" Content="Hilfeplan" Visibility="Collapsed" x:Name="SupportConceptBtn" />
             <Button x:Name="SupportConceptsPopUpOeffnenBtn" Grid.Column="4" Grid.Row="11" Width="20" Height="20" Margin="3,0,3,0" VerticalAlignment="Center" Click="SupportConceptsPopUpClick" Visibility="Collapsed">
               <Grid Width="18" HorizontalAlignment="Center" VerticalAlignment="Center">
@@ -439,32 +459,31 @@
             </ListBox>
 	        <!-- Endregion -->
 
-            <!-- Region Beschreibung -->
-      <Label x:Name="TaskDescriptionLabel" Visibility="Collapsed" Grid.Column="0" Grid.Row="13" VerticalAlignment="Top" Content="Beschreibung"/>
-      <TextBox Visibility="Collapsed" Grid.Column="1" Grid.Row="13" Grid.ColumnSpan="4" AcceptsReturn="True" VerticalScrollBarVisibility="Auto"
-		        HorizontalScrollBarVisibility="Disabled" Height="45" Margin="3" TextWrapping="Wrap" x:Name="TaskDescription"
-		        Text="{Binding Path=Controller.TaskDescription, UpdateSourceTrigger=PropertyChanged}" MaxLength="1024" />
+            <!-- Region Beschreibung (Aufgabe) -->
+            <Label x:Name="TaskDescriptionLabel" Visibility="Collapsed" Grid.Column="0" Grid.Row="13" VerticalAlignment="Top" Content="Beschreibung"/>
+            <TextBox Visibility="Collapsed" Grid.Column="1" Grid.Row="13" Grid.ColumnSpan="4" AcceptsReturn="True" VerticalScrollBarVisibility="Auto"
+		            HorizontalScrollBarVisibility="Disabled" Height="45" Margin="3" TextWrapping="Wrap" x:Name="TaskDescription"
+		            Text="{Binding Path=Controller.TaskDescription, UpdateSourceTrigger=PropertyChanged}" MaxLength="1024" />
+            <!-- Endregion -->
 
-		  <!-- Endregion -->
-
-		    <!-- Region Erledigt am -->
-          <Label Visibility="Collapsed" x:Name="CompletedDateLabel" Grid.Column="0" Grid.Row="14" VerticalAlignment="Center" Content="Erledigt am" />
-          <dxe:DateEdit Visibility="Collapsed" x:Name="CompletedDate" Grid.Column="1" Grid.ColumnSpan="4" Grid.Row="14" MaskType="DateTimeAdvancingCaret" Background="White" Height="23" MinWidth="80" Margin="3" EditValue="{Binding Controller.DisplayCompletedDateDate}" />
-		  <!-- Endregion -->
+		    <!-- Region Erledigt am (Aufgabe) -->
+            <Label Visibility="Collapsed" x:Name="CompletedDateLabel" Grid.Column="0" Grid.Row="14" VerticalAlignment="Center" Content="Erledigt am" />
+            <dxe:DateEdit Visibility="Collapsed" x:Name="CompletedDate" Grid.Column="1" Grid.ColumnSpan="4" Grid.Row="14" 
+                        MaskType="DateTimeAdvancingCaret" Background="White" Height="23" MinWidth="80" Margin="3" EditValue="{Binding Controller.DisplayCompletedDateDate}" />
+            <!-- Endregion -->
 
             <!-- Region Notiz -->
 			<Label x:Name="NoticeLabel" Grid.Column="0" Grid.Row="15" VerticalAlignment="Top" Content="Notiz"/>
 			<TextBox Grid.Column="1" Grid.Row="15" Grid.ColumnSpan="4" AcceptsReturn="True" VerticalScrollBarVisibility="Auto"
 						HorizontalScrollBarVisibility="Disabled" Height="45" Margin="3" TextWrapping="Wrap" x:Name="Notice"
 						Text="{Binding Path=Controller.Description, UpdateSourceTrigger=PropertyChanged}" MaxLength="1024" />
-				
 			<!-- Endregion -->
 				
 			<!-- Region Serienmuster -->
-      <Label x:Name="SerienLabel" Grid.Column="0" Grid.Row="16" Content="Wiederholung" Margin="3" />
-      <dxe:ComboBoxEdit Grid.Column="1" Grid.Row="16" Grid.ColumnSpan="4" x:Name="EdtRecurrenceType" Margin="3"
-								ItemsSource="{Binding RecurrenceVisualController.RecurrenceElements}" 
-								EditValue="{Binding RecurrenceVisualController.RecurrenceElement, UpdateSourceTrigger=PropertyChanged}" IsTextEditable="False">
+            <Label x:Name="SerienLabel" Grid.Column="0" Grid.Row="16" Content="Wiederholung" Margin="3" />
+            <dxe:ComboBoxEdit Grid.Column="1" Grid.Row="16" Grid.ColumnSpan="4" x:Name="EdtRecurrenceType" Margin="3"
+							ItemsSource="{Binding RecurrenceVisualController.RecurrenceElements}" 
+							EditValue="{Binding RecurrenceVisualController.RecurrenceElement, UpdateSourceTrigger=PropertyChanged}" IsTextEditable="False">
 				<dxe:ComboBoxEdit.ItemTemplate>
 					<DataTemplate>
 						<TextBlock Text="{Binding Description, Converter={StaticResource Recurrence2GermanConverter}}" />
@@ -472,20 +491,20 @@
 				</dxe:ComboBoxEdit.ItemTemplate>
 			</dxe:ComboBoxEdit>
 
-      <Grid x:Name="SerienGrid" Grid.Column="0" Grid.Row="17" Grid.ColumnSpan="5" Visibility="{Binding RecurrenceVisualController.EnableRecurrence, Converter={StaticResource BoolVisibilityConverter}}" >
+            <Grid x:Name="SerienGrid" Grid.Column="0" Grid.Row="17" Grid.ColumnSpan="5" Visibility="{Binding RecurrenceVisualController.EnableRecurrence, Converter={StaticResource BoolVisibilityConverter}}" >
 				<StackPanel>
 					<dx:GroupFrame Header="Serienmuster" Margin="3">
 						<StackPanel>
 							<dxsch:DailyRecurrenceControl Visibility="{Binding RecurrenceVisualController.IsDailyRecurrence, Converter={dxschint:BoolToVisibilityConverter}}" 
-															RecurrenceInfo="{Binding RecurrenceVisualController.RecurrenceInfo}" />
+														  RecurrenceInfo="{Binding RecurrenceVisualController.RecurrenceInfo}" />
 							<dxsch:WeeklyRecurrenceControl Visibility="{Binding RecurrenceVisualController.IsWeeklyRecurrence, Converter={dxschint:BoolToVisibilityConverter}}" 
-															RecurrenceInfo="{Binding RecurrenceVisualController.RecurrenceInfo}" x:Name="WeeklyRecurrenceControl" />
+														   RecurrenceInfo="{Binding RecurrenceVisualController.RecurrenceInfo}" x:Name="WeeklyRecurrenceControl" />
 							<dxsch:MonthlyRecurrenceControl x:Name="MonthlyRecurrenceControl" 
 															Visibility="{Binding RecurrenceVisualController.IsMonthlyRecurrence, Converter={dxschint:BoolToVisibilityConverter}}" 
 															RecurrenceInfo="{Binding RecurrenceVisualController.RecurrenceInfo}" />
 							<dxsch:YearlyRecurrenceControl x:Name="YearlyRecurrenceControl" 
-															Visibility="{Binding RecurrenceVisualController.IsYearlyRecurrence, Converter={dxschint:BoolToVisibilityConverter}}" 
-															RecurrenceInfo="{Binding RecurrenceVisualController.RecurrenceInfo}" />
+                                                           Visibility="{Binding RecurrenceVisualController.IsYearlyRecurrence, Converter={dxschint:BoolToVisibilityConverter}}" 
+                                                           RecurrenceInfo="{Binding RecurrenceVisualController.RecurrenceInfo}" />
 						</StackPanel>
 					</dx:GroupFrame>
 					<dx:GroupFrame  Header="Seriendauer" Margin="3" >

BeWo/Scheduler/View/SchedulerAppointmentEditForm.xaml.cs

@@ -9,13 +9,13 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Data;
 using System.Windows.Input;
-
 using BeWo.Annotations;
 using BeWo.Core;
-using BeWo.Core.Service;
 using BeWo.Scheduler.Utils;
 using BeWo.Scheduler.ViewModel;
 using BeWo.ServiceProxy;
+using BeWo.View;
+using BeWo.View.Detail;
 using BeWo.View.Search;
 
 using BS.Shared;
@@ -23,7 +23,6 @@ using BS.Shared.Core;
 using BS.Shared.DataContracts;
 using BS.Shared.DataContracts.Compact;
 using BS.Shared.Extensions;
-using DevExpress.Mvvm.Native;
 using DevExpress.Xpf.Editors;
 using DevExpress.Xpf.Scheduler.UI;
 using DevExpress.XtraScheduler;
@@ -36,7 +35,7 @@ namespace BeWo.Scheduler.View
 	{
 		public bool IsInCustomerViewMode { get; set; }
 
-	    private readonly bool IsInTaskViewMode;
+	    private readonly bool _IsInTaskViewMode;
 
 		private List<ValueListEntryDC> _Categories;
 		public List<ValueListEntryDC> Categories
@@ -135,6 +134,9 @@ namespace BeWo.Scheduler.View
 	    public static bool IsOwnAppointment { get; set; }
 	    public static bool IsAllowedToChange { get; set; }
 	    
+		public InformationView InformationView { get; set; }
+		public CompactCustomerDC Customer { get; set; }
+
 		public SchedulerAppointmentEditForm(SchedulerAppointmentListVM vm, SchedulerControl schedulerControl, Appointment appointment, IEnumerable<CompactEmployeeDC> employees, IEnumerable<CompactCustomerDC> customers, Dictionary<ValueListEntryDC, List<ResourceDC>> categoriesToResources, bool pIsInTaskViewMode) : base(schedulerControl, appointment)
 		{
 			ViewModel = vm;
@@ -144,7 +146,7 @@ namespace BeWo.Scheduler.View
 
 		    IsOwnAppointment = Equals(BeWoApp.CompactLoggedOnEmployee, NewSchedulerAppointmentFormController.Originator) && (NewSchedulerAppointmentFormController.EmployeeList?.Count == 0 || NewSchedulerAppointmentFormController.EmployeeList.Any(a => Equals(a.Employee, BeWoApp.CompactLoggedOnEmployee)));
 
-            IsInTaskViewMode = pIsInTaskViewMode;
+            _IsInTaskViewMode = pIsInTaskViewMode;
 
             InitializeComponent();
 
@@ -181,18 +183,18 @@ namespace BeWo.Scheduler.View
 
 			EdtRecurrenceType.CustomDisplayText += EdtRecurrenceType_CustomDisplayText;
 
-		    if(IsInTaskViewMode && !SelectedEmployees.Any(a => a.Employee.Equals(BeWoApp.CompactLoggedOnEmployee)))
+		    if(_IsInTaskViewMode && !SelectedEmployees.Any(a => a.Employee.Equals(BeWoApp.CompactLoggedOnEmployee)))
 		    {
 		        SelectedEmployees.Add(new Employee2SchedulerAppointmentDC { Employee = BeWoApp.CompactLoggedOnEmployee });
 		        MitarbeiterToggleButton.IsChecked = true;
 		    }
-		    
+
 			InitRights();
 		}
 
 		private void InitRights()
 		{
-		    var darfKlientermineAnsehen = BeWoUtils.HasRight(UserRightType.CustomerView_View);
+		    var darfKlientenAnsehen = BeWoUtils.HasRight(UserRightType.CustomerView_View) || BeWoUtils.HasRight(UserRightType.Customer_ViewMyTeams) || BeWoUtils.HasRight(UserRightType.Customer_ViewMyCustomers);
             var darfKliententermineAnlegen = BeWoUtils.HasRight(UserRightType.KalenderKliententermineAnlegen);
 		    var darfKliententermineAendern = BeWoUtils.HasRight(UserRightType.KalenderKliententermineAendern);
 
@@ -202,13 +204,14 @@ namespace BeWo.Scheduler.View
 		    var darfRessourcentermineAnlegen = BeWoUtils.HasRight(UserRightType.KalenderRessourcentermineAnlegen);
 		    var darfRessourcentermineAendern = BeWoUtils.HasRight(UserRightType.KalenderRessourcentermineAendern);
 
+
             if(IsNew && !darfKliententermineAnlegen)
 		    {
 		        KlientenPopUpOeffnenBtn.Visibility = Visibility.Hidden;
 		        SelectedCustomers.Clear();
             }
 
-		    if(!IsNew && (!darfKliententermineAendern || !darfKlientermineAnsehen) || !darfKlientermineAnsehen)
+		    if(!IsNew && (!darfKliententermineAendern || !darfKlientenAnsehen) || !darfKlientenAnsehen)
 		    {
 		        KlientenPopUpOeffnenBtn.Visibility = Visibility.Hidden;
             }
@@ -241,18 +244,24 @@ namespace BeWo.Scheduler.View
 
 		    // --------------------------------------------------------------------
 
-		    var checkType = IsNew ? SchedulerRightsCheckType.Create : SchedulerRightsCheckType.Edit;
-            var allowedToChange = BS.Shared.Core.Utils.CheckSchedulerRights(SelectedCustomers.ToList(), SelectedResources.ToList(), SelectedEmployees.ToList(), NewSchedulerAppointmentFormController.Originator, IsNew, checkType, BeWoApp.LoggedOnUser);
+            var customerOids = new List<long>();
+			ServiceFacade.DoEmployeeServiceSync(s => customerOids = s.LoadTeamsRelatedCustomerOids(BeWoApp.CompactLoggedOnEmployee.EmployeeOid));
 
-		    if(IsInTaskViewMode)
+		    var checkType = IsNew ? SchedulerRightsCheckType.Create : SchedulerRightsCheckType.Edit;
+            var allowedToChange = BS.Shared.Core.Utils.CheckSchedulerRights(SelectedCustomers.ToList(), SelectedResources.ToList(), SelectedEmployees.ToList(), NewSchedulerAppointmentFormController.Originator, IsNew, checkType, BeWoApp.LoggedOnUser, customerOids, true);
+
+		    if(_IsInTaskViewMode)
 		    {
                 BetreffLabel.Content = "Titel";
                 StartLabel.Content = "Beginn";
 
-		        EndDate.Visibility              = Visibility.Collapsed;
-		        EndTime.Visibility              = Visibility.Collapsed;
-		        EndLabel.Visibility             = Visibility.Collapsed;
-		        AllDay.Visibility               = Visibility.Collapsed;
+                EndDate.Visibility  = Visibility.Collapsed;
+                EndTime.Visibility  = Visibility.Collapsed;
+                EndLabel.Visibility = Visibility.Collapsed;
+
+                StartTimeTextEdit.Visibility = Visibility.Collapsed;
+
+                AllDay.Visibility               = Visibility.Collapsed;
 		        OrtLabel.Visibility             = Visibility.Collapsed;
 		        Ort.Visibility                  = Visibility.Collapsed;
 		        SerienLabel.Visibility          = Visibility.Collapsed;
@@ -272,13 +281,32 @@ namespace BeWo.Scheduler.View
 		        SupportConceptsPopUpOeffnenBtn.Visibility = Visibility.Visible;
                 SelectedSupportConceptsListBox.Visibility = Visibility.Visible;
 
-                CustomersLabel.Visibility = Visibility.Collapsed;
-                CustomersGrid.Visibility = Visibility.Collapsed;
-                CustomerSearchViewPopup.Visibility = Visibility.Collapsed;
+                CustomersLabel.Visibility           = Visibility.Collapsed;
+                CustomersGrid.Visibility            = Visibility.Collapsed;
+                CustomerSearchViewPopup.Visibility  = Visibility.Collapsed;
                 SelectedCustomersListBox.Visibility = Visibility.Collapsed;
-                KlientenPopUpOeffnenBtn.Visibility = Visibility.Collapsed;
+                KlientenPopUpOeffnenBtn.Visibility  = Visibility.Collapsed;
 
-                SelectedCustomers.Clear();
+                ResourceLabel.Visibility             = Visibility.Collapsed;
+                ResourceToggleButtonGrid.Visibility  = Visibility.Collapsed;
+                RessourcenPopUpOeffnenBtn.Visibility = Visibility.Collapsed;
+                PopupResource.Visibility             = Visibility.Collapsed;
+                ResourceListBox.Visibility           = Visibility.Collapsed;
+
+                StartDateDateEdit.IsEnabled              = false;
+                BetreffEditText.IsEnabled                = false;
+                DueDate.IsEnabled                        = false;
+                DueDateTime.IsEnabled                    = false;
+                SupportConceptBtn.IsEnabled              = false;
+                SupportConceptsPopUpOeffnenBtn.IsEnabled = false;
+                Notice.IsEnabled                         = false;
+                TaskDescription.IsEnabled                = false;
+                CompletedDate.IsEnabled                  = false;
+                MitarbeiterPopUpOeffnenBtn.IsEnabled     = false;
+
+				DeleteButton.Visibility = Visibility.Collapsed;
+
+				SelectedCustomers.Clear();
 
                 if (!Controller.IsNewAppointment)
 		        {
@@ -288,9 +316,9 @@ namespace BeWo.Scheduler.View
                     CompletedDateLabel.Visibility = Visibility.Visible;
 		            CompletedDate.Visibility      = Visibility.Visible;
                 }
-            }
+			}
 
-		    NewSchedulerAppointmentFormController.DisplayDueDateTime = NewSchedulerAppointmentFormController.DueDate;
+            NewSchedulerAppointmentFormController.DisplayDueDateTime = NewSchedulerAppointmentFormController.DueDate;
 
 		    IsAllowedToChange = allowedToChange;
 
@@ -301,8 +329,8 @@ namespace BeWo.Scheduler.View
 
 		    BetreffEditText.IsReadOnly   = true;
 		    Ort.IsReadOnly               = true;
-		    StartDate.IsReadOnly         = true;
-            StartTime.IsReadOnly         = true;
+            StartDateDateEdit.IsReadOnly = true;
+            StartTimeTextEdit.IsReadOnly = true;
 		    AllDay.IsReadOnly            = true;
             EndDate.IsReadOnly           = true;
             EndTime.IsReadOnly           = true;
@@ -331,9 +359,9 @@ namespace BeWo.Scheduler.View
 			e.Handled = true;
 		}
 
-		public string CountSelectedEmployees => $"{SelectedEmployees.Count} Mitarbeiter ausgewählt";
-		public string CountSelectedResources => $"{SelectedResources.Count} Resourcen ausgewählt";
-		public string CountSelectedCustomers => $"{SelectedCustomers.Count} Klienten ausgewählt";
+		public string CountSelectedEmployees => $"{SelectedEmployees.Count} " + BS.Shared.Translation.Translator.Translate("MitarbeiterPlural") + " ausgewählt";
+		public string CountSelectedResources => $"{SelectedResources.Count} Ressourcen ausgewählt";
+		public string CountSelectedCustomers => $"{SelectedCustomers.Count} " + BS.Shared.Translation.Translator.Translate("Klienten") + " ausgewählt";
 		public string CountSelectedSupportConcepts => $"{SelectedSupportConcepts.Count} Hilfepläne ausgewählt";
 
 		public override AppointmentFormController CreateFormController(SchedulerControl schedulerControl, Appointment appointment)
@@ -392,6 +420,13 @@ namespace BeWo.Scheduler.View
 		{
 		    try
 		    {
+                if(NewSchedulerAppointmentFormController.IsTask)
+                {
+                    MessageBox.Show("Aufgaben können nur im Hilfeplan angelegt und geändert werden", "Speichern nicht möglich", MessageBoxButton.OK, MessageBoxImage.Warning);
+
+                    return;
+                }
+
 		        var isWeeklyRecurrence = RecurrenceVisualController.IsWeeklyRecurrence;
 		        var weekDays = WeeklyRecurrenceControl.WeekDays;
 
@@ -401,10 +436,10 @@ namespace BeWo.Scheduler.View
 
 		            return;
 		        }
-
-		        Controller.Storage.BeginUpdate();
-
-		        var employees          = NewSchedulerAppointmentFormController.EmployeeList;
+				
+				Controller.Storage.BeginUpdate();
+                
+				var employees          = NewSchedulerAppointmentFormController.EmployeeList;
 		        var customers          = NewSchedulerAppointmentFormController.CustomerList;
 		        var resources          = NewSchedulerAppointmentFormController.ResourceList;
 		        var originator         = NewSchedulerAppointmentFormController.Originator;
@@ -419,8 +454,7 @@ namespace BeWo.Scheduler.View
 		        var start              = NewSchedulerAppointmentFormController.Start;
 		        var end                = NewSchedulerAppointmentFormController.End;
 
-
-                ViewModel.NewVM.AllDay             = !Appointment.AllDay;
+                ViewModel.NewVM.AllDay             = NewSchedulerAppointmentFormController.AllDay;
 		        ViewModel.NewVM.IsPrivate          = isPrivate;
 		        ViewModel.NewVM.ResourceList       = resources;
 		        ViewModel.NewVM.CustomerList       = customers;
@@ -436,11 +470,15 @@ namespace BeWo.Scheduler.View
                 ViewModel.NewVM.Start              = start;
 		        ViewModel.NewVM.End                = end;
 
+				if (isTask && dueDate.HasValue)
+                {
+                    ViewModel.NewVM.End = dueDate.Value.GetShortDateTime().AddDays(1);
+                }
+
                 // Änderung an den CustomFields lösen das NewSchedulerStorage_AppointmentsChanged-Event aus
 
                 var employeeOids = new List<long>();
 		        var customerOids = new List<long>();
-		        var overlaps = false;
 
 		        foreach (var emp in employees)
 		        {
@@ -452,44 +490,29 @@ namespace BeWo.Scheduler.View
 		            customerOids.AddIfNotIn(customer.CustomerOid);
 		        }
 
-		        var item = (SchedulerAppointmentVM) Appointment.GetSourceObject(Control.GetCoreStorage());
+		        var item = Appointment.GetSourceObject(Control.GetCoreStorage());
 
-		        if(!IsInTaskViewMode){
-		            ServiceFacade.DoResourceServiceSync(definedBelow => overlaps = definedBelow.OverlappingAppointmentsExist(Appointment.Start, Appointment.End, employeeOids, customerOids, resources.Select(res => res.ResourceOid.Value).ToList(), ViewModel.NewVM.Originator.EmployeeOid, item?.CommitToDataContract().SchedulerAppointmentOid, string.Empty, Appointment.RecurrenceIndex));
-
-		            if (overlaps)
-		            {
-		                var erg = MessageBox.Show("Dieser Termin überschneidet sich mit einem anderen bereits existierenden Termin.\n Möchten Sie ihn wirklich speichern?", "Überschneidung", MessageBoxButton.YesNo, MessageBoxImage.Exclamation);
-
-		                if (erg.Equals(MessageBoxResult.No))
-		                {
-		                    Controller.Storage.EndUpdate();
-                            return;
-		                }
-		            }
-		        }
-
-                ViewModel.ShouldLockOverlappingAppointmentCheck = true;
+				ViewModel.ShouldLockOverlappingAppointmentCheck = Appointment.Type == AppointmentType.ChangedOccurrence;
 
 		        if (Appointment.RecurrenceInfo != null)
-		        {
-		            ViewModel.ApplyChangesToChangedOccurencyCustomFields(employees, customers, resources, originator, isPrivate, Appointment.RecurrenceIndex.ToString(), new Guid(Appointment.RecurrenceInfo.Id.ToString()), isTask, taskDescription, completedDate, dueDate, completedNotice, supportConceptList, Appointment.Subject, Appointment.AllDay);
-		        }
+                {
+                    var customFieldStorage = Appointment.GetCustomFieldStorage();
+                    var serviceRecords = customFieldStorage?.ServiceRecordList ?? new List<ServiceRecordDC>();
 
-                //if(Appointment.IsOccurrence && item == null)
-                //{
-                //    Appointment.GetCustomFieldStorage().EmployeeList.ForEach(each =>
-                //    {
-                //        each.Employee2SchedulerAppointmentOid = null;
-                //        each.Employee2SchedulerAppointmentVersion = null;
-                //        each.SchedulerAppointmentOid = null;
-                //        each.IsPChanged = false;
-                //        each.IsPC_CheckedTs = null;
-                //    });
-                //}
+		            ViewModel.ApplyChangesToChangedOccurencyCustomFields(employees, customers, resources, originator, isPrivate, Appointment.RecurrenceIndex.ToString(), new Guid(Appointment.RecurrenceInfo.Id.ToString()), isTask, taskDescription, completedDate, dueDate, completedNotice, supportConceptList, Appointment.Subject, Appointment.AllDay, serviceRecords);
+
+                    var oldRecurrenceInfo = Appointment.RecurrenceInfo.ToXml();
+                    var newRecurrenceInfo = ViewModel.NewVM.RecurrenceInfo;
+
+                    if(!Equals(oldRecurrenceInfo, newRecurrenceInfo))
+                    {
+                        // Damit wird verhindert, dass beim Ändern von Zeitangaben bei Serienterminen die Ausnahmen gelöscht werden.
+                        SaveFlagToInternInfo();
+                    }
+                }
 
                 ApplyChanges();
-		    }
+			}
 		    catch (Exception exception)
 		    {
 		        MessageBox.Show(exception.Message + "\n" + exception.StackTrace);
@@ -519,12 +542,12 @@ namespace BeWo.Scheduler.View
 
 	        if(y.Count == 0)
 	        {
-	            MessageBox.Show("Bitte wählen Sie mindestens einen Klienten aus!");
+	            MessageBox.Show("Bitte wählen Sie mindestens " + BS.Shared.Translation.Translator.Translate("einen Klienten") +  " aus!");
 	        }
 	        else
 	        {
-                var startDate = StartDate.DateTime;
-                var startTime = DateTime.Parse(StartTime.Text);
+                var startDate = StartDateDateEdit.DateTime;
+                var startTime = DateTime.Parse(StartTimeTextEdit.Text);
 
                 var endDate = EndDate.DateTime;
                 var endTime = DateTime.Parse(EndTime.Text);
@@ -542,6 +565,11 @@ namespace BeWo.Scheduler.View
 
         private void BtnRemoveElement_Click(object sender, RoutedEventArgs e)
 		{
+            if(_IsInTaskViewMode)
+            {
+                return;
+            }
+
 			var obj = ((Button) sender).Tag;
 
 		    switch(obj)
@@ -569,6 +597,49 @@ namespace BeWo.Scheduler.View
 			SelectedEmployees.Remove(emp);
 			OnPropertyChanged(nameof(CountSelectedEmployees));
 		}
+		private void btnInformation_Click(object sender, RoutedEventArgs e)
+		{
+			var obj = ((Button)sender).Tag;
+
+			if (obj == null || !(obj is CompactCustomerDC))
+				return;
+
+			Customer = (CompactCustomerDC)obj;
+
+			InformationView = new InformationView();
+			//ServiceFacade.DoOperationsServiceAsync(s => s.GetXAMLInformationStringForScheduler(Customer.CustomerOid), OpenWindow);
+
+			InformationView.SetXaml(ServiceFacade.DoOperationsServiceSync(s => s.GetXAMLInformationStringForScheduler(Customer.CustomerOid)));
+
+			var beWoWindow = new BeWoWindow();
+			InformationView.ButtonCloseClicked += () => beWoWindow.Close();
+
+			beWoWindow.Height = 200;
+			beWoWindow.Width = 600;
+			beWoWindow.WindowStartupLocation = WindowStartupLocation.CenterOwner;
+			beWoWindow.GroupBoxContent = InformationView;
+			beWoWindow.Owner = BeWoApp.CurrentBeWo.MainWindow;
+			//beWoWindow.rootGroupBox.Header = "Auslastung von " + Customer.FirstName + " " + Customer.LastName;
+			beWoWindow.ShowDialog();
+		}
+
+		public void OpenWindow(string xaml)
+        {
+			this.Dispatch(() =>
+			{
+				InformationView.SetXaml(xaml);
+
+				var beWoWindow = new BeWoWindow();
+
+				beWoWindow.Height = 200;
+				beWoWindow.Width = 500;
+				beWoWindow.WindowStartupLocation = WindowStartupLocation.CenterOwner;
+				beWoWindow.GroupBoxContent = Control;
+				beWoWindow.Owner = BeWoApp.CurrentBeWo.MainWindow;
+				beWoWindow.rootGroupBox.Header = "Auslastung von " + Customer.FirstName + " " + Customer.LastName;
+				beWoWindow.ShowDialog();
+			});
+		}
 
 		private void ResourcesTreeSearchView_OnSelectionChanged(object sender, RoutedEventArgs e)
 		{
@@ -636,11 +707,146 @@ namespace BeWo.Scheduler.View
 	            OnPropertyChanged(nameof(CountSelectedSupportConcepts));
 	        }
 	    }
-	}
-	
-	public class NewSchedulerAppointmentFormController : AppointmentFormController
+
+        private void DueDate_OnEditValueChanged(object sender, EditValueChangedEventArgs e)
+        {
+   //         if(e.NewValue != null && e.NewValue is DateTime dueDate)
+   //         {
+   //             var newEnd = dueDate.GetShortDateTime().AddDays(1);
+
+			//	NewSchedulerAppointmentFormController.End = newEnd;
+   //             NewSchedulerAppointmentFormController.DisplayEnd = newEnd;
+   //             NewSchedulerAppointmentFormController.DisplayEndDate = newEnd;
+			//}
+		}
+
+		/* 
+		 * Appointment.End:
+		 * ======================================================================================================
+		 * The End property is usually specified by the Appointment.Start and Appointment.
+		 * Duration properties, and is always calculated as End = Start + Duration.
+		 * When setting the End property, the Appointment. Start property retains its value, and the Appointment.
+		 * Duration is changed according to the new value of the End property.
+		 * If the new Appointment. End property's value is less than the Appointment.
+		 * Start property's value, an exception is raised.
+		 *
+		 * Ende = Start + Vorherige Dauer
+		 */
+
+        private DateTime? _PreviousEndDate;
+        private DateTime? _PreviousEndDate2;
+
+        private bool _EndTimeHasBeenChangedByStartTime;
+        private bool _EndDateHasBeenChangedByStartDate;
+
+		// TODO: Bei jeder Änderung darauf achten, dass keinn anderer Wert manipuliert wird!
+
+		private void StartDate_OnChange(object sender, EditValueChangedEventArgs e)
+        {
+            //         BeWoApp.LogMessage("StartDate changed", Colors.DarkTurquoise);
+            //         LogAllDates();
+
+            //_EndTimeHasBeenChangedByStartTime = false;
+
+            //         _PreviousEndDate2 = NewSchedulerAppointmentFormController.End;
+
+            //_EndDateHasBeenChangedByStartDate = true;
+        }
+
+		private void EndDate_OnChange(object sender, EditValueChangedEventArgs e)
+        {
+            //         BeWoApp.LogMessage("EndDate changed", Colors.DarkTurquoise);
+            //         LogAllDates();
+
+            //_EndTimeHasBeenChangedByStartTime = false;
+
+
+            //         if(_EndDateHasBeenChangedByStartDate && _PreviousEndDate2.HasValue)
+            //         {
+            //             var start = NewSchedulerAppointmentFormController.Start;
+
+            //             if(_PreviousEndDate2 > start)
+            //             {
+            //		var neuesEnddatum = NewSchedulerAppointmentFormController.End.MergeDatesByDateReversed(_PreviousEndDate2.Value);
+
+            //		//NewSchedulerAppointmentFormController.End = neuesEnddatum;
+            //             }
+            //         }
+
+            //         _EndDateHasBeenChangedByStartDate = true;
+        }
+
+        private void StartTimeTextEdit_OnEditValueChanged(object sender, EditValueChangedEventArgs e)
+        {
+            //         BeWoApp.LogMessage("StartTime changed", Colors.DarkTurquoise);
+            //         LogAllDates();
+
+            //_PreviousEndDate = NewSchedulerAppointmentFormController.End;
+
+            //         _EndTimeHasBeenChangedByStartTime = true;
+        }
+
+        private void EndTimeTextEdit_OnEditValueChanged(object sender, EditValueChangedEventArgs e)
+        {
+            //         BeWoApp.LogMessage("EndTime changed", Colors.DarkTurquoise);
+            //         LogAllDates();
+
+            //if (_EndTimeHasBeenChangedByStartTime && _PreviousEndDate.HasValue)
+            //         {
+            //             var start = NewSchedulerAppointmentFormController.Start;
+
+            //             if (_PreviousEndDate > start)
+            //             {
+            //                 //NewSchedulerAppointmentFormController.End = NewSchedulerAppointmentFormController.End.MergeDatesByDate(_PreviousEndDate.Value);
+            //             }
+            //         }
+
+            //         _EndTimeHasBeenChangedByStartTime = false;
+        }
+
+		// Was beeinflusst was? Startzeit -> Endzeit
+		// Ganztag -> DisplayEndDate
+		// 
+
+        private void AllDay_OnEditValueChanged(object sender, EditValueChangedEventArgs e)
+        {
+            //BeWoApp.LogMessage("AllDay changed", Colors.DarkTurquoise);
+            //LogAllDates();
+        }
+
+        private static void SaveFlagToInternInfo()
+        {
+            if (CurrentAppointment.IsRecurring)
+            {
+                var internalInfo = CurrentAppointment.GetCustomFieldStorage().InternalInfo ?? new InternalInfo();
+                internalInfo.IsTimeChangedRecurringAppointment = true;
+
+                CurrentAppointment.GetCustomFieldStorage().InternalInfo = internalInfo;
+            }
+        }
+
+        private void LogAllDates()
+        {
+            var initialStartValue = NewSchedulerAppointmentFormController.Start;
+            var initialEndValue = NewSchedulerAppointmentFormController.End;
+            var isAllDay = NewSchedulerAppointmentFormController.AllDay;
+            var initialDisplayStart = NewSchedulerAppointmentFormController.DisplayStart;
+            var initialDisplayEnd = NewSchedulerAppointmentFormController.DisplayEnd;
+
+            BeWoApp.LogMessage("\n" +
+                               $"\t\t\tIs AllDay:    {isAllDay}\n" +
+                               $"\t\t\tStart:        {initialStartValue:dd.MM.yy HH:mm}\n" +
+                               $"\t\t\tEnd:          {initialEndValue:dd.MM.yy HH:mm}\n" +
+                               $"\t\t\tDisplayStart: {initialDisplayStart:dd.MM.yy HH:mm}\n" +
+                               $"\t\t\tDisplayEnd:   {initialDisplayEnd:dd.MM.yy HH:mm}");
+		}
+
+        
+    }
+
+    public class NewSchedulerAppointmentFormController : AppointmentFormController
 	{
-	    private List<ResourceDC> SourceResourceList
+		private List<ResourceDC> SourceResourceList
 		{
 			get => SourceAppointment.CF_ResourceList();
 		    set => SourceAppointment.CF_ResourceList(value);
@@ -862,7 +1068,10 @@ namespace BeWo.Scheduler.View
 			return resourceListsAreEqual || employeeListsAreEqual || customerListsAreEqual || originatorsAreEqual || isPrivatesAreEqual || dueDatesAreEqal || completedDatesAreEqal || taskDescriptionsAreEqual || supportConceptListsAreEqual;
 		}
 
-		public NewSchedulerAppointmentFormController(SchedulerControl control, Appointment apt) : base(control, apt) { }
+        public NewSchedulerAppointmentFormController(SchedulerControl control, Appointment apt) : base(control, apt)
+        {
+			
+        }
 
 		protected override void ApplyCustomFieldsValues()
 		{
@@ -892,12 +1101,14 @@ namespace BeWo.Scheduler.View
             {
                 return Visibility.Visible;
             }
-            
-            var isNew = SchedulerAppointmentEditForm.IsNew;
 
-            var isAllowedToChange = BeWoUtils.CheckSchedulerRights(SchedulerAppointmentEditForm.CurrentAppointment, isNew, SchedulerRightsCheckType.Edit);
+			var customerOids = new List<long>();
+            ServiceFacade.DoEmployeeServiceSync(s => customerOids = s.LoadTeamsRelatedCustomerOids(BeWoApp.CompactLoggedOnEmployee.EmployeeOid));
+
+			var isNew = SchedulerAppointmentEditForm.IsNew;
+
+            var isAllowedToChange = BeWoUtils.CheckSchedulerRights(SchedulerAppointmentEditForm.CurrentAppointment, isNew, SchedulerRightsCheckType.Edit, customerOids, true);
 
-            
             return isAllowedToChange ? Visibility.Visible : Visibility.Hidden;
         }
 
@@ -906,4 +1117,15 @@ namespace BeWo.Scheduler.View
             throw new NotImplementedException();
         }
     }
+	public class InformationVisibilityConverter : IValueConverter
+	{
+		public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return value is CompactCustomerDC ? Visibility.Visible : Visibility.Collapsed;
+        }
+		public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+		{
+			throw new NotImplementedException();
+		}
+	}
 }

BeWo/Scheduler/ViewModel/CustomFieldStorage.cs

@@ -27,11 +27,11 @@ namespace BeWo.Scheduler.ViewModel
                         result += " erledigt am " + CompletedDate.Value.ToShortDateString();
                     } else if(DueDate.HasValue)
                     {
-                        result += " bis " + DueDate.Value.ToString("dd.MM.yyyy HH:mm");
+                        result += $" bis {DueDate.Value:dd.MM.yyyy HH:mm}";
                     }
                 }
 
-                if (IsAbsenceTime && _AbsenceTimeStart.HasValue)
+                if(IsAbsenceTime && _AbsenceTimeStart.HasValue)
                 {
                     result += _AbsenceTimeStart.Value.GetIntervalDescription(_AbsenceTimeEnd);
                 }
@@ -58,6 +58,7 @@ namespace BeWo.Scheduler.ViewModel
         public DateTime? DueDate { get; set; }
         public DateTime? CompletedDate { get; set; }
         public string CompletedNotice { get; set; }
+        public string CompletedUser { get; set; }
         public string TaskDescription { get; set; }
 
         public long? SchedulerAppointmentOid { get; set; }
@@ -71,6 +72,14 @@ namespace BeWo.Scheduler.ViewModel
 
         private DateTime? _AbsenceTimeEnd;
 
+        public InternalInfo InternalInfo { get; set; }
+
+        public bool CanBeEdited { get; set; }
+
+        public long? AbsenceTimeOid { get; set; }
+
+        public bool IsCustomerAbsenceTime { get; set; }
+
         public CustomFieldStorage()
         {
             
@@ -105,6 +114,11 @@ namespace BeWo.Scheduler.ViewModel
             _AbsenceTimeEnd = pAppointment.AbsenceTimeEnd;
 
             HasServiceRecordEntry = pAppointment.HasServiceRecordEntry;
+            CanBeEdited = pAppointment.CanBeEdited;
+
+            AbsenceTimeOid = pAppointment.AbsenceTimeOid;
+            IsCustomerAbsenceTime = pAppointment.IsCustomerAbsenceTime;
+            ServiceRecordList = pAppointment.ServiceRecordList;
         }
 
         public CustomFieldStorage(SchedulerAppointmentDC pAppointment)
@@ -118,6 +132,7 @@ namespace BeWo.Scheduler.ViewModel
             CustomerList       = pAppointment.CustomerList;
             ResourceList       = pAppointment.ResourceList;
             SupportConceptList = pAppointment.SupportConceptList;
+            ServiceRecordList  = pAppointment.ServiceRecordList;
 
             DueDate         = pAppointment.DueDate;
             CompletedDate   = pAppointment.CompletedDate;
@@ -133,9 +148,11 @@ namespace BeWo.Scheduler.ViewModel
             RecurrenceIndex = pAppointment.RecurrenceIndex;
 
             HasServiceRecordEntry = pAppointment.HasServiceRecordEntry;
+
+            CanBeEdited = pAppointment.CanBeEdited;
         }
 
-        public CustomFieldStorage(ObservableCollection<Employee2SchedulerAppointmentDC> pEmployees, List<CompactCustomerDC> pCustomers, List<ResourceDC> pResources, CompactEmployeeDC pOriginator, bool pIsPrivate, bool pIsTask, string pTaskDescription, DateTime? pDueDate, DateTime? pCompletedDate, string pCompletedNotice, List<CompactSupportConceptDC> pSupportConcepts, string pSubject, bool pIsAllDay)
+        public CustomFieldStorage(ObservableCollection<Employee2SchedulerAppointmentDC> pEmployees, List<CompactCustomerDC> pCustomers, List<ResourceDC> pResources, CompactEmployeeDC pOriginator, bool pIsPrivate, bool pIsTask, string pTaskDescription, DateTime? pDueDate, DateTime? pCompletedDate, string pCompletedNotice, List<CompactSupportConceptDC> pSupportConcepts, string pSubject, bool pIsAllDay, List<ServiceRecordDC> serviceRecords)
         {
             IsTask    = pIsTask;
             IsPrivate = pIsPrivate;
@@ -144,7 +161,9 @@ namespace BeWo.Scheduler.ViewModel
             EmployeeList       = pEmployees;
             CustomerList       = pCustomers;
             ResourceList       = pResources;
+            
             SupportConceptList = pSupportConcepts;
+            ServiceRecordList  = serviceRecords;
 
             DueDate         = pDueDate;
             CompletedDate   = pCompletedDate;
@@ -168,5 +187,12 @@ namespace BeWo.Scheduler.ViewModel
         public Visibility ToolTipZusageVisibility => IsTask ? Visibility.Collapsed : Visibility.Visible;
 
         public bool HasServiceRecordEntry { get; set; }
+
+        public List<ServiceRecordDC> ServiceRecordList { get; set; } = new List<ServiceRecordDC>();
+    }
+
+    public class InternalInfo
+    {
+        public bool IsTimeChangedRecurringAppointment { get; set; }
     }
 }

BeWo/Scheduler/ViewModel/NewSchedulerViewModel.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 
 using BeWo.Scheduler.View;
-
+using BeWo.ServiceProxy;
 using BS.Shared.Core;
 using BS.Shared.DataContracts;
 using BS.Shared.DataContracts.Compact;
@@ -14,6 +14,7 @@ namespace BeWo.Scheduler.ViewModel
 {
 	public class NewSchedulerViewModel
 	{
+
 		public event EventHandler<EventArgs<ISchedulerViewModel>> ViewModelChanged;
 
 		private ISchedulerViewModel _ActiveAppointmentViewModel;
@@ -55,22 +56,47 @@ namespace BeWo.Scheduler.ViewModel
 			return ActiveAppointmentViewModel == null ? null : SchedulerSettings ?? ActiveAppointmentViewModel.GetDefaultSchedulerSettings();
 		}
 
-		public IEnumerable<SchedulerAppointmentVM> ConvertAbsenceTimesToAppointments(IEnumerable<AbsenceTimeDC> pAbsenceTimes, DateTime pIntervalEnd, List<CompactEmployeeDC> allEmployees)
+		public IEnumerable<SchedulerAppointmentVM> ConvertAbsenceTimesToAppointments(IEnumerable<AbsenceTimeDC> pAbsenceTimes, DateTime pIntervalEnd, List<CompactEmployeeDC> allEmployees, List<CompactCustomerDC> allCustomers)
 		{
 		    return pAbsenceTimes.Where(w => w.AbsenceTimeOid.HasValue && w.Start.HasValue).Select(abwesenheit =>
-		    {
-		        var subject = $"{abwesenheit.Reason.Description}";
-		        var employee = abwesenheit.EmployeeOid != null ? allEmployees.FirstOrDefault(f => f.EmployeeOid == abwesenheit.EmployeeOid.Value) : null;
+            {
+                var isEmployeeAbsenceTime = abwesenheit.EmployeeOid.HasValue;
 
-		        if(employee != null)
-		        {
-		            subject += $" ({employee.SimpleDescription})";
-		        }
+		        var subject = $"{abwesenheit.Reason.Description}";
+		        var employee = abwesenheit.EmployeeOid.HasValue ? allEmployees.FirstOrDefault(f => f.EmployeeOid == abwesenheit.EmployeeOid.Value) : null;
+                var customer = abwesenheit.CustomerOid.HasValue ? allCustomers.FirstOrDefault(f => f.CustomerOid == abwesenheit.CustomerOid.Value) : null;
+
+                IFilterableDC dc = employee;
+                var originator = employee;
+                if(!isEmployeeAbsenceTime)
+                {
+                    dc = customer;
+                    ServiceFacade.DoEmployeeServiceSync(s => originator = s.FindCompactEmployeeByFullname(abwesenheit.InsUser));
+                }
+
+		        if(!(dc is null))
+                {
+                    subject += $" ({dc.SimpleDescription})";
+                }
 
                 var absenceTimeEnd = abwesenheit.End?.AddTicks(1);
+				
+                if(originator is null)
+                {
+                    originator = BeWoApp.CompactLoggedOnEmployee;
+                }
 
-		        return new SchedulerAppointmentVM(true, subject, abwesenheit.Start.Value, abwesenheit.End ?? pIntervalEnd, employee, abwesenheit.Start, absenceTimeEnd);
-		    }).ToList();
+				return new SchedulerAppointmentVM(
+                    true, 
+                    subject, 
+                    abwesenheit.Start.Value, 
+                    abwesenheit.End ?? pIntervalEnd, 
+                    originator, 
+                    abwesenheit.Start, 
+                    absenceTimeEnd, 
+                    abwesenheit.AbsenceTimeOid.Value, 
+                    !isEmployeeAbsenceTime);
+			}).ToList();
 		}
 	}
 }

BeWo/Scheduler/ViewModel/SchedulerAppointmentListVM.cs

@@ -29,7 +29,21 @@ namespace BeWo.Scheduler.ViewModel
 	{
 		public bool ShouldLockOverlappingAppointmentCheck { get; set; }
 
-		public SchedulerSettings GetDefaultSchedulerSettings()
+	    //protected override SchedulerAppointmentVM CreateVM(SchedulerAppointmentDC pDC)
+	    //{
+	    //    var vm = base.CreateVM(pDC);
+	    //    if (!pDC.SchedulerAppointmentOid.HasValue && vm.EmployeeList.Count == 0)
+	    //    {
+	    //        var e2sVm = new Employee2SchedulerAppointmentDC();
+	    //        e2sVm.Employee = BeWoApp.LoggedOnUser.Employee;
+                
+     //           vm.EmployeeList.Add(e2sVm);
+	    //    }
+
+	    //    return vm;
+	    //}
+
+        public SchedulerSettings GetDefaultSchedulerSettings()
 		{
 			var settings = new SchedulerSettings(AppointmentKind.General, AppointmentViewType.WorkWeek);
 			return settings;
@@ -57,18 +71,16 @@ namespace BeWo.Scheduler.ViewModel
 			}
 		}
 
-		private readonly List<CompactCustomerDC> _AllCustomers;
-		private readonly List<CompactEmployeeDC> _AllEmployees;
-		private readonly Dictionary<ValueListEntryDC, List<ResourceDC>> _Categories2Resources;
-
-		private static void AppointmentListAddingNew(object sender, AddingNewEventArgs e)
+        private static void AppointmentListAddingNew(object sender, AddingNewEventArgs e)
 		{
 			var dc = new SchedulerAppointmentDC
 			{
-				EmployeeList = new List<Employee2SchedulerAppointmentDC>(),
-				CustomerList = new List<CompactCustomerDC>(),
-				ResourceList = new List<ResourceDC>(),
-				Status       = 0
+				EmployeeList       = new List<Employee2SchedulerAppointmentDC>(),
+				CustomerList       = new List<CompactCustomerDC>(),
+				ResourceList       = new List<ResourceDC>(),
+                ServiceRecordList  = new List<ServiceRecordDC>(),
+                SupportConceptList = new List<CompactSupportConceptDC>(),
+				Status             = 0
 			};
 			
 			var neu = new SchedulerAppointmentVM(dc);
@@ -79,19 +91,19 @@ namespace BeWo.Scheduler.ViewModel
         private Dictionary<Guid, Dictionary<string, Dictionary<string, object>>> _ChangedOccurenceCustomFields;
         public Dictionary<Guid, Dictionary<string, Dictionary<string, object>>> ChangedOccurenceCustomFields { get; }
 
-		public List<CompactCustomerDC> AllCustomers => _AllCustomers;
+		public List<CompactCustomerDC> AllCustomers { get; }
 
-	    public List<CompactEmployeeDC> AllEmployees => _AllEmployees;
+        public List<CompactEmployeeDC> AllEmployees { get; }
 
-	    public Dictionary<ValueListEntryDC, List<ResourceDC>> Categories2Resources => _Categories2Resources;
+        public Dictionary<ValueListEntryDC, List<ResourceDC>> Categories2Resources { get; }
 
-	    private Appointment _GeoeffneterTermin;
+        private Appointment _GeoeffneterTermin;
 		
 		public SchedulerAppointmentListVM(List<SchedulerAppointmentDC> appList, List<CompactCustomerDC> allCustomers, List<CompactEmployeeDC> allEmployees, Dictionary<ValueListEntryDC, List<ResourceDC>> lCategoriesToResources) : base(appList)
 		{
-			_Categories2Resources = lCategoriesToResources;
-			_AllCustomers         = allCustomers;
-			_AllEmployees         = allEmployees;
+			Categories2Resources = lCategoriesToResources;
+			AllCustomers         = allCustomers;
+			AllEmployees         = allEmployees;
 		    
 		    // TODO: Hier Rechte beachten!
 
@@ -150,37 +162,55 @@ namespace BeWo.Scheduler.ViewModel
 
 				UpdateSchedulerAppointment(item, vm);
 
-                if(vm.ResourceList.Any())
+				// Wird ein Serientermin bearbeitet, erfolgt ein Insert und ein Update. Beim Insert erfolgt bereits die Überschneidungsprüfung und muss hier nicht wiederholt werden.
+                var shouldSkipResourceAvailablityCheck = false;
+
+                if(_RecurrenceInfoId != null && item.RecurrenceInfo?.Id is Guid recurrenceId)
                 {
-                    if(!CheckForUnavailableResources(vm))
-                    {
-                        return;
-                    }
+                    shouldSkipResourceAvailablityCheck = recurrenceId.Equals(_RecurrenceInfoId);
                 }
 
-				if (!ShouldLockOverlappingAppointmentCheck && vm.EventType != 3 && !vm.IsTask)
-				{
-					var isOverlapping = false;
 
-                    ServiceFacade.DoResourceServiceSync(s => isOverlapping = s.OverlappingAppointmentsExist(
-                        vm.Start,
-                        vm.End,
-                        vm.EmployeeList.Select(emp => emp.Employee.EmployeeOid).ToList(),
-                        vm.CustomerList.Select(cc => cc.CustomerOid).ToList(),
-                        vm.ResourceList.Select(r => r.ResourceOid.Value).ToList(),
-                        vm.Originator.EmployeeOid,
-                        vm.DataContract.SchedulerAppointmentOid,
-                        item.RecurrenceInfo?.Id.ToString() ?? string.Empty, item.RecurrenceIndex));
+                /*
+                 * EventTypes:
+                 * 0: Normal
+                 * 1: Pattern
+                 * 2: Occurrence
+                 * 3: ChangedOccurrence
+                 * 4: DeletedOccurrence
+                 *
+                 *
+                 *
+                 * Wozu ist das gut?
+                 * !ShouldLockOverlappingAppointmentCheck && 
+                 */
 
-					if (isOverlapping)
-					{
-                        var erg = MessageBox.Show("Dieser Termin überschneidet sich mit einem anderen bereits existierenden Termin.\nMöchten Sie ihn wirklich speichern?", "Überschneidung", MessageBoxButton.YesNo, MessageBoxImage.Exclamation);
+				if(!shouldSkipResourceAvailablityCheck && !vm.IsTask && vm.EventType != 4 && !(vm.EventType == 3 && vm.DataContract?.SchedulerAppointmentOid == null))
+                {
+                    var start = vm.Start;
+                    var end = vm.End;
+                    var employeeOids = vm.EmployeeList.Select(emp => emp.Employee.EmployeeOid).ToList();
+                    var customerOids = vm.CustomerList.Select(cc => cc.CustomerOid).ToList();
+                    var resourceOids = vm.ResourceList.Where(r => r.ResourceOid.HasValue).Select(r => r.ResourceOid.Value).ToList();
+                    var originatorOid = vm.Originator.EmployeeOid;
+                    var schedulerAppointmentOid = vm.DataContract?.SchedulerAppointmentOid;
+                    var recurrenceInfoId = vm.RecurrenceId;
+                    var recurrenceIndex = vm.RecurrenceIndex;
 
-						if (erg.Equals(MessageBoxResult.No))
-						{
-						    return;
-						}
-					}
+                    var message = string.Empty;
+
+					
+                    ServiceFacade.DoResourceServiceSync( s => message = s.ValidateSchedulerAppointment(start, end, employeeOids, customerOids, resourceOids, originatorOid, schedulerAppointmentOid, recurrenceInfoId, recurrenceIndex, shouldSkipResourceAvailablityCheck));
+
+                    if(!string.IsNullOrWhiteSpace(message))
+                    {
+                        var messageBoxResult = MessageBox.Show(message, "Überschneidung", MessageBoxButton.YesNo, MessageBoxImage.Exclamation);
+
+                        if(messageBoxResult.Equals(MessageBoxResult.No))
+                        {
+                            return;
+                        }
+                    }
 				}
 
 				if (item.Type.Equals(AppointmentType.ChangedOccurrence) && _GeoeffneterTermin != null)
@@ -203,11 +233,13 @@ namespace BeWo.Scheduler.ViewModel
 			var mostRecentAppointments = new List<SchedulerAppointmentDC>();
 			ServiceFacade.DoResourceServiceSync(sync => mostRecentAppointments = sync.UpdateSchedulerAppointments(dcList));
 			UpdateViewModel(mostRecentAppointments);
+            _RecurrenceInfoId = null;
 			control.ActiveView.LayoutChanged();
 			NewSchedulerView.IgnoreChangeEvents = false;
 		}
 
-		public void InsertAppointments(SchedulerControl control, IEnumerable<Appointment> list)
+		private Guid? _RecurrenceInfoId;
+        public void InsertAppointments(SchedulerControl control, IEnumerable<Appointment> list)
 		{
 			var dcList = new List<SchedulerAppointmentDC>();
 			foreach (var item in list)
@@ -218,25 +250,26 @@ namespace BeWo.Scheduler.ViewModel
                     {
                         var dc = new SchedulerAppointmentDC
                         {
-                            IsPrivate = item.CF_IsPrivate(),
-                            Subject = item.Subject,
-                            Description = item.Description,
-                            StartDate = item.Start,
-                            EndDate = item.End,
-                            Originator = item.CF_Originator(),
-                            LabelId = item.LabelId,
-                            AllDay = item.AllDay,
-                            Status = item.StatusId,
-                            Type = (int) item.Type,
-                            Location = item.Location,
-                            RecurrenceInfo = item.RecurrenceInfo.ToXml(),
-                            ReminderInfo = item.Reminder?.ToXml(),
-                            CustomerList = item.CF_CustomerList(),
-                            EmployeeList = item.CF_EmployeeList().ToList(),
-                            ResourceList = item.CF_ResourceList(),
-                            SupportConceptList = item.CF_SupportConceptList(),
-                            RecurrenceIndex = item.RecurrenceIndex,
-                            RecurrenceId = item.RecurrenceInfo.Id.ToString(),
+                            IsPrivate             = item.CF_IsPrivate(),
+                            Subject               = item.Subject,
+                            Description           = item.Description,
+                            StartDate             = item.Start,
+                            EndDate               = item.End,
+                            Originator            = item.CF_Originator(),
+                            LabelKey              = (long?) item.LabelKey,
+                            AllDay                = item.AllDay,
+                            Status                = item.StatusId,
+                            Type                  = (int) item.Type,
+                            Location              = item.Location,
+                            RecurrenceInfo        = item.RecurrenceInfo.ToXml(),
+                            ReminderInfo          = item.Reminder?.ToXml(),
+                            CustomerList          = item.CF_CustomerList(),
+                            EmployeeList          = item.CF_EmployeeList().ToList(),
+                            ResourceList          = item.CF_ResourceList(),
+                            SupportConceptList    = item.CF_SupportConceptList(),
+                            ServiceRecordList     = item.CF_ServiceRecordList(),
+                            RecurrenceIndex       = item.RecurrenceIndex,
+                            RecurrenceId          = item.RecurrenceInfo.Id.ToString(),
                             HasServiceRecordEntry = item.CF_HasServiceRecordEntry()
                         };
 
@@ -247,42 +280,43 @@ namespace BeWo.Scheduler.ViewModel
                         continue;
 					}
 				}
-
+				
+                if(item.RecurrenceInfo != null)
+                {
+                    _RecurrenceInfoId = (Guid) item.RecurrenceInfo.Id;
+                }
+                
 				UpdateSchedulerAppointment(item, vm);
 
-                if(vm.ResourceList.Any())
+                if(!vm.IsTask && vm.EventType != 4 && !ShouldLockOverlappingAppointmentCheck)
                 {
-                    if(!CheckForUnavailableResources(vm))
+                    var start                   = vm.Start;
+                    var end                     = vm.End;
+                    var employeeOids            = vm.EmployeeList.Select(emp => emp.Employee.EmployeeOid).ToList();
+                    var customerOids            = vm.CustomerList.Select(cc => cc.CustomerOid).ToList();
+                    var resourceOids            = vm.ResourceList.Where(r => r.ResourceOid.HasValue).Select(r => r.ResourceOid.Value).ToList();
+                    var originatorOid           = vm.Originator.EmployeeOid;
+                    var schedulerAppointmentOid = vm.DataContract?.SchedulerAppointmentOid;
+                    var recurrenceInfoId        = vm.RecurrenceId;
+                    var recurrenceIndex         = vm.RecurrenceIndex;
+
+                    var message = string.Empty;
+					
+					ServiceFacade.DoResourceServiceSync(s => message = s.ValidateSchedulerAppointment(start, end, employeeOids, customerOids, resourceOids, originatorOid, schedulerAppointmentOid, recurrenceInfoId, recurrenceIndex, false));
+
+                    if(!string.IsNullOrWhiteSpace(message))
                     {
-                        return;
+                        var messageBoxResult = MessageBox.Show(message, "Überschneidung", MessageBoxButton.YesNo, MessageBoxImage.Exclamation);
+
+                        if(messageBoxResult.Equals(MessageBoxResult.No))
+                        {
+                            return;
+                        }
                     }
-				}
+                }
 
-				if (!ShouldLockOverlappingAppointmentCheck && !vm.IsTask)
-				{
-					var isOverlapping = false;
-                    ServiceFacade.DoResourceServiceSync(s => isOverlapping = s.OverlappingAppointmentsExist(
-                        vm.Start,
-                        vm.End,
-                        vm.EmployeeList.Select(emp => emp.Employee.EmployeeOid).ToList(),
-                        vm.CustomerList.Select(cc => cc.CustomerOid).ToList(),
-                        vm.ResourceList.Select(r => r.ResourceOid.Value).ToList(),
-                        vm.Originator.EmployeeOid,
-                        vm.DataContract.SchedulerAppointmentOid,
-                        item.RecurrenceInfo?.Id.ToString() ?? string.Empty, item.RecurrenceIndex));
 
-					if (isOverlapping)
-					{
-						var erg = MessageBox.Show("Dieser Termin überschneidet sich mit einem anderen bereits existierenden Termin.\nMöchten Sie ihn wirklich speichern?", "Überschneidung", MessageBoxButton.YesNo, MessageBoxImage.Exclamation);
-
-						if (erg.Equals(MessageBoxResult.No))
-						{
-						    return;
-						}
-					}
-				}
-
-				dcList.Add(vm.CommitToDataContract());
+                dcList.Add(vm.CommitToDataContract());
 			}
 
 			if (dcList.Count <= 0)
@@ -300,30 +334,26 @@ namespace BeWo.Scheduler.ViewModel
 
 		private void UpdateSchedulerAppointment(Appointment app, SchedulerAppointmentVM vm)
 		{
-		    vm.EmployeeList = app.CF_EmployeeList();
-		    vm.CustomerList = app.CF_CustomerList();
-		    vm.ResourceList = app.CF_ResourceList();
-		    vm.Originator = app.CF_Originator();
-		    vm.IsPrivate = app.CF_IsPrivate();
-		    vm.IsTask = app.CF_IsTask();
-		    vm.DueDate = app.CF_DueDate();
-		    vm.CompletedDate = app.CF_CompletedDate();
-		    vm.CompletedNotice = app.CF_CompletedNotice();
-		    vm.TaskDescription = app.CF_TaskDescription();
-		    vm.SupportConceptList = app.CF_SupportConceptList();
+		    vm.EmployeeList          = app.CF_EmployeeList();
+		    vm.CustomerList          = app.CF_CustomerList();
+		    vm.ResourceList          = app.CF_ResourceList();
+		    vm.Originator            = app.CF_Originator();
+		    vm.IsPrivate             = app.CF_IsPrivate();
+		    vm.IsTask                = app.CF_IsTask();
+		    vm.DueDate               = app.CF_DueDate();
+		    vm.CompletedDate         = app.CF_CompletedDate();
+		    vm.CompletedNotice       = app.CF_CompletedNotice();
+		    vm.TaskDescription       = app.CF_TaskDescription();
+		    vm.SupportConceptList    = app.CF_SupportConceptList();
             vm.HasServiceRecordEntry = app.CF_HasServiceRecordEntry();
+            vm.ServiceRecordList     = app.CF_ServiceRecordList();
 
-		    if(vm.IsTask)
-		    {
-		        vm.AllDay = true;
-		        if(vm.DueDate.HasValue)
-		        {
-		            vm.DueDate = vm.Start.MergeDatesByDate(vm.DueDate.Value);
-		            vm.DueTime = vm.DueDate;
-		        }
-		    }
-		    
-		    if(!vm.CustomFields.ContainsKey(nameof(CustomFieldStorage)))
+            if(vm.IsTask)
+            {
+                vm.AllDay = true;
+            }
+
+            if(!vm.CustomFields.ContainsKey(nameof(CustomFieldStorage)))
 		    {
 		        vm.CustomFields.Add(nameof(CustomFieldStorage), new CustomFieldStorage(vm));
 		    }
@@ -364,8 +394,8 @@ namespace BeWo.Scheduler.ViewModel
 				}
 			}
 
-			app.LabelId = vm.LabelId;
-		}
+            app.LabelKey = vm.LabelKey;
+        }
 
 		AbstractAppointmentEditForm ISchedulerViewModel.GetEditAppointmentForm(SchedulerControl control, Appointment appointment)
 		{
@@ -384,7 +414,7 @@ namespace BeWo.Scheduler.ViewModel
 
             if (!appointment.Type.Equals(AppointmentType.ChangedOccurrence))
 			{
-			    return new SchedulerAppointmentEditForm(this, control, appointment, _AllEmployees, _AllCustomers, _Categories2Resources, isTask);
+			    return new SchedulerAppointmentEditForm(this, control, appointment, AllEmployees, AllCustomers, Categories2Resources, isTask);
 			}
 
 			var index = appointment.RecurrenceIndex;
@@ -402,17 +432,17 @@ namespace BeWo.Scheduler.ViewModel
 				}
 			}
 
-			return new SchedulerAppointmentEditForm(this, control, appointment, _AllEmployees, _AllCustomers, _Categories2Resources, isTask);
+			return new SchedulerAppointmentEditForm(this, control, appointment, AllEmployees, AllCustomers, Categories2Resources, isTask);
 		}
 
-		public void ApplyChangesToChangedOccurencyCustomFields(ObservableCollection<Employee2SchedulerAppointmentDC> employees, List<CompactCustomerDC> customers, List<ResourceDC> resources, CompactEmployeeDC originator, bool isPrivate, string index, Guid id, bool isTask, string taskDescription, DateTime? completedDate, DateTime? dueDate, string completedNotice, List<CompactSupportConceptDC> supportConcepts, string subject, bool isAllDay)
+		public void ApplyChangesToChangedOccurencyCustomFields(ObservableCollection<Employee2SchedulerAppointmentDC> employees, List<CompactCustomerDC> customers, List<ResourceDC> resources, CompactEmployeeDC originator, bool isPrivate, string index, Guid id, bool isTask, string taskDescription, DateTime? completedDate, DateTime? dueDate, string completedNotice, List<CompactSupportConceptDC> supportConcepts, string subject, bool isAllDay, List<ServiceRecordDC> serviceRecords)
 		{
 			if (!_ChangedOccurenceCustomFields.ContainsKey(id) || !_ChangedOccurenceCustomFields[id].ContainsKey(index))
 			{
 			    return;
 			}
 
-		    _ChangedOccurenceCustomFields[id][index][nameof(CustomFieldStorage)] = new CustomFieldStorage(employees, customers, resources, originator, isPrivate, isTask, taskDescription, dueDate, completedDate, completedNotice, supportConcepts, subject, isAllDay);
+		    _ChangedOccurenceCustomFields[id][index][nameof(CustomFieldStorage)] = new CustomFieldStorage(employees, customers, resources, originator, isPrivate, isTask, taskDescription, dueDate, completedDate, completedNotice, supportConcepts, subject, isAllDay, serviceRecords);
 		}
 
 		public void AddCustomFieldsMapping(SchedulerStorage schedulerStorage)
@@ -524,8 +554,8 @@ namespace BeWo.Scheduler.ViewModel
 
                     var istEigen = ersteller.EmployeeOid.Equals(BeWoApp.LoggedOnEmployee.EmployeeOid);
 
-                    var mVorhanden = appEList.Any(a2app => _AllEmployees.Contains(a2app.Employee));
-                    var kVorhanden = customerList.Any(_AllCustomers.Contains);
+                    var mVorhanden = appEList.Any(a2app => AllEmployees.Contains(a2app.Employee));
+                    var kVorhanden = customerList.Any(AllCustomers.Contains);
 
                     wirdAngezeigt = liste[0] && mVorhanden || liste[1] && resourceList.Any() || liste[2] && kVorhanden;
 
@@ -640,39 +670,6 @@ namespace BeWo.Scheduler.ViewModel
 
             return areEqual;
         }
-
-        private static bool CheckForUnavailableResources(SchedulerAppointmentVM vm)
-        {
-            var unavailableResources = new List<ResourceDC>();
-
-            ServiceFacade.DoResourceServiceSync(s => unavailableResources = s.CheckResourceAvailability(vm.Start, vm.End, vm.ResourceList.Select(resource => resource.ResourceOid.Value).ToList(), null));
-
-            if(unavailableResources.Any())
-            {
-                var names = string.Empty;
-
-                unavailableResources.DoForEach(resource => names += resource.Name + ", ");
-
-                names = names.TrimEnd(' ').TrimEnd(',');
-
-                var resourceCount = vm.ResourceList.Count;
-
-                var warningMessage = unavailableResources.Count > 1 ?
-                    $"Ein{(resourceCount > 1 ? "ige" : "e")} der ausgewählten Ressourcen ({names}) sind" :
-                    $"{(resourceCount > 1 ? "Eine der" : "Die")} ausgewählte{(resourceCount > 1 ? "n" : string.Empty)} Ressource{(resourceCount > 1 ? "n" : string.Empty)} ({names}) ist";
-
-                warningMessage += $" zum gewählten Zeitpunkt ({vm.Start.GetIntervalDescription(vm.End).TrimStart(' ')}) nicht verfügbar.\n\nMöchten Sie trotzdem speichern?";
-
-                var erg = MessageBox.Show(warningMessage, "Überschneidung", MessageBoxButton.YesNo);
-
-                if(erg.Equals(MessageBoxResult.No))
-                {
-                    return false;
-                }
-            }
-
-            return true;
-        }
 	}
 }
 

BeWo/Scheduler/ViewModel/SchedulerAppointmentVM.cs

@@ -2,13 +2,14 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-
+using BeWo.Scheduler.Utils;
 using BeWo.ViewModel;
-
+using BS.Shared;
 using BS.Shared.DataContracts;
 using BS.Shared.DataContracts.Compact;
 
 using BS.Shared.Extensions;
+using DevExpress.XtraScheduler;
 
 namespace BeWo.Scheduler.ViewModel
 {
@@ -33,34 +34,40 @@ namespace BeWo.Scheduler.ViewModel
 	    public static string PropertyName_DueDate         = nameof(DueDate);
 	    public static string PropertyName_CompletedDate   = nameof(CompletedDate);
 	    public static string PropertyName_CompletedNotice = nameof(CompletedNotice);
-	    public static string PropertyName_TaskDescription = nameof(TaskDescription);
+		public static string PropertyName_CompletedUser = nameof(CompletedUser);
+		public static string PropertyName_TaskDescription = nameof(TaskDescription);
 
-		private bool _AllDay;
-		private string _Description;
-		private DateTime _End;
-		private string _Location;
-		private string _RecurrenceInfo;
-		private DateTime _Start;
-		private int _Status;
-		private string _Subject;
-		private int _Type;
-		private Dictionary<string, object> _CustomFields;
-		private bool _IsPrivate;
+		private bool                                                  _AllDay;
+		private string                                                _Description;
+		private DateTime                                              _End;
+		private string                                                _Location;
+		private string                                                _RecurrenceInfo;
+		private DateTime                                              _Start;
+		private int                                                   _Status;
+		private string                                                _Subject;
+		private int                                                   _Type;
+		private Dictionary<string, object>                            _CustomFields;
+		private bool                                                  _IsPrivate;
 		private ObservableCollection<Employee2SchedulerAppointmentDC> _EmployeeList;
-		private List<CompactCustomerDC> _CustomerList;
-		private List<ResourceDC> _ResourceList;
-		private List<CompactSupportConceptDC> _SupportConceptList;
-		private CompactEmployeeDC _Originator;
-	    private bool _IsTask;
-	    private string _TaskDescription;
-	    private string _CompletedNotice;
-	    private DateTime? _CompletedDate;
-	    private DateTime? _DueDate;
-	    private DateTime? _DueTime;
-        private bool _HasServiceRecordEntry;
+		private List<CompactCustomerDC>                               _CustomerList;
+		private List<ResourceDC>                                      _ResourceList;
+		private List<CompactSupportConceptDC>                         _SupportConceptList;
+		private CompactEmployeeDC                                     _Originator;
+	    private bool                                                  _IsTask;
+	    private string                                                _TaskDescription;
+	    private string                                                _CompletedNotice;
+		private string _CompletedUser;
+		private DateTime?                                             _CompletedDate;
+	    private DateTime?                                             _DueDate;
+	    private DateTime?                                             _DueTime;
+        private bool                                                  _HasServiceRecordEntry;
+        private bool                                                  _IsArchived;
+        private long?                                                 _AbsenceTimeOid;
+        private bool                                                  _IsCustomerAbsenceTime;
+        private List<ServiceRecordDC>                                 _ServiceRecordList;
 
 
-        public bool HasServiceRecordEntry
+		public bool HasServiceRecordEntry
         {
             get => _HasServiceRecordEntry;
             set
@@ -75,11 +82,30 @@ namespace BeWo.Scheduler.ViewModel
             }
         }
 
+        public bool IsArchived
+        {
+            get => _IsArchived;
+
+            set
+            {
+                if(AreDifferent(_IsArchived, value))
+                {
+                    _IsArchived = value;
+                    StoreDirtyInformation((value && DataContract.ActivationType == ActivationTypeId.Active) || (!value && DataContract.ActivationType == ActivationTypeId.Archived), nameof(IsArchived));
+                    FirePropertyChanged(nameof(IsArchived));
+                }
+            }
+        }
+
 		public DateTime? AbsenceTimeStart { get; set; }
         public DateTime? AbsenceTimeEnd { get; set; }
 
+		public long? AbsenceTimeOid { get; set; }
+
+		public bool IsCustomerAbsenceTime { get; set; }
+
 		public object Id { get; set; }
-		public int LabelId { get; set; }
+		
 		public Dictionary<string, object> CustomFields
 		{
 			get => _CustomFields ?? (_CustomFields = new Dictionary<string, object>());
@@ -94,20 +120,23 @@ namespace BeWo.Scheduler.ViewModel
 
 			    var customFieldStorage = (CustomFieldStorage) value[nameof(CustomFieldStorage)];
 			    
-				EmployeeList       = customFieldStorage.EmployeeList;
-				CustomerList       = customFieldStorage.CustomerList;
-				ResourceList       = customFieldStorage.ResourceList;
-				Originator         = customFieldStorage.Originator;
-				IsPrivate          = customFieldStorage.IsPrivate;
-			    IsTask             = customFieldStorage.IsTask;
-			    DueDate            = customFieldStorage.DueDate;
-			    TaskDescription    = customFieldStorage.TaskDescription;
-			    CompletedDate      = customFieldStorage.CompletedDate;
-			    CompletedNotice    = customFieldStorage.CompletedNotice;
-			    SupportConceptList = customFieldStorage.SupportConceptList;
-			}
+				EmployeeList          = customFieldStorage.EmployeeList;
+				CustomerList          = customFieldStorage.CustomerList;
+				ResourceList          = customFieldStorage.ResourceList;
+				Originator            = customFieldStorage.Originator;
+				IsPrivate             = customFieldStorage.IsPrivate;
+			    IsTask                = customFieldStorage.IsTask;
+			    DueDate               = customFieldStorage.DueDate;
+			    TaskDescription       = customFieldStorage.TaskDescription;
+			    CompletedDate         = customFieldStorage.CompletedDate;
+			    CompletedNotice       = customFieldStorage.CompletedNotice;
+				CompletedUser         = customFieldStorage.CompletedUser;
+				SupportConceptList    = customFieldStorage.SupportConceptList;
+                AbsenceTimeOid        = customFieldStorage.AbsenceTimeOid;
+                IsCustomerAbsenceTime = customFieldStorage.IsCustomerAbsenceTime;
+            }
 		}
-
+		
 		public int EventType
 		{
 			get => _Type;
@@ -473,7 +502,28 @@ namespace BeWo.Scheduler.ViewModel
 	        }
 	    }
 
-	    public DateTime? CompletedDate
+		public string CompletedUser
+		{
+			get => _CompletedUser;
+
+			set
+			{
+				if (AreDifferent(_CompletedUser, value))
+				{
+					_CompletedUser = value;
+
+					if (IsAbsenceTime)
+					{
+						return;
+					}
+
+					StoreDirtyInformation(AreDifferent(DataContract.CompletedUser, value), nameof(CompletedUser));
+					FirePropertyChanged(nameof(CompletedUser));
+				}
+			}
+		}
+
+		public DateTime? CompletedDate
 	    {
 	        get => _CompletedDate;
 
@@ -530,24 +580,59 @@ namespace BeWo.Scheduler.ViewModel
 	        }
 	    }
 
-        public SchedulerAppointmentVM(SchedulerAppointmentDC pDC) : base(pDC, pDC.SchedulerAppointmentOid == null)
+        public Guid? RecurrenceId => BS.Shared.Core.Utils.GetRecurrenceIdFromRecurrenceInfo(RecurrenceInfo);
+
+        public int RecurrenceIndex => BS.Shared.Core.Utils.GetRecurrenceIndexFromRecurrenceInfo(RecurrenceInfo);
+
+		public bool CanBeEdited { get; set; } = true;
+
+
+		public SchedulerAppointmentVM(SchedulerAppointmentDC pDC) : base(pDC, pDC.SchedulerAppointmentOid == null)
 	    {
 	        IsTeilnahmeBestaetigung = pDC.IsTeilnahmeBestaetigung;
-	    }
+			CanBeEdited = pDC.CanBeEdited;
+		}
+
+		// Wird für die Druckfunktion von Serienterminen benutzt:
+        public SchedulerAppointmentVM(Appointment appointment) : base(new SchedulerAppointmentDC(), true)
+        {
+            _AllDay = appointment.AllDay;
+            _Start = appointment.Start;
+            _End = appointment.End;
+            _Location = appointment.Location;
+            _Description = appointment.Description;
+            _Subject = appointment.Subject;
+            _Type = (int) appointment.Type;
+            _IsPrivate = appointment.CF_IsPrivate();
+            _EmployeeList = appointment.CF_EmployeeList();
+            _CustomerList = appointment.CF_CustomerList();
+            _ResourceList = appointment.CF_ResourceList();
+            _Originator = appointment.CF_Originator();
+            _AbsenceTimeOid = appointment.CF_AbsenceTimeOid();
+            _IsCustomerAbsenceTime = appointment.CF_IsCustomerAbsenceTime();
+
+
+			if(!(appointment.RecurrenceInfo is null) && appointment.Type == AppointmentType.Occurrence)
+            {
+                _RecurrenceInfo = $"<RecurrenceInfo Id=\"{appointment.RecurrenceInfo.Id}\" Index=\"{appointment.RecurrenceIndex}\" />";
+            }
+        }
 
 		// Wird für Abwesenheiten genutzt
-		public SchedulerAppointmentVM(bool pAllDay, string pSubject, DateTime pStart, DateTime pEnd, CompactEmployeeDC pOriginator, DateTime? absenceTimeStart, DateTime? absenceTimeEnd)
+		public SchedulerAppointmentVM(bool pAllDay, string pSubject, DateTime pStart, DateTime pEnd, CompactEmployeeDC pOriginator, DateTime? absenceTimeStart, DateTime? absenceTimeEnd, long absenceTimeOid, bool isCustomerAbsenceTime)
 		{
-			_AllDay = pAllDay;
-			_Subject = pSubject;
-			_Start = pStart;
-			_End = pEnd;
+			_AllDay     = pAllDay;
+			_Subject    = pSubject;
+			_Start      = pStart;
+			_End        = pEnd;
 			_Originator = pOriginator;
 
             AbsenceTimeStart = absenceTimeStart;
-            AbsenceTimeEnd = absenceTimeEnd;
+            AbsenceTimeEnd   = absenceTimeEnd;
+			IsAbsenceTime    = true;
+			AbsenceTimeOid   = absenceTimeOid;
 
-			IsAbsenceTime = true;
+            IsCustomerAbsenceTime = isCustomerAbsenceTime;
 
 			UpdateCustomFields();
 		}
@@ -579,9 +664,14 @@ namespace BeWo.Scheduler.ViewModel
 		    _IsTask                = pDataContract.IsTask;
 		    _TaskDescription       = pDataContract.TaskDescription;
 		    _CompletedNotice       = pDataContract.CompletedNotice;
-		    _CompletedDate         = pDataContract.CompletedDate;
+			_CompletedUser         = pDataContract.CompletedUser;
+			_CompletedDate         = pDataContract.CompletedDate;
 		    _SupportConceptList    = pDataContract.SupportConceptList ?? new List<CompactSupportConceptDC>();
             _HasServiceRecordEntry = pDataContract.HasServiceRecordEntry;
+            _ServiceRecordList     = pDataContract.ServiceRecordList ?? new List<ServiceRecordDC>();
+
+            _IsArchived = pDataContract.ActivationType == ActivationTypeId.Archived;
+			CanBeEdited = pDataContract.CanBeEdited;
 
 
 			if(pDataContract.DueDate.HasValue)
@@ -610,10 +700,12 @@ namespace BeWo.Scheduler.ViewModel
 		    pDataContract.IsTask                = _IsTask;
 		    pDataContract.TaskDescription       = _TaskDescription;
 		    pDataContract.CompletedNotice       = _CompletedNotice;
-		    pDataContract.CompletedDate         = _CompletedDate;
+			pDataContract.CompletedUser         = _CompletedUser;
+			pDataContract.CompletedDate         = _CompletedDate;
 		    pDataContract.SupportConceptList    = _SupportConceptList;
             pDataContract.HasServiceRecordEntry = _HasServiceRecordEntry;
-
+            pDataContract.ActivationType        = _IsArchived ? ActivationTypeId.Archived : ActivationTypeId.Active;
+            pDataContract.ServiceRecordList     = _ServiceRecordList;
 
 			if(_DueDate.HasValue && _DueTime.HasValue)
             {
@@ -624,6 +716,8 @@ namespace BeWo.Scheduler.ViewModel
                 pDataContract.DueDate = _DueDate;
             }
 
+			pDataContract.CanBeEdited = CanBeEdited;
+
             return pDataContract;
 		}
 
@@ -660,7 +754,7 @@ namespace BeWo.Scheduler.ViewModel
 
 	        var areEqual =
 	            Equals(Subject, obj.Subject) &&
-                LabelId   == obj.LabelId &&
+				LabelKey == obj.LabelKey &&
 	            AllDay    == obj.AllDay &&
 	            IsPrivate == obj.IsPrivate &&
                 IsDirty   == obj.IsDirty &&
@@ -670,7 +764,8 @@ namespace BeWo.Scheduler.ViewModel
                 Equals(CompletedDate, obj.CompletedDate) &&
                 Equals(DueDate, obj.DueDate) &&
                 Equals(CompletedNotice, obj.CompletedNotice) &&
-                customFieldsAreEqual &&
+				Equals(CompletedUser, obj.CompletedUser) &&
+				customFieldsAreEqual &&
                 CustomerList.AreEqual(obj.CustomerList) &&
 	            Equals(Description, obj.Description) &&
                 EmployeeList.AreEqual(obj.EmployeeList) &&
@@ -679,7 +774,8 @@ namespace BeWo.Scheduler.ViewModel
                 Equals(Location, obj.Location) &&
                 ResourceList.AreEqual(obj.ResourceList) &&
                 Equals(RecurrenceInfo, obj.RecurrenceInfo) &&
-                HasServiceRecordEntry == obj.HasServiceRecordEntry;
+                HasServiceRecordEntry == obj.HasServiceRecordEntry
+                ;
 
 	        return areEqual;
 	    }
@@ -691,13 +787,55 @@ namespace BeWo.Scheduler.ViewModel
                 : base.GetHashCode();
         }
 
-		public override bool IsDirty => !IsAbsenceTime && base.IsDirty;
+		
+		public override bool IsDirty
+		{
+			get
+			{
 
-	    public new bool IsNew
+				return (!IsAbsenceTime && base.IsDirty) || EmployeesChanged();
+			}
+		}
+
+		private bool EmployeesChanged()
+		{
+			if (_EmployeeList != null && this.DataContract.EmployeeList != null && _EmployeeList.Count != this.DataContract.EmployeeList.Count)
+			{
+				return true;
+			}
+			return false;
+		}
+
+		public new bool IsNew
 		{
 			get => !IsAbsenceTime && base.IsNew;
 
 	        set => base.IsNew = value;
 	    }
+
+        public long? LabelKey { get; set; }
+		
+        public List<ServiceRecordDC> ServiceRecordList
+        {
+            get => _ServiceRecordList ?? (ServiceRecordList = new List<ServiceRecordDC>());
+
+            set
+            {
+                if(!AreDifferent(_ServiceRecordList, value))
+                {
+                    return;
+                }
+
+                _ServiceRecordList = value;
+
+                if(IsAbsenceTime)
+                {
+                    return;
+                }
+
+				StoreDirtyInformation(AreDifferent(DataContract.ServiceRecordList, value), nameof(ServiceRecordList));
+				FirePropertyChanged(nameof(ServiceRecordList));
+            }
+        }
 	}
 }

BeWo/SchulbegleitenderDienst/SBDUtils/SBDUtils.cs

@@ -20,7 +20,11 @@ namespace BeWo.SchulbegleitenderDienst.SBDUtils
                 {
                     var substitutionStartingDayCountCondition = SubstitutionStartingDayCountCondition(viewModel);
 
-                    if (substitutionStartingDayCountCondition || viewModel.Vertretung?.VertretenderMitarbeiterOid != null || viewModel.Customer != null && viewModel.Customer.SubstitutionNeed == SubstitutionNeed.NoSubstitutionWanted)
+                    if (viewModel.VertretungsStatus == VertretungsStatus.KlientUndMitarbeiterKrank || viewModel.VertretungsStatus == VertretungsStatus.MaKrankKeineVertretungBenoetigt)
+                    {
+                        unwantedSubstitutionList.AddIfNotIn(viewModel);
+                    }
+                    else if (substitutionStartingDayCountCondition || viewModel.Vertretung?.VertretenderMitarbeiterOid != null || viewModel.Customer != null && viewModel.Customer.SubstitutionNeed == SubstitutionNeed.NoSubstitutionWanted)
                     {
                         unwantedSubstitutionList.AddIfNotIn(viewModel);
                     }

BeWo/SchulbegleitenderDienst/VertretenderKlientSearchView.xaml

@@ -7,9 +7,10 @@
         xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
         xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
         Title="Vertretung auswählen" Height="650" Width="750" WindowStartupLocation="CenterScreen" 
+        xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup"
         ResizeMode="CanResizeWithGrip" WindowStyle="None" Background="Transparent">
-    
-    <GroupBox Header="Vertretenden auswählen" x:Name="rootGroupBox" Style="{DynamicResource MainContentGroupBoxWithoutMaximizeBtnStyle}" MouseLeftButtonDown="RootGroupBox_OnMouseLeftButtonDown" >
+
+    <GroupBox Header="{markup:Translate Vertretenden auswählen}" x:Name="rootGroupBox" Style="{DynamicResource MainContentGroupBoxWithoutMaximizeBtnStyle}" MouseLeftButtonDown="RootGroupBox_OnMouseLeftButtonDown" >
         <Grid>
        
         <Grid Background="White" x:Name="rootGroupBoxMitarbeiter" >
@@ -38,7 +39,7 @@
                 <RowDefinition Height="*"/>
             </Grid.RowDefinitions>
             
-              <GroupBox Header="Mitarbeiter Wunsch Kriterien" Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" Style="{StaticResource ObjectEditGroupBox}" Margin="3,3,3,3" >
+              <GroupBox Header="{markup:Translate Mitarbeiter Wunsch Kriterien}" Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" Style="{StaticResource ObjectEditGroupBox}" Margin="3,3,3,3" >
                 <!-- Ready machen für teilweise funktion / Combobox zur auswahl der tokens und TextBox zur anzeige der ausgewählten tokens -->
              
                     <Grid>
@@ -62,7 +63,7 @@
              
               </GroupBox>
 
-              <GroupBox Header="Mitarbeiter Ausschluss Kriterien" Grid.Row="0" Grid.Column="2" Grid.ColumnSpan="2" Style="{StaticResource ObjectEditGroupBox}" Margin="3,3,3,3">
+              <GroupBox Header="{markup:Translate Mitarbeiter Ausschluss Kriterien}" Grid.Row="0" Grid.Column="2" Grid.ColumnSpan="2" Style="{StaticResource ObjectEditGroupBox}" Margin="3,3,3,3">
                 <!-- Ready machen für teilweise funktion   <ColumnDefinition Width="Auto"/>
                       <ColumnDefinition Width="Auto"/> <RowDefinition Height="Auto"/>-->
 
@@ -85,9 +86,9 @@
 
                   </Grid>
               </GroupBox>
-          
-			 
-              <GroupBox Header="Klient Wunsch Kriterien" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2"  Style="{StaticResource ObjectEditGroupBox}" Margin="3,3,3,3" >
+
+
+                    <GroupBox Header="{markup:Translate Klient Wunsch Kriterien}" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2"  Style="{StaticResource ObjectEditGroupBox}" Margin="3,3,3,3" >
 
 				  <!-- ############### wird durch Token Combobox mit devexpress vers. 17 ersetzt ################################## -->
                  <Grid>
@@ -110,7 +111,7 @@
 				  <!-- ############################################################################################################## -->
               </GroupBox>
 
-              <GroupBox Header="Klient Ausschluss Kriterien" Grid.Row="1" Grid.Column="2" Grid.ColumnSpan="2"  Style="{StaticResource ObjectEditGroupBox}" Margin="3,3,3,3" >
+                    <GroupBox Header="{markup:Translate Klient Ausschluss Kriterien}" Grid.Row="1" Grid.Column="2" Grid.ColumnSpan="2"  Style="{StaticResource ObjectEditGroupBox}" Margin="3,3,3,3" >
 
 				  <!-- ############### wird durch Token Combobox mit devexpress vers. 17 ersetzt ################################## -->
                    <Grid>
@@ -149,8 +150,8 @@
 					  <RowDefinition Height="60"/>
 					  <RowDefinition Height="*"/>
 				  </Grid.RowDefinitions>
-				  
-				  <GroupBox Grid.Row="0"  Margin="1" Style="{StaticResource ObjectEditGroupBox}" Header="Klienten PLZ">
+
+                        <GroupBox Grid.Row="0"  Margin="1" Style="{StaticResource ObjectEditGroupBox}" Header="{markup:Translate Klienten PLZ}">
 					<Grid>
 						<Grid.ColumnDefinitions>
 							<ColumnDefinition Width="*"/>

BeWo/SchulbegleitenderDienst/VertretenderKlientSearchView.xaml.cs

@@ -584,7 +584,7 @@ namespace BeWo.SchulbegleitenderDienst
 				}
 				else
 				{
-					MessageBox.Show("Bitte wählen sie zuerst einen Klienten aus.");
+					MessageBox.Show("Bitte wählen sie zuerst " + BS.Shared.Translation.Translator.Translate("einen Klienten") + " aus.");
 				}
 	    }
     }

BeWo/SchulbegleitenderDienst/VertretungsMainView.xaml

@@ -91,7 +91,7 @@
 
                 <controls:PopupNonTopmost Topmost="False" x:Name="popup_newMitarbeiterVertretung" Width="300" StaysOpen="True" Placement="MousePoint" Grid.Row="1" PlacementTarget="{Binding ElementName=MitarbeiterVertretung_Button}">
                   <Border Background="White" Padding="3" BorderThickness="1" BorderBrush="Gray">
-                    <GroupBox x:Name="groupbox_newEnvironmentPerson" Header="Mitarbeiter/in hinzufügen" Style="{DynamicResource ObjectEditGroupBox}">
+                    <GroupBox x:Name="groupbox_newEnvironmentPerson" Header="{markup:Translate Mitarbeiter/in hinzufügen}" Style="{DynamicResource ObjectEditGroupBox}">
                       <Grid>
                         <Grid.ColumnDefinitions>
                           <ColumnDefinition Width="Auto" />
@@ -182,7 +182,7 @@
 
                 <controls:PopupNonTopmost Topmost="False" x:Name="popup_newKlientVertretung" Width="300" StaysOpen="True" Placement="MousePoint" Grid.Row="1" PlacementTarget="{Binding ElementName=KlientVertretung_Button}">
                   <Border Background="White" Padding="3" BorderThickness="1" BorderBrush="Gray">
-                    <GroupBox x:Name="groupbox_newKlientVertretung" Header="Klient/in hinzufügen" Style="{DynamicResource ObjectEditGroupBox}">
+                    <GroupBox x:Name="groupbox_newKlientVertretung" Header="{markup:Translate Klient/in hinzufügen}" Style="{DynamicResource ObjectEditGroupBox}">
                       <Grid>
                         <Grid.ColumnDefinitions>
                           <ColumnDefinition Width="Auto" />
@@ -203,7 +203,7 @@
                           <RowDefinition Height="Auto" />
                         </Grid.RowDefinitions>
 
-                        <Label Grid.Row="0" Grid.Column="0" Content="Klient/in" />
+                        <Label Grid.Row="0" Grid.Column="0" Content="{markup:Translate Klient/in}" />
                         <Label Grid.Row="1" Grid.Column="0" Content="Abwesenheitskategorie" />
                         <Label Grid.Row="2" Grid.Column="0" Content="Meldung vom" />
                         <Label Grid.Row="3" Grid.Column="0" Content="Startdatum" />
@@ -295,7 +295,7 @@
                 <GroupBox Header="{markup:Translate Abwesenheiten Mitarbeiter}" Style="{StaticResource ObjectEditGroupBox}" >
                   <dxg:GridControl  x:Name="GridDataControlTagesansichtMitarbeiter" Visibility="Visible" Grid.Row="0" Margin="5,5,5,5" >
                     <dxg:GridControl.Columns >
-                      <dxg:GridColumn FieldName="Employee" Width="125" ReadOnly="True" Header="Mitarbeiter/in">
+                      <dxg:GridColumn FieldName="Employee" Width="125" ReadOnly="True" Header="{markup:Translate Mitarbeiter/in}">
                         <dxg:GridColumn.CellStyle>
                           <Style TargetType="{x:Type dxg:LightweightCellEditor}" >
                             <Setter Property="Background" Value="{Binding RowData.Row.MitarbeiterStatusColor}" />
@@ -303,7 +303,7 @@
                         </dxg:GridColumn.CellStyle>
                       </dxg:GridColumn>
                       <dxg:GridColumn FieldName="ArbeitszeitenString" Header="Arbeitszeit" ReadOnly="True" Width="100"/>
-                      <dxg:GridColumn FieldName="Customer" Header="Klient/in" Width="125" ReadOnly="True" >
+                      <dxg:GridColumn FieldName="Customer" Header="{markup:Translate Klient/in}" Width="125" ReadOnly="True" >
                         <dxg:GridColumn.CellStyle>
                           <Style TargetType="{x:Type dxg:LightweightCellEditor}" >
                             <Setter Property="Background" Value="{Binding RowData.Row.KlientStatusColor}" />
@@ -352,7 +352,7 @@
                     <dxg:GridControl.Columns >
 
 
-                      <dxg:GridColumn FieldName="Employee" Width="125" ReadOnly="True" Header="Mitarbeiter/in">
+                      <dxg:GridColumn FieldName="Employee" Width="125" ReadOnly="True" Header="{markup:Translate Mitarbeiter/in}">
                         <dxg:GridColumn.CellStyle>
                           <Style TargetType="{x:Type dxg:LightweightCellEditor}" >
                             <Setter Property="Background" Value="{Binding RowData.Row.MitarbeiterStatusColor}" />
@@ -362,7 +362,7 @@
 
                       <dxg:GridColumn FieldName="ArbeitszeitenString" Header="Arbeitszeit" ReadOnly="True" Width="100"/>
 
-                      <dxg:GridColumn FieldName="Customer" Header="Klient/in" Width="125" ReadOnly="True" >
+                      <dxg:GridColumn FieldName="Customer" Header="{markup:Translate Klient/in}" Width="125" ReadOnly="True" >
 
                         <dxg:GridColumn.CellStyle>
                           <Style TargetType="{x:Type dxg:LightweightCellEditor}" >
@@ -422,11 +422,11 @@
                   <dxg:GridControl  x:Name="GridDataControlWochenansichtMitarbeiter" Grid.Row="1" Grid.ColumnSpan="3" AllowDrop="true"  Margin="5,5,5,5"  VerticalContentAlignment="Center" BorderBrush="Black" >
               <dxg:GridControl.Columns >
 
-                <dxg:GridColumn FieldName="Employee"  Header="Mitarbeiter/in" Width="125" ReadOnly="True" >
+                <dxg:GridColumn FieldName="Employee"  Header="{markup:Translate Mitarbeiter/in}" Width="125" ReadOnly="True" >
                   
                 </dxg:GridColumn>
 
-                <dxg:GridColumn FieldName="Customer" Header="Klient/in" Width="125" ReadOnly="True" >
+                <dxg:GridColumn FieldName="Customer" Header="{markup:Translate Klient/in}" Width="125" ReadOnly="True" >
                   
                 </dxg:GridColumn>
 
@@ -574,11 +574,11 @@
                   <dxg:GridControl  x:Name="GridDataControlWochenansichtKlient" Grid.Row="2" Grid.ColumnSpan="3" AllowDrop="true"  Margin="5,5,5,5"  VerticalContentAlignment="Center" BorderBrush="Black" >
               <dxg:GridControl.Columns >
 
-                <dxg:GridColumn FieldName="Employee"  Header="Mitarbeiter / in" Width="125" ReadOnly="True" >
+                <dxg:GridColumn FieldName="Employee"  Header="{markup:Translate Mitarbeiter/in}" Width="125" ReadOnly="True" >
                   
                 </dxg:GridColumn>
 
-                <dxg:GridColumn FieldName="Customer" Header="Klient/in" Width="125" ReadOnly="True" >
+                <dxg:GridColumn FieldName="Customer" Header="{markup:Translate Klient/in}" Width="125" ReadOnly="True" >
                   
                 </dxg:GridColumn>
 
@@ -619,7 +619,7 @@
 
                 <!-- Umbauen -->
 
-                <dxg:GridColumn FieldName="Employee" Header="Mitarbeiter" Width="125" ReadOnly="True" >
+                <dxg:GridColumn FieldName="Employee" Header="{markup:Translate Mitarbeiter}" Width="125" ReadOnly="True" >
                   <!-- <dxg:GridColumn.CellStyle>
               <Style TargetType="{x:Type dxg:LightweightCellEditor}" >
                 <Setter Property="Background" Value="White" />
@@ -640,7 +640,7 @@
                       <dxe:ButtonEditSettings.Buttons >
                         <dxe:ButtonInfo GlyphKind="Custom" ButtonKind="Simple" Click="AddKlientToMitarbeiter_OnClick"  >
                           <dxe:ButtonInfo.Content>
-                            <Image Source ="../Ressources/Icons/Search.png" Width="20" Height="15" RenderOptions.BitmapScalingMode="HighQuality" x:Name="SearchImageButtonMaMo"  ToolTip="Klient/in hinzufügen"/>
+                            <Image Source ="../Ressources/Icons/Search.png" Width="20" Height="15" RenderOptions.BitmapScalingMode="HighQuality" x:Name="SearchImageButtonMaMo"  ToolTip="{markup:Translate Klient/in hinzufügen}"/>
                           </dxe:ButtonInfo.Content>
                         </dxe:ButtonInfo>
                       </dxe:ButtonEditSettings.Buttons>
@@ -670,7 +670,7 @@
                       <dxe:ButtonEditSettings.Buttons >
                         <dxe:ButtonInfo GlyphKind="Custom" ButtonKind="Simple"  Click="AddKlientToMitarbeiter_OnClick">
                           <dxe:ButtonInfo.Content>
-                            <Image Source ="../Ressources/Icons/Search.png" Width="20" Height="15" RenderOptions.BitmapScalingMode="HighQuality" x:Name="SearchImageButtonMaDi"  ToolTip="Klient/in hinzufügen"/>
+                                                        <Image Source ="../Ressources/Icons/Search.png" Width="20" Height="15" RenderOptions.BitmapScalingMode="HighQuality" x:Name="SearchImageButtonMaDi"  ToolTip="{markup:Translate Klient/in hinzufügen}"/>
                           </dxe:ButtonInfo.Content>
                         </dxe:ButtonInfo>
                       </dxe:ButtonEditSettings.Buttons>
@@ -700,7 +700,7 @@
                       <dxe:ButtonEditSettings.Buttons >
                         <dxe:ButtonInfo GlyphKind="Custom" ButtonKind="Simple"  Click="AddKlientToMitarbeiter_OnClick">
                           <dxe:ButtonInfo.Content>
-                            <Image Source ="../Ressources/Icons/Search.png" Width="20" Height="15" RenderOptions.BitmapScalingMode="HighQuality" x:Name="SearchImageButtonMaMi"  ToolTip="Klient/in hinzufügen"/>
+                            <Image Source ="../Ressources/Icons/Search.png" Width="20" Height="15" RenderOptions.BitmapScalingMode="HighQuality" x:Name="SearchImageButtonMaMi"  ToolTip="{markup:Translate Klient/in hinzufügen}"/>
                           </dxe:ButtonInfo.Content>
                         </dxe:ButtonInfo>
                       </dxe:ButtonEditSettings.Buttons>
@@ -730,7 +730,7 @@
                       <dxe:ButtonEditSettings.Buttons >
                         <dxe:ButtonInfo GlyphKind="Custom" ButtonKind="Simple"  Click="AddKlientToMitarbeiter_OnClick">
                           <dxe:ButtonInfo.Content>
-                            <Image Source ="../Ressources/Icons/Search.png" Width="20" Height="15" RenderOptions.BitmapScalingMode="HighQuality" x:Name="SearchImageButtonMaDo"  ToolTip="Klient/in hinzufügen"/>
+                                                        <Image Source ="../Ressources/Icons/Search.png" Width="20" Height="15" RenderOptions.BitmapScalingMode="HighQuality" x:Name="SearchImageButtonMaDo"  ToolTip="{markup:Translate Klient/in hinzufügen}"/>
                           </dxe:ButtonInfo.Content>
                         </dxe:ButtonInfo>
                       </dxe:ButtonEditSettings.Buttons>
@@ -760,7 +760,7 @@
                       <dxe:ButtonEditSettings.Buttons >
                         <dxe:ButtonInfo GlyphKind="Custom" ButtonKind="Simple"  Click="AddKlientToMitarbeiter_OnClick">
                           <dxe:ButtonInfo.Content>
-                            <Image Source ="../Ressources/Icons/Search.png" Width="20" Height="15" RenderOptions.BitmapScalingMode="HighQuality" x:Name="SearchImageButtonMaFr"  ToolTip="Klient/in hinzufügen"/>
+                            <Image Source ="../Ressources/Icons/Search.png" Width="20" Height="15" RenderOptions.BitmapScalingMode="HighQuality" x:Name="SearchImageButtonMaFr"  ToolTip="{markup:Translate Klient/in hinzufügen}"/>
                           </dxe:ButtonInfo.Content>
                         </dxe:ButtonInfo>
                       </dxe:ButtonEditSettings.Buttons>
@@ -790,7 +790,7 @@
                       <dxe:ButtonEditSettings.Buttons >
                         <dxe:ButtonInfo GlyphKind="Custom" ButtonKind="Simple" Click="AddKlientToMitarbeiter_OnClick">
                           <dxe:ButtonInfo.Content>
-                            <Image Source ="../Ressources/Icons/Search.png" Width="20" Height="15" RenderOptions.BitmapScalingMode="HighQuality" x:Name="SearchImageButtonMaSa"  ToolTip="Klient/in hinzufügen"/>
+                            <Image Source ="../Ressources/Icons/Search.png" Width="20" Height="15" RenderOptions.BitmapScalingMode="HighQuality" x:Name="SearchImageButtonMaSa"  ToolTip="{markup:Translate Klient/in hinzufügen}"/>
                           </dxe:ButtonInfo.Content>
                         </dxe:ButtonInfo>
                       </dxe:ButtonEditSettings.Buttons>

BeWo/SchulbegleitenderDienst/VertretungsMainView.xaml.cs

@@ -550,7 +550,7 @@ namespace BeWo.SchulbegleitenderDienst
             }
             else
             {           
-                MessageBox.Show("Bitte wählen sie eine/n Mitarbeiter/in und eine Abwesenheitskategorie aus.");
+                MessageBox.Show(BS.Shared.Translation.Translator.Translate("Bitte wählen sie eine/n Mitarbeiter/in und eine Abwesenheitskategorie aus."));
             }
 
 
@@ -746,7 +746,7 @@ namespace BeWo.SchulbegleitenderDienst
             }
             else
             {
-                MessageBox.Show("Bitte wählen Sie eine/n Klient/in und eine Abwesenheitskategorie aus.");
+                MessageBox.Show("Bitte wählen Sie " + BS.Shared.Translation.Translator.Translate("eine/n Klient/in") + " und eine Abwesenheitskategorie aus.");
             }
 
 
@@ -868,21 +868,21 @@ namespace BeWo.SchulbegleitenderDienst
 
 	        if (e.MenuInfo.Column.FieldName == "Kunde")
 	        {
-	            BarButtonItem x = new BarButtonItem() {Content = "Klient/in öffnen"};
+	            BarButtonItem x = new BarButtonItem() {Content = BS.Shared.Translation.Translator.Translate("Klient/in öffnen") };
 	            x.ItemClick += Kundeninfo_OnClick;
 	            e.Customizations.Add(x);
 	        }
 
 	        if (e.MenuInfo.Column.FieldName == "KrankerMitarbeiter")
 	        {
-	            BarButtonItem x = new BarButtonItem() {Content = "Mitarbeiter/in öffnen"};
+	            BarButtonItem x = new BarButtonItem() { Content = BS.Shared.Translation.Translator.Translate("Mitarbeiter/in öffnen") };
 	            x.ItemClick += Mitarbeiterinfo_OnClick;
 	            e.Customizations.Add(x);
 	        }
 
 	        if (e.MenuInfo.Column.FieldName == "Vertretung")
 	        {
-	            BarButtonItem s = new BarButtonItem() {Content = "Mitarbeiter/in öffnen"};
+	            BarButtonItem s = new BarButtonItem() { Content = BS.Shared.Translation.Translator.Translate("Mitarbeiter/in öffnen") };
 	            s.ItemClick += MitarbeiterVertretunginfo_OnClick;
 	            e.Customizations.Add(s);
 	        }
@@ -905,21 +905,21 @@ namespace BeWo.SchulbegleitenderDienst
 
             if (e.MenuInfo.Column.FieldName == "Kunde")
             {
-                BarButtonItem x = new BarButtonItem() { Content = "Klient/in öffnen" };
+                BarButtonItem x = new BarButtonItem() { Content = BS.Shared.Translation.Translator.Translate("Klient/in öffnen") };
                 x.ItemClick += Kundeninfo_OnClick;
                 e.Customizations.Add(x);
             }
 
             if (e.MenuInfo.Column.FieldName == "KrankerMitarbeiter")
             {
-                BarButtonItem x = new BarButtonItem() { Content = "Mitarbeiter/in öffnen" };
+                BarButtonItem x = new BarButtonItem() { Content = BS.Shared.Translation.Translator.Translate("Mitarbeiter/in öffnen") };
                 x.ItemClick += Mitarbeiterinfo_OnClick;
                 e.Customizations.Add(x);
             }
 
             if (e.MenuInfo.Column.FieldName == "Vertretung")
             {
-                BarButtonItem s = new BarButtonItem() { Content = "Mitarbeiter/in öffnen" };
+                BarButtonItem s = new BarButtonItem() { Content = BS.Shared.Translation.Translator.Translate("Mitarbeiter/in öffnen") };
                 s.ItemClick += MitarbeiterVertretunginfo_OnClick;
                 e.Customizations.Add(s);
             }
@@ -946,14 +946,14 @@ namespace BeWo.SchulbegleitenderDienst
 
             if (e.MenuInfo.Column.FieldName == "Kunde") // FieldNames umbennenen 
             {
-                BarButtonItem x = new BarButtonItem() { Content = "Klient/in öffnen" };
+                BarButtonItem x = new BarButtonItem() { Content = BS.Shared.Translation.Translator.Translate("Klient/in öffnen") };
                 x.ItemClick += Kundeninfo_OnClick; // bearbeiten
                 e.Customizations.Add(x);
             }
 
             if (e.MenuInfo.Column.FieldName == "MaKrank")
             {
-                BarButtonItem x = new BarButtonItem() { Content = "Mitarbeiter/in öffnen" };
+                BarButtonItem x = new BarButtonItem() { Content = BS.Shared.Translation.Translator.Translate("Mitarbeiter/in öffnen") };
                 x.ItemClick += Mitarbeiterinfo_OnClick; // eee
                 e.Customizations.Add(x);
             }
@@ -963,7 +963,7 @@ namespace BeWo.SchulbegleitenderDienst
                 e.MenuInfo.Column.FieldName == "VertretungFr" || e.MenuInfo.Column.FieldName == "VertretungSa" ||
                 e.MenuInfo.Column.FieldName == "VertretungSo")
             {
-                BarButtonItem s = new BarButtonItem() { Content = "Mitarbeiter/in öffnen" };
+                BarButtonItem s = new BarButtonItem() { Content = BS.Shared.Translation.Translator.Translate("Mitarbeiter/in öffnen") };
                 s.ItemClick += MitarbeiterVertretunginfoWochenanzeige_OnClick;
                 e.Customizations.Add(s);
                 _mitarbeiterVertretungWocheninfo = e.MenuInfo.Column.FieldName;
@@ -986,14 +986,14 @@ namespace BeWo.SchulbegleitenderDienst
 
             if (e.MenuInfo.Column.FieldName == "Kunde") // FieldNames umbennenen 
             {
-                BarButtonItem x = new BarButtonItem() { Content = "Klient/in öffnen" };
+                BarButtonItem x = new BarButtonItem() { Content = BS.Shared.Translation.Translator.Translate("Klient/in öffnen") };
                 x.ItemClick += Kundeninfo_OnClick; // bearbeiten
                 e.Customizations.Add(x);
             }
 
             if (e.MenuInfo.Column.FieldName == "MaKrank")
             {
-                BarButtonItem x = new BarButtonItem() { Content = "Mitarbeiter/in öffnen" };
+                BarButtonItem x = new BarButtonItem() { Content = BS.Shared.Translation.Translator.Translate("Mitarbeiter/in öffnen") };
                 x.ItemClick += Mitarbeiterinfo_OnClick; // eee
                 e.Customizations.Add(x);
             }
@@ -1003,7 +1003,7 @@ namespace BeWo.SchulbegleitenderDienst
                 e.MenuInfo.Column.FieldName == "VertretungFr" || e.MenuInfo.Column.FieldName == "VertretungSa" ||
                 e.MenuInfo.Column.FieldName == "VertretungSo")
             {
-                BarButtonItem s = new BarButtonItem() { Content = "Mitarbeiter/in öffnen" };
+                BarButtonItem s = new BarButtonItem() { Content = BS.Shared.Translation.Translator.Translate("Mitarbeiter/in öffnen") };
                 s.ItemClick += MitarbeiterVertretunginfoWochenanzeige_OnClick;
                 e.Customizations.Add(s);
                 _mitarbeiterVertretungWocheninfo = e.MenuInfo.Column.FieldName;
@@ -1026,14 +1026,14 @@ namespace BeWo.SchulbegleitenderDienst
 
             if (e.MenuInfo.Column.FieldName == "Kunde") // FieldNames umbennenen 
             {
-                BarButtonItem x = new BarButtonItem() { Content = "Klient/in öffnen" };
+                BarButtonItem x = new BarButtonItem() { Content = BS.Shared.Translation.Translator.Translate("Klient/in öffnen") };
                 x.ItemClick += Kundeninfo_OnClick; // bearbeiten
                 e.Customizations.Add(x);
             }
 
             if (e.MenuInfo.Column.FieldName == "MaKrank")
             {
-                BarButtonItem x = new BarButtonItem() { Content = "Mitarbeiter/in öffnen" };
+                BarButtonItem x = new BarButtonItem() { Content = BS.Shared.Translation.Translator.Translate("Mitarbeiter/in öffnen") };
                 x.ItemClick += Mitarbeiterinfo_OnClick; // eee
                 e.Customizations.Add(x);
             }
@@ -1043,7 +1043,7 @@ namespace BeWo.SchulbegleitenderDienst
                 e.MenuInfo.Column.FieldName == "VertretungFr" || e.MenuInfo.Column.FieldName == "VertretungSa" ||
                 e.MenuInfo.Column.FieldName == "VertretungSo")
             {
-                BarButtonItem s = new BarButtonItem() { Content = "Mitarbeiter/in öffnen" };
+                BarButtonItem s = new BarButtonItem() { Content = BS.Shared.Translation.Translator.Translate("Mitarbeiter/in öffnen") };
                 s.ItemClick += MitarbeiterVertretunginfoWochenanzeige_OnClick;
                 e.Customizations.Add(s);
                 _mitarbeiterVertretungWocheninfo = e.MenuInfo.Column.FieldName;
@@ -1173,12 +1173,12 @@ namespace BeWo.SchulbegleitenderDienst
                     }
                 }
                 else
-                    MessageBox.Show("Es wurde der Vertretung kein Mitarbeiter zugeteilt");
+                    MessageBox.Show(BS.Shared.Translation.Translator.Translate("Es wurde der Vertretung kein Mitarbeiter zugeteilt"));
 
             }
             else
             {
-                MessageBox.Show("Es wurde der Vertretung kein Mitarbeiter zugeteilt");
+                MessageBox.Show(BS.Shared.Translation.Translator.Translate("Es wurde der Vertretung kein Mitarbeiter zugeteilt"));
             }
         }
         
@@ -1225,12 +1225,12 @@ namespace BeWo.SchulbegleitenderDienst
                                     ));
                             }
                             else
-                                MessageBox.Show("Es wurde der Vertretung kein Mitarbeiter zugeteilt");
+                                MessageBox.Show(BS.Shared.Translation.Translator.Translate("Es wurde der Vertretung kein Mitarbeiter zugeteilt"));
 
                         }
                         else
                         {
-                            MessageBox.Show("Es wurde der Vertretung kein Mitarbeiter zugeteilt");
+                            MessageBox.Show(BS.Shared.Translation.Translator.Translate("Es wurde der Vertretung kein Mitarbeiter zugeteilt"));
                         }
     
                     }

BeWo/SchulbegleitenderDienst/VertretungsMainViewV2.xaml

@@ -107,7 +107,7 @@
                 </Button>
                 <controls:PopupNonTopmost Topmost="False" x:Name="PopupNewMitarbeiterVertretung" Width="300" StaysOpen="True" Placement="MousePoint" PlacementTarget="{Binding ElementName=MitarbeiterVertretungButton}">
                   <Border Background="White" Padding="3" BorderThickness="1" BorderBrush="Gray">
-                    <GroupBox x:Name="GroupboxNewEnvironmentPerson" Header="Mitarbeiter/in hinzufügen" Style="{DynamicResource ObjectEditGroupBox}">
+                    <GroupBox x:Name="GroupboxNewEnvironmentPerson" Header="{markup:Translate Mitarbeiter/in hinzufügen}" Style="{DynamicResource ObjectEditGroupBox}">
                       <Grid>
                         <Grid.ColumnDefinitions>
                           <ColumnDefinition Width="Auto" />
@@ -127,7 +127,7 @@
                           <RowDefinition Height="Auto" />
                           <RowDefinition Height="Auto" />
                         </Grid.RowDefinitions>
-                        <Label Grid.Row="0" Grid.Column="0" Content="Mitarbeiter/in" />
+                        <Label Grid.Row="0" Grid.Column="0" Content="{markup:Translate Mitarbeiter/in}" />
                         <Label Grid.Row="2" Grid.Column="0" Content="Abwesenheitskategorie" />
                         <Label Grid.Row="3" Grid.Column="0" Content="Meldung vom" />
                         <Label Grid.Row="4" Grid.Column="0" Content="Startdatum" />
@@ -171,7 +171,7 @@
 
                 <controls:PopupNonTopmost Topmost="False" x:Name="PopupNewKlientVertretung" Width="300" StaysOpen="True" Placement="MousePoint" PlacementTarget="{Binding ElementName=KlientVertretungButton}">
                   <Border Background="White" Padding="3" BorderThickness="1" BorderBrush="Gray">
-                    <GroupBox x:Name="GroupboxNewKlientVertretung" Header="Klient/in hinzufügen" Style="{DynamicResource ObjectEditGroupBox}">
+                    <GroupBox x:Name="GroupboxNewKlientVertretung" Header="{markup:Translate Klient/in hinzufügen}" Style="{DynamicResource ObjectEditGroupBox}">
                       <Grid>
                         <Grid.ColumnDefinitions>
                           <ColumnDefinition Width="Auto" />
@@ -192,7 +192,7 @@
                           <RowDefinition Height="Auto" />
                         </Grid.RowDefinitions>
 
-                        <Label Grid.Row="0" Grid.Column="0" Content="Klient/in" />
+                        <Label Grid.Row="0" Grid.Column="0" Content="{markup:Translate Klient/in}" />
                         <Label Grid.Row="1" Grid.Column="0" Content="Abwesenheitskategorie" />
                         <Label Grid.Row="2" Grid.Column="0" Content="Meldung vom" />
                         <Label Grid.Row="3" Grid.Column="0" Content="Startdatum" />
@@ -211,7 +211,7 @@
                         <CheckBox Grid.Column="1" Grid.Row="5" Content="ganztägig" Unchecked="KlientVertretungsToggleButton_OnUnchecked" Checked="KlientVertretungsToggleButton_OnChecked"
                                   Grid.ColumnSpan="2" HorizontalAlignment="Left" x:Name="KVCheckBox" Margin="3"/>
 
-                        <dxe:DateEdit x:Name="KVDatepickerVon" MaskType="DateTimeAdvancingCaret" Mask="HH:mm" Grid.Column="1" Grid.Row="3" Grid.ColumnSpan="2" Margin="3" Height="23" EditValueChanged="KVDatepickerVon_OnEditValueChanged"/>
+                        <dxe:DateEdit x:Name="KVDatepickerVon" MaskType="DateTimeAdvancingCaret"  Grid.Column="1" Grid.Row="3" Grid.ColumnSpan="2" Margin="3" Height="23" EditValueChanged="KVDatepickerVon_OnEditValueChanged"/>
 
                         <dxe:DateEdit x:Name="KVDatepickerBis" MaskType="DateTimeAdvancingCaret" Grid.Column="1" Grid.Row="4" Grid.ColumnSpan="2" Margin="3" Height="23"  EditValueChanged="KVDatepickerBis_OnEditValueChanged"/>
 
@@ -262,7 +262,7 @@
                 <GroupBox Header="{markup:Translate Abwesenheiten Mitarbeiter}" Style="{StaticResource ObjectEditGroupBox}" >
                     <dxg:GridControl x:Name="GridDataControlTagesansichtMitarbeiter" Visibility="Visible" Margin="5" VerticalContentAlignment="Stretch" ItemsSource="{Binding Path=AbsentEmployeesDayViewList, UpdateSourceTrigger=PropertyChanged}">
                         <dxg:GridControl.Columns >
-                            <dxg:GridColumn FieldName="EmployeeName" ReadOnly="True" Header="Mitarbeiter/in" SortOrder="Ascending">
+                                        <dxg:GridColumn FieldName="EmployeeName" ReadOnly="True" Header="{markup:Translate Mitarbeiter/in}" SortOrder="Ascending">
                                 <dxg:GridColumn.CellStyle>
                                     <Style TargetType="{x:Type dxg:LightweightCellEditor}" >
                                         <Setter Property="Background" Value="{Binding RowData.Row.MitarbeiterStatusColor, Converter={StaticResource SubstitutionBrushConverter}}" />
@@ -278,7 +278,7 @@
                                     </DataTemplate>
                                 </dxg:GridColumn.CellTemplate>
                             </dxg:GridColumn>
-                            <dxg:GridColumn FieldName="CustomerName" Header="Klient/in" ReadOnly="True" >
+                            <dxg:GridColumn FieldName="CustomerName" Header="{markup:Translate Klient/in}" ReadOnly="True" >
                                 <dxg:GridColumn.CellStyle>
                                     <Style TargetType="{x:Type dxg:LightweightCellEditor}" >
                                         <Setter Property="Background" Value="{Binding RowData.Row.KlientStatusColor, Converter={StaticResource SubstitutionBrushConverter}}" />
@@ -406,7 +406,7 @@
                 <GroupBox Grid.Row="1" Header="{markup:Translate Abwesenheiten Klienten}" Style="{StaticResource ObjectEditGroupBox}"  Margin="0,10,0,0">
                     <dxg:GridControl x:Name="GridDataControlTagesansichtKlient" Visibility="Visible" Margin="5" VerticalContentAlignment="Stretch" ItemsSource="{Binding Path=AbsentCustomersDayViewList, UpdateSourceTrigger=PropertyChanged}">
                         <dxg:GridControl.Columns>
-                            <dxg:GridColumn FieldName="EmployeeName" ReadOnly="True" Header="Mitarbeiter/in" SortOrder="Ascending">
+                            <dxg:GridColumn FieldName="EmployeeName" ReadOnly="True" Header="{markup:Translate Mitarbeiter/in}" SortOrder="Ascending">
                                 <dxg:GridColumn.CellStyle>
                                     <Style TargetType="{x:Type dxg:LightweightCellEditor}" >
                                         <Setter Property="Background" Value="{Binding RowData.Row.MitarbeiterStatusColor, Converter={StaticResource SubstitutionBrushConverter}}" />
@@ -424,7 +424,7 @@
                             </dxg:GridColumn>
                                 <dxg:GridColumn FieldName="AssistanceTimeEntry" Header="Betreuungszeiten" ReadOnly="False">
                             </dxg:GridColumn>
-                            <dxg:GridColumn FieldName="CustomerName" Header="Klient/in" ReadOnly="True">
+                            <dxg:GridColumn FieldName="CustomerName" Header="{markup:Translate Klient/in}" ReadOnly="True">
                                 <dxg:GridColumn.CellStyle>
                                     <Style TargetType="{x:Type dxg:LightweightCellEditor}">
                                         <Setter Property="Background" Value="{Binding RowData.Row.KlientStatusColor, Converter={StaticResource SubstitutionBrushConverter}}" />
@@ -517,7 +517,7 @@
                                                                 <TextBlock Text="{Binding Row.SchulbegleitenderDienstString}" Visibility="{Binding Path=Text, Converter={StaticResource StringLengthVisibilityConverter}, RelativeSource={RelativeSource Self}}" />
 
                                                                 <Separator Visibility="{Binding Row.EmployeeAddressString, Converter={StaticResource StringLengthVisibilityConverter}}" />
-                                                                <TextBlock FontWeight="Bold" Text="Mitarbeiter/in:" Visibility="{Binding Row.EmployeeAddressString, Converter={StaticResource StringLengthVisibilityConverter}}" />
+                                                                <TextBlock FontWeight="Bold" Text="{markup:Translate Mitarbeiter/in:}" Visibility="{Binding Row.EmployeeAddressString, Converter={StaticResource StringLengthVisibilityConverter}}" />
                                                                 <TextBlock Text="{Binding Row.EmployeeAddressString}"  Visibility="{Binding Path=Text, Converter={StaticResource StringLengthVisibilityConverter}, RelativeSource={RelativeSource Self}}" />
                                                             </StackPanel>
                                                         </DataTemplate>
@@ -536,7 +536,7 @@
                 <GroupBox Grid.Row="2" Header="{markup:Translate Kein Vertretungsbedarf}" Style="{StaticResource ObjectEditGroupBox}">
                     <dxg:GridControl x:Name="SubstitutionUnwantedDayViewGridControl" AllowDrop="True" Margin="5" BorderBrush="Black" VerticalContentAlignment="Stretch" ItemsSource="{Binding Path=SubstitutionUnwantedDayViewList, UpdateSourceTrigger=PropertyChanged}">
                         <dxg:GridControl.Columns>
-                            <dxg:GridColumn FieldName="EmployeeName" ReadOnly="True" Header="Mitarbeiter/in abwesend" SortOrder="Ascending">
+                                        <dxg:GridColumn FieldName="EmployeeName" ReadOnly="True" Header="{markup:Translate Mitarbeiter/in abwesend}" SortOrder="Ascending">
                                 <dxg:GridColumn.CellStyle>
                                     <Style TargetType="{x:Type dxg:LightweightCellEditor}" >
                                         <Setter Property="Background" Value="{Binding RowData.Row.MitarbeiterStatusColor, Converter={StaticResource SubstitutionBrushConverter}}" />
@@ -552,7 +552,7 @@
                                     </DataTemplate>
                                 </dxg:GridColumn.CellTemplate>
                             </dxg:GridColumn>
-                            <dxg:GridColumn FieldName="Vertreter" Header="Mitarbeiter/in vertretend" x:Name="SubUnwantedSubstitutionColumn" ReadOnly="True" AllowEditing="False">
+                                        <dxg:GridColumn FieldName="Vertreter" Header="{markup:Translate Mitarbeiter/in vertretend}" x:Name="SubUnwantedSubstitutionColumn" ReadOnly="True" AllowEditing="False">
                                 <dxg:GridColumn.DisplayTemplate>
                                     <ControlTemplate>
                                         <Grid>
@@ -572,7 +572,7 @@
                                     </ControlTemplate>
                                 </dxg:GridColumn.DisplayTemplate>
                             </dxg:GridColumn>
-                            <dxg:GridColumn FieldName="CustomerName" Header="Klient/in" ReadOnly="True" >
+                            <dxg:GridColumn FieldName="CustomerName" Header="{markup:Translate Klient/in}" ReadOnly="True" >
                                 <dxg:GridColumn.CellStyle>
                                     <Style TargetType="{x:Type dxg:LightweightCellEditor}" >
                                         <Setter Property="Background" Value="{Binding RowData.Row.KlientStatusColor}" />
@@ -661,7 +661,7 @@
                 <GroupBox Header="{markup:Translate Abwesenheiten Mitarbeiter}" Style="{StaticResource ObjectEditGroupBox}">
                     <dxg:GridControl x:Name="GridDataControlWochenansichtMitarbeiter" AllowDrop="true" Margin="5" VerticalContentAlignment="Stretch" BorderBrush="Black" ItemsSource="{Binding AbsentEmployeesWeekViewList, UpdateSourceTrigger=PropertyChanged}">
                         <dxg:GridControl.Columns>
-                                        <dxg:GridColumn FieldName="EmployeeName"  Header="Mitarbeiter/in" ReadOnly="True" SortOrder="Ascending" AllowBestFit="True">
+                                        <dxg:GridColumn FieldName="EmployeeName"  Header="{markup:Translate Mitarbeiter/in}" ReadOnly="True" SortOrder="Ascending" AllowBestFit="True">
                                 <dxg:GridColumn.CellToolTipTemplate>
                                     <DataTemplate>
                                         <StackPanel>
@@ -679,7 +679,7 @@
                                     </DataTemplate>
                                 </dxg:GridColumn.CellTemplate>
                             </dxg:GridColumn>
-                            <dxg:GridColumn FieldName="CustomerName" Header="Klient/in" ReadOnly="True" >
+                            <dxg:GridColumn FieldName="CustomerName" Header="{markup:Translate Klient/in}" ReadOnly="True" >
                                 <dxg:GridColumn.CellTemplate>
                                     <DataTemplate>
                                         <TextBlock Margin="5,5,0,0">
@@ -965,7 +965,7 @@
                 <GroupBox Grid.Row="1" Header="{markup:Translate Abwesenheiten Klienten}" Style="{StaticResource ObjectEditGroupBox}" Margin="0,10,0,0">
                     <dxg:GridControl x:Name="GridDataControlWochenansichtKlient" AllowDrop="true" Margin="5" VerticalContentAlignment="Stretch" BorderBrush="Black" ItemsSource="{Binding AbsentCustomersWeekViewList, UpdateSourceTrigger=PropertyChanged}">
                         <dxg:GridControl.Columns >
-                                        <dxg:GridColumn FieldName="EmployeeName"  Header="Mitarbeiter/in" ReadOnly="True" SortOrder="Ascending" AllowBestFit="True">
+                                        <dxg:GridColumn FieldName="EmployeeName"  Header="{markup:Translate Mitarbeiter/in}" ReadOnly="True" SortOrder="Ascending" AllowBestFit="True">
                                 <dxg:GridColumn.CellTemplate>
                                     <DataTemplate>
                                         <TextBlock Margin="5,5,0,0">
@@ -976,7 +976,7 @@
                                     </DataTemplate>
                                 </dxg:GridColumn.CellTemplate>
                             </dxg:GridColumn>
-                                        <dxg:GridColumn FieldName="CustomerName" Header="Klient/in" Width="100" ReadOnly="True" AllowBestFit="True">
+                                        <dxg:GridColumn FieldName="CustomerName" Header="{markup:Translate Klient/in}" Width="100" ReadOnly="True" AllowBestFit="True">
                                 <dxg:GridColumn.CellTemplate>
                                     <DataTemplate>
                                         <TextBlock Margin="5,5,0,0">
@@ -1162,7 +1162,7 @@
                     <dxg:GridControl AllowDrop="True" Margin="5" VerticalContentAlignment="Stretch" BorderBrush="Black"
                                      x:Name="SubstitutionUnwantedWeekViewGridControl" ItemsSource="{Binding SubstitutionUnwantedWeekViewList, UpdateSourceTrigger=PropertyChanged}">
                         <dxg:GridControl.Columns>
-                                        <dxg:GridColumn FieldName="EmployeeName" Header="Mitarbeiter/in abwesend" ReadOnly="True" SortOrder="Ascending" AllowBestFit="True">
+                                        <dxg:GridColumn FieldName="EmployeeName" Header="{markup:Translate Mitarbeiter/in abwesend}" ReadOnly="True" SortOrder="Ascending" AllowBestFit="True">
                                 <dxg:GridColumn.CellTemplate>
                                     <DataTemplate>
                                         <TextBlock Margin="5,5,0,0">
@@ -1173,7 +1173,7 @@
                                     </DataTemplate>
                                 </dxg:GridColumn.CellTemplate>
                             </dxg:GridColumn>
-                                        <dxg:GridColumn FieldName="CustomerName" Header="Klient/in abwesend" ReadOnly="True" AllowBestFit="True">
+                                        <dxg:GridColumn FieldName="CustomerName" Header="{markup:Translate Klient/in abwesend}" ReadOnly="True" AllowBestFit="True">
                                 <dxg:GridColumn.CellTemplate>
                                     <DataTemplate>
                                         <TextBlock Margin="5,5,0,0">

BeWo/SchulbegleitenderDienst/VertretungsMainViewV2.xaml.cs

@@ -274,7 +274,7 @@ namespace BeWo.SchulbegleitenderDienst
             }
             else
             {           
-                MessageBox.Show("Bitte wählen sie eine/n Mitarbeiter/in und eine Abwesenheitskategorie aus.");
+                MessageBox.Show(BS.Shared.Translation.Translator.Translate("Bitte wählen Sie eine/n Mitarbeiter/in und eine Abwesenheitskategorie aus."));
             }
 
 
@@ -481,7 +481,7 @@ namespace BeWo.SchulbegleitenderDienst
             }
             else
             {
-                MessageBox.Show("Bitte wählen Sie eine/n Klient/in und eine Abwesenheitskategorie aus.");
+                MessageBox.Show("Bitte wählen Sie " + BS.Shared.Translation.Translator.Translate("eine/n Klient/in")  + " und eine Abwesenheitskategorie aus.");
             }
 
             if(isValid)
@@ -563,7 +563,7 @@ namespace BeWo.SchulbegleitenderDienst
                 {
                     if (isOverlapping)
                     {
-                        MessageBox.Show($"In dem angegebenen Zeitraum({absenceTime.Start.Value:dd.MM.yyyy} - {absenceTime.End.Value:dd.MM.yyyy}) existiert bereits eine Abwesehenheit von Klient {_CurrentCustomer.SimpleDescription}. Die Abwesenheit konnte nicht angelegt werden.", "Fehler", MessageBoxButton.OK, MessageBoxImage.Warning);
+                        MessageBox.Show($"In dem angegebenen Zeitraum({absenceTime.Start.Value:dd.MM.yyyy} - {absenceTime.End.Value:dd.MM.yyyy}) existiert bereits eine Abwesenheit von " + BS.Shared.Translation.Translator.Translate("Klient") + " " + _CurrentCustomer.SimpleDescription + ". Die Abwesenheit konnte nicht angelegt werden.", "Fehler", MessageBoxButton.OK, MessageBoxImage.Warning);
                     }
                     else
                     {
@@ -621,6 +621,15 @@ namespace BeWo.SchulbegleitenderDienst
             var barButtonItem2 = new BarButtonItem {Content = "Steckbrief anzeigen"};
             barButtonItem2.ItemClick += ShowCharacteristics;
             e.Customizations.Add(barButtonItem2);
+
+            var selectedViewModel = (TagesansichtVM)GridDataControlTagesansichtMitarbeiter.SelectedItem;
+            
+            if (selectedViewModel != null && selectedViewModel.Vertretung != null)
+            {    
+                var barButtonItem3 = new BarButtonItem {Content = "Vertretung löschen", Tag = e.Source.DataControl.SelectedItem };
+                barButtonItem3.ItemClick += DeleteVertretung_OnClick;
+                e.Customizations.Add(barButtonItem3);
+            }
         }
 
         private void ShowCharacteristics(object sender, RoutedEventArgs e)
@@ -679,6 +688,18 @@ namespace BeWo.SchulbegleitenderDienst
             }
 	    }
 
+        //private void DeleteVertretung_OnClick(object sender, RoutedEventArgs e)
+        //{
+        //    if (MessageBox.Show("Möchten Sie die Vertretung wirklich löschen?", "Abwesenheit löschen", MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.Yes)
+        //    {
+        //        var selectedViewModel = (TagesansichtVM)GridDataControlTagesansichtMitarbeiter.SelectedItem;
+
+        //        _Tagesvertretung.DeleteVertretung(selectedViewModel);
+
+        //        LadeTagesansicht(Datepicker.DateTime.Date);
+        //    }
+        //}
+
         private void DeleteKlientKrankmeldung_OnClick(object sender, RoutedEventArgs e)
         {
             if (MessageBox.Show("Möchten Sie die Abwesenheit wirklich löschen?", "Abwesenheit löschen", MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.Yes)
@@ -693,6 +714,9 @@ namespace BeWo.SchulbegleitenderDienst
 
         private static bool? ShowDeletionMessageBox(AbsenceTimeDC absenceTime)
         {
+            // erstmal nur ganze Abwesenheit
+            return true;
+
             if(absenceTime.Start != null && absenceTime.End != null && absenceTime.Start.Value.Date == absenceTime.End.Value.Date)
             {
                 return true;
@@ -1033,8 +1057,16 @@ namespace BeWo.SchulbegleitenderDienst
         {
             var barButtonItem = new BarButtonItem {Content = "Abwesenheit löschen", Tag = e.Source.DataControl.SelectedItem};
             barButtonItem.ItemClick += DeleteCustomerAbsenceTime_OnClick;
-
             e.Customizations.Add(barButtonItem);
+
+            var selectedTagesansichtVM = (TagesansichtVM)barButtonItem.Tag;
+            if (selectedTagesansichtVM != null && selectedTagesansichtVM.Vertreter != null)
+            {
+                var barButtonItem2 = new BarButtonItem { Content = "Vertretung löschen", Tag = e.Source.DataControl.SelectedItem };
+                barButtonItem2.ItemClick += DeleteVertretung_OnClick;
+                e.Customizations.Add(barButtonItem2);
+            }
+            
         }
 
         private void DeleteCustomerAbsenceTime_OnClick(object sender, RoutedEventArgs e)
@@ -1049,7 +1081,20 @@ namespace BeWo.SchulbegleitenderDienst
                 LadeTagesansicht(Datepicker.DateTime);
             }
         }
-        
+
+        private void DeleteVertretung_OnClick(object sender, RoutedEventArgs e)
+        {
+            var barButtonItem = (BarButtonItem)sender;
+            var selectedTagesansichtVM = (TagesansichtVM)barButtonItem.Tag;
+
+            if (MessageBox.Show("Möchten Sie die Vertretung wirklich löschen?", "Abwesenheit löschen", MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.Yes)
+            {
+                _Tagesvertretung.DeleteVertretung(selectedTagesansichtVM);
+
+                LadeTagesansicht(Datepicker.DateTime);
+            }
+        }
+
         private void GridControlSubUnwanted_OnCellValueChanged(object sender, CellValueChangedEventArgs e)
         {
             _Tagesvertretung.UpdateRowData((TagesansichtVM) SubstitutionUnwantedDayViewGridControl.SelectedItem);

BeWo/SchulbegleitenderDienst/VertretungsSearchView.xaml

@@ -7,6 +7,7 @@
         xmlns:dxgt="http://schemas.devexpress.com/winfx/2008/xaml/grid/themekeys"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d"
+        xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup"
         Title="Vertretung auswählen" SizeToContent="WidthAndHeight" AllowsTransparency="True" WindowStartupLocation="CenterScreen"
         ResizeMode="CanResizeWithGrip" WindowStyle="None" Background="Transparent" d:DataContext="{d:DesignData VertretungsSearchView}">
   <Window.Resources>
@@ -44,34 +45,35 @@
             <ColumnDefinition Width="Auto"/>
             <ColumnDefinition Width="Auto"/>
             <ColumnDefinition Width="*"/>
+              <ColumnDefinition Width="*"/>
           </Grid.ColumnDefinitions>
           <Grid.RowDefinitions>
-            <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto"/>
               <RowDefinition Height="*"/>
           </Grid.RowDefinitions>
-          <Label Grid.Row="0" Grid.Column="0" Content="Klient/in:"  Margin="3" FontWeight="Bold"/>
-          <Label x:Name="lblCustomerName" Content="{Binding Path=CustomerName, UpdateSourceTrigger=PropertyChanged}" Grid.Row="0" Grid.Column="1" Margin="3,3,3,0" />
-          <Label x:Name="lblCustomerStreet" Content="{Binding Path=CustomerStreet, UpdateSourceTrigger=PropertyChanged}" Grid.Row="1" Grid.Column="1" Margin="3,0,3,0"/>
-          <Label x:Name="lblCustomerCity" Content="{Binding Path=CustomerCity, UpdateSourceTrigger=PropertyChanged}" Grid.Row="2" Grid.Column="1" Margin="3,0,3,0"/>
+          <Label Grid.Row="0" Grid.Column="0" Content="{markup:Translate Klient/in:}"  Margin="3,2,3,0" FontWeight="Bold"/>
+                    <Label x:Name="lblCustomerName" Grid.Row="1" Grid.Column="0" Grid.RowSpan="2" Margin="3,0,3,2" Content="Max Mustermann"/>
+                    
 
-          <Label Grid.Row="0" Grid.Column="2" Content="Schule:"  Margin="10,3,3,3" FontWeight="Bold"/>
-          <Label x:Name="lblSchoolName" Grid.Row="0" Grid.Column="3" Margin="3,3,3,0"/>
-          <Label x:Name="lblSchoolStreet" Grid.Row="1" Grid.Column="3" Margin="3,0,3,0"/>
-          <Label x:Name="lblSchoolCity" Grid.Row="2" Grid.Column="3" Margin="3,0,3,0"/>
+          <Label Grid.Row="0" Grid.Column="1" Content="Schule:"  Margin="15,2,2,0" FontWeight="Bold"/>
+          <Label x:Name="lblSchoolName" Grid.Row="1" Grid.Column="1" Grid.RowSpan="2" Margin="15,0,3,2" Content="Max Mustermann"/>
+                    
+                    <Label Grid.Row="0" Grid.Column="2" Content="Betreuungszeiten:"  Margin="15,2,2,0" FontWeight="Bold"/>
+          <Label x:Name="lblBetreuungszeiten" Grid.Row="1" Grid.Column="2" Grid.RowSpan="2" Margin="15,0,3,2" Content="Max Mustermann"/>
 
-          <Label Grid.Row="0" Grid.Column="4" Content="Klient Wunschkriterien"  Margin="10,3,3,3" FontWeight="Bold"/>
-          <dxg:LookUpEdit Grid.Row="1" Grid.Column="4" Grid.RowSpan="3" Margin="10,3,3,3" x:Name="TokenBoxWunschAnzeige" ValidateOnTextInput="True" ValidateOnEnterKeyPressed="True" TextWrapping="Wrap" IsReadOnly="True"
-                          MinHeight="50" Width="200" PopupHeight="500" PopupWidth="750" PopupMinHeight="100" PopupMinWidth="100" IsPopupAutoWidth="False" >
+
+                    <Label Grid.Row="0" Grid.Column="3" Content="{markup:Translate Klient Wunschkriterien}"  Margin="15,2,3,0" FontWeight="Bold"/>
+          <dxg:LookUpEdit Grid.Row="1" Grid.Column="3" Grid.RowSpan="2" Margin="15,0,3,2" x:Name="TokenBoxWunschAnzeige" ValidateOnTextInput="True" ValidateOnEnterKeyPressed="True" TextWrapping="Wrap" IsReadOnly="True"
+                          MinHeight="50" Width="150" PopupHeight="500" PopupWidth="750" PopupMinHeight="100" PopupMinWidth="100" IsPopupAutoWidth="False" >
             <dxg:LookUpEdit.StyleSettings>
               <dxg:TokenLookUpEditStyleSettings EnableTokenWrapping="True"/>
             </dxg:LookUpEdit.StyleSettings>
           </dxg:LookUpEdit>
 
-          <Label Grid.Row="0" Grid.Column="5" Content="Klient Ausschlusskriterien"  Margin="3" FontWeight="Bold"/>
-          <dxg:LookUpEdit Grid.Row="1" Grid.Column="5" Grid.RowSpan="3" Margin="3" x:Name="TokenBoxAusschlussAnzeige" ValidateOnTextInput="True" ValidateOnEnterKeyPressed="True" TextWrapping="Wrap" IsReadOnly="True"
-                          MinHeight="50" Width="200" PopupHeight="500" PopupWidth="750" PopupMinHeight="100" PopupMinWidth="100" IsPopupAutoWidth="False" >
+                    <Label Grid.Row="0" Grid.Column="4" Content="{markup:Translate Klient Ausschlusskriterien}" Margin="15,2,2,0" FontWeight="Bold"/>
+          <dxg:LookUpEdit Grid.Row="1" Grid.Column="4" Grid.RowSpan="2" Margin="15,0,2,3" x:Name="TokenBoxAusschlussAnzeige" ValidateOnTextInput="True" ValidateOnEnterKeyPressed="True" TextWrapping="Wrap" IsReadOnly="True"
+                          MinHeight="50" Width="150" PopupHeight="500" PopupWidth="750" PopupMinHeight="100" PopupMinWidth="100" IsPopupAutoWidth="False" >
             <dxg:LookUpEdit.StyleSettings>
               <dxg:TokenLookUpEditStyleSettings EnableTokenWrapping="True"/>
             </dxg:LookUpEdit.StyleSettings>
@@ -131,7 +133,7 @@
           <dxg:GridControl.Columns>
             <dxg:GridColumn FieldName="Nachname" ReadOnly="True" Header="Nachname" SortOrder="Ascending" />
             <dxg:GridColumn FieldName="Vorname" ReadOnly="True" Header="Vorname"/>
-            <dxg:GridColumn FieldName="Arbeitszeit" ReadOnly="True" Header="Arbeitszeit"/>
+            <dxg:GridColumn FieldName="Arbeitszeit" ReadOnly="True" Header="Betreuungszeiten"/>
             <dxg:GridColumn FieldName="Postleitzahl" ReadOnly="True" Header="Postleitzahl" />
             <dxg:GridColumn FieldName="Strasse" ReadOnly="True" Header="Strasse" />
             <dxg:GridColumn FieldName="Stadt" ReadOnly="True" Header="Stadt" />

BeWo/SchulbegleitenderDienst/VertretungsSearchView.xaml.cs

@@ -182,33 +182,45 @@ namespace BeWo.SchulbegleitenderDienst
 
         private void RootGroupBox_OnMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
         {
-            DragMove();
+            try
+            {
+                DragMove();
+            }
+            catch (Exception exception)
+            {
+                //ignore
+            }
+            
         }
 
 	    private void SetCustomerInfos()
 	    {
 	        lblCustomerName.Content = string.Empty;
-            lblCustomerStreet.Content = string.Empty;
-            lblCustomerCity.Content = string.Empty;
-
 	        lblSchoolName.Content = string.Empty;
-            lblSchoolStreet.Content = string.Empty;
-            lblSchoolCity.Content = string.Empty;
-
+	        lblBetreuungszeiten.Content = string.Empty;
+            
             if (_Tagesansicht.Customer != null)
-	        {
-	            lblCustomerName.Content = _Tagesansicht.Customer.Name;
-	            lblCustomerStreet.Content = _Tagesansicht.Customer.Street;
-	            lblCustomerCity.Content = $"{_Tagesansicht.Customer.PostalCode} {_Tagesansicht.Customer.Town}";
+            {
+                lblCustomerName.Content = String.Format("{0}\n{1}\n{2} {3}", _Tagesansicht.Customer.Name,
+                    _Tagesansicht.Customer.Street, _Tagesansicht.Customer.PostalCode, _Tagesansicht.Customer.Town);
             }
 
-	        if (_Tagesansicht.Schule != null)
+	        if (_Tagesansicht.Schools != null && _Tagesansicht.Schools.Count > 0)
 	        {
-	            lblSchoolName.Content = _Tagesansicht.Schule.Name;
-	            lblSchoolStreet.Content = _Tagesansicht.Schule.Street;
-	            lblSchoolCity.Content = $"{_Tagesansicht.Schule.PostalCode} {_Tagesansicht.Schule.Town}";
+	            var c2o = _Tagesansicht.Schools[0];
+	            var schule = c2o.Organisation;
+
+	            lblSchoolName.Content = String.Format("{0}\n{1}\n{2} {3}", schule.Name, schule.Street, schule.PostalCode, schule.Town);
+	            //    _Tagesansicht.Schule.Street, _Tagesansicht.Schule.PostalCode, _Tagesansicht.Schule.Town);
 	        }
-        }
+
+	        if (_Tagesansicht.AssistanceTimeEntry != null)
+	        {
+	            lblBetreuungszeiten.Content = _Tagesansicht.AssistanceTimeEntry.ToString();
+            }
+	        
+	            //"Montag 09:00 - 12:00\nDienstag 10:00 - 11:00\nMittwoch 08:00 - 12:00\nDonnerstag 08:00 - 12:00\nFreitag 08:00 - 12:00";
+	    }
 
         private void SetzeLetzteVertreter()
         {
@@ -269,7 +281,12 @@ namespace BeWo.SchulbegleitenderDienst
                     {
                         if (eintrag != null && (int)_Tagesansicht.Datum.DayOfWeek == (int)eintrag.Tag + 1)
                         {
-                            arbeitszeitEintrag = eintrag.UhrzeitVon + " - " + eintrag.UhrzeitBis;
+                            if (arbeitszeitEintrag.Length > 0)
+                            {
+                                arbeitszeitEintrag += ", ";
+                            }
+
+                            arbeitszeitEintrag += eintrag.UhrzeitVon + " - " + eintrag.UhrzeitBis;
                         }
                     }
                 }

BeWo/Security/EncryptionUtils.cs

@@ -0,0 +1,77 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Security.Cryptography;
+using System.Text;
+
+namespace BeWo.Security
+{
+    public class EncryptionUtils
+    {
+        private static readonly byte[] _Rc2Iv = { 50, 241, 173, 46, 224, 103, 137, 72 };
+        private static readonly byte[] _Rc2Key = { 140, 81, 67, 90, 70, 222, 51, 20, 154, 60, 68, 87, 112, 169, 38, 234 };
+
+        public static string EncryptString(string stringToEncrypt)
+        {
+            var rc2Csp = new RC2CryptoServiceProvider();
+            var encryptor = rc2Csp.CreateEncryptor(_Rc2Key, _Rc2Iv);
+
+            using(var memoryStream = new MemoryStream())
+            {
+                using(var cryptoStream = new CryptoStream(memoryStream, encryptor, CryptoStreamMode.Write))
+                {
+                    var toEncrypt = Encoding.UTF8.GetBytes(stringToEncrypt);
+
+                    cryptoStream.Write(toEncrypt, 0, toEncrypt.Length);
+                    cryptoStream.FlushFinalBlock();
+
+                    var encrypted = memoryStream.ToArray();
+
+                    return Convert.ToBase64String(encrypted);
+                }
+            }
+        }
+
+        public static string DecryptString(string stringToDecrypt)
+        {
+            if (String.IsNullOrEmpty(stringToDecrypt))
+            {
+                return "";
+            }
+            var rc2Csp = new RC2CryptoServiceProvider();
+            var decryptor = rc2Csp.CreateDecryptor(_Rc2Key, _Rc2Iv);
+
+            stringToDecrypt = stringToDecrypt.Replace(' ', '+');
+            stringToDecrypt = stringToDecrypt.Trim(',');
+
+            try
+            {
+                using (var memoryStream = new MemoryStream(Convert.FromBase64String(stringToDecrypt)))
+                {
+                    using (var cryptoStream = new CryptoStream(memoryStream, decryptor, CryptoStreamMode.Read))
+                    {
+                        var bytes = new List<byte>();
+                        int b;
+
+                        do
+                        {
+                            b = cryptoStream.ReadByte();
+
+                            if(b != -1)
+                            {
+                                bytes.Add(Convert.ToByte(b));
+                            }
+                        } while(b != -1);
+
+                        return Encoding.UTF8.GetString(bytes.ToArray());
+                    }
+                }
+            }
+            catch(CryptographicException)
+            {
+                // Es wird davon ausgegangen, dass der String nicht verschlüsselt ist.
+                return Encoding.UTF8.GetString(Convert.FromBase64String(stringToDecrypt));
+            }
+        }
+    }
+}

BeWo/ServiceProxy/ServiceFacade.cs

@@ -248,7 +248,21 @@ namespace BeWo.ServiceProxy
                 ShowErrorMessage(e);
             }
         }
-		
+
+        public static T DoWohnheimServiceSync<T>(Func<IOperationsService, T> pFunc)
+        {
+            try
+            {
+                return pFunc.Invoke(GetInstance<OperationsServiceClient, IOperationsService>());
+            }
+            catch (Exception e)
+            {
+                ShowErrorMessage(e);
+            }
+
+            return default(T);
+        }
+
         public static void DoMailServiceAsync<T>(Func<IMailService, T> pFunc, Action<T> pCallBack)
 		{
 			DoAsync<MailServiceClient, IMailService, T>(pFunc, pCallBack, true);
@@ -851,7 +865,7 @@ namespace BeWo.ServiceProxy
 			{
 				var lBeWoFault = (e as FaultException<BeWoFault>).Detail;
 
-				String rowUpdated = "Der Datensatz wurde in der Zwischenzeit von einem anderen Benutzer geändert. Ihre Änderungen konnten leider NICHT gespeichert werden. Das Problem tritt auf, wenn mehrere Benutzer gleichzeitig den gleichen Datensatz bearbeiten.\n\nSie müssen den Datensatz schließen und erneut öffnen, um die Änderungen vornehmen zu können.";
+				String rowUpdated = "Der Datensatz wurde in der Zwischenzeit von " + BS.Shared.Translation.Translator.Translate("einem anderen Benutzer") + " geändert. Ihre Änderungen konnten leider NICHT gespeichert werden. Das Problem tritt auf, wenn mehrere " + BS.Shared.Translation.Translator.Translate("BenutzerPlural") + " gleichzeitig den gleichen Datensatz bearbeiten.\n\nSie müssen den Datensatz schließen und erneut öffnen, um die Änderungen vornehmen zu können.";
 				switch (lBeWoFault.FaultType)
 				{
 					case BeWoFaultType.Concurrency:

BeWo/Styles/OrangeBlack.xaml

@@ -2789,12 +2789,15 @@
             <Border x:Name="ItemContent" CornerRadius="5" MinHeight="30">
               <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="5,3,5,3" OpacityMask="{x:Null}" SnapsToDevicePixels="True" >
                 <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="Auto" SharedSizeGroup="EmployeeDetailColumn1"/>
+                    <ColumnDefinition Width="Auto" SharedSizeGroup="EmployeeDetailColumn2"/>
                   <ColumnDefinition Width="Auto" />
                   <ColumnDefinition Width="*" />
                   <ColumnDefinition Width="Auto" />
                   <ColumnDefinition Width="Auto" />
                   <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="Auto" />
+                  <ColumnDefinition Width="Auto" />
                 </Grid.ColumnDefinitions>
                 <Grid.RowDefinitions>
                   <RowDefinition Height="Auto" />
@@ -2802,7 +2805,10 @@
                 </Grid.RowDefinitions>
                 <Image Grid.RowSpan="2" Grid.Row="0" Grid.Column="0" Source="..\Ressources\Icons\AnonymousUserDisabled.png" Margin="0,0,5,0" Height="30" VerticalAlignment="Center" HorizontalAlignment="Stretch" Width="Auto" RenderTransformOrigin="0.5, 0.5" />
                 <TextBlock x:Name="txtDetail1" Grid.Row="0" Grid.Column="1" Grid.RowSpan="2" Text="{Binding Path=DetailDescription}" FontSize="14" Foreground="#FFD2D2D2" FontFamily="Microsoft Sans Serif" VerticalAlignment="Center" />
-                  <TextBlock Grid.Row="0" Grid.RowSpan="2" Grid.Column="2" Margin="0,0,3,0" FontSize="12" Foreground="#FFD2D2D2" FontFamily="Microsoft Sans Serif" VerticalAlignment="Center">
+                  <TextBlock x:Name="txtDetail2" Grid.Row="0" Grid.Column="2" Grid.RowSpan="2" Text="{Binding Path=Details2}" Margin="16,0,0,0" FontSize="14" Foreground="#FFD2D2D2" FontFamily="Microsoft Sans Serif" VerticalAlignment="Center" />
+                  <TextBlock x:Name="txtDetail3" Grid.Row="0" Grid.Column="3" Grid.RowSpan="2" Text="{Binding Path=Details3}" Margin="16,0,0,0" FontSize="14" Foreground="#FFD2D2D2" FontFamily="Microsoft Sans Serif" VerticalAlignment="Center" />
+                  <TextBlock x:Name="txtTeams" Grid.Row="0" Grid.Column="4" Grid.RowSpan="2" Text="{Binding Path=Teams}" Margin="16,0,0,0" FontSize="14" Foreground="#FFD2D2D2" FontFamily="Microsoft Sans Serif" VerticalAlignment="Center" />
+                  <TextBlock Grid.Row="0" Grid.RowSpan="2" Grid.Column="5" Margin="0,0,3,0" FontSize="12" Foreground="#FFD2D2D2" FontFamily="Microsoft Sans Serif" VerticalAlignment="Center">
                       <TextBlock.Visibility>
                           <Binding Path="IsDeleted" ConverterParameter="Employee">
                               <Binding.Converter>
@@ -2814,7 +2820,7 @@
                           Anonymisieren
                       </Hyperlink>
                   </TextBlock>
-                <TextBlock Grid.Row="0" Grid.RowSpan="2" Grid.Column="3" Margin="0,0,3,0" FontSize="12" Foreground="#FFD2D2D2" FontFamily="Microsoft Sans Serif" VerticalAlignment="Center">
+                <TextBlock Grid.Row="0" Grid.RowSpan="2" Grid.Column="6" Margin="0,0,3,0" FontSize="12" Foreground="#FFD2D2D2" FontFamily="Microsoft Sans Serif" VerticalAlignment="Center">
                     <TextBlock.Visibility>
                         <Binding Path="IsDeleted" ConverterParameter="Employee">
                             <Binding.Converter>
@@ -2826,7 +2832,7 @@
                         Endgültig löschen
                     </Hyperlink>
                 </TextBlock>
-                <TextBlock Grid.Row="0" Grid.RowSpan="2" Grid.Column="4" FontSize="12" Foreground="#FFD2D2D2" FontFamily="Microsoft Sans Serif" VerticalAlignment="Center">
+                <TextBlock Grid.Row="0" Grid.RowSpan="2" Grid.Column="7" FontSize="12" Foreground="#FFD2D2D2" FontFamily="Microsoft Sans Serif" VerticalAlignment="Center">
                   <TextBlock.Visibility>
                     <Binding Path="IsDeleted" ConverterParameter="Employee">
                       <Binding.Converter>
@@ -2838,7 +2844,7 @@
                     Reaktivieren
                   </Hyperlink>
                 </TextBlock>
-                  <TextBlock Grid.Row="0" Grid.RowSpan="2" Grid.Column="5" FontSize="12" Foreground="#FFFFFFFF" FontFamily="Microsoft Sans Serif" VerticalAlignment="Center" Margin="5,0,0,0">
+                  <TextBlock Grid.Row="0" Grid.RowSpan="2" Grid.Column="8" FontSize="12" Foreground="#FFFFFFFF" FontFamily="Microsoft Sans Serif" VerticalAlignment="Center" Margin="5,0,0,0">
                       <Hyperlink Click="Hyperlink_Employee_Print_Click" TargetName="_NewWindow" Foreground="#FFFFFFFF" Tag="{Binding}">
                           Drucken
                       </Hyperlink>
@@ -2850,9 +2856,13 @@
           <ControlTemplate.Triggers>
             <DataTrigger Binding="{Binding Path=IsArchived}" Value="True">
               <Setter Property="Foreground" TargetName="txtDetail1" Value="#FF808080" />
+                <Setter Property="Foreground" TargetName="txtDetail2" Value="#FF808080" />
+                <Setter Property="Foreground" TargetName="txtDetail3" Value="#FF808080" />
             </DataTrigger>
             <DataTrigger Binding="{Binding Path=IsDeleted}" Value="True">
               <Setter Property="Foreground" TargetName="txtDetail1" Value="#FFF97E7B" />
+                <Setter Property="Foreground" TargetName="txtDetail2" Value="#FFF97E7B" />
+                <Setter Property="Foreground" TargetName="txtDetail3" Value="#FFF97E7B" />
             </DataTrigger>
             <Trigger Property="IsMouseOver" Value="True">
               <Setter Property="OpacityMask" TargetName="ItemBorder">
@@ -3014,8 +3024,23 @@
 		<Setter Property="Template" Value="{StaticResource NavigationGroupTemplate}" />
 	</Style>
 	<!-- EndRegion -->
-	
-	<!-- Region User Styles-->
+
+    <!-- Region Team Styles-->
+    <SolidColorBrush x:Key="DokumenteContentBrush" Color="AntiqueWhite" />
+    <Style x:Key="DokumenteNavigationStyle" TargetType="{x:Type GroupBox}">
+        <Style.Resources>
+            <SolidColorBrush x:Key="NavigationHeaderBrush" Color="Beige" />
+            <LinearGradientBrush x:Key="NavigationContentBrush" EndPoint="0.5,1" StartPoint="0.5,0">
+                <GradientStop Color="AntiqueWhite" Offset="0" />
+                <GradientStop Color="Beige" Offset="1" />
+            </LinearGradientBrush>
+        </Style.Resources>
+
+        <Setter Property="Template" Value="{StaticResource NavigationGroupTemplate}" />
+    </Style>
+    <!-- EndRegion -->
+
+    <!-- Region User Styles-->
 	<SolidColorBrush x:Key="UserContentBrush" Color="#FF4B4B4B" />
 	<Style x:Key="UserNavigationStyle" TargetType="{x:Type GroupBox}">
 		<Style.Resources>
@@ -3180,10 +3205,7 @@
 				<Canvas Grid.Column="1" Width="14" Margin="2,2,2,2">
 					<Ellipse Stroke="#FF7C7C7C" Height="10" Width="10" StrokeThickness="2" Fill="{x:Null}" />
 					<Line Fill="#FFFFFFFF" Stretch="Fill" Stroke="#FF7C7C7C" Canvas.Left="6" Canvas.Top="7.4" Y1="0" Y2="5" StrokeThickness="3" X2="4" />
-
-
 				</Canvas>
-
 			</Grid>
 
 		</Border>

BeWo/View/BargeldkassenView.xaml

@@ -9,6 +9,7 @@
                xmlns:validation="clr-namespace:BeWo.Validation"
                xmlns:core="clr-namespace:BS.Shared.Core;assembly=BS.Shared"
                xmlns:controls="clr-namespace:BeWo.View.Controls"
+               xmlns:t="clr-namespace:BeWo.MultiLanguage.Markup"
                Height="Auto" Width="Auto" HorizontalAlignment="Stretch"
                mc:Ignorable="d" VerticalAlignment="Stretch" Focusable="True">
     <view:BeWoView.Resources>
@@ -110,6 +111,7 @@
                                     <RowDefinition Height="Auto" />
                                     <RowDefinition Height="Auto" />
                                     <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
                                 </Grid.RowDefinitions>
                                 <!-- RelativeSource={RelativeSource AncestorType={x:Type view:BargeldkassenView}} -->
                                 <!--<Label Grid.Column="0" Grid.Row="0" Content="Kasse" VerticalAlignment="Center" />
@@ -128,16 +130,19 @@
                                 <Label Grid.Column="0" Grid.Row="2" Content="Betrag" VerticalAlignment="Center" />
                                 <dxe:TextEdit Grid.Column="1" Grid.Row="2" MaskType="Numeric" Mask="########0.00" MaskUseAsDisplayFormat="True" Height="23" Margin="3" x:Name="NewTransaktionBetragTextEdit" 
                                               EditValue="{validation:ValidationBinding Path=NewBargeldtransaktion.Betrag, UpdateSourceTrigger=PropertyChanged, RelativeSource={RelativeSource AncestorType={x:Type view:BargeldkassenView}}}" />
+                                <Label Grid.Column="0" Grid.Row="3" Content="{t:Translate Belegnummer}" VerticalAlignment="Center" />
+                                <dxe:TextEdit Grid.Column="1" Grid.Row="3" Height="23" Margin="3" x:Name="NewTransaktionBelegnummerTextEdit" 
+                                              EditValue="{validation:ValidationBinding Path=NewBargeldtransaktion.Belegnummer, UpdateSourceTrigger=PropertyChanged, RelativeSource={RelativeSource AncestorType={x:Type view:BargeldkassenView}}}" />
 
-                                <Label Grid.Column="0" Grid.Row="3" Content="Notiz" VerticalAlignment="Center" />
-                                <TextBox Grid.Column="1" Grid.Row="3" VerticalAlignment="Center" Height="60" Margin="3,0,3,3"
+                                <Label Grid.Column="0" Grid.Row="4" Content="Notiz" VerticalAlignment="Center" />
+                                <TextBox Grid.Column="1" Grid.Row="4" VerticalAlignment="Center" Height="60" Margin="3,0,3,3"
                                          ScrollViewer.CanContentScroll="False" VerticalScrollBarVisibility="Auto"
 									     HorizontalScrollBarVisibility="Hidden" TextWrapping="Wrap" AcceptsReturn="True"
 									     AutoWordSelection="True" Language="de-DE" SpellCheck.IsEnabled="True"
                                          x:Name="NewTransaktionNotizTextBox"
                                          Text="{Binding Path=NewBargeldtransaktion.Notice, UpdateSourceTrigger=PropertyChanged, RelativeSource={RelativeSource AncestorType={x:Type view:BargeldkassenView}}}"/>
 
-                                <StackPanel Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="4" Orientation="Horizontal" HorizontalAlignment="Right">
+                                <StackPanel Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="5" Orientation="Horizontal" HorizontalAlignment="Right">
                                     <Button Click="ButtonAddBargeldtransaktionClick" Content="Hinzufügen" Height="25"
                                             FontWeight="Normal" Margin="3" VerticalAlignment="Center" HorizontalAlignment="Right" />
                                     <Button HorizontalAlignment="Right" VerticalAlignment="Center" Height="25"
@@ -285,6 +290,11 @@
                                                 <dxe:TextEditSettings MaskType="Numeric" Mask="c" MaskUseAsDisplayFormat="True" />
                                             </dxg:GridColumn.EditSettings>
                                         </dxg:GridColumn>
+                                        <dxg:GridColumn Header="{t:Translate Belegnummer}" FixedWidth="True" FieldName="Belegnummer" AllowEditing="{Binding Path=BargeldtransaktionenBearbeitenAlsDefaultBooelan, RelativeSource={RelativeSource AncestorType={x:Type view:BargeldkassenView}}}">
+                                            <dxg:GridColumn.EditSettings>
+                                                <dxe:TextEditSettings />
+                                            </dxg:GridColumn.EditSettings>
+                                        </dxg:GridColumn>
                                         <dxg:GridColumn Header="Angelegt von" FixedWidth="True" FieldName="InsUser" AllowEditing="False">
                                             
                                         </dxg:GridColumn>

BeWo/View/BargeldkassenView.xaml.cs

@@ -217,6 +217,7 @@ namespace BeWo.View
                                 {
                                     isRelevantProperty = args.PropertyDescriptor.Name.Equals(BargeldtransaktionsVM.PropertyName_Betrag) ||
                                                          args.PropertyDescriptor.Name.Equals(BargeldtransaktionsVM.PropertyName_Notice) ||
+                                                         args.PropertyDescriptor.Name.Equals(BargeldtransaktionsVM.PropertyName_Belegnummer) ||
                                                          args.PropertyDescriptor.Name.Equals(BargeldtransaktionsVM.PropertyName_Zahlungsdatum) ||
                                                          args.PropertyDescriptor.Name.Equals(BargeldtransaktionsVM.PropertyName_Zahlungstyp);
                                 }

BeWo/View/BeWoFileView.xaml

@@ -9,8 +9,8 @@
                     xmlns:diagnostics="clr-namespace:System.Diagnostics;assembly=WindowsBase" 
                     VerticalAlignment="Stretch" Focusable="True">
 	<localView:BeWoView.Resources>
-
-		<ContextMenu x:Key="cm" MenuItem.Click="ContextMenu_Click" Opened="ContextMenu_Opened">
+        <localView:DeleteButtonVisibilityConverter x:Key="DeleteButtonVisibilityConverter" />
+        <ContextMenu x:Key="cm" MenuItem.Click="ContextMenu_Click" Opened="ContextMenu_Opened" >
             <MenuItem Header="Neu" >
                 <MenuItem.Icon>
                     <Image Source="..\Ressources\Icons\Add24.png"/>
@@ -22,14 +22,14 @@
                 </MenuItem.Icon>
             </MenuItem>
             <Separator />
-			<MenuItem Header="Löschen" >
+            <MenuItem Header="Löschen" >
                 <MenuItem.Icon>
                     <Image Source="..\Ressources\Icons\Delete24.png"/>
                 </MenuItem.Icon>
             </MenuItem>
-		</ContextMenu>
-
-		<HierarchicalDataTemplate x:Key="test" DataType="{x:Type localViewModel:BeWoFolderVM}" ItemsSource="{Binding SubFolders}">
+        </ContextMenu>
+        
+        <HierarchicalDataTemplate x:Key="test" DataType="{x:Type localViewModel:BeWoFolderVM}" ItemsSource="{Binding SubFolders}">
 
 			<StackPanel Orientation="Horizontal" ContextMenu="{StaticResource cm}">
 				<Image Name="img" Width="20" Height="20" Stretch="Fill" Source="..\Ressources\Icons\Folder.png" />
@@ -49,7 +49,7 @@
 				<ColumnDefinition Width="Auto" />
 				<ColumnDefinition Width="*" />
 			</Grid.ColumnDefinitions>
-            <GroupBox Grid.ColumnSpan="2" Padding="5" Style="{StaticResource ObjectEditGroupBox}" Header="Neue Datei hochladen">
+            <GroupBox Grid.ColumnSpan="2" Padding="5" Style="{StaticResource ObjectEditGroupBox}" Header="Neue Datei hochladen" x:Name="GroupBoxDateiHochladen">
                 <Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="Auto" />
@@ -80,7 +80,7 @@
 
             <dxg:GridControl Grid.Row="1" Margin="2,3,5,5" DataSource="{Binding SelectedItem.Files, ElementName=treeview, diagnostics:PresentationTraceSources.TraceLevel=High}" x:Name="datagrid_documents" Grid.Column="1" ItemsSourceChanged="Datagrid_documents_OnItemsSourceChanged">
 				<dxg:GridControl.Columns>
-                    <dxg:GridColumn FieldName="FileName" Header="" FixedWidth="True" Width="24" ReadOnly="True">
+                    <dxg:GridColumn FieldName="FileName" Header="" FixedWidth="True" Width="24" ReadOnly="True" Visible="{Binding Converter={StaticResource DeleteButtonVisibilityConverter}}">
                         <dxg:GridColumn.CellTemplate>
                             <DataTemplate>
                                 <Button Content="r" FontFamily="Webdings" Click="DeleteButton_Click" Width="18" Height="18" VerticalAlignment="Center" />

BeWo/View/BeWoFileView.xaml.cs

@@ -21,6 +21,8 @@ using BS.Shared;
 using BS.Shared.Core;
 using DevExpress.Xpf.Grid;
 using Microsoft.Win32;
+using System.Windows.Data;
+using System.Globalization;
 
 namespace BeWo.View
 {
@@ -46,6 +48,12 @@ namespace BeWo.View
         {
             InitializeComponent();
 
+            if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.DocumentsUploadAll))
+            {
+                GroupBoxDateiHochladen.Visibility = Visibility.Collapsed;
+            }
+            
+
             CursorControl.Visibility = Visibility.Collapsed;
             _ObjectOid = pObjectOid;
             _ObjectTid = pObjectTid;
@@ -205,6 +213,10 @@ namespace BeWo.View
 
         private void ContextMenu_Click(object sender, RoutedEventArgs e)
         {
+            if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.DocumentsEditFolders))
+            {
+                return;
+            }
             if (e.OriginalSource is MenuItem)
             {
                 var twi = e.OriginalSource as MenuItem;
@@ -337,6 +349,10 @@ namespace BeWo.View
 
         private void treeview_PreviewMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
         {
+            if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.DocumentsEditFolders))
+            {
+                return;
+            }
             drag = treeview.GetDataItemUnderMouse<BeWoFolderVM>(e) ?? datagrid_documents.GetRow(datagrid_documents.View.GetRowHandleByMouseEventArgs(e));
 
             _MouseDownPosition = e.GetPosition(this);
@@ -537,7 +553,8 @@ namespace BeWo.View
                 BeWoFolderVM folder = this.treeview.SelectedItem as BeWoFolderVM;
 
                 bool enabled = false;
-
+                bool darfBearbeiten = BeWoApp.LoggedOnUser.HasRight(UserRightType.DocumentsEditFolders);
+                
                 if (folder != null)
                 {
                     if (folder.ParentFolder != null)
@@ -550,7 +567,13 @@ namespace BeWo.View
                     {
                         MenuItem menuitem = item as MenuItem;
                         if (menuitem.Header.Equals("Umbenennen"))
+                        {
                             menuitem.IsEnabled = enabled;
+                        }
+                        if (!darfBearbeiten)
+                        {
+                            menuitem.IsEnabled = false;
+                        }
                     }
                 }
             }
@@ -717,5 +740,23 @@ namespace BeWo.View
         {
             DocumentTableView.BestFitColumns();
         }
+
+    }
+    public class DeleteButtonVisibilityConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (BeWoApp.LoggedOnUser.HasRight(UserRightType.DocumentsDeleteAll))
+            {
+                return true;
+            }
+            else
+                return false;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
     }
 }

BeWo/View/BeWoWindow.xaml.cs

@@ -53,7 +53,11 @@ namespace BeWo.View
         {
             try
             {
-                DragMove();
+                var p = e.GetPosition(this);
+                if (p.Y <= 40)
+                {
+                    DragMove();
+                }
             }
             catch (Exception){}
         }

BeWo/View/Controls/ComboBoxTreeViewControl.xaml

@@ -150,15 +150,9 @@
 		</Popup>
 	    <Popup x:Name="RatingPopup" StaysOpen="False" Placement="MousePoint" Width="400"  Height="200" >
             <Border Background="{StaticResource ObjectEditBackgroundBrush}">
-                <StackPanel Orientation="Vertical" Margin="5">
-                    <RadioButton x:Name="RadioButtonNone" Margin="3" FontSize="12" Click="RatingButton_OnClick" Tag="-1" Content="Keine Bewertung" IsChecked="True"></RadioButton>
-                    <RadioButton x:Name="RadioButton0" Margin="3" FontSize="12" Click="RatingButton_OnClick" Tag="0" Content="xxx.0 - Problem nicht vorhanden (ohne, kein, unerheblich ...) 0 bis 4 %"></RadioButton>
-                    <RadioButton x:Name="RadioButton1" Margin="3" FontSize="12" Click="RatingButton_OnClick" Tag="1" Content="xxx.1 - Problem leicht ausgeprägt (schwach, gering ...) 5 bis 24 %"></RadioButton>
-                    <RadioButton x:Name="RadioButton2" Margin="3" FontSize="12" Click="RatingButton_OnClick" Tag="2" Content="xxx.2 - Problem mäßig ausgeprägt (mittel, ziemlich ...) 25 bis 49 %"></RadioButton>
-                    <RadioButton x:Name="RadioButton3" Margin="3" FontSize="12" Click="RatingButton_OnClick" Tag="3" Content="xxx.3 - Problem erheblich ausgeprägt (hoch, äußerst ...) 50 bis 95 %"></RadioButton>
-                    <RadioButton x:Name="RadioButton4" Margin="3" FontSize="12" Click="RatingButton_OnClick" Tag="4" Content="xxx.4 - Problem voll ausgeprägt (komplett, total ...) 96 bis 100 %"></RadioButton>
-                    <RadioButton x:Name="RadioButton8" Margin="3" FontSize="12" Click="RatingButton_OnClick" Tag="8" Content="xxx.8 - Nicht spezifiziert"></RadioButton>
-                    <RadioButton x:Name="RadioButton9" Margin="3" FontSize="12" Click="RatingButton_OnClick" Tag="9" Content="xxx.9 - Nicht anwendbar"></RadioButton>
+                <StackPanel x:Name="ratingPanel" Orientation="Vertical" Margin="5">
+                    <RadioButton x:Name="RadioButtonNone" Margin="3" FontSize="12" Click="RatingButton_OnClick" Content="Keine Bewertung" IsChecked="True"></RadioButton>
+                    
                 </StackPanel>
             </Border>
 

BeWo/View/Controls/ComboBoxTreeViewControl.xaml.cs

@@ -5,7 +5,8 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
 using System.Windows.Input;
-
+using BeWo.Core.Service;
+using BS.Shared;
 using BS.Shared.DataContracts;
 using BS.Shared.DataContracts.ClientPartials;
 
@@ -15,6 +16,22 @@ namespace BeWo.View.Controls
     {
         private SupportConceptGoalDC lastCheckedSupportConceptGoal;
 
+        public static readonly DependencyProperty ShowRatingPanelProperty = DependencyProperty.Register("ShowRatingPanel", typeof(bool), typeof(ComboBoxTreeViewControl), new FrameworkPropertyMetadata(false));
+
+        public bool ShowRatingPanel
+        {
+            get { return (bool)GetValue(ShowRatingPanelProperty); }
+            set { SetValue(ShowRatingPanelProperty, value); }
+        }
+
+        public static readonly DependencyProperty SelectOnlyLeafsProperty = DependencyProperty.Register("SelectOnlyLeafs", typeof(bool), typeof(ComboBoxTreeViewControl), new FrameworkPropertyMetadata(true));
+
+        public bool SelectOnlyLeafs
+        {
+            get { return (bool)GetValue(SelectOnlyLeafsProperty); }
+            set { SetValue(SelectOnlyLeafsProperty, value); }
+        }
+
         public double ParentWindowHeight
         {
             get { return (double) GetValue(ParentWindowHeightProperty); }
@@ -40,6 +57,26 @@ namespace BeWo.View.Controls
         {
             InitializeComponent();
             DataContext = this;
+            InitRatings();
+        }
+
+        private void InitRatings()
+        {
+            ratingPanel.Children.Clear();
+            var ratingList = Cache.GetInstance().GetAllRatingTypeList();
+            foreach (var r in ratingList)
+            {
+                //<RadioButton x:Name="RadioButton0" Margin="3" FontSize="12" Click="RatingButton_OnClick" Tag="0" Content="xxx.0 - Problem nicht vorhanden (ohne, kein, unerheblich ...) 0 bis 4 %"></RadioButton>
+
+                var rb = new RadioButton();
+                rb.Margin = new Thickness(3);
+                rb.FontSize = 12;
+                rb.Click += RatingButton_OnClick;
+                rb.Tag = r;
+                rb.Content = r.DisplayName;
+
+                ratingPanel.Children.Add(rb);
+            }
         }
 
         private void ShowCheckedValues()
@@ -104,6 +141,14 @@ namespace BeWo.View.Controls
                 }
                 else
                 {
+                    if (!SelectOnlyLeafs)
+                    {
+                        GoalCount++;
+                        if (item.IsChecked)
+                        {
+                            selectedGoals.Add(item.GoalEntryDC);
+                        }
+                    }
                     AddCheckedGoals(item.Children, selectedGoals);
                 }
             }
@@ -175,6 +220,15 @@ namespace BeWo.View.Controls
 
         private void SetPopUpVisible(bool visible)
         {
+            if (!ShowRatingPanel || !BeWoApp.LoggedOnUser.HasRight(UserRightType.BewertenInZeiterfassung))
+            {
+                return;
+            }
+
+            if (ratingPanel.Children.Count == 0)
+            {
+                return;
+            }
             if (lastCheckedSupportConceptGoal == null)
             {
                 return;
@@ -182,38 +236,29 @@ namespace BeWo.View.Controls
 
             if (lastCheckedSupportConceptGoal.Children != null && lastCheckedSupportConceptGoal.Children.Count > 0)
             {
-                return;
+                //return;
             }
             RatingPopup.IsOpen = visible;
 
             RadioButtonNone.IsChecked = true;
-            if (lastCheckedSupportConceptGoal.GoalEntryDC.Rating != null)
+            if (lastCheckedSupportConceptGoal.GoalEntryDC.RatingTypeOid.HasValue)
             {
-                switch (lastCheckedSupportConceptGoal.GoalEntryDC.Rating.Value)
+                foreach (var c in ratingPanel.Children)
                 {
-                    case 0:
-                        RadioButton0.IsChecked = true;
-                        break;
-                    case 1:
-                        RadioButton1.IsChecked = true;
-                        break;
-                    case 2:
-                        RadioButton2.IsChecked = true;
-                        break;
-                    case 3:
-                        RadioButton3.IsChecked = true;
-                        break;
-                    case 4:
-                        RadioButton4.IsChecked = true;
-                        break;
-                    case 8:
-                        RadioButton8.IsChecked = true;
-                        break;
-                    case 9:
-                        RadioButton9.IsChecked = true;
-                        break;
+                    RadioButton rb = c as RadioButton;
+                    if (rb != null && rb.Tag != null)
+                    {
+                        RatingTypeDC rbRating = rb.Tag as RatingTypeDC;
 
+                        if (rbRating != null && rbRating.RatingTypeOid ==
+                            lastCheckedSupportConceptGoal.GoalEntryDC.RatingTypeOid)
+                        {
+                            rb.IsChecked = true;
+                        }
+                    
+                    }
                 }
+                
             }
         }
 
@@ -305,11 +350,11 @@ namespace BeWo.View.Controls
                 RadioButton rb = sender as RadioButton;
                 if (rb.Tag != null)
                 {
-                    int rating = 0;
-
-                    if (Int32.TryParse(rb.Tag.ToString(), out rating))
+                    var rt = rb.Tag as RatingTypeDC;
+                    
+                    if (rt != null)
                     {
-                        lastCheckedSupportConceptGoal.SetRating(rating);
+                        lastCheckedSupportConceptGoal.SetRatingType(rt);
                     }
                 }
             }

BeWo/View/Controls/CompactAdditionalServiceGroupControl.xaml

@@ -3,7 +3,8 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:localsearch="clr-namespace:BeWo.View.Search" mc:Ignorable="d" 
+             xmlns:localsearch="clr-namespace:BeWo.View.Search" mc:Ignorable="d"
+             xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup"
              d:DesignHeight="300" d:DesignWidth="300">
   <UserControl.Resources>
     <Style x:Key="MultiSupportConceptSelectionControlStyle" TargetType="{x:Type ListBoxItem}">
@@ -38,7 +39,7 @@
 
                   <TextBlock x:Name="txtDetail1" Grid.Column="0" Grid.Row="0" Text="{Binding Path=FullName}" FontSize="12" Foreground="#FFD2D2D2" FontFamily="Microsoft Sans Serif" />
                   <!--<CheckBox x:Name="participatingCheckBox" Grid.Column="1" Grid.RowSpan="2" ToolTip="Anwesenheit des Klienten" Margin="3,0,20,0" VerticalAlignment="Center" />-->
-                  <Button x:Name="btnRemoveCustomer" Grid.Column="2" Grid.RowSpan="2" Width="20" Height="20" ToolTip="Klienten aus der Gruppe entfernen" Tag="{Binding}" Style="{DynamicResource CloseButtonStyle}" Click="btnRemoveCustomer_Click" Margin="3,0,0,0" />
+                                    <Button x:Name="btnRemoveCustomer" Grid.Column="2" Grid.RowSpan="2" Width="20" Height="20" ToolTip="{markup:Translate Klienten aus der Gruppe entfernen}" Tag="{Binding}" Style="{DynamicResource CloseButtonStyle}" Click="btnRemoveCustomer_Click" Margin="3,0,0,0" />
                 </Grid>
               </Border>
             </Grid>
@@ -95,7 +96,7 @@
       <RowDefinition Height="*" />
     </Grid.RowDefinitions>
     <Label x:Name="labelTitle" Content="Gruppendetails" FontSize="12" FontWeight="Bold" />
-    <Button x:Name="btnAddCustomer" HorizontalAlignment="Right" Click="btnAddCustomer_Click" Height="21" Width="45" Margin="0,0,0,3" ToolTip="Neuen Klienten hinzufügen">
+        <Button x:Name="btnAddCustomer" HorizontalAlignment="Right" Click="btnAddCustomer_Click" Height="21" Width="45" Margin="0,0,0,3" ToolTip="{markup:Translate Neuen Klienten hinzufügen}">
       <StackPanel Orientation="Horizontal">
         <Grid Width="18" HorizontalAlignment="Center" VerticalAlignment="Center">
           <Line X1="4" X2="12" Y1="8" Y2="8" Fill="{x:Null}" Stroke="#FFFFFFFF" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeThickness="2" HorizontalAlignment="Center" VerticalAlignment="Center" Width="16" Height="16" />

BeWo/View/Controls/DPCtrlDay.cs

@@ -0,0 +1,243 @@
+using BeWo.ServiceProxy;
+using BeWo.View.Detail.Report;
+using BS.Shared.DataContracts;
+using BS.Shared.Extensions;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Input;
+using System.Windows.Media;
+using Brush = System.Windows.Media.Brush;
+using SolidColorBrush = System.Windows.Media.SolidColorBrush;
+
+namespace BeWo.View.Controls
+{
+    public class DPCtrlDay : DienstplanerControl
+    {
+        public static bool bemerkungVorhanden = false;
+
+        public static readonly DependencyProperty DPCtrlDayInformationProperty = DependencyProperty.Register(
+            "DPCtrlDayInformation",
+            typeof(DPCtrlDayInformation),
+            typeof(DPCtrlDay),
+            new UIPropertyMetadata(
+                (s, e) =>
+                {
+                    var info = (DPCtrlDayInformation)e.NewValue;
+                    var c = (DPCtrlDay)s;
+
+                    if (c != null && info != null)
+                    {
+                        if (info.StatusInformation == null)
+                        {
+                            var dc = info.DienstInfoDC;
+
+                            var right = info.DayOfWeek == DayOfWeek.Sunday || info.IsLastColumn;
+                            var bottom = info.IsLastRow;
+
+                            c.Path_Notice.Visibility = info.MarkierungBenoetigt ? Visibility.Visible : Visibility.Collapsed;
+                            var bottomBorder = bottom ? 1.5 : 0;
+                            c.Border = new Thickness(0, 0, Convert.ToDouble(right), bottomBorder);
+                        
+                            if (!info.IsInContractRange)
+                            {
+                                c.Background = Brushes.Gray;
+                                c.Foreground = Brushes.Red;
+                                c.Text = string.Empty;
+                                c.ToolTip = "Kein gültiger Arbeitsvertrag";
+                            }
+                            else if (info.AbsenceTime != null && info.EnableDiensteAnFeiertagen == true)
+                            {
+                                string additionToTooltip = "";
+                                var start = info.AbsenceTime.Start.Value;
+                                var end = info.AbsenceTime.End.Value;
+                                var startArray = start.ToString().Split(' ');
+                                var endArray = end.ToString().Split(' ');
+
+                                if (start.Date == end.Date)
+                                {
+                                    if (start.TimeOfDay == end.TimeOfDay)
+                                        additionToTooltip = " (ganzer Tag)";
+                                    else
+                                        additionToTooltip = " (halber Tag)";
+                                }
+                                else
+                                    additionToTooltip = string.Format(" ({0} - {1})", startArray[0], endArray[0]); 
+
+                                c.Foreground = Brushes.Red;
+                                c.Text = $"{info.AbsenceTime.Reason.Description[0]}";
+                                c.ToolTip = $"{info.AbsenceTime.Reason.Description}" + additionToTooltip;
+
+                                if (info.DayOfWeek == DayOfWeek.Saturday || info.DayOfWeek == DayOfWeek.Sunday)
+                                    c.Background = new SolidColorBrush(ColorExtensions.FromHexString("EFEFEF"));
+                                else
+                                    c.Background = Brushes.White;
+
+                            }
+                            else if (info.OverTime != null)
+                            {
+                                c.Foreground = Brushes.Red;
+                                c.Text = "ÜS";
+                                c.ToolTip = (dc == null) ? string.Format("Überstunden:\t{0:0.00}\nAuszahlung:\t{1}\nBemerkung:\t{2}", 
+                                    info.OverTime.Betrag, info.OverTime.Auszahlungsart.Name, info.OverTime.Notice) : null;
+
+                                if (info.DayOfWeek == DayOfWeek.Saturday || info.DayOfWeek == DayOfWeek.Sunday)
+                                    c.Background = new SolidColorBrush(ColorExtensions.FromHexString("EFEFEF"));
+                                else if (dc != null)
+                                    c.Background = (SolidColorBrush)new BrushConverter().ConvertFrom(dc.Farbe);
+                                else
+                                    c.Background = Brushes.White;
+                            }
+                            else
+                            {
+                                c.Background = ((int)info.DayOfWeek % 6 == 0) ? new SolidColorBrush(ColorExtensions.FromHexString("EFEFEF")) : Brushes.White;
+                                c.Text = string.Empty;
+                                c.ToolTip = null;
+                            }
+
+                            if (dc != null)
+                            {
+                                c.Text = $"{dc.Kurz}";
+                                if (c.Path_Notice.Visibility == Visibility.Collapsed)
+                                {
+                                    c.BorderThickness = new Thickness(0, 0, 0, 0);
+                                    c.BorderBrush = Brushes.Transparent;
+                                }
+                                var bg = string.IsNullOrEmpty(dc.Farbe) ? Brushes.White : (SolidColorBrush)new BrushConverter().ConvertFrom(dc.Farbe);
+                                var grey = 0.2989 * bg.Color.R + 0.5870 * bg.Color.G + 0.1140 * bg.Color.B;
+
+                                c.Background = bg;
+                                if (info.OverTime == null && info.AbsenceTime == null)
+                                    c.Foreground = grey < 70 ? Brushes.White : Brushes.Black;
+                                else
+                                    c.Foreground = Brushes.Red;
+
+
+                                c.ToolTip = new DPCtrlDienstTooltip(dc, info.Dauer, info.Bemerkung, info.Zeiten, info.OverTime, info.AbsenceTime);
+                            }
+                            else
+                            {
+                                c.Path_Notice.Visibility = Visibility.Collapsed;
+                                c.BorderThickness = new Thickness(0, 0, 0, 0);
+                                c.BorderBrush = Brushes.Transparent;
+                            }
+                        }
+                        else
+                        {
+                            var right = info.DayOfWeek == DayOfWeek.Sunday || info.IsLastColumn;
+                            c.Border = new Thickness(0, 0, Convert.ToDouble(right), 2);
+
+                            if (info.StatusInformation != null)
+                            {
+                                var converter = new BrushConverter();
+
+                                var color = (info.StatusInformation.BesetzungsStatus) ? info.StatusInformation.ColorTrue : info.StatusInformation.ColorFalse;
+                                c.Background = (Brush)converter.ConvertFromString(color);
+
+                                if (info.StatusInformation.BesetzungsStatus) 
+                                {
+                                    c.ToolTip = "Dienste decken 24 Stunden ab";
+                                }
+                                else
+                                {
+                                    c.ToolTip = "Achtung: Dienste decken nicht 24 Stunden ab";
+                                }
+                                if (!info.StatusInformation.StatusInfoString.IsNullOrEmpty())
+                                {
+                                    c.ToolTip += c.ToolTip.ToString().IsNullOrEmpty() ? info.StatusInformation.StatusInfoString : "\n" + info.StatusInformation.StatusInfoString;
+                                    c.Path_Notice.Visibility = Visibility.Visible;
+                                }
+                                else
+                                    c.Path_Notice.Visibility = Visibility.Collapsed;
+                            }
+                        }
+
+                        if (info.Feiertag != null)
+                        {
+                            c.Background = Brushes.LightPink;
+                            c.ToolTip += "\n" + info.Feiertag.Name + " (gesetzl. Feiertag)";
+                        }
+                    }
+                }));
+
+        public DPCtrlDay()
+        {
+            InitializeComponent();
+            MouseDown += DienstplanerControl_MouseDown;
+
+            
+        }
+
+        public new Brush Background
+        {
+            get => BorderLight.Background;
+            set => BorderLight.Background = value;
+        }
+
+        public Thickness Border
+        {
+            get => BorderBlack.BorderThickness;
+            set => BorderBlack.BorderThickness = value;
+        }
+
+        public DPCtrlDayInformation DPCtrlDayInformation
+        {
+            get { return (DPCtrlDayInformation)GetValue(DPCtrlDayInformationProperty); }
+
+            set { SetValue(DPCtrlDayInformationProperty, value); }
+        }
+
+        private void DienstplanerControl_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+            DienstplanerView entryView = null;
+
+            System.Windows.DependencyObject parent = VisualTreeHelper.GetParent(this);
+
+            while (parent != null && entryView == null)
+            {
+                entryView = parent as DienstplanerView;
+                var fe = parent as FrameworkElement;
+                parent = fe != null ? VisualTreeHelper.GetParent(fe) : null;
+            }
+
+            if (entryView != null)
+            {
+                entryView.DienstplanerControl_MouseDown(sender, e);
+            }
+        }
+    }
+
+    public class DPCtrlDayInformation
+    {
+        public DienstInfoDC DienstInfoDC { get; set; }
+        public AbsenceTimeDC AbsenceTime { get; set; }
+        public OvertimeDC OverTime { get; set; }
+        public bool IsInContractRange { get; set; }
+        public bool IsLastRow { get; set; }
+        public bool IsLastColumn { get; set; }
+        public DayOfWeek DayOfWeek { get; set; }
+        public StatusInformation StatusInformation { get; set; }
+        public string Bemerkung { get; set; }
+        public string[] Zeiten { get; set; }
+        public double Dauer { get; set; }
+        public FeiertagDC Feiertag { get; set; }
+        public bool MarkierungBenoetigt { get; set; }
+        public bool EnableDiensteAnFeiertagen { get; set; }
+
+    }
+
+    public class StatusInformation
+    {
+        public bool BesetzungsStatus { get; set; }
+        public string StatusInfoString { get; set; }
+        public DayOfWeek DayOfWeek { get; set; }
+        public bool IsLastColumn { get; set; }
+        public string ColorTrue { get; set; }
+        public string ColorFalse { get; set; }
+    }
+}

BeWo/View/Controls/DPCtrlDienstTooltip.xaml

@@ -0,0 +1,52 @@
+<UserControl x:Class="BeWo.View.Controls.DPCtrlDienstTooltip" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <Grid>
+    <Grid.ColumnDefinitions>
+      <ColumnDefinition Width="Auto" />
+      <ColumnDefinition Width="10" />
+      <ColumnDefinition Width="Auto" />
+    </Grid.ColumnDefinitions>
+    <Grid.RowDefinitions>
+      <RowDefinition Height="Auto" />
+      <RowDefinition Height="Auto" />
+      <RowDefinition Height="Auto" />
+      <RowDefinition Height="Auto" />
+      <RowDefinition Height="Auto" />
+      <RowDefinition Height="Auto" />
+      <RowDefinition Height="Auto" />
+      <RowDefinition Height="Auto" />
+      <RowDefinition Height="Auto" />
+      <RowDefinition Height="Auto" />
+      <RowDefinition Height="Auto" />
+      <RowDefinition Height="Auto" />
+      <RowDefinition Height="Auto" />
+    </Grid.RowDefinitions>
+    <TextBlock Grid.Row="0" Grid.Column="0" Text="Dienst:"/>
+    <TextBlock Grid.Row="2" Grid.Column="0" Text="Start:"/>
+    <TextBlock Grid.Row="3" Grid.Column="0" Text="Ende:"/>
+    <TextBlock Grid.Row="4" Grid.Column="0" Text="Dauer:"/>
+    <TextBlock Grid.Row="5" Grid.Column="0" Text="Pausendauer:"/>
+    <TextBlock Grid.Row="7" Grid.Column="0" Text="Bemerkung:"/>
+    <TextBlock x:Name="lblUeberstunden" Grid.Row="9" Grid.Column="0" Text="Überstunden:" Visibility="Collapsed" />
+    <TextBlock x:Name="lblAuszahlungsart" Grid.Row="10" Grid.Column="0" Text="Auszahlung:" Visibility="Collapsed" />
+    <TextBlock x:Name="lblUrlaub" Grid.Row="12" Grid.Column="0" Text="Urlaub:" Visibility="Collapsed" />
+
+    <Separator Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="3"/>
+    
+    <TextBlock Grid.Row="0" Grid.Column="2" x:Name="TxtDienst"/>
+    <TextBlock Grid.Row="2" Grid.Column="2" x:Name="TxtStart"/>
+    <TextBlock Grid.Row="3" Grid.Column="2" x:Name="TxtEnde"/>
+    <TextBlock Grid.Row="4" Grid.Column="2" x:Name="TxtDauer"/>
+    <TextBlock Grid.Row="5" Grid.Column="2" x:Name="TxtPausendauer"/>
+    <TextBlock Grid.Row="7" Grid.Column="2" x:Name="TxtBemerkung" MaxWidth="275" TextWrapping="Wrap"/>
+    <TextBlock Grid.Row="9" Grid.Column="2" x:Name="TxtUeberstunden" Visibility="Collapsed" />
+    <TextBlock Grid.Row="10" Grid.Column="2" x:Name="TxtAuszahlungsart" Visibility="Collapsed" />
+    <TextBlock Grid.Row="12" Grid.Column="2" x:Name="TxtUrlaub" Visibility="Collapsed" />
+     
+    <Separator Grid.Row="6" Grid.Column="0" Grid.ColumnSpan="3"/>
+
+    <Separator x:Name="sepUeberstunden"  Grid.Row="8" Grid.Column="0" Grid.ColumnSpan="3" Visibility="Collapsed"/>
+    <Separator x:Name="sepUrlaub"  Grid.Row="11" Grid.Column="0" Grid.ColumnSpan="3" Visibility="Collapsed"/>
+
+
+    </Grid>
+</UserControl>

BeWo/View/Controls/DPCtrlDienstTooltip.xaml.cs

@@ -0,0 +1,71 @@
+using System;
+using System.Collections.Generic;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using System.Windows.Media;
+using BeWo.View.Detail;
+using BeWo.View.Detail.Report;
+using BeWo.ViewModel;
+using BS.Shared.DataContracts;
+
+namespace BeWo.View.Controls
+{
+    /// <summary>
+    ///     Interaction logic for DienstplanerControl.xaml
+    /// </summary>
+    public partial class DPCtrlDienstTooltip : UserControl
+    {
+        public DPCtrlDienstTooltip(DienstInfoDC dienst, double dauer, string bemerkung, string[] zeiten, OvertimeDC overtime, AbsenceTimeDC absence)
+        {
+            InitializeComponent();
+
+            TxtDienst.Text = $"{dienst.DienstName} ({dienst.Kurz})";
+            TxtEnde.Text = zeiten[1];
+            TxtEnde.Foreground = dienst.Ende.ToString("HH:mm").Equals(zeiten[1]) ? TxtDienst.Foreground : Brushes.CornflowerBlue;
+            TxtPausendauer.Text = dienst.Pause.ToString();
+            TxtStart.Text = zeiten[0];
+            TxtStart.Foreground = dienst.Start.ToString("HH:mm").Equals(zeiten[0]) ? TxtDienst.Foreground : Brushes.CornflowerBlue;
+
+            TxtDauer.Text = string.Format("{0:0.00}", dauer);
+
+            TxtBemerkung.Text = bemerkung;
+            
+            if (overtime != null)
+            {
+                TxtUeberstunden.Text = string.Format("{0:0.00}", overtime.Betrag);
+                TxtAuszahlungsart.Text = overtime.Auszahlungsart.Name;
+
+                TxtUeberstunden.Visibility = Visibility.Visible;
+                TxtAuszahlungsart.Visibility = Visibility.Visible;
+                lblUeberstunden.Visibility = Visibility.Visible;
+                lblAuszahlungsart.Visibility = Visibility.Visible;
+                sepUeberstunden.Visibility = Visibility.Visible;
+            }
+            if (absence != null)
+            {
+                string tooltipString = "";
+                var start = absence.Start.Value;
+                var end = absence.End.Value;
+                var startArray = start.ToString().Split(' ');
+                var endArray = end.ToString().Split(' ');
+
+                if (start.Date == end.Date)
+                {
+                    if (start.TimeOfDay == end.TimeOfDay)
+                        tooltipString = "ganzer Tag";
+                    else
+                        tooltipString = "halber Tag";
+                }
+                else
+                    tooltipString = string.Format("{0} - {1}", startArray[0], endArray[0]);
+
+                TxtUrlaub.Text = tooltipString;
+
+                lblUrlaub.Visibility = Visibility.Visible;
+                TxtUrlaub.Visibility = Visibility.Visible;
+                sepUrlaub.Visibility = Visibility.Visible;
+            }
+        }
+    }
+}

BeWo/View/Controls/DPCtrlEmployee.cs

@@ -0,0 +1,172 @@
+using BeWo.View.Detail.Report;
+using BS.Shared.DataContracts;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Input;
+using System.Windows.Media;
+using BS.Shared.Translation;
+
+namespace BeWo.View.Controls
+{
+    public class DPCtrlEmployee : DienstplanerControl
+    {
+        public static readonly DependencyProperty EmployeeInformationProperty = DependencyProperty.Register(
+              "EmployeeInformation",
+              typeof(DPCtrlEmployeeInformation),
+              typeof(DPCtrlEmployee),
+              new UIPropertyMetadata(
+                  (s, e) =>
+                  {
+                      var information = (DPCtrlEmployeeInformation)e.NewValue;
+                      var ctrl = (DPCtrlEmployee)s;
+
+                      if (ctrl != null)
+                      {
+                          if (information != null)
+                          {
+                              if(information.Employee != null)
+                              {
+                                  if (information.IsLastRow)
+                                  {
+                                      ctrl.BorderBlack.BorderThickness = new Thickness(0, 0, 1, 1.5);
+                                      ctrl.BorderLight.BorderThickness = new Thickness(0, 0, 0, 1.5);
+                                  }
+                                  else
+                                  {
+                                      ctrl.BorderBlack.BorderThickness = new Thickness(0, 0, 1, 0);
+                                      ctrl.BorderLight.BorderThickness = new Thickness(0, 0, 0, 1);
+                                  }
+                              }
+                              else
+                              {
+                                  ctrl.BorderBlack.BorderThickness = new Thickness(0, 0, 1, 2);
+                                  ctrl.BorderLight.BorderThickness = new Thickness(0, 0, 0, 2);
+                              }
+                              
+
+                              ctrl.Text = ctrl.DisplayMember;
+
+                              ctrl.ToolTip = new DPCtrlEmployeeTooltip(information.Employee, information.Contracts, information.IsVertretung);
+                              //if (information.IsVertretung)
+                              //    ctrl.Path_Notice.Visibility = Visibility.Visible;
+                          }
+                          else
+                          {
+                              ctrl.ToolTip = null;
+                          }
+                      }
+                  }));
+
+
+
+        public DPCtrlEmployee()
+        {
+            InitializeComponent();
+            FontSize = 12;
+            txt.HorizontalAlignment = HorizontalAlignment.Left;
+
+            MouseDown += DienstplanerControl_MouseDown;
+        }
+
+        private void DienstplanerControl_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+            DienstplanerView entryView = null;
+
+            System.Windows.DependencyObject parent = VisualTreeHelper.GetParent(this);
+
+            while (parent != null && entryView == null)
+            {
+                entryView = parent as DienstplanerView;
+                var fe = parent as FrameworkElement;
+                parent = fe != null ? VisualTreeHelper.GetParent(fe) : null;
+            }
+
+            if (entryView != null)
+            {
+                entryView.DienstplanerControl_MouseDown(sender, e);
+            }
+        }
+
+        public DPCtrlEmployeeInformation EmployeeInformation
+        {
+            get { return (DPCtrlEmployeeInformation)GetValue(EmployeeInformationProperty); }
+
+            set { SetValue(EmployeeInformationProperty, value); }
+        }
+
+        public string DisplayMember
+        {
+            get
+            {
+                var sb = new StringBuilder();
+                if (EmployeeInformation.Employee != null)
+                {
+                    switch (EmployeeInformation.Row)
+                    {
+
+                        case 0: return EmployeeInformation.Employee.LastNameFirstName;
+                        //Auskommentieren für nur eine Zeile
+                        //case 1:
+
+                        //    foreach (var contract in EmployeeInformation.Contracts)
+                        //    {
+                        //        sb.Append(contract.EmploymentType?.Name);
+                        //        sb.Append('/');
+                        //    }
+
+                        //    sb.Remove(sb.Length - 1, 1);
+
+                        //    return sb.ToString();
+
+                        //case 2:
+
+                        //    foreach (var contract in EmployeeInformation.Contracts)
+                        //    {
+                        //        sb.Append('(');
+
+                        //        if (contract.EntryDate.HasValue)
+                        //            sb.Append(contract.EntryDate.Value.ToString("dd.MM.yy"));
+                        //        else
+                        //            sb.Append("k.A.");
+
+                        //        sb.Append(" - ");
+
+                        //        if (contract.ContractEndDate.HasValue)
+                        //            sb.Append(contract.ContractEndDate.Value.ToString("dd.MM.yy"));
+                        //        else
+                        //            sb.Append("unbefr.");
+
+                        //        sb.Append(')');
+
+                        //        sb.Append('/');
+                        //    }
+
+                        //    sb.Remove(sb.Length - 1, 1);
+
+                        //    return sb.ToString();
+
+                    }
+                }
+                else
+                {
+                    return Translator.Translate("Status");
+                }
+
+                return null;
+            }
+        }
+    }
+
+    public class DPCtrlEmployeeInformation
+    {
+        public EmployeeDC Employee { get; set; }
+        public List<ContractDC> Contracts { get; set; }
+        public int Row { get; set; }
+        public bool IsLastRow { get; set; }
+        public bool IsVertretung { get; set; }
+    }
+}

BeWo/View/Controls/DPCtrlEmployeeContractTooltip.xaml

@@ -0,0 +1,21 @@
+<UserControl x:Class="BeWo.View.Controls.DPCtrlEmployeeContractTooltip" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <Grid>
+    <Grid.ColumnDefinitions>
+      <ColumnDefinition Width="Auto" />
+      <ColumnDefinition Width="10" />
+      <ColumnDefinition Width="Auto" />
+    </Grid.ColumnDefinitions>
+    <Grid.RowDefinitions>
+      <RowDefinition Height="Auto" />
+      <RowDefinition Height="Auto" />
+      <RowDefinition Height="Auto" />
+    </Grid.RowDefinitions>
+    <Separator Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="3"/>
+    
+    <TextBlock Grid.Row="1" Grid.Column="0" Text="Beschäftigungsart:"/>
+    <TextBlock Grid.Row="2" Grid.Column="0" Text="Vereinbarte Regelarbeitszeit:"/>
+
+    <TextBlock Grid.Row="1" Grid.Column="2" x:Name="TxtEmploymentType"/>
+    <TextBlock Grid.Row="2" Grid.Column="2" x:Name="TxtArbeitszeit"/>
+  </Grid>
+</UserControl>

BeWo/View/Controls/DPCtrlEmployeeContractTooltip.xaml.cs

@@ -0,0 +1,39 @@
+using System;
+using System.Collections.Generic;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using System.Windows.Media;
+using BeWo.View.Detail;
+using BeWo.View.Detail.Report;
+using BeWo.ViewModel;
+using BS.Shared.DataContracts;
+
+namespace BeWo.View.Controls
+{
+    /// <summary>
+    ///     Interaction logic for DienstplanerControl.xaml
+    /// </summary>
+    public partial class DPCtrlEmployeeContractTooltip : UserControl
+    {
+        public DPCtrlEmployeeContractTooltip(ContractDC contract)
+        {
+            InitializeComponent();
+
+            TxtEmploymentType.Text = contract.EmploymentType.Name;
+            
+            if(contract.MonthlyTotalHours != null)
+            {
+                TxtArbeitszeit.Text = $"{contract.MonthlyTotalHours.Value} Std/Monat";
+            }
+            else if(contract.WeeklyTotalHours != null)
+            {
+                TxtArbeitszeit.Text = $"{contract.WeeklyTotalHours.Value} Std/Woche";
+            }
+            else
+            {
+                TxtArbeitszeit.Text = $"k.A.";
+            }
+        }
+    }
+}

BeWo/View/Controls/DPCtrlEmployeeTooltip.xaml

@@ -0,0 +1,14 @@
+<UserControl x:Class="BeWo.View.Controls.DPCtrlEmployeeTooltip" xmlns:t="clr-namespace:BeWo.MultiLanguage.Markup" xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup"  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <Grid x:Name="RootGrid">
+    <Grid.ColumnDefinitions>
+      <ColumnDefinition Width="Auto" />
+      <ColumnDefinition Width="10" />
+      <ColumnDefinition Width="Auto" />
+    </Grid.ColumnDefinitions>
+    <Grid.RowDefinitions>
+      <RowDefinition Height="Auto" />
+    </Grid.RowDefinitions>
+    <TextBlock Grid.Row="0" Grid.Column="0" Text="{t:Translate MitarbeiterSingular:}"/>
+    <TextBlock Grid.Row="0" Grid.Column="2" x:Name="TxtMitarbeiter"/>
+  </Grid>
+</UserControl>

BeWo/View/Controls/DPCtrlEmployeeTooltip.xaml.cs

@@ -0,0 +1,102 @@
+using System;
+using System.Collections.Generic;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using System.Windows.Media;
+using BeWo.View.Detail;
+using BeWo.View.Detail.Report;
+using BeWo.ViewModel;
+using BS.Shared.DataContracts;
+
+namespace BeWo.View.Controls
+{
+    /// <summary>
+    ///     Interaction logic for DienstplanerControl.xaml
+    /// </summary>
+    public partial class DPCtrlEmployeeTooltip : UserControl
+    {
+        public DPCtrlEmployeeTooltip(EmployeeDC employeeDC, List<ContractDC> contractDCs, bool isVertretung)
+        {
+            InitializeComponent();
+
+            if(employeeDC != null)
+            {
+                TxtMitarbeiter.Text = employeeDC.LastNameFirstName;
+
+                var separator = new Separator();
+
+                foreach (var contract in contractDCs)
+                {
+                    var sep1 = new Separator();
+                    var sep2 = new Separator();
+                    var txtType1 = new TextBlock();
+                    var txtType2 = new TextBlock();
+                    var txtArbeit1 = new TextBlock();
+                    var txtArbeit2 = new TextBlock();
+                    var txtVertretung1 = new TextBlock();
+                    var txtVertretung2 = new TextBlock();
+                    
+                    txtType1.Text = "Beschäftigungsart:";
+                    txtType2.Text = $"{contract.EmploymentType?.Name}";
+
+                    txtArbeit1.Text = "Vereinbarte Regelarbeitszeit:";
+
+                    if (contract.MonthlyTotalHours != null)
+                    {
+                        txtArbeit2.Text = $"{contract.MonthlyTotalHours.Value:0.00} Std/Monat";
+                    }
+                    else if (contract.WeeklyTotalHours != null)
+                    {
+                        txtArbeit2.Text = $"{contract.WeeklyTotalHours.Value:0.00} Std/Woche";
+                    }
+                    else
+                    {
+                        txtArbeit2.Text = $"k.A.";
+                    }
+                    txtVertretung1.Text = "Vertretung:";
+                    txtVertretung2.Text = isVertretung ? "Ja" : "Nein";
+
+                    RootGrid.RowDefinitions.Add(new RowDefinition { Height = GridLength.Auto });
+                    RootGrid.Children.Add(sep1);
+
+                    Grid.SetRow(sep1, RootGrid.RowDefinitions.Count - 1);
+                    Grid.SetColumnSpan(sep1, 3);
+
+                    RootGrid.RowDefinitions.Add(new RowDefinition { Height = GridLength.Auto });
+                    RootGrid.Children.Add(txtType1);
+                    RootGrid.Children.Add(txtType2);
+
+                    Grid.SetRow(txtType1, RootGrid.RowDefinitions.Count - 1);
+                    Grid.SetRow(txtType2, RootGrid.RowDefinitions.Count - 1);
+                    Grid.SetColumn(txtType2, 2);
+
+                    RootGrid.RowDefinitions.Add(new RowDefinition { Height = GridLength.Auto });
+                    RootGrid.Children.Add(txtArbeit1);
+                    RootGrid.Children.Add(txtArbeit2);
+
+                    Grid.SetRow(txtArbeit1, RootGrid.RowDefinitions.Count - 1);
+                    Grid.SetRow(txtArbeit2, RootGrid.RowDefinitions.Count - 1);
+                    Grid.SetColumn(txtArbeit2, 2);
+
+
+                    RootGrid.RowDefinitions.Add(new RowDefinition { Height = GridLength.Auto });
+                    RootGrid.Children.Add(sep2);
+
+                    Grid.SetRow(sep2, RootGrid.RowDefinitions.Count - 1);
+                    Grid.SetColumnSpan(sep2, 3);
+
+                    RootGrid.RowDefinitions.Add(new RowDefinition { Height = GridLength.Auto });
+                    RootGrid.Children.Add(txtVertretung1);
+                    RootGrid.Children.Add(txtVertretung2);
+
+                    Grid.SetRow(txtVertretung1, RootGrid.RowDefinitions.Count - 1);
+                    Grid.SetRow(txtVertretung2, RootGrid.RowDefinitions.Count - 1);
+                    Grid.SetColumn(txtVertretung2, 2);
+
+                }
+            }
+            
+        }
+    }
+}

BeWo/View/Controls/DPCtrlIcon.cs

@@ -0,0 +1,68 @@
+using BS.Shared.DataContracts;
+using BS.Shared.Extensions;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Media;
+
+namespace BeWo.View.Controls
+{
+    public class DPCtrlIcon : DienstplanerControl
+    {
+        public static readonly DependencyProperty DienstValueProperty = DependencyProperty.Register(
+            "DienstValue",
+            typeof(DienstInfoDC),
+            typeof(DienstplanerControl),
+            new UIPropertyMetadata(
+                (s, e) =>
+                {
+                    var dc = (DienstInfoDC)e.NewValue;
+                    var c = (DPCtrlIcon)s;
+
+                    if (c != null)
+                    {
+                        if (dc != null)
+                        {
+                            // rgb2gray converts RGB values to grayscale values by forming a weighted sum of the R, G, and B components:
+                            // 0.2989 * R + 0.5870 * G + 0.1140 * B
+
+                            var color = ColorExtensions.FromHexStringDefault(dc.Farbe, Colors.Transparent);
+                            var brush = new SolidColorBrush(color);
+
+                            c.BorderBlack.Background = brush;
+                            c.BorderBlack.ToolTip = dc.DienstName;
+                            c.Foreground = color.IsBrighter(70) ? Brushes.Black : Brushes.White;
+                            c.Text = dc.Kurz;
+                        }
+                        else
+                        {
+                            c.BorderBlack.ToolTip = string.Empty;
+                            c.BorderBlack.Background = Brushes.White;
+                            c.Foreground = Brushes.Black;
+                            c.Text = string.Empty;
+                        }
+                    }
+                }));
+
+        public DPCtrlIcon()
+        {
+            InitializeComponent();
+
+            BorderBlack.BorderThickness = new Thickness(1);
+            BorderBlack.CornerRadius = new CornerRadius(4);
+            BorderBlack.Visibility = Visibility.Visible;
+            BorderLight.Visibility = Visibility.Hidden;
+            FontSize = 12;
+        }
+
+        public DienstInfoDC DienstValue
+        {
+            get { return (DienstInfoDC)GetValue(DienstValueProperty); }
+
+            set { SetValue(DienstValueProperty, value); }
+        }
+    }
+}

BeWo/View/Controls/DPCtrlIst.cs

@@ -0,0 +1,68 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+
+namespace BeWo.View.Controls
+{
+    public class DPCtrlIst : DienstplanerControl
+    {
+        public static readonly DependencyProperty IstInformationProperty = DependencyProperty.Register(
+            "IstInformation",
+              typeof(DPCtrlIstInformation),
+              typeof(DPCtrlIst),
+              new UIPropertyMetadata(
+                  (s, e) =>
+                  {
+                      var information = (DPCtrlIstInformation)e.NewValue;
+                      var ctrl = (DPCtrlIst)s;
+
+                      if (ctrl != null)
+                      {
+                          ctrl.Text = "";
+                          ctrl.ToolTip = "";
+
+                          if (information != null)
+                          {
+                              if (information.Row == 0 && !information.Statuszeile)
+                              {
+                                  ctrl.Text = string.Format("{0:0.00}", information.IstWert);
+                                  ctrl.ToolTip = "Ist-Wert";
+                              }
+
+                              if (information.Statuszeile)
+                                  ctrl.BorderBlack.BorderThickness = new Thickness(0, 0, 0, 2);
+                              else
+                              {
+                                  if (information.IsLastRow)
+                                      ctrl.BorderBlack.BorderThickness = new Thickness(0, 0, 0, 1.5);
+                                  else
+                                      ctrl.BorderBlack.BorderThickness = new Thickness(0, 0, 0, 0);
+                              }
+                          }
+                      }
+                  }));
+
+        public DPCtrlIst()
+        {
+            InitializeComponent();
+            //BorderBlack.BorderThickness = new Thickness(0, 0, 1, 1);
+            txt.HorizontalAlignment = HorizontalAlignment.Right;
+        }
+        public DPCtrlIstInformation IstInformation
+        {
+            get { return (DPCtrlIstInformation)GetValue(IstInformationProperty); }
+
+            set { SetValue(IstInformationProperty, value); }
+        }
+    }
+    public class DPCtrlIstInformation
+    {
+        public int Row { get; set; }
+        public bool Statuszeile { get; set; }
+        public decimal IstWert { get; set; }
+        public bool IsLastRow { get; set; }
+    }
+}

BeWo/View/Controls/DPCtrlMonth.cs

@@ -0,0 +1,83 @@
+using BS.Shared.DataContracts;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+
+namespace BeWo.View.Controls
+{
+    public class DPCtrlMonth : DienstplanerControl
+    {
+        public static readonly DependencyProperty DPCtrlMonthProperty = DependencyProperty.Register(
+            "DPCtrlMonthInformation",
+            typeof(DPCtrlMonthInformation),
+            typeof(DPCtrlMonth),
+            new UIPropertyMetadata(
+                (s, e) =>
+                {
+                    var dc = (DPCtrlMonthInformation)e.NewValue;
+                    var c = (DPCtrlMonth)s;
+
+                    if (c != null)
+                    {
+                        if (dc != null)
+                        {
+                            double res = 0.0;
+
+                            if (dc.Hours.Count != 0 || dc.Row == 2)
+                            {
+                                foreach (var stunde in dc.Hours)
+                                {
+                                    res += stunde;
+                                }
+                                c.Text = res.ToString("0.##");
+                                c.BorderBlack.BorderThickness = new Thickness(0, 0, 1, 1);
+                            }
+                            else
+                            {
+                                if (dc.Statuszeile)
+                                    c.BorderBlack.BorderThickness = new Thickness(0, 0, 1, 2);
+                                else 
+                                    c.BorderBlack.BorderThickness = new Thickness(0, 0, 1, 0);
+                                    
+                                c.Text = "";
+                            }
+                        }
+                        else
+                        {
+                            c.BorderBlack.BorderThickness = new Thickness(0, 0, 1, 0);
+
+                            c.Text = "";
+                        }
+                    }
+
+                    
+                }));
+
+        public DPCtrlMonth()
+        {
+            InitializeComponent();
+
+            BorderBlack.BorderThickness = new Thickness(1, 0, 0, 0);
+            txt.TextAlignment = TextAlignment.Left;
+            txt.HorizontalAlignment = HorizontalAlignment.Left;
+            txt.FontWeight = FontWeights.SemiBold;
+        }
+
+        public DPCtrlMonthInformation DPCtrlMonthInformation
+        {
+            get { return (DPCtrlMonthInformation)GetValue(DPCtrlMonthProperty); }
+
+            set { SetValue(DPCtrlMonthProperty, value); }
+        }
+    }
+
+    public class DPCtrlMonthInformation
+    {
+        public List<double> Hours { get; set; }
+        public int Row { get; set; }
+        public bool Statuszeile { get; set; }
+    }
+}

BeWo/View/Controls/DPCtrlSaldo.cs

@@ -0,0 +1,67 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+
+namespace BeWo.View.Controls
+{
+    public class DPCtrlSaldo : DienstplanerControl
+    {
+        public static readonly DependencyProperty SaldoInformationProperty = DependencyProperty.Register(
+            "SaldoInformation",
+              typeof(DPCtrlSaldoInformation),
+              typeof(DPCtrlSaldo),
+              new UIPropertyMetadata(
+                  (s, e) =>
+                  {
+                      var information = (DPCtrlSaldoInformation)e.NewValue;
+                      var ctrl = (DPCtrlSaldo)s;
+
+                      if (ctrl != null)
+                      {
+                          ctrl.Text = "";
+                          ctrl.ToolTip = "";
+
+                          if (information != null)
+                          {
+                              if (information.Row == 0 && !information.Statuszeile)
+                              {
+                                  ctrl.Text = string.Format("{0:0.00}", information.SaldoWert);
+                                  ctrl.ToolTip = "Saldo-Wert";
+                              }
+
+                              if (information.Statuszeile)
+                                  ctrl.BorderBlack.BorderThickness = new Thickness(0, 0, 1, 2);
+                              else
+                              {
+                                  if (information.IsLastRow)
+                                      ctrl.BorderBlack.BorderThickness = new Thickness(0, 0, 1, 1.5);
+                                  else
+                                      ctrl.BorderBlack.BorderThickness = new Thickness(0, 0, 1, 0);
+                              }
+                          }
+                      }
+                  }));
+        public DPCtrlSaldo()
+        {
+            InitializeComponent();
+            //BorderBlack.BorderThickness = new Thickness(0, 0, 1, 1);
+            txt.HorizontalAlignment = HorizontalAlignment.Right;
+        }
+        public DPCtrlSaldoInformation SaldoInformation
+        {
+            get { return (DPCtrlSaldoInformation)GetValue(SaldoInformationProperty); }
+
+            set { SetValue(SaldoInformationProperty, value); }
+        }
+    }
+    public class DPCtrlSaldoInformation
+    {
+        public int Row { get; set; }
+        public bool Statuszeile { get; set; }
+        public decimal SaldoWert { get; set; }
+        public bool IsLastRow { get; set; }
+    }
+}

BeWo/View/Controls/DPCtrlSoll.cs

@@ -0,0 +1,76 @@
+using BS.Shared.DataContracts;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+
+
+namespace BeWo.View.Controls
+{
+    public class DPCtrlSoll : DienstplanerControl
+    {
+        public static readonly DependencyProperty SollInformationProperty = DependencyProperty.Register(
+            "SollInformation",
+              typeof(DPCtrlSollInformation),
+              typeof(DPCtrlSoll),
+              new UIPropertyMetadata(
+                  (s, e) =>
+                  {
+                      var information = (DPCtrlSollInformation)e.NewValue;
+                      var ctrl = (DPCtrlSoll)s;
+
+                      
+                      if (ctrl != null)
+                      {
+                          ctrl.Text = "";
+                          ctrl.ToolTip = "";
+
+                          if (information != null)
+                          {
+                              Debug.WriteLine("Status: " + information.Statuszeile + " | MA: " + information.EmployeeDC + " | Soll: " + information.SollWert);
+                              if (information.Row == 0 && !information.Statuszeile)
+                              {
+                                  ctrl.Text = string.Format("{0:0.00}", information.SollWert);
+                                  ctrl.ToolTip = "Soll-Wert";
+                                  
+                              }
+                              
+                              if (information.Statuszeile)
+                                  ctrl.BorderBlack.BorderThickness = new Thickness(0, 0, 0, 2);
+                              else
+                              {
+                                  if (information.IsLastRow)
+                                      ctrl.BorderBlack.BorderThickness = new Thickness(0, 0, 0, 1.5);
+                                  else
+                                      ctrl.BorderBlack.BorderThickness = new Thickness(0, 0, 0, 0);
+                              }
+                          }
+                      }
+                  }));
+
+        public DPCtrlSoll()
+        {
+            InitializeComponent();
+            //BorderBlack.BorderThickness = new Thickness(0, 0, 1, 1);
+            txt.HorizontalAlignment = HorizontalAlignment.Right;
+        }
+        public DPCtrlSollInformation SollInformation
+        {
+            get { return (DPCtrlSollInformation)GetValue(SollInformationProperty); }
+
+            set { SetValue(SollInformationProperty, value); }
+        }
+    }
+    public class DPCtrlSollInformation
+    {
+        public int Row { get; set; }
+        public bool Statuszeile { get; set; }
+        public decimal SollWert { get; set; }
+        public bool IsLastRow { get; set; }
+        public EmployeeDC EmployeeDC { get; set; }
+    }
+
+}

BeWo/View/Controls/DPCtrlUrlaubKrankheit.cs

@@ -0,0 +1,88 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+
+namespace BeWo.View.Controls
+{
+    public class DPCtrlUrlaubKrankheit : DienstplanerControl
+    {
+        public static readonly DependencyProperty UrlaubKrankheitInformationProperty = DependencyProperty.Register(
+           "UrlaubKrankheitInformation",
+             typeof(DPCtrlUrlaubKrankheitInformation),
+             typeof(DPCtrlUrlaubKrankheit),
+             new UIPropertyMetadata(
+                 (s, e) =>
+                 {
+                     var information = (DPCtrlUrlaubKrankheitInformation)e.NewValue;
+                     var ctrl = (DPCtrlUrlaubKrankheit)s;
+
+                     if (ctrl != null)
+                     {
+                         ctrl.Text = "";
+                         ctrl.ToolTip = "";
+
+                         if (information != null)
+                         {
+                             if (information.SpalteFuerUrlaub)
+                             {
+                                 if (information.IsLastRow)
+                                 {
+                                     ctrl.BorderBlack.BorderThickness = new Thickness(0, 0, 0, 1.5);
+                                 }
+                                 else
+                                 {
+                                     if (information.Statuszeile)
+                                         ctrl.BorderBlack.BorderThickness = new Thickness(0, 0, 0, 2);
+                                     else
+                                         ctrl.BorderBlack.BorderThickness = new Thickness(0, 0, 0, 0);
+                                 }
+                             }
+                             else
+                             {
+                                 if (information.IsLastRow)
+                                 {
+                                     ctrl.BorderBlack.BorderThickness = new Thickness(0, 0, 1, 1.5);
+                                 }
+                                 else
+                                 {
+                                     if (information.Statuszeile)
+                                         ctrl.BorderBlack.BorderThickness = new Thickness(0, 0, 1, 2);
+                                     else
+                                         ctrl.BorderBlack.BorderThickness = new Thickness(0, 0, 1, 0);
+                                 }
+                             }
+
+                             if(information.Row == 0 && !information.Statuszeile)
+                             {
+                                 ctrl.Text = string.Format("{0:0.00}", information.SummeTage);
+                                 ctrl.ToolTip = "Abwesenheiten an Wochenend- und Feiertagen werden nicht mitgezählt.";
+                             }
+                         }
+                     }
+                 }));
+
+        public DPCtrlUrlaubKrankheit()
+        {
+            InitializeComponent();
+            txt.HorizontalAlignment = HorizontalAlignment.Right;
+        }
+
+        public DPCtrlUrlaubKrankheitInformation UrlaubKrankheitInformation
+        {
+            get { return (DPCtrlUrlaubKrankheitInformation)GetValue(UrlaubKrankheitInformationProperty); }
+            set { SetValue(UrlaubKrankheitInformationProperty, value); }
+        }
+    }
+
+    public class DPCtrlUrlaubKrankheitInformation
+    {
+        public bool Statuszeile { get; set; }
+        public int Row { get; set; }
+        public bool SpalteFuerUrlaub { get; set; }
+        public decimal SummeTage { get; set; }
+        public bool IsLastRow { get; set; }
+    }
+}

BeWo/View/Controls/DPCtrlWeek.cs

@@ -0,0 +1,92 @@
+using BS.Shared.DataContracts;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+
+namespace BeWo.View.Controls
+{
+    public class DPCtrlWeek : DienstplanerControl
+    {
+        public static readonly DependencyProperty DPCtrlWeekProperty = DependencyProperty.Register(
+              "DPCtrlWeekInformation",
+              typeof(DPCtrlWeekInformation),
+              typeof(DPCtrlWeek),
+              new UIPropertyMetadata(
+                  (s, e) =>
+                  {
+                      var dc = (DPCtrlWeekInformation)e.NewValue;
+                      var c = (DPCtrlWeek)s;
+
+                      if (c != null)
+                      {
+                          c.Text = "";
+                          c.ToolTip = "";
+                          if (dc != null)
+                          {
+                              //dc.RemoveAll(x => x == null);
+                              if (!dc.IsLastRow)
+                                  c.BorderBlack.BorderThickness = new Thickness(0, 0, 1, 0);
+                              else
+                                  c.BorderBlack.BorderThickness = new Thickness(0, 0, 1, 1.5 );
+
+                              double res = 0.0;
+
+                              if(!dc.Statuszeile)
+                              {
+                                  if (dc.Hours.Count != 0 || dc.Row == 0)
+                                  {
+                                      foreach (var dauer in dc.Hours)
+                                      {
+                                          res += dauer;
+                                      }
+                                      c.Text = res.ToString("0.##");
+                                  }
+                              }
+                              else
+                              {
+                                  if(dc.Statuszeile)
+                                    c.BorderBlack.BorderThickness = new Thickness(0, 0, 1, 2);
+                                  else
+                                    c.BorderBlack.BorderThickness = new Thickness(0, 0, 1, 0);
+                                  
+                                  c.Text = "";
+                              }
+                          }
+                          else
+                          {
+                              c.BorderBlack.BorderThickness = new Thickness(0, 0, 1, 1);
+
+                              c.Text = "";
+                          }
+                      }
+                  }));
+
+        public DPCtrlWeek()
+        {
+            InitializeComponent();
+
+            BorderBlack.BorderThickness = new Thickness(0, 0, 1, 0);
+            txt.TextAlignment = TextAlignment.Left;
+            txt.HorizontalAlignment = HorizontalAlignment.Left;
+
+        }
+
+        public DPCtrlWeekInformation DPCtrlWeekInformation
+        {
+            get { return (DPCtrlWeekInformation)GetValue(DPCtrlWeekProperty); }
+
+            set { SetValue(DPCtrlWeekProperty, value); }
+        }
+    }
+
+    public class DPCtrlWeekInformation
+    {
+        public List<double> Hours { get; set; }
+        public bool Statuszeile { get; set; }
+        public int Row { get; set; }
+        public bool IsLastRow { get; set; }
+    }
+}

BeWo/View/Controls/DPCtrlZeitkonto.cs

@@ -0,0 +1,73 @@
+using BS.Shared.DataContracts;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+
+namespace BeWo.View.Controls
+{
+    public class DPCtrlZeitkonto : DienstplanerControl
+    {
+        public static readonly DependencyProperty ZeitkontoInformationProperty = DependencyProperty.Register(
+            "ZeitkontoInformation",
+              typeof(DPCtrlZeitkontoInformation),
+              typeof(DPCtrlZeitkonto),
+              new UIPropertyMetadata(
+                  (s, e) =>
+                  {
+                      var information = (DPCtrlZeitkontoInformation)e.NewValue;
+                      var ctrl = (DPCtrlZeitkonto)s;
+
+                      if (ctrl != null)
+                      {
+                          if (information != null)
+                          {
+                              if (information.IsLastRow)
+                                  ctrl.BorderBlack.BorderThickness = new Thickness(0, 0, 1, 1);
+                              else
+                              {
+                                  if (information.Statuszeile)
+                                      ctrl.BorderBlack.BorderThickness = new Thickness(0, 0, 0, 2);
+                                  else
+                                  {
+                                      ctrl.BorderBlack.BorderThickness = new Thickness(0, 0, 1, 0);
+                                      if (information.Row == 0)
+                                      {
+                                          ctrl.Text = string.Format("{0:0.00}", information.Monatszusammenfassung.ZeitkontoLetzterMonat);
+                                          ctrl.ToolTip = "Zeitkonto Vormonat";
+                                      }
+                                      else if (information.Row == 1)
+                                      {
+                                          ctrl.Text = string.Format("{0:0.00}", information.Monatszusammenfassung.ZeitkontoAktualisiert);
+                                          ctrl.ToolTip = "Zeitkonto dieser Monat";
+                                      }
+                                  }
+
+                              }
+                          }
+                      }
+                  }));
+
+        public DPCtrlZeitkonto()
+        {
+            InitializeComponent();
+            //BorderBlack.BorderThickness = new Thickness(0, 0, 1, 1);
+            txt.HorizontalAlignment = HorizontalAlignment.Right;
+        }
+        public DPCtrlZeitkontoInformation ZeitkontoInformation
+        {
+            get { return (DPCtrlZeitkontoInformation)GetValue(ZeitkontoInformationProperty); }
+
+            set { SetValue(ZeitkontoInformationProperty, value); }
+        }
+    }
+    public class DPCtrlZeitkontoInformation
+    {
+        public int Row { get; set; }
+        public bool Statuszeile { get; set; }
+        public DienstplanerMonthlySummaryDC Monatszusammenfassung { get; set;}
+        public bool IsLastRow { get; set; }
+    }
+}

BeWo/View/Controls/DienstplanerControl.xaml

@@ -0,0 +1,26 @@
+<UserControl x:Class="BeWo.View.Controls.DienstplanerControl" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Grid>
+        <Border x:Name="boLight" IsHitTestVisible="True" Background="White" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" BorderThickness="0 0 1 1" BorderBrush="#FFBFBFBF" />
+        <Border x:Name="bo" IsHitTestVisible="True" Background="Transparent" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" BorderThickness="0 0 0 0" BorderBrush="#FF000000" >
+            <Rectangle x:Name="Path_Notice" Visibility="Collapsed" Fill="Black" Margin="15,-50,-8,-15" RenderTransformOrigin="0.5,0.5">
+                <Rectangle.RenderTransform>
+                    <TransformGroup>
+                        <ScaleTransform/>
+                        <SkewTransform/>
+                        <RotateTransform Angle="-45"/>
+                        <TranslateTransform/>
+                    </TransformGroup>
+                </Rectangle.RenderTransform>
+            </Rectangle>
+        </Border>
+        <TextBlock Name="txt" FontSize="15" Margin="3" HorizontalAlignment="Center" VerticalAlignment="Center" />
+        <!--<Path
+            x:Name="Path_Notice"
+            HorizontalAlignment="Center"
+            VerticalAlignment="Center"
+            Fill="Black"
+            Data="M 22,1 L 27,1 L 27,5" Margin="21.031,0,0.804,20.416" Stretch="Fill" Width="6" Height="6"
+            Visibility="Collapsed"
+		/>-->
+    </Grid>
+</UserControl>

BeWo/View/Controls/DienstplanerControl.xaml.cs

@@ -0,0 +1,50 @@
+using System;
+using System.Collections.Generic;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using System.Windows.Media;
+using BeWo.View.Detail;
+using BeWo.View.Detail.Report;
+using BeWo.ViewModel;
+using BS.Shared.DataContracts;
+
+namespace BeWo.View.Controls
+{
+    /// <summary>
+    ///     Interaction logic for DienstplanerControl.xaml
+    /// </summary>
+    public partial class DienstplanerControl : UserControl
+    {
+        public DienstplanerControl()
+        {
+            InitializeComponent();
+
+            ToolTipService.SetShowDuration(this, 60000);
+        }
+
+        public string Text
+        {
+            get => txt.Text;
+            set => txt.Text = value;
+        }
+        
+        public new double FontSize
+        {
+            get => txt.FontSize;
+            set => txt.FontSize = value;
+        }
+
+        public Border BorderLight
+        {
+            get => boLight;
+            set => boLight = value;
+        }
+
+        public Border BorderBlack
+        {
+            get => bo;
+            set => bo = value;
+        }
+    }
+}

BeWo/View/Controls/GoalRatingControl.xaml.cs

@@ -9,6 +9,8 @@ using System.Linq;
 using System.Text;
 using System.Windows;
 using System.Windows.Controls;
+using BeWo.Core.Service;
+using BS.Shared.DataContracts;
 using BS.Shared.DataContracts.ClientPartials;
 using BS.Shared.Translation;
 using DevExpress.Data.Helpers;
@@ -26,29 +28,17 @@ namespace BeWo.View.Controls
         public event Action CancelButtonClicked;
         public event Action ActionButtonClicked;
 
-        private List<GoalRating> _Ratings;
         
         public GoalRatingControl()
         {
             InitializeComponent();
-            InitRatings();
-            ColumnRating.EditSettings = new ComboBoxEditSettings { ItemsSource = _Ratings, IsTextEditable = false };
+
+            
+            ColumnRating.EditSettings = new ComboBoxEditSettings { ItemsSource = Cache.GetInstance().GetAllRatingTypeList(), IsTextEditable = false };
             IsDirty = false;
         }
-
-        private void InitRatings()
-        {
-            _Ratings = new List<GoalRating>();
-            _Ratings.Add(new GoalRating { RatingValue = -1, RatingName = "Keine Bewertung"});
-            _Ratings.Add(new GoalRating { RatingValue = 0, RatingName = "xxx.0 - Problem nicht vorhanden (ohne, kein, unerheblich ...) 0 bis 4 %" });
-            _Ratings.Add(new GoalRating { RatingValue = 1, RatingName = "xxx.1 - Problem leicht ausgeprägt (schwach, gering ...) 5 bis 24 %" });
-            _Ratings.Add(new GoalRating { RatingValue = 2, RatingName = "xxx.2 - Problem mäßig ausgeprägt (mittel, ziemlich ...) 25 bis 49 %" });
-            _Ratings.Add(new GoalRating { RatingValue = 3, RatingName = "xxx.3 - Problem erheblich ausgeprägt (hoch, äußerst ...) 50 bis 95 %" });
-            _Ratings.Add(new GoalRating { RatingValue = 4, RatingName = "xxx.4 - Problem voll ausgeprägt (komplett, total ...) 96 bis 100 %" });
-            _Ratings.Add(new GoalRating { RatingValue = 8, RatingName = "xxx.8 - Nicht spezifiziert" });
-            _Ratings.Add(new GoalRating { RatingValue = 9, RatingName = "xxx.9 - Nicht anwendbar" });
-        }
-
+        
+        
         public List<SupportConceptGoalDC> Goals
         {
             get { return _Goals;}
@@ -69,7 +59,7 @@ namespace BeWo.View.Controls
                 entry.Name = goal.DetailDescription;
                 if (goal.HasRating)
                 {
-                    entry.GoalRating = _Ratings.FirstOrDefault(r => r.RatingValue == goal.GoalEntryDC.Rating.Value);
+                    entry.RatingType = Cache.GetInstance().GetAllRatingTypeList().FirstOrDefault(r => r.RatingTypeOid == goal.GoalEntryDC.RatingTypeOid);
                 }
 
                 entries.Add(entry);
@@ -120,13 +110,13 @@ namespace BeWo.View.Controls
         {
             foreach (var e in Entries)
             {
-                if (e.GoalRating != null)
+                if (e.RatingType != null)
                 {
-                    e.Goal.SetRating(e.GoalRating.RatingValue);
+                    e.Goal.SetRatingType(e.RatingType);
                 }
                 else
                 {
-                    e.Goal.SetRating(null);
+                    e.Goal.SetRatingType(null);
                 }
             }
         }
@@ -137,34 +127,7 @@ namespace BeWo.View.Controls
     {
         public SupportConceptGoalDC Goal { get; set; }
         public String Name { get; set; }
-        public GoalRating GoalRating { get; set; }
-    }
-
-    public class GoalRating
-    {
-        public int RatingValue { get; set; }
-        public String RatingName { get; set; }
-
-        public override string ToString()
-        {
-            return RatingName;
-        }
-
-        public override bool Equals(object obj)
-        {
-            var gr = obj as GoalRating;
-
-            if (gr != null)
-            {
-                return this.RatingName.Equals(((GoalRating) obj).RatingName);
-            }
-
-            return false;
-        }
-
-        public override int GetHashCode()
-        {
-            return RatingName.GetHashCode();
-        }
+        public RatingTypeDC RatingType { get; set; }
     }
+    
 }

BeWo/View/Controls/ListboxSelectControl.xaml

@@ -18,8 +18,9 @@
       <RowDefinition Height="*" />
       <RowDefinition Height="Auto" />
     </Grid.RowDefinitions>
-    <ListBox x:Name="Listbox" Grid.ColumnSpan="3" Margin="3, 3, 3, 0" SelectionMode="Single"/>
-    <Button x:Name="CancelButton" Grid.Row="1" Grid.Column="1" Content="Abbrechen" Margin="3" Click="CancelButton_Click"/>
-    <Button x:Name="SelectButton" Grid.Row="1" Grid.Column="2" Content="Auswählen" Margin="3" Click="SelectButton_Click"/>
+    <ListBox x:Name="Listbox" Grid.ColumnSpan="3" Margin="3, 3, 3, 0" SelectionMode="Single" FontSize="14" MouseDoubleClick="Listbox_OnMouseDoubleClick"/>
+      <Button x:Name="SelectButton" Grid.Row="1" Grid.Column="1" Content=" Auswählen " Margin="3" Click="SelectButton_Click"/>
+    <Button x:Name="CancelButton" Grid.Row="1" Grid.Column="2" Content=" Abbrechen " Margin="3" Click="CancelButton_Click"/>
+    
   </Grid>
 </UserControl>

BeWo/View/Controls/ListboxSelectControl.xaml.cs

@@ -6,6 +6,7 @@ using System.Linq;
 using System.Web.UI.WebControls;
 using System.Windows;
 using System.Windows.Documents;
+using System.Windows.Input;
 using BeWo.Annotations;
 
 using BS.Shared;
@@ -42,5 +43,10 @@ namespace BeWo.View.Controls
         {
             SelectButtonClicked?.Invoke();
         }
+
+        private void Listbox_OnMouseDoubleClick(object sender, MouseButtonEventArgs e)
+        {
+            SelectButtonClicked?.Invoke();
+        }
     }
 }

BeWo/View/Controls/MonthPicker.xaml

@@ -0,0 +1,11 @@
+<UserControl x:Class="BeWo.View.Controls.MonthPicker" 
+             xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*"></ColumnDefinition>
+        </Grid.ColumnDefinitions>
+      <dxe:ComboBoxEdit x:Name="_MonthPicker" IsManipulationEnabled="False" IsTextEditable="False" HorizontalAlignment="Stretch"/>
+    </Grid>
+</UserControl>

BeWo/View/Controls/MonthPicker.xaml.cs

@@ -0,0 +1,39 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using System.Windows.Media;
+using BeWo.View.Detail;
+using BeWo.View.Detail.Report;
+using BeWo.ViewModel;
+using BS.Shared.DataContracts;
+
+namespace BeWo.View.Controls
+{
+    /// <summary>
+    ///     Interaction logic for MonthPicker.xaml
+    /// </summary>
+    public partial class MonthPicker : UserControl
+    {
+        public MonthPicker()
+        {
+            InitializeComponent();
+            _MonthPicker.ItemsSource = DateTimeFormatInfo.CurrentInfo.MonthNames.Where(s => !string.IsNullOrEmpty(s));
+            _MonthPicker.SelectedIndex = 0;
+        }
+        
+        public int SelectedMonth
+        {
+            get => _MonthPicker.SelectedIndex + 1;
+            set => _MonthPicker.SelectedIndex = value - 1;
+        }
+
+        public string SelectedMonthName
+        {
+            get => (string)_MonthPicker.SelectedItem;
+        }
+    }
+}