From 9ec488b15a8b83234f49486126b47f8c947d9f20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ivan=20Ho=CC=88rler?= <i.hoerler@me.com>
Date: Tue, 17 Jul 2018 19:51:33 +0200
Subject: [PATCH] blop

---
 EHEC_Server/EHEC_Server/EHEC_Server.csproj    |  99 +++++++------
 EHEC_Server/EHEC_Server/Global.asax.cs        |  36 +++--
 EHEC_Server/EHEC_Server/Global.cs             |  37 +++++
 EHEC_Server/EHEC_Server/Service.svc.cs        |   9 +-
 EHEC_Server/EHEC_Server/cluster.aspx          |  59 ++++----
 .../cluster_dependencies/Blueprint.json       |  32 ++++
 .../cluster_dependencies/ClusterConverter.cs  |  24 +++
 .../cluster_dependencies/JsonConverter.cs     | 140 ++++++++++++++++++
 .../cluster_dependencies/JsonModel.cs         |  27 ++++
 .../Models/ClusterPatient.cs                  |  34 +++++
 .../Models/ClusterResult.cs                   |  22 +++
 .../alchemy/alchemy-white.css                 |   0
 .../alchemy/alchemy.css                       |   0
 .../alchemy/alchemy.js                        |   0
 .../alchemy/alchemy.min.css                   |   0
 .../alchemy/alchemy.min.js                    |   0
 .../alchemy/scripts/vendor.js                 |   0
 .../alchemy/styles/fonts/FontAwesome.otf      | Bin
 .../styles/fonts/fontawesome-webfont.eot      | Bin
 .../styles/fonts/fontawesome-webfont.svg      |   0
 .../styles/fonts/fontawesome-webfont.ttf      | Bin
 .../styles/fonts/fontawesome-webfont.woff     | Bin
 .../alchemy/styles/images/maze-black.png      | Bin
 .../alchemy/styles/vendor.css                 |   0
 .../alchemy/testdata/actors.json              |   0
 .../alchemy/testdata/charlize.json            |   0
 .../alchemy/testdata/contrib.json             |  88 +++++++++++
 .../alchemy/testdata/presocratics.json        |   0
 .../bootstrap/css/bootstrap-grid.css          |   0
 .../bootstrap/css/bootstrap-grid.css.map      |   0
 .../bootstrap/css/bootstrap-grid.min.css      |   0
 .../bootstrap/css/bootstrap-grid.min.css.map  |   0
 .../bootstrap/css/bootstrap-reboot.css        |   0
 .../bootstrap/css/bootstrap-reboot.css.map    |   0
 .../bootstrap/css/bootstrap-reboot.min.css    |   0
 .../css/bootstrap-reboot.min.css.map          |   0
 .../bootstrap/css/bootstrap.css               |   0
 .../bootstrap/css/bootstrap.css.map           |   0
 .../bootstrap/css/bootstrap.min.css           |   0
 .../bootstrap/css/bootstrap.min.css.map       |   0
 .../bootstrap/js/bootstrap.bundle.js          |   0
 .../bootstrap/js/bootstrap.bundle.js.map      |   0
 .../bootstrap/js/bootstrap.bundle.min.js      |   0
 .../bootstrap/js/bootstrap.bundle.min.js.map  |   0
 .../bootstrap/js/bootstrap.js                 |   0
 .../bootstrap/js/bootstrap.js.map             |   0
 .../bootstrap/js/bootstrap.min.js             |   0
 .../bootstrap/js/bootstrap.min.js.map         |   0
 .../{ => cluster_dependencies}/d3/API.md      |   0
 .../{ => cluster_dependencies}/d3/CHANGES.md  |   0
 .../{ => cluster_dependencies}/d3/LICENSE     |   0
 .../{ => cluster_dependencies}/d3/README.md   |   0
 .../{ => cluster_dependencies}/d3/d3.js       |   0
 .../{ => cluster_dependencies}/d3/d3.min.js   |   0
 .../jquery/jquery-3.3.1.min.js                |   0
 .../lodash/lodash.js                          |   0
 EHEC_Server/EHEC_Server/packages.config       |   1 +
 .../Properties/AssemblyInfo.cs                |  20 +++
 EHEC_Server/UnitTestProject1/UnitTest1.cs     |  70 +++++++++
 .../UnitTestProject1/UnitTestProject1.csproj  |  67 +++++++++
 EHEC_Server/UnitTestProject1/packages.config  |   5 +
 SQL/Development-Querys.sql                    | Bin 676 -> 684 bytes
 62 files changed, 678 insertions(+), 92 deletions(-)
 create mode 100644 EHEC_Server/EHEC_Server/Global.cs
 create mode 100644 EHEC_Server/EHEC_Server/cluster_dependencies/Blueprint.json
 create mode 100644 EHEC_Server/EHEC_Server/cluster_dependencies/ClusterConverter.cs
 create mode 100644 EHEC_Server/EHEC_Server/cluster_dependencies/JsonConverter.cs
 create mode 100644 EHEC_Server/EHEC_Server/cluster_dependencies/JsonModel.cs
 create mode 100644 EHEC_Server/EHEC_Server/cluster_dependencies/Models/ClusterPatient.cs
 create mode 100644 EHEC_Server/EHEC_Server/cluster_dependencies/Models/ClusterResult.cs
 rename EHEC_Server/EHEC_Server/{ => cluster_dependencies}/alchemy/alchemy-white.css (100%)
 rename EHEC_Server/EHEC_Server/{ => cluster_dependencies}/alchemy/alchemy.css (100%)
 rename EHEC_Server/EHEC_Server/{ => cluster_dependencies}/alchemy/alchemy.js (100%)
 rename EHEC_Server/EHEC_Server/{ => cluster_dependencies}/alchemy/alchemy.min.css (100%)
 rename EHEC_Server/EHEC_Server/{ => cluster_dependencies}/alchemy/alchemy.min.js (100%)
 rename EHEC_Server/EHEC_Server/{ => cluster_dependencies}/alchemy/scripts/vendor.js (100%)
 rename EHEC_Server/EHEC_Server/{ => cluster_dependencies}/alchemy/styles/fonts/FontAwesome.otf (100%)
 rename EHEC_Server/EHEC_Server/{ => cluster_dependencies}/alchemy/styles/fonts/fontawesome-webfont.eot (100%)
 rename EHEC_Server/EHEC_Server/{ => cluster_dependencies}/alchemy/styles/fonts/fontawesome-webfont.svg (100%)
 rename EHEC_Server/EHEC_Server/{ => cluster_dependencies}/alchemy/styles/fonts/fontawesome-webfont.ttf (100%)
 rename EHEC_Server/EHEC_Server/{ => cluster_dependencies}/alchemy/styles/fonts/fontawesome-webfont.woff (100%)
 rename EHEC_Server/EHEC_Server/{ => cluster_dependencies}/alchemy/styles/images/maze-black.png (100%)
 rename EHEC_Server/EHEC_Server/{ => cluster_dependencies}/alchemy/styles/vendor.css (100%)
 rename EHEC_Server/EHEC_Server/{ => cluster_dependencies}/alchemy/testdata/actors.json (100%)
 rename EHEC_Server/EHEC_Server/{ => cluster_dependencies}/alchemy/testdata/charlize.json (100%)
 create mode 100644 EHEC_Server/EHEC_Server/cluster_dependencies/alchemy/testdata/contrib.json
 rename EHEC_Server/EHEC_Server/{ => cluster_dependencies}/alchemy/testdata/presocratics.json (100%)
 rename EHEC_Server/EHEC_Server/{ => cluster_dependencies}/bootstrap/css/bootstrap-grid.css (100%)
 rename EHEC_Server/EHEC_Server/{ => cluster_dependencies}/bootstrap/css/bootstrap-grid.css.map (100%)
 rename EHEC_Server/EHEC_Server/{ => cluster_dependencies}/bootstrap/css/bootstrap-grid.min.css (100%)
 rename EHEC_Server/EHEC_Server/{ => cluster_dependencies}/bootstrap/css/bootstrap-grid.min.css.map (100%)
 rename EHEC_Server/EHEC_Server/{ => cluster_dependencies}/bootstrap/css/bootstrap-reboot.css (100%)
 rename EHEC_Server/EHEC_Server/{ => cluster_dependencies}/bootstrap/css/bootstrap-reboot.css.map (100%)
 rename EHEC_Server/EHEC_Server/{ => cluster_dependencies}/bootstrap/css/bootstrap-reboot.min.css (100%)
 rename EHEC_Server/EHEC_Server/{ => cluster_dependencies}/bootstrap/css/bootstrap-reboot.min.css.map (100%)
 rename EHEC_Server/EHEC_Server/{ => cluster_dependencies}/bootstrap/css/bootstrap.css (100%)
 rename EHEC_Server/EHEC_Server/{ => cluster_dependencies}/bootstrap/css/bootstrap.css.map (100%)
 rename EHEC_Server/EHEC_Server/{ => cluster_dependencies}/bootstrap/css/bootstrap.min.css (100%)
 rename EHEC_Server/EHEC_Server/{ => cluster_dependencies}/bootstrap/css/bootstrap.min.css.map (100%)
 rename EHEC_Server/EHEC_Server/{ => cluster_dependencies}/bootstrap/js/bootstrap.bundle.js (100%)
 rename EHEC_Server/EHEC_Server/{ => cluster_dependencies}/bootstrap/js/bootstrap.bundle.js.map (100%)
 rename EHEC_Server/EHEC_Server/{ => cluster_dependencies}/bootstrap/js/bootstrap.bundle.min.js (100%)
 rename EHEC_Server/EHEC_Server/{ => cluster_dependencies}/bootstrap/js/bootstrap.bundle.min.js.map (100%)
 rename EHEC_Server/EHEC_Server/{ => cluster_dependencies}/bootstrap/js/bootstrap.js (100%)
 rename EHEC_Server/EHEC_Server/{ => cluster_dependencies}/bootstrap/js/bootstrap.js.map (100%)
 rename EHEC_Server/EHEC_Server/{ => cluster_dependencies}/bootstrap/js/bootstrap.min.js (100%)
 rename EHEC_Server/EHEC_Server/{ => cluster_dependencies}/bootstrap/js/bootstrap.min.js.map (100%)
 rename EHEC_Server/EHEC_Server/{ => cluster_dependencies}/d3/API.md (100%)
 rename EHEC_Server/EHEC_Server/{ => cluster_dependencies}/d3/CHANGES.md (100%)
 rename EHEC_Server/EHEC_Server/{ => cluster_dependencies}/d3/LICENSE (100%)
 rename EHEC_Server/EHEC_Server/{ => cluster_dependencies}/d3/README.md (100%)
 rename EHEC_Server/EHEC_Server/{ => cluster_dependencies}/d3/d3.js (100%)
 rename EHEC_Server/EHEC_Server/{ => cluster_dependencies}/d3/d3.min.js (100%)
 rename EHEC_Server/EHEC_Server/{ => cluster_dependencies}/jquery/jquery-3.3.1.min.js (100%)
 rename EHEC_Server/EHEC_Server/{ => cluster_dependencies}/lodash/lodash.js (100%)
 create mode 100644 EHEC_Server/UnitTestProject1/Properties/AssemblyInfo.cs
 create mode 100644 EHEC_Server/UnitTestProject1/UnitTest1.cs
 create mode 100644 EHEC_Server/UnitTestProject1/UnitTestProject1.csproj
 create mode 100644 EHEC_Server/UnitTestProject1/packages.config

diff --git a/EHEC_Server/EHEC_Server/EHEC_Server.csproj b/EHEC_Server/EHEC_Server/EHEC_Server.csproj
index 181548c..ee168bd 100644
--- a/EHEC_Server/EHEC_Server/EHEC_Server.csproj
+++ b/EHEC_Server/EHEC_Server/EHEC_Server.csproj
@@ -55,6 +55,9 @@
       <HintPath>..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.8\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
+    <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Security" />
     <Reference Include="System.ServiceModel" />
@@ -80,55 +83,57 @@
       <Generator>EntityModelCodeGenerator</Generator>
       <LastGenOutput>Model.Designer.cs</LastGenOutput>
     </EntityDeploy>
-    <Content Include="alchemy\alchemy-white.css" />
-    <Content Include="alchemy\alchemy.css" />
-    <Content Include="alchemy\alchemy.js" />
-    <Content Include="alchemy\alchemy.min.css" />
-    <Content Include="alchemy\alchemy.min.js" />
-    <Content Include="alchemy\scripts\vendor.js" />
-    <Content Include="alchemy\styles\fonts\fontawesome-webfont.svg" />
-    <Content Include="alchemy\styles\images\maze-black.png" />
-    <Content Include="alchemy\styles\vendor.css" />
-    <Content Include="bootstrap\css\bootstrap-grid.css" />
-    <Content Include="bootstrap\css\bootstrap-grid.min.css" />
-    <Content Include="bootstrap\css\bootstrap-reboot.css" />
-    <Content Include="bootstrap\css\bootstrap-reboot.min.css" />
-    <Content Include="bootstrap\css\bootstrap.css" />
-    <Content Include="bootstrap\css\bootstrap.min.css" />
-    <Content Include="bootstrap\js\bootstrap.bundle.js" />
-    <Content Include="bootstrap\js\bootstrap.bundle.min.js" />
-    <Content Include="bootstrap\js\bootstrap.js" />
-    <Content Include="bootstrap\js\bootstrap.min.js" />
+    <Content Include="cluster_dependencies\alchemy\alchemy-white.css" />
+    <Content Include="cluster_dependencies\alchemy\alchemy.css" />
+    <Content Include="cluster_dependencies\alchemy\alchemy.js" />
+    <Content Include="cluster_dependencies\alchemy\alchemy.min.css" />
+    <Content Include="cluster_dependencies\alchemy\alchemy.min.js" />
+    <Content Include="cluster_dependencies\alchemy\scripts\vendor.js" />
+    <Content Include="cluster_dependencies\alchemy\styles\fonts\fontawesome-webfont.svg" />
+    <Content Include="cluster_dependencies\alchemy\styles\images\maze-black.png" />
+    <Content Include="cluster_dependencies\alchemy\styles\vendor.css" />
+    <Content Include="cluster_dependencies\bootstrap\css\bootstrap-grid.css" />
+    <Content Include="cluster_dependencies\bootstrap\css\bootstrap-grid.min.css" />
+    <Content Include="cluster_dependencies\bootstrap\css\bootstrap-reboot.css" />
+    <Content Include="cluster_dependencies\bootstrap\css\bootstrap-reboot.min.css" />
+    <Content Include="cluster_dependencies\bootstrap\css\bootstrap.css" />
+    <Content Include="cluster_dependencies\bootstrap\css\bootstrap.min.css" />
+    <Content Include="cluster_dependencies\bootstrap\js\bootstrap.bundle.js" />
+    <Content Include="cluster_dependencies\bootstrap\js\bootstrap.bundle.min.js" />
+    <Content Include="cluster_dependencies\bootstrap\js\bootstrap.js" />
+    <Content Include="cluster_dependencies\bootstrap\js\bootstrap.min.js" />
     <Content Include="cluster.aspx" />
-    <Content Include="d3\d3.js" />
-    <Content Include="d3\d3.min.js" />
+    <Content Include="cluster_dependencies\d3\d3.js" />
+    <Content Include="cluster_dependencies\d3\d3.min.js" />
     <Content Include="Global.asax" />
-    <Content Include="jquery\jquery-3.3.1.min.js" />
-    <Content Include="lodash\lodash.js" />
+    <Content Include="cluster_dependencies\jquery\jquery-3.3.1.min.js" />
+    <Content Include="cluster_dependencies\lodash\lodash.js" />
     <Content Include="Model.edmx.diagram">
       <DependentUpon>Model.edmx</DependentUpon>
     </Content>
-    <Content Include="d3\API.md" />
-    <Content Include="d3\CHANGES.md" />
-    <Content Include="d3\LICENSE" />
-    <Content Include="d3\README.md" />
-    <Content Include="alchemy\testdata\actors.json" />
-    <Content Include="alchemy\testdata\charlize.json" />
-    <Content Include="alchemy\testdata\presocratics.json" />
-    <Content Include="alchemy\styles\fonts\fontawesome-webfont.eot" />
-    <Content Include="alchemy\styles\fonts\fontawesome-webfont.ttf" />
-    <Content Include="alchemy\styles\fonts\fontawesome-webfont.woff" />
-    <Content Include="alchemy\styles\fonts\FontAwesome.otf" />
-    <Content Include="bootstrap\js\bootstrap.bundle.js.map" />
-    <Content Include="bootstrap\js\bootstrap.bundle.min.js.map" />
-    <Content Include="bootstrap\js\bootstrap.js.map" />
-    <Content Include="bootstrap\js\bootstrap.min.js.map" />
-    <Content Include="bootstrap\css\bootstrap-grid.css.map" />
-    <Content Include="bootstrap\css\bootstrap-grid.min.css.map" />
-    <Content Include="bootstrap\css\bootstrap-reboot.css.map" />
-    <Content Include="bootstrap\css\bootstrap-reboot.min.css.map" />
-    <Content Include="bootstrap\css\bootstrap.css.map" />
-    <Content Include="bootstrap\css\bootstrap.min.css.map" />
+    <Content Include="cluster_dependencies\d3\API.md" />
+    <Content Include="cluster_dependencies\d3\CHANGES.md" />
+    <Content Include="cluster_dependencies\d3\LICENSE" />
+    <Content Include="cluster_dependencies\d3\README.md" />
+    <Content Include="cluster_dependencies\alchemy\testdata\actors.json" />
+    <Content Include="cluster_dependencies\alchemy\testdata\charlize.json" />
+    <Content Include="cluster_dependencies\alchemy\testdata\presocratics.json" />
+    <Content Include="cluster_dependencies\alchemy\styles\fonts\fontawesome-webfont.eot" />
+    <Content Include="cluster_dependencies\alchemy\styles\fonts\fontawesome-webfont.ttf" />
+    <Content Include="cluster_dependencies\alchemy\styles\fonts\fontawesome-webfont.woff" />
+    <Content Include="cluster_dependencies\alchemy\styles\fonts\FontAwesome.otf" />
+    <Content Include="cluster_dependencies\bootstrap\js\bootstrap.bundle.js.map" />
+    <Content Include="cluster_dependencies\bootstrap\js\bootstrap.bundle.min.js.map" />
+    <Content Include="cluster_dependencies\bootstrap\js\bootstrap.js.map" />
+    <Content Include="cluster_dependencies\bootstrap\js\bootstrap.min.js.map" />
+    <Content Include="cluster_dependencies\bootstrap\css\bootstrap-grid.css.map" />
+    <Content Include="cluster_dependencies\bootstrap\css\bootstrap-grid.min.css.map" />
+    <Content Include="cluster_dependencies\bootstrap\css\bootstrap-reboot.css.map" />
+    <Content Include="cluster_dependencies\bootstrap\css\bootstrap-reboot.min.css.map" />
+    <Content Include="cluster_dependencies\bootstrap\css\bootstrap.css.map" />
+    <Content Include="cluster_dependencies\bootstrap\css\bootstrap.min.css.map" />
+    <Content Include="cluster_dependencies\alchemy\testdata\contrib.json" />
+    <Content Include="cluster_dependencies\Blueprint.json" />
     <None Include="packages.config" />
     <None Include="Web.Debug.config">
       <DependentUpon>Web.config</DependentUpon>
@@ -159,6 +164,11 @@
     <Compile Include="cluster.aspx.designer.cs">
       <DependentUpon>cluster.aspx</DependentUpon>
     </Compile>
+    <Compile Include="cluster_dependencies\ClusterConverter.cs" />
+    <Compile Include="cluster_dependencies\JsonConverter.cs" />
+    <Compile Include="cluster_dependencies\JsonModel.cs" />
+    <Compile Include="cluster_dependencies\Models\ClusterPatient.cs" />
+    <Compile Include="cluster_dependencies\Models\ClusterResult.cs" />
     <Compile Include="DatabaseAccess\Doctor.cs" />
     <Compile Include="DatabaseAccess\Origin.cs" />
     <Compile Include="DatabaseAccess\Origin_Exam.cs" />
@@ -176,6 +186,7 @@
     <Compile Include="Global.asax.cs">
       <DependentUpon>Global.asax</DependentUpon>
     </Compile>
+    <Compile Include="Global.cs" />
     <Compile Include="IService.cs" />
     <Compile Include="Model.Context.cs">
       <AutoGen>True</AutoGen>
diff --git a/EHEC_Server/EHEC_Server/Global.asax.cs b/EHEC_Server/EHEC_Server/Global.asax.cs
index 4605b8f..ed2e699 100644
--- a/EHEC_Server/EHEC_Server/Global.asax.cs
+++ b/EHEC_Server/EHEC_Server/Global.asax.cs
@@ -8,7 +8,7 @@ using EHEC_Server.DataBuilder;
 
 namespace EHEC_Server
 {
-    public class Global : System.Web.HttpApplication
+    public partial class Global : System.Web.HttpApplication
     {
         private static List<string> FirstNames = new List<string>(new string[]
         {
@@ -49,8 +49,8 @@ namespace EHEC_Server
         protected void Application_Start(object sender, EventArgs e)
         {
             //add patients
-            using (EHEC_DBEntities ctx = new EHEC_DBEntities())
-            {
+            //using (EHEC_DBEntities ctx = new EHEC_DBEntities())
+            //{
 
                 Random p = new Random();
                 for (int i = 0; i < 10; i++)
@@ -64,28 +64,30 @@ namespace EHEC_Server
                         City = Cities[p.Next(0, 7)].ToString(),
                         Region = Regions[p.Next(0, 6)].ToString()
                     };
-                    ctx.Patients.Add(patient);
-                    ctx.SaveChanges();
+                    Global.GlobalInstance.DbAccess.Patients.Add(patient);
+                    //ctx.Patients.Add(patient);
+                    //ctx.SaveChanges();
                 }
-            }
+            //}
             //add doctors
-            using (EHEC_DBEntities ctx = new EHEC_DBEntities())
-            {
+            //using (EHEC_DBEntities ctx = new EHEC_DBEntities())
+            //{
 
-                Random p = new Random();
+                Random d = new Random();
                 for (int i = 0; i < 10; i++)
                 {
                     Doctor doctor = new Doctor
                     {
-                        FirstName = FirstNames[p.Next(0, 5)].ToString(),
-                        LastName = LastNames[p.Next(0, 7)].ToString(),
-                        DoctorOrigin = DoctorOrigins[p.Next(0, 4)].ToString(),
-                        Region = Regions[p.Next(0, 6)].ToString()
+                        FirstName = FirstNames[d.Next(0, 5)].ToString(),
+                        LastName = LastNames[d.Next(0, 7)].ToString(),
+                        DoctorOrigin = DoctorOrigins[d.Next(0, 4)].ToString(),
+                        Region = Regions[d.Next(0, 6)].ToString()
                     };
-                    ctx.Doctors.Add(doctor);
-                    ctx.SaveChanges();
+                    Global.GlobalInstance.DbAccess.Doctors.Add(doctor);
+                    //ctx.Doctors.Add(doctor);
+                    //ctx.SaveChanges();
                 }
-            }
+            //}
 
         }
 
@@ -119,5 +121,7 @@ namespace EHEC_Server
         {
 
         }
+
+
     }
 }
\ No newline at end of file
diff --git a/EHEC_Server/EHEC_Server/Global.cs b/EHEC_Server/EHEC_Server/Global.cs
new file mode 100644
index 0000000..a5fac28
--- /dev/null
+++ b/EHEC_Server/EHEC_Server/Global.cs
@@ -0,0 +1,37 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace EHEC_Server
+{
+    /// <summary>
+    /// This is a Singleton implementation for the need of one single db connection
+    /// </summary>
+    public partial class Global
+    {
+        private static Global globalInstance = null;
+        private static EHEC_DBEntities dbAccess = null;
+
+        public static Global GlobalInstance {
+            get {
+                if (globalInstance == null)
+                {
+                    globalInstance = new Global();
+                }
+                return globalInstance;
+            }
+        }
+
+        public EHEC_DBEntities DbAccess
+        {
+            get {
+                if (dbAccess == null)
+                {
+                    dbAccess = new EHEC_DBEntities();
+                }
+                return dbAccess;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/EHEC_Server/EHEC_Server/Service.svc.cs b/EHEC_Server/EHEC_Server/Service.svc.cs
index cb27122..2d0afa9 100644
--- a/EHEC_Server/EHEC_Server/Service.svc.cs
+++ b/EHEC_Server/EHEC_Server/Service.svc.cs
@@ -8,8 +8,10 @@ using EHEC_Server.DataBuilder;
 
 namespace EHEC_Server
 {
-    // NOTE: You can use the "Rename" command on the "Refactor" menu to change the class name "Service" in code, svc and config file together.
-    // NOTE: In order to launch WCF Test Client for testing this service, please select Service.svc or Service.svc.cs at the Solution Explorer and start debugging.
+    // NOTE: You can use the "Rename" command on the "Refactor" menu to change the 
+    //       class name "Service" in code, svc and config file together.
+    // NOTE: In order to launch WCF Test Client for testing this service, please select 
+    //       Service.svc or Service.svc.cs at the Solution Explorer and start debugging.
     public class Service : IService
     {
 
@@ -19,7 +21,7 @@ namespace EHEC_Server
         Origin dataaccess_origin = new Origin();
         Origin_Exam dataaccess_origin_exam = new Origin_Exam();
         Exam dataaccess_exam = new Exam();
-        private readonly string ping = "pong";
+        
 
         public List<Doctor> GetDoctors()
         {
@@ -63,6 +65,7 @@ namespace EHEC_Server
             return dataaccess_result.CreateResult(result);
         }
 
+        private readonly string ping = "pong";
         public string Ping()
         {
             return ping;
diff --git a/EHEC_Server/EHEC_Server/cluster.aspx b/EHEC_Server/EHEC_Server/cluster.aspx
index f36fa58..72e172f 100644
--- a/EHEC_Server/EHEC_Server/cluster.aspx
+++ b/EHEC_Server/EHEC_Server/cluster.aspx
@@ -7,17 +7,17 @@
     <title>CS-EHEC-II</title>
     <%--<script src="https://d3js.org/d3.v4.min.js"></script>--%>
     <%--<script src="http://cdn.graphalchemist.com/alchemy.min.js"></script>--%>
-    <link rel="stylesheet" type="text/css" href="alchemy/alchemy.css" />
-    <link rel="stylesheet" type="text/css" href="alchemy/styles/vendor.css" />
-    <link rel="stylesheet" type="text/css" href="bootstrap/css/bootstrap.css" />
-    <script type="text/javascript" src="jquery/jquery-3.3.1.min.js"></script>
-    <script type="text/javascript" src="lodash/lodash.js"></script>
-    <script type="text/javascript" src="bootstrap/js/bootstrap.bundle.js"></script>
-    <%--<script type="text/javascript" src="d3/d3.min.js"></script>--%>
-    <script type="text/javascript" src="d3/d3.js"></script>
-    <script type="text/javascript" src="alchemy/alchemy.js"></script>
-    <%--<script type="text/javascript" src="alchemy/alchemy.min.js"></script>--%>
-    <script type="text/javascript" src="alchemy/scripts/vendor.js"></script>
+    <link rel="stylesheet" type="text/css" href="cluster_dependencies/alchemy/alchemy.css" />
+    <link rel="stylesheet" type="text/css" href="cluster_dependencies/alchemy/styles/vendor.css" />
+    <link rel="stylesheet" type="text/css" href="cluster_dependencies/bootstrap/css/bootstrap.css" />
+    <script type="text/javascript" src="cluster_dependencies/jquery/jquery-3.3.1.min.js"></script>
+    <script type="text/javascript" src="cluster_dependencies/lodash/lodash.js"></script>
+    <script type="text/javascript" src="cluster_dependencies/bootstrap/js/bootstrap.bundle.js"></script>
+    <%--<script type="text/javascript" src="cluster_dependencies/d3/d3.min.js"></script>--%>
+    <script type="text/javascript" src="cluster_dependencies/d3/d3.js"></script>
+    <script type="text/javascript" src="cluster_dependencies/alchemy/alchemy.js"></script>
+    <%--<script type="text/javascript" src="cluster_dependencies/alchemy/alchemy.min.js"></script>--%>
+    <script type="text/javascript" src="cluster_dependencies/alchemy/scripts/vendor.js"></script>
     
 </head>
 <body>
@@ -29,24 +29,25 @@
     <div class="alchemy" id="alchemy"></div>
 
     <script type="text/javascript">
-      var config = {
-        dataSource: "alchemy/testdata/presocratics.json", 
-        cluster: true, 
-        clusterColours: ["#DD79FF", "#00FF30", "#5168FF", "#f83f00", "#ff8d8f"],
-        forceLocked: false,
-        nodeCaption: "title", 
-        edgeCaption: "relatedness",
-        nodeCaptionsOnByDefault: true,
-        nodeTypes: {"type":["philosopher"]},
-        directedEdges:true,
-        nodeStyle: {
-            "philosopher": {
-                "radius": 15
-            }
-        }, 
-        initialScale: 0.5, 
-        initialTranslate: [250,150]
-      }
+        var config = {
+            dataSource: 'cluster_dependencies/alchemy/testdata/contrib.json',
+            forceLocked: true,
+            graphHeight: function(){ return 800; },
+            graphWidth: function(){ return 800; },      
+            linkDistance: function(){ return 50; },
+            nodeTypes: {
+                "node_type": [
+                    "Maintainer",
+                    "Contributor",
+                    "none"
+                ]
+            },
+            nodeMouseOver: 'fun_fact',
+            //nodeCaption: function(node){ 
+            //    return node.caption + " _ " + node.fun_fact;
+            //}
+            
+        };
 
         alchemy = new Alchemy(config)
     </script>
diff --git a/EHEC_Server/EHEC_Server/cluster_dependencies/Blueprint.json b/EHEC_Server/EHEC_Server/cluster_dependencies/Blueprint.json
new file mode 100644
index 0000000..faf7a5d
--- /dev/null
+++ b/EHEC_Server/EHEC_Server/cluster_dependencies/Blueprint.json
@@ -0,0 +1,32 @@
+{
+  "comment": "EHEC Casestudy for TI6-IBZ-AR",
+  "nodes": [
+    {
+      "id": 1,
+      "nodetype": "person",
+      "name": "name"
+    },
+    {
+      "id": 2,
+      "nodetype": "result",
+      "name": "bakterie"
+    },
+    {
+      "id": 3,
+      "nodetype": "origin",
+      "name": "ort"
+    }
+  ],
+  "edges": [
+    {
+      "source": 1,
+      "target": 2,
+      "edgetype": "angesteckt mit "
+    },
+    {
+      "source": 1,
+      "target": 3,
+      "edgetype": "angesteckt in "
+    }
+  ]
+}
\ No newline at end of file
diff --git a/EHEC_Server/EHEC_Server/cluster_dependencies/ClusterConverter.cs b/EHEC_Server/EHEC_Server/cluster_dependencies/ClusterConverter.cs
new file mode 100644
index 0000000..4f295dd
--- /dev/null
+++ b/EHEC_Server/EHEC_Server/cluster_dependencies/ClusterConverter.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using EHEC_Server;
+
+namespace EHEC_Server
+{
+    public class ClusterConverter
+    {
+        public void WriteJson()
+        {
+            var json = JsonConverter.Serialize(GetCompanyObject());
+            System.IO.File.WriteAllText(@"C:\Users\Public\Documents\Company.json", json);
+        }
+        private List<ClusterPatient> GetClusterPatient()
+        {
+            return new List<ClusterPatient>();
+        }
+        
+
+        
+    }
+}
\ No newline at end of file
diff --git a/EHEC_Server/EHEC_Server/cluster_dependencies/JsonConverter.cs b/EHEC_Server/EHEC_Server/cluster_dependencies/JsonConverter.cs
new file mode 100644
index 0000000..57dab00
--- /dev/null
+++ b/EHEC_Server/EHEC_Server/cluster_dependencies/JsonConverter.cs
@@ -0,0 +1,140 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Web;
+using EHEC_Server;
+
+namespace EHEC_Server
+{
+    /// <summary>  
+    /// Class to convert object into json  
+    /// </summary>  
+    public class JsonConverter
+    { // https://www.c-sharpcorner.com/article/object-to-json-converter/
+        /// <summary>  
+        /// To Serialize a object  
+        /// </summary>  
+        /// <param name="obj">object for serialization</param>  
+        /// <returns>json string of object</returns>  
+        public static string Serialize(object obj)
+        {
+            ///// To parse base class object  
+            var json = ParsePreDefinedClassObject(obj);
+
+            ///// Null means it is not a base class object  
+            if (!string.IsNullOrEmpty(json))
+            {
+                return json;
+            }
+
+            //// For parsing user defined class object  
+            //// To get all properties of object  
+            //// and then store object properties and their value in dictionary container  
+            var objectDataContainer = obj.GetType().GetProperties().ToDictionary(i => i.Name, i => i.GetValue(obj));
+
+            StringBuilder jsonfile = new StringBuilder();
+            jsonfile.Append("{");
+            foreach (var data in objectDataContainer)
+            {
+                jsonfile.Append($"\"{data.Key}\":{Serialize(data.Value)},");
+            }
+
+            //// To remove last comma  
+            jsonfile.Remove(jsonfile.Length - 1, 1);
+            jsonfile.Append("}");
+            return jsonfile.ToString();
+        }
+
+        /// <summary>  
+        /// To Serialize C# Pre defined classes  
+        /// </summary>  
+        /// <param name="obj">object for serialization</param>  
+        /// <returns>json string of object</returns>  
+        private static string ParsePreDefinedClassObject(object obj)
+        {
+            if (obj is null)
+            {
+                return "null";
+            }
+            if (IsJsonValueType(obj))
+            {
+                return obj.ToString().ToLower();
+            }
+            else if (IsJsonStringType(obj))
+            {
+                return $"\"{obj.ToString()}\"";
+            }
+            else if (obj is IDictionary)
+            {
+                return SearlizeDictionaryObject((IDictionary)obj);
+            }
+            else if (obj is IList || obj is Array)
+            {
+                return SearlizeListObject((IEnumerable)obj);
+            }
+
+            return null;
+        }
+
+        /// <summary>  
+        /// To Serialize Dictionary type object  
+        /// </summary>  
+        /// <param name="obj">object for serialization</param>  
+        /// <returns>json string of object</returns>  
+        private static string SearlizeDictionaryObject(IDictionary dict)
+        {
+            StringBuilder jsonfile = new StringBuilder();
+            jsonfile.Append("{");
+            var keysAsJson = new List<string>();
+            var valuesAsJson = new List<string>();
+            foreach (var item in (IEnumerable)dict.Keys)
+            {
+                keysAsJson.Add(Serialize(item));
+            }
+            foreach (var item in (IEnumerable)dict.Values)
+            {
+                valuesAsJson.Add(Serialize(item));
+            }
+            for (int i = 0; i < dict.Count; i++)
+            {
+                ////To check whether data is under double quotes or not  
+                keysAsJson[i] = keysAsJson[i].Contains("\"") ? keysAsJson[i] : $"\"{keysAsJson[i]}\"";
+
+                jsonfile.Append($"{keysAsJson[i]}:{valuesAsJson[i]},");
+            }
+            jsonfile.Remove(jsonfile.Length - 1, 1);
+            jsonfile.Append("}");
+            return jsonfile.ToString();
+        }
+
+        /// <summary>  
+        /// To Serialize Enumerable (IList,Array..etc) type object  
+        /// </summary>  
+        /// <param name="obj">object for serialization</param>  
+        /// <returns>json string of object</returns>  
+        private static string SearlizeListObject(IEnumerable obj)
+        {
+            StringBuilder jsonfile = new StringBuilder();
+            jsonfile.Append("[");
+            foreach (var item in obj)
+            {
+                jsonfile.Append($"{Serialize(item)},");
+            }
+            jsonfile.Remove(jsonfile.Length - 1, 1);
+            jsonfile.Append("]");
+            return jsonfile.ToString();
+        }
+
+        private static bool IsJsonStringType(object obj)
+        {
+            return obj is string || obj is DateTime;
+        }
+
+        private static bool IsJsonValueType(object obj)
+        {
+            return obj.GetType().IsPrimitive;
+        }
+    }
+}
\ No newline at end of file
diff --git a/EHEC_Server/EHEC_Server/cluster_dependencies/JsonModel.cs b/EHEC_Server/EHEC_Server/cluster_dependencies/JsonModel.cs
new file mode 100644
index 0000000..b4b498f
--- /dev/null
+++ b/EHEC_Server/EHEC_Server/cluster_dependencies/JsonModel.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using Newtonsoft.Json;
+
+namespace EHEC_Server
+{
+    public class JsonModel
+    { 
+        public IList<JsonNodeModel> Node { get; set; } = new List<JsonNodeModel>();
+        public IList<JsonEdgesModel> Edge { get; set; } = new List<JsonEdgesModel>();
+    }
+    public class JsonNodeModel
+    {
+        public int Id { get; set; }
+        public string Nodetype { get; set; }
+        public string Name { get; set; }
+    }
+    public class JsonEdgesModel
+    {
+        public int Source { get; set; }
+        public int Target { get; set; }
+        public string EdgeType { get; set; }
+    }
+
+}
\ No newline at end of file
diff --git a/EHEC_Server/EHEC_Server/cluster_dependencies/Models/ClusterPatient.cs b/EHEC_Server/EHEC_Server/cluster_dependencies/Models/ClusterPatient.cs
new file mode 100644
index 0000000..1d44d65
--- /dev/null
+++ b/EHEC_Server/EHEC_Server/cluster_dependencies/Models/ClusterPatient.cs
@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace EHEC_Server
+{
+    
+    public class ClusterPatient
+    {
+        public List<Patient> Patients;
+        public List<ClusterPatient> ClusterPatients;
+        public int Id;
+        public string Name;
+
+        public List<ClusterPatient> GetPatients()
+        {
+            Patients = Global.GlobalInstance.DbAccess.Patients.ToList();
+
+            foreach (Patient element in Patients)
+            {
+                ClusterPatient clusterPatient = new ClusterPatient
+                {
+                    Id = element.PatientId,
+                    Name = element.FirstName + " " + element.LastName
+                };
+                ClusterPatients.Add(clusterPatient);
+            }
+            return ClusterPatients;
+        }
+                
+    }
+    
+}
\ No newline at end of file
diff --git a/EHEC_Server/EHEC_Server/cluster_dependencies/Models/ClusterResult.cs b/EHEC_Server/EHEC_Server/cluster_dependencies/Models/ClusterResult.cs
new file mode 100644
index 0000000..6654704
--- /dev/null
+++ b/EHEC_Server/EHEC_Server/cluster_dependencies/Models/ClusterResult.cs
@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace EHEC_Server
+{
+    public class ClusterResult
+    {
+        public List<Result> result = new List<Result>();
+        public int Id { get; set; }
+        public string Name { get; set; }
+
+        public ClusterResult() { }
+        public ClusterResult(int id, string name)
+        {
+            Id = id;
+            Name = name;
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/EHEC_Server/EHEC_Server/alchemy/alchemy-white.css b/EHEC_Server/EHEC_Server/cluster_dependencies/alchemy/alchemy-white.css
similarity index 100%
rename from EHEC_Server/EHEC_Server/alchemy/alchemy-white.css
rename to EHEC_Server/EHEC_Server/cluster_dependencies/alchemy/alchemy-white.css
diff --git a/EHEC_Server/EHEC_Server/alchemy/alchemy.css b/EHEC_Server/EHEC_Server/cluster_dependencies/alchemy/alchemy.css
similarity index 100%
rename from EHEC_Server/EHEC_Server/alchemy/alchemy.css
rename to EHEC_Server/EHEC_Server/cluster_dependencies/alchemy/alchemy.css
diff --git a/EHEC_Server/EHEC_Server/alchemy/alchemy.js b/EHEC_Server/EHEC_Server/cluster_dependencies/alchemy/alchemy.js
similarity index 100%
rename from EHEC_Server/EHEC_Server/alchemy/alchemy.js
rename to EHEC_Server/EHEC_Server/cluster_dependencies/alchemy/alchemy.js
diff --git a/EHEC_Server/EHEC_Server/alchemy/alchemy.min.css b/EHEC_Server/EHEC_Server/cluster_dependencies/alchemy/alchemy.min.css
similarity index 100%
rename from EHEC_Server/EHEC_Server/alchemy/alchemy.min.css
rename to EHEC_Server/EHEC_Server/cluster_dependencies/alchemy/alchemy.min.css
diff --git a/EHEC_Server/EHEC_Server/alchemy/alchemy.min.js b/EHEC_Server/EHEC_Server/cluster_dependencies/alchemy/alchemy.min.js
similarity index 100%
rename from EHEC_Server/EHEC_Server/alchemy/alchemy.min.js
rename to EHEC_Server/EHEC_Server/cluster_dependencies/alchemy/alchemy.min.js
diff --git a/EHEC_Server/EHEC_Server/alchemy/scripts/vendor.js b/EHEC_Server/EHEC_Server/cluster_dependencies/alchemy/scripts/vendor.js
similarity index 100%
rename from EHEC_Server/EHEC_Server/alchemy/scripts/vendor.js
rename to EHEC_Server/EHEC_Server/cluster_dependencies/alchemy/scripts/vendor.js
diff --git a/EHEC_Server/EHEC_Server/alchemy/styles/fonts/FontAwesome.otf b/EHEC_Server/EHEC_Server/cluster_dependencies/alchemy/styles/fonts/FontAwesome.otf
similarity index 100%
rename from EHEC_Server/EHEC_Server/alchemy/styles/fonts/FontAwesome.otf
rename to EHEC_Server/EHEC_Server/cluster_dependencies/alchemy/styles/fonts/FontAwesome.otf
diff --git a/EHEC_Server/EHEC_Server/alchemy/styles/fonts/fontawesome-webfont.eot b/EHEC_Server/EHEC_Server/cluster_dependencies/alchemy/styles/fonts/fontawesome-webfont.eot
similarity index 100%
rename from EHEC_Server/EHEC_Server/alchemy/styles/fonts/fontawesome-webfont.eot
rename to EHEC_Server/EHEC_Server/cluster_dependencies/alchemy/styles/fonts/fontawesome-webfont.eot
diff --git a/EHEC_Server/EHEC_Server/alchemy/styles/fonts/fontawesome-webfont.svg b/EHEC_Server/EHEC_Server/cluster_dependencies/alchemy/styles/fonts/fontawesome-webfont.svg
similarity index 100%
rename from EHEC_Server/EHEC_Server/alchemy/styles/fonts/fontawesome-webfont.svg
rename to EHEC_Server/EHEC_Server/cluster_dependencies/alchemy/styles/fonts/fontawesome-webfont.svg
diff --git a/EHEC_Server/EHEC_Server/alchemy/styles/fonts/fontawesome-webfont.ttf b/EHEC_Server/EHEC_Server/cluster_dependencies/alchemy/styles/fonts/fontawesome-webfont.ttf
similarity index 100%
rename from EHEC_Server/EHEC_Server/alchemy/styles/fonts/fontawesome-webfont.ttf
rename to EHEC_Server/EHEC_Server/cluster_dependencies/alchemy/styles/fonts/fontawesome-webfont.ttf
diff --git a/EHEC_Server/EHEC_Server/alchemy/styles/fonts/fontawesome-webfont.woff b/EHEC_Server/EHEC_Server/cluster_dependencies/alchemy/styles/fonts/fontawesome-webfont.woff
similarity index 100%
rename from EHEC_Server/EHEC_Server/alchemy/styles/fonts/fontawesome-webfont.woff
rename to EHEC_Server/EHEC_Server/cluster_dependencies/alchemy/styles/fonts/fontawesome-webfont.woff
diff --git a/EHEC_Server/EHEC_Server/alchemy/styles/images/maze-black.png b/EHEC_Server/EHEC_Server/cluster_dependencies/alchemy/styles/images/maze-black.png
similarity index 100%
rename from EHEC_Server/EHEC_Server/alchemy/styles/images/maze-black.png
rename to EHEC_Server/EHEC_Server/cluster_dependencies/alchemy/styles/images/maze-black.png
diff --git a/EHEC_Server/EHEC_Server/alchemy/styles/vendor.css b/EHEC_Server/EHEC_Server/cluster_dependencies/alchemy/styles/vendor.css
similarity index 100%
rename from EHEC_Server/EHEC_Server/alchemy/styles/vendor.css
rename to EHEC_Server/EHEC_Server/cluster_dependencies/alchemy/styles/vendor.css
diff --git a/EHEC_Server/EHEC_Server/alchemy/testdata/actors.json b/EHEC_Server/EHEC_Server/cluster_dependencies/alchemy/testdata/actors.json
similarity index 100%
rename from EHEC_Server/EHEC_Server/alchemy/testdata/actors.json
rename to EHEC_Server/EHEC_Server/cluster_dependencies/alchemy/testdata/actors.json
diff --git a/EHEC_Server/EHEC_Server/alchemy/testdata/charlize.json b/EHEC_Server/EHEC_Server/cluster_dependencies/alchemy/testdata/charlize.json
similarity index 100%
rename from EHEC_Server/EHEC_Server/alchemy/testdata/charlize.json
rename to EHEC_Server/EHEC_Server/cluster_dependencies/alchemy/testdata/charlize.json
diff --git a/EHEC_Server/EHEC_Server/cluster_dependencies/alchemy/testdata/contrib.json b/EHEC_Server/EHEC_Server/cluster_dependencies/alchemy/testdata/contrib.json
new file mode 100644
index 0000000..cc8eb3b
--- /dev/null
+++ b/EHEC_Server/EHEC_Server/cluster_dependencies/alchemy/testdata/contrib.json
@@ -0,0 +1,88 @@
+{
+  "comment": "AlchemyJS contributors",
+  "nodes": [
+    {
+      "id": 0,
+      "caption": "AlchemyJS",
+      "role": "project",
+      "fun_fact": "built almost entirely in D3",
+      "root": true
+    },
+    {
+      "id": 1,
+      "caption": "Huston Hedinger",
+      "github": "hustonhedinger",
+      "role": "Maintainer",
+      "fun_fact": "hooligan"
+    },
+    {
+      "id": 2,
+      "caption": "Grace Andrews",
+      "github": "Grace-Andrews",
+      "role": "Maintainer",
+      "fun_fact": "was born left handed, now right handed."
+    },
+    {
+      "id": 3,
+      "caption": "Isabella Jorissen",
+      "github": "ifjorissen",
+      "role": "Maintainer",
+      "fun_fact": "knows a lot of digits of pi. Also loves pie."
+    },
+    {
+      "id": 4,
+      "caption": "Matt Cox",
+      "github": "MDCox",
+      "role": "Maintainer",
+      "fun_fact": "is not fun"
+    },
+    {
+      "id": 5,
+      "caption": "Dave Torbeck",
+      "github": "DaveTorbeck",
+      "role": "Contributor",
+      "fun_fact": ""
+    },
+    {
+      "id": 6,
+      "caption": "Ivan Hörler",
+      "github": "novski",
+      "role": "none",
+      "fun_fact": "does code...",
+      "additional_property":  "one two thre, hwo pwo!"
+    }
+
+  ],
+  "edges": [
+    {
+      "source": 1,
+      "target": 0,
+      "caption": "Maintains"
+    },
+    {
+      "source": 2,
+      "target": 1,
+      "caption": "Maintains"
+    },
+    {
+      "source": 3,
+      "target": 0,
+      "caption": "Maintains"
+    },
+    {
+      "source": 4,
+      "target": 0,
+      "caption": "Often Breaks"
+    },
+    {
+      "source": 5,
+      "target": 0,
+      "caption": "contributes"
+    },
+    {
+      "source": 6,
+      "target": 0,
+      "caption": "does nothing"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/EHEC_Server/EHEC_Server/alchemy/testdata/presocratics.json b/EHEC_Server/EHEC_Server/cluster_dependencies/alchemy/testdata/presocratics.json
similarity index 100%
rename from EHEC_Server/EHEC_Server/alchemy/testdata/presocratics.json
rename to EHEC_Server/EHEC_Server/cluster_dependencies/alchemy/testdata/presocratics.json
diff --git a/EHEC_Server/EHEC_Server/bootstrap/css/bootstrap-grid.css b/EHEC_Server/EHEC_Server/cluster_dependencies/bootstrap/css/bootstrap-grid.css
similarity index 100%
rename from EHEC_Server/EHEC_Server/bootstrap/css/bootstrap-grid.css
rename to EHEC_Server/EHEC_Server/cluster_dependencies/bootstrap/css/bootstrap-grid.css
diff --git a/EHEC_Server/EHEC_Server/bootstrap/css/bootstrap-grid.css.map b/EHEC_Server/EHEC_Server/cluster_dependencies/bootstrap/css/bootstrap-grid.css.map
similarity index 100%
rename from EHEC_Server/EHEC_Server/bootstrap/css/bootstrap-grid.css.map
rename to EHEC_Server/EHEC_Server/cluster_dependencies/bootstrap/css/bootstrap-grid.css.map
diff --git a/EHEC_Server/EHEC_Server/bootstrap/css/bootstrap-grid.min.css b/EHEC_Server/EHEC_Server/cluster_dependencies/bootstrap/css/bootstrap-grid.min.css
similarity index 100%
rename from EHEC_Server/EHEC_Server/bootstrap/css/bootstrap-grid.min.css
rename to EHEC_Server/EHEC_Server/cluster_dependencies/bootstrap/css/bootstrap-grid.min.css
diff --git a/EHEC_Server/EHEC_Server/bootstrap/css/bootstrap-grid.min.css.map b/EHEC_Server/EHEC_Server/cluster_dependencies/bootstrap/css/bootstrap-grid.min.css.map
similarity index 100%
rename from EHEC_Server/EHEC_Server/bootstrap/css/bootstrap-grid.min.css.map
rename to EHEC_Server/EHEC_Server/cluster_dependencies/bootstrap/css/bootstrap-grid.min.css.map
diff --git a/EHEC_Server/EHEC_Server/bootstrap/css/bootstrap-reboot.css b/EHEC_Server/EHEC_Server/cluster_dependencies/bootstrap/css/bootstrap-reboot.css
similarity index 100%
rename from EHEC_Server/EHEC_Server/bootstrap/css/bootstrap-reboot.css
rename to EHEC_Server/EHEC_Server/cluster_dependencies/bootstrap/css/bootstrap-reboot.css
diff --git a/EHEC_Server/EHEC_Server/bootstrap/css/bootstrap-reboot.css.map b/EHEC_Server/EHEC_Server/cluster_dependencies/bootstrap/css/bootstrap-reboot.css.map
similarity index 100%
rename from EHEC_Server/EHEC_Server/bootstrap/css/bootstrap-reboot.css.map
rename to EHEC_Server/EHEC_Server/cluster_dependencies/bootstrap/css/bootstrap-reboot.css.map
diff --git a/EHEC_Server/EHEC_Server/bootstrap/css/bootstrap-reboot.min.css b/EHEC_Server/EHEC_Server/cluster_dependencies/bootstrap/css/bootstrap-reboot.min.css
similarity index 100%
rename from EHEC_Server/EHEC_Server/bootstrap/css/bootstrap-reboot.min.css
rename to EHEC_Server/EHEC_Server/cluster_dependencies/bootstrap/css/bootstrap-reboot.min.css
diff --git a/EHEC_Server/EHEC_Server/bootstrap/css/bootstrap-reboot.min.css.map b/EHEC_Server/EHEC_Server/cluster_dependencies/bootstrap/css/bootstrap-reboot.min.css.map
similarity index 100%
rename from EHEC_Server/EHEC_Server/bootstrap/css/bootstrap-reboot.min.css.map
rename to EHEC_Server/EHEC_Server/cluster_dependencies/bootstrap/css/bootstrap-reboot.min.css.map
diff --git a/EHEC_Server/EHEC_Server/bootstrap/css/bootstrap.css b/EHEC_Server/EHEC_Server/cluster_dependencies/bootstrap/css/bootstrap.css
similarity index 100%
rename from EHEC_Server/EHEC_Server/bootstrap/css/bootstrap.css
rename to EHEC_Server/EHEC_Server/cluster_dependencies/bootstrap/css/bootstrap.css
diff --git a/EHEC_Server/EHEC_Server/bootstrap/css/bootstrap.css.map b/EHEC_Server/EHEC_Server/cluster_dependencies/bootstrap/css/bootstrap.css.map
similarity index 100%
rename from EHEC_Server/EHEC_Server/bootstrap/css/bootstrap.css.map
rename to EHEC_Server/EHEC_Server/cluster_dependencies/bootstrap/css/bootstrap.css.map
diff --git a/EHEC_Server/EHEC_Server/bootstrap/css/bootstrap.min.css b/EHEC_Server/EHEC_Server/cluster_dependencies/bootstrap/css/bootstrap.min.css
similarity index 100%
rename from EHEC_Server/EHEC_Server/bootstrap/css/bootstrap.min.css
rename to EHEC_Server/EHEC_Server/cluster_dependencies/bootstrap/css/bootstrap.min.css
diff --git a/EHEC_Server/EHEC_Server/bootstrap/css/bootstrap.min.css.map b/EHEC_Server/EHEC_Server/cluster_dependencies/bootstrap/css/bootstrap.min.css.map
similarity index 100%
rename from EHEC_Server/EHEC_Server/bootstrap/css/bootstrap.min.css.map
rename to EHEC_Server/EHEC_Server/cluster_dependencies/bootstrap/css/bootstrap.min.css.map
diff --git a/EHEC_Server/EHEC_Server/bootstrap/js/bootstrap.bundle.js b/EHEC_Server/EHEC_Server/cluster_dependencies/bootstrap/js/bootstrap.bundle.js
similarity index 100%
rename from EHEC_Server/EHEC_Server/bootstrap/js/bootstrap.bundle.js
rename to EHEC_Server/EHEC_Server/cluster_dependencies/bootstrap/js/bootstrap.bundle.js
diff --git a/EHEC_Server/EHEC_Server/bootstrap/js/bootstrap.bundle.js.map b/EHEC_Server/EHEC_Server/cluster_dependencies/bootstrap/js/bootstrap.bundle.js.map
similarity index 100%
rename from EHEC_Server/EHEC_Server/bootstrap/js/bootstrap.bundle.js.map
rename to EHEC_Server/EHEC_Server/cluster_dependencies/bootstrap/js/bootstrap.bundle.js.map
diff --git a/EHEC_Server/EHEC_Server/bootstrap/js/bootstrap.bundle.min.js b/EHEC_Server/EHEC_Server/cluster_dependencies/bootstrap/js/bootstrap.bundle.min.js
similarity index 100%
rename from EHEC_Server/EHEC_Server/bootstrap/js/bootstrap.bundle.min.js
rename to EHEC_Server/EHEC_Server/cluster_dependencies/bootstrap/js/bootstrap.bundle.min.js
diff --git a/EHEC_Server/EHEC_Server/bootstrap/js/bootstrap.bundle.min.js.map b/EHEC_Server/EHEC_Server/cluster_dependencies/bootstrap/js/bootstrap.bundle.min.js.map
similarity index 100%
rename from EHEC_Server/EHEC_Server/bootstrap/js/bootstrap.bundle.min.js.map
rename to EHEC_Server/EHEC_Server/cluster_dependencies/bootstrap/js/bootstrap.bundle.min.js.map
diff --git a/EHEC_Server/EHEC_Server/bootstrap/js/bootstrap.js b/EHEC_Server/EHEC_Server/cluster_dependencies/bootstrap/js/bootstrap.js
similarity index 100%
rename from EHEC_Server/EHEC_Server/bootstrap/js/bootstrap.js
rename to EHEC_Server/EHEC_Server/cluster_dependencies/bootstrap/js/bootstrap.js
diff --git a/EHEC_Server/EHEC_Server/bootstrap/js/bootstrap.js.map b/EHEC_Server/EHEC_Server/cluster_dependencies/bootstrap/js/bootstrap.js.map
similarity index 100%
rename from EHEC_Server/EHEC_Server/bootstrap/js/bootstrap.js.map
rename to EHEC_Server/EHEC_Server/cluster_dependencies/bootstrap/js/bootstrap.js.map
diff --git a/EHEC_Server/EHEC_Server/bootstrap/js/bootstrap.min.js b/EHEC_Server/EHEC_Server/cluster_dependencies/bootstrap/js/bootstrap.min.js
similarity index 100%
rename from EHEC_Server/EHEC_Server/bootstrap/js/bootstrap.min.js
rename to EHEC_Server/EHEC_Server/cluster_dependencies/bootstrap/js/bootstrap.min.js
diff --git a/EHEC_Server/EHEC_Server/bootstrap/js/bootstrap.min.js.map b/EHEC_Server/EHEC_Server/cluster_dependencies/bootstrap/js/bootstrap.min.js.map
similarity index 100%
rename from EHEC_Server/EHEC_Server/bootstrap/js/bootstrap.min.js.map
rename to EHEC_Server/EHEC_Server/cluster_dependencies/bootstrap/js/bootstrap.min.js.map
diff --git a/EHEC_Server/EHEC_Server/d3/API.md b/EHEC_Server/EHEC_Server/cluster_dependencies/d3/API.md
similarity index 100%
rename from EHEC_Server/EHEC_Server/d3/API.md
rename to EHEC_Server/EHEC_Server/cluster_dependencies/d3/API.md
diff --git a/EHEC_Server/EHEC_Server/d3/CHANGES.md b/EHEC_Server/EHEC_Server/cluster_dependencies/d3/CHANGES.md
similarity index 100%
rename from EHEC_Server/EHEC_Server/d3/CHANGES.md
rename to EHEC_Server/EHEC_Server/cluster_dependencies/d3/CHANGES.md
diff --git a/EHEC_Server/EHEC_Server/d3/LICENSE b/EHEC_Server/EHEC_Server/cluster_dependencies/d3/LICENSE
similarity index 100%
rename from EHEC_Server/EHEC_Server/d3/LICENSE
rename to EHEC_Server/EHEC_Server/cluster_dependencies/d3/LICENSE
diff --git a/EHEC_Server/EHEC_Server/d3/README.md b/EHEC_Server/EHEC_Server/cluster_dependencies/d3/README.md
similarity index 100%
rename from EHEC_Server/EHEC_Server/d3/README.md
rename to EHEC_Server/EHEC_Server/cluster_dependencies/d3/README.md
diff --git a/EHEC_Server/EHEC_Server/d3/d3.js b/EHEC_Server/EHEC_Server/cluster_dependencies/d3/d3.js
similarity index 100%
rename from EHEC_Server/EHEC_Server/d3/d3.js
rename to EHEC_Server/EHEC_Server/cluster_dependencies/d3/d3.js
diff --git a/EHEC_Server/EHEC_Server/d3/d3.min.js b/EHEC_Server/EHEC_Server/cluster_dependencies/d3/d3.min.js
similarity index 100%
rename from EHEC_Server/EHEC_Server/d3/d3.min.js
rename to EHEC_Server/EHEC_Server/cluster_dependencies/d3/d3.min.js
diff --git a/EHEC_Server/EHEC_Server/jquery/jquery-3.3.1.min.js b/EHEC_Server/EHEC_Server/cluster_dependencies/jquery/jquery-3.3.1.min.js
similarity index 100%
rename from EHEC_Server/EHEC_Server/jquery/jquery-3.3.1.min.js
rename to EHEC_Server/EHEC_Server/cluster_dependencies/jquery/jquery-3.3.1.min.js
diff --git a/EHEC_Server/EHEC_Server/lodash/lodash.js b/EHEC_Server/EHEC_Server/cluster_dependencies/lodash/lodash.js
similarity index 100%
rename from EHEC_Server/EHEC_Server/lodash/lodash.js
rename to EHEC_Server/EHEC_Server/cluster_dependencies/lodash/lodash.js
diff --git a/EHEC_Server/EHEC_Server/packages.config b/EHEC_Server/EHEC_Server/packages.config
index 243fd05..418c7cb 100644
--- a/EHEC_Server/EHEC_Server/packages.config
+++ b/EHEC_Server/EHEC_Server/packages.config
@@ -3,4 +3,5 @@
   <package id="EntityFramework" version="6.1.3" targetFramework="net461" />
   <package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="1.0.8" targetFramework="net461" />
   <package id="Microsoft.Net.Compilers" version="2.4.0" targetFramework="net461" developmentDependency="true" />
+  <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net461" />
 </packages>
\ No newline at end of file
diff --git a/EHEC_Server/UnitTestProject1/Properties/AssemblyInfo.cs b/EHEC_Server/UnitTestProject1/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..3ed0918
--- /dev/null
+++ b/EHEC_Server/UnitTestProject1/Properties/AssemblyInfo.cs
@@ -0,0 +1,20 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+[assembly: AssemblyTitle("UnitTestProject1")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("UnitTestProject1")]
+[assembly: AssemblyCopyright("Copyright ©  2018")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+[assembly: ComVisible(false)]
+
+[assembly: Guid("fa6173e8-f454-4582-aa0d-dee40126cae3")]
+
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/EHEC_Server/UnitTestProject1/UnitTest1.cs b/EHEC_Server/UnitTestProject1/UnitTest1.cs
new file mode 100644
index 0000000..fb2a2d4
--- /dev/null
+++ b/EHEC_Server/UnitTestProject1/UnitTest1.cs
@@ -0,0 +1,70 @@
+using System;
+using System.Collections.Generic;
+using JsonConverterTest;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+
+namespace JsonConverterTest
+{
+    [TestClass]
+    public class UnitTest1
+    {
+        /// <summary>  
+        /// To Get a instance of object Company  
+        /// </summary>  
+        /// <returns>instance of company</returns>  
+        private Comapany GetCompanyObject()
+        {
+            return new Comapany
+            {
+                Name = "CSG Solutions India Pvt Ltd",
+                TotalEmployee = 50,
+                Established = DateTime.Now,
+                IsGovtOrganisation = false,
+                TotalAsset = 20000000,
+                Branches = new List<Branch>
+            {
+                new Branch
+                {
+                    Country = "India",
+                    State = "Karnataka",
+                    Address = new Location
+                    {
+                        BuildingName = "Sri Hari Tower",
+                        Street = "2nd Main Road",
+                        ZipCode = 560016
+                    }
+                },
+                new Branch
+                {
+                    Country = "USA",
+                    State = "Germantown",
+                    Address = new Location
+                    {
+                        BuildingName = "Zinc Tower",
+                        Street = "Germantown Road",
+                        ZipCode = 50001
+                    }
+                }
+            },
+                Departments = new Dictionary<string, Department>
+            {
+                { "Engineering", new Department { DeptId = 001, DeptName = "Super Engineers" } },
+                { "Support", new Department { DeptId = 002, DeptName = "24*7 Tech Support" } },
+                { "Marketings", new Department { DeptId = 003, DeptName = "Tech Mavens" } }
+            },
+                Management = new Management { CEO = "Tarun Kumar Rajak", Founder = "Ashok Kisku" }
+            };
+        }
+
+        /// <summary>  
+        /// To Test Serialize functionality  
+        /// </summary>  
+        [TestMethod]
+        public void TestMethod1()
+        {
+            var json = JsonConverter.Serialize(GetCompanyObject());
+            System.IO.File.WriteAllText(@"C:\Users\Public\Documents\Company.json", json);
+        }
+    }
+}
diff --git a/EHEC_Server/UnitTestProject1/UnitTestProject1.csproj b/EHEC_Server/UnitTestProject1/UnitTestProject1.csproj
new file mode 100644
index 0000000..8655c91
--- /dev/null
+++ b/EHEC_Server/UnitTestProject1/UnitTestProject1.csproj
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\MSTest.TestAdapter.1.2.1\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.1.2.1\build\net45\MSTest.TestAdapter.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{FA6173E8-F454-4582-AA0D-DEE40126CAE3}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>UnitTestProject1</RootNamespace>
+    <AssemblyName>UnitTestProject1</AssemblyName>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">15.0</VisualStudioVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
+    <IsCodedUITest>False</IsCodedUITest>
+    <TestProjectType>UnitTest</TestProjectType>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <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' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\MSTest.TestFramework.1.2.1\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\MSTest.TestFramework.1.2.1\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="UnitTest1.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.1.2.1\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.1.2.1\build\net45\MSTest.TestAdapter.props'))" />
+    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.1.2.1\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.1.2.1\build\net45\MSTest.TestAdapter.targets'))" />
+  </Target>
+  <Import Project="..\packages\MSTest.TestAdapter.1.2.1\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\packages\MSTest.TestAdapter.1.2.1\build\net45\MSTest.TestAdapter.targets')" />
+</Project>
\ No newline at end of file
diff --git a/EHEC_Server/UnitTestProject1/packages.config b/EHEC_Server/UnitTestProject1/packages.config
new file mode 100644
index 0000000..091ce8d
--- /dev/null
+++ b/EHEC_Server/UnitTestProject1/packages.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="MSTest.TestAdapter" version="1.2.1" targetFramework="net462" />
+  <package id="MSTest.TestFramework" version="1.2.1" targetFramework="net462" />
+</packages>
\ No newline at end of file
diff --git a/SQL/Development-Querys.sql b/SQL/Development-Querys.sql
index a2e821b94bf8d258c66ef8f57c0f3180c68f204f..2e59bee629cc105370183c7c0dbbaf715cb6a070 100644
GIT binary patch
delta 16
VcmZ3&x`uVb5+)8_1}+8=1^^`30_Ok#

delta 7
OcmZ3(x`cJZ5+(o(djhcl