Эх сурвалжийг харах

Added the "not working" to big string over ssl back, its working for now.

jancoow 10 жил өмнө
parent
commit
1b71297f0d

+ 9 - 9
Proftaak Remote Healthcare/FietsClientV2/Forms/DoctorForm.Designer.cs

@@ -35,6 +35,7 @@
             this.PatientBox = new System.Windows.Forms.ToolStripComboBox();
             this.sessionsBox = new System.Windows.Forms.ToolStripComboBox();
             this.selectSessionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.logoutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.chatBox = new System.Windows.Forms.TextBox();
             this.messageBox = new System.Windows.Forms.TextBox();
             this.chatArea = new System.Windows.Forms.GroupBox();
@@ -42,7 +43,6 @@
             this.doctorTabControl = new System.Windows.Forms.TabControl();
             this.tabPageSummary = new System.Windows.Forms.TabPage();
             this.doctorSummaryUC1 = new FietsClient.Forms.DoctorSummaryUC();
-            this.logoutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.menuStrip1.SuspendLayout();
             this.chatArea.SuspendLayout();
             this.doctorTabControl.SuspendLayout();
@@ -97,6 +97,13 @@
             this.selectSessionToolStripMenuItem.Text = "Select session";
             this.selectSessionToolStripMenuItem.Click += new System.EventHandler(this.selectSessionToolStripMenuItem_Click);
             // 
+            // logoutToolStripMenuItem
+            // 
+            this.logoutToolStripMenuItem.Name = "logoutToolStripMenuItem";
+            this.logoutToolStripMenuItem.Size = new System.Drawing.Size(57, 20);
+            this.logoutToolStripMenuItem.Text = "Logout";
+            this.logoutToolStripMenuItem.Click += new System.EventHandler(this.logoutToolStripMenuItem_Click);
+            // 
             // chatBox
             // 
             this.chatBox.Location = new System.Drawing.Point(0, 13);
@@ -159,18 +166,11 @@
             // 
             this.doctorSummaryUC1.BackColor = System.Drawing.SystemColors.Control;
             this.doctorSummaryUC1.Location = new System.Drawing.Point(0, 0);
-            this.doctorSummaryUC1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.doctorSummaryUC1.Margin = new System.Windows.Forms.Padding(4);
             this.doctorSummaryUC1.Name = "doctorSummaryUC1";
             this.doctorSummaryUC1.Size = new System.Drawing.Size(822, 640);
             this.doctorSummaryUC1.TabIndex = 0;
             // 
-            // logoutToolStripMenuItem
-            // 
-            this.logoutToolStripMenuItem.Name = "logoutToolStripMenuItem";
-            this.logoutToolStripMenuItem.Size = new System.Drawing.Size(57, 20);
-            this.logoutToolStripMenuItem.Text = "Logout";
-            this.logoutToolStripMenuItem.Click += new System.EventHandler(this.logoutToolStripMenuItem_Click);
-            // 
             // DoctorForm
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);

+ 2 - 0
Proftaak Remote Healthcare/FietsClientV2/Forms/DoctorForm.cs

@@ -211,6 +211,8 @@ namespace FietsClient
         private void loadUsersToolStripMenuItem_Click(object sender, EventArgs e)
         {
             users = doctorModel.tcpConnection.users;
+            PatientBox.Items.Clear();
+            sessionsBox.Items.Clear();
             foreach (User user in users)
             {
                 PatientBox.Items.Add(user.id);

+ 2 - 2
Proftaak Remote Healthcare/ServerV2/AppGlobal.cs

@@ -282,8 +282,8 @@ namespace ServerV2
 
                         // BUG: er wordt teveel data verstuurd!!!!
                         //Console.WriteLine("send users");
-                        //string file = "9|" + FietsLibrary.JsonConverter.GetUsers(users);
-                        //Communication.Send(file, sslStream);
+                        string file = "9|" + FietsLibrary.JsonConverter.GetUsers(users);
+                        Communication.Send(file, sslStream);
                         break;
                     case "10":
                         if (response[1] == "1" || response[1] == "0") //start of stop sesie (met check)