Chat werkt

Proftaak Remote Healthcare/FietsClientV2/Forms/DoctorForm.cs

@@ -65,7 +65,7 @@ namespace FietsClient
 
         private void printMessage(string[] data)
         {
-            string finalMessage = data[0] + ":\t\t" + data[2] + "\r\n";
+            string finalMessage = "\r\n" + data[0] + ":\t" + data[2];
             chatBox.Invoke((MethodInvoker) delegate ()
             {
                 chatBox.AppendText(finalMessage);

Proftaak Remote Healthcare/FietsClientV2/Forms/PatientForm.cs

@@ -204,8 +204,9 @@ namespace FietsClient
         }
         private void printMessage(string[] data)
         {
-            patientModel.CurrentDoctorID = data[1];
-            string finalMessage = data[0] + ":\t\t" + data[2] + "\r\n";
+            if (data[0] != _connection.userID)
+                patientModel.CurrentDoctorID = data[0];
+            string finalMessage = "\r\n" + data[0] + ":\t" + data[2];
             chatBox.Invoke((MethodInvoker)delegate ()
             {
                 chatBox.AppendText(finalMessage);

Proftaak Remote Healthcare/FietsClientV2/TCPConnection.cs

@@ -109,22 +109,25 @@ namespace FietsClient
                             if (currentData.isDoctor == true)
                             {
                                 Form activeForm = Form.ActiveForm;
-                                activeForm.Invoke((MethodInvoker) delegate()
-                                {
-                                    DoctorForm doctorForm = new DoctorForm(this);
-                                    activeForm.Hide();
-                                    doctorForm.Show();
-                                });
+                                activeForm.Invoke((MethodInvoker)delegate ()
+                               {
+                                   DoctorForm doctorForm = new DoctorForm(this);
+                                   activeForm.Hide();
+                                   doctorForm.Show();
+                               });
                             }
                             else
                             {
                                 Form activeForm = Form.ActiveForm;
-                                activeForm.Invoke((MethodInvoker)delegate ()
+                                if (activeForm != null)
                                 {
-                                    PatientForm patientForm = new PatientForm(this);
-                                    activeForm.Hide();
-                                    patientForm.Show();
-                                });
+                                    activeForm.Invoke((MethodInvoker)delegate ()
+                                    {
+                                        PatientForm patientForm = new PatientForm(this);
+                                        activeForm.Hide();
+                                        patientForm.Show();
+                                    });
+                                }
                             }
 
                             break;