diff --git a/EHEC_Server/EHEC_Server/cluster_dependencies/ClusterConverter.cs b/EHEC_Server/EHEC_Server/cluster_dependencies/ClusterConverter.cs index 3a55b13..e2b023f 100644 --- a/EHEC_Server/EHEC_Server/cluster_dependencies/ClusterConverter.cs +++ b/EHEC_Server/EHEC_Server/cluster_dependencies/ClusterConverter.cs @@ -10,11 +10,12 @@ namespace EHEC_Server { public void WriteJson() { - ClusterPatient clusterp = new ClusterPatient(); - List clusterPatientList = new List(); - clusterPatientList = clusterp.GetClusterPatients(); + ClusterPatient p = new ClusterPatient(); + List clusterPatientsList = new List(); + clusterPatientsList = p.GetClusterPatients(); + //clusterPatient = - var json = JsonConverter.Serialize(clusterPatientList); + var json = JsonConverter.Serialize(clusterPatientsList); System.IO.File.WriteAllText(@"C:\Users\novski\Desktop\cluster.json", json); } private List GetCluster() diff --git a/EHEC_Server/EHEC_Server/cluster_dependencies/Models/ClusterPatient.cs b/EHEC_Server/EHEC_Server/cluster_dependencies/Models/ClusterPatient.cs index 7bc0496..88cb040 100644 --- a/EHEC_Server/EHEC_Server/cluster_dependencies/Models/ClusterPatient.cs +++ b/EHEC_Server/EHEC_Server/cluster_dependencies/Models/ClusterPatient.cs @@ -8,28 +8,33 @@ namespace EHEC_Server public class ClusterPatient { - public List Patients { get; set; } - public List ClusterPatients { get; set; } - public int Id { get; set; } - public string Name { get; set; } + private int Id { get; set; } + private string Name { get; set; } + private string Nodetype { get; set; } + + public ClusterPatient() { } public List GetClusterPatients() { - Patient p = new Patient(); - Patients = p.GetAllPatients(); + Patient patient = new Patient(); + List patients = new List(); + patients = patient.GetAllPatients(); + List ClusterPatients = new List(); - foreach (Patient element in Patients) + foreach (Patient element in patients) { ClusterPatient clusterPatient = new ClusterPatient { Id = element.PatientId, + Nodetype = "patient", Name = element.FirstName + " " + element.LastName }; ClusterPatients.Add(clusterPatient); } return ClusterPatients; } - + + } } \ No newline at end of file