Merge remote-tracking branch 'origin/feature/prepare' into feature/prepare

Conflicts:
	Proftaak Remote Healthcare/FietsClientV2/Forms/Login.cs
	Proftaak Remote Healthcare/FietsClientV2/Program.cs
	Proftaak Remote Healthcare/FietsClientV2/TCPConnection.cs

.gitignore

@@ -210,3 +210,4 @@ FakesAssemblies/
 GeneratedArtifacts/
 _Pvt_Extensions/
 ModelManifest.xml
+Proftaak Remote Healthcare/FietsClientV2/TCPConnection.cs

Proftaak Remote Healthcare/FietsClientV2/Forms/Login.cs

@@ -33,7 +33,12 @@ namespace FietsClient
             errorLBL.Text = message;
         }
 
+<<<<<<< HEAD
         public void setError(string message)
+=======
+
+        public void setError(String message)
+>>>>>>> origin/feature/prepare
         {
             errorLBL.Text = message;
         }

Proftaak Remote Healthcare/FietsClientV2/Forms/PatientForm.cs

@@ -13,9 +13,11 @@ namespace FietsClient
 {
     public partial class PatientForm : Form
     {
+        private TcpConnection _connection;
         private PatientModel patienModel;
-        public PatientForm()
+        public PatientForm(TcpConnection connection)
         {
+            this._connection = connection;
             InitializeComponent();
             patienModel = PatientModel.patientModel;
             patienModel.patientform = this;

Proftaak Remote Healthcare/FietsClientV2/PatientModel.cs

@@ -22,7 +22,7 @@ namespace FietsClient
 
         private string powerLog;
 
-        private PatientModel()
+        public PatientModel()
         {
             dataHandler = new DataHandler();
             DataHandler.IncomingDataEvent += HandleBikeData; //initialize event

Proftaak Remote Healthcare/FietsClientV2/TCPConnection.cs

@@ -44,7 +44,7 @@ namespace FietsClient
                 isConnectedFlag = false;
             }
         }
-
+        
         public void receive()
         {
             while (true)
@@ -67,10 +67,15 @@ namespace FietsClient
                                     doctorForm.Show();
                                     currentData = new CurrentData(userID);
                                 }
-                                else if (response_parts[2] == "0" && response_parts[1] == "1")
+                                else if(response_parts[2] == "0" && response_parts[1] == "1")
                                 {
-                                    PatientForm patienForm = new PatientForm();
-                                    patienForm.Show();
+                                    PatientForm form = new PatientForm(this);
+                                    Form activeForm = Form.ActiveForm;
+
+                                    activeForm.Invoke((MethodInvoker)delegate () {
+                                        activeForm.Hide();
+                                        form.Show();
+                                    });
                                     currentData = new CurrentData(userID);
                                 }
                                 else