claunia/marechai
1
0
Fork 0
mirror of https://github.com/claunia/marechai.git synced 2025-12-16 19:14:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implement details admin page for screens by machine.

Browse Source
This commit is contained in:
Natalia Portillo
2019-06-02 02:46:59 +01:00
parent 535aeff6c7
commit 5a74ba4f18
3 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
cicm_web/Areas/Admin/Controllers/ScreensByMachineController.cs
View File

@@ -41,9 +41,20 @@ namespace cicm_web.Areas.Admin.Controllers
{ {
if(id == null) return NotFound(); if(id == null) return NotFound();
ScreensByMachine screensByMachine = await _context.ScreensByMachine ScreensByMachineViewModel screensByMachine = await _context.ScreensByMachine
.Include(s => s.Machine).Include(s => s.Screen) .Include(s => s.Machine).Include(s => s.Screen)
.FirstOrDefaultAsync(m => m.Id == id); .Select(s => new ScreensByMachineViewModel
{
Id = s.Id,
Screen =
s.Screen.NativeResolution !=
null
? $"{s.Screen.Diagonal}\" {s.Screen.Type} with {s.Screen.NativeResolution}"
: $"{s.Screen.Diagonal}\" {s.Screen}",
Machine =
$"{s.Machine.Company.Name} {s.Machine.Name}"
}).FirstOrDefaultAsync(m => m.Id ==
id);
if(screensByMachine == null) return NotFound(); if(screensByMachine == null) return NotFound();
return View(screensByMachine); return View(screensByMachine);

18
cicm_web/Areas/Admin/Views/ScreensByMachine/Details.cshtml
View File

@@ -1,4 +1,4 @@
@model Cicm.Database.Models.ScreensByMachine @model cicm_web.Areas.Admin.Models.ScreensByMachineViewModel
@{ @{
ViewData["Title"] = "Details"; ViewData["Title"] = "Details";
@@ -7,27 +7,31 @@
<h1>Details</h1> <h1>Details</h1>
<div> <div>
<h4>ScreensByMachine</h4> <h4>Screens by machine</h4>
<hr /> <hr />
<dl class="row"> <dl class="row">
<dt class="col-sm-2"> <dt class="col-sm-2">
@Html.DisplayNameFor(model => model.Screen) @Html.DisplayNameFor(model => model.Screen)
</dt> </dt>
<dd class="col-sm-10"> <dd class="col-sm-10">
@Html.DisplayFor(model => model.Screen.Type) @Html.DisplayFor(model => model.Screen)
</dd> </dd>
<dt class="col-sm-2"> <dt class="col-sm-2">
@Html.DisplayNameFor(model => model.Machine) @Html.DisplayNameFor(model => model.Machine)
</dt> </dt>
<dd class="col-sm-10"> <dd class="col-sm-10">
@Html.DisplayFor(model => model.Machine.Name) @Html.DisplayFor(model => model.Machine)
</dd> </dd>
</dl> </dl>
</div> </div>
<div> <div>
<a asp-action="Edit" <a asp-action="Edit"
asp-route-id="@Model.Id"> asp-route-id="@Model.Id"
class="btn btn-primary">
Edit Edit
</a> | </a>
<a asp-action="Index">Back to List</a> <a asp-action="Index"
class="btn btn-secondary">
Back to List
</a>
</div> </div>

2
cicm_web/cicm_web.csproj
View File

@@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web"> <Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp2.2</TargetFramework> <TargetFramework>netcoreapp2.2</TargetFramework>
<Version>3.0.99.747</Version> <Version>3.0.99.748</Version>
<Company>Canary Islands Computer Museum</Company> <Company>Canary Islands Computer Museum</Company>
<Copyright>Copyright © 2003-2018 Natalia Portillo</Copyright> <Copyright>Copyright © 2003-2018 Natalia Portillo</Copyright>
<Product>Canary Islands Computer Museum Website</Product> <Product>Canary Islands Computer Museum Website</Product>