Avans/ErgometerLibrary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
Aareschluchtje
2015-10-20 13:46:10 +02:00
parent 6a1e058639 59aac89454
commit 0e77de2318
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ErgometerLibrary/NetCommand.cs
+8 -4
View File
@@ -10,7 +10,7 @@ namespace ErgometerLibrary
public class NetCommand public class NetCommand
{ {
public enum CommandType { LOGIN, DATA, CHAT, LOGOUT, SESSION, VALUESET, USER, RESPONSE, REQUEST, LENGTH, SESSIONDATA, ERROR } public enum CommandType { LOGIN, DATA, CHAT, LOGOUT, SESSION, VALUESET, USER, RESPONSE, REQUEST, LENGTH, SESSIONDATA, ERROR }
public enum RequestType { USERS, ALLSESSIONS, OLDDATA, SESSIONDATA } public enum RequestType { USERS, ALLSESSIONS, OLDDATA, SESSIONDATA, CHAT }
public enum ResponseType { LOGINOK, LOGINWRONG, ERROR, NOTLOGGEDIN } public enum ResponseType { LOGINOK, LOGINWRONG, ERROR, NOTLOGGEDIN }
public enum ValueType { TIME, POWER, ENERGY, DISTANCE } public enum ValueType { TIME, POWER, ENERGY, DISTANCE }
public enum LengthType { USERS, SESSIONS, SESSIONDATA, DATA } public enum LengthType { USERS, SESSIONS, SESSIONDATA, DATA }
@@ -94,10 +94,11 @@ namespace ErgometerLibrary
} }
//CHAT //CHAT
public NetCommand(string chat, int session) public NetCommand(string chat, bool isDoctor, int session)
{ {
Type = CommandType.CHAT; Type = CommandType.CHAT;
Session = session; Session = session;
IsDoctor = isDoctor;
Timestamp = Helper.Now; Timestamp = Helper.Now;
ChatMessage = chat.Replace("\n", ""); ChatMessage = chat.Replace("\n", "");
@@ -233,6 +234,8 @@ namespace ErgometerLibrary
return new NetCommand(RequestType.OLDDATA, session); return new NetCommand(RequestType.OLDDATA, session);
case "sessiondata": case "sessiondata":
return new NetCommand(RequestType.SESSIONDATA, session); return new NetCommand(RequestType.SESSIONDATA, session);
case "chat":
return new NetCommand(RequestType.CHAT, session);
default: default:
throw new FormatException("Error in NetCommand: Request type not recognised"); throw new FormatException("Error in NetCommand: Request type not recognised");
} }
@@ -308,11 +311,12 @@ namespace ErgometerLibrary
private static NetCommand ParseChatMessage(int session, string[] args) private static NetCommand ParseChatMessage(int session, string[] args)
{ {
if (args.Length != 1) if (args.Length != 2)
throw new MissingFieldException("Error in NetCommand: Chat Message is missing arguments"); throw new MissingFieldException("Error in NetCommand: Chat Message is missing arguments");
NetCommand temp = new NetCommand(CommandType.CHAT, session); NetCommand temp = new NetCommand(CommandType.CHAT, session);
temp.ChatMessage = args[0]; temp.ChatMessage = args[0];
temp.IsDoctor = bool.Parse(args[1]);
return temp; return temp;
} }
@@ -355,7 +359,7 @@ namespace ErgometerLibrary
command += "2»ses" + Session + "»" + Meting.ToCommand(); command += "2»ses" + Session + "»" + Meting.ToCommand();
break; break;
case CommandType.CHAT: case CommandType.CHAT:
command += "3»ses" + Session + "»" + ChatMessage; command += "3»ses" + Session + "»" + ChatMessage + "»" + IsDoctor;
break; break;
case CommandType.LOGOUT: case CommandType.LOGOUT:
command += "4»ses" + Session + "»logout"; command += "4»ses" + Session + "»logout";