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

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

Browse Source 
# Conflicts:
#	BeWo/View/ChatView.xaml.cs
#	BeWoChatServer/Server.cs
#	BeWoOhneReports.v12.suo
#	BeWoPlanerMobil/logs/Traces.svclog
#	Service/DCEntityMapper/ChatMessageDC_ChatMessage.cs
#	Service/ServiceImplementations/OperationsServiceImp.cs
This commit is contained in:
staccatomamba
2016-09-13 11:42:30 +02:00
parent 988ac1ff4c d2c294f0b1
commit d512a8f8e6
22 changed files with 1194 additions and 571 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
BeWoChatServer/Server.cs
View File

@@ -258,7 +258,7 @@ namespace BeWoChatServer
var chatMessage = new ChatMessage
{
SenderPersonOid = dataPacket.SenderPersonOid,
ChatText = dataPacket.ChatMessage,
ChatText = Encoding.Default.GetBytes(dataPacket.ChatMessage),
EmpfängerPersonOid = dataPacket.RecipientPersonOid,
Uhrzeit = DateTime.Now,
InsUser = dataPacket.ClientName,
@@ -338,7 +338,7 @@ namespace BeWoChatServer
var chatMessage = new ChatMessage
{
SenderPersonOid = dataPacket.SenderPersonOid,
ChatText = dataPacket.ChatMessage,
ChatText = System.Text.Encoding.Default.GetBytes(dataPacket.ChatMessage),
EmpfängerPersonOid = dataPacket.RecipientPersonOid,
Uhrzeit = dataPacket.MessageTimeStamp,
InsUser = dataPacket.ClientName,