Mauro & karol & john cena

# Conflicts:
#	Proftaak Remote Healthcare/Fietsclient/Fietsclient.csproj

# Improvements:
#   Removed some useless comments
#   Removed demo project (standalone project)

Proftaak Remote Healthcare/ConsoleApplication1/App.config

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+    <startup> 
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
+    </startup>
+</configuration>

Proftaak Remote Healthcare/ConsoleApplication1/ConsoleApplication1.csproj

@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{21FEAE1B-DC2C-4788-9D25-C7F40F1B3126}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>ConsoleApplication1</RootNamespace>
+    <AssemblyName>ConsoleApplication1</AssemblyName>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Program.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+  </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.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>

Proftaak Remote Healthcare/ConsoleApplication1/Program.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ConsoleApplication1
+{
+    class Program
+    {
+        static void Main(string[] args)
+        {
+        }
+    }
+}

Proftaak Remote Healthcare/ConsoleApplication1/Properties/AssemblyInfo.cs

@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("ConsoleApplication1")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("ConsoleApplication1")]
+[assembly: AssemblyCopyright("Copyright ©  2015")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("21feae1b-dc2c-4788-9d25-c7f40f1b3126")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

Proftaak Remote Healthcare/Fietsclient/Fietsclient.csproj

@@ -36,6 +36,10 @@
     <StartupObject />
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Windows.Forms.DataVisualization" />
@@ -51,6 +55,8 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AppGlobal.cs" />
+    <Compile Include="Meting.cs" />
+    <Compile Include="Meetsessie.cs" />
     <Compile Include="KettlerBikeComm.cs" />
     <Compile Include="MainForm.cs">
       <SubType>Form</SubType>

Proftaak Remote Healthcare/Fietsclient/KettlerBikeComm.cs

@@ -5,6 +5,8 @@ using System.Text;
 using System.Threading.Tasks;
 using System.IO.Ports;
 using System.Threading;
+using Newtonsoft.Json;
+using System.IO;
 
 namespace Fietsclient
 {
@@ -200,6 +202,18 @@ namespace Fietsclient
                 return;
             sendData(CMD_ENERGY);
         }
+
+        public void saveToJson(string path,Meetsessie sessie)
+        {
+            string json = JsonConvert.SerializeObject(sessie);
+            File.WriteAllText(path, json);    
+        }
+        public Meetsessie loadFromJson(string path){
+            string jsonFile = File.ReadAllText(path);
+
+            Meetsessie sessieFromJson = JsonConvert.DeserializeObject<Meetsessie>(jsonFile);
+            return sessieFromJson;
+        }
     }
 }
 

Proftaak Remote Healthcare/Fietsclient/Meetsessie.cs

@@ -0,0 +1,37 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Fietsclient
+{
+    [Serializable]
+    class Meetsessie
+    {
+        //public List<Meting> metingen = new List<Meting>()
+        public int idMeting;
+        public string name;
+        public Boolean active;
+        public List<Meting> metingen { get; private set; } = new List<Meting>();
+
+        public void AddMeting(Meting meting)
+        {
+            metingen.Add(meting);
+        }
+
+        public List<Meting> getMetingen()
+        {
+            return metingen;
+        }
+
+        public void PrintAll()
+        {
+            Console.WriteLine("pulse" + "\t" + "rpm" + "\t" + "speed" + "\t" + " dist" + "\t" + "req pow" + "\t" + "energy" + "\t" + "time" + "\t\t" + "act pow");
+            for (int i = 0; i < metingen.Count; i++)
+            {
+                Console.WriteLine(metingen[i].pulse + "\t" + metingen[i].rpm + "\t" + metingen[i].speed + "\t " + metingen[i].distance + "\t" + metingen[i].requestedPower + "\t" + metingen[i].energy + "\t" + metingen[i].time + "\t" + metingen[i].actualPower);
+            }
+        }
+    }
+}

Proftaak Remote Healthcare/Fietsclient/Meting.cs

@@ -0,0 +1,39 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Fietsclient
+
+{
+    [Serializable]
+    class Meting
+    {
+        public int pulse { get; private set; }          //BPM
+        public int rpm { get; private set; }            //RPM
+        public int speed { get; private set; }          //meter per seconden
+        public int distance { get; private set; }       //meter
+        public int requestedPower { get; private set; } //Watt
+        public int energy { get; private set; }         //Watt
+        public TimeSpan time { get; private set; }      // minuten: seconden
+        public int actualPower { get; private set; }    //Watt
+
+        public Meting(int pulse, int rpm, int speed, int distance, int requestedPower, int energy, TimeSpan time, int actualPower)
+        {
+            this.pulse = pulse;
+            this.rpm = rpm;
+            this.speed = speed;
+            this.distance = distance;
+            this.requestedPower = requestedPower;
+            this.energy = energy;
+            this.time = time;
+            this.actualPower = actualPower;
+        }
+
+        public override string ToString()
+        {
+            return "pulse: " + pulse + " - RPM: " + rpm + " speed: " + speed + " - distance: " + distance + " - requested power: " + requestedPower + " - energy: " + energy + " - time: " + time + " - actual power: " + actualPower;
+        }
+    }
+}

Proftaak Remote Healthcare/Fietsclient/packages.config

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net452" />
+</packages>

Proftaak Remote Healthcare/Opslag demo/App.config

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+    <startup> 
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
+    </startup>
+</configuration>

Proftaak Remote Healthcare/Opslag demo/Meetsessie.cs

@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Opslag_demo
+{
+    class Meetsessie
+    {
+        List<Meting> metingen = new List<Meting>();
+
+        public void AddMeting(Meting meting)
+        {
+            metingen.Add(meting);
+        }
+
+        public List<Meting> getMetingen()
+        {
+            return metingen;
+        }
+
+        public void PrintAll()
+        {
+            Console.WriteLine("pulse" + "\t" + "rpm" + "\t" + "speed" + "\t" + " dist" + "\t" + "req pow" + "\t" + "energy" + "\t" + "time" + "\t\t" + "act pow");
+            for (int i = 0; i < metingen.Count; i++)
+            {
+                Console.WriteLine(metingen[i].pulse + "\t" + metingen[i].rpm + "\t" + metingen[i].speed + "\t " + metingen[i].distance + "\t"+ metingen[i].requestedPower + "\t" + metingen[i].energy + "\t" + metingen[i].time + "\t" + metingen[i].actualPower);
+            }
+        }
+    }
+}

Proftaak Remote Healthcare/Opslag demo/Meting.cs

@@ -0,0 +1,37 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Opslag_demo
+{
+    class Meting
+    {
+        public int pulse { get; private set; }          //BPM
+        public int rpm { get; private set; }            //RPM
+        public int speed { get; private set; }          //meter per seconden
+        public int distance { get; private set; }       //meter
+        public int requestedPower { get; private set; } //Watt
+        public int energy { get; private set; }         //Watt
+        public TimeSpan time { get; private set; }      // minuten: seconden
+        public int actualPower { get; private set; }    //Watt
+
+        public Meting(int pulse, int rpm, int speed, int distance, int requestedPower, int energy, TimeSpan time, int actualPower)
+        {
+            this.pulse = pulse;
+            this.rpm = rpm;
+            this.speed = speed;
+            this.distance = distance;
+            this.requestedPower = requestedPower;
+            this.energy = energy;
+            this.time = time;
+            this.actualPower = actualPower;
+        }
+
+        public override string ToString()
+        {
+            return "pulse: " + pulse + " - RPM: " + rpm + " speed: " + speed + " - distance: " + distance + " - requested power: " + requestedPower + " - energy: " + energy + " - time: " + time + " - actual power: " + actualPower;
+        }
+    }
+}

Proftaak Remote Healthcare/Opslag demo/Opslag demo.csproj

@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{D4D15FC6-D86A-488C-9AEC-A006B98A1D2F}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Opslag_demo</RootNamespace>
+    <AssemblyName>Opslag demo</AssemblyName>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Meting.cs" />
+    <Compile Include="Meetsessie.cs" />
+    <Compile Include="Program.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+    <None Include="packages.config" />
+  </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.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>

Proftaak Remote Healthcare/Opslag demo/Program.cs

@@ -0,0 +1,60 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
+
+
+namespace Opslag_demo
+{
+    class Program
+    {
+        static void Main(string[] args)
+        {
+            Meetsessie sessie = new Meetsessie();
+            sessie.AddMeting(new Meting(1, 2, 3, 4, 5, 6, new TimeSpan(00, 00, 01), 8));
+            sessie.AddMeting(new Meting(18, 22, 3, 54, 5, 6, new TimeSpan(00, 00, 10), 8));
+            sessie.AddMeting(new Meting(15, 27, 3, 54, 5, 76, new TimeSpan(00, 01, 00), 8));
+            sessie.AddMeting(new Meting(12, 52, 53, 48, 5, 76, new TimeSpan(00, 10, 00), 87));
+            sessie.AddMeting(new Meting(51, 25, 3, 54, 5, 476, new TimeSpan(00, 10, 01), 87));
+            sessie.AddMeting(new Meting(71, 2, 37, 44, 5, 46, new TimeSpan(00, 11, 00), 8));
+
+            string json = JsonConvert.SerializeObject(sessie.getMetingen());
+
+            File.WriteAllText(Environment.CurrentDirectory + "\\testKarel.json", json);
+
+            string jsonFile = File.ReadAllText(Environment.CurrentDirectory + "\\testKarel.json");
+
+            List<Meting> sessieFromJson = JsonConvert.DeserializeObject<List<Meting>>(jsonFile);
+            foreach (var item in sessieFromJson)
+            {
+                sessie.AddMeting(item); 
+                Console.WriteLine(item.ToString());
+            }
+            //FileStream fileStream = System.IO.File.Open(Environment.CurrentDirectory+"\\test.json", FileMode.OpenOrCreate);
+            //StreamWriter streamWriter = new StreamWriter(fileStream);
+            //JsonWriter jsontTextWriter = new JsonTextWriter(streamWriter);
+            //JsonSerializer jsonSerializer = new JsonSerializer();
+
+            //using (jsontTextWriter)
+            //{
+            //    jsonSerializer.Serialize(jsontTextWriter, sessie.getMetingen().ToArray());
+            //}
+
+            //using (StreamReader r = new StreamReader("test.json"))
+            //{
+            //    string json = r.ReadToEnd();
+            //    List<Meetsessie> items = JsonConvert.DeserializeObject<List<Meetsessie>>(json);
+            //    //items[0].PrintAll();
+            //    Console.WriteLine(items[0].getMetingen().Count);
+
+            //}
+
+            ////Console.WriteLine(sessie.getMetingen()[0]);
+            ////sessie.PrintAll();
+            Console.Read();
+        }
+    }
+}

Proftaak Remote Healthcare/Opslag demo/Properties/AssemblyInfo.cs

@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Opslag demo")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Opslag demo")]
+[assembly: AssemblyCopyright("Copyright ©  2015")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("d4d15fc6-d86a-488c-9aec-a006b98a1d2f")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

Proftaak Remote Healthcare/Opslag demo/packages.config

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net452" />
+</packages>

Proftaak Remote Healthcare/Proftaak Remote Healthcare.sln

@@ -7,6 +7,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Fietsclient", "Fietsclient\
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FietsSimulator", "FietsSimulator\FietsSimulator.csproj", "{4FF5A179-C048-4833-AD7C-568FF05C66C5}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Opslag demo", "Opslag demo\Opslag demo.csproj", "{D4D15FC6-D86A-488C-9AEC-A006B98A1D2F}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -21,6 +23,10 @@ Global
 		{4FF5A179-C048-4833-AD7C-568FF05C66C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4FF5A179-C048-4833-AD7C-568FF05C66C5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4FF5A179-C048-4833-AD7C-568FF05C66C5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D4D15FC6-D86A-488C-9AEC-A006B98A1D2F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D4D15FC6-D86A-488C-9AEC-A006B98A1D2F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D4D15FC6-D86A-488C-9AEC-A006B98A1D2F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D4D15FC6-D86A-488C-9AEC-A006B98A1D2F}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE