diff --git a/ErgometerServer/DoctorThread.cs b/ErgometerServer/DoctorThread.cs index 2f9d1ac..c0c1918 100644 --- a/ErgometerServer/DoctorThread.cs +++ b/ErgometerServer/DoctorThread.cs @@ -74,11 +74,11 @@ namespace ErgometerServer } break; case NetCommand.RequestType.ALLSESSIONS: - int[] sessions = FileHandler.GetAllSessions(); - sendToDoctor(new NetCommand(NetCommand.LengthType.SESSIONS, sessions.Length, input.Session)); - for (int i = 0; i < sessions.Length; i++) + List> sessions = FileHandler.GetAllSessions(); + sendToDoctor(new NetCommand(NetCommand.LengthType.SESSIONS, sessions.Count, input.Session)); + foreach(Tuple session in sessions) { - sendToDoctor(new NetCommand(NetCommand.CommandType.SESSION, sessions[i])); + sendToDoctor(new NetCommand(session.Item2, session.Item3, session.Item1)); } break; case NetCommand.RequestType.SESSIONDATA: @@ -86,7 +86,7 @@ namespace ErgometerServer sendToDoctor(new NetCommand(NetCommand.LengthType.SESSIONDATA, currentsessionsdata.Count, input.Session)); foreach (Tuple ses in currentsessionsdata) { - sendToDoctor(new NetCommand(ses.Item2, false, ses.Item1)); + sendToDoctor(new NetCommand(ses.Item2, Helper.Now, ses.Item1)); } break; default: diff --git a/ErgometerServer/ErgometerServer.csproj b/ErgometerServer/ErgometerServer.csproj index 67b48bc..c27f517 100644 --- a/ErgometerServer/ErgometerServer.csproj +++ b/ErgometerServer/ErgometerServer.csproj @@ -33,9 +33,9 @@ 4 - + False - ..\..\..\ErgometerLibrary\ErgometerLibrary\ErgometerLibrary\bin\Debug\ErgometerLibrary.dll + ..\..\ErgometerLibrary\ErgometerLibrary\bin\Debug\ErgometerLibrary.dll ..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll diff --git a/ErgometerServer/FileHandler.cs b/ErgometerServer/FileHandler.cs index 5a2aa64..e2556f0 100644 --- a/ErgometerServer/FileHandler.cs +++ b/ErgometerServer/FileHandler.cs @@ -82,15 +82,19 @@ namespace ErgometerServer return metingen; } - public static int[] GetAllSessions() + public static List> GetAllSessions() { string[] directories = Directory.GetDirectories(DataFolder); - int[] sessions = new int[directories.Length]; + List> sessiondata = new List>(); for (int i = 0; i < directories.Length; i++) { - sessions[i] = int.Parse(directories[i]); + string props = File.ReadAllText(GetSessionFile(int.Parse(directories[i]))); + string[] properties = props.Split('\n'); + string name = properties[0]; + double date = double.Parse(properties[1]); + sessiondata.Add(new Tuple(int.Parse(directories[i]), name, date)); } - return sessions; + return sessiondata; } public static void WriteChat(int session, List chat)