Move document companies admin index to Blazor.

This commit is contained in:
2020-05-24 05:10:00 +01:00
parent 6aa8c57a1a
commit 4a94fe37cc
12 changed files with 291 additions and 53 deletions

View File

@@ -2,6 +2,7 @@
using System.Threading.Tasks;
using Marechai.Areas.Admin.Models;
using Marechai.Database.Models;
using Marechai.ViewModels;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Rendering;

View File

@@ -1,4 +1,4 @@
@model Marechai.Areas.Admin.Models.DocumentCompanyViewModel
@model Marechai.ViewModels.DocumentCompanyViewModel
@{
ViewData["Title"] = "Delete";

View File

@@ -1,4 +1,4 @@
@model Marechai.Areas.Admin.Models.DocumentCompanyViewModel
@model Marechai.ViewModels.DocumentCompanyViewModel
@{
ViewData["Title"] = "Details";

View File

@@ -1,49 +0,0 @@
@model IEnumerable<Marechai.Areas.Admin.Models.DocumentCompanyViewModel>
@{
ViewData["Title"] = "Index";
}
<h1>Document companies</h1>
<p>
<a asp-action="Create" class="btn btn-primary">
Create New
</a>
</p>
<table class="table">
<thead>
<tr>
<th>
@Html.DisplayNameFor(model => model.Name)
</th>
<th>
@Html.DisplayNameFor(model => model.Company)
</th>
<th></th>
</tr>
</thead>
<tbody>
@foreach (var item in Model)
{
<tr>
<td>
@Html.DisplayFor(modelItem => item.Name)
</td>
<td>
<a asp-action="Details" asp-route-id="@item.CompanyId" asp-controller="Companies">
@Html.DisplayFor(modelItem => item.Company)</a>
</td>
<td>
<a asp-action="Details" class="btn btn-primary" asp-route-id="@item.Id">
Details
</a>
<a asp-action="Edit" class="btn btn-secondary" asp-route-id="@item.Id">
Edit
</a>
<a asp-action="Delete" class="btn btn-danger" asp-route-id="@item.Id">
Delete
</a>
</td>
</tr>
}
</tbody>
</table>

View File

@@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<Version>3.0.99.1047</Version>
<Version>3.0.99.1049</Version>
<Company>Canary Islands Computer Museum</Company>
<Copyright>Copyright © 2003-2020 Natalia Portillo</Copyright>
<Product>Canary Islands Computer Museum Website</Product>
@@ -43,6 +43,9 @@
<Content Update="Pages\Admin\Index.razor">
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
</Content>
<Content Update="Pages\Admin\DocumentCompanies.razor">
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
</Content>
</ItemGroup>
<ItemGroup>
<_ContentIncludedByDefault Remove="Areas\Admin\Views\BrowserTests\Delete.cshtml" />

View File

@@ -0,0 +1,97 @@
@{
/******************************************************************************
// MARECHAI: Master repository of computing history artifacts information
// ----------------------------------------------------------------------------
//
// Filename : DocumentCompanies.razor
// Author(s) : Natalia Portillo <claunia@claunia.com>
//
// --[ Description ] ----------------------------------------------------------
//
// List of document companies
//
// --[ License ] --------------------------------------------------------------
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as
// published by the Free Software Foundation, either version 3 of the
// License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
//
// ----------------------------------------------------------------------------
// Copyright © 2003-2020 Natalia Portillo
*******************************************************************************/
}
@page "/admin/document_companies"
@inherits OwningComponentBase<DocumentCompaniesService>
@inject IStringLocalizer<DocumentCompaniesService> L
@attribute [Authorize(Roles = "UberAdmin, Admin")]
<h3>@L["Document companies"]</h3>
@if (_companies is null)
{
<p>@L["Loading..."]</p>
return;
}
<p>
<span class="btn btn-primary">
@L["Create New"]
</span>
</p>
<table class="table">
<thead>
<tr>
<th>
@L["Name"]
</th>
<th>
@L["Linked company"]
</th>
<th></th>
</tr>
</thead>
<tbody>
@foreach (var item in _companies)
{
<tr>
<td>
@item.Name
</td>
<td>
<a href="/admin/companies/details/@item.CompanyId">
item.Company
</a>
</td>
<td>
<span class="btn btn-primary">
@L["Details"]
</span>
<span class="btn btn-secondary">
@L["Edit"]
</span>
<span class="btn btn-danger">
@L["Delete"]
</span>
</td>
</tr>
}
</tbody>
</table>
@code
{
List<DocumentCompanyViewModel> _companies;
protected override async Task OnInitializedAsync()
{
_companies = await Service.GetAsync();
}
}

View File

@@ -45,4 +45,7 @@
<li>
<a href="/admin/companies">@L["Companies"]</a>
</li>
<li>
<a href="/admin/document_companies">@L["Document companies"]</a>
</li>
</ul>

View File

@@ -138,4 +138,8 @@
<value>Compañías</value>
<comment>Companies.</comment>
</data>
<data name="Document companies" xml:space="preserve">
<value>Compañías de documentos</value>
<comment>Document companies.</comment>
</data>
</root>

View File

@@ -0,0 +1,153 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- ReSharper disable MarkupTextTypo -->
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="Document companies" xml:space="preserve">
<value>Compañías de documentos</value>
<comment>Document companies</comment>
</data>
<data name="Loading..." xml:space="preserve">
<value>Cargando...</value>
<comment>Message that appears while data is being loaded from database</comment>
</data>
<data name="Name" xml:space="preserve">
<value>Nombre</value>
<comment>Name</comment>
</data>
<data name="Linked company" xml:space="preserve">
<value>Compañía vinculada</value>
<comment>Linked company</comment>
</data>
<data name="Create new" xml:space="preserve">
<value>Crear nueva</value>
<comment>Create new document company</comment>
</data>
<data name="Details" xml:space="preserve">
<value>Detalles</value>
<comment>Details</comment>
</data>
<data name="Edit" xml:space="preserve">
<value>Editar</value>
<comment>Edit</comment>
</data>
<data name="Delete" xml:space="preserve">
<value>Eliminar</value>
<comment>Delete</comment>
</data>
</root>

View File

@@ -0,0 +1,25 @@
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Marechai.Database.Models;
using Marechai.ViewModels;
using Microsoft.EntityFrameworkCore;
namespace Marechai.Services
{
public class DocumentCompaniesService
{
readonly MarechaiContext _context;
public DocumentCompaniesService(MarechaiContext context) => _context = context;
public async Task<List<DocumentCompanyViewModel>> GetAsync() => await _context.
DocumentCompanies.OrderBy(c => c.Name).
Select(d => new DocumentCompanyViewModel
{
Id = d.Id, Name = d.Name,
Company = d.Company.Name,
CompanyId = d.CompanyId
}).ToListAsync();
}
}

View File

@@ -48,6 +48,7 @@ namespace Marechai.Services
services.AddScoped<MachinesService>();
services.AddScoped<AdminService>();
services.AddScoped<BrowserTestsService>();
services.AddScoped<DocumentCompaniesService>();
}
}
}

View File

@@ -1,6 +1,6 @@
using System.ComponentModel;
namespace Marechai.Areas.Admin.Models
namespace Marechai.ViewModels
{
public class DocumentCompanyViewModel : BaseViewModel<int>
{