Jelajahi Sumber

Merge branch 'feature/Char_(Daniel)'

Conflicts:
	Proftaak Remote Healthcare/FietsClientV2/Forms/PatientForm.cs
Bart Reedijk 10 tahun lalu
induk
melakukan
59370124f7

+ 16 - 1
Proftaak Remote Healthcare/FietsClientV2/Forms/DoctorForm.cs

@@ -51,7 +51,7 @@ namespace FietsClient
 
         private void messageButton_Click(object sender, EventArgs e)
         {
-            if (messageBox.Text != null)
+            if (messageBox.Text != null && doctorTabControl.SelectedTab.Name != "tabPageSummary")
             {
                 String[] data = new String[2];
                 data[0] = messageBox.Text;
@@ -60,6 +60,21 @@ namespace FietsClient
                 messageBox.Clear();
 
                 doctorModel.tcpConnection.SendChatMessage(data);
+            }
+            
+            else if (messageBox.Text != null && doctorTabControl.SelectedTab.Name == "tabPageSummary")
+            {
+                String[] data = new String[2];
+                data[0] = "This is a broadcast: " + messageBox.Text;
+                //all patients:
+                for (int tabs = 1; tabs <= doctorTabControl.TabCount -1; tabs++)
+                {
+                    doctorTabControl.SelectTab(tabs);
+                    data[1] = doctorTabControl.SelectedTab.Name;
+                    doctorModel.tcpConnection.SendChatMessage(data);
+                }
+                messageBox.Clear();
+
             }  
         }
 

+ 21 - 6
Proftaak Remote Healthcare/FietsClientV2/Forms/PatientForm.cs

@@ -204,13 +204,28 @@ namespace FietsClient
         }
         private void printMessage(string[] data)
         {
-            if (data[0] != _connection.userID)
-                patientModel.CurrentDoctorID = data[0];
-            string finalMessage = data[0] + ":\t" + data[2] + "\r\n";
-            chatBox.Invoke((MethodInvoker)delegate ()
+	    if (data[2].StartsWith("This is a broadcast: "))
             {
-                chatBox.AppendText(finalMessage);
-            });
+                string finalMessage = "\r\n" + data[2];
+
+                chatBox.Invoke((MethodInvoker)delegate ()
+                {
+                    chatBox.AppendText(finalMessage);
+                });
+            }
+
+            else
+            {
+                if (data[0] != _connection.userID)
+                    patientModel.CurrentDoctorID = data[0];
+                string finalMessage = data[0] + ":\t" + data[2] + "\r\n";
+
+                chatBox.Invoke((MethodInvoker)delegate ()
+                {
+                    chatBox.AppendText(finalMessage);
+                });
+            }
+
         }
 
         private void PatientForm_FormClosing(object sender, FormClosingEventArgs e)