Mauro heeft ez fix op laptop daniel

Proftaak Remote Healthcare/FietsClientV2/DoctorModel.cs

@@ -46,7 +46,6 @@ namespace FietsClient
         internal List<User> requestUsers()
         {
             tcpConnection.requestUsers();
-            Thread.Sleep(1000);
             return tcpConnection.users;
         }
 

Proftaak Remote Healthcare/FietsClientV2/Forms/DoctorForm.Designer.cs

@@ -41,6 +41,7 @@
             this.doctorTabControl = new System.Windows.Forms.TabControl();
             this.tabPageSummary = new System.Windows.Forms.TabPage();
             this.doctorSummaryUC1 = new FietsClient.Forms.DoctorSummaryUC();
+            this.loadUsersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.menuStrip1.SuspendLayout();
             this.chatArea.SuspendLayout();
             this.doctorTabControl.SuspendLayout();
@@ -62,6 +63,7 @@
             // archiefToolStripMenuItem
             // 
             this.archiefToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.loadUsersToolStripMenuItem,
             this.PatientBox,
             this.sessionsBox,
             this.selectSessionToolStripMenuItem});
@@ -161,6 +163,13 @@
             this.doctorSummaryUC1.Size = new System.Drawing.Size(1096, 788);
             this.doctorSummaryUC1.TabIndex = 0;
             // 
+            // loadUsersToolStripMenuItem
+            // 
+            this.loadUsersToolStripMenuItem.Name = "loadUsersToolStripMenuItem";
+            this.loadUsersToolStripMenuItem.Size = new System.Drawing.Size(187, 26);
+            this.loadUsersToolStripMenuItem.Text = "Load users";
+            this.loadUsersToolStripMenuItem.Click += new System.EventHandler(this.loadUsersToolStripMenuItem_Click);
+            // 
             // DoctorForm
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
@@ -204,6 +213,7 @@
         public System.Windows.Forms.TabPage tabPageSummary;
         public System.Windows.Forms.ToolStripComboBox sessionsBox;
         private System.Windows.Forms.ToolStripMenuItem selectSessionToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem loadUsersToolStripMenuItem;
     }
 }
 

Proftaak Remote Healthcare/FietsClientV2/Forms/DoctorForm.cs

@@ -10,6 +10,7 @@ using System.Windows.Forms;
 using FietsClient.Forms;
 using FietsLibrary.JSONObjecten;
 using System.Windows.Forms.DataVisualization.Charting;
+using System.Threading;
 
 namespace FietsClient
 {
@@ -39,15 +40,10 @@ namespace FietsClient
             }
         }
 
-        private List<User> users;
+        private List<User> users = new List<User>();
         private void Form1_Load(object sender, EventArgs e)
         {
             users = doctorModel.requestUsers();
-            foreach (User user in users)
-            {
-                PatientBox.Items.Add(user.id);
-            }
-
         }
 
         private void messageBox_KeyPress(object sender, KeyPressEventArgs e)
@@ -137,9 +133,9 @@ namespace FietsClient
             User user = null;
             foreach (User userx in users)
             {
+                user = userx;
                 if (PatientBox.Text == user.id)
                 {
-                    user = userx;
                     List<Session> sessions = user.GetSessions();
                     foreach (Session session in sessions)
                     {
@@ -208,5 +204,14 @@ namespace FietsClient
                     }
             }
         }
+
+        private void loadUsersToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            users = doctorModel.tcpConnection.users;
+            foreach (User user in users)
+            {
+                PatientBox.Items.Add(user.id);
+            }
+        }
     }
 }

Proftaak Remote Healthcare/FietsClientV2/TCPConnection.cs

@@ -27,7 +27,7 @@ namespace FietsClient
 
         public delegate void ChatmassegeDelegate(string[] data);
         public event ChatmassegeDelegate IncomingChatmessageEvent;
-        public List<User> users;
+        public List<User> users = new List<User>();
 
         public TcpConnection()
         {
@@ -218,7 +218,32 @@ namespace FietsClient
                             }
                             break;
                         case "9":
-                            users = JsonConvert.DeserializeObject<List<User>>(response_parts[1]);
+                            dynamic results = JsonConvert.DeserializeObject<dynamic>(response_parts[1]);
+
+                            foreach (dynamic r in results)
+                            {
+                                User user = r as User;
+                                users.Add(new User(r.id.ToString(), r.password.ToString(), Int32.Parse(r.age.ToString()),
+                                    Boolean.Parse(r.gender.ToString()), Int32.Parse(r.weight.ToString()),
+                                    Boolean.Parse(r.isDoctor.ToString())));
+
+                                int i = 1;
+
+                                foreach (dynamic ses in r.tests)
+                                {
+                                    Session tempSession = new Session(i, Int32.Parse(ses.bikeMode.ToString()), ses.modevalue.ToString());
+                                    i++;
+
+                                    foreach (dynamic m in ses.session)
+                                    {
+                                        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()));
+                                        tempSession.AddMeasurement(measurement);
+                                    }
+
+                                    users.Last().AddSession(tempSession);
+                                }
+                                Console.WriteLine(users);
+                            }
                             break;
                     }
                 }

Proftaak Remote Healthcare/FietsLibrary/JSONObjecten/Session.cs

@@ -21,7 +21,7 @@ namespace FietsLibrary.JSONObjecten
         public string note { get; private set; }
         public string modevalue { get; private set; }
 
-        public Session(int bikeMode, string modevalue)
+        public Session(int id ,int bikeMode, string modevalue)
         {
             if (!(Directory.Exists(@"JSON Files"))) 
             {

Proftaak Remote Healthcare/ServerV2/AppGlobal.cs

@@ -45,12 +45,12 @@ namespace ServerV2
             users.Add(new User("admin", "admin", 80, false, 77, true));
 
             Random r = new Random();
-            Session session = new Session(1, "100");
+            Session session = new Session(1,1, "100");
             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)));
             users.ElementAt(1).tests.Add(session);
 
-            Session session2 = new Session(2, "100");
+            Session session2 = new Session(2,2, "100");
             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)));
             users.ElementAt(1).tests.Add(session2);
@@ -156,7 +156,7 @@ namespace ServerV2
                             foreach (User u in users)
                             {
                                 if (u.id == response[1])
-                                    u.AddSession(new Session(int.Parse(response[2]), response[3]));
+                                    u.AddSession(new Session(u.GetSessions().Last().id+1, int.Parse(response[2]), response[3]));
                             }
                         }
                         break;
@@ -212,7 +212,9 @@ namespace ServerV2
                         }
                         break;
                     case "9": //alles doorsturen voor de dokter
-                        Communication.Send(FietsLibrary.JsonConverter.GetUsers(users), sslStream);
+                        Console.WriteLine("send users");
+                        string file = "9|" + FietsLibrary.JsonConverter.GetUsers(users);
+                        Communication.Send(file, sslStream);
                         break;
                     default:
                         break;