From da856f73e1016ad2f9952badbb3e45e04128dba9 Mon Sep 17 00:00:00 2001
From: Waldi <waldemar.ruppel@beyondsoft.de>
Date: Wed, 18 Oct 2017 14:31:28 +0200
Subject: [PATCH] mini update

---
 BeWo/View/ChatServiceCustomer.xaml  | 20 +++++++++++---------
 BeWo/View/ChatView.xaml.cs          |  1 +
 BeWo/View/HomeDragPanelView.xaml.cs | 25 ++++++++++++++++---------
 3 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/BeWo/View/ChatServiceCustomer.xaml b/BeWo/View/ChatServiceCustomer.xaml
index 455afe9d3..42901261d 100644
--- a/BeWo/View/ChatServiceCustomer.xaml
+++ b/BeWo/View/ChatServiceCustomer.xaml
@@ -50,9 +50,9 @@
 
                       <!--<CheckBox x:Name="ChatAktive" Grid.Column="1" Grid.Row="1" Margin="3" Height="23" Checked="CheckBox_Checked" Unchecked="CheckBox_Unchecked"/>-->
 
-                      <GroupBox Margin="3" Grid.Row="2" Grid.RowSpan="2" Grid.Column="0" Grid.ColumnSpan="3" Header="ownChat Benutzer Konto"  >
-                        <!-- ####################### Style Design gedönse Style="{x:Null}" ############################################# -->
-                        <!-- <GroupBox.Template>
+                      <GroupBox Margin="3" Grid.Row="2" Grid.RowSpan="2" Grid.Column="0" Grid.ColumnSpan="3" Header="ownChat Benutzer Konto" Style="{x:Null}" >
+                        <!-- ####################### Style Design gedönse  ## -->
+                         <GroupBox.Template>
                           <ControlTemplate TargetType="{x:Type GroupBox}">
                             <Grid SnapsToDevicePixels="true">
                               <Grid.ColumnDefinitions>
@@ -68,7 +68,9 @@
                                 <RowDefinition Height="6"/>
                               </Grid.RowDefinitions>
                               <Border BorderBrush="Black" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="4" Grid.Column="0" CornerRadius="4" Grid.Row="1" Grid.RowSpan="3"/>
-                              <Border BorderBrush="Black" BorderThickness="{TemplateBinding BorderThickness}" Grid.ColumnSpan="4" CornerRadius="4" Grid.Row="1" Grid.RowSpan="3">
+                              
+                              
+                                <Border BorderBrush="Black" BorderThickness="1.25" Grid.ColumnSpan="4" CornerRadius="4" Grid.Row="1" Grid.RowSpan="3">
                                 <Border.OpacityMask>
                                   <MultiBinding ConverterParameter="7">
                                     <MultiBinding.Converter>
@@ -79,18 +81,18 @@
                                     <Binding Path="ActualHeight" RelativeSource="{RelativeSource Self}"/>
                                   </MultiBinding>
                                 </Border.OpacityMask>
-                                <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="3">
-                                  <Border BorderBrush="Black" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="2"/>
-                                </Border>
                               </Border>
+                              
+                                
                               <Border x:Name="Header" Grid.Column="1" Padding="3,1,3,0" Grid.Row="0" Grid.RowSpan="2" Background="Transparent" BorderBrush="Black" CornerRadius="2" BorderThickness="1">
                                 <ContentPresenter ContentSource="Header" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
                               </Border>
+                              
                               <ContentPresenter Grid.ColumnSpan="2" Grid.Column="1" Margin="{TemplateBinding Padding}" Grid.Row="2" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
                             </Grid>                          
                           </ControlTemplate>
-                        </GroupBox.Template>-->
-                        <!-- ######################################################################################################################################################################### -->
+                        </GroupBox.Template>
+                        <!-- ################################################ -->
                         <Grid>
                           <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="Auto" />                          
diff --git a/BeWo/View/ChatView.xaml.cs b/BeWo/View/ChatView.xaml.cs
index a5697d533..c67963710 100644
--- a/BeWo/View/ChatView.xaml.cs
+++ b/BeWo/View/ChatView.xaml.cs
@@ -175,6 +175,7 @@ namespace BeWo.View
         private void ChatMainControl_OnOnClose()
         {
             _emojiView = null;
+            ChatMainControl.SpeichereMessageInfoInDatei();
 
             this.Dispatch(delegate
             {
diff --git a/BeWo/View/HomeDragPanelView.xaml.cs b/BeWo/View/HomeDragPanelView.xaml.cs
index 2fe52ed2a..0420bf275 100644
--- a/BeWo/View/HomeDragPanelView.xaml.cs
+++ b/BeWo/View/HomeDragPanelView.xaml.cs
@@ -1310,28 +1310,35 @@ namespace BeWo.View
 
                 if (empAppCodes != null && empAppCodes.Count > 0)
                 {
-                    var xxx = empAppCodes.Last();
+                    string _Code = "";
+                    foreach (var item in empAppCodes)
+                    {
+                        if(item.EmployeeCode != null && !item.EmployeeCode.Equals(""))
+                            _Code = item.EmployeeCode;
+                    }
+
+                    //var xxx = empAppCodes.Last();
 
                     string _kundennummer = BeWoApp.Tenant;
 
                     string _benutzername = BeWoApp.UserName;
-                    string _passwort = "12345678"; // welches passwort wird hier benutzt
+                    string _passwort = BeWoApp.UserPassword;
                     string _apikey;
 
-                    string _ChatCode = "";
-                    if (xxx.EmployeeCode != null && !xxx.EmployeeCode.Equals(""))
-                    {
-                        _ChatCode = xxx.EmployeeCode;
-                    }
+                    //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
 
-                    if (_ChatCode.Equals("")) //Weitere Abfragen von nöten
+                    if (!_Code.Equals("")) //Weitere Abfragen von nöten
                     {
-                        Login _login = new Login(_kundennummer, _ChatCode, _benutzername, _passwort, _apikey);
+                        Login _login = new Login(_kundennummer, _Code, _benutzername, _passwort, _apikey);
 
                         var x = _login.AnmeldevorgangDurchFuehren();