Add companies to document admin page.

This commit is contained in:
2020-08-09 17:04:22 +01:00
parent eadedfde30
commit 3952f03cf7
6 changed files with 371 additions and 13 deletions

View File

@@ -33,6 +33,9 @@
@inherits OwningComponentBase<DocumentsService>
@inject IStringLocalizer<DocumentsService> L
@inject Iso31661NumericService CountriesService
@inject DocumentCompaniesService CompaniesService
@inject DocumentRolesService DocumentRolesService
@inject CompaniesByDocumentService CompaniesByDocumentService
@inject NavigationManager NavigationManager
@inject IWebHostEnvironment Host
@inject IJSRuntime JSRuntime
@@ -136,3 +139,85 @@
}
<a href="/admin/documents" class="btn btn-secondary">@L["Back to list"]</a>
</div>
@if (!_editing)
{
<hr />
<h3>@L["Companies involved in this document"]</h3>
<Button Color="Color.Success" Clicked="OnAddCompanyClick" Disabled="_addingCompany">@L["Add new (company)"]</Button>
@if (_addingCompany)
{
<div>
<Field>
<FieldLabel>@L["Company"]</FieldLabel>
<Select Disabled="_savingCompany" TValue="int?" @bind-SelectedValue="@_addingCompanyId">
@foreach (var company in _companies)
{
<SelectItem TValue="int?" Value="@company.Id">@company.Name</SelectItem>
}
</Select>
</Field>
<Field>
<FieldLabel>@L["Role"]</FieldLabel>
<Select Disabled="!_editing" TValue="string" @bind-SelectedValue="@_addingCompanyRoleId">
@foreach (var role in _roles)
{
<SelectItem TValue="string" Value="@role.Id">@role.Name</SelectItem>
}
</Select>
</Field>
<Button Color="Color.Primary" Clicked="@CancelAddCpu" Disabled="@_savingCompany">@L["Cancel"]</Button>
<Button Color="Color.Success" Clicked="@ConfirmAddCpu" Disabled="@_savingCompany">@L["Add"]</Button>
</div>
}
@if (_documentCompanies?.Count > 0)
{
<div>
<table class="table table-striped">
<thead>
<tr>
<th>
@L["Company"]
</th>
<th>
@L["Role"]
</th>
<th></th>
</tr>
</thead>
<tbody>
@foreach (var item in _documentCompanies)
{
<tr>
<td>
@item.Company
</td>
<td>
@item.Role
</td>
<td>
<Button Color="Color.Danger" Clicked="() => {ShowCpuDeleteModal(item.Id);}" Disabled="@_addingCompany">@L["Delete"]</Button>
</td>
</tr>
}
</tbody>
</table>
</div>
}
<Modal @ref="_frmDelete" IsCentered="true" Closing="@ModalClosing">
<ModalBackdrop />
<ModalContent Centered="true">
<ModalHeader>
<ModalTitle>@_deleteTitle</ModalTitle>
<CloseButton Clicked="@HideModal" />
</ModalHeader>
<ModalBody>
<Text>@_deleteText</Text>
</ModalBody>
<ModalFooter>
<Button Color="Color.Primary" Clicked="@HideModal" Disabled="@_deleteInProgress">@L["Cancel"]</Button>
<Button Color="Color.Danger" Clicked="@ConfirmDelete" Disabled="@_deleteInProgress">@L["Delete"]</Button>
</ModalFooter>
</ModalContent>
</Modal>
}

View File

@@ -25,6 +25,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Blazorise;
using Marechai.Database.Models;
@@ -37,15 +38,28 @@ namespace Marechai.Pages.Admin.Details
{
public partial class Document
{
AuthenticationState _authState;
List<Iso31661Numeric> _countries;
bool _creating;
bool _editing;
bool _loaded;
DocumentViewModel _model;
bool _unknownCountry;
bool _unknownNativeTitle;
bool _unknownPublished;
bool _addingCompany;
int? _addingCompanyId;
string _addingCompanyRoleId;
AuthenticationState _authState;
List<DocumentCompanyViewModel> _companies;
List<Iso31661Numeric> _countries;
bool _creating;
CompanyByDocumentViewModel _currentCompanyByDocument;
bool _deleteInProgress;
string _deleteText;
string _deleteTitle;
bool _deletingCompanyByDocument;
List<CompanyByDocumentViewModel> _documentCompanies;
bool _editing;
Modal _frmDelete;
bool _loaded;
DocumentViewModel _model;
List<DocumentRoleViewModel> _roles;
bool _savingCompany;
bool _unknownCountry;
bool _unknownNativeTitle;
bool _unknownPublished;
[Parameter]
public long Id { get; set; }
@@ -64,9 +78,12 @@ namespace Marechai.Pages.Admin.Details
!_creating)
return;
_countries = await CountriesService.GetAsync();
_model = _creating ? new DocumentViewModel() : await Service.GetAsync(Id);
_authState = await AuthenticationStateProvider.GetAuthenticationStateAsync();
_countries = await CountriesService.GetAsync();
_companies = await CompaniesService.GetAsync();
_roles = await DocumentRolesService.GetEnabledAsync();
_model = _creating ? new DocumentViewModel() : await Service.GetAsync(Id);
_authState = await AuthenticationStateProvider.GetAuthenticationStateAsync();
_addingCompanyRoleId = _roles.First().Id;
_editing = _creating || NavigationManager.ToBaseRelativePath(NavigationManager.Uri).ToLowerInvariant().
StartsWith("admin/documents/edit/",
@@ -147,5 +164,103 @@ namespace Marechai.Pages.Admin.Details
void ValidateNativeTitle(ValidatorEventArgs e) =>
Validators.ValidateString(e, L["Native title must be smaller than 256 characters."], 256);
void OnAddCompanyClick()
{
_addingCompany = true;
_savingCompany = false;
_addingCompanyId = _companies.First().Id;
}
void CancelAddCpu()
{
_addingCompany = false;
_savingCompany = false;
_addingCompanyId = null;
}
async Task ConfirmAddCpu()
{
if(_addingCompanyId is null ||
_addingCompanyId <= 0)
{
CancelAddCpu();
return;
}
_savingCompany = true;
// Yield thread to let UI to update
await Task.Yield();
await CompaniesByDocumentService.CreateAsync(_addingCompanyId.Value, Id, _addingCompanyRoleId,
(await UserManager.GetUserAsync(_authState.User)).Id);
_documentCompanies = await CompaniesByDocumentService.GetByDocument(Id);
_addingCompany = false;
_savingCompany = false;
_addingCompanyId = null;
// Yield thread to let UI to update
await Task.Yield();
// Tell we finished loading
StateHasChanged();
}
void ShowCpuDeleteModal(long itemId)
{
_currentCompanyByDocument = _documentCompanies.FirstOrDefault(n => n.Id == itemId);
_deletingCompanyByDocument = true;
_deleteTitle = L["Delete company from this document"];
_deleteText =
string.Format(L["Are you sure you want to delete the company {0} with role {1} from this document?"],
_currentCompanyByDocument?.Company, _currentCompanyByDocument?.Role);
_frmDelete.Show();
}
void ModalClosing(ModalClosingEventArgs obj)
{
_deleteInProgress = false;
_deletingCompanyByDocument = false;
_currentCompanyByDocument = null;
}
void HideModal() => _frmDelete.Hide();
async void ConfirmDelete()
{
if(_deletingCompanyByDocument)
await ConfirmDeleteCpuByMachine();
}
async Task ConfirmDeleteCpuByMachine()
{
if(_currentCompanyByDocument is null)
return;
_deleteInProgress = true;
// Yield thread to let UI to update
await Task.Yield();
await CompaniesByDocumentService.DeleteAsync(_currentCompanyByDocument.Id,
(await UserManager.GetUserAsync(_authState.User)).Id);
_documentCompanies = await CompaniesByDocumentService.GetByDocument(Id);
_deleteInProgress = false;
_frmDelete.Hide();
// Yield thread to let UI to update
await Task.Yield();
// Tell we finished loading
StateHasChanged();
}
}
}

View File

@@ -92,4 +92,25 @@
<data name="Unknown (country of publication)" xml:space="preserve">
<value>Unknown</value>
</data>
<data name="Companies involved in this document" xml:space="preserve">
<value>Companies involved in this document</value>
</data>
<data name="Add new (company)" xml:space="preserve">
<value>Add new</value>
</data>
<data name="Company" xml:space="preserve">
<value>Company</value>
</data>
<data name="Role" xml:space="preserve">
<value>Role</value>
</data>
<data name="Add" xml:space="preserve">
<value>Add</value>
</data>
<data name="Delete company from this document" xml:space="preserve">
<value>Delete company from this document</value>
</data>
<data name="Are you sure you want to delete the company {0} with role {1} from this document?" xml:space="preserve">
<value>Are you sure you want to delete the company {0} with role {1} from this document?</value>
</data>
</root>

View File

@@ -147,7 +147,7 @@
<comment>Delete document</comment>
</data>
<data name="Are you sure you want to delete the document {0}?" xml:space="preserve">
<value>¿Está seguro de que desea borrar el libro {0}?</value>
<value>¿Estás seguro de eliminar el libro {0}?</value>
<comment>{0} document name</comment>
</data>
<data name="Cancel" xml:space="preserve">
@@ -208,4 +208,25 @@
<data name="Native title must be smaller than 256 characters." xml:space="preserve">
<value>El título nativo debe contener menos de 256 caracteres.</value>
</data>
<data name="Add" xml:space="preserve">
<value>Añadir</value>
</data>
<data name="Add new (company)" xml:space="preserve">
<value>Añadir nueva</value>
</data>
<data name="Are you sure you want to delete the company {0} with role {1} from this document?" xml:space="preserve">
<value>¿Estás seguro de eliminar la compañía {0} con rol {1} de este documento?</value>
</data>
<data name="Companies involved in this document" xml:space="preserve">
<value>Compañías involucradas en este documento</value>
</data>
<data name="Company" xml:space="preserve">
<value>Compañía</value>
</data>
<data name="Delete company from this document" xml:space="preserve">
<value>Eliminar compañía de este documento</value>
</data>
<data name="Role" xml:space="preserve">
<value>Rol</value>
</data>
</root>

View File

@@ -0,0 +1,80 @@
/******************************************************************************
// MARECHAI: Master repository of computing history artifacts information
// ----------------------------------------------------------------------------
//
// Author(s) : Natalia Portillo <claunia@claunia.com>
//
// --[ 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
*******************************************************************************/
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 CompaniesByDocumentService
{
readonly MarechaiContext _context;
public CompaniesByDocumentService(MarechaiContext context) => _context = context;
public async Task<List<CompanyByDocumentViewModel>> GetByDocument(long documentId) =>
await _context.CompaniesByDocuments.Where(p => p.DocumentId == documentId).
Select(p => new CompanyByDocumentViewModel
{
Id = p.Id,
Company = p.Company.Name,
CompanyId = p.CompanyId,
RoleId = p.RoleId,
Role = p.Role.Name,
DocumentId = p.DocumentId
}).OrderBy(p => p.Company).ThenBy(p => p.Role).ToListAsync();
public async Task DeleteAsync(long id, string userId)
{
CompaniesByDocument item = await _context.CompaniesByDocuments.FindAsync(id);
if(item is null)
return;
_context.CompaniesByDocuments.Remove(item);
await _context.SaveChangesWithUserAsync(userId);
}
public async Task<long> CreateAsync(int companyId, long documentId, string roleId, string userId)
{
var item = new CompaniesByDocument
{
CompanyId = companyId,
DocumentId = documentId,
RoleId = roleId
};
await _context.CompaniesByDocuments.AddAsync(item);
await _context.SaveChangesWithUserAsync(userId);
return item.Id;
}
}
}

View File

@@ -0,0 +1,36 @@
/******************************************************************************
// MARECHAI: Master repository of computing history artifacts information
// ----------------------------------------------------------------------------
//
// Author(s) : Natalia Portillo <claunia@claunia.com>
//
// --[ 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
*******************************************************************************/
namespace Marechai.ViewModels
{
public class CompanyByDocumentViewModel : BaseViewModel<long>
{
public int CompanyId { get; set; }
public long DocumentId { get; set; }
public string RoleId { get; set; }
public string Company { get; set; }
public string Role { get; set; }
}
}