diff --git a/Marechai/Marechai.csproj b/Marechai/Marechai.csproj index ebc85a4c..51b777ad 100644 --- a/Marechai/Marechai.csproj +++ b/Marechai/Marechai.csproj @@ -2,7 +2,7 @@ netcoreapp3.1 - 3.0.99.1182 + 3.0.99.1185 Canary Islands Computer Museum Copyright © 2003-2020 Natalia Portillo Canary Islands Computer Museum Website @@ -103,6 +103,9 @@ true + + true + <_ContentIncludedByDefault Remove="Areas\Admin\Views\BrowserTests\Delete.cshtml" /> diff --git a/Marechai/Areas/Admin/Views/MachineFamilies/Details.cshtml b/Marechai/Pages/Admin/Details/MachineFamily.razor similarity index 56% rename from Marechai/Areas/Admin/Views/MachineFamilies/Details.cshtml rename to Marechai/Pages/Admin/Details/MachineFamily.razor index d9ed8457..96d4542e 100644 --- a/Marechai/Areas/Admin/Views/MachineFamilies/Details.cshtml +++ b/Marechai/Pages/Admin/Details/MachineFamily.razor @@ -1,5 +1,5 @@ -@{ - /****************************************************************************** +@{ +/****************************************************************************** // MARECHAI: Master repository of computing history artifacts information // ---------------------------------------------------------------------------- // @@ -29,31 +29,38 @@ // Copyright © 2003-2020 Natalia Portillo *******************************************************************************/ } -@model Marechai.Database.Models.MachineFamily -@{ - ViewData["Title"] = "Details"; +@page "/admin/machine_families/details/{Id:int}" +@inherits OwningComponentBase +@inject IStringLocalizer L +@inject CompaniesService CompaniesService +@attribute [Authorize(Roles = "UberAdmin, Admin")] +

@L["Machine family details"]

+
+ +@if (!_loaded) +{ +

@L["Loading..."]

+ + return; } -

Details

+
-

Machine family

-
-
-
- @Html.DisplayNameFor(model => model.Company) -
-
- @Html.DisplayFor(model => model.Company.Name) -
-
- @Html.DisplayNameFor(model => model.Name) -
-
- @Html.DisplayFor(model => model.Name) -
-
+ + @L["Company"] + + + + @L["Name"] + +
- Edit - Back to List + @L["Edit"] + @L["Back to list"]
\ No newline at end of file diff --git a/Marechai/Pages/Admin/Details/MachineFamily.razor.cs b/Marechai/Pages/Admin/Details/MachineFamily.razor.cs new file mode 100644 index 00000000..b277899e --- /dev/null +++ b/Marechai/Pages/Admin/Details/MachineFamily.razor.cs @@ -0,0 +1,33 @@ +using System.Collections.Generic; +using System.Threading.Tasks; +using Marechai.ViewModels; +using Microsoft.AspNetCore.Components; + +namespace Marechai.Pages.Admin.Details +{ + public partial class MachineFamily + { + List _companies; + bool _editable; + bool _loaded; + Database.Models.MachineFamily _model; + [Parameter] + public int Id { get; set; } + + protected override async Task OnAfterRenderAsync(bool firstRender) + { + if(_loaded) + return; + + _loaded = true; + + if(Id <= 0) + return; + + _companies = await CompaniesService.GetAsync(); + _model = await Service.GetAsync(Id); + + StateHasChanged(); + } + } +} \ No newline at end of file diff --git a/Marechai/Pages/Admin/MachineFamilies.razor b/Marechai/Pages/Admin/MachineFamilies.razor index 113c297e..599dd7b1 100644 --- a/Marechai/Pages/Admin/MachineFamilies.razor +++ b/Marechai/Pages/Admin/MachineFamilies.razor @@ -69,9 +69,7 @@ @item.Name - - @L["Details"] - + @L["Details"] @L["Edit"] diff --git a/Marechai/Resources/Services/MachineFamiliesService.es.resx b/Marechai/Resources/Services/MachineFamiliesService.es.resx index a78857ee..ee72f2b1 100644 --- a/Marechai/Resources/Services/MachineFamiliesService.es.resx +++ b/Marechai/Resources/Services/MachineFamiliesService.es.resx @@ -162,4 +162,12 @@ Cancelar Cancel + + Detalles de familia de máquinas + Machine family details + + + Volver a la lista + Back to list + \ No newline at end of file diff --git a/Marechai/Services/MachineFamiliesService.cs b/Marechai/Services/MachineFamiliesService.cs index 02e48f95..945650aa 100644 --- a/Marechai/Services/MachineFamiliesService.cs +++ b/Marechai/Services/MachineFamiliesService.cs @@ -20,6 +20,8 @@ namespace Marechai.Services Id = m.Id, Company = m.Company.Name, Name = m.Name }).ToListAsync(); + public async Task GetAsync(int id) => await _context.MachineFamilies.FindAsync(id); + public async Task DeleteAsync(int id) { MachineFamily item = await _context.MachineFamilies.FindAsync(id);