Aktuallisierung des ChatControllers und umsidlung der chat gedönse in ein eigenen ownchat ordner
This commit is contained in:
@@ -271,11 +271,11 @@
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="View\ChatEmojiView.xaml">
|
||||
<Page Include="ownChat\ChatEmojiView.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="View\ChatView.xaml">
|
||||
<Page Include="ownChat\ChatView.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
@@ -451,15 +451,15 @@
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="View\ChatServiceCustomer.xaml">
|
||||
<Page Include="ownChat\ChatServiceCustomer.xaml">
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
<SubType>Designer</SubType>
|
||||
</Page>
|
||||
<Page Include="View\ChatServiceEmployee.xaml">
|
||||
<Page Include="ownChat\ChatServiceEmployee.xaml">
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
<SubType>Designer</SubType>
|
||||
</Page>
|
||||
<Page Include="View\ChatDokumentationsView.xaml">
|
||||
<Page Include="ownChat\ChatDokumentationsView.xaml">
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
<SubType>Designer</SubType>
|
||||
</Page>
|
||||
@@ -739,10 +739,10 @@
|
||||
<Compile Include="View\BeWoWindow.xaml.cs">
|
||||
<DependentUpon>BeWoWindow.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="View\ChatEmojiView.xaml.cs">
|
||||
<Compile Include="ownChat\ChatEmojiView.xaml.cs">
|
||||
<DependentUpon>ChatEmojiView.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="View\ChatView.xaml.cs">
|
||||
<Compile Include="ownChat\ChatView.xaml.cs">
|
||||
<DependentUpon>ChatView.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="View\Controls\TextModuleTreeViewControl.xaml.cs">
|
||||
@@ -874,13 +874,13 @@
|
||||
<Compile Include="View\Detail\TextModuleView.xaml.cs">
|
||||
<DependentUpon>TextModuleView.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="View\ChatServiceCustomer.xaml.cs">
|
||||
<Compile Include="ownChat\ChatServiceCustomer.xaml.cs">
|
||||
<DependentUpon>ChatServiceCustomer.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="View\ChatServiceEmployee.xaml.cs">
|
||||
<Compile Include="ownChat\ChatServiceEmployee.xaml.cs">
|
||||
<DependentUpon>ChatServiceEmployee.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="View\ChatDokumentationsView.xaml.cs">
|
||||
<Compile Include="ownChat\ChatDokumentationsView.xaml.cs">
|
||||
<DependentUpon>ChatDokumentationsView.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="View\EmployeeArbeitszeitView.xaml.cs">
|
||||
@@ -2537,6 +2537,7 @@
|
||||
<ItemGroup>
|
||||
<Resource Include="Ressources\Icons\DocumentWithAdd2.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup />
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<PropertyGroup>
|
||||
<PostBuildEvent>
|
||||
|
||||
@@ -43,6 +43,7 @@ using Image = System.Windows.Controls.Image;
|
||||
using MessageBox = System.Windows.MessageBox;
|
||||
using Panel = System.Windows.Controls.Panel;
|
||||
using System.Windows.Media;
|
||||
using BeWo.ownChat;
|
||||
using BeWo.PasswortSecurity;
|
||||
using DevExpress.Xpf.Bars;
|
||||
using DevExpress.Xpf.DocumentViewer;
|
||||
|
||||
@@ -29,6 +29,7 @@ using DevExpress.Xpf.Editors.Settings;
|
||||
using DevExpress.Xpf.Grid;
|
||||
|
||||
using System.Windows.Media.Imaging;
|
||||
using BeWo.ownChat;
|
||||
using BS.Shared.Translation;
|
||||
using DevExpress.XtraGrid;
|
||||
using Binding = System.Windows.Data.Binding;
|
||||
|
||||
@@ -12,6 +12,7 @@ using System.Windows.Media;
|
||||
using System.Windows.Media.Imaging;
|
||||
using BeWo.Core;
|
||||
using BeWo.Core.Service;
|
||||
using BeWo.ownChat;
|
||||
using BeWo.ServiceProxy;
|
||||
using BeWo.Validation;
|
||||
using BeWo.ViewModel;
|
||||
|
||||
@@ -40,6 +40,7 @@ using System.Net.NetworkInformation;
|
||||
using System.Text;
|
||||
using System.Text.RegularExpressions;
|
||||
using System.Windows.Forms;
|
||||
using BeWo.ownChat;
|
||||
using BS.Shared.Core;
|
||||
using ChatController.HauptKlassen;
|
||||
using Newtonsoft.Json;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<Window x:Class="BeWo.View.ChatDokumentationsView"
|
||||
<Window x:Class="BeWo.ownChat.ChatDokumentationsView"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:view="clr-namespace:BeWo.View"
|
||||
@@ -34,7 +34,7 @@ using DevExpress.XtraPrinting.XamlExport;
|
||||
using Microsoft.Office.Interop.Word;
|
||||
using Color = System.Drawing.Color;
|
||||
|
||||
namespace BeWo.View
|
||||
namespace BeWo.ownChat
|
||||
{
|
||||
public partial class ChatDokumentationsView
|
||||
{
|
||||
@@ -1,4 +1,4 @@
|
||||
<Window x:Class="BeWo.View.ChatEmojiView"
|
||||
<Window x:Class="BeWo.ownChat.ChatEmojiView"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
@@ -14,7 +14,7 @@ using System.Windows.Shapes;
|
||||
using ChatController;
|
||||
using ChatController.HauptKlassen;
|
||||
|
||||
namespace BeWo.View
|
||||
namespace BeWo.ownChat
|
||||
{
|
||||
/// <summary>
|
||||
/// Interaktionslogik für ChatEmojiService.xaml
|
||||
@@ -1,154 +1,154 @@
|
||||
<localView:BeWoView x:Class="BeWo.View.ChatServiceCustomer"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:localView="clr-namespace:BeWo.View"
|
||||
xmlns:localViewModel="clr-namespace:BeWo.ViewModel"
|
||||
xmlns:uc="clr-namespace:BeWo.Controls;assembly=BeWo.Controls"
|
||||
xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
|
||||
Height="Auto" Width="Auto" HorizontalAlignment="Stretch"
|
||||
xmlns:diagnostics="clr-namespace:System.Diagnostics;assembly=WindowsBase"
|
||||
VerticalAlignment="Stretch" Focusable="True">
|
||||
|
||||
<Grid x:Name="ChatServiceCustomerGrid">
|
||||
<Grid>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="*" />
|
||||
</Grid.RowDefinitions>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="Auto" />
|
||||
<ColumnDefinition Width="*" />
|
||||
</Grid.ColumnDefinitions>
|
||||
<GroupBox Grid.ColumnSpan="2" Padding="5" Style="{StaticResource ObjectEditGroupBox}" Header="ownChat">
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="Auto" />
|
||||
<ColumnDefinition Width="Auto" />
|
||||
<ColumnDefinition Width="Auto" />
|
||||
<ColumnDefinition Width="Auto" />
|
||||
<ColumnDefinition Width="*" />
|
||||
</Grid.ColumnDefinitions>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="*" />
|
||||
</Grid.RowDefinitions>
|
||||
|
||||
<Label Content="Chat-Code" x:Name="lblGenerateCode" Grid.Column="0" Grid.Row="0" Margin="3" VerticalAlignment="Center" HorizontalAlignment="Left" Height="21" />
|
||||
|
||||
<TextBox Grid.Column="1" Grid.Row="0" Margin="3" Height="23" MinWidth="120" x:Name="GeneratetTexfield" IsReadOnly="True"/>
|
||||
|
||||
<Button Grid.Column="2" Grid.Row="0" Click="GenerateCodeClick" Margin="3" VerticalAlignment="Center" HorizontalAlignment="Left" ToolTip="Chat-Code anfordern"
|
||||
Height="23" x:Name="ButtonGenerateCode" >
|
||||
<Image Height="15" Width="15" Source='/Ressources/Icons/DocumentWithAdd2.png' Margin="3" RenderOptions.BitmapScalingMode="HighQuality" HorizontalAlignment="Center" x:Name="ImageGenerateCode"/>
|
||||
</Button>
|
||||
|
||||
|
||||
<Button Grid.Row="0" Grid.Column="3" Margin="3" Height="23" Click="RemoveCode_OnClick" ToolTip="Aktuellen Chat-Code löschen." x:Name="RemoveButton" Visibility="Collapsed">
|
||||
<Image Height="15" Width="15" Source='/Ressources/Icons/Symbol Delete.png' Margin="3" RenderOptions.BitmapScalingMode="HighQuality" HorizontalAlignment="Center" />
|
||||
</Button>
|
||||
|
||||
<Label Grid.Row="1" Grid.Column="0" Content="Benutzername" Margin="3" />
|
||||
|
||||
<TextBox Grid.Row="1" Grid.Column="1" Margin="3" x:Name="TXTBenutzerName" />
|
||||
|
||||
<Label Grid.Row="2" Grid.Column="0" Content="Passwort" Margin="3" />
|
||||
<TextBox Grid.Row="2" Grid.Column="1" Margin="3" x:Name="TXTPasswort" TextChanged="TXTPasswort_OnTextChanged" />
|
||||
|
||||
<Label x:Name="LblPwStaerkenAnzeige" Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2" Margin="3" Visibility="Hidden"></Label>
|
||||
|
||||
<Button Content="Speichern" Click="SpeicherButton_OnClick" Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="2" Margin="3" HorizontalAlignment="Right" />
|
||||
|
||||
<!-- <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"/>-->
|
||||
|
||||
<!--<GroupBox Margin="3" Grid.Row="2" Grid.RowSpan="2" Grid.Column="0" Grid.ColumnSpan="4" Header="ownChat Benutzerkonto" Style="{x:Null}" x:Name="CustomerBenutzerKontoGroupBox" Visibility="Visible">
|
||||
--><!-- ####################### Style Design gedönse ## --><!--
|
||||
<GroupBox.Template>
|
||||
<ControlTemplate TargetType="{x:Type GroupBox}">
|
||||
<Grid SnapsToDevicePixels="true">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="6"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="*"/>
|
||||
<ColumnDefinition Width="6"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="*"/>
|
||||
<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="1.25" Grid.ColumnSpan="4" CornerRadius="4" Grid.Row="1" Grid.RowSpan="3">
|
||||
<Border.OpacityMask>
|
||||
<MultiBinding ConverterParameter="7">
|
||||
<MultiBinding.Converter>
|
||||
<BorderGapMaskConverter />
|
||||
</MultiBinding.Converter>
|
||||
<Binding ElementName="Header" Path="ActualWidth"/>
|
||||
<Binding Path="ActualWidth" RelativeSource="{RelativeSource Self}"/>
|
||||
<Binding Path="ActualHeight" RelativeSource="{RelativeSource Self}"/>
|
||||
</MultiBinding>
|
||||
</Border.OpacityMask>
|
||||
</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>
|
||||
--><!-- ################################################ --><!--
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="Auto" />
|
||||
<ColumnDefinition Width="*" />
|
||||
</Grid.ColumnDefinitions>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="*" />
|
||||
</Grid.RowDefinitions>
|
||||
|
||||
<Label Grid.Row="0" Grid.Column="0" Content="Benutzername" Margin="3" /> --><!-- row 2 | column 0 && 1--><!--
|
||||
<TextBox Grid.Row="0" Grid.Column="1" Margin="3" x:Name="TXTBenutzerName" />
|
||||
|
||||
<Label Grid.Row="1" Grid.Column="0" Content="Passwort" Margin="3" /> --><!-- row 3 | column 0 && 1 --><!--
|
||||
<TextBox Grid.Row="1" Grid.Column="1" Margin="3" x:Name="TXTPasswort" />
|
||||
|
||||
<Button Content="Speichern" Click="SpeicherButton_OnClick" Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" Margin="3" HorizontalAlignment="Right" /> --><!-- row 4 | column 0--><!--
|
||||
</Grid>
|
||||
</GroupBox>-->
|
||||
|
||||
|
||||
<Button Grid.Column="4" Grid.Row="0" Click="ZeigeHandoutPDF_OnClick " Margin="3" VerticalAlignment="Center" HorizontalAlignment="Left" Height="23" ToolTip="ownChat Kurzanleitung für Klient herunterladen." x:Name="CustomerHandoutButton" Visibility="Collapsed">
|
||||
<Image Height="15" Width="15" Source='/Ressources/Icons/adobe-pdf-icon.png' Margin="3" RenderOptions.BitmapScalingMode="HighQuality" HorizontalAlignment="Center" />
|
||||
</Button>
|
||||
|
||||
|
||||
|
||||
|
||||
<!-- IsChecked="{Binding Path=IsChatAktiv, UpdateSourceTrigger=PropertyChanged}" -->
|
||||
|
||||
</Grid>
|
||||
|
||||
</GroupBox>
|
||||
|
||||
|
||||
</Grid>
|
||||
</Grid>
|
||||
|
||||
<localView:BeWoView x:Class="BeWo.ownChat.ChatServiceCustomer"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:localView="clr-namespace:BeWo.View"
|
||||
xmlns:localViewModel="clr-namespace:BeWo.ViewModel"
|
||||
xmlns:uc="clr-namespace:BeWo.Controls;assembly=BeWo.Controls"
|
||||
xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
|
||||
Height="Auto" Width="Auto" HorizontalAlignment="Stretch"
|
||||
xmlns:diagnostics="clr-namespace:System.Diagnostics;assembly=WindowsBase"
|
||||
VerticalAlignment="Stretch" Focusable="True">
|
||||
|
||||
<Grid x:Name="ChatServiceCustomerGrid">
|
||||
<Grid>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="*" />
|
||||
</Grid.RowDefinitions>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="Auto" />
|
||||
<ColumnDefinition Width="*" />
|
||||
</Grid.ColumnDefinitions>
|
||||
<GroupBox Grid.ColumnSpan="2" Padding="5" Style="{StaticResource ObjectEditGroupBox}" Header="ownChat">
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="Auto" />
|
||||
<ColumnDefinition Width="Auto" />
|
||||
<ColumnDefinition Width="Auto" />
|
||||
<ColumnDefinition Width="Auto" />
|
||||
<ColumnDefinition Width="*" />
|
||||
</Grid.ColumnDefinitions>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="*" />
|
||||
</Grid.RowDefinitions>
|
||||
|
||||
<Label Content="Chat-Code" x:Name="lblGenerateCode" Grid.Column="0" Grid.Row="0" Margin="3" VerticalAlignment="Center" HorizontalAlignment="Left" Height="21" />
|
||||
|
||||
<TextBox Grid.Column="1" Grid.Row="0" Margin="3" Height="23" MinWidth="120" x:Name="GeneratetTexfield" IsReadOnly="True"/>
|
||||
|
||||
<Button Grid.Column="2" Grid.Row="0" Click="GenerateCodeClick" Margin="3" VerticalAlignment="Center" HorizontalAlignment="Left" ToolTip="Chat-Code anfordern"
|
||||
Height="23" x:Name="ButtonGenerateCode" >
|
||||
<Image Height="15" Width="15" Source='/Ressources/Icons/DocumentWithAdd2.png' Margin="3" RenderOptions.BitmapScalingMode="HighQuality" HorizontalAlignment="Center" x:Name="ImageGenerateCode"/>
|
||||
</Button>
|
||||
|
||||
|
||||
<Button Grid.Row="0" Grid.Column="3" Margin="3" Height="23" Click="RemoveCode_OnClick" ToolTip="Aktuellen Chat-Code löschen." x:Name="RemoveButton" Visibility="Collapsed">
|
||||
<Image Height="15" Width="15" Source='/Ressources/Icons/Symbol Delete.png' Margin="3" RenderOptions.BitmapScalingMode="HighQuality" HorizontalAlignment="Center" />
|
||||
</Button>
|
||||
|
||||
<Label Grid.Row="1" Grid.Column="0" Content="Benutzername" Margin="3" />
|
||||
|
||||
<TextBox Grid.Row="1" Grid.Column="1" Margin="3" x:Name="TXTBenutzerName" />
|
||||
|
||||
<Label Grid.Row="2" Grid.Column="0" Content="Passwort" Margin="3" />
|
||||
<TextBox Grid.Row="2" Grid.Column="1" Margin="3" x:Name="TXTPasswort" TextChanged="TXTPasswort_OnTextChanged" />
|
||||
|
||||
<Label x:Name="LblPwStaerkenAnzeige" Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2" Margin="3" Visibility="Hidden"></Label>
|
||||
|
||||
<Button Content="Speichern" Click="SpeicherButton_OnClick" Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="2" Margin="3" HorizontalAlignment="Right" />
|
||||
|
||||
<!-- <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"/>-->
|
||||
|
||||
<!--<GroupBox Margin="3" Grid.Row="2" Grid.RowSpan="2" Grid.Column="0" Grid.ColumnSpan="4" Header="ownChat Benutzerkonto" Style="{x:Null}" x:Name="CustomerBenutzerKontoGroupBox" Visibility="Visible">
|
||||
--><!-- ####################### Style Design gedönse ## --><!--
|
||||
<GroupBox.Template>
|
||||
<ControlTemplate TargetType="{x:Type GroupBox}">
|
||||
<Grid SnapsToDevicePixels="true">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="6"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="*"/>
|
||||
<ColumnDefinition Width="6"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="*"/>
|
||||
<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="1.25" Grid.ColumnSpan="4" CornerRadius="4" Grid.Row="1" Grid.RowSpan="3">
|
||||
<Border.OpacityMask>
|
||||
<MultiBinding ConverterParameter="7">
|
||||
<MultiBinding.Converter>
|
||||
<BorderGapMaskConverter />
|
||||
</MultiBinding.Converter>
|
||||
<Binding ElementName="Header" Path="ActualWidth"/>
|
||||
<Binding Path="ActualWidth" RelativeSource="{RelativeSource Self}"/>
|
||||
<Binding Path="ActualHeight" RelativeSource="{RelativeSource Self}"/>
|
||||
</MultiBinding>
|
||||
</Border.OpacityMask>
|
||||
</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>
|
||||
--><!-- ################################################ --><!--
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="Auto" />
|
||||
<ColumnDefinition Width="*" />
|
||||
</Grid.ColumnDefinitions>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="*" />
|
||||
</Grid.RowDefinitions>
|
||||
|
||||
<Label Grid.Row="0" Grid.Column="0" Content="Benutzername" Margin="3" /> --><!-- row 2 | column 0 && 1--><!--
|
||||
<TextBox Grid.Row="0" Grid.Column="1" Margin="3" x:Name="TXTBenutzerName" />
|
||||
|
||||
<Label Grid.Row="1" Grid.Column="0" Content="Passwort" Margin="3" /> --><!-- row 3 | column 0 && 1 --><!--
|
||||
<TextBox Grid.Row="1" Grid.Column="1" Margin="3" x:Name="TXTPasswort" />
|
||||
|
||||
<Button Content="Speichern" Click="SpeicherButton_OnClick" Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" Margin="3" HorizontalAlignment="Right" /> --><!-- row 4 | column 0--><!--
|
||||
</Grid>
|
||||
</GroupBox>-->
|
||||
|
||||
|
||||
<Button Grid.Column="4" Grid.Row="0" Click="ZeigeHandoutPDF_OnClick " Margin="3" VerticalAlignment="Center" HorizontalAlignment="Left" Height="23" ToolTip="ownChat Kurzanleitung für Klient herunterladen." x:Name="CustomerHandoutButton" Visibility="Collapsed">
|
||||
<Image Height="15" Width="15" Source='/Ressources/Icons/adobe-pdf-icon.png' Margin="3" RenderOptions.BitmapScalingMode="HighQuality" HorizontalAlignment="Center" />
|
||||
</Button>
|
||||
|
||||
|
||||
|
||||
|
||||
<!-- IsChecked="{Binding Path=IsChatAktiv, UpdateSourceTrigger=PropertyChanged}" -->
|
||||
|
||||
</Grid>
|
||||
|
||||
</GroupBox>
|
||||
|
||||
|
||||
</Grid>
|
||||
</Grid>
|
||||
|
||||
</localView:BeWoView>
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,81 +1,81 @@
|
||||
<localView:BeWoView x:Class="BeWo.View.ChatServiceEmployee"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:localView="clr-namespace:BeWo.View"
|
||||
xmlns:localViewModel="clr-namespace:BeWo.ViewModel"
|
||||
xmlns:uc="clr-namespace:BeWo.Controls;assembly=BeWo.Controls"
|
||||
xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
|
||||
Height="Auto" Width="Auto" HorizontalAlignment="Stretch"
|
||||
xmlns:diagnostics="clr-namespace:System.Diagnostics;assembly=WindowsBase"
|
||||
VerticalAlignment="Stretch" Focusable="True">
|
||||
|
||||
|
||||
<Grid x:Name="ChatServiceEmployeeGrid">
|
||||
<Grid>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="*" />
|
||||
</Grid.RowDefinitions>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="Auto" />
|
||||
<ColumnDefinition Width="*" />
|
||||
</Grid.ColumnDefinitions>
|
||||
<GroupBox Grid.ColumnSpan="2" Padding="5" Style="{StaticResource ObjectEditGroupBox}" Header="ownChat">
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="Auto" />
|
||||
<ColumnDefinition Width="Auto" />
|
||||
<ColumnDefinition Width="Auto" />
|
||||
<ColumnDefinition Width="Auto" />
|
||||
<ColumnDefinition Width="*" />
|
||||
</Grid.ColumnDefinitions>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="Auto" />
|
||||
</Grid.RowDefinitions>
|
||||
|
||||
<Label Content="Chat-Code:" x:Name="lblGenerateCode"/>
|
||||
|
||||
<TextBox Grid.Column="1" Grid.Row="0" Margin="3" Height="23" MinWidth="120" x:Name="GeneratetTexfield" IsReadOnly="True" />
|
||||
|
||||
<Button Grid.Column="2" Grid.Row="0" Click="GenerateCodeClick" Margin="3" VerticalAlignment="Center" HorizontalAlignment="Left" ToolTip="Chat-Code anfordern"
|
||||
Height="23" x:Name="ButtonGenerateCode">
|
||||
<Image Height="15" Width="15" Source='/Ressources/Icons/DocumentWithAdd2.png' Margin="3" RenderOptions.BitmapScalingMode="HighQuality" HorizontalAlignment="Center" x:Name="ImageGenerateCode"/>
|
||||
</Button>
|
||||
|
||||
<Button Grid.Row="0" Grid.Column="3" Height="23" Click="RemoveCode_OnClick" ToolTip="Aktuellen Chat-Code löschen." x:Name="RemoveButton" Visibility="Collapsed">
|
||||
<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" />
|
||||
|
||||
<CheckBox x:Name="ChatAktive" Grid.Column="1" Grid.Row="1" Margin="3" Height="23" Checked="CheckBox_Checked" Unchecked="CheckBox_Unchecked" />
|
||||
|
||||
<Label x:Name="LblSetStatement" Grid.Column="0" Grid.Row="2" Content="Notfall Nachricht" />
|
||||
|
||||
<TextBox Grid.Column="1" Grid.Row="2" Margin="3" Height="23" MinWidth="120" x:Name="NotfallTexfield" />
|
||||
|
||||
|
||||
<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="4" Grid.Row="0" Click="ZeigePDF_OnClick" Margin="3" VerticalAlignment="Center" HorizontalAlignment="Left" Height="23" ToolTip="ownChat Kurzanleitung für Mitarbeiter herunterladen." x:Name="EmployeeHandoutButton" Visibility="Collapsed">
|
||||
<Image Height="15" Width="15" Source='/Ressources/Icons/adobe-pdf-icon.png' Margin="3" RenderOptions.BitmapScalingMode="HighQuality" HorizontalAlignment="Center" />
|
||||
</Button>
|
||||
</Grid>
|
||||
|
||||
</GroupBox>
|
||||
|
||||
<!--
|
||||
Text="{Binding Path=Code, UpdateSourceTrigger=PropertyChanged}"
|
||||
IsChecked="{Binding Path=IsChecked}"
|
||||
Text="{Binding Path=Notfallstatement, UpdateSourceTrigger=PropertyChanged}"
|
||||
-->
|
||||
|
||||
</Grid>
|
||||
</Grid>
|
||||
|
||||
<localView:BeWoView x:Class="BeWo.ownChat.ChatServiceEmployee"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:localView="clr-namespace:BeWo.View"
|
||||
xmlns:localViewModel="clr-namespace:BeWo.ViewModel"
|
||||
xmlns:uc="clr-namespace:BeWo.Controls;assembly=BeWo.Controls"
|
||||
xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
|
||||
Height="Auto" Width="Auto" HorizontalAlignment="Stretch"
|
||||
xmlns:diagnostics="clr-namespace:System.Diagnostics;assembly=WindowsBase"
|
||||
VerticalAlignment="Stretch" Focusable="True">
|
||||
|
||||
|
||||
<Grid x:Name="ChatServiceEmployeeGrid">
|
||||
<Grid>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="*" />
|
||||
</Grid.RowDefinitions>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="Auto" />
|
||||
<ColumnDefinition Width="*" />
|
||||
</Grid.ColumnDefinitions>
|
||||
<GroupBox Grid.ColumnSpan="2" Padding="5" Style="{StaticResource ObjectEditGroupBox}" Header="ownChat">
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="Auto" />
|
||||
<ColumnDefinition Width="Auto" />
|
||||
<ColumnDefinition Width="Auto" />
|
||||
<ColumnDefinition Width="Auto" />
|
||||
<ColumnDefinition Width="*" />
|
||||
</Grid.ColumnDefinitions>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="Auto" />
|
||||
</Grid.RowDefinitions>
|
||||
|
||||
<Label Content="Chat-Code:" x:Name="lblGenerateCode"/>
|
||||
|
||||
<TextBox Grid.Column="1" Grid.Row="0" Margin="3" Height="23" MinWidth="120" x:Name="GeneratetTexfield" IsReadOnly="True" />
|
||||
|
||||
<Button Grid.Column="2" Grid.Row="0" Click="GenerateCodeClick" Margin="3" VerticalAlignment="Center" HorizontalAlignment="Left" ToolTip="Chat-Code anfordern"
|
||||
Height="23" x:Name="ButtonGenerateCode">
|
||||
<Image Height="15" Width="15" Source='/Ressources/Icons/DocumentWithAdd2.png' Margin="3" RenderOptions.BitmapScalingMode="HighQuality" HorizontalAlignment="Center" x:Name="ImageGenerateCode"/>
|
||||
</Button>
|
||||
|
||||
<Button Grid.Row="0" Grid.Column="3" Height="23" Click="RemoveCode_OnClick" ToolTip="Aktuellen Chat-Code löschen." x:Name="RemoveButton" Visibility="Collapsed">
|
||||
<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" />
|
||||
|
||||
<CheckBox x:Name="ChatAktive" Grid.Column="1" Grid.Row="1" Margin="3" Height="23" Checked="CheckBox_Checked" Unchecked="CheckBox_Unchecked" />
|
||||
|
||||
<Label x:Name="LblSetStatement" Grid.Column="0" Grid.Row="2" Content="Notfall Nachricht" />
|
||||
|
||||
<TextBox Grid.Column="1" Grid.Row="2" Margin="3" Height="23" MinWidth="120" x:Name="NotfallTexfield" />
|
||||
|
||||
|
||||
<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="4" Grid.Row="0" Click="ZeigePDF_OnClick" Margin="3" VerticalAlignment="Center" HorizontalAlignment="Left" Height="23" ToolTip="ownChat Kurzanleitung für Mitarbeiter herunterladen." x:Name="EmployeeHandoutButton" Visibility="Collapsed">
|
||||
<Image Height="15" Width="15" Source='/Ressources/Icons/adobe-pdf-icon.png' Margin="3" RenderOptions.BitmapScalingMode="HighQuality" HorizontalAlignment="Center" />
|
||||
</Button>
|
||||
</Grid>
|
||||
|
||||
</GroupBox>
|
||||
|
||||
<!--
|
||||
Text="{Binding Path=Code, UpdateSourceTrigger=PropertyChanged}"
|
||||
IsChecked="{Binding Path=IsChecked}"
|
||||
Text="{Binding Path=Notfallstatement, UpdateSourceTrigger=PropertyChanged}"
|
||||
-->
|
||||
|
||||
</Grid>
|
||||
</Grid>
|
||||
|
||||
</localView:BeWoView>
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,4 +1,4 @@
|
||||
<Window x:Class="BeWo.View.ChatView"
|
||||
<Window x:Class="BeWo.ownChat.ChatView"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
@@ -15,15 +15,17 @@ using System.Windows.Media.Imaging;
|
||||
using System.Windows.Shapes;
|
||||
using BeWo.Core.Config;
|
||||
using BeWo.ServiceProxy;
|
||||
using BeWo.View;
|
||||
using BS.Shared.DataContracts.Compact;
|
||||
using BS.Shared.Extensions;
|
||||
using ChatController;
|
||||
using ChatController.ChatKlassen;
|
||||
using ChatController.Klassen;
|
||||
using DevExpress.Xpf.Core;
|
||||
using Button = System.Windows.Controls.Button;
|
||||
using MessageBox = System.Windows.MessageBox;
|
||||
|
||||
namespace BeWo.View
|
||||
namespace BeWo.ownChat
|
||||
{
|
||||
/// <summary>
|
||||
/// Interaktionslogik für ChatService.xaml
|
||||
@@ -168,6 +168,13 @@ namespace BeWoPlanerMobil.Controllers
|
||||
input.Status = "3";
|
||||
if (daten.IsActive == ActivationTypeId.Archived)
|
||||
input.Status = "2";
|
||||
|
||||
|
||||
if (daten.TerminationDate != null && daten.TerminationDate.Value.Date < DateTime.Now.Date)
|
||||
{
|
||||
input.Status = "2";
|
||||
}
|
||||
|
||||
|
||||
input1.Add(input);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user