Merge branch 'master' of ssh://float.beyondsoft.de/git/beyondSoft/BeWo

BeWo/BeWo.csproj

@@ -817,7 +817,6 @@
     </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>

BeWo/View/Detail/UrlaubstagSchenkenView.xaml.cs

@@ -42,11 +42,12 @@ namespace BeWo.View.Detail
 
 
 
-        public UrlaubstagSchenkenView(List<EmployeeDC> _EmployeeList)
+        public UrlaubstagSchenkenView(List<EmployeeDC> EmployeeList)
         {
             InitializeComponent();
 
             //_EmployeeList = ServiceFacade.DoEmployeeServiceSync(s => s.GetAllActiveEmployees());
+            _EmployeeList = EmployeeList;
             EmployeeSelectionGrid.ItemsSource = _EmployeeList;
         }
 
@@ -96,6 +97,8 @@ namespace BeWo.View.Detail
                 }
                 else
                 {
+                    //var allEmployee = (List<EmployeeDC>)EmployeeSelectionGrid.ItemsSource;
+                    //foreach (var item in allEmployee)
                     foreach (var item in _EmployeeList)
                     {
                         var oid = item.EmployeeOid;