Reformating charting, add DataError message

This commit is contained in:
2016-05-09 11:46:32 -04:00
parent 1ba8f24b10
commit aca7157663
11 changed files with 616 additions and 24 deletions
+9
View File
@@ -0,0 +1,9 @@
@model string
@{
ViewBag.Title = "Chart - Data Error";
}
<h1>@ViewBag.Title</h1>
<p>There was an issue generating a chart for the selected data.</p>
<p>@Model</p>
@@ -1,4 +1,9 @@
@model LeafWeb.Web.ViewModels.LeafCharter.LeafCharterViewModel
@model LeafWeb.Web.ViewModels.Chart.ChartViewModel
@{
ViewBag.Title = "Chart";
}
<h1>@ViewBag.Title</h1>
<h3>Identifier: <strong>@Model.LeafInputIdentifier</strong></h3>
@Html.DropDownList("CurveId", new SelectList(Model.AvailableCurveId, Model.CurveId), "Select CurveId")
@@ -15,7 +20,7 @@
$chart.attr('src', "");
var curveId = $("option:selected", this).text();
var url =
"@Html.Raw(Url.Action("LeafCharts", new {leafInputId = Model.LeafInputId, curveId="curveId"}))";
"@Html.Raw(Url.Action("ChartCurve", new {leafInputId = Model.LeafInputId, curveId="curveId"}))";
url = url.replace("=curveId", "=" + curveId);
$chart.attr('src', url)
.load(function() {
+1 -1
View File
@@ -11,7 +11,7 @@
@Html.Partial("_StatusMessage")
<h1>Submitting Data and Retrieving EDO Results</h1>
<h1>@ViewBag.Title</h1>
<p>
There is no limit on the number of files you may submit for analysis.
Keep selecting files and hitting the Add button until all of the files you need to upload are shown in the list.
+4 -4
View File
@@ -5,7 +5,7 @@
var grid = new WebGrid(Model, rowsPerPage: 45);
}
<h1>Result Status</h1>
<h1>@ViewBag.Title</h1>
@grid.GetHtml(columns:
grid.Columns(
@@ -15,8 +15,8 @@
grid.Column("CurrentStatus", "Status"),
grid.Column("Chart", "Chart", item =>
item.HasLeafChart
? Html.ActionLink("Chart", "Index", "LeafCharter", new {leafInputId = item.LeafInputId}, new {})
: Html.Raw(""))
),
? Html.ActionLink("Chart", "Index", "Chart", new {leafInputId = item.LeafInputId}, new {})
: Html.Raw(""))
),
htmlAttributes: new { @class = "table table-striped table-bordered table-hover table-condensed" }
)