Aaldert 10 лет назад
Родитель
Сommit
7b465f27f8

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

@@ -65,8 +65,11 @@ namespace FietsClient
 
         private void printMessage(string[] data)
         {
-            string finalMessage = data[1] + ":\t\t" + data[3] + "\r\n";
-            chatBox.AppendText(finalMessage);
+            string finalMessage = data[0] + ":\t\t" + data[2] + "\r\n";
+            chatBox.Invoke((MethodInvoker) delegate ()
+            {
+                chatBox.AppendText(finalMessage);
+            });
         }
 
         public void AddSessionToTabcontrol(string patientID)

+ 5 - 2
Proftaak Remote Healthcare/FietsClientV2/Forms/PatientForm.cs

@@ -205,8 +205,11 @@ namespace FietsClient
         private void printMessage(string[] data)
         {
             patientModel.CurrentDoctorID = data[1];
-            string finalMessage = data[1] + ":\t\t" + data[3] + "\r\n";
-            chatBox.AppendText(finalMessage);
+            string finalMessage = data[0] + ":\t\t" + data[2] + "\r\n";
+            chatBox.Invoke((MethodInvoker)delegate ()
+            {
+                chatBox.AppendText(finalMessage);
+            });
         }
 
         private void PatientForm_FormClosing(object sender, FormClosingEventArgs e)

+ 2 - 2
Proftaak Remote Healthcare/FietsClientV2/TCPConnection.cs

@@ -46,7 +46,7 @@ namespace FietsClient
         {
                 try
                 {
-                    client.Connect("brdk.nl", 1288);
+                    client.Connect("127.0.0.1", 1288);
 
                     // create streams
                     serverStream = client.GetStream();
@@ -75,7 +75,7 @@ namespace FietsClient
             while (true)
             {
                 byte[] bytesFrom = new byte[(int)client.ReceiveBufferSize];
-                serverStream.Read(bytesFrom, 0, (int)client.ReceiveBufferSize);
+                serverStream.Read(bytesFrom, 0, client.ReceiveBufferSize);
                 string response = Encoding.ASCII.GetString(bytesFrom);
                 string[] response_parts = response.Split('|');
 

+ 6 - 2
Proftaak Remote Healthcare/Server/Client.cs

@@ -106,8 +106,12 @@ namespace Server
                                 String receiver = response_parts[2];
                                 String sender = response_parts[1];
 
-                                //bericht doorsturen naar alle actieve gebruikers (de Fietsclient zorgt ervoor dat alleen de geadresseerde het bericht kan zien)
-                                sendString("7|" + sender + "|" + receiver + "|" + message);   
+                                sendString("7|" + sender + "|" + receiver + "|" + message);
+                                foreach (var client in Program.Clients)
+                                {
+                                    if (client.username == receiver)
+                                        client.sendString("7|" + sender + "|" + receiver + "|" + message);
+                                }
                             }
                             break;
                         case "8": //alle online Patients sturen naar Doctorclient