diff --git a/Labtracker/dashboard.aspx b/Labtracker/dashboard.aspx
index f306357..62c78e6 100644
--- a/Labtracker/dashboard.aspx
+++ b/Labtracker/dashboard.aspx
@@ -476,6 +476,9 @@
var keraniy = '<%=Sites[19]%>';
+
+
+
var mymap = L.map('mapid').setView([9.058702156392139, 38.759765625
], 5);
@@ -488,69 +491,18 @@
marker.bindPopup("Armaeur Hansen Research Institute(AHRI)
Sequenced 0 samples").openPopup();
- var marker = L.marker([8.54385, 39.27445]).addTo(mymap);
- marker.bindPopup("Adama Hospital
Samples: " + adama).openPopup();
-
- var marker = L.marker([7.20721, 38.61220]).addTo(mymap);
- marker.bindPopup("Shashemene Hospital
Samples: " + shashe).openPopup();
-
- var marker = L.marker([6.85448, 37.76073]).addTo(mymap);
- marker.bindPopup("Wolaita Sodo Hospital
Samples: " + wolay).openPopup();
-
-
- var marker = L.marker([8.24229, 34.58165]).addTo(mymap);
- marker.bindPopup("Gambella General Hospital
Samples: " + gambe).openPopup();
-
- var marker = L.marker([6.02797, 37.55298]).addTo(mymap);
- marker.bindPopup("ArbaMinch Hospital
Samples: " + arba).openPopup();
-
- var marker = L.marker([6.75001, 38.39411]).addTo(mymap);
- marker.bindPopup("Yirgalem General Hospital
Samples: " + yirga).openPopup();
-
-
-
- var marker = L.marker([5.9595411, 43.5512884]).addTo(mymap);
- marker.bindPopup("Gode Hospital
Samples: " + gode).openPopup();
-
- var marker = L.marker([6.857281, 37.7733635]).addTo(mymap);
- marker.bindPopup("Sodo Hospital
Samples: " + sodo).openPopup();
+ <% var serializer = new System.Web.Script.Serialization.JavaScriptSerializer(); %>
+ for (let i = 0; i < 2; i++) {
+ var kert = <%= serializer.Serialize(Sites_Name)%>;
+ var kert2 =<%= serializer.Serialize(Sites_PID)%>;
+ var kert3 = <%= serializer.Serialize(Sites_Samples)%>;
- var marker = L.marker([7.0273564, 38.4305888]).addTo(mymap);
- marker.bindPopup("Hawassa CS Hospital
Samples: " + hawas).openPopup();
-
- var marker = L.marker([7.3178819, 38.0930245]).addTo(mymap);
- marker.bindPopup("Halaba Primary Hospital
Samples: " + halab).openPopup();
-
- var marker = L.marker([7.5511255, 37.8319107]).addTo(mymap);
- marker.bindPopup("Hosaina Hospital
Samples: " + hosain).openPopup();
-
- var marker = L.marker([6.4000662, 38.3099362]).addTo(mymap);
- marker.bindPopup("Dilla Hospital
Samples: " + dilla).openPopup();
-
- var marker = L.marker([8.9840787, 37.8477461]).addTo(mymap);
- marker.bindPopup("Ambo Hospital
Samples: " + ambo).openPopup();
-
- var marker = L.marker([8.6645898, 38.2180664]).addTo(mymap);
- marker.bindPopup("Tulubolo Hospital
Samples: " + tulu).openPopup();
-
- var marker = L.marker([11.5959828, 37.4121578]).addTo(mymap);
- marker.bindPopup("Addis Alem Hospital
Samples: " + addisalem).openPopup();
-
- var marker = L.marker([9.0436391, 38.7589657]).addTo(mymap);
- marker.bindPopup("Yekatit 12 Hospital
Samples: " + yekatit).openPopup();
-
- var marker = L.marker([9.0332229, 38.7087812]).addTo(mymap);
- marker.bindPopup("Addis Ketema Health Center
Samples: " + addisketema).openPopup();
-
- var marker = L.marker([9.049408, 38.7366835]).addTo(mymap);
- marker.bindPopup("Woreda 3 Health Center
Samples: " + woreda3).openPopup();
-
- var marker = L.marker([9.0518675, 38.6948024]).addTo(mymap);
- marker.bindPopup("Mikiland Health Center
Samples: " + miki).openPopup();
-
- var marker = L.marker([9.0441326, 38.6973718]).addTo(mymap);
- marker.bindPopup("Keraniyo Health Center
Samples: " + keraniy).openPopup();
+ var kert_lat = <%=serializer.Serialize(Sites_latit)%>;
+ var kert_long = <%=serializer.Serialize(Sites_long)%>;
+ var marker = L.marker([parseFloat(kert_lat[i]), parseFloat(kert_long[i])]).addTo(mymap);
+ marker.bindPopup("" + kert[i] + "
Samples: " + kert3[i]).openPopup();
+ }
diff --git a/Labtracker/dashboard.aspx.cs b/Labtracker/dashboard.aspx.cs
index 1ad1012..6f85df4 100644
--- a/Labtracker/dashboard.aspx.cs
+++ b/Labtracker/dashboard.aspx.cs
@@ -22,6 +22,13 @@ public partial class dashboard : System.Web.UI.Page
public string[] Regions = new string[10];
public string[] Sites = new string[20];
+ public string[] Sites_PID = new string[20];
+ public string[] Sites_Name = new string[20];
+ public string[] Sites_Samples = new string[20];
+ public string[] Sites_latit = new string[20];
+ public string[] Sites_long = new string[20];
+
+
protected void Page_Load(object sender, EventArgs e)
{
if (!User.Identity.IsAuthenticated)
@@ -30,21 +37,7 @@ protected void Page_Load(object sender, EventArgs e)
}
- /* SqlConnection con = new SqlConnection(strConnString);
- con.Open();
- str = "select SampleID from Samples";
- com = new SqlCommand(str, con);
- SqlDataReader reader = com.ExecuteReader();
-
- reader.Read();
- lblTotalSample.Text = reader["SampleID"].ToString();
- reader.Close();
- con.Close();*/
-
- //BindSample(GetSample());
- // Sample tsam = new Sample();
-
- //lblTotalSample.Text = tsam.SampleID.ToString();
+
@@ -73,6 +66,88 @@ protected void Page_Load(object sender, EventArgs e)
{
conn.Open();
+ string sqlsite_PIDs = "SELECT SitePatientId FROM Sites";
+ using (SqlCommand cmd = new SqlCommand(sqlsite_PIDs, conn))
+ {
+ using (SqlDataReader reader = cmd.ExecuteReader())
+ {
+ List values = new List();
+ while (reader.Read())
+ {
+ values.Add(reader.GetString(0));
+ }
+ reader.Close();
+ Sites_PID = values.ToArray();
+ }
+
+ }
+
+ string sqlsite_Name = "SELECT HealthFacility FROM Sites";
+ using (SqlCommand cmd = new SqlCommand(sqlsite_Name, conn))
+ {
+ using (SqlDataReader reader = cmd.ExecuteReader())
+ {
+ List values = new List();
+ while (reader.Read())
+ {
+ values.Add(reader.GetString(0));
+ }
+ reader.Close();
+ Sites_Name = values.ToArray();
+ }
+
+ }
+
+ string sqlsite_latit = "SELECT LocationLatitude FROM Sites";
+ using (SqlCommand cmd = new SqlCommand(sqlsite_latit, conn))
+ {
+ using (SqlDataReader reader = cmd.ExecuteReader())
+ {
+ List values = new List();
+ while (reader.Read())
+ {
+ values.Add(reader.GetString(0));
+ }
+ reader.Close();
+ Sites_latit = values.ToArray();
+ }
+
+ }
+
+ string sqlsite_long = "SELECT LocationLongitude FROM Sites";
+ using (SqlCommand cmd = new SqlCommand(sqlsite_long, conn))
+ {
+ using (SqlDataReader reader = cmd.ExecuteReader())
+ {
+ List values = new List();
+ while (reader.Read())
+ {
+ values.Add(reader.GetString(0));
+ }
+ reader.Close();
+ Sites_long = values.ToArray();
+ }
+
+ }
+
+ for (int i=0; i < Sites_PID.Length; i++)
+ {
+ string pid = Sites_PID[i];
+ string sqlsite_samples = String.Format("SELECT COUNT(PatientId) FROM Samples WHERE PatientId LIKE '{0}%'", pid);
+ using (SqlCommand cmd = new SqlCommand(sqlsite_samples, conn))
+ {
+ using (SqlDataReader reader = cmd.ExecuteReader())
+ {
+ reader.Read();
+ Sites_Samples[i] = reader[0].ToString();
+ }
+
+ }
+ }
+
+
+
+
string sql = "SELECT COUNT(LJ_res) FROM Results WHERE LJ_res='Contaminated'";
string sql7 = "SELECT COUNT(LJ_res) FROM Results WHERE LJ_res='Neg'";
string sql2 = "SELECT COUNT(DISTINCT PatientId) FROM Results";