From ad42184e6b8cc9e45c95d7a5aa88d73b2f1a734d Mon Sep 17 00:00:00 2001
From: Christian <christian.baeurle@beyondsoft.de>
Date: Tue, 25 Apr 2017 18:07:24 +0200
Subject: [PATCH] Diverses

---
 BeWo/LoginControl.xaml.cs                     |  2 +-
 .../MitarbeiterverfuegbarkeitsinfoView.xaml   |  4 +-
 ...MitarbeiterverfuegbarkeitsinfoView.xaml.cs |  2 +-
 BeWo/Scheduler/View/NewSchedulerView.xaml.cs  |  2 +-
 BeWo/View/Detail/CustomerView.xaml            | 36 ++++++-------
 .../SupportConceptsAnalysisView.xaml.cs       | 27 ++++++++--
 Service/Plugins/DataImporter.cs               |  2 +-
 Service/Plugins/IpAddressChecker.cs           | 33 ++++++++++++
 Service/Plugins/PluginLoader.cs               |  4 +-
 Service/Plugins/ServiceRecordValidator.cs     | 51 ++++++++++++++++++-
 Service/Service.csproj                        |  1 +
 .../DownloadServiceImp.cs                     |  1 +
 .../StreamingServiceImp.cs                    |  4 ++
 Shared/BeWoEntityEnums.cs                     | 13 +++--
 Shared/Core/EnumTranslations.cs               | 10 +++-
 15 files changed, 153 insertions(+), 39 deletions(-)
 create mode 100644 Service/Plugins/IpAddressChecker.cs

diff --git a/BeWo/LoginControl.xaml.cs b/BeWo/LoginControl.xaml.cs
index 8c01ff6ad..66c9ca130 100644
--- a/BeWo/LoginControl.xaml.cs
+++ b/BeWo/LoginControl.xaml.cs
@@ -380,7 +380,7 @@ namespace BeWo
 //Nur Testdaten. Weiß gar nicht mehr so genau wofür das gut war…
 //https://bewoplaner.beyondsoft.de/getcontractstate.php?CustomerID=1234567890
 
-				String url = String.Format("https://bewoplaner.beyondsoft.de/getserver.php?CustomerID={0}", tenant);
+				String url = String.Format("https://support.bewoplaner.de/api/getserver.php?k={0}", tenant);
 				using (WebClient client = new WebClient())
 				{
 					//MessageBox.Show(hostAddress);
diff --git a/BeWo/Scheduler/View/MitarbeiterverfuegbarkeitsinfoView.xaml b/BeWo/Scheduler/View/MitarbeiterverfuegbarkeitsinfoView.xaml
index 2a2b9c853..5acc15e04 100644
--- a/BeWo/Scheduler/View/MitarbeiterverfuegbarkeitsinfoView.xaml
+++ b/BeWo/Scheduler/View/MitarbeiterverfuegbarkeitsinfoView.xaml
@@ -18,8 +18,8 @@
 				</Grid.RowDefinitions>
 				<dxg:GridControl DataSource="{Binding Verfuegbarkeiten}">
 					<dxg:GridControl.Columns>
-						<dxg:GridColumn FieldName="Mitarbeiter" Header="Mitarbeiter" />
-						<dxg:GridColumn FieldName="Ueberstunden" Header="Überstunden">
+						<dxg:GridColumn FieldName="Mitarbeiter" Header="Mitarbeiter" AllowEditing="False" />
+						<dxg:GridColumn FieldName="Ueberstunden" Header="Überstunden" AllowEditing="False">
 							<dxg:GridColumn.EditSettings>
 								<dxe:TextEditSettings MaskUseAsDisplayFormat="True" Mask="########0.00" MaskType="Numeric" />
 							</dxg:GridColumn.EditSettings>
diff --git a/BeWo/Scheduler/View/MitarbeiterverfuegbarkeitsinfoView.xaml.cs b/BeWo/Scheduler/View/MitarbeiterverfuegbarkeitsinfoView.xaml.cs
index 329363101..ea077306d 100644
--- a/BeWo/Scheduler/View/MitarbeiterverfuegbarkeitsinfoView.xaml.cs
+++ b/BeWo/Scheduler/View/MitarbeiterverfuegbarkeitsinfoView.xaml.cs
@@ -14,7 +14,7 @@ namespace BeWo.Scheduler.View
 			InitializeComponent();
 			root.DataContext = this;
 
-			rootGroupBox.Header = String.Format("Mitarbeiterverfügbarkeiten für den Zeitraum vom {0} bis {1}", pStart.ToString("dd.MM.yyyy hh:mm"), pEnde.ToString("dd.MM.yyyy hh:mm"));
+			rootGroupBox.Header = String.Format("Verfügbarkeit vom {0} bis {1}", pStart.ToString("dd.MM.yy HH:mm"), pEnde.ToString("dd.MM.yy HH:mm"));
 
 			Verfuegbarkeiten = new List<MitarbeiterVerfuegbarkeitsstruct>();
 			pMitarbeiterZuUeberstunden.DoForEach(kvp => Verfuegbarkeiten.Add(new MitarbeiterVerfuegbarkeitsstruct(kvp.Key, kvp.Value)));
diff --git a/BeWo/Scheduler/View/NewSchedulerView.xaml.cs b/BeWo/Scheduler/View/NewSchedulerView.xaml.cs
index 142938937..a2f1ee6d5 100644
--- a/BeWo/Scheduler/View/NewSchedulerView.xaml.cs
+++ b/BeWo/Scheduler/View/NewSchedulerView.xaml.cs
@@ -1719,7 +1719,7 @@ namespace BeWo.Scheduler.View
 
 														popup_content.Child = mviv;
 														popup_content.Height = 400;
-														popup_content.Width = 400;
+														popup_content.Width = 450;
 														popup_content.Visibility = Visibility.Visible;
 													})));
 		}
diff --git a/BeWo/View/Detail/CustomerView.xaml b/BeWo/View/Detail/CustomerView.xaml
index e8cb067ef..2a80b87d6 100644
--- a/BeWo/View/Detail/CustomerView.xaml
+++ b/BeWo/View/Detail/CustomerView.xaml
@@ -776,7 +776,7 @@
                       <ColumnDefinition Width="*" />
                     </Grid.ColumnDefinitions>
                     <Label x:Name="lbl_medication" Margin="3" Grid.Row="1" VerticalAlignment="Top" Content="Medikation" />
-                    <TextBox x:Name="tb_medication" Margin="3" Height="100" Grid.Column="1" Grid.Row="1"
+                                        <TextBox x:Name="tb_medication" Margin="3" MinHeight="40" MaxHeight="200" Grid.Column="1" Grid.Row="1"
 										         VerticalScrollBarVisibility="Auto" AcceptsReturn="True"
 										         Text="{Binding Path=Medication, UpdateSourceTrigger=PropertyChanged}" TextWrapping="Wrap" />
                     <Label x:Name="lbl_diag" Grid.Column="0" Grid.Row="2" Margin="3" VerticalAlignment="Top"
@@ -894,7 +894,7 @@
                         </Grid.RowDefinitions>
 
                         <Label Grid.Column="0" Grid.Row="0" Content="Aust. Vers. -amt" VerticalAlignment="Center" HorizontalAlignment="Left" />
-                        <TextBox Grid.Column="1" Grid.Row="0" Margin="3" Height="23" Width="100" Text="{Binding Path=AusstVersAmt, UpdateSourceTrigger=PropertyChanged}" />
+                        <TextBox Grid.Column="1" Grid.Row="0" Margin="3" Height="23" Width="150" Text="{Binding Path=AusstVersAmt, UpdateSourceTrigger=PropertyChanged}" />
 
                         <Label Grid.Column="0" Grid.Row="1" Content="Ausweis unbefristet gültig" VerticalAlignment="Center" />
                         <CheckBox Grid.Column="1" Grid.Row="1" Margin="3,5,3,1" Height="23" x:Name="AusweisUnbefristetCheckBox"
@@ -903,29 +903,29 @@
 
                         <Label Grid.Column="0" Grid.Row="2" Content="Ausweis gültig von" VerticalAlignment="Center" />
                         <dxe:DateEdit Grid.Column="1" Grid.Row="2" AllowNullInput="True" Height="23" Margin="3"
-															  Width="100" HorizontalAlignment="Left" MaskType="DateTimeAdvancingCaret"
+															  Width="150" HorizontalAlignment="Left" MaskType="DateTimeAdvancingCaret"
                                                               EditValue="{Binding Path=AusweisGueltigVon, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
 
                         <Label Grid.Column="0" Grid.Row="3" Content="Ausweis gültig bis" VerticalAlignment="Center" />
                         <dxe:DateEdit Grid.Column="1" Grid.Row="3" AllowNullInput="True" Height="23" Margin="3"
-															  Width="100" HorizontalAlignment="Left" MaskType="DateTimeAdvancingCaret"
+															  Width="150" HorizontalAlignment="Left" MaskType="DateTimeAdvancingCaret"
                                                               EditValue="{Binding Path=AusweisGueltigBis, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
 															  IsEnabled="{Binding ElementName=AusweisUnbefristetCheckBox, Path=IsChecked, Converter={StaticResource BoolReverseConverter}}" />
 
                         <Label Grid.Column="2" Grid.Row="0" Content="Beiblatt gültig bis" VerticalAlignment="Center" />
                         <dxe:DateEdit Grid.Column="3" Grid.Row="0" AllowNullInput="True" Height="23" Margin="3"
                                                               EditValue="{Binding Path=BeiblattGueltigBis, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
-															  Width="100" HorizontalAlignment="Left" MaskType="DateTimeAdvancingCaret" />
+															  Width="150" HorizontalAlignment="Left" MaskType="DateTimeAdvancingCaret" />
 
                         <Label Grid.Column="2" Grid.Row="1" Content="Grad der Behinderung" VerticalAlignment="Center" />
-                        <ComboBox Grid.Column="3" Grid.Row="1" Height="23" Margin="3" x:Name="GdBComboBox" Width="100" SelectionChanged="GdBComboBox_OnSelectionChanged"/>
+                                                <ComboBox Grid.Column="3" Grid.Row="1" Height="23" Margin="3" x:Name="GdBComboBox" Width="150" SelectionChanged="GdBComboBox_OnSelectionChanged"/>
 
                         <Label Grid.Column="2" Grid.Row="2" Content="Merkzeichen" VerticalAlignment="Center" />
                         <uc:PopUpEdit IsReadOnly="True"
                                                               DeleteButtonVisibility="Collapsed"
                                                               PopUpClick="popupedit_merkzeichen_PopUpClick"
                                                               HorizontalAlignment="Stretch"
-                                                              HorizontalContentAlignment="Stretch" Height="23" Width="100" Grid.Column="3" Grid.Row="2" Margin="3"
+                                                              HorizontalContentAlignment="Stretch" Height="23" Width="150" Grid.Column="3" Grid.Row="2" Margin="3"
 															  Text="{Binding ElementName=MerkzeichenSelection, Path=AusgewaehlteMerkzeichenString}"
 															  ToolTip="{Binding ElementName=MerkzeichenSelection, Path=AusgewaehlteMerkzeichenString}"
                                                               Cursor="Arrow" />
@@ -935,13 +935,13 @@
                                       DeleteButtonVisibility="Collapsed"
                                       PopUpClick="popupedit_behinderungsarten_PopUpClick"
                                       HorizontalAlignment="Stretch"
-                                      HorizontalContentAlignment="Stretch" Height="23" Width="100" Grid.Column="3" Grid.Row="3" Margin="3"
+                                      HorizontalContentAlignment="Stretch" Height="23" Width="150" Grid.Column="3" Grid.Row="3" Margin="3"
         Text="{Binding ElementName=BehinderungsartenSelection, Path=AusgewaehlteBehinderungsartenString}"
         ToolTip="{Binding ElementName=BehinderungsartenSelection, Path=AusgewaehlteBehinderungsartenString}"
                                       Cursor="Arrow" />
 
                         <Label Grid.Column="4" Grid.Row="0" Content="Pflegegrad" VerticalAlignment="Center" />
-                        <uc:NullItemComboBox Grid.Column="5" Grid.Row="0" Margin="3" Height="23" Width="100"
+                                                <uc:NullItemComboBox Grid.Column="5" Grid.Row="0" Margin="3" Height="23" Width="150"
                                        ItemsSource="{x:Static core:EnumTranslations.PflegegradTranslations}"
                                        SelectedValue="{Binding Path=Pflegegrad}" DisplayMemberPath="Value"
                                        SelectedValuePath="Key" />
@@ -963,7 +963,7 @@
                     <RowDefinition Height="*" />
                   </Grid.RowDefinitions>
                   <GroupBox x:Name="groupbox_customerCareType" Header="Betreuung" Style="{StaticResource ObjectEditGroupBox}">
-                    <Grid>
+                    <Grid IsSharedSizeScope="True">
                       <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="Auto" />
                         <ColumnDefinition Width="Auto" />
@@ -1012,9 +1012,9 @@
 
 
                       <Label Content="Betreuungsart" Grid.Column="2"/>
-                      <ListBox Grid.Row="1" Grid.RowSpan="3" Grid.Column="2" IsSynchronizedWithCurrentItem="True" x:Name="customerCareTypeList"
-											         Margin="3" Height="Auto" Padding="3,3,3,3" Width="Auto" HorizontalAlignment="Left" MinWidth="200"
-											         MinHeight="20" MaxHeight="65" />
+                      <ListBox Grid.Row="1" Grid.RowSpan="4" Grid.Column="2" IsSynchronizedWithCurrentItem="True" x:Name="customerCareTypeList"
+											         Margin="3" Height="Auto" Padding="3,3,3,3" Width="Auto" HorizontalAlignment="Left" MinWidth="200" VerticalAlignment="Top"
+											         MinHeight="52" MaxHeight="65" />
 
                       <StackPanel Orientation="Horizontal" Grid.Row="0" Grid.Column="3">
                         <Label Content="Vermittlung" />
@@ -1032,10 +1032,10 @@
                         </Button>
                       </StackPanel>
 
-                      <ListBox Grid.Column="3" Grid.Row="1" Grid.RowSpan="3" IsSynchronizedWithCurrentItem="True"
+                      <ListBox Grid.Column="3" Grid.Row="1" Grid.RowSpan="4" IsSynchronizedWithCurrentItem="True"
 											         x:Name="placementListBox" ItemsSource="{Binding Path=PlacementList.VMList, Mode=OneWay}" Margin="3"
 											         Height="Auto" Padding="3,3,3,3" Width="Auto" HorizontalAlignment="Left" MinWidth="200"
-											         MinHeight="20" MaxHeight="65">
+											         MinHeight="20" MaxHeight="200">
                         <ListBox.ItemContainerStyle>
                           <Style TargetType="{x:Type ListBoxItem}">
                             <Setter Property="Margin" Value="2" />
@@ -1045,11 +1045,11 @@
 
                         <ListBox.ItemTemplate>
                           <DataTemplate>
-                            <Grid x:Name="ItemGrid" Grid.Row="2" Grid.ColumnSpan="2">
+                            <Grid x:Name="ItemGrid" Grid.Row="2" Grid.ColumnSpan="2" >
                               <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="Auto" />
                                 <ColumnDefinition Width="Auto" />
-                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="*" SharedSizeGroup="VermittlungComboBox"/>
                                 <ColumnDefinition Width="Auto" />
                               </Grid.ColumnDefinitions>
 
@@ -1061,7 +1061,7 @@
 															              Height="23" Grid.Row="0" Width="100" />
 
                               <ComboBox x:Name="comboBox_PlacementObjectives" Loaded="comboBox_PlacementObjectives_Loaded"
-															          Margin="2,0,0,0" Grid.Column="2" MinWidth="100" MaxWidth="140" Height="23"
+															          Margin="2,0,0,0" Grid.Column="2" MinWidth="100" Height="23"
 															          SelectedValue="{Binding Path=Objective, Mode=TwoWay}" />
 
                               <Button x:Name="button_deletePlacement" Grid.Column="3" Grid.Row="1" Width="20" Height="20"
diff --git a/BeWo/View/Detail/Report/SupportConceptsAnalysisView.xaml.cs b/BeWo/View/Detail/Report/SupportConceptsAnalysisView.xaml.cs
index e13a9368b..7a6cd7a53 100644
--- a/BeWo/View/Detail/Report/SupportConceptsAnalysisView.xaml.cs
+++ b/BeWo/View/Detail/Report/SupportConceptsAnalysisView.xaml.cs
@@ -7,7 +7,7 @@ using System.Windows.Controls;
 using System.Windows.Navigation;
 using BeWo.Core;
 using BeWo.ServiceProxy;
-
+using BeWo.View.Search;
 using BS.Shared;
 using BS.Shared.Core;
 using BS.Shared.DataContracts;
@@ -37,11 +37,21 @@ namespace BeWo.View.Detail.Report
             
             if (!DarfAlleMitarbeiterSehen)
             {
-                checkbox_allEmployees.IsEnabled = false;
-                checkbox_allEmployees.IsChecked = false;
+                if (DarfTeamsSehen)
+                {
+                    employeeSearchView.SearchMode = SearchMode.OnlyTeamMember;
+                }
+                else
+                {
+                    checkbox_allEmployees.IsEnabled = false;
+                    checkbox_allEmployees.IsChecked = false;
 
-                popupedit_employee.Text = String.Format("{0}, {1}", BeWoApp.LoggedOnEmployee.LastName,
+                    popupedit_employee.Text = String.Format("{0}, {1}", BeWoApp.LoggedOnEmployee.LastName,
                     BeWoApp.LoggedOnEmployee.FirstName);
+                }
+                
+
+                
             }
 
             ChangeReportType();
@@ -342,6 +352,8 @@ namespace BeWo.View.Detail.Report
                         //checkbox_all.Visibility = Visibility.Collapsed;
                         //popupedit_employee.Visibility = Visibility.Collapsed;
 
+                        List<CompactEmployeeDC> mitarbeiterAllerTeams = new List<CompactEmployeeDC>();
+
                         var ol = teamSearchView.ObjectList;
                         if (ol != null)
                         {
@@ -359,6 +371,13 @@ namespace BeWo.View.Detail.Report
                             }
 
                             teamSearchView.ObjectList = teams;
+
+                            //foreach (var t in teams)
+                            //{
+                            //    var t = ServiceFacade.DoEmployeeServiceSync(s => s.GetAllTeamMember())
+
+                            //    var emps = t. 
+                            //}
                         }
                     }
                 }
diff --git a/Service/Plugins/DataImporter.cs b/Service/Plugins/DataImporter.cs
index d6d04aebd..98b451c60 100644
--- a/Service/Plugins/DataImporter.cs
+++ b/Service/Plugins/DataImporter.cs
@@ -18,7 +18,7 @@ namespace BeWo.Service.Plugins
 {
     public class DataImporter : AbstractIDSpecificDefaultClass<DataImporter>
     {
-        internal UploadImportFileResult ImportData(string filename, byte[] daten)
+        public virtual UploadImportFileResult ImportData(string filename, byte[] daten)
         {
             //muss überschrieben werden. Es gibt keinen Standardimport
             var result = new UploadImportFileResult();
diff --git a/Service/Plugins/IpAddressChecker.cs b/Service/Plugins/IpAddressChecker.cs
new file mode 100644
index 000000000..72ad496b7
--- /dev/null
+++ b/Service/Plugins/IpAddressChecker.cs
@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.ServiceModel;
+using BeWo.Data.Access;
+using BeWo.Data.Entities;
+using BeWo.Service.Core;
+using BeWo.Service.DCEntityMapper;
+using BeWo.Service.MessageContracts;
+using BeWo.Service.ServiceContracts;
+using BS.Shared;
+using BS.Shared.Core;
+using BS.Shared.DataContracts;
+using BS.Shared.Extensions;
+using BS.Shared.Services;
+using Utils = BS.Shared.Core.Utils;
+
+namespace BeWo.Service.Plugins
+{
+    public class IpAddressChecker : AbstractIDSpecificDefaultClass<IpAddressChecker>
+    {
+        public virtual bool CheckIpAddress()
+        {
+            //muss überschrieben werden.
+
+            return true;
+            //throw new FaultException<BeWoFault>(new BeWoFault("Dieser Vorgang ist von Ihrem Arbeitsplatz nicht erlaubt.", BeWoFaultType.DeleteNotPossible));
+
+            
+        }
+    }
+}
diff --git a/Service/Plugins/PluginLoader.cs b/Service/Plugins/PluginLoader.cs
index 7a7f89f11..da1e93187 100644
--- a/Service/Plugins/PluginLoader.cs
+++ b/Service/Plugins/PluginLoader.cs
@@ -145,10 +145,10 @@ namespace BeWo.Service.Plugins
                 //t = "4595275645"; // Eigenständig Hennef               
                 //  t = "7381352241"; // Ressource e.V.
 			    //t = "7912635399"; //Prof Eggers Stiftung
-			    //t = "5562845955";//Praunheimer WerkstaettenGmbh
+			    t = "5562845955";//Praunheimer WerkstaettenGmbh
                 //t = "1106039294"; //HphBersenbrueckAtz
 			    //t = "3607551608"; // BetreuungsBuero Scholz
-			    t = "3104936392"; //B.A.P. Bielefelder Ambulante Pflege
+			    //t = "3104936392"; //B.A.P. Bielefelder Ambulante Pflege
                 return t;
 #else
 				if (MultitenancyOperationContextExt.Current != null)
diff --git a/Service/Plugins/ServiceRecordValidator.cs b/Service/Plugins/ServiceRecordValidator.cs
index ad789102c..5526109ef 100644
--- a/Service/Plugins/ServiceRecordValidator.cs
+++ b/Service/Plugins/ServiceRecordValidator.cs
@@ -534,7 +534,43 @@ namespace BeWo.Service.Plugins
 				empRecords = empRecords.Where(r => r.Oid != newServiceRecord.ServiceRecordOid.Value).ToList();
 			}
 			empRecords = empRecords.Where(r => r.Start.HasValue && r.Start.Value.Second == 0).ToList();
-			try
+
+            
+            String[] ignoreNames = GetIgnoreCategoriesForOverlappingCheck();
+
+            if (ignoreNames != null)
+            {
+                bool ignore = ignoreNames.Contains(newServiceRecord.ServiceDescription.Category.Name);
+
+                if (ignore)
+                {
+                    empRecords =
+                        empRecords.Where(r => ignoreNames.Contains(r.ServiceDescription.ServiceCategory.Name)).ToList();
+                }
+                else
+                {
+                    empRecords =
+                        empRecords.Where(r => !ignoreNames.Contains(r.ServiceDescription.ServiceCategory.Name)).ToList();
+                }
+            }
+            ignoreNames = GetIgnoreServiceDescriptionsForOverlappingCheck();
+
+            if (ignoreNames != null)
+            {
+                bool ignore = ignoreNames.Contains(newServiceRecord.ServiceDescription.Name);
+
+                if (ignore)
+                {
+                    empRecords =
+                        empRecords.Where(r => ignoreNames.Contains(r.ServiceDescription.Name)).ToList();
+                }
+                else
+                {
+                    empRecords =
+                        empRecords.Where(r => !ignoreNames.Contains(r.ServiceDescription.Name)).ToList();
+                }
+            }
+            try
 			{
 				ServiceRecord overlappingRecord =
 					empRecords.FirstOrDefault(
@@ -570,8 +606,19 @@ namespace BeWo.Service.Plugins
 			}
 			return null;
 		}
+        
 
-		private SupportConceptPeriodStatisticsDC GetStatisticsForServiceRecord(SupportConceptStatisticsDC statistics, ServiceRecordDC newServiceRecord)
+	    public virtual String[] GetIgnoreCategoriesForOverlappingCheck()
+	    {
+	        return null;
+	    }
+
+        public virtual String[] GetIgnoreServiceDescriptionsForOverlappingCheck()
+        {
+            return null;
+        }
+
+        private SupportConceptPeriodStatisticsDC GetStatisticsForServiceRecord(SupportConceptStatisticsDC statistics, ServiceRecordDC newServiceRecord)
 		{
 			if (statistics != null && statistics.PeriodStatistics.Count > 0)
 			{
diff --git a/Service/Service.csproj b/Service/Service.csproj
index b8c5c2e70..48074339a 100644
--- a/Service/Service.csproj
+++ b/Service/Service.csproj
@@ -294,6 +294,7 @@
     <Compile Include="Multitenancy\MultitenancyContextInitializer.cs" />
     <Compile Include="Multitenancy\MultitenancyEndpointBehavior.cs" />
     <Compile Include="Plugins\CustomerService.cs" />
+    <Compile Include="Plugins\IpAddressChecker.cs" />
     <Compile Include="Plugins\DataImporter.cs" />
     <Compile Include="Plugins\DataExporter.cs" />
     <Compile Include="Plugins\GroupDurationCalculator.cs" />
diff --git a/Service/ServiceImplementations/DownloadServiceImp.cs b/Service/ServiceImplementations/DownloadServiceImp.cs
index 36d00d958..ae6502713 100644
--- a/Service/ServiceImplementations/DownloadServiceImp.cs
+++ b/Service/ServiceImplementations/DownloadServiceImp.cs
@@ -743,6 +743,7 @@ namespace BeWo.Service.ServiceImplementations
 
         public FileAttachmentDC GetFileAttachment(long oid)
         {
+            PluginLoader.FindClass<IpAddressChecker>().CheckIpAddress();
             var lFA = DAOFactory.GenericDAO.LoadByID<FileAttachment>(oid);
             var dc = MapperFactory.FileAttachmentDC_FileAttachment.MapToNewDC(lFA);
 
diff --git a/Service/ServiceImplementations/StreamingServiceImp.cs b/Service/ServiceImplementations/StreamingServiceImp.cs
index 2f06dc2fe..0d726d402 100644
--- a/Service/ServiceImplementations/StreamingServiceImp.cs
+++ b/Service/ServiceImplementations/StreamingServiceImp.cs
@@ -77,6 +77,8 @@ namespace BeWo.Service.ServiceImplementations
 
         public UploadResult UploadDocument(UploadPackage pUpload)
         {
+            PluginLoader.FindClass<IpAddressChecker>().CheckIpAddress();
+
             //try
             //{
             var lEntity = new FileAttachment
@@ -139,6 +141,8 @@ namespace BeWo.Service.ServiceImplementations
         {
             try
             {
+                PluginLoader.FindClass<IpAddressChecker>().CheckIpAddress();
+
                 var pFileId = pUpload.FileOid;
 
                 var original = DAOFactory.GenericDAO.GetByID<FileAttachment>(pFileId);
diff --git a/Shared/BeWoEntityEnums.cs b/Shared/BeWoEntityEnums.cs
index e5ebfc827..a5ae04006 100644
--- a/Shared/BeWoEntityEnums.cs
+++ b/Shared/BeWoEntityEnums.cs
@@ -494,11 +494,14 @@ namespace BS.Shared
     }
 
     public enum Pflegegrad {
-        Grad1,
-        Grad2,
-        Grad3,
-        Grad4,
-        Grad5
+        KeinGrad = -2,
+        PflegegradBeantragt = -1,
+        Grad1 = 0,
+        Grad2 = 1,
+        Grad3 = 2,
+        Grad4 = 3,
+        Grad5 = 4
+        
     }
 
     public enum ValueListEntryType
diff --git a/Shared/Core/EnumTranslations.cs b/Shared/Core/EnumTranslations.cs
index 0e5d7a2dd..312f6fc3f 100644
--- a/Shared/Core/EnumTranslations.cs
+++ b/Shared/Core/EnumTranslations.cs
@@ -609,7 +609,13 @@ namespace BS.Shared.Core
             #region PflegegradTranslations
             PflegegradTranslations = new Dictionary<object, String>
 	        {
-		        {
+                {
+                    Pflegegrad.KeinGrad, "Kein Pflegegrad"
+                },
+                 {
+                    Pflegegrad.PflegegradBeantragt, "Pflegegrad beantragt"
+                },
+                {
 			        Pflegegrad.Grad1, "Pflegegrad 1"
 		        },
 		         {
@@ -625,7 +631,7 @@ namespace BS.Shared.Core
 			        Pflegegrad.Grad5, "Pflegegrad 5"
 		        }
 
-	        };
+            };
             #endregion
 
             #region ZeiterfassungsDauerTranslations