From f9596501006414982e7168db0b3bae1ba6215732 Mon Sep 17 00:00:00 2001
From: Christian <christian.baeurle@beyondsoft.de>
Date: Wed, 11 Oct 2017 14:44:51 +0200
Subject: [PATCH 1/9] gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index d9805409f..f0d36d9a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -256,3 +256,4 @@
 /ReportImp/Taubblindendienst/obj/Debug
 /BeWoPlanerMobil/logs
 /Host/logs
+/.vs/BeWoGit/v15

From dd98a74bb890e4c39fe6fab1283792eea5312ba9 Mon Sep 17 00:00:00 2001
From: Waldi <waldemar.ruppel@beyondsoft.de>
Date: Wed, 11 Oct 2017 14:45:11 +0200
Subject: [PATCH 2/9] =?UTF-8?q?PDF=20Handout=20Chat=20ged=C3=B6nse?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BeWo/BeWo.csproj                              |   2 +-
 .../NewSchulbegleitenderDienstView.xaml.cs    |  32 ++++-
 BeWo/ServiceProxy/Generated.cs                |   9 ++
 BeWo/View/ChatServiceEmployee.xaml            |   8 +-
 BeWo/View/ChatServiceEmployee.xaml.cs         | 109 ++++++++++--------
 .../ServiceContracts/IOperationsService.cs    |   4 +
 .../OperationsServiceImp.cs                   |  50 ++++++++
 Shared/DataContracts/CustomerAPPCodeDC.cs     |   4 +
 Shared/DataContracts/EmployeeAPPCodeDC.cs     |   5 +-
 Shared/Shared.csproj                          |   1 +
 10 files changed, 167 insertions(+), 57 deletions(-)

diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj
index 2f3ca6f41..e4818c8dc 100644
--- a/BeWo/BeWo.csproj
+++ b/BeWo/BeWo.csproj
@@ -1975,7 +1975,7 @@
     </BootstrapperPackage>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Chat\ChatController\ChatController.csproj">
+    <ProjectReference Include="..\..\Chat\ChatController\ChatController.csproj">
       <Project>{8a83c4dc-a0b1-4a51-ae1d-366d7a05b298}</Project>
       <Name>ChatController</Name>
     </ProjectReference>
diff --git a/BeWo/SchulbegleitenderDienst/NewSchulbegleitenderDienstView.xaml.cs b/BeWo/SchulbegleitenderDienst/NewSchulbegleitenderDienstView.xaml.cs
index c7f9f7879..bd8de940f 100644
--- a/BeWo/SchulbegleitenderDienst/NewSchulbegleitenderDienstView.xaml.cs
+++ b/BeWo/SchulbegleitenderDienst/NewSchulbegleitenderDienstView.xaml.cs
@@ -244,13 +244,41 @@ namespace BeWo.SchulbegleitenderDienst
                         // hier den Tag merken  um auch für WOCHEN bereich die spalte orange zu machen 
 
                     }
-
+                    
                     if (item.isCustomerKrank)
                     {
                         xyc.IsCustomerKrank = true;
                         xyc.IsKunde = 2;
                     }
-                                             
+
+                    //hier bereich zu abfrage Vertretung Gewünscht / nicht gewünscht
+                    //################## Besser auf Server auslagern  ?? #############################################
+                    List<long> custOid = new List<long>();
+                    custOid.Add(customer.Key);
+                    var cus = ServiceFacade.DoCustomerServiceSync(r => r.GetCustomersById(custOid));
+
+                    foreach (var c in cus)
+                    {
+                        // 1 für Grün | 0 für Rot
+                        if (c.VertretungDringendErforderlich == false && c.VertretungGewuenscht == false)
+                        {
+                            //anzeige Grün machen
+                            xyc.IsKunde = 1;
+                        }
+                        //else if (c.VertretungDringendErforderlich == false && c.VertretungGewuenscht == true)
+                        //{
+                        //    // anzeige noral halten
+                        //    xyc.IsKunde = 2;
+                        //}
+                        //else if (c.VertretungDringendErforderlich == true && c.VertretungGewuenscht == true)
+                        //{
+                        //    //anzeige normal halten
+                        //    xyc.IsKunde = 2;
+                        //}
+                    }
+
+                    //############################
+
                     _items.Add(xyc);
                 }
 
diff --git a/BeWo/ServiceProxy/Generated.cs b/BeWo/ServiceProxy/Generated.cs
index f41f54e9f..e6d760a76 100644
--- a/BeWo/ServiceProxy/Generated.cs
+++ b/BeWo/ServiceProxy/Generated.cs
@@ -4411,6 +4411,10 @@ namespace BeWo.ServiceProxy
         [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetLastVertreterBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
         System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactVertreterEmployeeDC> GetLastVertreter(System.Nullable<long> klientenOid);
         
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/GetHandOutPdfForChat", ReplyAction="http://tempuri.org/IOperationsService/GetHandOutPdfForChatResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetHandOutPdfForChatBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        BS.Shared.DataContracts.PdfChatHandoutDC GetHandOutPdfForChat(string customerId, string apikey);
+        
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/DeactivateInvoices", ReplyAction="http://tempuri.org/IOperationsService/DeactivateInvoicesResponse")]
         [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/DeactivateInvoicesBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
         void DeactivateInvoices(System.Collections.Generic.List<BS.Shared.DataContracts.InvoiceDC> invoices);
@@ -5226,6 +5230,11 @@ namespace BeWo.ServiceProxy
             return base.Channel.GetLastVertreter(klientenOid);
         }
         
+        public BS.Shared.DataContracts.PdfChatHandoutDC GetHandOutPdfForChat(string customerId, string apikey)
+        {
+            return base.Channel.GetHandOutPdfForChat(customerId, apikey);
+        }
+        
         public void DeactivateInvoices(System.Collections.Generic.List<BS.Shared.DataContracts.InvoiceDC> invoices)
         {
             base.Channel.DeactivateInvoices(invoices);
diff --git a/BeWo/View/ChatServiceEmployee.xaml b/BeWo/View/ChatServiceEmployee.xaml
index c52fbe4c9..241549300 100644
--- a/BeWo/View/ChatServiceEmployee.xaml
+++ b/BeWo/View/ChatServiceEmployee.xaml
@@ -34,6 +34,7 @@
                         <RowDefinition Height="Auto" />
                         <RowDefinition Height="Auto" />
                         <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
                     </Grid.RowDefinitions>
 
                   <Button Grid.Column="0" Grid.Row="0" Content="Code Generieren" Click="GenerateCodeClick" Margin="3" VerticalAlignment="Center" HorizontalAlignment="Left"
@@ -41,7 +42,7 @@
 
                   <TextBox Grid.Column="1" Grid.Row="0" Margin="3" Height="23" MinWidth="120" x:Name="GeneratetTexfield" IsReadOnly="True"  />
 
-                  <Label x:Name="lblIsChatAktive" Grid.Column="0" Grid.Row="1" Content="Chat Aktivieren"  />
+                  <!--<Label x:Name="lblIsChatAktive" Grid.Column="0" Grid.Row="1" Content="Chat Aktivieren"  />
 
                   <CheckBox x:Name="ChatAktive" Grid.Column="1" Grid.Row="1" Margin="3" Height="23"  Checked="CheckBox_Checked" Unchecked="CheckBox_Unchecked"  />
                             
@@ -51,8 +52,9 @@
                            
                  
                   <Button Grid.Column="0" Grid.Row="3" Content="Save Notfall Message" Click="Creat_NotfallMessage" Margin="3" VerticalAlignment="Center" HorizontalAlignment="Left"
-                       Height="21" x:Name="SaveMSButon" />
-      
+                       Height="21" x:Name="SaveMSButon" />-->
+
+                  <Button Grid.Column="0" Grid.Row="4" Content="PDF Anzeigen" Click="ZeigePDF_OnClick" Margin="3" VerticalAlignment="Center" HorizontalAlignment="Left" Height="21"/>
                   
                 </Grid>
 
diff --git a/BeWo/View/ChatServiceEmployee.xaml.cs b/BeWo/View/ChatServiceEmployee.xaml.cs
index 74362a3e9..fe94a1964 100644
--- a/BeWo/View/ChatServiceEmployee.xaml.cs
+++ b/BeWo/View/ChatServiceEmployee.xaml.cs
@@ -1,5 +1,6 @@
 using System;
 using System.ComponentModel;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Windows;
@@ -105,6 +106,8 @@ namespace BeWo.View
                         GeneratetTexfield.Text = result.EmployeeCode;
                     }else{
                         MessageBox.Show("Beim erstellen eines neuen Chatcodes ist ein fehler aufgetreten. ");
+
+                        //result.Result mit switc case Fehler ausgabe
                     }
                 }
             }
@@ -125,32 +128,33 @@ namespace BeWo.View
                         GeneratetTexfield.Text = result.EmployeeCode;
                     }else{
                         MessageBox.Show("Beim erstellen eines neuen Chatcodes ist ein fehler aufgetreten. ");
+                        //result.Result mit switc case Fehler ausgabe
                     }
                 }
                 else
                 {
-                    MessageBox.Show("Sie besitzen derzeit keinen API-Key. Bitte wenden sie sich an den Suppoert. ","Info",MessageBoxButton.OK);
+                    MessageBox.Show("Sie besitzen derzeit keinen API-Key. Bitte wenden sie sich an den Support. ","Info",MessageBoxButton.OK);
                 }
             }
 //#endif
 
         }
 
-        private void CheckBox_Checked(object sender, RoutedEventArgs e)
-        {
-            ServiceFacade.DoOperationsServiceSync(s => s.UpdateIsChatActiveEmployeeAPPCodeDC(employeeOid.Value, 1));           
-        }
+        //private void CheckBox_Checked(object sender, RoutedEventArgs e)
+        //{
+        //    ServiceFacade.DoOperationsServiceSync(s => s.UpdateIsChatActiveEmployeeAPPCodeDC(employeeOid.Value, 1));           
+        //}
 
-        private void CheckBox_Unchecked(object sender, RoutedEventArgs e)
-        {
-            ServiceFacade.DoOperationsServiceSync(s => s.UpdateIsChatActiveEmployeeAPPCodeDC(employeeOid.Value, 0));      
-        }
+        //private void CheckBox_Unchecked(object sender, RoutedEventArgs e)
+        //{
+        //    ServiceFacade.DoOperationsServiceSync(s => s.UpdateIsChatActiveEmployeeAPPCodeDC(employeeOid.Value, 0));      
+        //}
 
-        private void Creat_NotfallMessage(object sender, RoutedEventArgs e)
-        {
-            if(!NotfallTexfield.Text.Equals(""))
-                ServiceFacade.DoOperationsServiceSync(s => s.UpdateNotfallNacrichtEmployeeAPPCodeDC(employeeOid.Value, NotfallTexfield.Text));
-        }
+        //private void Creat_NotfallMessage(object sender, RoutedEventArgs e)
+        //{
+        //    if(!NotfallTexfield.Text.Equals(""))
+        //        ServiceFacade.DoOperationsServiceSync(s => s.UpdateNotfallNacrichtEmployeeAPPCodeDC(employeeOid.Value, NotfallTexfield.Text));
+        //}
 
 
         private void LaodInfostoView()
@@ -172,22 +176,22 @@ namespace BeWo.View
               //  a = getEmployeeAppCode[getEmployeeAppCode.Count - 1].EmployeeCode;
                 
 
-                NotfallTexfield.Text = getEmployeeAppCode[0].NotfallStatement;
+                //NotfallTexfield.Text = getEmployeeAppCode[0].NotfallStatement;
                 //b = getEmployeeAppCode[0].NotfallStatement;
             }
-            else
-                 x = 0;
+            //else
+            //     x = 0;
 
-            if (x == 0)
-            {
-                 ChatAktive.SetCurrentValue(CheckBox.IsCheckedProperty, false);   
-                //c = false;
-            }
-            else
-            {
-                 ChatAktive.SetCurrentValue(CheckBox.IsCheckedProperty, true);
-             //   c = true;
-            }
+            //if (x == 0)
+            //{
+            //     ChatAktive.SetCurrentValue(CheckBox.IsCheckedProperty, false);   
+            //    //c = false;
+            //}
+            //else
+            //{
+            //     ChatAktive.SetCurrentValue(CheckBox.IsCheckedProperty, true);
+            // //   c = true;
+            //}
 
 
 
@@ -195,31 +199,36 @@ namespace BeWo.View
 
         }
 
-    }
-
-    public class ChatServiceBuilder
-    {
-        public ChatServiceBuilder(bool isChecked, string notfallstatement, string code)
+        private void ZeigePDF_OnClick(object sender, RoutedEventArgs e)
         {
-            IsChecked = isChecked;
-            Notfallstatement = notfallstatement;
-            Code = code;
-        }
+            //zu Testzwecken
+            //var handout = ServiceFacade.DoOperationsServiceSync(r => r.GetHandOutPdfForChat("5473568546", "12345678 "));
+            var handout = ServiceFacade.DoOperationsServiceSync(r => r.GetHandOutPdfForChat(BeWoApp.Tenant, BeWoApp.Mandator.Apikey));
 
-        public bool IsChecked { get; set; }
-
-        public string Notfallstatement { get; set; }
-        /*       get { return _Notfallstatement; }
-            set
+            switch (handout.Result)
             {
-              if (value != _Notfallstatement)
-              {
-                 _Notfallstatement = value;
-                 OnPropertyChanged("Notfallstatement");
-              } 
-        }*/
-        
-            
-        public string Code { get; set; }   
+                case 0:
+                    //Hier die pdf anzeigen
+
+                    Process.Start(handout.File);
+
+                    break;
+                case 11:
+                    MessageBox.Show("Kundennummer unbekannt.", "Fehler", MessageBoxButton.OK); 
+                    break;
+                case 12:
+                    MessageBox.Show("Der API-Key ist falsch -> Auth-Error.", "Fehler", MessageBoxButton.OK); 
+                    break;
+                case 13:
+                    MessageBox.Show("Es existiert kein API-Key für die angegebene Kundennummer.", "Fehler", MessageBoxButton.OK); 
+                    break;
+                case 40:
+                    MessageBox.Show("Vorlage nicht gefunden.", "Fehler", MessageBoxButton.OK); 
+                    break;
+                case 41:
+                    MessageBox.Show("Ungültige Custom-Logo-URL.", "Fehler", MessageBoxButton.OK); 
+                    break;
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/Service/ServiceContracts/IOperationsService.cs b/Service/ServiceContracts/IOperationsService.cs
index e170b4de9..3b814303a 100644
--- a/Service/ServiceContracts/IOperationsService.cs
+++ b/Service/ServiceContracts/IOperationsService.cs
@@ -695,5 +695,9 @@ namespace BeWo.Service.ServiceContracts
         [FaultContract(typeof(BeWoFault))]
         [OperationContract]
         List<CompactVertreterEmployeeDC> GetLastVertreter(long? klientenOid);
+
+        [FaultContract(typeof(BeWoFault))]
+        [OperationContract]
+        PdfChatHandoutDC GetHandOutPdfForChat(string customerId, string apikey);
     }
 }
\ No newline at end of file
diff --git a/Service/ServiceImplementations/OperationsServiceImp.cs b/Service/ServiceImplementations/OperationsServiceImp.cs
index 284bf2025..753ce544a 100644
--- a/Service/ServiceImplementations/OperationsServiceImp.cs
+++ b/Service/ServiceImplementations/OperationsServiceImp.cs
@@ -4543,6 +4543,56 @@ namespace BeWo.Service.ServiceImplementations
             }
         }
 
+        //neu
+        public PdfChatHandoutDC GetHandOutPdfForChat(string customerId,string apikey)
+        {
+            try
+            {
+                var handout = new PdfChatHandoutDC();
+
+                string serverUrl = ErmittleServerURL(customerId);
+             
+                if (serverUrl.Equals(""))
+                {
+                    handout.Result = 11;
+
+                    return handout;
+                }
+
+                var endurl = serverUrl + "/api/ownchat/createpdfmanual/" + apikey + "/" + customerId;
+
+                WebRequest request = WebRequest.Create(endurl);
+
+                request.Credentials = CredentialCache.DefaultCredentials;
+                request.Proxy = null;
+
+                //von get auf Post umstellen
+                //optional übergeben -> chatcode, login->password-> und CustomLogoUrl
+                //Hier die URl zu customLogoURl
+                //  https://support.bewoplaner.de/bewoplaner_logo_big.png 
+
+                WebResponse response = request.GetResponse();
+                
+                string responseFromServer = ReadStreamForChatCode(response);
+                
+                var jsonDatentyp = JsonConvert.DeserializeObject<PdfChatHandoutDC>(responseFromServer);
+                
+
+               return jsonDatentyp;
+            }
+            catch (Exception e)
+            {
+                //throw Utils.CreateBeWoFaultException(e);
+                var handout = new PdfChatHandoutDC();
+                handout.Result = 13;
+
+                return handout;
+                //MessageBox.Show("Es existiert kein API-Key für die angegebene Kundennummer.\nBitte wenden sie sich an den Support", "Fehler", MessageBoxButton.OK);
+                // return null;              
+            }
+        } 
+
+        
         #endregion
     }
 }
\ No newline at end of file
diff --git a/Shared/DataContracts/CustomerAPPCodeDC.cs b/Shared/DataContracts/CustomerAPPCodeDC.cs
index 800ba9046..e43ba34b9 100644
--- a/Shared/DataContracts/CustomerAPPCodeDC.cs
+++ b/Shared/DataContracts/CustomerAPPCodeDC.cs
@@ -29,5 +29,9 @@ namespace BS.Shared.DataContracts
         [DataMember]
         public string Passwort { get; set; }
 
+        [DataMember]
+        public int Result { get; set; }
+
+
     }
 }
\ No newline at end of file
diff --git a/Shared/DataContracts/EmployeeAPPCodeDC.cs b/Shared/DataContracts/EmployeeAPPCodeDC.cs
index 1f4666bbf..8dd176304 100644
--- a/Shared/DataContracts/EmployeeAPPCodeDC.cs
+++ b/Shared/DataContracts/EmployeeAPPCodeDC.cs
@@ -25,7 +25,10 @@ namespace BS.Shared.DataContracts
 
         [DataMember]
         public string NotfallStatement { get; set; }
-        
+
+        [DataMember]
+        public int Result { get; set; }
+
 
     }
 }
\ No newline at end of file
diff --git a/Shared/Shared.csproj b/Shared/Shared.csproj
index ee61762a5..be5750ba9 100644
--- a/Shared/Shared.csproj
+++ b/Shared/Shared.csproj
@@ -169,6 +169,7 @@
     <Compile Include="DataContracts\Compact\CompactCustomerTeamDC.cs" />
     <Compile Include="DataContracts\Compact\CompactGroupOfPeopleDC.cs" />
     <Compile Include="DataContracts\Compact\CompactWohnheimDC.cs" />
+    <Compile Include="DataContracts\PdfChatHandoutDC.cs" />
     <Compile Include="DataContracts\CustomerTeamDC.cs" />
     <Compile Include="DataContracts\Compact\CompactVertreterEmployeeDC.cs" />
     <Compile Include="DataContracts\Compact\CompactTokenDC.cs" />

From 48a0dedc39d65c90fd020a7f6b13aa4c5895862d Mon Sep 17 00:00:00 2001
From: Waldi <waldemar.ruppel@beyondsoft.de>
Date: Thu, 12 Oct 2017 12:58:09 +0200
Subject: [PATCH 3/9] =?UTF-8?q?Klient=20Benutzer=20passwort=20f=C3=BCr=20c?=
 =?UTF-8?q?hat=20und=20anderweitige=20sachen=20die=20mit=20chatappcode=20z?=
 =?UTF-8?q?u=20tun=20haben?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BeWo/View/ChatServiceCustomer.xaml            | 10 ++-
 BeWo/View/ChatServiceCustomer.xaml.cs         | 88 ++++++++++---------
 BeWo/View/ChatServiceEmployee.xaml            |  2 +-
 BeWo/View/ChatServiceEmployee.xaml.cs         | 42 +++++----
 .../CustomerServiceImp.cs                     | 42 +++++++--
 .../OperationsServiceImp.cs                   | 60 ++++++++++---
 Shared/DataContracts/PdfChatHandoutDC.cs      | 17 ++++
 7 files changed, 175 insertions(+), 86 deletions(-)
 create mode 100644 Shared/DataContracts/PdfChatHandoutDC.cs

diff --git a/BeWo/View/ChatServiceCustomer.xaml b/BeWo/View/ChatServiceCustomer.xaml
index d39ab71eb..6c2cf1562 100644
--- a/BeWo/View/ChatServiceCustomer.xaml
+++ b/BeWo/View/ChatServiceCustomer.xaml
@@ -42,17 +42,19 @@
                       <TextBox Grid.Column="1" Grid.Row="0" Margin="3" Height="23" MinWidth="120" x:Name="GeneratetTexfield" IsReadOnly="True"/>
                                
 
-                      <Label x:Name="lblIsChatAktive" Grid.Column="0" Grid.Row="1" Margin="3" Content="Chat Aktivieren" />
+                      <!-- <Label x:Name="lblIsChatAktive" Grid.Column="0" Grid.Row="1" Margin="3" Content="Chat Aktivieren" />-->
 
 
-                      <CheckBox x:Name="ChatAktive" Grid.Column="1" Grid.Row="1" Margin="3" Height="23" Checked="CheckBox_Checked" Unchecked="CheckBox_Unchecked"/>
+                      <!--<CheckBox x:Name="ChatAktive" Grid.Column="1" Grid.Row="1" Margin="3" Height="23" Checked="CheckBox_Checked" Unchecked="CheckBox_Unchecked"/>-->
 
                       
                       <Label Grid.Row="2" Grid.Column="0" Content="Benutzer Name" Margin="3" />                      
-                      <TextBox Grid.Row="2" Grid.Column="1" Margin="3" x:Name="TXTBenutzerName" KeyDown="TXTBenutzerName_OnKeyDown" LostFocus="TXTBenutzerName_OnLostFocus" />
+                      <TextBox Grid.Row="2" Grid.Column="1" Margin="3" x:Name="TXTBenutzerName"  />
                   
                       <Label Grid.Row="3" Grid.Column="0" Content="Passwort" Margin="3" />
-                      <TextBox Grid.Row="3" Grid.Column="1" Margin="3" x:Name="TXTPasswort" KeyDown="TXTPasswort_OnKeyDown" LostFocus="TXTPasswort_OnLostFocus" />
+                      <TextBox Grid.Row="3" Grid.Column="1" Margin="3" x:Name="TXTPasswort" />
+
+                  <Button Content="Speichern" Click="SpeicherButton_OnClick" Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="2" Margin="3" HorizontalAlignment="Right"/>
                   
                   <!--  IsChecked="{Binding Path=IsChatAktiv, UpdateSourceTrigger=PropertyChanged}"  -->  
                   
diff --git a/BeWo/View/ChatServiceCustomer.xaml.cs b/BeWo/View/ChatServiceCustomer.xaml.cs
index a36cc2265..903725e76 100644
--- a/BeWo/View/ChatServiceCustomer.xaml.cs
+++ b/BeWo/View/ChatServiceCustomer.xaml.cs
@@ -211,17 +211,17 @@ namespace BeWo.View
 
                 GeneratetTexfield.Text = getCustomerAppCode[getCustomerAppCode.Count - 1].CustomerCode;
             }
-            else
-                x = 0;
+            //else
+            //    x = 0;
 
-            if (x == 0)
-            {
-                ChatAktive.SetCurrentValue(CheckBox.IsCheckedProperty, false);
-            }
-            else
-            {
-                ChatAktive.SetCurrentValue(CheckBox.IsCheckedProperty, true);
-            }
+            //if (x == 0)
+            //{
+            //    ChatAktive.SetCurrentValue(CheckBox.IsCheckedProperty, false);
+            //}
+            //else
+            //{
+            //    ChatAktive.SetCurrentValue(CheckBox.IsCheckedProperty, true);
+            //}
 
             if (getCustomerAppCode.Count > 0)
             {
@@ -231,41 +231,43 @@ namespace BeWo.View
         }
 
         //######### Erstmal vorrübergehend #####################################################################################
+//#region Passwort geändert
+//        private void TXTPasswort_OnKeyDown(object sender, KeyEventArgs e)
+//        {
+//            if (e.Key == Key.Enter) { 
+//                var passwort = TXTPasswort.Text;
 
-#region Passwort
-        private void TXTPasswort_OnKeyDown(object sender, KeyEventArgs e)
+//                ServiceFacade.DoCustomerServiceSync(s => s.SetBenutzerPasswortChatAppCode(customerOid.Value,"", passwort));            
+//            }
+//        }
+
+//        private void TXTPasswort_OnLostFocus(object sender, RoutedEventArgs e)
+//        {
+//            var passwort = TXTPasswort.Text;
+//            ServiceFacade.DoCustomerServiceSync(s => s.SetBenutzerPasswortChatAppCode(customerOid.Value, "", passwort));
+//        }
+//#endregion
+
+//#region BenutzerName
+//        private void TXTBenutzerName_OnKeyDown(object sender, KeyEventArgs e)
+//        {
+//            if(e.Key == Key.Enter) { 
+//                var benutzerName = TXTBenutzerName.Text;
+
+//                ServiceFacade.DoCustomerServiceSync(s => s.SetBenutzerPasswortChatAppCode(customerOid.Value, benutzerName, ""));            
+//            }
+//        }
+
+//        private void TXTBenutzerName_OnLostFocus(object sender, RoutedEventArgs e)
+//        {
+//            var benutzerName = TXTBenutzerName.Text;
+//            ServiceFacade.DoCustomerServiceSync(s => s.SetBenutzerPasswortChatAppCode(customerOid.Value, benutzerName, ""));
+//        }
+//#endregion
+
+        private void SpeicherButton_OnClick(object sender, RoutedEventArgs e)
         {
-            if (e.Key == Key.Enter) { 
-                var passwort = TXTPasswort.Text;
-
-                ServiceFacade.DoCustomerServiceSync(s => s.SetBenutzerPasswortChatAppCode(customerOid.Value,"", passwort));            
-            }
+            ServiceFacade.DoCustomerServiceSync(s => s.SetBenutzerPasswortChatAppCode(customerOid.Value, TXTBenutzerName.Text, TXTPasswort.Text));
         }
-
-        private void TXTPasswort_OnLostFocus(object sender, RoutedEventArgs e)
-        {
-            var passwort = TXTPasswort.Text;
-            ServiceFacade.DoCustomerServiceSync(s => s.SetBenutzerPasswortChatAppCode(customerOid.Value, "", passwort));
-        }
-#endregion
-
-#region BenutzerName
-        private void TXTBenutzerName_OnKeyDown(object sender, KeyEventArgs e)
-        {
-            if(e.Key == Key.Enter) { 
-                var benutzerName = TXTBenutzerName.Text;
-
-                ServiceFacade.DoCustomerServiceSync(s => s.SetBenutzerPasswortChatAppCode(customerOid.Value, benutzerName, ""));            
-            }
-        }
-
-        private void TXTBenutzerName_OnLostFocus(object sender, RoutedEventArgs e)
-        {
-            var benutzerName = TXTBenutzerName.Text;
-            ServiceFacade.DoCustomerServiceSync(s => s.SetBenutzerPasswortChatAppCode(customerOid.Value, benutzerName, ""));
-        }
-#endregion
-
-      
     }
 }
\ No newline at end of file
diff --git a/BeWo/View/ChatServiceEmployee.xaml b/BeWo/View/ChatServiceEmployee.xaml
index 241549300..2e10d19bb 100644
--- a/BeWo/View/ChatServiceEmployee.xaml
+++ b/BeWo/View/ChatServiceEmployee.xaml
@@ -54,7 +54,7 @@
                   <Button Grid.Column="0" Grid.Row="3" Content="Save Notfall Message" Click="Creat_NotfallMessage" Margin="3" VerticalAlignment="Center" HorizontalAlignment="Left"
                        Height="21" x:Name="SaveMSButon" />-->
 
-                  <Button Grid.Column="0" Grid.Row="4" Content="PDF Anzeigen" Click="ZeigePDF_OnClick" Margin="3" VerticalAlignment="Center" HorizontalAlignment="Left" Height="21"/>
+                  <Button Grid.Column="0" Grid.Row="4" Content="Handout PDF Anzeigen" Click="ZeigePDF_OnClick" Margin="3" VerticalAlignment="Center" HorizontalAlignment="Left" Height="21"/>
                   
                 </Grid>
 
diff --git a/BeWo/View/ChatServiceEmployee.xaml.cs b/BeWo/View/ChatServiceEmployee.xaml.cs
index fe94a1964..db319a8ae 100644
--- a/BeWo/View/ChatServiceEmployee.xaml.cs
+++ b/BeWo/View/ChatServiceEmployee.xaml.cs
@@ -140,6 +140,7 @@ namespace BeWo.View
 
         }
 
+        #region Nicht benutzte Events
         //private void CheckBox_Checked(object sender, RoutedEventArgs e)
         //{
         //    ServiceFacade.DoOperationsServiceSync(s => s.UpdateIsChatActiveEmployeeAPPCodeDC(employeeOid.Value, 1));           
@@ -155,30 +156,32 @@ namespace BeWo.View
         //    if(!NotfallTexfield.Text.Equals(""))
         //        ServiceFacade.DoOperationsServiceSync(s => s.UpdateNotfallNacrichtEmployeeAPPCodeDC(employeeOid.Value, NotfallTexfield.Text));
         //}
+        
 
-
+        #endregion
+        
         private void LaodInfostoView()
-        {
-            
+        {          
             var getEmployeeAppCode = ServiceFacade.DoEmployeeServiceSync(s => s.GetAllEmployeeAppCodes(employeeOid.Value));
 
-            
-
-            /* String a = "";
-             String b = "";
-             bool c = false;
-            */
             int x;
             if (getEmployeeAppCode.Count > 0){
                  x = getEmployeeAppCode[getEmployeeAppCode.Count - 1].IsChatAktive;
                 
-                GeneratetTexfield.Text = getEmployeeAppCode[getEmployeeAppCode.Count - 1].EmployeeCode;
-              //  a = getEmployeeAppCode[getEmployeeAppCode.Count - 1].EmployeeCode;
-                
-
-                //NotfallTexfield.Text = getEmployeeAppCode[0].NotfallStatement;
-                //b = getEmployeeAppCode[0].NotfallStatement;
+                GeneratetTexfield.Text = getEmployeeAppCode[getEmployeeAppCode.Count - 1].EmployeeCode;            
             }
+
+            #region Nicht mehr gebrauchter Code
+            /* String a = "";
+             String b = "";
+             bool c = false;
+            */
+
+            //  a = getEmployeeAppCode[getEmployeeAppCode.Count - 1].EmployeeCode;
+
+
+            //NotfallTexfield.Text = getEmployeeAppCode[0].NotfallStatement;
+            //b = getEmployeeAppCode[0].NotfallStatement;
             //else
             //     x = 0;
 
@@ -195,8 +198,8 @@ namespace BeWo.View
 
 
 
-          //  ChatServiceBuilder builder = new ChatServiceBuilder(c,b,a);
-
+            //  ChatServiceBuilder builder = new ChatServiceBuilder(c,b,a);
+            #endregion
         }
 
         private void ZeigePDF_OnClick(object sender, RoutedEventArgs e)
@@ -205,6 +208,11 @@ namespace BeWo.View
             //var handout = ServiceFacade.DoOperationsServiceSync(r => r.GetHandOutPdfForChat("5473568546", "12345678 "));
             var handout = ServiceFacade.DoOperationsServiceSync(r => r.GetHandOutPdfForChat(BeWoApp.Tenant, BeWoApp.Mandator.Apikey));
 
+            if (handout.File != null && !handout.File.Equals(""))
+            {
+                handout.Result = 0;
+            }
+
             switch (handout.Result)
             {
                 case 0:
diff --git a/Service/ServiceImplementations/CustomerServiceImp.cs b/Service/ServiceImplementations/CustomerServiceImp.cs
index 443613243..86c524d54 100644
--- a/Service/ServiceImplementations/CustomerServiceImp.cs
+++ b/Service/ServiceImplementations/CustomerServiceImp.cs
@@ -3680,26 +3680,50 @@ namespace BeWo.Service.ServiceImplementations
             }
         }
 
-        //vorrübergehend 
         public void SetBenutzerPasswortChatAppCode(long pCustomerOid, string benutzerName, string passwort )
         {
             try
             {
                 var cusappcode = DAOFactory.SearchDAO.FindAllCustomerAppCodes(pCustomerOid);
+                int anzahl = cusappcode.Count();
 
-                foreach (var appcode in cusappcode)
+                if (anzahl > 0)
                 {
-                    if(!benutzerName.Equals("") && appcode.BenutzerName != null && !appcode.BenutzerName.Equals(benutzerName)) { 
-                        appcode.BenutzerName = benutzerName;
+                    foreach (var appcode in cusappcode)
+                    {
+                        if (!benutzerName.Equals("") && appcode.BenutzerName != null &&
+                            !appcode.BenutzerName.Equals(benutzerName))
+                        {
+                            appcode.BenutzerName = benutzerName;
+                        }
+
+                        if (!passwort.Equals("") && appcode.Passwort != null && !appcode.Passwort.Equals(passwort))
+                        {
+                            appcode.Passwort = passwort;
+                        }
                     }
 
-                    if (!passwort.Equals("") && appcode.Passwort != null && !appcode.Passwort.Equals(passwort)) { 
-                        appcode.Passwort = passwort;
+                    if (!benutzerName.Equals("") || !passwort.Equals("")) { 
+                        DAOFactory.GenericDAO.Update(cusappcode);
                     }
                 }
-                
-                DAOFactory.GenericDAO.Update(cusappcode);
-              
+                else
+                {
+                 
+                    CustomerAPPCodeDC cusApp = new CustomerAPPCodeDC();
+
+                    cusApp.Benutzername = benutzerName;
+                    cusApp.Passwort = passwort;
+                    cusApp.CustomerOid = pCustomerOid;
+
+                    var yx = MapperFactory.CustomerAPPCodeDC_CustomerAPPCode.MapToNewEntity(cusApp);
+
+                    if (!benutzerName.Equals("") || !passwort.Equals(""))
+                    {
+                        DAOFactory.GenericDAO.Insert(yx);
+                    }
+                }
+               
             }
             catch (Exception e)
             {
diff --git a/Service/ServiceImplementations/OperationsServiceImp.cs b/Service/ServiceImplementations/OperationsServiceImp.cs
index f0a2d38cc..3e0120c1d 100644
--- a/Service/ServiceImplementations/OperationsServiceImp.cs
+++ b/Service/ServiceImplementations/OperationsServiceImp.cs
@@ -7,6 +7,7 @@ using System.Net;
 using System.ServiceModel;
 using System.Text;
 using System.Threading;
+using System.Web;
 using System.Windows;
 using System.Windows.Documents;
 using BeWo.Data;
@@ -4561,8 +4562,7 @@ namespace BeWo.Service.ServiceImplementations
                 throw Utils.CreateBeWoFaultException(e);
             }
         }
-
-        //neu
+    
         public PdfChatHandoutDC GetHandOutPdfForChat(string customerId,string apikey)
         {
             try
@@ -4570,8 +4570,14 @@ namespace BeWo.Service.ServiceImplementations
                 var handout = new PdfChatHandoutDC();
 
                 string serverUrl = ErmittleServerURL(customerId);
-             
-                if (serverUrl.Equals(""))
+
+                if (serverUrl == null)
+                {
+                    handout.Result = 11;
+
+                    return handout;
+                }
+                else if (serverUrl.Equals(""))
                 {
                     handout.Result = 11;
 
@@ -4580,16 +4586,48 @@ namespace BeWo.Service.ServiceImplementations
 
                 var endurl = serverUrl + "/api/ownchat/createpdfmanual/" + apikey + "/" + customerId;
 
+                #region neuer nicht funktionsfähiger bereich 
+                //neu post bereich 
+                //Dictionary<string, string> dic = new Dictionary<string, string>();
+
+                //dic.Add("chatcode", "Hier ChatCode");
+                //dic.Add("login", "hier benutzername");
+                //dic.Add("password", "hier passwort");
+                //dic.Add("custom_logo_url", "https://support.bewoplaner.de/bewoplaner_logo_big.png");
+
+                //string postdaten = "";
+                //foreach (var key in dic.Keys)
+                //{
+                //    postdaten += HttpUtility.UrlEncode(key) + "=" + HttpUtility.UrlEncode(dic[key]) + "&";
+                //}
+
+                //WebRequest requesten = WebRequest.Create(endurl);
+                //requesten.Method = "POST";
+                //requesten.ContentType = "application/x-www-form-urlencoded";
+                ////requesten.Headers["Token"] = "hier ggf. token hin ";
+                //requesten.Headers["CustomerID"] = customerId;
+
+                //byte[] daten = Encoding.ASCII.GetBytes(postdaten);
+
+                //requesten.ContentLength = daten.Length;
+
+                //Stream requestStream = requesten.GetRequestStream();
+
+                //requestStream.Write(daten, 0, daten.Length);
+
+                //requestStream.Close();
+
+
+                //neu ende 
+
+                #endregion 
+
+                //alt get bereich 
                 WebRequest request = WebRequest.Create(endurl);
 
                 request.Credentials = CredentialCache.DefaultCredentials;
                 request.Proxy = null;
 
-                //von get auf Post umstellen
-                //optional übergeben -> chatcode, login->password-> und CustomLogoUrl
-                //Hier die URl zu customLogoURl
-                //  https://support.bewoplaner.de/bewoplaner_logo_big.png 
-
                 WebResponse response = request.GetResponse();
                 
                 string responseFromServer = ReadStreamForChatCode(response);
@@ -4605,9 +4643,7 @@ namespace BeWo.Service.ServiceImplementations
                 var handout = new PdfChatHandoutDC();
                 handout.Result = 13;
 
-                return handout;
-                //MessageBox.Show("Es existiert kein API-Key für die angegebene Kundennummer.\nBitte wenden sie sich an den Support", "Fehler", MessageBoxButton.OK);
-                // return null;              
+                return handout;         
             }
         } 
 
diff --git a/Shared/DataContracts/PdfChatHandoutDC.cs b/Shared/DataContracts/PdfChatHandoutDC.cs
new file mode 100644
index 000000000..6d9a7fa32
--- /dev/null
+++ b/Shared/DataContracts/PdfChatHandoutDC.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Runtime.Serialization;
+
+namespace BS.Shared.DataContracts
+{
+	[DataContract]
+	public class PdfChatHandoutDC :  IDataContract
+	{
+        [DataMember]
+        public string File { get; set; }
+        
+        [DataMember]
+        public int Result { get; set; }
+        
+    }
+}
\ No newline at end of file

From 0798d836ea1cc08a4c14f3dbdb481bf2045c8da6 Mon Sep 17 00:00:00 2001
From: Waldi <waldemar.ruppel@beyondsoft.de>
Date: Fri, 13 Oct 2017 11:06:40 +0200
Subject: [PATCH 4/9] =?UTF-8?q?Chat-Code=20Erneuern=20=20und=20klienigkeit?=
 =?UTF-8?q?en=20hinzugef=C3=BCgt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BeWo/ServiceProxy/Generated.cs                | 18 +++++
 BeWo/View/ChatServiceCustomer.xaml            |  8 +-
 BeWo/View/ChatServiceCustomer.xaml.cs         | 63 ++++++++++++++++
 BeWo/View/ChatServiceEmployee.xaml            |  7 +-
 BeWo/View/ChatServiceEmployee.xaml.cs         | 36 ++++++++-
 .../ServiceContracts/IOperationsService.cs    |  8 ++
 .../OperationsServiceImp.cs                   | 73 ++++++++++++++++++-
 7 files changed, 204 insertions(+), 9 deletions(-)

diff --git a/BeWo/ServiceProxy/Generated.cs b/BeWo/ServiceProxy/Generated.cs
index e6d760a76..c3872f444 100644
--- a/BeWo/ServiceProxy/Generated.cs
+++ b/BeWo/ServiceProxy/Generated.cs
@@ -4415,6 +4415,14 @@ namespace BeWo.ServiceProxy
         [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetHandOutPdfForChatBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
         BS.Shared.DataContracts.PdfChatHandoutDC GetHandOutPdfForChat(string customerId, string apikey);
         
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/DeletEmloyeeChatCode", ReplyAction="http://tempuri.org/IOperationsService/DeletEmloyeeChatCodeResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/DeletEmloyeeChatCodeBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        bool DeletEmloyeeChatCode(string apikey, string kundennummer, long userOid);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/DeletCustomerChatCode", ReplyAction="http://tempuri.org/IOperationsService/DeletCustomerChatCodeResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/DeletCustomerChatCodeBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        bool DeletCustomerChatCode(string apikey, string kundennummer, long userOid);
+        
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/DeactivateInvoices", ReplyAction="http://tempuri.org/IOperationsService/DeactivateInvoicesResponse")]
         [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/DeactivateInvoicesBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
         void DeactivateInvoices(System.Collections.Generic.List<BS.Shared.DataContracts.InvoiceDC> invoices);
@@ -5235,6 +5243,16 @@ namespace BeWo.ServiceProxy
             return base.Channel.GetHandOutPdfForChat(customerId, apikey);
         }
         
+        public bool DeletEmloyeeChatCode(string apikey, string kundennummer, long userOid)
+        {
+            return base.Channel.DeletEmloyeeChatCode(apikey, kundennummer, userOid);
+        }
+        
+        public bool DeletCustomerChatCode(string apikey, string kundennummer, long userOid)
+        {
+            return base.Channel.DeletCustomerChatCode(apikey, kundennummer, userOid);
+        }
+        
         public void DeactivateInvoices(System.Collections.Generic.List<BS.Shared.DataContracts.InvoiceDC> invoices)
         {
             base.Channel.DeactivateInvoices(invoices);
diff --git a/BeWo/View/ChatServiceCustomer.xaml b/BeWo/View/ChatServiceCustomer.xaml
index 6c2cf1562..23260b612 100644
--- a/BeWo/View/ChatServiceCustomer.xaml
+++ b/BeWo/View/ChatServiceCustomer.xaml
@@ -40,8 +40,8 @@
 											        Height="21"  x:Name="GenerateButon"/>
 
                       <TextBox Grid.Column="1" Grid.Row="0" Margin="3" Height="23" MinWidth="120" x:Name="GeneratetTexfield" IsReadOnly="True"/>
-                               
 
+                      <Button Content="Chat-Code Entfernen" Grid.Row="0" Grid.Column="2" Height="23" Click="RemoveCode_OnClick"/>
                       <!-- <Label x:Name="lblIsChatAktive" Grid.Column="0" Grid.Row="1" Margin="3" Content="Chat Aktivieren" />-->
 
 
@@ -55,6 +55,12 @@
                       <TextBox Grid.Row="3" Grid.Column="1" Margin="3" x:Name="TXTPasswort" />
 
                   <Button Content="Speichern" Click="SpeicherButton_OnClick" Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="2" Margin="3" HorizontalAlignment="Right"/>
+
+
+                  <Button Grid.Column="0" Grid.Row="4" Content="Handout PDF Anzeigen" Click="ZeigeHandoutPDF_OnClick " Margin="3" VerticalAlignment="Center" HorizontalAlignment="Left" Height="21"/>
+                  
+                  
+                 
                   
                   <!--  IsChecked="{Binding Path=IsChatAktiv, UpdateSourceTrigger=PropertyChanged}"  -->  
                   
diff --git a/BeWo/View/ChatServiceCustomer.xaml.cs b/BeWo/View/ChatServiceCustomer.xaml.cs
index 903725e76..2becf79ec 100644
--- a/BeWo/View/ChatServiceCustomer.xaml.cs
+++ b/BeWo/View/ChatServiceCustomer.xaml.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Windows;
@@ -211,6 +212,10 @@ namespace BeWo.View
 
                 GeneratetTexfield.Text = getCustomerAppCode[getCustomerAppCode.Count - 1].CustomerCode;
             }
+
+            if (!GeneratetTexfield.Text.Equals("")) { 
+                GenerateButon.Content = "Chat-Code erneuern";
+            }
             //else
             //    x = 0;
 
@@ -269,5 +274,63 @@ namespace BeWo.View
         {
             ServiceFacade.DoCustomerServiceSync(s => s.SetBenutzerPasswortChatAppCode(customerOid.Value, TXTBenutzerName.Text, TXTPasswort.Text));
         }
+
+        private void RemoveCode_OnClick(object sender, RoutedEventArgs e)
+        {
+            if (!GeneratetTexfield.Text.Equals(""))
+            {
+                var isdeletet = ServiceFacade.DoOperationsServiceSync(r => r.DeletCustomerChatCode(BeWoApp.Mandator.Apikey, BeWoApp.Tenant, personOid.Value));
+
+                if (isdeletet)
+                {
+                    GeneratetTexfield.Text = "";
+                }
+                else
+                {
+                    MessageBox.Show("Löschen des ChatCodes Fehlgeschlagen.", "Fehler");
+                }
+            }
+            else
+            {
+                MessageBox.Show("Sie müssen vorher einen Chat-Code generieren, bevor sie ihn löschen können", "Info",
+                    MessageBoxButton.OK, MessageBoxImage.Information);
+            }
+        }
+
+        private void ZeigeHandoutPDF_OnClick(object sender, RoutedEventArgs e)
+        {
+            var handout = ServiceFacade.DoOperationsServiceSync(r => r.GetHandOutPdfForChat(BeWoApp.Tenant, BeWoApp.Mandator.Apikey));
+
+            if (handout.File != null && !handout.File.Equals(""))
+            {
+                handout.Result = 0;
+            }
+
+            switch (handout.Result)
+            {
+                case 0:
+                    //Hier die pdf anzeigen
+
+                    Process.Start(handout.File);
+
+                    break;
+                case 11:
+                    MessageBox.Show("Kundennummer unbekannt.", "Fehler", MessageBoxButton.OK);
+                    break;
+                case 12:
+                    MessageBox.Show("Der API-Key ist falsch -> Auth-Error.", "Fehler", MessageBoxButton.OK);
+                    break;
+                case 13:
+                    MessageBox.Show("Es existiert kein API-Key für die angegebene Kundennummer.", "Fehler", MessageBoxButton.OK);
+                    break;
+                case 40:
+                    MessageBox.Show("Vorlage nicht gefunden.", "Fehler", MessageBoxButton.OK);
+                    break;
+                case 41:
+                    MessageBox.Show("Ungültige Custom-Logo-URL.", "Fehler", MessageBoxButton.OK);
+                    break;
+            }
+
+        }
     }
 }
\ No newline at end of file
diff --git a/BeWo/View/ChatServiceEmployee.xaml b/BeWo/View/ChatServiceEmployee.xaml
index 2e10d19bb..df82d57aa 100644
--- a/BeWo/View/ChatServiceEmployee.xaml
+++ b/BeWo/View/ChatServiceEmployee.xaml
@@ -23,11 +23,10 @@
             <GroupBox Grid.ColumnSpan="2" Padding="5" Style="{StaticResource ObjectEditGroupBox}" Header="Chat Service">
                 <Grid>
                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" />                     
+                        <ColumnDefinition Width="Auto" />                   
                         <ColumnDefinition Width="Auto" />
                         <ColumnDefinition Width="*" />
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="*" />
-                        <ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
                     <Grid.RowDefinitions>
                         <RowDefinition Height="Auto" />
@@ -42,6 +41,8 @@
 
                   <TextBox Grid.Column="1" Grid.Row="0" Margin="3" Height="23" MinWidth="120" x:Name="GeneratetTexfield" IsReadOnly="True"  />
 
+                  <Button Content="Chat-Code Entfernen" Grid.Row="0" Grid.Column="2" Height="23" Click="RemoveCode_OnClick"/>
+                  
                   <!--<Label x:Name="lblIsChatAktive" Grid.Column="0" Grid.Row="1" Content="Chat Aktivieren"  />
 
                   <CheckBox x:Name="ChatAktive" Grid.Column="1" Grid.Row="1" Margin="3" Height="23"  Checked="CheckBox_Checked" Unchecked="CheckBox_Unchecked"  />
diff --git a/BeWo/View/ChatServiceEmployee.xaml.cs b/BeWo/View/ChatServiceEmployee.xaml.cs
index db319a8ae..8ee5116a6 100644
--- a/BeWo/View/ChatServiceEmployee.xaml.cs
+++ b/BeWo/View/ChatServiceEmployee.xaml.cs
@@ -170,12 +170,19 @@ namespace BeWo.View
                 
                 GeneratetTexfield.Text = getEmployeeAppCode[getEmployeeAppCode.Count - 1].EmployeeCode;            
             }
+            
+
+            if (!GeneratetTexfield.Text.Equals(""))
+            {
+                GenerateButon.Content = "Chat-Code erneuern";
+            }
 
             #region Nicht mehr gebrauchter Code
+
             /* String a = "";
-             String b = "";
-             bool c = false;
-            */
+                         String b = "";
+                         bool c = false;
+                        */
 
             //  a = getEmployeeAppCode[getEmployeeAppCode.Count - 1].EmployeeCode;
 
@@ -199,6 +206,7 @@ namespace BeWo.View
 
 
             //  ChatServiceBuilder builder = new ChatServiceBuilder(c,b,a);
+
             #endregion
         }
 
@@ -238,5 +246,27 @@ namespace BeWo.View
                     break;
             }
         }
+
+        private void RemoveCode_OnClick(object sender, RoutedEventArgs e)
+        {
+            if (!GeneratetTexfield.Text.Equals(""))
+            {
+                var isdeletet = ServiceFacade.DoOperationsServiceSync(r => r.DeletEmloyeeChatCode(BeWoApp.Mandator.Apikey, BeWoApp.Tenant, personOid.Value));
+
+                if (isdeletet)
+                {
+                    GeneratetTexfield.Text = "";
+                }
+                else
+                {
+                    MessageBox.Show("Löschen des ChatCodes Fehlgeschlagen.", "Fehler");
+                }
+            }
+            else
+            {
+                MessageBox.Show("Sie müssen vorher einen Chat-Code generieren, bevor sie ihn löschen können", "Info",
+                    MessageBoxButton.OK, MessageBoxImage.Information);
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/Service/ServiceContracts/IOperationsService.cs b/Service/ServiceContracts/IOperationsService.cs
index 3b814303a..4141641c8 100644
--- a/Service/ServiceContracts/IOperationsService.cs
+++ b/Service/ServiceContracts/IOperationsService.cs
@@ -699,5 +699,13 @@ namespace BeWo.Service.ServiceContracts
         [FaultContract(typeof(BeWoFault))]
         [OperationContract]
         PdfChatHandoutDC GetHandOutPdfForChat(string customerId, string apikey);
+
+        [FaultContract(typeof(BeWoFault))]
+        [OperationContract]
+        bool DeletEmloyeeChatCode(string apikey, string kundennummer, long userOid);
+        
+        [FaultContract(typeof(BeWoFault))]
+        [OperationContract]
+        bool DeletCustomerChatCode(string apikey, string kundennummer, long userOid);
     }
 }
\ No newline at end of file
diff --git a/Service/ServiceImplementations/OperationsServiceImp.cs b/Service/ServiceImplementations/OperationsServiceImp.cs
index 3e0120c1d..8a2bec432 100644
--- a/Service/ServiceImplementations/OperationsServiceImp.cs
+++ b/Service/ServiceImplementations/OperationsServiceImp.cs
@@ -4645,9 +4645,78 @@ namespace BeWo.Service.ServiceImplementations
 
                 return handout;         
             }
-        } 
+        }
+
+        public bool DeletCustomerChatCode(string apikey,string kundennummer,long userOid)
+        {
+            try
+            {
+                DeletZufallsCode(apikey, kundennummer, "C" + userOid);
+
+                var customerappcode = DAOFactory.SearchDAO.FindAllCustomerAppCodes(userOid);
+
+                var anzahl = customerappcode.Count();
+
+                if (anzahl > 0)
+                {
+                    foreach (var code in customerappcode)
+                    {
+                        code.CustomerCode = "";
+                        code.CustomerCodeGenDate = DateTime.Now;
+                    }
+
+
+                    DAOFactory.GenericDAO.Update(customerappcode);
+
+                    return true;
+                }
+                else
+                {
+                    return false;
+                }
+            }
+            catch (Exception e)
+            {
+                return false;
+                //   throw Utils.CreateBeWoFaultException(e);
+            }
+        }
+
+        public bool DeletEmloyeeChatCode(string apikey, string kundennummer, long userOid)
+        {
+            try
+            {
+                DeletZufallsCode(apikey, kundennummer, "E" + userOid);
+
+                var employeeappcode = DAOFactory.SearchDAO.FindAllEmployeeAppCodes(userOid);
+
+                var anzahl = employeeappcode.Count();
+
+                if (anzahl > 0)
+                {
+                    foreach (var code in employeeappcode)
+                    {
+                        code.EmployeeCode = "";
+                        code.EmployeeCodeGenDate = DateTime.Now;
+                    }
+
+
+                    DAOFactory.GenericDAO.Update(employeeappcode);
+
+                    return true;
+                }
+                else
+                {
+                    return false;
+                }
+            }
+            catch (Exception e)
+            {
+                return false;
+                //throw Utils.CreateBeWoFaultException(e);
+            }
+        }
 
-        
         #endregion
     }
 }
\ No newline at end of file

From ce1f1a57d5a8b2f98006e8dbbeaa970efd0d2dd4 Mon Sep 17 00:00:00 2001
From: Christian <christian.baeurle@beyondsoft.de>
Date: Fri, 13 Oct 2017 11:10:37 +0200
Subject: [PATCH 5/9] Enums TextModules in Textbausteine umbenannt

---
 BeWo/BeWoApp.xaml.cs                          | 4 ++--
 BeWo/View/ChatServiceCustomer.xaml.cs         | 8 ++++----
 BeWo/View/ChatServiceEmployee.xaml.cs         | 8 ++++----
 BeWo/View/Detail/ServiceRecordView2.xaml.cs   | 8 ++++----
 BeWo/View/Detail/TextModuleView.xaml.cs       | 8 ++++----
 BeWo/View/Master/AdministrationView.xaml.cs   | 2 +-
 BeWo/View/Search/TextModuleSearchView.cs      | 2 +-
 BeWo/ViewModel/TextModuleVM.cs                | 2 +-
 BeWo/ViewModel/VMFactory.cs                   | 2 +-
 BeWoPlanerMobil/Controllers/ChatController.cs | 2 +-
 BeWoPlanerMobil/Controllers/MainController.cs | 4 ++--
 BeWoPlanerMobil/Models/MainModel.cs           | 4 ++--
 Model/Changes_2017_10_09.txt                  | 4 +++-
 Shared/BeWoEntityEnums.cs                     | 8 ++++----
 Shared/Core/EnumTranslations.cs               | 8 ++++----
 15 files changed, 38 insertions(+), 36 deletions(-)

diff --git a/BeWo/BeWoApp.xaml.cs b/BeWo/BeWoApp.xaml.cs
index 9f7da0f05..d963e688e 100644
--- a/BeWo/BeWoApp.xaml.cs
+++ b/BeWo/BeWoApp.xaml.cs
@@ -39,7 +39,7 @@ namespace BeWo
 
 		//public static string Version = "Version 2.0";
 
-		public static string Version = "Version 2.3.4";
+		public static string Version = "Version 2.4.1";
 
 		public static int RenderTier = 0;
 
@@ -243,7 +243,7 @@ namespace BeWo
 				    {
 				        isOnlyYearMonthVisible = true;
 				    }
-				    isOnlyYearMonthVisible = true;
+				    
                     val = GetSettingValue(_Mandator.Settings, "IsZeiterfassungInStdMin");
                     if (val != null && val.Equals("1"))
                     {
diff --git a/BeWo/View/ChatServiceCustomer.xaml.cs b/BeWo/View/ChatServiceCustomer.xaml.cs
index a36cc2265..6a309fe05 100644
--- a/BeWo/View/ChatServiceCustomer.xaml.cs
+++ b/BeWo/View/ChatServiceCustomer.xaml.cs
@@ -152,7 +152,7 @@ namespace BeWo.View
 
             if (!GeneratetTexfield.Text.Equals("") && BeWoApp.Tenant != null && BeWoApp.Mandator.Apikey != null)
             {
-                if (MessageBox.Show("Wollen sie wirklich ihren Code ändern?", "Achtung", MessageBoxButton.YesNo,
+                if (MessageBox.Show("Wollen Sie wirklich den Code ändern?", "Achtung", MessageBoxButton.YesNo,
                         MessageBoxImage.Question) == MessageBoxResult.Yes)
                 {
                     var result =
@@ -162,7 +162,7 @@ namespace BeWo.View
                     if(result != null){
                         GeneratetTexfield.Text = result.CustomerCode;
                     }else{
-                        MessageBox.Show("Beim erstellen eines neuen Chatcodes ist ein fehler aufgetreten. ");
+                        MessageBox.Show("Beim Erstellen eines neuen Chatcodes ist ein Fehler aufgetreten.");
                     }
 
                     //GeneratetTexfield.Text = result.CustomerCode;
@@ -175,13 +175,13 @@ namespace BeWo.View
                 if(result != null){
                     GeneratetTexfield.Text = result.CustomerCode;
                 }else{
-                    MessageBox.Show("Beim erstellen eines neuen Chatcodes ist ein fehler aufgetreten. ");
+                    MessageBox.Show("Beim Erstellen eines neuen Chatcodes ist ein Fehler aufgetreten.");
                 }
                 //GeneratetTexfield.Text = result.CustomerCode;    
             }
             else
             {
-                MessageBox.Show("Sie besitzen derzeit keinen API-Key. Bitte wenden sie sich an den Suppoert. ","Info",MessageBoxButton.OK);
+                MessageBox.Show("Sie besitzen derzeit keinen API-Key. Bitte wenden sie sich an den Support.","Info",MessageBoxButton.OK);
             }
 //#endif
         }
diff --git a/BeWo/View/ChatServiceEmployee.xaml.cs b/BeWo/View/ChatServiceEmployee.xaml.cs
index 74362a3e9..1688fb8c0 100644
--- a/BeWo/View/ChatServiceEmployee.xaml.cs
+++ b/BeWo/View/ChatServiceEmployee.xaml.cs
@@ -96,7 +96,7 @@ namespace BeWo.View
 //#else
             if (!GeneratetTexfield.Text.Equals("") && BeWoApp.Tenant != null && BeWoApp.Mandator.Apikey != null)
             {
-                if (MessageBox.Show("Wollen sie wirklich ihren Code ändern?", "Achtung", MessageBoxButton.YesNo,
+                if (MessageBox.Show("Wollen Sie wirklich den Code ändern?", "Achtung", MessageBoxButton.YesNo,
                         MessageBoxImage.Question) == MessageBoxResult.Yes)
                 {
                     var result = ServiceFacade.DoOperationsServiceSync(s => s.CreateNewEmployeeAPPCodeDC(employeeOid.Value, BeWoApp.Tenant, BeWoApp.Mandator.Apikey, personOid.Value)); 
@@ -104,7 +104,7 @@ namespace BeWo.View
                     if(result != null){
                         GeneratetTexfield.Text = result.EmployeeCode;
                     }else{
-                        MessageBox.Show("Beim erstellen eines neuen Chatcodes ist ein fehler aufgetreten. ");
+                        MessageBox.Show("Beim Erstellen eines neuen Chatcodes ist ein Fehler aufgetreten.");
                     }
                 }
             }
@@ -124,12 +124,12 @@ namespace BeWo.View
                     if(result != null){
                         GeneratetTexfield.Text = result.EmployeeCode;
                     }else{
-                        MessageBox.Show("Beim erstellen eines neuen Chatcodes ist ein fehler aufgetreten. ");
+                        MessageBox.Show("Beim Erstellen eines neuen Chatcodes ist ein Fehler aufgetreten.");
                     }
                 }
                 else
                 {
-                    MessageBox.Show("Sie besitzen derzeit keinen API-Key. Bitte wenden sie sich an den Suppoert. ","Info",MessageBoxButton.OK);
+                    MessageBox.Show("Sie besitzen derzeit keinen API-Key. Bitte wenden sie sich an den Support.","Info",MessageBoxButton.OK);
                 }
             }
 //#endif
diff --git a/BeWo/View/Detail/ServiceRecordView2.xaml.cs b/BeWo/View/Detail/ServiceRecordView2.xaml.cs
index 16cdf79c7..a3b988aac 100644
--- a/BeWo/View/Detail/ServiceRecordView2.xaml.cs
+++ b/BeWo/View/Detail/ServiceRecordView2.xaml.cs
@@ -223,7 +223,7 @@ namespace BeWo.View.Detail
 			{
 				chkMultiBooking.Visibility = Visibility.Collapsed;
 			}
-            if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.TextModulesAlleAnsehen) && !BeWoApp.LoggedOnUser.HasRight(UserRightType.TextModulesNurEigeneAnsehen))
+            if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.TextbausteineAlleAnsehen) && !BeWoApp.LoggedOnUser.HasRight(UserRightType.TextbausteineNurEigeneAnsehen))
             {
 				TextModuleTreeViewControl1.Visibility = Visibility.Collapsed;    
                 TextbausteineBearbeitenButton1.Visibility = Visibility.Collapsed;
@@ -236,7 +236,7 @@ namespace BeWo.View.Detail
 				TextModuleTreeViewControl5.Visibility = Visibility.Collapsed;
 				TextbausteineBearbeitenButton5.Visibility = Visibility.Collapsed;
             }
-            if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.TextModulesAlleBearbeiten) && !BeWoApp.LoggedOnUser.HasRight(UserRightType.TextModulesNurEigeneBearbeiten))
+            if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.TextbausteineAlleBearbeiten) && !BeWoApp.LoggedOnUser.HasRight(UserRightType.TextbausteineNurEigeneBearbeiten))
             {
                 TextbausteineBearbeitenButton1.Visibility = Visibility.Collapsed;
 				TextbausteineBearbeitenButton2.Visibility = Visibility.Collapsed;
@@ -3630,13 +3630,13 @@ namespace BeWo.View.Detail
             textbausteineOptionen.Click += EditTextbausteineClick;
 	        textbausteine.TextModuleSelected += TextModuleTreeViewControl_OnTextModuleSelected;
 
-			if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.TextModulesAlleAnsehen) && !BeWoApp.LoggedOnUser.HasRight(UserRightType.TextModulesNurEigeneAnsehen))
+			if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.TextbausteineAlleAnsehen) && !BeWoApp.LoggedOnUser.HasRight(UserRightType.TextbausteineNurEigeneAnsehen))
 			{
 				textbausteine.Visibility = Visibility.Collapsed;
 				textbausteineOptionen.Visibility = Visibility.Collapsed;
 			}
 
-			if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.TextModulesAlleBearbeiten) && !BeWoApp.LoggedOnUser.HasRight(UserRightType.TextModulesNurEigeneBearbeiten))
+			if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.TextbausteineAlleBearbeiten) && !BeWoApp.LoggedOnUser.HasRight(UserRightType.TextbausteineNurEigeneBearbeiten))
 			{
 				textbausteineOptionen.Visibility = Visibility.Collapsed;
 			}
diff --git a/BeWo/View/Detail/TextModuleView.xaml.cs b/BeWo/View/Detail/TextModuleView.xaml.cs
index 02ba8270a..b4bdeda17 100644
--- a/BeWo/View/Detail/TextModuleView.xaml.cs
+++ b/BeWo/View/Detail/TextModuleView.xaml.cs
@@ -38,7 +38,7 @@ namespace BeWo.View.Detail
 
 	    public bool IsInAdministrationView { get; }
 
-	    public bool AreUserControlsEnabled => IsInAdministrationView ? BeWoApp.LoggedOnUser.HasRight(UserRightType.TextModulesAlleBearbeiten) : BeWoApp.LoggedOnUser.HasRight(UserRightType.TextModulesNurEigeneBearbeiten);
+	    public bool AreUserControlsEnabled => IsInAdministrationView ? BeWoApp.LoggedOnUser.HasRight(UserRightType.TextbausteineAlleBearbeiten) : BeWoApp.LoggedOnUser.HasRight(UserRightType.TextbausteineNurEigeneBearbeiten);
 
 	    public TextModuleView(TextModuleListVM pViewModel, bool pIsInAdministrationView = false)
         {
@@ -141,9 +141,9 @@ namespace BeWo.View.Detail
 	        {
                 var isOwn = textModuleVM.Employee.EmployeeOid.Equals(BeWoApp.LoggedOnEmployee.EmployeeOid);
 
-		        var hasRight2EditAll = BeWoApp.LoggedOnUser.HasRight(UserRightType.TextModulesAlleBearbeiten);
-		        var hasRight2EditOwn = BeWoApp.LoggedOnUser.HasRight(UserRightType.TextModulesNurEigeneBearbeiten);
-		        var hasRight2Create4All = BeWoApp.LoggedOnUser.HasRight(UserRightType.TextModulesAlleBearbeiten);
+		        var hasRight2EditAll = BeWoApp.LoggedOnUser.HasRight(UserRightType.TextbausteineAlleBearbeiten);
+		        var hasRight2EditOwn = BeWoApp.LoggedOnUser.HasRight(UserRightType.TextbausteineNurEigeneBearbeiten);
+		        var hasRight2Create4All = BeWoApp.LoggedOnUser.HasRight(UserRightType.TextbausteineAlleBearbeiten);
 
 		        if(parameter != null && parameter.ToString().Equals("IsOnlyForEmployeeCheckBox"))
 		        {
diff --git a/BeWo/View/Master/AdministrationView.xaml.cs b/BeWo/View/Master/AdministrationView.xaml.cs
index 0af76906e..7d3e21b1f 100644
--- a/BeWo/View/Master/AdministrationView.xaml.cs
+++ b/BeWo/View/Master/AdministrationView.xaml.cs
@@ -54,7 +54,7 @@ namespace BeWo.View.Master
 				tabitem_medikamentenarten.Visibility = Visibility.Collapsed;
 			}
 
-			if(!BeWoApp.LoggedOnUser.HasRight(UserRightType.TextModulesAlleAnsehen) && !BeWoApp.LoggedOnUser.HasRight(UserRightType.TextModulesAlleBearbeiten))
+			if(!BeWoApp.LoggedOnUser.HasRight(UserRightType.TextbausteineAlleAnsehen) && !BeWoApp.LoggedOnUser.HasRight(UserRightType.TextbausteineAlleBearbeiten))
 			{
 				tabitem_textbausteine.Visibility = Visibility.Collapsed;
 			}
diff --git a/BeWo/View/Search/TextModuleSearchView.cs b/BeWo/View/Search/TextModuleSearchView.cs
index 3947bc7c6..1a3aac911 100644
--- a/BeWo/View/Search/TextModuleSearchView.cs
+++ b/BeWo/View/Search/TextModuleSearchView.cs
@@ -45,7 +45,7 @@ namespace BeWo.View.Search
             {
                 r = r.OrderBy(tb => tb.ServiceCategory == null).ThenBy(tb => tb.Position).ThenBy(tb => tb.Name).ToList();
 
-                r = !BeWoApp.LoggedOnUser.HasRight(UserRightType.TextModulesAlleAnsehen) ? 
+                r = !BeWoApp.LoggedOnUser.HasRight(UserRightType.TextbausteineAlleAnsehen) ? 
                     r.Where(w => w.Employee.EmployeeOid.Equals(BeWoApp.LoggedOnEmployee.EmployeeOid)).ToList() :
                     r.Where(w => !(w.IsOnlyForEmployee && !w.Employee.EmployeeOid.Equals(BeWoApp.LoggedOnEmployee.EmployeeOid))).ToList();
 
diff --git a/BeWo/ViewModel/TextModuleVM.cs b/BeWo/ViewModel/TextModuleVM.cs
index 89aa68dee..63d880a55 100644
--- a/BeWo/ViewModel/TextModuleVM.cs
+++ b/BeWo/ViewModel/TextModuleVM.cs
@@ -175,7 +175,7 @@ namespace BeWo.ViewModel
             {
                 ServiceFacade.DoEmployeeServiceSync(s => _Employee = s.LoadCompactEmployee(BeWoApp.LoggedOnEmployee.EmployeeOid.Value));
 
-                if (BeWoApp.LoggedOnUser.HasRight(UserRightType.TextModulesNurEigeneBearbeiten) && !BeWoApp.LoggedOnUser.HasRight(UserRightType.TextModulesAlleBearbeiten))
+                if (BeWoApp.LoggedOnUser.HasRight(UserRightType.TextbausteineNurEigeneBearbeiten) && !BeWoApp.LoggedOnUser.HasRight(UserRightType.TextbausteineAlleBearbeiten))
                 {
                     _IsOnlyForEmployee = true;
                 }
diff --git a/BeWo/ViewModel/VMFactory.cs b/BeWo/ViewModel/VMFactory.cs
index 2a228eeb7..469ce8f25 100644
--- a/BeWo/ViewModel/VMFactory.cs
+++ b/BeWo/ViewModel/VMFactory.cs
@@ -437,7 +437,7 @@ namespace BeWo.ViewModel
 
         public static void CreateTextModuleListVMAsync(Action<TextModuleListVM> pCallBack, bool pIsInAdministrationView = false, bool pIsInTextModuleEditor = false)
         {
-            ServiceFacade.DoOperationsServiceAsync(s1 => s1.GetTextModules(pIsInTextModuleEditor, BeWoApp.LoggedOnEmployee.EmployeeOid.Value, BeWoApp.LoggedOnUser.HasRight(UserRightType.TextModulesAlleAnsehen), pIsInAdministrationView), r1 => ServiceFacade.DoOperationsServiceAsync(
+            ServiceFacade.DoOperationsServiceAsync(s1 => s1.GetTextModules(pIsInTextModuleEditor, BeWoApp.LoggedOnEmployee.EmployeeOid.Value, BeWoApp.LoggedOnUser.HasRight(UserRightType.TextbausteineAlleAnsehen), pIsInAdministrationView), r1 => ServiceFacade.DoOperationsServiceAsync(
                 s2 => s2.GetAllServiceCategories(),
                     s3 =>
                     {
diff --git a/BeWoPlanerMobil/Controllers/ChatController.cs b/BeWoPlanerMobil/Controllers/ChatController.cs
index e20940f09..7b764e275 100644
--- a/BeWoPlanerMobil/Controllers/ChatController.cs
+++ b/BeWoPlanerMobil/Controllers/ChatController.cs
@@ -255,7 +255,7 @@ namespace BeWoPlanerMobil.Controllers
 		                            {
 		                                miInput = new JsonRueckgabeMitarbeiterInput(appus[daten.Oid].Oid.ToString(),
 		                                    daten.Oid.ToString(), "1", appus[daten.Oid].LoginName,
-                                            appus[daten.Oid].HashedPassword, daten.Person.FirstName,
+                                            appus[daten.Oid].BCryptPassword, daten.Person.FirstName,
 		                                    daten.Person.LastName,
 		                                    chatcode.EmployeeCode, handy, daten.Person.Oid.ToString(), instsStr);
 		                            }
diff --git a/BeWoPlanerMobil/Controllers/MainController.cs b/BeWoPlanerMobil/Controllers/MainController.cs
index 8b553dc0d..43be55771 100644
--- a/BeWoPlanerMobil/Controllers/MainController.cs
+++ b/BeWoPlanerMobil/Controllers/MainController.cs
@@ -514,14 +514,14 @@ namespace BeWoPlanerMobil.Controllers
 
         public string LoadTextbausteineForServiceCategory(long pServiceCategoryOid)
         {
-            if (!MobileSessionFacade.CheckForUserRight(UserRightType.TextModulesNurEigeneAnsehen) && !MobileSessionFacade.CheckForUserRight(UserRightType.TextModulesAlleAnsehen))
+            if (!MobileSessionFacade.CheckForUserRight(UserRightType.TextbausteineNurEigeneAnsehen) && !MobileSessionFacade.CheckForUserRight(UserRightType.TextbausteineAlleAnsehen))
             {
                 return null;
             }
 
             var textbausteine = OperationsService.GetTextModulesByServiceCategory(pServiceCategoryOid);
 
-            if(MobileSessionFacade.CheckForUserRight(UserRightType.TextModulesNurEigeneAnsehen))
+            if(MobileSessionFacade.CheckForUserRight(UserRightType.TextbausteineNurEigeneAnsehen))
             {
                 textbausteine = textbausteine.Where(w => w.Employee.EmployeeOid == Model.Employee.EmployeeOid).ToList();
             }
diff --git a/BeWoPlanerMobil/Models/MainModel.cs b/BeWoPlanerMobil/Models/MainModel.cs
index 5b697ff20..537cc8370 100644
--- a/BeWoPlanerMobil/Models/MainModel.cs
+++ b/BeWoPlanerMobil/Models/MainModel.cs
@@ -113,8 +113,8 @@ namespace BeWoPlanerMobil.Models
 	    {
 	        get
 	        {
-	            return MobileSessionFacade.CheckForUserRight(UserRightType.TextModulesAlleAnsehen) ||
-	                   MobileSessionFacade.CheckForUserRight(UserRightType.TextModulesNurEigeneAnsehen);
+	            return MobileSessionFacade.CheckForUserRight(UserRightType.TextbausteineAlleAnsehen) ||
+	                   MobileSessionFacade.CheckForUserRight(UserRightType.TextbausteineNurEigeneAnsehen);
 	        }
 	    }
 
diff --git a/Model/Changes_2017_10_09.txt b/Model/Changes_2017_10_09.txt
index 765ec0720..3fa7dd29d 100644
--- a/Model/Changes_2017_10_09.txt
+++ b/Model/Changes_2017_10_09.txt
@@ -1,2 +1,4 @@
 ALTER TABLE `applicationuser` 
-ADD COLUMN `PasswordHash` VARCHAR(1024) NULL DEFAULT NULL COMMENT '';
\ No newline at end of file
+ADD COLUMN `PasswordHash` VARCHAR(1024) NULL DEFAULT NULL COMMENT '';
+
+ALTER TABLE textbaustein ADD COLUMN `IsParent` TINYINT(1);
\ No newline at end of file
diff --git a/Shared/BeWoEntityEnums.cs b/Shared/BeWoEntityEnums.cs
index 2b1f7cfff..d03941aa0 100644
--- a/Shared/BeWoEntityEnums.cs
+++ b/Shared/BeWoEntityEnums.cs
@@ -416,10 +416,10 @@ namespace BS.Shared
 
         AllowChangeOwnPassword = 20800,
 
-        TextModulesAlleAnsehen         = 20900,
-        TextModulesNurEigeneAnsehen    = 20901,
-        TextModulesAlleBearbeiten      = 20902,
-        TextModulesNurEigeneBearbeiten = 20903,
+        TextbausteineAlleAnsehen = 20900,
+        TextbausteineNurEigeneAnsehen = 20901,
+        TextbausteineAlleBearbeiten = 20902,
+        TextbausteineNurEigeneBearbeiten = 20903,
         //TextbausteineAlleAnlegen         = 20904,
         //TextbausteineNurEigeneAnlegen    = 20905,
 
diff --git a/Shared/Core/EnumTranslations.cs b/Shared/Core/EnumTranslations.cs
index 057eaea73..feb41e1f5 100644
--- a/Shared/Core/EnumTranslations.cs
+++ b/Shared/Core/EnumTranslations.cs
@@ -452,16 +452,16 @@ namespace BS.Shared.Core
                                                  UserRightType.KalenderInZeiterfassungUebernehmen, "Termine in Zeiterfassung übernehmen"
                                                 },
                                             {
-                                                 UserRightType.TextModulesAlleAnsehen, "Textbausteine ansehen (allgemeine)"
+                                                 UserRightType.TextbausteineAlleAnsehen, "Textbausteine ansehen (allgemeine)"
                                                 },
                                             {
-                                                 UserRightType.TextModulesNurEigeneAnsehen, "Textbausteine ansehen (eigene)"
+                                                 UserRightType.TextbausteineNurEigeneAnsehen, "Textbausteine ansehen (eigene)"
                                                 },
                                             {
-                                                 UserRightType.TextModulesAlleBearbeiten, "Textbausteine bearbeiten (allgemeine)"
+                                                 UserRightType.TextbausteineAlleBearbeiten, "Textbausteine bearbeiten (allgemeine)"
                                                 },
                                             {
-                                                 UserRightType.TextModulesNurEigeneBearbeiten, "Textbausteine bearbeiten (eigene)"
+                                                 UserRightType.TextbausteineNurEigeneBearbeiten, "Textbausteine bearbeiten (eigene)"
                                                 },
                                             //{
                                             //     UserRightType.TextbausteineAlleAnlegen, "Textbausteine für alle Mitarbeiter anlegen"

From 7cfdd04648dc644f6552b019ada9f07dc34106f1 Mon Sep 17 00:00:00 2001
From: Christian <christian.baeurle@beyondsoft.de>
Date: Fri, 13 Oct 2017 11:11:08 +0200
Subject: [PATCH 6/9] cb

---
 BeWo/BeWo.csproj | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj
index 2f3ca6f41..1526b16ea 100644
--- a/BeWo/BeWo.csproj
+++ b/BeWo/BeWo.csproj
@@ -29,7 +29,7 @@
     </FileUpgradeFlags>
     <OldToolsVersion>3.5</OldToolsVersion>
     <UpgradeBackupLocation />
-    <PublishUrl>D:\Projects\beyondsoft\BeWoPlaner\Publish\</PublishUrl>
+    <PublishUrl>D:\Projects\beyondsoft\BeWoPlaner\Publish45\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Web</InstallFrom>
     <UpdateEnabled>true</UpdateEnabled>
@@ -39,16 +39,16 @@
     <UpdatePeriodically>false</UpdatePeriodically>
     <UpdateRequired>true</UpdateRequired>
     <MapFileExtensions>false</MapFileExtensions>
-    <InstallUrl>http://fortis-bewoplaner.fortis-ev.org.local/</InstallUrl>
+    <InstallUrl>http://app.beyondsoft.de/dev/</InstallUrl>
     <TargetCulture>de-DE</TargetCulture>
     <ProductName>BeWoPlaner</ProductName>
     <PublisherName>beyondSoft GmbH</PublisherName>
-    <MinimumRequiredVersion>2.0.1.129</MinimumRequiredVersion>
+    <MinimumRequiredVersion>2.0.1.130</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.htm</WebPage>
     <OpenBrowserOnPublish>false</OpenBrowserOnPublish>
     <TrustUrlParameters>true</TrustUrlParameters>
-    <ApplicationRevision>130</ApplicationRevision>
+    <ApplicationRevision>131</ApplicationRevision>
     <ApplicationVersion>2.0.1.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>

From 60cf6523f93cc43172e189691848ef9c1fde3c02 Mon Sep 17 00:00:00 2001
From: Waldi <waldemar.ruppel@beyondsoft.de>
Date: Fri, 13 Oct 2017 11:22:41 +0200
Subject: [PATCH 7/9] =?UTF-8?q?abfrage=20hinzugef=C3=BCgt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BeWo/View/HomeDragPanelView.xaml.cs | 35 ++++++++++++++++++++---------
 1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/BeWo/View/HomeDragPanelView.xaml.cs b/BeWo/View/HomeDragPanelView.xaml.cs
index e3a3e6398..dd11d3c62 100644
--- a/BeWo/View/HomeDragPanelView.xaml.cs
+++ b/BeWo/View/HomeDragPanelView.xaml.cs
@@ -1310,31 +1310,44 @@ namespace BeWo.View
                 var xxx = empAppCodes.Last();
 
                 string _kundennummer = BeWoApp.Tenant;
-                string _ChatCode = xxx.EmployeeCode; 
+                
                 string _benutzername = BeWoApp.UserName;
                 string _passwort = "12345678"; // welches passwort wird hier benutzt
                 string _apikey;
-                
+
+                string _ChatCode = "";
+                if (xxx.EmployeeCode!= null && !xxx.EmployeeCode.Equals("")) { 
+                    _ChatCode = xxx.EmployeeCode;
+                }
+
                 if (BeWoApp.Mandator.Apikey != null)
                     _apikey = BeWoApp.Mandator.Apikey; 
                 else
                     _apikey = "0000"; //erstmal zu default zwecken damit nichts abstürzt
 
-                Login _login = new Login(_kundennummer, _ChatCode, _benutzername, _passwort, _apikey);
+                if (_ChatCode.Equals(""))//Weitere Abfragen von nöten
+                {                 
+                    Login _login = new Login(_kundennummer, _ChatCode, _benutzername, _passwort, _apikey);
 
-                var x = _login.AnmeldevorgangDurchFuehren();
+                    var x = _login.AnmeldevorgangDurchFuehren();
 
-                if (x != null)
-                {
-                    ServiceChatView = new ChatView(x);
-                    ServiceChatView.Show();
+                    if (x != null)
+                    {
+                        ServiceChatView = new ChatView(x);
+                        ServiceChatView.Show();
+                    }
+                    else
+                    {
+                        //fehlermeldungen weiter Spezifizieren 
+                        MessageBox.Show(
+                            "Es konnte keine Verbindung hergestellt werden.\nBitte versuchen sie es später erneut");
+                    }
                 }
                 else
                 {
-                    //fehlermeldungen weiter Spezifizieren 
-                    MessageBox.Show("Es konnte keine Verbindung hergestellt werden.\nBitte versuchen sie es später erneut");
+                    MessageBox.Show("Sie benötgen einen gültigen Chat-Code.","Info");
                 }
-                
+
             }
             else if (ServiceChatView.Visibility == Visibility.Visible)
             {

From 0739d5ca40c83b39781a7c41656e81942e3a37f8 Mon Sep 17 00:00:00 2001
From: Waldi <waldemar.ruppel@beyondsoft.de>
Date: Fri, 13 Oct 2017 11:28:16 +0200
Subject: [PATCH 8/9] commit

---
 BeWo/View/HomeDragPanelView.xaml.cs | 64 ++++++++++++++++-------------
 1 file changed, 36 insertions(+), 28 deletions(-)

diff --git a/BeWo/View/HomeDragPanelView.xaml.cs b/BeWo/View/HomeDragPanelView.xaml.cs
index dd11d3c62..c5dc8e3ba 100644
--- a/BeWo/View/HomeDragPanelView.xaml.cs
+++ b/BeWo/View/HomeDragPanelView.xaml.cs
@@ -1307,45 +1307,53 @@ namespace BeWo.View
             {
                 var empAppCodes = ServiceFacade.DoEmployeeServiceSync(r=>r.GetAllEmployeeAppCodes(BeWoApp.LoggedOnUser.Employee.EmployeeOid));
 
-                var xxx = empAppCodes.Last();
+                if (empAppCodes != null && empAppCodes.Count > 0)
+                {
+                    var xxx = empAppCodes.Last();
 
-                string _kundennummer = BeWoApp.Tenant;
-                
-                string _benutzername = BeWoApp.UserName;
-                string _passwort = "12345678"; // welches passwort wird hier benutzt
-                string _apikey;
+                    string _kundennummer = BeWoApp.Tenant;
 
-                string _ChatCode = "";
-                if (xxx.EmployeeCode!= null && !xxx.EmployeeCode.Equals("")) { 
-                    _ChatCode = xxx.EmployeeCode;
-                }
+                    string _benutzername = BeWoApp.UserName;
+                    string _passwort = "12345678"; // welches passwort wird hier benutzt
+                    string _apikey;
 
-                if (BeWoApp.Mandator.Apikey != null)
-                    _apikey = BeWoApp.Mandator.Apikey; 
-                else
-                    _apikey = "0000"; //erstmal zu default zwecken damit nichts abstürzt
-
-                if (_ChatCode.Equals(""))//Weitere Abfragen von nöten
-                {                 
-                    Login _login = new Login(_kundennummer, _ChatCode, _benutzername, _passwort, _apikey);
-
-                    var x = _login.AnmeldevorgangDurchFuehren();
-
-                    if (x != null)
+                    string _ChatCode = "";
+                    if (xxx.EmployeeCode != null && !xxx.EmployeeCode.Equals(""))
                     {
-                        ServiceChatView = new ChatView(x);
-                        ServiceChatView.Show();
+                        _ChatCode = xxx.EmployeeCode;
+                    }
+
+                    if (BeWoApp.Mandator.Apikey != null)
+                        _apikey = BeWoApp.Mandator.Apikey;
+                    else
+                        _apikey = "0000"; //erstmal zu default zwecken damit nichts abstürzt
+
+                    if (_ChatCode.Equals("")) //Weitere Abfragen von nöten
+                    {
+                        Login _login = new Login(_kundennummer, _ChatCode, _benutzername, _passwort, _apikey);
+
+                        var x = _login.AnmeldevorgangDurchFuehren();
+
+                        if (x != null)
+                        {
+                            ServiceChatView = new ChatView(x);
+                            ServiceChatView.Show();
+                        }
+                        else
+                        {
+                            //fehlermeldungen weiter Spezifizieren 
+                            MessageBox.Show(
+                                "Es konnte keine Verbindung hergestellt werden.\nBitte versuchen sie es später erneut");
+                        }
                     }
                     else
                     {
-                        //fehlermeldungen weiter Spezifizieren 
-                        MessageBox.Show(
-                            "Es konnte keine Verbindung hergestellt werden.\nBitte versuchen sie es später erneut");
+                        MessageBox.Show("Sie benötgen einen gültigen Chat-Code.", "Info");
                     }
                 }
                 else
                 {
-                    MessageBox.Show("Sie benötgen einen gültigen Chat-Code.","Info");
+                    MessageBox.Show("Sie benötgen einen gültigen zugang zum Chat. Bitte wenden sie sich an den Support.", "Info");
                 }
 
             }

From 4b5e23cbd82c166cdee6e7e9031e5b0b198e8fd9 Mon Sep 17 00:00:00 2001
From: Waldi <waldemar.ruppel@beyondsoft.de>
Date: Fri, 13 Oct 2017 14:07:44 +0200
Subject: [PATCH 9/9] =?UTF-8?q?Aktuallisierungen=20und=20bcrypt=20f=C3=BCr?=
 =?UTF-8?q?=20clienten=20chat=20passwort=20zus=C3=A4tzliche=20erweiterunge?=
 =?UTF-8?q?n=20f=C3=BCr=20den=20ChatController=20Bewomobil?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BeWo/View/ChatServiceCustomer.xaml            | 12 +++++++---
 BeWo/View/ChatServiceCustomer.xaml.cs         | 16 ++++++++++++-
 BeWo/View/ChatServiceEmployee.xaml            |  9 +++++---
 BeWo/View/HomeDragPanelView.xaml.cs           | 23 ++++++++++---------
 BeWoPlanerMobil/Controllers/ChatController.cs |  8 +++++--
 Data/Entities/CustomerAPPCode.cs              | 17 ++++++++++++++
 Data/Mappings/CustomerAPPCode.hbm.xml         |  1 +
 Model/Changes_2017_10_13.txt                  |  3 +++
 .../CustomerServiceImp.cs                     |  4 ++++
 9 files changed, 73 insertions(+), 20 deletions(-)
 create mode 100644 Model/Changes_2017_10_13.txt

diff --git a/BeWo/View/ChatServiceCustomer.xaml b/BeWo/View/ChatServiceCustomer.xaml
index 23260b612..bea5ef48a 100644
--- a/BeWo/View/ChatServiceCustomer.xaml
+++ b/BeWo/View/ChatServiceCustomer.xaml
@@ -41,7 +41,10 @@
 
                       <TextBox Grid.Column="1" Grid.Row="0" Margin="3" Height="23" MinWidth="120" x:Name="GeneratetTexfield" IsReadOnly="True"/>
 
-                      <Button Content="Chat-Code Entfernen" Grid.Row="0" Grid.Column="2" Height="23" Click="RemoveCode_OnClick"/>
+                      <Button  Grid.Row="0" Grid.Column="2" Margin="3" Height="23" Click="RemoveCode_OnClick" ToolTip="Aktuellen Chat-Code löschen.">
+                        <Image Height="15" Width="15" Source='/Ressources/Icons/Symbol Delete.png' Margin="3"  RenderOptions.BitmapScalingMode="HighQuality" HorizontalAlignment="Center" />
+                      </Button>
+                  
                       <!-- <Label x:Name="lblIsChatAktive" Grid.Column="0" Grid.Row="1" Margin="3" Content="Chat Aktivieren" />-->
 
 
@@ -54,10 +57,13 @@
                       <Label Grid.Row="3" Grid.Column="0" Content="Passwort" Margin="3" />
                       <TextBox Grid.Row="3" Grid.Column="1" Margin="3" x:Name="TXTPasswort" />
 
-                  <Button Content="Speichern" Click="SpeicherButton_OnClick" Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="2" Margin="3" HorizontalAlignment="Right"/>
+                      <Button Content="Speichern" Click="SpeicherButton_OnClick" Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="2" Margin="3" HorizontalAlignment="Right"  />
+                     
 
 
-                  <Button Grid.Column="0" Grid.Row="4" Content="Handout PDF Anzeigen" Click="ZeigeHandoutPDF_OnClick " Margin="3" VerticalAlignment="Center" HorizontalAlignment="Left" Height="21"/>
+                    <Button Grid.Column="3" Grid.Row="0" Click="ZeigeHandoutPDF_OnClick " Margin="3" VerticalAlignment="Center" HorizontalAlignment="Left" Height="23" ToolTip="ownChat Kurzanleitung für Klient herunterladen.">
+                      <Image Height="15" Width="15" Source='/Ressources/Icons/ClipboardDisabled.png' Margin="3"  RenderOptions.BitmapScalingMode="HighQuality" HorizontalAlignment="Center" />
+                    </Button>
                   
                   
                  
diff --git a/BeWo/View/ChatServiceCustomer.xaml.cs b/BeWo/View/ChatServiceCustomer.xaml.cs
index b5a646a60..e23870132 100644
--- a/BeWo/View/ChatServiceCustomer.xaml.cs
+++ b/BeWo/View/ChatServiceCustomer.xaml.cs
@@ -272,7 +272,21 @@ namespace BeWo.View
 
         private void SpeicherButton_OnClick(object sender, RoutedEventArgs e)
         {
-            ServiceFacade.DoCustomerServiceSync(s => s.SetBenutzerPasswortChatAppCode(customerOid.Value, TXTBenutzerName.Text, TXTPasswort.Text));
+            if (BeWoApp.AppSettings.IsPasswordSecurityActiv)
+            {
+                if (TXTPasswort.Text.Length >= 8)
+                {
+                    ServiceFacade.DoCustomerServiceSync(s => s.SetBenutzerPasswortChatAppCode(customerOid.Value, TXTBenutzerName.Text, TXTPasswort.Text));
+                }
+                else
+                {
+                    MessageBox.Show("Das Passwort ist zu schwach.");
+                }
+            }
+            else
+            {
+                ServiceFacade.DoCustomerServiceSync(s => s.SetBenutzerPasswortChatAppCode(customerOid.Value, TXTBenutzerName.Text, TXTPasswort.Text));
+            }
         }
 
         private void RemoveCode_OnClick(object sender, RoutedEventArgs e)
diff --git a/BeWo/View/ChatServiceEmployee.xaml b/BeWo/View/ChatServiceEmployee.xaml
index df82d57aa..c2a2a476b 100644
--- a/BeWo/View/ChatServiceEmployee.xaml
+++ b/BeWo/View/ChatServiceEmployee.xaml
@@ -41,7 +41,9 @@
 
                   <TextBox Grid.Column="1" Grid.Row="0" Margin="3" Height="23" MinWidth="120" x:Name="GeneratetTexfield" IsReadOnly="True"  />
 
-                  <Button Content="Chat-Code Entfernen" Grid.Row="0" Grid.Column="2" Height="23" Click="RemoveCode_OnClick"/>
+                  <Button Grid.Row="0" Grid.Column="2" Height="23" Click="RemoveCode_OnClick" ToolTip="Aktuellen Chat-Code löschen.">
+                    <Image Height="15" Width="15" Source='/Ressources/Icons/Symbol Delete.png' Margin="3"  RenderOptions.BitmapScalingMode="HighQuality" HorizontalAlignment="Center" />
+                  </Button>
                   
                   <!--<Label x:Name="lblIsChatAktive" Grid.Column="0" Grid.Row="1" Content="Chat Aktivieren"  />
 
@@ -55,8 +57,9 @@
                   <Button Grid.Column="0" Grid.Row="3" Content="Save Notfall Message" Click="Creat_NotfallMessage" Margin="3" VerticalAlignment="Center" HorizontalAlignment="Left"
                        Height="21" x:Name="SaveMSButon" />-->
 
-                  <Button Grid.Column="0" Grid.Row="4" Content="Handout PDF Anzeigen" Click="ZeigePDF_OnClick" Margin="3" VerticalAlignment="Center" HorizontalAlignment="Left" Height="21"/>
-                  
+                  <Button Grid.Column="3" Grid.Row="0" Click="ZeigePDF_OnClick" Margin="3" VerticalAlignment="Center" HorizontalAlignment="Left" Height="23" ToolTip="ownChat Kurzanleitung für Mitarbeiter herunterladen.">
+                    <Image Height="15" Width="15" Source='/Ressources/Icons/ClipboardDisabled.png' Margin="3"  RenderOptions.BitmapScalingMode="HighQuality" HorizontalAlignment="Center" />
+                  </Button>
                 </Grid>
 
             </GroupBox>
diff --git a/BeWo/View/HomeDragPanelView.xaml.cs b/BeWo/View/HomeDragPanelView.xaml.cs
index c5dc8e3ba..2fe52ed2a 100644
--- a/BeWo/View/HomeDragPanelView.xaml.cs
+++ b/BeWo/View/HomeDragPanelView.xaml.cs
@@ -108,26 +108,27 @@ namespace BeWo.View
                         MessageBox.Show("Verbindung geglückt.", "Info", MessageBoxButton.OK,MessageBoxImage.Information);
                 });*/
 
-            
-            //var berechtigung = ServiceFacade.DoEmployeeServiceSync(s => s.GetAllChatActiveEmployeesCompact());
-            //foreach (var list in berechtigung)
-            //{
-            //    if (list.PersonOid == BeWoApp.LoggedOnUser.Employee.PersonOid)
-            //    {
-            //        berechtigt = true;
-            //    }
-            //}
+
+            var berechtigung = ServiceFacade.DoEmployeeServiceSync(s => s.GetAllChatActiveEmployeesCompact());
+            foreach (var list in berechtigung)
+            {
+                if (list.PersonOid == BeWoApp.LoggedOnUser.Employee.PersonOid)
+                {
+                    berechtigt = true;
+                }
+            }
 
 
             if (berechtigt)
-            {                           
+            {
                 //asx = new Thread(ConnectWithServer);                   
                 //asx.Start();
+                BewoChat.Visibility = Visibility.Visible;//Hidden
             }
             else
             {
 
-               // BewoChat.Visibility = Visibility.Visible;//Hidden
+                BewoChat.Visibility = Visibility.Hidden;//Hidden
             }
 
             PruefePasswortStaerke();
diff --git a/BeWoPlanerMobil/Controllers/ChatController.cs b/BeWoPlanerMobil/Controllers/ChatController.cs
index 7b764e275..6b48c89d1 100644
--- a/BeWoPlanerMobil/Controllers/ChatController.cs
+++ b/BeWoPlanerMobil/Controllers/ChatController.cs
@@ -161,7 +161,7 @@ namespace BeWoPlanerMobil.Controllers
                                 }
 
                                 JsonInputKlient1 input = new JsonInputKlient1(daten.Oid.ToString(),"1",
-				                daten.Person.FirstName, daten.Person.LastName, daten.CustomerAlias, mobilnummer, chatcode.CustomerCode, inputList);
+				                daten.Person.FirstName, daten.Person.LastName, daten.CustomerAlias, mobilnummer, chatcode.CustomerCode,chatcode.BenutzerName,chatcode.BCryptPassword, inputList);
 
 
 							    if (daten.IsActive == ActivationTypeId.Deleted)
@@ -422,10 +422,12 @@ namespace BeWoPlanerMobil.Controllers
 		public string Alias { get; set; }
         public string Mobile { get; set; }
         public string ChatCode { get; set; }
+        public string Login { get; set; }
+        public string Password { get; set; }
 
         public List<JsonInputKlient2> Guardians { get; set; }
 
-        public JsonInputKlient1(string oid,string status, string firstname, string lastname, string alias,string mobile,string chatCode, List<JsonInputKlient2> guardians)
+        public JsonInputKlient1(string oid,string status, string firstname, string lastname, string alias,string mobile,string chatCode,string login,string password, List<JsonInputKlient2> guardians)
         {
 	        Oid = "C"+oid;
 	        Status = status;
@@ -434,6 +436,8 @@ namespace BeWoPlanerMobil.Controllers
 	        Alias = alias;
             Mobile = mobile;
             ChatCode = chatCode;
+            Login = login;
+            Password = password;
             Guardians = guardians;
         }
     }
diff --git a/Data/Entities/CustomerAPPCode.cs b/Data/Entities/CustomerAPPCode.cs
index 8c2af6a1c..d4dc065a5 100644
--- a/Data/Entities/CustomerAPPCode.cs
+++ b/Data/Entities/CustomerAPPCode.cs
@@ -18,6 +18,8 @@ namespace BeWo.Data.Entities
 
         public static string PropertyName_Passwort = "Passwort";
 
+        public static string PropertyName_BCryptPassword = "BCryptPassword";
+
         private string _CustomerCode;
 
         private DateTime _CustomerCodeGenDate;
@@ -30,6 +32,8 @@ namespace BeWo.Data.Entities
 
         private string _Passwort;
 
+        private string _BCryptPassword;
+
         public virtual string CustomerCode
         {
             get
@@ -126,5 +130,18 @@ namespace BeWo.Data.Entities
             }
         }
 
+        public virtual string BCryptPassword
+        {
+            get { return _BCryptPassword; }
+
+            set
+            {
+                if (AreDifferent(_BCryptPassword, value))
+                {
+                    _BCryptPassword = value;
+                }
+            }
+        }
+
     }
 }
\ No newline at end of file
diff --git a/Data/Mappings/CustomerAPPCode.hbm.xml b/Data/Mappings/CustomerAPPCode.hbm.xml
index 2577b5f20..423715a33 100644
--- a/Data/Mappings/CustomerAPPCode.hbm.xml
+++ b/Data/Mappings/CustomerAPPCode.hbm.xml
@@ -19,5 +19,6 @@
     <property name="IsChatAktiv"          column="IsChatActive"                />
     <property name="BenutzerName"          column="BenutzerName"                />
     <property name="Passwort"          column="Passwort"                />
+    <property name="BCryptPassword" column="PasswordHash" />
   </class>
 </hibernate-mapping>
\ No newline at end of file
diff --git a/Model/Changes_2017_10_13.txt b/Model/Changes_2017_10_13.txt
new file mode 100644
index 000000000..b29ea2d1b
--- /dev/null
+++ b/Model/Changes_2017_10_13.txt
@@ -0,0 +1,3 @@
+
+ALTER TABLE `CustomerAppCode` 
+ADD COLUMN `PasswordHash` VARCHAR(1024) NULL DEFAULT NULL COMMENT '';
\ No newline at end of file
diff --git a/Service/ServiceImplementations/CustomerServiceImp.cs b/Service/ServiceImplementations/CustomerServiceImp.cs
index 86c524d54..6fca40dc6 100644
--- a/Service/ServiceImplementations/CustomerServiceImp.cs
+++ b/Service/ServiceImplementations/CustomerServiceImp.cs
@@ -5,6 +5,7 @@ using System.ServiceModel;
 
 using BeWo.Data.Access;
 using BeWo.Data.Entities;
+using BeWo.Data.Security;
 using BeWo.Service.Core;
 using BeWo.Service.DCEntityMapper;
 using BeWo.Service.Plugins;
@@ -3700,6 +3701,9 @@ namespace BeWo.Service.ServiceImplementations
                         if (!passwort.Equals("") && appcode.Passwort != null && !appcode.Passwort.Equals(passwort))
                         {
                             appcode.Passwort = passwort;
+
+                            string salt = BCrypt.GenerateSalt();
+                            appcode.BCryptPassword = BCrypt.HashPassword(passwort, salt);
                         }
                     }