diff --git a/GST_Program.Domain/Models/BadgeHistory.cs b/GST_Program.Domain/Models/BadgeHistory.cs index bd4099b..26daceb 100644 --- a/GST_Program.Domain/Models/BadgeHistory.cs +++ b/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; } + } } \ No newline at end of file diff --git a/GST_Program.Domain/Services/Database.cs b/GST_Program.Domain/Services/Database.cs index 52ad9cf..e35568a 100644 --- a/GST_Program.Domain/Services/Database.cs +++ b/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); } } diff --git a/GST_Program.Domain/Sql/CreateTables.sql b/GST_Program.Domain/Sql/CreateTables.sql index 3b95cf5..8037ad8 100644 --- a/GST_Program.Domain/Sql/CreateTables.sql +++ 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]( diff --git a/GST_Program.Domain/Sql/InsertDummyData.sql b/GST_Program.Domain/Sql/InsertDummyData.sql index a2dfdf0..bd17182 100644 --- a/GST_Program.Domain/Sql/InsertDummyData.sql +++ b/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 diff --git a/GST_Program.Domain/bin/Debug/GST_Program.Domain.dll b/GST_Program.Domain/bin/Debug/GST_Program.Domain.dll index 3f56476..554a258 100644 Binary files a/GST_Program.Domain/bin/Debug/GST_Program.Domain.dll and b/GST_Program.Domain/bin/Debug/GST_Program.Domain.dll differ diff --git a/GST_Program.Domain/bin/Debug/GST_Program.Domain.pdb b/GST_Program.Domain/bin/Debug/GST_Program.Domain.pdb index 30d2b14..65d9fd8 100644 Binary files a/GST_Program.Domain/bin/Debug/GST_Program.Domain.pdb and b/GST_Program.Domain/bin/Debug/GST_Program.Domain.pdb differ diff --git a/GST_Program.Domain/bin/Debug/Sql/CreateTables.sql b/GST_Program.Domain/bin/Debug/Sql/CreateTables.sql index 3b95cf5..8037ad8 100644 --- a/GST_Program.Domain/bin/Debug/Sql/CreateTables.sql +++ b/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]( diff --git a/GST_Program.Domain/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/GST_Program.Domain/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 4346311..078d21b 100644 Binary files a/GST_Program.Domain/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/GST_Program.Domain/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/GST_Program.Domain/obj/Debug/GST_Program.Domain.csprojResolveAssemblyReference.cache b/GST_Program.Domain/obj/Debug/GST_Program.Domain.csprojResolveAssemblyReference.cache index eccab6a..b1cd856 100644 Binary files a/GST_Program.Domain/obj/Debug/GST_Program.Domain.csprojResolveAssemblyReference.cache and b/GST_Program.Domain/obj/Debug/GST_Program.Domain.csprojResolveAssemblyReference.cache differ diff --git a/GST_Program.Domain/obj/Debug/GST_Program.Domain.dll b/GST_Program.Domain/obj/Debug/GST_Program.Domain.dll index 3f56476..554a258 100644 Binary files a/GST_Program.Domain/obj/Debug/GST_Program.Domain.dll and b/GST_Program.Domain/obj/Debug/GST_Program.Domain.dll differ diff --git a/GST_Program.Domain/obj/Debug/GST_Program.Domain.pdb b/GST_Program.Domain/obj/Debug/GST_Program.Domain.pdb index 30d2b14..65d9fd8 100644 Binary files a/GST_Program.Domain/obj/Debug/GST_Program.Domain.pdb and b/GST_Program.Domain/obj/Debug/GST_Program.Domain.pdb differ diff --git a/GST_Program/Controllers/TreeController.cs b/GST_Program/Controllers/TreeController.cs index e25490e..717b15c 100644 --- a/GST_Program/Controllers/TreeController.cs +++ b/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 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 = 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 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 = 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 + } } \ No newline at end of file diff --git a/GST_Program/GST_Program.csproj b/GST_Program/GST_Program.csproj index 0e6ef45..8ee26dc 100644 --- a/GST_Program/GST_Program.csproj +++ b/GST_Program/GST_Program.csproj @@ -1,267 +1,268 @@ - - - - - - - Debug - AnyCPU - - - 2.0 - {F65C002F-1FC7-45BA-9B06-2C237A0C74C2} - {349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} - Library - Properties - GST_Program - GST_Program - v4.5.1 - true - - - - - - - - - - true - full - false - bin\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\ - TRACE - prompt - 4 - - - - ..\packages\Antlr.3.4.1.9004\lib\Antlr3.Runtime.dll - True - - - ..\..\..\..\..\..\..\_Git\GST\packages\Dapper.1.50.2\lib\net451\Dapper.dll - True - - - ..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.0\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True - - - - ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True - - - ..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll - True - - - - - - - - - - - - ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True - - - ..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True - - - ..\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll - True - - - ..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True - - - ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True - - - ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True - - - ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True - - - - - - - - - - ..\packages\WebGrease.1.5.2\lib\WebGrease.dll - True - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Web.config - - - Web.config - - - - - - - - - - - - - - - - - Designer - - - - - - - - - - - - Global.asax - - - - - - - - - - - {2e3565fe-7351-4b97-bda3-bd40ac03b6e3} - GST_Program.Domain - - - - 10.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - - - - - - True - True - 51211 - / - http://localhost:51211/ - False - False - - - False - - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - + + + + + + + Debug + AnyCPU + + + 2.0 + {F65C002F-1FC7-45BA-9B06-2C237A0C74C2} + {349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} + Library + Properties + GST_Program + GST_Program + v4.5.1 + true + + + + + + + + + + true + full + false + bin\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\ + TRACE + prompt + 4 + + + + ..\packages\Antlr.3.4.1.9004\lib\Antlr3.Runtime.dll + True + + + ..\..\..\..\..\..\..\_Git\GST\packages\Dapper.1.50.2\lib\net451\Dapper.dll + True + + + ..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.0\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll + True + + + + ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll + True + + + ..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll + True + + + + + + + + + + + + ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll + True + + + ..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll + True + + + ..\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll + True + + + ..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll + True + + + ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll + True + + + ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll + True + + + ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll + True + + + + + + + + + + ..\packages\WebGrease.1.5.2\lib\WebGrease.dll + True + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Web.config + + + Web.config + + + + + + + + + + + + + + + + + Designer + + + + + + + + + + + + Global.asax + + + + + + + + + + + + {2e3565fe-7351-4b97-bda3-bd40ac03b6e3} + GST_Program.Domain + + + + 10.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + + + + + + + + + True + True + 51211 + / + http://localhost:51211/ + False + False + + + False + + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + + \ No newline at end of file diff --git a/GST_Program/Models/TreeAlgorithm.cs b/GST_Program/Models/TreeAlgorithm.cs new file mode 100644 index 0000000..3597c2b --- /dev/null +++ b/GST_Program/Models/TreeAlgorithm.cs @@ -0,0 +1,132 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; + +namespace GST_Program.Models +{ + public class TreeAlgorithm + { + //a class to represent a point with an angle + public class point + { + public int pos_x; + public int pos_y; + public int angle; + + public point(int posx, int posy) + { + pos_x = posx; + pos_y = posy; + angle = 0; + } + public point(int posx, int posy, int angl) + { + pos_x = posx; + pos_y = posy; + angle = angl; + } + } + + //Obtains percentage across the tree based on the leaf quantity number + static public float BinPercent(int num) + { + float percent = 0.0f; + int loopcount = 0; + for (int i = 1; i <= num; i *= 2) + { + int compare = num & i; + if (compare != 0) + { + percent += (0.5f / (float)Math.Pow(2, loopcount)); + } + loopcount++; + } + return percent; + } + + //finds the position of a point based on the shape it's strewn across and the percentage across the shape + static point ShapePos(List shape, float percent, float offset) + { + List lengths = new List(); + lengths.Add(0.0f); + for (int i = 0; i < shape.Count - 1; i++) + { + float length = ((float)Math.Sqrt((float)Math.Pow(Math.Abs((float)shape[i].pos_x - (float)shape[i + 1].pos_x), 2) + + (float)Math.Pow(Math.Abs((float)shape[i].pos_y - (float)shape[i + 1].pos_y), 2))); + lengths.Add(lengths[i] + length); + } + + float place = percent * lengths[lengths.Count - 1]; + float percent2 = 0.0f; + bool found = false; + point p1, p2, newpt; + for (int i = 0; i < lengths.Count - 1 && !found; i++) + { + if (place <= lengths[i + 1]) + { + found = true; + p1 = shape[i]; + p2 = shape[i + 1]; + percent2 = (place - lengths[i]) / (lengths[i + 1] - lengths[i]); + + newpt = new point((int)((p2.pos_x - p1.pos_x) * percent2) + p1.pos_x, + (int)((p2.pos_y - p1.pos_y) * percent2) + p1.pos_y, + (int)Math.Round(Math.Atan2(p2.pos_y - p1.pos_y, p2.pos_x - p1.pos_x) * 180.0 / Math.PI, 0)); + + newpt.pos_x += (int)(offset * Math.Round((Math.Sin(newpt.angle / 180.0 * Math.PI)), 5) * -1); + newpt.pos_y += (int)(offset * Math.Round((Math.Cos(newpt.angle / 180.0 * Math.PI)), 5)); + + return newpt; + } + } + return null; + } + + //Finds a leaf's position on the Tree Image + static public point TreePos(float percent, float offset) + { + + //The entire tree image, hard-coded + List treeShape = new List(); + treeShape.Add(new point(200, 500)); + treeShape.Add(new point(350, 369)); + treeShape.Add(new point(242, 397)); + treeShape.Add(new point(101, 382)); + treeShape.Add(new point(242, 369)); + treeShape.Add(new point(345, 330)); + treeShape.Add(new point(248, 264)); + treeShape.Add(new point(177, 270)); + treeShape.Add(new point(98, 227)); + treeShape.Add(new point(183, 240)); + treeShape.Add(new point(245, 237)); + treeShape.Add(new point(344, 290)); + treeShape.Add(new point(270, 171)); + treeShape.Add(new point(255, 55)); + treeShape.Add(new point(300, 163)); + treeShape.Add(new point(368, 260)); + treeShape.Add(new point(399, 151)); + treeShape.Add(new point(392, 18)); + treeShape.Add(new point(426, 135)); + treeShape.Add(new point(411, 264)); + treeShape.Add(new point(472, 133)); + treeShape.Add(new point(536, 64)); + treeShape.Add(new point(488, 152)); + treeShape.Add(new point(441, 292)); + treeShape.Add(new point(518, 279)); + treeShape.Add(new point(574, 219)); + treeShape.Add(new point(688, 194)); + treeShape.Add(new point(588, 242)); + treeShape.Add(new point(534, 301)); + treeShape.Add(new point(441, 333)); + treeShape.Add(new point(550, 360)); + treeShape.Add(new point(697, 328)); + treeShape.Add(new point(560, 388)); + treeShape.Add(new point(437, 373)); + + point treePoint = ShapePos(treeShape, percent, offset); + + return treePoint; + } + } +} \ No newline at end of file diff --git a/GST_Program/Views/Admin/PersonSearch.cshtml b/GST_Program/Views/Admin/PersonSearch.cshtml index f7954bc..4e729eb 100644 --- a/GST_Program/Views/Admin/PersonSearch.cshtml +++ b/GST_Program/Views/Admin/PersonSearch.cshtml @@ -22,6 +22,9 @@ @Html.DisplayFor(modelp => p.Person_Type) + @if (p.Person_Type == "Student") { + @Html.ActionLink("Tree", $"../Tree/Index/{p.Person_ID}") | + } @Html.ActionLink("Details", "PersonDetail", new { id = p.Person_ID }) | @Html.ActionLink("Edit", "PersonEdit", new { id = p.Person_ID }) | @Html.ActionLink("Delete", "PersonDelete", new { id = p.Person_ID }) diff --git a/GST_Program/Views/Tree/Index.cshtml b/GST_Program/Views/Tree/Index.cshtml index 1035761..627504a 100644 --- a/GST_Program/Views/Tree/Index.cshtml +++ b/GST_Program/Views/Tree/Index.cshtml @@ -32,6 +32,7 @@ name: 'b_@b.Transaction_Num', layer: true, x: @b.Pos_X, y: @b.Pos_Y, + rotate: @b.Angle, scale: 1 }); $treeCanvas.addLayerToGroup('b_@b.Transaction_Num', 'tree'); diff --git a/GST_Program/bin/GST_Program.Domain.dll b/GST_Program/bin/GST_Program.Domain.dll index 3f56476..554a258 100644 Binary files a/GST_Program/bin/GST_Program.Domain.dll and b/GST_Program/bin/GST_Program.Domain.dll differ diff --git a/GST_Program/bin/GST_Program.Domain.pdb b/GST_Program/bin/GST_Program.Domain.pdb index 30d2b14..65d9fd8 100644 Binary files a/GST_Program/bin/GST_Program.Domain.pdb and b/GST_Program/bin/GST_Program.Domain.pdb differ diff --git a/GST_Program/bin/GST_Program.dll b/GST_Program/bin/GST_Program.dll index 1eefaf2..2cf0709 100644 Binary files a/GST_Program/bin/GST_Program.dll and b/GST_Program/bin/GST_Program.dll differ diff --git a/GST_Program/bin/GST_Program.pdb b/GST_Program/bin/GST_Program.pdb index b3b8111..afd69de 100644 Binary files a/GST_Program/bin/GST_Program.pdb and b/GST_Program/bin/GST_Program.pdb differ diff --git a/GST_Program/bin/Sql/CreateTables.sql b/GST_Program/bin/Sql/CreateTables.sql index 3b95cf5..8037ad8 100644 --- a/GST_Program/bin/Sql/CreateTables.sql +++ b/GST_Program/bin/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]( diff --git a/GST_Program/obj/Debug/GST_Program.csprojResolveAssemblyReference.cache b/GST_Program/obj/Debug/GST_Program.csprojResolveAssemblyReference.cache index 77e7515..eb23d44 100644 Binary files a/GST_Program/obj/Debug/GST_Program.csprojResolveAssemblyReference.cache and b/GST_Program/obj/Debug/GST_Program.csprojResolveAssemblyReference.cache differ diff --git a/GST_Program/obj/Debug/GST_Program.dll b/GST_Program/obj/Debug/GST_Program.dll index 1eefaf2..2cf0709 100644 Binary files a/GST_Program/obj/Debug/GST_Program.dll and b/GST_Program/obj/Debug/GST_Program.dll differ diff --git a/GST_Program/obj/Debug/GST_Program.pdb b/GST_Program/obj/Debug/GST_Program.pdb index b3b8111..afd69de 100644 Binary files a/GST_Program/obj/Debug/GST_Program.pdb and b/GST_Program/obj/Debug/GST_Program.pdb differ