Merge branch 'Server' of https://github.com/bartreedijk/TI-2.1-RemoteHealthCare into Server

Conflicts:
	Proftaak Remote Healthcare/Server/AppGlobal.cs

Proftaak Remote Healthcare/Server/AppGlobal.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
+using System;
 using Server.JSONObjecten;
 
 namespace Server
@@ -22,7 +23,6 @@ namespace Server
             users.Add(new User("no", "no", 0, false, 0));
             users.Add(new User("JK123", "jancoow", 5, true, 100));
             users.Add(new User("TOM", "tommie", 80, false, 77, true));
-            
         }
 
         public void CheckLogin(string username, string password, out int admin, out int id)

Proftaak Remote Healthcare/Server/client.cs → Proftaak Remote Healthcare/Server/Client.cs

@@ -36,17 +36,17 @@ namespace Server
                     switch (response_parts[0])
                     {
                         case "0":   //login
-                            if (response_parts.Length == 3) { 
+                            if (response_parts.Length == 4) {
                                 int admin, id;
                                 _global.CheckLogin(response_parts[1], response_parts[2], out admin, out id);
                                 if(id > -1)
                                 {
                                     this.iduser = id;
-                                    sendString("0|" + id + "|" + admin);
+                                    sendString("0|" + id + "|" + admin + "|" );
                                 }
                                 else
                                 {
-                                    sendString("0|0|0");
+                                    sendString("0|0|0|");
                                 }
                             }
                             break;

Proftaak Remote Healthcare/Server/Server.csproj

@@ -52,6 +52,12 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Fietsclient\Fietsclient.csproj">
+      <Project>{49668592-ed5d-4907-9ea7-2df70ab96271}</Project>
+      <Name>Fietsclient</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.