diff --git a/EHEC_Server/EHEC_Server/Global.asax.cs b/EHEC_Server/EHEC_Server/Global.asax.cs index 7dde78f..ca8ff25 100644 --- a/EHEC_Server/EHEC_Server/Global.asax.cs +++ b/EHEC_Server/EHEC_Server/Global.asax.cs @@ -58,9 +58,9 @@ namespace EHEC_Server //add patients - //using (EHEC_DBEntities ctx = new EHEC_DBEntities()) - //{ - Random p = new Random(); + using (EHEC_DBEntities ctx = new EHEC_DBEntities()) + { + Random p = new Random(); for (int i = 0; i < 10; i++) { Patient patient = new Patient @@ -72,14 +72,14 @@ namespace EHEC_Server City = Cities[p.Next(0, 7)].ToString(), Region = Regions[p.Next(0, 6)].ToString() }; - Global.GlobalInstance.DbAccess.Patients.Add(patient); - //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 d = new Random(); for (int i = 0; i < 10; i++) @@ -91,11 +91,11 @@ namespace EHEC_Server DoctorOrigin = DoctorOrigins[d.Next(0, 4)].ToString(), Region = Regions[d.Next(0, 6)].ToString() }; - Global.GlobalInstance.DbAccess.Doctors.Add(doctor); - //ctx.Doctors.Add(doctor); - //ctx.SaveChanges(); + //Global.GlobalInstance.DbAccess.Doctors.Add(doctor); + ctx.Doctors.Add(doctor); + ctx.SaveChanges(); } - //} + } } diff --git a/EHEC_Server/EHEC_Server/cluster_dependencies/ClusterConverter.cs b/EHEC_Server/EHEC_Server/cluster_dependencies/ClusterConverter.cs index d763f57..3a55b13 100644 --- a/EHEC_Server/EHEC_Server/cluster_dependencies/ClusterConverter.cs +++ b/EHEC_Server/EHEC_Server/cluster_dependencies/ClusterConverter.cs @@ -15,7 +15,7 @@ namespace EHEC_Server clusterPatientList = clusterp.GetClusterPatients(); var json = JsonConverter.Serialize(clusterPatientList); - System.IO.File.WriteAllText(@"C:\Users\novski\Desktop\Company.json", json); + 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 083ff3a..7bc0496 100644 --- a/EHEC_Server/EHEC_Server/cluster_dependencies/Models/ClusterPatient.cs +++ b/EHEC_Server/EHEC_Server/cluster_dependencies/Models/ClusterPatient.cs @@ -15,7 +15,8 @@ namespace EHEC_Server public List GetClusterPatients() { - Patients = Global.GlobalInstance.DbAccess.Patients.ToList(); + Patient p = new Patient(); + Patients = p.GetAllPatients(); foreach (Patient element in Patients) { @@ -24,7 +25,7 @@ namespace EHEC_Server Id = element.PatientId, Name = element.FirstName + " " + element.LastName }; - this.ClusterPatients.Add(clusterPatient); + ClusterPatients.Add(clusterPatient); } return ClusterPatients; }