ibz
/
oop_II-6
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add lists to json and camelcase it to match json standards

This commit is contained in:
Ivan Hörler 2018-07-23 23:00:23 +02:00
parent 8cc003cc03
commit b00d0e937d
5 changed files with 38 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
EHEC_Server/EHEC_Server/EHEC_Server.csproj
View File

@ -166,11 +166,7 @@
</Compile> </Compile>
<Compile Include="cluster_dependencies\ClusterConverter.cs" /> <Compile Include="cluster_dependencies\ClusterConverter.cs" />
<Compile Include="cluster_dependencies\JsonConverter.cs" /> <Compile Include="cluster_dependencies\JsonConverter.cs" />
<Compile Include="cluster_dependencies\JsonModel.cs" /> <Compile Include="cluster_dependencies\Models\ClusterModel.cs" />
<Compile Include="cluster_dependencies\Models\Cluster.cs" />
<Compile Include="cluster_dependencies\Models\ClusterOrigin.cs" />
<Compile Include="cluster_dependencies\Models\ClusterPatient.cs" />
<Compile Include="cluster_dependencies\Models\ClusterResult.cs" />
<Compile Include="cluster_dependencies\Models\Edges.cs" /> <Compile Include="cluster_dependencies\Models\Edges.cs" />
<Compile Include="cluster_dependencies\Models\Nodes.cs" /> <Compile Include="cluster_dependencies\Models\Nodes.cs" />
<Compile Include="DatabaseAccess\Doctor.cs" /> <Compile Include="DatabaseAccess\Doctor.cs" />

7
EHEC_Server/EHEC_Server/cluster.aspx.cs
View File

@ -1,4 +1,5 @@
using System; using Newtonsoft.Json;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Web; using System.Web;
@ -13,11 +14,11 @@ namespace EHEC_Server
ClusterConverter cc = new ClusterConverter(); ClusterConverter cc = new ClusterConverter();
protected void Page_Load(object sender, EventArgs e) protected void Page_Load(object sender, EventArgs e)
{ {
Clusterdata = cc.WriteJson(); Clusterdata = JsonConvert.SerializeObject(cc.WriteJson());
} }
protected void Button1_Click(object sender, EventArgs e) protected void Button1_Click(object sender, EventArgs e)
{ {
Clusterdata = cc.WriteJson(); Clusterdata = JsonConvert.SerializeObject(cc.WriteJson());
} }
} }

34
EHEC_Server/EHEC_Server/cluster_dependencies/ClusterConverter.cs
View File

@ -4,42 +4,42 @@ using System.Linq;
using System.Web; using System.Web;
using EHEC_Server; using EHEC_Server;
using System.Web.Script.Serialization; using System.Web.Script.Serialization;
using Newtonsoft.Json;
using Newtonsoft.Json.Serialization;
using Newtonsoft.Json.Linq;
namespace EHEC_Server namespace EHEC_Server
{ {
public class ClusterConverter public class ClusterConverter
{ {
protected string Json { get; set; } protected string Json { get; set; }
public string WriteJson() public JObject WriteJson()
{ {
var Json = JsonConverter.Serialize(GetCluster()); var serializer = new JsonSerializer
{
ContractResolver = new CamelCasePropertyNamesContractResolver()
};
var Json = JObject.FromObject(GetCluster(), serializer);
//ClusterPatient p = new ClusterPatient(); //ClusterPatient p = new ClusterPatient();
//List<ClusterPatient> clusterPatientsList = new List<ClusterPatient>(); //List<ClusterPatient> clusterPatientsList = new List<ClusterPatient>();
//clusterPatientsList = p.GetClusterPatients(); //clusterPatientsList = p.GetClusterPatients();
//ClusterResult r = new ClusterResult(); //ClusterResult r = new ClusterResult();
//List<ClusterResult> clusterResultsList = new List<ClusterResult>(); //List<ClusterResult> clusterResultsList = new List<ClusterResult>();
//clusterResultsList = r.GetClusterResults(); //clusterResultsList = r.GetClusterResults();
System.IO.File.WriteAllText(@"C: \Users\novski\Desktop\cluster.json", Json); System.IO.File.WriteAllText(@"C: \Users\novski\Desktop\cluster.json", JsonConvert.SerializeObject(Json));
return Json; //= JsonConverter.Serialize(clusterPatientsList); return Json; //= JsonConverter.Serialize(clusterPatientsList);
} }
private Cluster GetCluster() private ClusterModel GetCluster()
{ {
return new Cluster Node node = new Node();
Edge edge = new Edge();
return new ClusterModel
{ {
Comment = "some comment", Comment = "some comment",
Nodes = new List<Node> Nodes = node.GetNodes(),
{ Edges = edge.GetEdges(),
new Node
{
Node get = new Node();
List <Node> xs = new List<Node>();
}
Nodes.add(getClusterPatients()) // irrgend sowas...
}
}; };
} }
} }

2
EHEC_Server/EHEC_Server/cluster_dependencies/Models/ClusterModel.cs
View File

@ -9,6 +9,6 @@ namespace EHEC_Server
{ {
public string Comment { get; set; } public string Comment { get; set; }
public List<Node> Nodes { get; set; } public List<Node> Nodes { get; set; }
public List<Edges> Edges { get; set; } public List<Edge> Edges { get; set; }
} }
} }

24
EHEC_Server/EHEC_Server/cluster_dependencies/Models/Edges.cs
View File

@ -5,22 +5,28 @@ using System.Web;
namespace EHEC_Server namespace EHEC_Server
{ {
public class Edges public class Edge
{ {
public int Source { get; set; } public int Source { get; set; }
public int Target { get; set; } public int Target { get; set; }
public string Edgetype { get; set; } public string Edgetype { get; set; }
public Edges() { } public Edge() { }
public List<Edge> GetEdges()
public List<Edges> GetClusterRelationsPatientsOrigins() {
List<Edge> X = new List<Edge>();
X.AddRange(GetClusterRelationsPatientsOrigins());
X.AddRange(GetClusterRelationsPatientsResults());
return X;
}
public List<Edge> GetClusterRelationsPatientsOrigins()
{ {
Exam exam = new Exam(); Exam exam = new Exam();
List<Exam> exams = new List<Exam>(); List<Exam> exams = new List<Exam>();
exams = exam.GetAllExams(); exams = exam.GetAllExams();
List<Edges> clusterEdges = new List<Edges>(); List<Edge> clusterEdges = new List<Edge>();
foreach (Exam element in exams) foreach (Exam element in exams)
{ {
Edges clusterEdge = new Edges Edge clusterEdge = new Edge
{ {
Edgetype = "Angesteckt in ", Edgetype = "Angesteckt in ",
Source = element.PatientId, Source = element.PatientId,
@ -30,15 +36,15 @@ namespace EHEC_Server
} }
return clusterEdges; return clusterEdges;
} }
public List<Edges> GetClusterRelationsPatientsResults() public List<Edge> GetClusterRelationsPatientsResults()
{ {
Exam exam = new Exam(); Exam exam = new Exam();
List<Exam> exams = new List<Exam>(); List<Exam> exams = new List<Exam>();
exams = exam.GetAllExams(); exams = exam.GetAllExams();
List<Edges> clusterEdges = new List<Edges>(); List<Edge> clusterEdges = new List<Edge>();
foreach (Exam element in exams) foreach (Exam element in exams)
{ {
Edges clusterEdge = new Edges Edge clusterEdge = new Edge
{ {
Edgetype = "Wurde Angesteckt mit ", Edgetype = "Wurde Angesteckt mit ",
Source = element.PatientId, Source = element.PatientId,