Treeview2

GST_Program.Domain/Models/BadgeHistory.cs

@@ -1,18 +1,19 @@
-using System;
-
-namespace GST_Program.Domain.Models {
-    public class BadgeHistory {
-        public int Transaction_Num { get; set; }
-        public string Badge_ID { get; set; }
-        public string Giver_ID { get; set; }
-        public string Student_ID { get; set; }
-        public DateTime Time_Stamp { get; set; }
-        public string Comment { get; set; }
-		public int Pos_X { get; set; }
-		public int Pos_Y { get; set; }
-
-        public Badge Badge { get; set; }
-        public Person Giver { get; set; }
-        public Person Receiver { get; set; }
-    }
+using System;
+
+namespace GST_Program.Domain.Models {
+    public class BadgeHistory {
+        public int Transaction_Num { get; set; }
+        public string Badge_ID { get; set; }
+        public string Giver_ID { get; set; }
+        public string Student_ID { get; set; }
+        public DateTime Time_Stamp { get; set; }
+        public string Comment { get; set; }
+        public int Pos_X { get; set; }
+        public int Pos_Y { get; set; }
+		public int Angle { get; set; }
+
+        public Badge Badge { get; set; }
+        public Person Giver { get; set; }
+        public Person Receiver { get; set; }
+    }
 }

GST_Program.Domain/Services/Database.cs

@@ -61,7 +61,7 @@ public void Create(Badge b) {
 		// Create new row in BadgeHistory
 		public void Create(BadgeHistory b) {
 			using (IDbConnection db = new SqlConnection(connection)) {
-				string sqlQuery = "INSERT INTO BadgeHistory VALUES(@Badge_ID, @Giver_ID, @Student_ID, @Time_Stamp, @Comment)";
+				string sqlQuery = "INSERT INTO BadgeHistory VALUES(@Badge_ID, @Giver_ID, @Student_ID, @Time_Stamp, @Comment, @Pos_X, @Pos_Y, @Angle)";
 				db.Execute(sqlQuery, b);
 			}
 		}

GST_Program.Domain/Sql/CreateTables.sql

@@ -26,7 +26,8 @@ CREATE TABLE [BadgeHistory](
 	[Time_Stamp]		DateTime,
 	[Comment]			varchar(50),
 	[Pos_X]				int,
-	[Pos_Y]				int
+	[Pos_Y]				int,
+	[Angle]				int
 );
 
 CREATE TABLE [CoreRelation](

GST_Program.Domain/Sql/InsertDummyData.sql

@@ -84,9 +84,9 @@ INSERT INTO [BadgeBank] VALUES
 
 
 INSERT INTO [BadgeHistory] VALUES
-	('201','10010','10010','11/4/16','I read',100,100)
-   ,('206','10014','10010','11/7/16','BEYOND!',100,200)
-   ,('514','10011','10010','11/12/16','Competency test',100,300);
+	('201','10010','10010','11/4/16','I read',100,100,0)
+   ,('206','10014','10010','11/7/16','BEYOND!',100,200,90)
+   ,('514','10011','10010','11/12/16','Competency test',100,300,270);
 
 
 INSERT INTO [CoreRelation] VALUES

GST_Program.Domain/bin/Debug/Sql/CreateTables.sql

@@ -26,7 +26,8 @@ CREATE TABLE [BadgeHistory](
 	[Time_Stamp]		DateTime,
 	[Comment]			varchar(50),
 	[Pos_X]				int,
-	[Pos_Y]				int
+	[Pos_Y]				int,
+	[Angle]				int
 );
 
 CREATE TABLE [CoreRelation](

GST_Program/Controllers/TreeController.cs

@@ -1,99 +1,109 @@
-using System;
-using System.Collections.Generic;
-using System.Web.Mvc;
-using GST_Program.Domain.Models;
-using GST_Program.Domain.Services;
-using GST_Program.Models;
-
-namespace GST_Program.Controllers {
-	public class TreeController : Controller {
-
-		// GET: Tree
-		public ActionResult Index(string id) {
-			var service = new Database();
-			List<BadgeHistory> b = service.ReadAllBadgeReceivedByReceiver(id);
-			return View(b);
-		}
-
-
-		// GET: Tree/Grid
-		public ActionResult Grid(string id) {
-			var service = new Database();
-			var person = service.ReadSinglePerson(id);
-			ViewBag.Person = person;
-
-			List<Core> core = service.ReadAllCores();
-			ViewBag.Core = core;
-
-			var badgeHistoryList = service.ReadAllBadgeReceivedByReceiver(id);
-
-			return View(badgeHistoryList);
-		}
-
-
-		// GET: Tree/BadgeHistoryDetail
-		public ActionResult BadgeHistoryDetail(string id) {
-			var service = new Database();
-			var b = service.ReadSingleBadgeReceived(id);
-			return View(b);
-		}
-
-		#region Give Badge
-
-		// GET: Tree/GiveBadge
-		public ActionResult GiveBadge() {
-			var service = new Database();
-			var bb = service.ReadAllBadge();
-
-			var pvm = service.ReadAllPerson();
-
-			ViewBag.Badges = bb;
-			ViewBag.People = pvm;
-
-			return View();
-		}
-
-
-		// POST: Tree/GiveBadge
-		[HttpPost]
-		public ActionResult GiveBadge(FormCollection form) {
-			var service = new Database();
-			BadgeHistory b = new BadgeHistory();
-
-			var badge = form["badge"];
-			var giver = form["giver"];
-			var receiver = form["receiver"];
-			var comment = form["Comment"];
-
-			// Test to see if Form Input for Badge is a Name or a Number
-			if (!TestString.IsAllDigits(badge)) {
-				b.Badge = service.ReadSingleBadgeByName(badge);
-				b.Badge_ID = Convert.ToString(b.Badge.Badge_ID);
-			}
-
-			// Test to see if Form Input for Giver is a Name or a Number
-			if (!TestString.IsAllDigits(giver)) {
-				b.Giver = service.ReadSinglePersonByName(giver);
-				b.Giver_ID = Convert.ToString(b.Giver.Person_ID);
-			}
-
-			// Test to see if Form Input for Receiver is a Name or a Number
-			if (!TestString.IsAllDigits(receiver)) {
-				b.Receiver = service.ReadSinglePersonByName(receiver);
-				b.Student_ID = Convert.ToString(b.Receiver.Person_ID);
-			}
-
-			b.Time_Stamp = DateTime.Now;
-			b.Comment = comment;
-
-			if (ModelState.IsValid) {
-				service.Create(b);
-				return RedirectToAction($"Grid/{b.Student_ID}");
-			}
-
-			return View(b);
-		}
-
-		#endregion
-	}
+using System;
+using System.Collections.Generic;
+using System.Web.Mvc;
+using GST_Program.Domain.Models;
+using GST_Program.Domain.Services;
+using GST_Program.Models;
+
+namespace GST_Program.Controllers {
+	public class TreeController : Controller {
+
+		// GET: Tree
+		public ActionResult Index(string id) {
+			var service = new Database();
+			List<BadgeHistory> b = service.ReadAllBadgeReceivedByReceiver(id);
+			return View(b);
+		}
+
+
+		// GET: Tree/Grid
+		public ActionResult Grid(string id) {
+			var service = new Database();
+			var person = service.ReadSinglePerson(id);
+			ViewBag.Person = person;
+
+			List<Core> core = service.ReadAllCores();
+			ViewBag.Core = core;
+
+			var badgeHistoryList = service.ReadAllBadgeReceivedByReceiver(id);
+
+			return View(badgeHistoryList);
+		}
+
+
+		// GET: Tree/BadgeHistoryDetail
+		public ActionResult BadgeHistoryDetail(string id) {
+			var service = new Database();
+			var b = service.ReadSingleBadgeReceived(id);
+			return View(b);
+		}
+
+		#region Give Badge
+
+		// GET: Tree/GiveBadge
+		public ActionResult GiveBadge() {
+			var service = new Database();
+			var bb = service.ReadAllBadge();
+
+			var pvm = service.ReadAllPerson();
+
+			ViewBag.Badges = bb;
+			ViewBag.People = pvm;
+
+			return View();
+		}
+
+
+		// POST: Tree/GiveBadge
+		[HttpPost]
+		public ActionResult GiveBadge(FormCollection form) {
+			var service = new Database();
+			BadgeHistory b = new BadgeHistory();
+
+			var badge = form["badge"];
+			var giver = form["giver"];
+			var receiver = form["receiver"];
+			var comment = form["Comment"];
+
+			// Test to see if Form Input for Badge is a Name or a Number
+			if (!TestString.IsAllDigits(badge)) {
+				b.Badge = service.ReadSingleBadgeByName(badge);
+				b.Badge_ID = Convert.ToString(b.Badge.Badge_ID);
+			}
+
+			// Test to see if Form Input for Giver is a Name or a Number
+			if (!TestString.IsAllDigits(giver)) {
+				b.Giver = service.ReadSinglePersonByName(giver);
+				b.Giver_ID = Convert.ToString(b.Giver.Person_ID);
+			}
+
+			// Test to see if Form Input for Receiver is a Name or a Number
+			if (!TestString.IsAllDigits(receiver)) {
+				b.Receiver = service.ReadSinglePersonByName(receiver);
+				b.Student_ID = Convert.ToString(b.Receiver.Person_ID);
+			}
+
+			b.Time_Stamp = DateTime.Now;
+			b.Comment = comment;
+
+			var count = service.ReadAllBadgeReceivedByReceiver(b.Student_ID).Count;
+
+            //replace '1' with the badge count for a person (or any positive number if you want a different position)
+            TreeAlgorithm.point bPos = TreeAlgorithm.TreePos(TreeAlgorithm.BinPercent(count),-32.0f);
+
+            b.Pos_X = bPos.pos_x;
+            b.Pos_Y = bPos.pos_y;
+			b.Angle = bPos.angle;
+            //rotation angle will be put here
+
+			if (ModelState.IsValid) {
+				service.Create(b);
+				return RedirectToAction($"Grid/{b.Student_ID}");
+			}
+
+			return View(b);
+		}
+
+		#endregion
+	}
 }