diff options
| -rw-r--r-- | Project-Unite/ChartExtensions.cs | 45 | ||||
| -rw-r--r-- | Project-Unite/Project-Unite.csproj | 1 | ||||
| -rw-r--r-- | Project-Unite/Views/Bugs/Index.cshtml | 77 | ||||
| -rw-r--r-- | Project-Unite/Views/Shared/_Layout.cshtml | 1 |
4 files changed, 114 insertions, 10 deletions
diff --git a/Project-Unite/ChartExtensions.cs b/Project-Unite/ChartExtensions.cs new file mode 100644 index 0000000..b9b2879 --- /dev/null +++ b/Project-Unite/ChartExtensions.cs @@ -0,0 +1,45 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Web; +using System.Web.Mvc; + +namespace Project_Unite +{ + public static class ChartExtensions + { + public static IHtmlString PieChart(this HtmlHelper hpr, string title, Dictionary<string, double> values) + { + var sb = new StringBuilder(); + string chart_id = Guid.NewGuid().ToString().Replace("-", ""); + sb.AppendLine($@"<script type=""text/javascript""> +google.charts.load('current', {{'packages':['corechart']}}); + google.charts.setOnLoadCallback(drawChart_{chart_id}); + +function drawChart_{chart_id}() +{{ + var data_{chart_id} = google.visualization.arrayToDataTable([ + ['Key', 'Value']"); + + foreach(var kvs in values) + { + sb.Append(","); + sb.AppendLine($"['{kvs.Key}', {kvs.Value}]"); + } + sb.AppendLine($@"]); + +var options_{chart_id} = {{ + title: '{title}' + }}; + + var chart = new google.visualization.PieChart(document.getElementById('{chart_id}')); + + chart.draw(data, options);"); + + sb.AppendLine("}</script>"); + sb.AppendLine($"<div id=\"{chart_id}\" style=\"width:100%; height:auto;\"></div>"); + return hpr.Raw(sb.ToString()); + } + } +}
\ No newline at end of file diff --git a/Project-Unite/Project-Unite.csproj b/Project-Unite/Project-Unite.csproj index dd41d50..f4da41b 100644 --- a/Project-Unite/Project-Unite.csproj +++ b/Project-Unite/Project-Unite.csproj @@ -248,6 +248,7 @@ <Compile Include="App_Start\IdentityConfig.cs" /> <Compile Include="App_Start\RouteConfig.cs" /> <Compile Include="App_Start\Startup.Auth.cs" /> + <Compile Include="ChartExtensions.cs" /> <Compile Include="Controllers\AccountController.cs" /> <Compile Include="Controllers\AdminController.cs" /> <Compile Include="Controllers\APIController.cs" /> diff --git a/Project-Unite/Views/Bugs/Index.cshtml b/Project-Unite/Views/Bugs/Index.cshtml index 0e7754d..f5fd394 100644 --- a/Project-Unite/Views/Bugs/Index.cshtml +++ b/Project-Unite/Views/Bugs/Index.cshtml @@ -1,5 +1,7 @@ @model IEnumerable<Project_Unite.Models.BugTag> +@using Project_Unite.Models; @{ + var db = new ApplicationDbContext(); ViewBag.Title = "Bugtracker"; } @@ -10,18 +12,73 @@ } <div class="row"> - <div class="col-xs-3"> -@{ - Html.RenderPartial("~/Views/Bugs/_Sidebar.cshtml", Model); -} - </div> + <div class="col-xs-4"> + <h4>Bug types</h4> - <div class="col-xs-9"> - <h3>Welcome to the ShiftOS bug tracker.</h3> + <ul id="tabs" data-tabs="tabs" class="nav nav-stacked nav-pills"> + @foreach(var cat in Model) + { + string c = ""; + if(cat == Model.First()) + { + c = "active"; + } + <li class="@c"><a href="#[email protected]" data-toggle="tab">@cat.Name (@cat.Open.Length)</a></li> + } + </ul> + </div> - <p>ShiftOS is a game about an evolving operating system, and an evolving world. However, ShiftOS itself is evolving with new features everyday.</p> + <div class="tab-content"> + @foreach(var category in Model.ToArray()) + { + string c = "tab-pane fade in"; + if(category == Model.First()) + { + c += " active"; + } + <div class="@c" id="[email protected]"> + <h2>@category.Name</h2> + <p>@category.Description</p> - <p>We at ShiftOS strive to create a stable experience and most bugs are taken care of before they ever leave the development environment. However, sometimes we make mistakes. I mean, we're all human, right? Anyways, if you find a mistake we've made in ShiftOS, this is the best spot to place it.</p> - + <div class="row"> + <div class="col-xs-6"> + <strong>Open</strong> + </div> + <div class="col-xs-3"> + <strong>Urgency</strong> + </div> + <div class="col-xs-3"> + <strong>Actions</strong> + </div> + </div> + @foreach(var bug in category.Open.OrderByDescending(x=>x.Urgency)) + { + <div class="row"> + <div class="col-xs-6"> + <strong><a href="#[email protected]" data-toggle="modal"></a></strong><br/> + <p>Reported at: @bug.ReportedAt • Reported by: @Html.UserLink(bug.Reporter)</p> + </div> + @switch (bug.Urgency) + { + case 0: + <div class="col-xs-3"><strong>Minor</strong></div> + break; + case 1: + <div class="col-xs-3 panel-primary"><strong>Moderate</strong></div> + break; + case 2: + <div class="col-xs-3 panel-warning"><strong>Major</strong></div> + break; + case 3: + <div class="col-xs-3 panel-danger"><strong>Critical</strong></div> + break; + } + <div class="col-xs-3"> + <a class="btn btn-primary" href="@Url.Action("CloseBug", new {id=bug.Id})"><span class="glyphicon glyphicon-ok"></span> Close bug report</a> + </div> + </div> + } + </div> + } </div> </div>
\ No newline at end of file diff --git a/Project-Unite/Views/Shared/_Layout.cshtml b/Project-Unite/Views/Shared/_Layout.cshtml index 48b2fa6..5ade38b 100644 --- a/Project-Unite/Views/Shared/_Layout.cshtml +++ b/Project-Unite/Views/Shared/_Layout.cshtml @@ -25,6 +25,7 @@ @Scripts.Render("~/Scripts/simplemde.js") @Scripts.Render("~/bundles/modernizr") + <script type="text/javascript" src="https://www.gstatic.com/charts/loader.js"></script> </head> <body> <div class="navbar navbar-default"> |