merge fix #2

Proftaak Remote Healthcare/FietsClientV2/TcpConnection.cs

@@ -229,14 +229,14 @@ namespace FietsClient
 
                                 int i = 1;
 
-                                foreach (dynamic ses in r.tests)
+                                foreach (dynamic ses in r.sessions)
                                 {
                                     Session tempSession = new Session(i);
                                     i++;
 
-                                    foreach (dynamic m in ses.session)
+                                    foreach (dynamic m in ses.measurements)
                                     {
-                                        Measurement measurement = new Measurement(Int32.Parse(m.pulse.ToString()), Int32.Parse(m.rpm.ToString()), Int32.Parse(m.speed.ToString()), Int32.Parse(m.wattage.ToString()), Int32.Parse(m.distance.ToString()), Int32.Parse(m.requestedPower.ToString()), Int32.Parse(m.energy.ToString()), Int32.Parse(m.actualPower.ToString()), Int32.Parse(m.time.ToString()), Int32.Parse(m.bpm.ToString()));
+                                        Measurement measurement = new Measurement((int)m.pulse, (int)m.rpm, (int)m.speed, (int)m.distance, (int)m.requestedPower, (int)m.energy, (int)m.actualPower, (int)m.time); ;
                                         tempSession.AddMeasurement(measurement);
                                     }
 

Proftaak Remote Healthcare/FietsLibrary/JSONObjecten/Measurement.cs

@@ -10,7 +10,7 @@ namespace FietsLibrary.JSONObjecten
     [Serializable]
     public class Measurement
     {
-        public int pulse { get; private set; }
+        public int pulse { get; set; }
         public int rpm { get; private set; }
         public int speed { get; private set; }
         public int distance { get; private set; }
@@ -24,7 +24,7 @@ namespace FietsLibrary.JSONObjecten
 
         }
 
-        public Measurement(int pulse, int rpm, int speed, int wattage, int distance, int requestedPower, int energy, int actualPower, int time, int bpm)
+        public Measurement(int pulse, int rpm, int speed, int distance, int requestedPower, int energy, int actualPower, int time)
         {
             this.pulse = pulse;
             this.rpm = rpm;
@@ -46,7 +46,7 @@ namespace FietsLibrary.JSONObjecten
             energy = int.Parse(data[5]);
             int time = 0;
             string[] timeArray = data[6].Split(':');
-            time += (int.Parse(timeArray[0]) * 100);
+            time += (int.Parse(timeArray[0]) * 60);
             time += int.Parse(timeArray[1]);
             actualPower = int.Parse(data[7]);
         }

Proftaak Remote Healthcare/ServerV2/AppGlobal.cs

@@ -26,6 +26,7 @@ namespace ServerV2
             listener = new TcpListener(IPAddress.Any, 1288);
             listener.Start();
 
+            /*
             //Read UserDate file
             string s = File.ReadAllText(@"JSON Files\UserData.Json");
             dynamic results = JsonConvert.DeserializeObject<dynamic>(s);
@@ -53,7 +54,8 @@ namespace ServerV2
                 }
 
             }
-            //TestMethode();
+            */
+            TestMethode();
             while (true)
             {
                 
@@ -75,12 +77,12 @@ namespace ServerV2
             Random r = new Random();
             Session session = new Session(1);
             for (int i = 0; i < 20; i++)
-                session.AddMeasurement(new Measurement(r.Next(100, 200), r.Next(60, 100), r.Next(100, 150), r.Next(0, 100), i, r.Next(100), r.Next(100), r.Next(100), i, r.Next(100)));
+                session.AddMeasurement(new Measurement(r.Next(100, 200), r.Next(60, 100), r.Next(100, 150), i, r.Next(100), r.Next(100), r.Next(100), i));
             users.ElementAt(1).sessions.Add(session);
 
             Session session2 = new Session(2);
             for (int i = 0; i < 50; i++)
-                session2.AddMeasurement(new Measurement(r.Next(100, 200), r.Next(60, 100), r.Next(100, 150), r.Next(0, 100), i, r.Next(100), r.Next(100), r.Next(100), i, r.Next(100)));
+                session2.AddMeasurement(new Measurement(r.Next(100, 200), r.Next(60, 100), r.Next(100, 150), i, r.Next(100), r.Next(100), r.Next(100), i));
             users.ElementAt(1).sessions.Add(session2);
         }
 
@@ -190,7 +192,20 @@ namespace ServerV2
                             foreach (User u in users)
                             {
                                 if (u.id == response[1])
-                                    u.AddSession(new Session(u.GetSessions().Last().id));
+                                {
+                                    
+                                    if (u.GetSessions().Count != 0)
+                                    {
+                                        int sessionID = u.GetSessions().LastOrDefault().id;
+                                        u.AddSession(new Session(sessionID));
+                                    }
+                                    else
+                                    {
+                                        u.AddSession(new Session(1));
+                                    }
+                                        
+                                }
+                                    
                             }
                         }
                         break;