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

Problem mit ChatMessage gehabt und behoben. Hab's einmal umbenannt und dann zurückbenannt in ChatMessage

Browse Source
This commit is contained in:
Lyndon
2017-12-14 18:31:48 -04:00
parent 1dfda0dd87
commit 62dc785023
2 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChatController/ChatKlassen/ChatMessage.cs
View File

@@ -1,10 +1,6 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Media;

14
ChatController/HauptKlassen/Chat.cs
View File

@@ -216,7 +216,7 @@ namespace ChatController.HauptKlassen
{
if (ChatMessage.UserId == ChatDaten.Userid.Value)
{
//var timeformated = DateTime.Parse(ChatMessage.Timestamp.Date);
//var timeformated = DateTime.Parse(ChatMessage2.Timestamp.Date);
var time = DateTime.Parse(ChatMessage.Timestamp.Date);
var clientZone = TimeZoneInfo.Local;
@@ -237,11 +237,11 @@ namespace ChatController.HauptKlassen
{
//string textn = "";
//if (ChatMessage.Text != null)
// textn = ChatMessage.Text;
//if (ChatMessage2.Text != null)
// textn = ChatMessage2.Text;
//if (textn.Equals(""))
// textn = ChatMessage.Original_Filename;
// textn = ChatMessage2.Original_Filename;
Messages.Add(new ChatMessage(ChatMessage.User_Name, textn,
timeformated, true, LadeBildNach(ChatMessage.Smaller_Image),
@@ -268,7 +268,7 @@ namespace ChatController.HauptKlassen
}
else
{
//var timeformated = DateTime.Parse(ChatMessage.Timestamp.Date);
//var timeformated = DateTime.Parse(ChatMessage2.Timestamp.Date);
var time = DateTime.Parse(ChatMessage.Timestamp.Date);
var clientZone = TimeZoneInfo.Local;
@@ -440,7 +440,7 @@ namespace ChatController.HauptKlassen
{
if (ChatMessage.UserId == ChatDaten.Userid.Value)
{
//var timeformated = DateTime.Parse(ChatMessage.Timestamp.Date);
//var timeformated = DateTime.Parse(ChatMessage2.Timestamp.Date);
var time = DateTime.Parse(ChatMessage.Timestamp.Date);
var clientZone = TimeZoneInfo.Local;
@@ -485,7 +485,7 @@ namespace ChatController.HauptKlassen
}
else
{
//var timeformated = DateTime.Parse(ChatMessage.Timestamp.Date);
//var timeformated = DateTime.Parse(ChatMessage2.Timestamp.Date);
var time = DateTime.Parse(ChatMessage.Timestamp.Date);
var clientZone = TimeZoneInfo.Local;