From 1225de0329a5f35a67701c9f4736e7034be9c9c5 Mon Sep 17 00:00:00 2001 From: Dan <daniel2.lorych@live.uwe.ac.uk> Date: Tue, 3 May 2022 20:26:45 +0100 Subject: [PATCH] Add initial PanelDetails view --- Helios/Controllers/ConfiguratorController.cs | 6 +-- .../Configurator/ConfiguratorResult.cshtml | 2 +- Helios/Views/Configurator/PanelDetails.cshtml | 41 +++++++++++++++++++ Helios/Views/Shared/_Layout.cshtml | 8 +--- Helios/wwwroot/css/site.css | 27 ++++++++++++ 5 files changed, 73 insertions(+), 11 deletions(-) create mode 100644 Helios/Views/Configurator/PanelDetails.cshtml diff --git a/Helios/Controllers/ConfiguratorController.cs b/Helios/Controllers/ConfiguratorController.cs index 11e2a4e..8331eb3 100644 --- a/Helios/Controllers/ConfiguratorController.cs +++ b/Helios/Controllers/ConfiguratorController.cs @@ -31,11 +31,11 @@ namespace Helios.Controllers return View(model); } - public ActionResult PanelBreakdown(PanelPerformance panel) + public ActionResult PanelDetails(PanelPerformance panel) { - Console.WriteLine("Hello!"); + - return View(); + return View(panel); } } diff --git a/Helios/Views/Configurator/ConfiguratorResult.cshtml b/Helios/Views/Configurator/ConfiguratorResult.cshtml index 81f48cf..f168475 100644 --- a/Helios/Views/Configurator/ConfiguratorResult.cshtml +++ b/Helios/Views/Configurator/ConfiguratorResult.cshtml @@ -70,7 +70,7 @@ @panel.WithinBudget </td> <td> - @Html.ActionLink("Details", "PanelBreakdown", "Configurator", panel, null) + @Html.ActionLink("Details", "PanelDetails", "Configurator", panel, null) </td> </tr> } diff --git a/Helios/Views/Configurator/PanelDetails.cshtml b/Helios/Views/Configurator/PanelDetails.cshtml new file mode 100644 index 0000000..5ec8170 --- /dev/null +++ b/Helios/Views/Configurator/PanelDetails.cshtml @@ -0,0 +1,41 @@ +@model Helios.Models.PanelPerformance + +@{ + ViewData["Title"] = "Panel Details"; +} + +<div class="panelInfo"> + <div class="graph"> + <p>Graph</p> + </div> + <div class="panelDetails"> + <h5>Panel Details</h5> + <ul> + <li> + Efficiency: @Model.PanelEfficiency + </li> + <li> + Installation Cost: @Model.InstallationCost + </li> + </ul> + </div> + <div class="roofDetails"> + <h5>Roof Details</h5> + <ul> + <li> + Area: @Model.RoofArea㎡ + </li> + <li> + Angle: @Model.RoofAngle° + </li> + </ul> + </div> + <div class="propertyDetails"> + <h5>Property Details</h5> + <ul> + <li> + + </li> + </ul> + </div> +</div> \ No newline at end of file diff --git a/Helios/Views/Shared/_Layout.cshtml b/Helios/Views/Shared/_Layout.cshtml index 671b774..19186f4 100644 --- a/Helios/Views/Shared/_Layout.cshtml +++ b/Helios/Views/Shared/_Layout.cshtml @@ -26,17 +26,11 @@ <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="About">About</a> </li> <li class="nav-item"> - <a class="nav-link text-dark" asp-area="" asp-controller="Configurator" asp-action="Index">Services</a> - </li> - <li class="nav-item"> - <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="System Analysis">System Analysis</a> + <a class="nav-link text-dark" asp-area="" asp-controller="Configurator" asp-action="Index">System Analysis</a> </li> <li class="nav-item"> <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Data">Data</a> </li> - <li class="nav-item"> - <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Events">Events</a> - </li> <li class="nav-item"> <a class="nav-link text-dark" asp-area="" asp-controller="Login" asp-action="Index">Login</a> </li> diff --git a/Helios/wwwroot/css/site.css b/Helios/wwwroot/css/site.css index 154949f..931aa11 100644 --- a/Helios/wwwroot/css/site.css +++ b/Helios/wwwroot/css/site.css @@ -24,3 +24,30 @@ body { padding: 20px; margin-bottom: 20px; } + +.panelInfo { + display: grid; + grid-template-columns: 1fr 1fr 1fr; + grid-template-rows: 1fr 1fr; + gap: 0px 0px; + grid-auto-flow: row; + grid-template-areas: + "panelDetails roofDetails propertyDetails" + "graph graph graph"; +} + +.graph { + grid-area: graph; +} + +.panelDetails { + grid-area: panelDetails; +} + +.roofDetails { + grid-area: roofDetails; +} + +.propertyDetails { + grid-area: propertyDetails; +} -- GitLab