ownSoft/BeWoPlaner
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Viele Todos und Weitreichende aenderungen am Chat, die so Weitreichend sind, dass es jetz sinlos waere darueber zu schnacken

Browse Source
This commit is contained in:
Waldi
2016-11-08 13:50:58 +01:00
parent 9db29abcf0
commit f56353dc62
46 changed files with 1526 additions and 865 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
BeWo/MainWindow.xaml.cs
View File

@@ -1,5 +1,6 @@
using System;
using System.ComponentModel;
using System.IO;
using System.Net;
using System.Windows;
using System.Windows.Controls;
@@ -82,11 +83,18 @@ namespace BeWo
try
{
// if (BeWoApp.MainControl.HomeView.clientSocket.Connected)
// {
BeWoApp.MainControl.HomeView.CloseServerConnection();
// }
BeWoApp.MainControl.HomeView.CloseServerConnection();
foreach (var xyz in BeWoApp.MainControl.HomeView.chatView.Speicherpfad)
{
try
{
File.Delete(xyz.Value);
}
catch (Exception esx)
{
}
}
}
catch (Exception edf)
{

123
BeWo/ServiceProxy/Generated.cs
View File

@@ -493,6 +493,12 @@ namespace BeWo.ServiceProxy
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/GetEmployeeThumbnail", ReplyAction="http://tempuri.org/IEmployeeService/GetEmployeeThumbnailResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/GetEmployeeThumbnailBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
byte[] GetEmployeeThumbnail(long employeeOid);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/DeleteEmployeeCustomerRelationForEmployee", ReplyAction="http://tempuri.org/IEmployeeService/DeleteEmployeeCustomerRelationForEmployeeResp" +
"onse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/DeleteEmployeeCustomerRelationForEmployeeBeWo" +
"FaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
void DeleteEmployeeCustomerRelationForEmployee(long employeeOid);
}
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
@@ -918,6 +924,11 @@ namespace BeWo.ServiceProxy
{
return base.Channel.GetEmployeeThumbnail(employeeOid);
}
public void DeleteEmployeeCustomerRelationForEmployee(long employeeOid)
{
base.Channel.DeleteEmployeeCustomerRelationForEmployee(employeeOid);
}
}
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
@@ -2704,6 +2715,13 @@ namespace BeWo.ServiceProxy
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IStreamingService/UpdateDocument", ReplyAction="http://tempuri.org/IStreamingService/UpdateDocumentResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IStreamingService/UpdateDocumentBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
BeWo.ServiceProxy.UploadResult UpdateDocument(BeWo.ServiceProxy.UpdatePackage request);
// CODEGEN: Der Nachrichtenvertrag wird generiert, da der Wrappername (UploadChatPackage) von Nachricht "UploadChatPackage" nicht mit dem Standardwert (CreateNewSpeziallStreamChatMessagesDC) übereinstimmt.
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IStreamingService/CreateNewSpeziallStreamChatMessagesDC", ReplyAction="http://tempuri.org/IStreamingService/CreateNewSpeziallStreamChatMessagesDCRespons" +
"e")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IStreamingService/CreateNewSpeziallStreamChatMessagesDCBeWoFau" +
"ltFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
BeWo.ServiceProxy.UploadChatResult CreateNewSpeziallStreamChatMessagesDC(BeWo.ServiceProxy.UploadChatPackage request);
}
[System.Diagnostics.DebuggerStepThroughAttribute()]
@@ -2818,6 +2836,74 @@ namespace BeWo.ServiceProxy
}
}
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
[System.ServiceModel.MessageContractAttribute(WrapperName="UploadChatPackage", WrapperNamespace="http://tempuri.org/", IsWrapped=true)]
public partial class UploadChatPackage
{
[System.ServiceModel.MessageHeaderAttribute(Namespace="http://tempuri.org/")]
public long empfängerOid;
[System.ServiceModel.MessageHeaderAttribute(Namespace="http://tempuri.org/")]
public bool isDeliverd;
[System.ServiceModel.MessageHeaderAttribute(Namespace="http://tempuri.org/")]
public int mediatype;
[System.ServiceModel.MessageHeaderAttribute(Namespace="http://tempuri.org/")]
public string message;
[System.ServiceModel.MessageHeaderAttribute(Namespace="http://tempuri.org/")]
public string messageid;
[System.ServiceModel.MessageHeaderAttribute(Namespace="http://tempuri.org/")]
public long senderOid;
[System.ServiceModel.MessageHeaderAttribute(Namespace="http://tempuri.org/")]
public long teamid;
[System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://tempuri.org/", Order=0)]
public System.IO.Stream Stream;
public UploadChatPackage()
{
}
public UploadChatPackage(long empfängerOid, bool isDeliverd, int mediatype, string message, string messageid, long senderOid, long teamid, System.IO.Stream Stream)
{
this.empfängerOid = empfängerOid;
this.isDeliverd = isDeliverd;
this.mediatype = mediatype;
this.message = message;
this.messageid = messageid;
this.senderOid = senderOid;
this.teamid = teamid;
this.Stream = Stream;
}
}
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
[System.ServiceModel.MessageContractAttribute(WrapperName="UploadChatResult", WrapperNamespace="http://tempuri.org/", IsWrapped=true)]
public partial class UploadChatResult
{
[System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://tempuri.org/", Order=0)]
public BS.Shared.DataContracts.ChatMessageDC ChatMessage;
public UploadChatResult()
{
}
public UploadChatResult(BS.Shared.DataContracts.ChatMessageDC ChatMessage)
{
this.ChatMessage = ChatMessage;
}
}
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
public interface IStreamingServiceChannel : BeWo.ServiceProxy.IStreamingService, System.ServiceModel.IClientChannel
{
@@ -2912,6 +2998,27 @@ namespace BeWo.ServiceProxy
BeWo.ServiceProxy.UploadResult retVal = ((BeWo.ServiceProxy.IStreamingService)(this)).UpdateDocument(inValue);
return retVal.Attachment;
}
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
BeWo.ServiceProxy.UploadChatResult BeWo.ServiceProxy.IStreamingService.CreateNewSpeziallStreamChatMessagesDC(BeWo.ServiceProxy.UploadChatPackage request)
{
return base.Channel.CreateNewSpeziallStreamChatMessagesDC(request);
}
public BS.Shared.DataContracts.ChatMessageDC CreateNewSpeziallStreamChatMessagesDC(long empfängerOid, bool isDeliverd, int mediatype, string message, string messageid, long senderOid, long teamid, System.IO.Stream Stream)
{
BeWo.ServiceProxy.UploadChatPackage inValue = new BeWo.ServiceProxy.UploadChatPackage();
inValue.empfängerOid = empfängerOid;
inValue.isDeliverd = isDeliverd;
inValue.mediatype = mediatype;
inValue.message = message;
inValue.messageid = messageid;
inValue.senderOid = senderOid;
inValue.teamid = teamid;
inValue.Stream = Stream;
BeWo.ServiceProxy.UploadChatResult retVal = ((BeWo.ServiceProxy.IStreamingService)(this)).CreateNewSpeziallStreamChatMessagesDC(inValue);
return retVal.ChatMessage;
}
}
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
@@ -3811,12 +3918,7 @@ namespace BeWo.ServiceProxy
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/CreateNewChatMessagesDC", ReplyAction="http://tempuri.org/IOperationsService/CreateNewChatMessagesDCResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/CreateNewChatMessagesDCBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
BS.Shared.DataContracts.ChatMessageDC CreateNewChatMessagesDC(long senderOid, long empfängerOid, string message, bool isDeliverd, long teamid);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/CreateNewSpeziallChatMessagesDC", ReplyAction="http://tempuri.org/IOperationsService/CreateNewSpeziallChatMessagesDCResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/CreateNewSpeziallChatMessagesDCBeWoFaultFau" +
"lt", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
BS.Shared.DataContracts.ChatMessageDC CreateNewSpeziallChatMessagesDC(long senderOid, long empfängerOid, string message, bool isDeliverd, long teamid, byte[] sound, byte[] doku, byte[] bild);
BS.Shared.DataContracts.ChatMessageDC CreateNewChatMessagesDC(long senderOid, long empfängerOid, string message, bool isDeliverd, long teamid, string messageid);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/UpdateIsChatActiveCustomerAPPCodeDC", ReplyAction="http://tempuri.org/IOperationsService/UpdateIsChatActiveCustomerAPPCodeDCResponse" +
"")]
@@ -4483,14 +4585,9 @@ namespace BeWo.ServiceProxy
return base.Channel.CreateNewCustomerAPPCodeDC(customerOid);
}
public BS.Shared.DataContracts.ChatMessageDC CreateNewChatMessagesDC(long senderOid, long empfängerOid, string message, bool isDeliverd, long teamid)
public BS.Shared.DataContracts.ChatMessageDC CreateNewChatMessagesDC(long senderOid, long empfängerOid, string message, bool isDeliverd, long teamid, string messageid)
{
return base.Channel.CreateNewChatMessagesDC(senderOid, empfängerOid, message, isDeliverd, teamid);
}
public BS.Shared.DataContracts.ChatMessageDC CreateNewSpeziallChatMessagesDC(long senderOid, long empfängerOid, string message, bool isDeliverd, long teamid, byte[] sound, byte[] doku, byte[] bild)
{
return base.Channel.CreateNewSpeziallChatMessagesDC(senderOid, empfängerOid, message, isDeliverd, teamid, sound, doku, bild);
return base.Channel.CreateNewChatMessagesDC(senderOid, empfängerOid, message, isDeliverd, teamid, messageid);
}
public void UpdateIsChatActiveCustomerAPPCodeDC(long customerOid, int activeType)

14
BeWo/View/ChatProgressBarView.xaml Normal file
View File

@@ -0,0 +1,14 @@
<Window x:Class="BeWo.View.ChatProgressBarView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:view="clr-namespace:BeWo.View"
Height="100" Width="300" WindowStartupLocation="CenterScreen"
ResizeMode="NoResize"
>
<Grid Margin="20">
<ProgressBar x:Name="progressBar" Minimum="0" Maximum="100" />
<TextBlock Text="{Binding ElementName=progressBar, Path=Value, StringFormat={}Bitte warten... {0:0}%}" HorizontalAlignment="Center" VerticalAlignment="Center" />
</Grid>
</Window>

21
BeWo/View/ChatProgressBarView.xaml.cs Normal file
View File

@@ -0,0 +1,21 @@
using System;
using System.ComponentModel;
namespace BeWo.View
{
public partial class ChatProgressBarView
{
ChatView chatView;
BackgroundWorker worker = null;
int ubergabe = 0;
public ChatProgressBarView(String name)
{
InitializeComponent();
Title = name;
}
}
}

83
BeWo/View/ChatView.xaml
View File

@@ -53,7 +53,7 @@
</Button>
</StackPanel>
<TextBox x:Name="Suche" Grid.Column="0" Margin="3,1,3,3" MinHeight="25" VerticalContentAlignment="Center" KeyDown="Suche_OnKeyDown" Grid.Row="1" TextChanged="Suche_OnTextChanged" LostFocus="Suche_OnLostFocus" VerticalAlignment="Bottom">
<TextBox x:Name="Suche" Grid.Column="0" Margin="3,1,3,3" MinHeight="25" VerticalContentAlignment="Center" KeyDown="Suche_OnKeyDown" Grid.Row="1" TextChanged="Suche_OnTextChanged" LostFocus="Suche_OnLostFocus" VerticalAlignment="Bottom" ToolTip="Suchen Sie hier nach einem User in der Liste">
<TextBox.Resources>
<Style TargetType="{x:Type Border}">
<Setter Property="CornerRadius" Value="3"/>
@@ -213,18 +213,18 @@
</Button>
<!--####################### Test Zwecke ###############################################################-->
<!-- <Grid Grid.Row="0" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="3">
<Grid Grid.Row="0" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="3">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="35"/>
<ColumnDefinition Width="55"/>
<ColumnDefinition Width="125"/>
<ColumnDefinition Width="55"/>
</Grid.ColumnDefinitions>
<Button Grid.Column="0" PreviewMouseDown="Sound_OnPreviewMouseDown" PreviewMouseUp="Sound_OnPreviewMouseUp" HorizontalAlignment="Center" Margin="1" Width="30">
<Button Grid.Column="0" PreviewMouseDown="Sound_OnPreviewMouseDown" PreviewMouseUp="Sound_OnPreviewMouseUp" HorizontalAlignment="Center" Margin="1" Width="30" Visibility="Collapsed">
<Image x:Name="SmileySound" ToolTip="Sound Aufnehmen und verschicken" Source="/BeWoPlaner;component/Ressources/Icons/glucklicher.png" Stretch="Uniform" VerticalAlignment="Center" HorizontalAlignment="Center" RenderOptions.BitmapScalingMode="HighQuality" />
</Button>
<Button Content="Media" Grid.Column="1" Click="MediaBase_OnClick" HorizontalAlignment="Center" Width="50" Margin="1" />
<Button Content="Video Chatten" Grid.Column="2" Click="ButtonBase_OnClick" HorizontalAlignment="Center" Width="120" Margin="1"/>
</Grid>-->
<Button Content="Media" Grid.Column="2" Click="MediaBase_OnClick" HorizontalAlignment="Center" Width="50" Margin="1" />
<Button Content="Video Chatten" Grid.Column="1" Click="ButtonVideoChat_OnClick" HorizontalAlignment="Center" Width="120" Margin="1" Visibility="Collapsed"/>
</Grid>
<!--####################################################################################################-->
@@ -243,6 +243,7 @@
<ListBox.ItemTemplate>
<DataTemplate>
<Border BorderBrush="{Binding ChatColor}" BorderThickness="1,1,1,1" CornerRadius="8,8,8,8" Background="{Binding ChatColor}">
<DockPanel MinHeight="15" Margin="5" LastChildFill="True" Background="{Binding ChatColor}" >
<StackPanel DockPanel.Dock="Bottom" Visibility="{Binding ChatVisibility}" >
@@ -251,24 +252,58 @@
<!--############################### Neu versuch ein Button in den Chat hinein zu packen ###############################################-->
<!--Sound bereich-->
<Border BorderThickness="1" BorderBrush="Black" DockPanel.Dock="Bottom" Visibility="{Binding SoundVisibility}">
<DockPanel DockPanel.Dock="Bottom" Visibility="{Binding SoundVisibility}" >
<!--Sound bereich
<Border BorderThickness="1" BorderBrush="Black" DockPanel.Dock="Bottom" Visibility="{Binding SoundVisibility}">-->
<!-- <DockPanel DockPanel.Dock="Bottom" Visibility="{Binding SoundVisibility}" >
<Button HorizontalAlignment="Left" VerticalAlignment="Center" Click="PlayAufnahme_OnClick" Height="25" Width="25">
<Button HorizontalAlignment="Left" VerticalAlignment="Center" Click="PlayAufnahme_OnClick" Height="25" Width="25" Margin="0,0,5,0" Tag="{Binding SoundArray}">
<Image Name="image" ToolTip="Smiley einfügen" Source="/BeWoPlaner;component/Ressources/Icons/glucklicher.png" Stretch="Uniform" VerticalAlignment="Center" HorizontalAlignment="Center" RenderOptions.BitmapScalingMode="HighQuality" />
<!--<Button.Triggers>
<EventTrigger RoutedEvent="Button.Click">
<SoundPlayerAction Source="{Binding UserMessage}" />
</EventTrigger>
</Button.Triggers>-->
</Button>
<TextBlock Margin="2,0,0,0" VerticalAlignment="Center" HorizontalAlignment="Center" Text="{Binding UserMessage}" />
</DockPanel>
</Border>
</Button>-->
<!--Hier slider einbauen
<Slider HorizontalAlignment="Left" Margin="2,0,0,0" VerticalAlignment="Center" Width="100" ValueChanged="AudioSlider_OnValueChanged"/>-->
<!-- <Grid Width="200">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="110"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="25" />
<RowDefinition Height="15" />
</Grid.RowDefinitions>
<Border BorderThickness="1" Grid.Row="0" Grid.ColumnSpan="2" BorderBrush="Black" Visibility="{Binding SoundVisibility}">
<Slider Grid.Row="0" Grid.ColumnSpan="2" Value="{Binding Path=position, FallbackValue=0}" Maximum="{Binding Path=sliderMaximum, FallbackValue=0, Mode=TwoWay}" Minimum="0" Margin="5,0" VerticalAlignment="Center" />
</Border>
<TextBlock Grid.Row="1" Grid.Column="1" Text="{Binding Path=time, StringFormat={}{0:hh}:{0:mm}:{0:ss}, FallbackValue=00:00:00, Mode=TwoWay}" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="5,0" />
<TextBlock Grid.Row="1" Grid.Column="0" Name="text" Margin="5,0" VerticalAlignment="Center" HorizontalAlignment="Left" Text="{Binding UserMessage}" />
</Grid>
</DockPanel>-->
<!--Herunterlade bereich für Bild und Dokumente Mach ne binding auf die Visibility und zeige diese zuerst an die visibility wird dan geändert -->
<DockPanel DockPanel.Dock="Bottom" Visibility="{Binding Herunterladen}" >
<Grid >
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="25" />
<RowDefinition Height="25" />
</Grid.RowDefinitions>
<!-- Name Der Datei -->
<TextBlock Text="{Binding UserMessage}" Grid.Row="0" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<!-- Herunterlade Button Hole die Datei aus der Neuen Database | binding herunterladbares erstellen und beim auslesen aus der Datenbank dise dan binden -->
<Button Content="Herunterladen" Grid.Row="1" ToolTip="Datei Herunterladen" HorizontalAlignment="Center" VerticalAlignment="Center" Width="125" Height="25" Tag="{Binding Herunterladbares}" Click="DatenRunterladen_OnClick" />
</Grid>
</DockPanel>
<!-- #++++++++++++++++++++++++++++++++++++++++++++++# -->
<!-- Picture bereich-->
<DockPanel DockPanel.Dock="Bottom" Visibility="{Binding PictureVisibility}" >
<Image Stretch="Uniform" MaxHeight="200" MaxWidth="300" Source="{Binding ImageSources}" RenderOptions.BitmapScalingMode="HighQuality" />
@@ -277,14 +312,14 @@
<!--Documentation bereich -->
<DockPanel DockPanel.Dock="Bottom" Visibility="{Binding DokumentVisibility}" >
<Button HorizontalAlignment="Center" VerticalAlignment="Center" Click="OpenDokument_OnClick" Height="25" Width="25" >
<Button HorizontalAlignment="Center" VerticalAlignment="Center" Click="OpenDokument_OnClick" Height="25" Width="25" Tag="{Binding Dokpfad}" >
<Image ToolTip="Dokument öffnen" Source="/BeWoPlaner;component/Ressources/Icons/ClipboardDisabled.png" Stretch="Uniform" VerticalAlignment="Center" HorizontalAlignment="Center" />
</Button>
<TextBlock Margin="2,0,0,0" VerticalAlignment="Center" HorizontalAlignment="Center" Text="{Binding UserMessage}"/>
</DockPanel>
<!--###################################################################################################################################-->
<!--#################################################################################################################################################################-->
<StackPanel DockPanel.Dock="Left" Margin="0,0,0,5">
<TextBlock Text="{Binding Username}" FontWeight="Bold" MaxWidth="150" HorizontalAlignment="Left" TextAlignment="Left" VerticalAlignment="Center"/>
@@ -312,7 +347,7 @@
</Grid.RowDefinitions>
<TextBox x:Name="Chatbox" HorizontalAlignment="Stretch" Grid.Column="0" TextWrapping="Wrap" Text="Nachricht schreiben" TextChanged="Chatbox_OnTextChanged" VerticalScrollBarVisibility="Auto" MaxLines="5" MaxHeight="70"
<TextBox x:Name="Chatbox" HorizontalAlignment="Stretch" Grid.Column="0" TextWrapping="Wrap" Text="Nachricht schreiben" VerticalScrollBarVisibility="Auto" MaxLines="5" MaxHeight="70"
VerticalContentAlignment="Center" MinHeight="25" ToolTip="Schreiben Sie hier eine Nachricht hinein" KeyDown="OnKeyDownHandler" GotFocus="OnFocus" Foreground="DarkGray" VerticalAlignment="Bottom" >
<TextBox.Resources>
<Style TargetType="{x:Type Border}">

1414
BeWo/View/ChatView.xaml.cs
View File

File diff suppressed because it is too large Load Diff

13
BeWo/View/Detail/OrganisationView.xaml
View File

@@ -85,7 +85,8 @@
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Label Grid.Column="0" Grid.Row="0" Content="Name" />
<TextBox VerticalAlignment="Top" Margin="10,3,3,3" Height="23" Grid.Column="1"
@@ -97,8 +98,14 @@
<TextBox x:Name="txtDebitorNumber" Grid.Column="1" Grid.Row="1" Margin="10,3,3,3" Height="23"
Text="{val:ValidationBinding Path=DebitorNumber, UpdateSourceTrigger=PropertyChanged}"
Width="300" HorizontalAlignment="Left" />
<Label x:Name="lblArchiviert" Grid.Column="0" Grid.Row="2" Content="Archiviert" />
<CheckBox x:Name="chkArchiviert" Grid.Column="1" Grid.Row="2" Margin="10,6,3,0" Height="23" IsChecked="{Binding Path=IsArchived, UpdateSourceTrigger=PropertyChanged}" VerticalAlignment="Stretch" />
<Label Grid.Column="0" Grid.Row="2" Content="Funktion" />
<ComboBox x:Name="comboBox_Function" Grid.Column="1" Grid.Row="2" Margin="10,3,3,3" Height="23" Width="300" HorizontalAlignment="Left" SelectedValue="{Binding Path=Function, Mode=TwoWay}" />
<Label x:Name="lblArchiviert" Grid.Column="0" Grid.Row="3" Content="Archiviert" />
<CheckBox x:Name="chkArchiviert" Grid.Column="1" Grid.Row="3" Margin="10,6,3,0" Height="23" IsChecked="{Binding Path=IsArchived, UpdateSourceTrigger=PropertyChanged}" VerticalAlignment="Stretch" />
</Grid>
<GroupBox Grid.Column="0" Grid.Row="1" Header="Adresse"
Style="{StaticResource ObjectEditGroupBox}" Margin="0,8,0,0">

1
BeWo/View/Detail/OrganisationView.xaml.cs
View File

@@ -35,6 +35,7 @@ namespace BeWo.View.Detail
tabitem_costbearer.Visibility = BeWoApp.LoggedOnUser.HasRight(UserRightType.OrganisationView_AllowEditCostBearer) ? Visibility.Visible : Visibility.Collapsed;
comboBox_Function.ItemsSource = _ViewModel.Functions;
if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.Organisation_AllowArchiving))
{

25
BeWo/View/Detail/SupportConceptView.xaml
View File

@@ -1112,6 +1112,7 @@
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
@@ -1126,14 +1127,26 @@
PopUpClick="popupedit_betreuungsschluessel_PopUpClick"
PreviewMouseDoubleClick="Popupedit_betreuungsschluessel_OnPreviewMouseDoubleClick"
Cursor="Arrow" />
<Label Content="Anteil an der Betreuung (%)" Grid.Row="1" Grid.Column="0" VerticalAlignment="Center" />
<dxe:SpinEdit IsFloatValue="True" MinValue="0" MaxValue="100" Increment="10" Grid.Column="1" Grid.Row="1" Margin="3" Height="23"
Grid.ColumnSpan="2"
EditValue="{Binding Path=SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.NewVM.Betreuungsschluessel, UpdateSourceTrigger=PropertyChanged, RelativeSource={RelativeSource AncestorLevel=1, AncestorType={x:Type view:SupportConceptView}, Mode=FindAncestor}}" />
<Button Grid.Row="2" Grid.Column="1" HorizontalAlignment="Right" VerticalAlignment="Bottom" Height="25"
<StackPanel Orientation="Horizontal" Grid.Row="1" x:Name="RadioAbsolPro" Visibility="Collapsed">
<RadioButton GroupName="ProAbso" Content="Prozentual" IsChecked="{Binding Path=SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.IsProzentual}" Click="ToggledProz_OnChecked"/>
<RadioButton GroupName="ProAbso" Content="Absolut" IsChecked="{Binding Path=SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.IsAbsolut}" Margin="5,0,0,0" Click="ToggledAbsol_OnChecked"/>
</StackPanel>
<Label Content="Anteil an der Betreuung (%)" Grid.Row="2" Grid.Column="0" VerticalAlignment="Center" Visibility="Visible" x:Name="LabelProzentual"/>
<dxe:SpinEdit IsFloatValue="True" MinValue="0" MaxValue="100" Increment="10" Grid.Column="1" Grid.Row="2" Margin="3" Height="23"
Grid.ColumnSpan="2" Visibility="Visible" x:Name="editProzentual"
EditValue="{Binding Path=SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.NewVM.Betreuungsschluessel, UpdateSourceTrigger=PropertyChanged, RelativeSource={RelativeSource AncestorLevel=1, AncestorType={x:Type view:SupportConceptView}, Mode=FindAncestor}}" />
<Label Content="Anteil an der Betreuung (Absolut)" Grid.Row="2" Grid.Column="0" VerticalAlignment="Center" Visibility="Collapsed" x:Name="LabelAbsolut"/>
<dxe:SpinEdit IsFloatValue="True" MinValue="0" Increment="1" Grid.Column="1" Grid.Row="2" Margin="3" Height="23"
Grid.ColumnSpan="2" Visibility="Collapsed" x:Name="editAbsolut"
EditValue="{Binding Path=SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.NewVM.Betreuungsschluessel, UpdateSourceTrigger=PropertyChanged, RelativeSource={RelativeSource AncestorLevel=1, AncestorType={x:Type view:SupportConceptView}, Mode=FindAncestor}}" />
<Button Grid.Row="3" Grid.Column="1" HorizontalAlignment="Right" VerticalAlignment="Bottom" Height="25"
Margin="3" Content="Hinzufügen" x:Name="button_addBetreuungsschluessel"
Click="button_addBetreuungsschluessel_Click" />
<Button Grid.Row="2" Grid.Column="2" HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Height="25"
<Button Grid.Row="3" Grid.Column="2" HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Height="25"
Margin="3" Content="Abbrechen" x:Name="button_cancelBetreuungsschluessel"
Click="button_cancelBetreuungsschluessel_Click" />
</Grid>

110
BeWo/View/Detail/SupportConceptView.xaml.cs
View File

@@ -1148,7 +1148,7 @@ namespace BeWo.View.Detail
var employeeColumn = new GridColumn {Header = "Mitarbeiter", FieldName = "EmployeeString", AllowEditing = DefaultBoolean.False, Width = 250};
var allowEditingBetreuungsschluesselColumn = BeWoApp.HasLoggedOnUserRight(new[] { UserRightType.EditAll, UserRightType.Betreuungsschluessel_Edit }) ? DefaultBoolean.True : DefaultBoolean.False;
var betreuungsschluesselColumn = new GridColumn { Header = "Anteil an der Betreuung (%)", FieldName = "Betreuungsschluessel", AllowEditing = allowEditingBetreuungsschluesselColumn, Width = 170, EditSettings = new TextEditSettings { MaskUseAsDisplayFormat = true, MaskType = MaskType.Numeric, Mask = "########0.00" } };
var betreuungsschluesselColumn = new GridColumn { Header = "Anteil an der Betreuung", FieldName = "Betreuungsschluessel", AllowEditing = allowEditingBetreuungsschluesselColumn, Width = 170, EditSettings = new TextEditSettings { MaskUseAsDisplayFormat = true, MaskType = MaskType.Numeric, Mask = "########0.00" } };
gridControl.Columns.Add(employeeColumn);
gridControl.Columns.Add(betreuungsschluesselColumn);
@@ -1264,11 +1264,58 @@ namespace BeWo.View.Detail
if (SelectedApprovalPeriodVM != null)
{
var alt = SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.VMList.Sum(s => s.Betreuungsschluessel);
if (SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.VMList.Count == 0)
{
RadioAbsolPro.Visibility = Visibility.Visible;
}
else
{
RadioAbsolPro.Visibility = Visibility.Collapsed;
if (SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.VMList.Last().IsAbsolut)
{
LabelProzentual.Visibility = Visibility.Collapsed;
LabelAbsolut.Visibility = Visibility.Visible;
if (alt > 100)
alt = 100;
SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.NewVM.Betreuungsschluessel = 100 - alt;
editProzentual.Visibility = Visibility.Collapsed;
editAbsolut.Visibility = Visibility.Visible;
SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.NewVM.IsAbsolut = true;
var cbRelVM = this.tabcontrol_costbearers.SelectedItem as SupportConceptCostBearerRelVM;
var actual = cbRelVM.ApprovalPeriodList.VMList.OrderByDescending(i => i.StartDate).FirstOrDefault();
editAbsolut.MaxValue = actual.ApprovedBEPerInterval;
var alt =
SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.VMList.Sum(
s => s.Betreuungsschluessel);
if (alt > actual.ApprovedBEPerInterval)
alt = actual.ApprovedBEPerInterval ?? 0;
SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.NewVM.Betreuungsschluessel = Math.Round((actual.ApprovedBEPerInterval ?? 0) - alt,2);
}
else
{
LabelProzentual.Visibility = Visibility.Visible;
LabelAbsolut.Visibility = Visibility.Collapsed;
editProzentual.Visibility = Visibility.Visible;
editAbsolut.Visibility = Visibility.Collapsed;
SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.NewVM.IsAbsolut = false;
var alt = SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.VMList.Sum(s => s.Betreuungsschluessel);
if (alt > 100)
alt = 100;
SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.NewVM.Betreuungsschluessel = 100 - alt;
}
}
}
}
@@ -1276,13 +1323,28 @@ namespace BeWo.View.Detail
{
if (SelectedApprovalPeriodVM != null && Validate(groupbox_newBetreuungsschluessel))
{
var alt = SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.VMList.Sum(s => s.Betreuungsschluessel);
if (alt + SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.NewVM.Betreuungsschluessel > 100)
if (SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.NewVM.IsAbsolut)
{
MessageBox.Show("Die Summe der Anteile liegt bei über 100%. Hinzufügen nicht möglich.", "Fehler", MessageBoxButton.OK, MessageBoxImage.Warning);
return;
var alt = SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.VMList.Sum(s => s.Betreuungsschluessel);
if (alt + SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.NewVM.Betreuungsschluessel > editAbsolut.MaxValue)
{
MessageBox.Show("Die Summe der Anteile liegt bei über " + Math.Round(editAbsolut.MaxValue ?? 0,2) + ". Hinzufügen nicht möglich.", "Fehler", MessageBoxButton.OK, MessageBoxImage.Warning);
return;
}
}
else
{
var alt = SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.VMList.Sum(s => s.Betreuungsschluessel);
if (alt + SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.NewVM.Betreuungsschluessel > 100)
{
MessageBox.Show("Die Summe der Anteile liegt bei über 100%. Hinzufügen nicht möglich.", "Fehler", MessageBoxButton.OK, MessageBoxImage.Warning);
return;
}
}
SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.AddNewVMToList();
}
@@ -1290,6 +1352,7 @@ namespace BeWo.View.Detail
SelectedApprovalPeriodVM = null;
popup_newBetreuungsschluessel.IsOpen = false;
}
private void button_cancelBetreuungsschluessel_Click(object sender, RoutedEventArgs e)
@@ -1353,6 +1416,33 @@ namespace BeWo.View.Detail
var abc = SelectedApprovalPeriodVM;
}
private void ToggledProz_OnChecked(object sender, RoutedEventArgs e)
{
LabelProzentual.Visibility = Visibility.Visible;
LabelAbsolut.Visibility = Visibility.Collapsed;
editProzentual.Visibility = Visibility.Visible;
editAbsolut.Visibility = Visibility.Collapsed;
SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.NewVM.IsAbsolut = false;
}
private void ToggledAbsol_OnChecked(object sender, RoutedEventArgs e)
{
var cbRelVM = this.tabcontrol_costbearers.SelectedItem as SupportConceptCostBearerRelVM;
var actual = cbRelVM.ApprovalPeriodList.VMList.OrderByDescending(i => i.StartDate).FirstOrDefault();
editAbsolut.MaxValue = actual.ApprovedBEPerInterval;
LabelProzentual.Visibility = Visibility.Collapsed;
LabelAbsolut.Visibility = Visibility.Visible;
editProzentual.Visibility = Visibility.Collapsed;
editAbsolut.Visibility = Visibility.Visible;
SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.NewVM.IsAbsolut = true;
}
}
public class ValueListEntryTypeToColorConverter : IValueConverter

64
BeWo/View/Detail/ValueListView.xaml
View File

@@ -9,41 +9,41 @@
xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
Height="Auto" Width="Auto" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Focusable="True">
<GroupBox Name="groupbox_root" Header="{Binding Path=HeaderText}" Style="{StaticResource ObjectEditGroupBox}" >
<Grid Width="Auto">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<GroupBox Name="groupbox_root" Header="{Binding Path=HeaderText}" Style="{StaticResource ObjectEditGroupBox}">
<Grid Width="Auto">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<Label Name="label_" Content="Bezeichnung" />
<TextBox Margin="3" Grid.Column="1" Text="{val:ValidationBinding Path=NewVM.Description, UpdateSourceTrigger=PropertyChanged}" Height="23" VerticalAlignment="Center" />
<Button Margin="3" Padding="3,2,3,2" Grid.Column="2" IsDefault="True" Name="button_add" Click="button_add_Click" VerticalAlignment="Center" Content="Hinzufügen" Height="25" Width="Auto" FontWeight="Normal" />
<Label Name="label_" Content="Bezeichnung" />
<TextBox Margin="3" Grid.Column="1" Text="{val:ValidationBinding Path=NewVM.Description, UpdateSourceTrigger=PropertyChanged}" Height="23" VerticalAlignment="Center" />
<Button Margin="3" Padding="3,2,3,2" Grid.Column="2" IsDefault="True" Name="button_add" Click="button_add_Click" VerticalAlignment="Center" Content="Hinzufügen" Height="25" Width="Auto" FontWeight="Normal" />
<dxg:GridControl Margin="0,10,0,0" Grid.Row="1" Grid.ColumnSpan="3" Name="grid">
<dxg:GridControl.Columns>
<dxg:GridColumn FieldName="IsDeleteable" Header="" FixedWidth="True" Width="24" ReadOnly="True">
<dxg:GridControl Margin="0,10,0,0" Grid.Row="1" Grid.ColumnSpan="3" Name="grid">
<dxg:GridControl.Columns>
<dxg:GridColumn FieldName="IsDeleteable" Header="" FixedWidth="True" Width="24" ReadOnly="True">
<dxg:GridColumn.CellTemplate>
<DataTemplate>
<Button Content="r" Click="DeleteButton_Click" Visibility="{Binding Path=EditValue, Converter={StaticResource BoolVisibilityConverter}}" FontFamily="Webdings" Width="18" Height="18" VerticalAlignment="Center" />
</DataTemplate>
</dxg:GridColumn.CellTemplate>
<dxg:GridColumn.CellTemplate>
<DataTemplate>
<Button Content="r" Click="DeleteButton_Click" Visibility="{Binding Path=EditValue, Converter={StaticResource BoolVisibilityConverter}}" FontFamily="Webdings" Width="18" Height="18" VerticalAlignment="Center" />
</DataTemplate>
</dxg:GridColumn.CellTemplate>
</dxg:GridColumn>
<dxg:GridColumn FieldName="Description" Header="Beschreibung" />
</dxg:GridControl.Columns>
<dxg:GridControl.View>
<dxg:TableView AutoWidth="true" ShowGroupPanel="False" ShowGroupedColumns="false" ShowTotalSummary="False" NavigationStyle="Cell" />
</dxg:GridControl.View>
</dxg:GridControl>
</Grid>
</GroupBox>
</dxg:GridColumn>
<dxg:GridColumn FieldName="Description" Header="Beschreibung" />
</dxg:GridControl.Columns>
<dxg:GridControl.View>
<dxg:TableView AutoWidth="true" ShowGroupPanel="False" ShowGroupedColumns="false" ShowTotalSummary="False" NavigationStyle="Cell" />
</dxg:GridControl.View>
</dxg:GridControl>
</Grid>
</GroupBox>
</localView:BeWoView>

4
BeWo/View/Detail/ValueListView.xaml.cs
View File

@@ -20,12 +20,12 @@ namespace BeWo.View.Detail
/// </summary>
public partial class ValueListView : BeWoView
{
private ValueListEntryListVM _ViewModel;
private ValueListEntryListVM _ViewModel;
public ValueListView(ValueListEntryListVM pViewModel)
{
this.InitializeComponent();
this.ViewModel = pViewModel;
this.ViewModel = pViewModel;
}
public override bool IsDirty

14
BeWo/View/HomeDragPanelView.xaml.cs
View File

@@ -67,7 +67,7 @@ namespace BeWo.View
protected TextBox chat = new TextBox();
protected MiniChatView miniChatView = null;
protected ChatView chatView = null;
public ChatView chatView = null;
Dictionary<long, MiniChatView> miniChatViewList = new Dictionary<long, MiniChatView>();
Dictionary<long, MiniChatView> miniChatTeamViewList = new Dictionary<long, MiniChatView>();
@@ -1359,7 +1359,7 @@ namespace BeWo.View
{
try
{
var ipAdresse = "192.168.1.107"; //3 |9 || 192.168.1.103"app4.bewoplaner.de"
var ipAdresse = "192.168.1.103"; //3 |9 || 192.168.1.103"app4.bewoplaner.de"
var port = 5000;
var uri = BeWoApp.SiteOfOrigin;
@@ -1394,11 +1394,11 @@ namespace BeWo.View
}
catch (Exception e)
{
if (!isReconnect){
SystemSounds.Hand.Play();
MessageBox.Show("Verbindung zum Chat-Server konnte nicht aufgebaut werden.", "Fehler: 2010 ",
MessageBoxButton.OK);
}
//if (!isReconnect){
// SystemSounds.Hand.Play();
// MessageBox.Show("Verbindung zum Chat-Server konnte nicht aufgebaut werden.", "Fehler: 2010 ",
// MessageBoxButton.OK);
//}
if(!threadstop){
Dispatcher.Invoke(

7
BeWo/View/Master/AdministrationView.xaml.cs
View File

@@ -217,7 +217,12 @@ namespace BeWo.View.Master
{
if (!_OpenViews.ContainsKey(tabitem_functions) || _SavePerformed)
{
VMFactory.CreateValueListVMAsync(ValueListEntryType.FunctionType, r => this.Dispatch(() => AddView(tabitem_functions, new ValueListView(r))));
//VMFactory.CreateValueListVMAsync(ValueListEntryType.FunctionType, r => this.Dispatch(() => AddView(tabitem_functions, new ValueListView(r))));
VMFactory.CreateValueListVMAsync(ValueListEntryType.FunctionType,
personList => VMFactory.CreateValueListVMAsync(ValueListEntryType.OrganisationFunctionType,
orgList =>
this.Dispatch(() => AddView(tabitem_functions, new EnvironmentRoleView(personList, orgList)))));
}
}

76
BeWo/ViewModel/ChatMessageVM.cs
View File

@@ -15,19 +15,15 @@ namespace BeWo.ViewModel
public static string PropertyName_MessageId = "MessageId";
public static string PropertyName_SoundDatei = "SoundDatei";
public static string PropertyName_DokuDatei = "DokuDatei";
public static string PropertyName_BildDatei = "BildDatei";
public static string PropertyName_MediaDatei = "MediaDatei";
public static string PropertyName_MediaTyp = "MediaTyp";
private string _ChatText;
private byte[] _SoundDatei;
private byte[] _MediaDatei;
private byte[] _DokuDatei;
private byte[] _BildDatei;
private int _MediaTyp;
private DateTime _Uhrzeit;
@@ -73,41 +69,15 @@ namespace BeWo.ViewModel
}
}
public virtual byte[] SoundDatei
public virtual byte[] MediaDatei
{
get { return _SoundDatei; }
get { return _MediaDatei; }
set
{
if (AreDifferent(_SoundDatei, value))
if (AreDifferent(_MediaDatei, value))
{
_SoundDatei = value;
}
}
}
public virtual byte[] DokuDatei
{
get { return _DokuDatei; }
set
{
if (AreDifferent(_DokuDatei, value))
{
_DokuDatei = value;
}
}
}
public virtual byte[] BildDatei
{
get { return _BildDatei; }
set
{
if (AreDifferent(_BildDatei, value))
{
_BildDatei = value;
_MediaDatei = value;
}
}
}
@@ -207,6 +177,23 @@ namespace BeWo.ViewModel
}
}
public virtual int MediaTyp
{
get
{
return _MediaTyp;
}
set
{
if (AreDifferent(_MediaTyp, value))
{
_MediaTyp = value;
}
}
}
protected override void InitByDataContract(ChatMessageDC pDataContract)
{
_SenderPersonOid = pDataContract.SenderPersonOid;
@@ -217,9 +204,9 @@ namespace BeWo.ViewModel
_IstGelesen = pDataContract.IstGelesen;
_TeamOid = pDataContract.TeamOid;
_MessageId = pDataContract.MessageId;
_DokuDatei = pDataContract.DokuDatei;
_SoundDatei = pDataContract.SoundDatei;
_BildDatei = pDataContract.BildDatei;
_MediaDatei = pDataContract.MediaDatei;
_MediaTyp = pDataContract.MediaTyp;
}
protected override ChatMessageDC MapToDataContract(ChatMessageDC pDataContract, bool doCommit)
@@ -232,9 +219,8 @@ namespace BeWo.ViewModel
pDataContract.IstGelesen = _IstGelesen;
pDataContract.TeamOid = _TeamOid;
pDataContract.MessageId = _MessageId;
pDataContract.SoundDatei = _SoundDatei;
pDataContract.DokuDatei = _DokuDatei;
pDataContract.BildDatei = _BildDatei;
pDataContract.MediaDatei = _MediaDatei;
pDataContract.MediaTyp = _MediaTyp;
return pDataContract;
}

51
BeWo/ViewModel/OrganisationVM.cs
View File

@@ -2,6 +2,7 @@
using System.ComponentModel;
using System.Linq;
using System.Windows;
using BeWo.Core;
using BeWo.Validation;
using BeWo.ViewModel.ListViewModel;
@@ -70,6 +71,8 @@ namespace BeWo.ViewModel
public static string PropertyName_VarFields = "VarFields";
public static string PropertyName_Function = "OrganisationsFunction";
private readonly List<ValueListEntryDC> _AllQualifications;
private string _AccountNumber;
@@ -126,9 +129,17 @@ namespace BeWo.ViewModel
private VarFieldListVM _VarFields;
public OrganisationVM(OrganisationDC pDataContract, List<ValueListEntryDC> pAllQualifications) : base(pDataContract, pDataContract.OrganisationOid == null)
private ObservableSortCollection<ValueListEntryDC> _Functions;
private ValueListEntryDC _Function;
public OrganisationVM(OrganisationDC pDataContract, List<ValueListEntryDC> pAllQualifications, List<ValueListEntryDC> pPossibleFunctions)
: base(pDataContract, pDataContract.OrganisationOid == null)
{
this._AllQualifications = pAllQualifications;
this._Functions = new ObservableSortCollection<ValueListEntryDC>(pPossibleFunctions, Comparer.ValueListEntryDCComparer);
}
public string AccountNumber
@@ -599,6 +610,38 @@ namespace BeWo.ViewModel
}
}
public ObservableSortCollection<ValueListEntryDC> Functions
{
get
{
if (this._Functions == null)
{
this._Functions = new ObservableSortCollection<ValueListEntryDC>();
}
return this._Functions;
}
}
public ValueListEntryDC Function
{
get { return this._Function; }
set
{
if (this.AreDifferent(this._Function, value))
{
this._Function = value;
this.StoreDirtyInformation(this.AreDifferent(this.DataContract.Function, value), PropertyName_Function);
this.FirePropertyChanged(PropertyName_Function);
}
}
}
protected void CommitContact(string pValue, ContactType pContactType)
{
List<ContactDC> lOldContactDCs;
@@ -658,6 +701,8 @@ namespace BeWo.ViewModel
this._DebitorNumber = pDataContract.DebitorNumber;
this._IsArchived = pDataContract.ActivationType == ActivationTypeId.Archived;
_Function = pDataContract.Function;
foreach (ContactDC iContactDC in pDataContract.ContactInformations)
{
if (iContactDC.ContactType == ContactType.business_Mail)
@@ -754,7 +799,8 @@ namespace BeWo.ViewModel
pDataContract.IsSingleInvoicePerCustomer = this._IsSingleInvoicePerCustomer;
pDataContract.DebitorNumber = this._DebitorNumber;
pDataContract.ActivationType = this._IsArchived ? ActivationTypeId.Archived : ActivationTypeId.Active;
pDataContract.Function = this._Function;
this.CommitContact(this._Phone, ContactType.business_Phone);
this.CommitContact(this._Website, ContactType.business_Homepage);
this.CommitContact(this._Fax, ContactType.business_Fax);
@@ -762,6 +808,7 @@ namespace BeWo.ViewModel
this.CommitContact(this._ContactPerson, ContactType.ContactPerson);
this.CommitContact(this._POBox, ContactType.business_POBox);
this.CommitContact(this._InvoiceAddressPOBox, ContactType.private_POBox);
pDataContract.CostRatePeriods = this._CostRatePeriods.CopyToDCList(doCommit);

28
BeWo/ViewModel/SupportConceptApprovalPeriodEmployeeRelVM.cs
View File

@@ -11,9 +11,11 @@ namespace BeWo.ViewModel
{
public static string PropertyName_Employee = "Employee";
public static string PropertyName_Betreuungsschluessel = "Betreuungsschluessel";
public static string PropertyName_IsAbsolut = "IsAbsolut";
public static string PropertyName_EmployeeString = "EmployeeString";
private CompactEmployeeDC _Employee;
private bool _IsAbsolut;
private decimal _Betreuungsschluessel;
[Validation(ValidationRule = ValidationRules.NotNullOrStringEmpty)]
@@ -55,6 +57,29 @@ namespace BeWo.ViewModel
}
}
public bool IsProzentual
{
get { return !IsAbsolut; }
set { IsAbsolut = !value; }
}
public bool IsAbsolut
{
get { return _IsAbsolut; }
set
{
if (AreDifferent(_IsAbsolut, value))
{
_IsAbsolut = value;
StoreDirtyInformation(AreDifferent(DataContract.IsAbsolut, value), PropertyName_IsAbsolut);
FirePropertyChanged(PropertyName_IsAbsolut);
}
}
}
public SupportConceptApprovalPeriodEmployeeRelVM(SupportConceptApprovalPeriodEmployeeRelDC pDataContract) : base(pDataContract, pDataContract.SupportConceptApprovalPeriod2EmployeeOid == null) { }
protected override void InitByDataContract(SupportConceptApprovalPeriodEmployeeRelDC pDataContract)
@@ -63,6 +88,7 @@ namespace BeWo.ViewModel
{
_Employee = pDataContract.Employee;
_Betreuungsschluessel = pDataContract.Betreuungsschluessel;
_IsAbsolut = pDataContract.IsAbsolut;
}
}
@@ -70,7 +96,7 @@ namespace BeWo.ViewModel
{
pDataContract.Employee = _Employee;
pDataContract.Betreuungsschluessel = _Betreuungsschluessel;
pDataContract.IsAbsolut = _IsAbsolut;
return pDataContract;
}
}

8
BeWo/ViewModel/VMFactory.cs
View File

@@ -335,7 +335,7 @@ namespace BeWo.ViewModel
{
ServiceFacade.DoCustomerServiceAsync(
s => s.LoadOrganisation(pOid),
r1 => ServiceFacade.DoValueListServiceAsync(s1 => s1.GetAllValueListEntrysByType(ValueListEntryType.StaffQualificationsType), r2 => pCallBack(new OrganisationVM(r1, r2))));
r1 => ServiceFacade.DoValueListServiceAsync(s1 => s1.GetAllValueListEntrysByType(ValueListEntryType.StaffQualificationsType),r2 => Cache.GetInstance().GetAllValueListEntrysByTypeAsync(ValueListEntryType.OrganisationFunctionType, r3 => pCallBack(new OrganisationVM(r1,r2,r3)))));
}
public static void CreateOrganisationVMAsync(Action<OrganisationVM> pCallBack)
@@ -345,11 +345,13 @@ namespace BeWo.ViewModel
r1 =>
ServiceFacade.DoOperationsServiceAsync(
s => s.GetVarFieldDefs(TableID.Organisation),
r2 => pCallBack(new OrganisationVM(
r2 =>Cache.GetInstance().GetAllValueListEntrysByTypeAsync(
ValueListEntryType.OrganisationFunctionType,
r3 => pCallBack(new OrganisationVM(
new OrganisationDC
{
VarFields = r2
}, r1))));
}, r1,r3)))));
}
//public static void CreatePersonOrganisationRelationVMAsync(CompactOrganisationDC pOrganisation, Action<PersonOrganisationRelationVM> pCallBack)

60
Data/Entities/ChatMessage.cs
View File

@@ -21,19 +21,15 @@ namespace BeWo.Data.Entities
public static string PropertyName_MessageId = "MessageId";
public static string PropertyName_SoundDatei = "SoundDatei";
public static string PropertyName_MediaDatei = "MediaDatei";
public static string PropertyName_DokuDatei = "DokuDatei";
public static string PropertyName_BildDatei = "BildDatei";
public static string PropertyName_MediaTyp = "MediaTyp";
private byte[] _ChatText;
private byte[] _SoundDatei;
private byte[] _MediaDatei;
private byte[] _DokuDatei;
private byte[] _BildDatei;
private int _MediaTyp;
private long? _EmpfaengerPersonOid;
@@ -79,44 +75,18 @@ namespace BeWo.Data.Entities
}
}
public virtual byte[] SoundDatei
public virtual byte[] MediaDatei
{
get { return _SoundDatei; }
get { return _MediaDatei; }
set
{
if (AreDifferent(_SoundDatei, value))
if (AreDifferent(_MediaDatei, value))
{
_SoundDatei = value;
_MediaDatei = value;
}
}
}
public virtual byte[] DokuDatei
{
get { return _DokuDatei; }
set
{
if (AreDifferent(_DokuDatei, value))
{
_DokuDatei = value;
}
}
}
public virtual byte[] BildDatei
{
get { return _BildDatei; }
set
{
if (AreDifferent(_BildDatei, value))
{
_BildDatei = value;
}
}
}
}
public virtual DateTime Uhrzeit
{
@@ -196,5 +166,17 @@ namespace BeWo.Data.Entities
}
}
}
public virtual int MediaTyp
{
get { return _MediaTyp; }
set
{
if (AreDifferent(_MediaTyp, value))
{
_MediaTyp = value;
}
}
}
}
}

20
Data/Entities/Organisation.cs
View File

@@ -22,6 +22,8 @@ namespace BeWo.Data.Entities
public static string PropertyName_Organisation2PersonList = "Organisation2PersonList";
public static string PropertyName_Function = "OrganisationsFunction";
private Address _Address;
private BankAccount _BankAccount;
@@ -32,6 +34,8 @@ namespace BeWo.Data.Entities
private Address _InvoiceAddress;
private ValueListEntry _Function;
private string _Name;
private string _DebitorNumber;
@@ -184,5 +188,21 @@ namespace BeWo.Data.Entities
}
}
}
public virtual ValueListEntry Function
{
get
{
return this._Function;
}
set
{
if (this.AreDifferent(this._Function, value))
{
this._Function = value;
}
}
}
}
}

15
Data/Entities/SupportConceptApprovalPeriod2Employee.cs
View File

@@ -6,11 +6,13 @@ namespace BeWo.Data.Entities
{
public static string PropertyName_Employee = "Employee";
public static string PropertyName_SupportConceptApprovalPeriod = "SupportConceptApprovalPeriod";
public static string PropertyName_IsAbsolut = "IsAbsolut";
public static string PropertyName_Betreuungsschluessel = "Betreuungsschluessel";
private Employee _Employee;
private SupportConceptApprovalPeriod _SupportConceptApprovalPeriod;
private decimal _Betreuungsschluessel;
private bool _IsAbsolut;
public SupportConceptApprovalPeriod2Employee()
@@ -57,5 +59,18 @@ namespace BeWo.Data.Entities
}
}
}
public virtual bool IsAbsolut
{
get { return _IsAbsolut; }
set
{
if (AreDifferent(_IsAbsolut, value))
{
_IsAbsolut = value;
}
}
}
}
}

7
Data/Mappings/ChatMessage.hbm.xml
View File

@@ -21,9 +21,8 @@
<property name="IstGelesen" column="IstGelesen" />
<property name="TeamOid" column="TeamOid" />
<property name="MessageId" column="MessageId" />
<property name="SoundDatei" column="SoundDatei" />
<property name="DokuDatei" column="DokuDatei" />
<property name="BildDatei" column="BildDatei" />
<property name="MediaDatei" column="MediaDatei" />
<property name="MediaTyp" column="MediaTyp" />
</class>
</hibernate-mapping>

1
Data/Mappings/Organisation.hbm.xml
View File

@@ -20,6 +20,7 @@
<many-to-one name="InvoiceAddress" column="InvoiceAddressOid" class="BeWo.Data.Entities.Address, BeWo.Data" cascade="all" fetch="join"/>
<many-to-one name="BankAccount" column="BankAccountOid" class="BeWo.Data.Entities.BankAccount, BeWo.Data" cascade="all" />
<many-to-one name="CostBearer" column="CostBearerOid" cascade="all-delete-orphan" class="BeWo.Data.Entities.CostBearer, BeWo.Data" fetch="join"/>
<many-to-one name="Function" column="FunctionValueListEntryOid" class="BeWo.Data.Entities.ValueListEntry,BeWo.Data" cascade="none" fetch="join"/>
<bag name="Contacts" table="Contact" generic="true" cascade="all-delete-orphan" batch-size="250">
<key column="OrganisationOid" />

1
Data/Mappings/SupportConceptApprovalPeriod2Employee.hbm.xml
View File

@@ -14,6 +14,7 @@
<property column="IsActive" type="BS.Shared.ActivationTypeId, BS.Shared" name="IsActive" />
<property column="SystemEntryID" type="BS.Shared.SystemEntryID, BS.Shared" name="SystemEntryID" />
<property column="Betreuungsschluessel" type="System.Decimal" name="Betreuungsschluessel" />
<property column="IsAbsolut" name="IsAbsolut" />
<many-to-one name="Employee" column="EmployeeOid" class="BeWo.Data.Entities.Employee, BeWo.Data" cascade="none" />
<many-to-one name="SupportConceptApprovalPeriod" column="SupportConceptApprovalPeriodOid" class="BeWo.Data.Entities.SupportConceptApprovalPeriod, BeWo.Data" cascade="none" />

12
Model/Changes_03_11_2016.txt Normal file
View File

@@ -0,0 +1,12 @@
ALTER TABLE `1234567890`.`chatmessages`
DROP COLUMN `BildDatei`,
DROP COLUMN `DokuDatei`,
CHANGE COLUMN `SoundDatei` `MediaDatei` LONGBLOB NULL DEFAULT NULL COMMENT '' ;
ALTER TABLE `1234567890`.`chatmessages`
ADD COLUMN `MediaTyp` INT(10) NULL DEFAULT NULL COMMENT '' AFTER `MessageId`;

3
Model/Changes_04_11_2016.txt Normal file
View File

@@ -0,0 +1,3 @@
ALTER TABLE `1234567890`.`supportconceptapprovalperiod2employee`
ADD COLUMN `IsAbsolut` INT(10) NULL DEFAULT 0 COMMENT '' AFTER `Betreuungsschluessel`;

3
Model/Changes_07_11_2016.txt Normal file
View File

@@ -0,0 +1,3 @@
ALTER TABLE `1234567890`.`organisation`
ADD COLUMN `FunctionValueListEntryOid` BIGINT(19) NULL DEFAULT NULL COMMENT '' AFTER `AccountNumber`;

11
Service/DCEntityMapper/ChatMessageDC_ChatMessage.cs
View File

@@ -16,9 +16,9 @@ namespace BeWo.Service.DCEntityMapper
pDataContract.IstGelesen = pEntity.IstGelesen;
pDataContract.TeamOid = pEntity.TeamOid;
pDataContract.MessageId = pEntity.MessageId;
pDataContract.SoundDatei = pEntity.SoundDatei;
pDataContract.DokuDatei = pEntity.DokuDatei;
pDataContract.BildDatei = pEntity.BildDatei;
pDataContract.MediaDatei = pEntity.MediaDatei;
pDataContract.MediaTyp = pEntity.MediaTyp;
return pDataContract;
}
@@ -33,9 +33,8 @@ namespace BeWo.Service.DCEntityMapper
pEntity.IstGelesen = pDataContract.IstGelesen;
pEntity.TeamOid = pDataContract.TeamOid;
pEntity.MessageId = pDataContract.MessageId;
pEntity.SoundDatei = pDataContract.SoundDatei;
pEntity.DokuDatei = pDataContract.DokuDatei;
pEntity.BildDatei = pDataContract.BildDatei;
pEntity.MediaDatei = pDataContract.MediaDatei;
pEntity.MediaTyp = pDataContract.MediaTyp;
return pEntity;
}

2
Service/DCEntityMapper/CustomerDC_Customer.cs
View File

@@ -69,7 +69,7 @@ namespace BeWo.Service.DCEntityMapper
pDataContract.GradDerBehinderung = pEntity.GradDerBehinderung;
pDataContract.Pflegegrad = pEntity.Pflegegrad;
pDataContract.CustomerImage = pEntity.CustomerImage;
if (pEntity.BehinderungsartenListe != null)
{

14
Service/DCEntityMapper/OrganisationDC_Organisation.cs
View File

@@ -25,6 +25,11 @@ namespace BeWo.Service.DCEntityMapper
pDataContract.RelatedPersons = MapperFactory.OrganisationPersonRelDC_Organisation2PersonMapper.MapToNewDCs(pEntity.Organisation2PersonList.Where(o2P => o2P.Person.IsActive != ActivationTypeId.Deleted));
if (pEntity.Function != null)
{
pDataContract.Function = MapperFactory.ValueListEntryDC_ValueListEntry.MapToNewDC(pEntity.Function);
}
if (pEntity.Address != null)
{
pDataContract.AddressOid = pEntity.Address.Oid;
@@ -87,6 +92,15 @@ namespace BeWo.Service.DCEntityMapper
pEntity.IsActive = pDataContract.ActivationType;
//MapperFactory.OrganisationPersonRelDC_Organisation2PersonMapper.MergeWithEntitys(pDataContract.RelatedPersons, pEntity.Organisation2PersonList);
if (pDataContract.Function == null)
{
pEntity.Function = null;
}
else if (pEntity.Function == null || pEntity.Function.Oid != pDataContract.Function.ValueListEntryOid)
{
pEntity.Function = DAOFactory.GenericDAO.LoadByID<ValueListEntry>(pDataContract.Function.ValueListEntryOid.Value);
}
if (pDataContract.ContainsAddressData())
{
if (pEntity.Address == null)

2
Service/DCEntityMapper/SupportConceptApprovalPeriodEmployeeRelDC_SupportConceptApprovalPeriod2Employee.cs
View File

@@ -13,6 +13,7 @@ namespace BeWo.Service.DCEntityMapper
pDataContract.SupportConceptApprovalPeriod2EmployeeVersion = pEntity.Version;
pDataContract.Betreuungsschluessel = pEntity.Betreuungsschluessel;
pDataContract.Employee = MapperFactory.CompactEmployeeDC_Employee.MapToNewDC(pEntity.Employee);
pDataContract.IsAbsolut = pEntity.IsAbsolut;
return pDataContract;
}
@@ -23,6 +24,7 @@ namespace BeWo.Service.DCEntityMapper
pEntity.Employee = DAOFactory.GenericDAO.LoadByID<Employee>(pDataContract.Employee.EmployeeOid);
pEntity.Betreuungsschluessel = pDataContract.Betreuungsschluessel;
pEntity.IsAbsolut = pDataContract.IsAbsolut;
return pEntity;
}

2
Service/Service.csproj
View File

@@ -280,6 +280,8 @@
<Compile Include="Invoicing\LWLInvoiceCreation.cs" />
<Compile Include="Invoicing\LWLSettlementInvoiceCreation.cs" />
<Compile Include="Invoicing\SettlementInvoiceCreation.cs" />
<Compile Include="MessageContracts\UploadChatPackage.cs" />
<Compile Include="MessageContracts\UploadChatResult.cs" />
<Compile Include="MessageContracts\UpdatePackage.cs" />
<Compile Include="MessageContracts\UploadPackage.cs" />
<Compile Include="MessageContracts\UploadResult.cs" />

4
Service/ServiceContracts/IEmployeeService.cs
View File

@@ -322,5 +322,9 @@ namespace BeWo.Service.ServiceContracts
[FaultContract(typeof(BeWoFault))]
[OperationContract]
Byte[] GetEmployeeThumbnail(long employeeOid);
[FaultContract(typeof(BeWoFault))]
[OperationContract]
void DeleteEmployeeCustomerRelationForEmployee(long employeeOid);
}
}

8
Service/ServiceContracts/IOperationsService.cs
View File

@@ -515,18 +515,12 @@ namespace BeWo.Service.ServiceContracts
[FaultContract(typeof (BeWoFault))]
[OperationContract]
ChatMessageDC CreateNewChatMessagesDC(long senderOid, long empfängerOid, string message, bool isDeliverd, long teamid);
[FaultContract(typeof (BeWoFault))]
[OperationContract]
ChatMessageDC CreateNewSpeziallChatMessagesDC(long senderOid, long empfängerOid, string message, bool isDeliverd,long teamid,byte[] sound,byte[] doku,byte[] bild);
ChatMessageDC CreateNewChatMessagesDC(long senderOid, long empfängerOid, string message, bool isDeliverd, long teamid, string messageid);
[FaultContract(typeof(BeWoFault))]
[OperationContract]
void UpdateIsChatActiveCustomerAPPCodeDC(long customerOid, int activeType);
[FaultContract(typeof (BeWoFault))]
[OperationContract]
IList<CustomerAPPCodeDC> GetIsChatActiveCustomerAPPCodeDC(long customerOid, int activeType);

6
Service/ServiceContracts/IStreamingService.cs
View File

@@ -1,4 +1,5 @@
using System.Collections.Generic;
using System.IO;
using System.ServiceModel;
using BeWo.Service.MessageContracts;
@@ -33,5 +34,10 @@ namespace BeWo.Service.ServiceContracts
[FaultContract(typeof (BeWoFault))]
[OperationContract]
UploadResult UpdateDocument(UpdatePackage pUpload);
[FaultContract(typeof(BeWoFault))]
[OperationContract]
UploadChatResult CreateNewSpeziallStreamChatMessagesDC(UploadChatPackage istream);
}
}

3
Service/ServiceImplementations/CustomerServiceImp.cs
View File

@@ -348,7 +348,7 @@ namespace BeWo.Service.ServiceImplementations
{
var s = PluginLoader.FindClass<CustomerService>();
return s.GetAllCustomersCompact(false, currentEmployeeOid);
return s.GetAllCustomersCompact(true, currentEmployeeOid);
}
catch (Exception e)
@@ -1969,6 +1969,7 @@ namespace BeWo.Service.ServiceImplementations
customerDC.CustomerVersion = cust.Version.Value;
customerDC.FirstName = cust.Person.FirstName;
customerDC.LastName = cust.Person.LastName;
customerDC.CustomerAlias = cust.CustomerAlias;
customerDC.DateOfBirth = cust.Person.DateOfBirth;
customerDC.Sex = cust.Person.Sex;
customerDC.ActivationType = cust.IsActive;

17
Service/ServiceImplementations/EmployeeServiceImp.cs
View File

@@ -85,6 +85,9 @@ namespace BeWo.Service.ServiceImplementations
var e = DAOFactory.GenericDAO.LoadByID<Employee>(pOid);
e.Person.IsActive = ActivationTypeId.Deleted;
ServiceLogic.SetActivationType<Employee>(pOid, pVersion, ActivationTypeId.Deleted);
DeleteEmployeeCustomerRelationForEmployee(pOid);
}
catch (Exception e)
{
@@ -92,11 +95,25 @@ namespace BeWo.Service.ServiceImplementations
}
}
public void DeleteEmployeeCustomerRelationForEmployee(long employeeOid)
{
var emp = DAOFactory.GenericDAO.LoadByID<Employee>(employeeOid);
foreach (var e2c in emp.Employee2CustomerList)
{
DAOFactory.GenericDAO.Delete(e2c);
}
}
public void DeactivateEmployees(Dictionary<long, long> pOid2Version)
{
try
{
ServiceLogic.SetActivationType<Employee>(pOid2Version, ActivationTypeId.Deleted);
foreach (var key in pOid2Version.Keys)
{
DeleteEmployeeCustomerRelationForEmployee(key);
}
}
catch (Exception e)
{

44
Service/ServiceImplementations/OperationsServiceImp.cs
View File

@@ -3128,7 +3128,7 @@ namespace BeWo.Service.ServiceImplementations
}
}
public ChatMessageDC CreateNewChatMessagesDC(long senderOid, long empfängerOid, string message, bool isDeliverd, long teamid)
public ChatMessageDC CreateNewChatMessagesDC(long senderOid, long empfängerOid, string message, bool isDeliverd, long teamid,string messageid)
{
try
{
@@ -3139,45 +3139,9 @@ namespace BeWo.Service.ServiceImplementations
Uhrzeit = DateTime.Now,
IsDelivered = isDeliverd,
ChatText = Encoding.UTF8.GetBytes(message),
IstGelesen = 0
};
if (teamid != 0)
{
chatMessage.TeamOid = teamid;
}
else
{
chatMessage.TeamOid = null;
}
DAOFactory.GenericDAO.Insert(chatMessage);
var ChatMessagesDC = MapperFactory.ChatMessagesDC_ChatMessages.MapToNewDC(chatMessage);
return ChatMessagesDC;
}
catch (Exception e)
{
throw Utils.CreateBeWoFaultException(e);
}
}
public ChatMessageDC CreateNewSpeziallChatMessagesDC(long senderOid, long empfängerOid, string message, bool isDeliverd, long teamid, byte[] sound, byte[] doku,byte[] bild)
{
try
{
var chatMessage = new ChatMessage
{
EmpfaengerPersonOid = empfängerOid,
SenderPersonOid = senderOid,
Uhrzeit = DateTime.Now,
IsDelivered = isDeliverd,
ChatText = Encoding.UTF8.GetBytes(message),
SoundDatei = sound,
DokuDatei = doku,
BildDatei = bild,
IstGelesen = 0
IstGelesen = 0,
MessageId = messageid
};
if (teamid != 0)

50
Service/ServiceImplementations/StreamingServiceImp.cs
View File

@@ -1,9 +1,10 @@
using System;
using System.Collections.Generic;
using System.Configuration;
using System.IO;
using System.Linq;
using System.ServiceModel;
using System.Text;
using BeWo.Data.Access;
using BeWo.Data.Entities;
using BeWo.Service.Core;
@@ -12,7 +13,9 @@ using BeWo.Service.MessageContracts;
using BeWo.Service.ServiceContracts;
using BS.Shared;
using BS.Shared.Core;
using BS.Shared.DataContracts;
using Utils = BeWo.Service.Core.Utils;
namespace BeWo.Service.ServiceImplementations
{
@@ -167,5 +170,50 @@ namespace BeWo.Service.ServiceImplementations
throw Utils.CreateBeWoFaultException(e);
}
}
public UploadChatResult CreateNewSpeziallStreamChatMessagesDC(UploadChatPackage istream)
{
try
{
var chatMessage = new ChatMessage
{
EmpfaengerPersonOid = istream.empfängerOid,
SenderPersonOid = istream.senderOid,
Uhrzeit = DateTime.Now,
IsDelivered = istream.isDeliverd,
ChatText = Encoding.UTF8.GetBytes(istream.message),
MediaDatei = BS.Shared.Core.Utils.ReadFully(istream.Stream),
MediaTyp = istream.mediatype,
IstGelesen = 0,
MessageId = istream.messageid
};
istream.Stream.Close();
istream.Stream.Dispose();
if (istream.teamid != 0)
{
chatMessage.TeamOid = istream.teamid;
}
else
{
chatMessage.TeamOid = null;
}
DAOFactory.GenericDAO.Insert(chatMessage);
var result = MapperFactory.ChatMessagesDC_ChatMessages.MapToNewDC(chatMessage);
result.MediaDatei = null;
//return new UploadChatResult { ChatMessage = MapperFactory.ChatMessagesDC_ChatMessages.MapToNewDC(chatMessage)};
return new UploadChatResult {ChatMessage = result};
}
catch (Exception e)
{
throw Utils.CreateBeWoFaultException(e);
}
}
}
}

4
Shared/BeWoEntityEnums.cs
View File

@@ -518,8 +518,8 @@ namespace BS.Shared
SupportConceptIndividualGoalType,
Auszahlungsart,
SupportConceptIndividualGoalCategoryType, // 20
DocumentType
DocumentType,
OrganisationFunctionType
}
public enum ContactType

10
Shared/Core/EnumTranslations.cs
View File

@@ -716,7 +716,10 @@ namespace BS.Shared.Core
},
{
ValueListEntryType.DocumentType, "Dokumentationstypen"
}
},
{
ValueListEntryType.OrganisationFunctionType,"Funktionen Organisation"
}
};
#endregion
@@ -776,7 +779,10 @@ namespace BS.Shared.Core
},
{
ValueListEntryType.DocumentType, "Dokumentationstypen"
}
},
{
ValueListEntryType.OrganisationFunctionType,"Funktionen Organisation"
}
};
#endregion

8
Shared/DataContracts/ChatMessageDC.cs
View File

@@ -34,12 +34,10 @@ namespace BS.Shared.DataContracts
public string MessageId { get; set; }
[DataMember]
public byte[] SoundDatei { get; set; }
public byte[] MediaDatei { get; set; }
[DataMember]
public byte[] DokuDatei { get; set; }
[DataMember]
public byte[] BildDatei { get; set; }
public int MediaTyp { get; set; }
}
}

2
Shared/DataContracts/Compact/ClientPartials/CompactCustomerDC.cs
View File

@@ -53,7 +53,7 @@ namespace BS.Shared.DataContracts.Compact
{
get
{
string lResult = this.FirstName + " " + this.LastName + " ";
string lResult = this.FirstName + " " + this.LastName + " " + CustomerAlias + " ";
if (this.CostBearerReferenceNumbers != null)
{
lResult += string.Join(" ", this.CostBearerReferenceNumbers.Values.ToArray());

2
Shared/DataContracts/Compact/ClientPartials/CompactSupportConceptDC.cs
View File

@@ -136,7 +136,7 @@ namespace BS.Shared.DataContracts.Compact
// return string.Join(" ", CostBearerDetailStrings.ToArray())
// + " " + string.Join(" ", CustomerReferenceNumbers.ToArray())
// + " " + Customer.ToString();
string fr = string.Join(" ", this.CustomerReferenceNumbers.ToArray()) + " " + this.Customer;
string fr = string.Join(" ", this.CustomerReferenceNumbers.ToArray()) + " " + this.Customer + " " + Customer.CustomerAlias;
fr += " " + string.Join(" ", this.CostBearerDetailStrings.ToArray());
return fr;

3
Shared/DataContracts/OrganisationDC.cs
View File

@@ -150,5 +150,8 @@ namespace BS.Shared.DataContracts
[DataMember]
public List<VarFieldDC> VarFields { get; set; }
[DataMember]
public ValueListEntryDC Function { get; set; }
}
}

3
Shared/DataContracts/SupportConceptApprovalPeriodEmployeeRelDC.cs
View File

@@ -13,6 +13,9 @@ namespace BS.Shared.DataContracts
[DataMember]
public decimal Betreuungsschluessel { get; set; }
[DataMember]
public bool IsAbsolut { get; set; }
[DataMember]
public long? SupportConceptApprovalPeriod2EmployeeVersion { get; set; }