mirror of
https://github.com/claunia/marechai.git
synced 2025-12-16 19:14:25 +00:00
Add companies to magazine admin page.
This commit is contained in:
@@ -33,6 +33,9 @@
|
|||||||
@inherits OwningComponentBase<MagazinesService>
|
@inherits OwningComponentBase<MagazinesService>
|
||||||
@inject IStringLocalizer<MagazinesService> L
|
@inject IStringLocalizer<MagazinesService> L
|
||||||
@inject Iso31661NumericService CountriesService
|
@inject Iso31661NumericService CountriesService
|
||||||
|
@inject DocumentCompaniesService CompaniesService
|
||||||
|
@inject DocumentRolesService DocumentRolesService
|
||||||
|
@inject CompaniesByMagazineService CompaniesByMagazineService
|
||||||
@inject NavigationManager NavigationManager
|
@inject NavigationManager NavigationManager
|
||||||
@inject IWebHostEnvironment Host
|
@inject IWebHostEnvironment Host
|
||||||
@inject IJSRuntime JSRuntime
|
@inject IJSRuntime JSRuntime
|
||||||
@@ -157,3 +160,85 @@
|
|||||||
}
|
}
|
||||||
<a href="/admin/magazines" class="btn btn-secondary">@L["Back to list"]</a>
|
<a href="/admin/magazines" class="btn btn-secondary">@L["Back to list"]</a>
|
||||||
</div>
|
</div>
|
||||||
|
@if (!_editing)
|
||||||
|
{
|
||||||
|
<hr />
|
||||||
|
<h3>@L["Companies involved in this magazine"]</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 (_magazineCompanies?.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 _magazineCompanies)
|
||||||
|
{
|
||||||
|
<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>
|
||||||
|
}
|
||||||
@@ -25,6 +25,7 @@
|
|||||||
|
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using Blazorise;
|
using Blazorise;
|
||||||
using Marechai.Database.Models;
|
using Marechai.Database.Models;
|
||||||
@@ -37,12 +38,25 @@ namespace Marechai.Pages.Admin.Details
|
|||||||
{
|
{
|
||||||
public partial class Magazine
|
public partial class Magazine
|
||||||
{
|
{
|
||||||
|
bool _addingCompany;
|
||||||
|
int? _addingCompanyId;
|
||||||
|
string _addingCompanyRoleId;
|
||||||
AuthenticationState _authState;
|
AuthenticationState _authState;
|
||||||
|
List<DocumentCompanyViewModel> _companies;
|
||||||
List<Iso31661Numeric> _countries;
|
List<Iso31661Numeric> _countries;
|
||||||
bool _creating;
|
bool _creating;
|
||||||
|
CompanyByMagazineViewModel _currentCompanyByMagazine;
|
||||||
|
bool _deleteInProgress;
|
||||||
|
string _deleteText;
|
||||||
|
string _deleteTitle;
|
||||||
|
bool _deletingCompanyByMagazine;
|
||||||
bool _editing;
|
bool _editing;
|
||||||
|
Modal _frmDelete;
|
||||||
bool _loaded;
|
bool _loaded;
|
||||||
|
List<CompanyByMagazineViewModel> _magazineCompanies;
|
||||||
MagazineViewModel _model;
|
MagazineViewModel _model;
|
||||||
|
List<DocumentRoleViewModel> _roles;
|
||||||
|
bool _savingCompany;
|
||||||
bool _unknownCountry;
|
bool _unknownCountry;
|
||||||
bool _unknownFirstPublication;
|
bool _unknownFirstPublication;
|
||||||
bool _unknownIssn;
|
bool _unknownIssn;
|
||||||
@@ -66,8 +80,11 @@ namespace Marechai.Pages.Admin.Details
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
_countries = await CountriesService.GetAsync();
|
_countries = await CountriesService.GetAsync();
|
||||||
|
_companies = await CompaniesService.GetAsync();
|
||||||
|
_roles = await DocumentRolesService.GetEnabledAsync();
|
||||||
_model = _creating ? new MagazineViewModel() : await Service.GetAsync(Id);
|
_model = _creating ? new MagazineViewModel() : await Service.GetAsync(Id);
|
||||||
_authState = await AuthenticationStateProvider.GetAuthenticationStateAsync();
|
_authState = await AuthenticationStateProvider.GetAuthenticationStateAsync();
|
||||||
|
_addingCompanyRoleId = _roles.First().Id;
|
||||||
|
|
||||||
_editing = _creating || NavigationManager.ToBaseRelativePath(NavigationManager.Uri).ToLowerInvariant().
|
_editing = _creating || NavigationManager.ToBaseRelativePath(NavigationManager.Uri).ToLowerInvariant().
|
||||||
StartsWith("admin/magazines/edit/",
|
StartsWith("admin/magazines/edit/",
|
||||||
@@ -156,5 +173,103 @@ namespace Marechai.Pages.Admin.Details
|
|||||||
Validators.ValidateString(e, L["Native title must be smaller than 256 characters."], 256);
|
Validators.ValidateString(e, L["Native title must be smaller than 256 characters."], 256);
|
||||||
|
|
||||||
void ValidateIssn(ValidatorEventArgs e) => Validators.ValidateIssn(e);
|
void ValidateIssn(ValidatorEventArgs e) => Validators.ValidateIssn(e);
|
||||||
|
|
||||||
|
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 CompaniesByMagazineService.CreateAsync(_addingCompanyId.Value, Id, _addingCompanyRoleId,
|
||||||
|
(await UserManager.GetUserAsync(_authState.User)).Id);
|
||||||
|
|
||||||
|
_magazineCompanies = await CompaniesByMagazineService.GetByMagazine(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)
|
||||||
|
{
|
||||||
|
_currentCompanyByMagazine = _magazineCompanies.FirstOrDefault(n => n.Id == itemId);
|
||||||
|
_deletingCompanyByMagazine = true;
|
||||||
|
_deleteTitle = L["Delete company from this magazine"];
|
||||||
|
|
||||||
|
_deleteText =
|
||||||
|
string.Format(L["Are you sure you want to delete the company {0} with role {1} from this magazine?"],
|
||||||
|
_currentCompanyByMagazine?.Company, _currentCompanyByMagazine?.Role);
|
||||||
|
|
||||||
|
_frmDelete.Show();
|
||||||
|
}
|
||||||
|
|
||||||
|
void ModalClosing(ModalClosingEventArgs obj)
|
||||||
|
{
|
||||||
|
_deleteInProgress = false;
|
||||||
|
_deletingCompanyByMagazine = false;
|
||||||
|
_currentCompanyByMagazine = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
void HideModal() => _frmDelete.Hide();
|
||||||
|
|
||||||
|
async void ConfirmDelete()
|
||||||
|
{
|
||||||
|
if(_deletingCompanyByMagazine)
|
||||||
|
await ConfirmDeleteCpuByMachine();
|
||||||
|
}
|
||||||
|
|
||||||
|
async Task ConfirmDeleteCpuByMachine()
|
||||||
|
{
|
||||||
|
if(_currentCompanyByMagazine is null)
|
||||||
|
return;
|
||||||
|
|
||||||
|
_deleteInProgress = true;
|
||||||
|
|
||||||
|
// Yield thread to let UI to update
|
||||||
|
await Task.Yield();
|
||||||
|
|
||||||
|
await CompaniesByMagazineService.DeleteAsync(_currentCompanyByMagazine.Id,
|
||||||
|
(await UserManager.GetUserAsync(_authState.User)).Id);
|
||||||
|
|
||||||
|
_magazineCompanies = await CompaniesByMagazineService.GetByMagazine(Id);
|
||||||
|
|
||||||
|
_deleteInProgress = false;
|
||||||
|
_frmDelete.Hide();
|
||||||
|
|
||||||
|
// Yield thread to let UI to update
|
||||||
|
await Task.Yield();
|
||||||
|
|
||||||
|
// Tell we finished loading
|
||||||
|
StateHasChanged();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -101,4 +101,25 @@
|
|||||||
<data name="Magazines" xml:space="preserve">
|
<data name="Magazines" xml:space="preserve">
|
||||||
<value>Magazines</value>
|
<value>Magazines</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="Companies involved in this magazine" xml:space="preserve">
|
||||||
|
<value>Companies involved in this magazine</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 magazine" xml:space="preserve">
|
||||||
|
<value>Delete company from this magazine</value>
|
||||||
|
</data>
|
||||||
|
<data name="Are you sure you want to delete the company {0} with role {1} from this magazine?" xml:space="preserve">
|
||||||
|
<value>Are you sure you want to delete the company {0} with role {1} from this magazine?</value>
|
||||||
|
</data>
|
||||||
</root>
|
</root>
|
||||||
@@ -101,4 +101,25 @@
|
|||||||
<data name="Unknown (native title)" xml:space="preserve">
|
<data name="Unknown (native title)" xml:space="preserve">
|
||||||
<value>Desconocido</value>
|
<value>Desconocido</value>
|
||||||
</data>
|
</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 magazine?" xml:space="preserve">
|
||||||
|
<value>¿Estás seguro de eliminar la compañía {0} con rol {1} de esta revista?</value>
|
||||||
|
</data>
|
||||||
|
<data name="Companies involved in this magazine" xml:space="preserve">
|
||||||
|
<value>Compañías involucradas en esta revista</value>
|
||||||
|
</data>
|
||||||
|
<data name="Company" xml:space="preserve">
|
||||||
|
<value>Compañía</value>
|
||||||
|
</data>
|
||||||
|
<data name="Delete company from this magazine" xml:space="preserve">
|
||||||
|
<value>Eliminar compañía de esta revista</value>
|
||||||
|
</data>
|
||||||
|
<data name="Role" xml:space="preserve">
|
||||||
|
<value>Rol</value>
|
||||||
|
</data>
|
||||||
</root>
|
</root>
|
||||||
80
Marechai/Services/CompaniesByMagazineService.cs
Normal file
80
Marechai/Services/CompaniesByMagazineService.cs
Normal 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 CompaniesByMagazineService
|
||||||
|
{
|
||||||
|
readonly MarechaiContext _context;
|
||||||
|
|
||||||
|
public CompaniesByMagazineService(MarechaiContext context) => _context = context;
|
||||||
|
|
||||||
|
public async Task<List<CompanyByMagazineViewModel>> GetByMagazine(long magazineId) =>
|
||||||
|
await _context.CompaniesByMagazines.Where(p => p.MagazineId == magazineId).
|
||||||
|
Select(p => new CompanyByMagazineViewModel
|
||||||
|
{
|
||||||
|
Id = p.Id,
|
||||||
|
Company = p.Company.Name,
|
||||||
|
CompanyId = p.CompanyId,
|
||||||
|
RoleId = p.RoleId,
|
||||||
|
Role = p.Role.Name,
|
||||||
|
MagazineId = p.MagazineId
|
||||||
|
}).OrderBy(p => p.Company).ThenBy(p => p.Role).ToListAsync();
|
||||||
|
|
||||||
|
public async Task DeleteAsync(long id, string userId)
|
||||||
|
{
|
||||||
|
CompaniesByMagazine item = await _context.CompaniesByMagazines.FindAsync(id);
|
||||||
|
|
||||||
|
if(item is null)
|
||||||
|
return;
|
||||||
|
|
||||||
|
_context.CompaniesByMagazines.Remove(item);
|
||||||
|
|
||||||
|
await _context.SaveChangesWithUserAsync(userId);
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<long> CreateAsync(int companyId, long magazineId, string roleId, string userId)
|
||||||
|
{
|
||||||
|
var item = new CompaniesByMagazine
|
||||||
|
{
|
||||||
|
CompanyId = companyId,
|
||||||
|
MagazineId = magazineId,
|
||||||
|
RoleId = roleId
|
||||||
|
};
|
||||||
|
|
||||||
|
await _context.CompaniesByMagazines.AddAsync(item);
|
||||||
|
await _context.SaveChangesWithUserAsync(userId);
|
||||||
|
|
||||||
|
return item.Id;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
36
Marechai/ViewModels/CompanyByMagazineViewModel.cs
Normal file
36
Marechai/ViewModels/CompanyByMagazineViewModel.cs
Normal 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 CompanyByMagazineViewModel : BaseViewModel<long>
|
||||||
|
{
|
||||||
|
public int CompanyId { get; set; }
|
||||||
|
public long MagazineId { get; set; }
|
||||||
|
public string RoleId { get; set; }
|
||||||
|
public string Company { get; set; }
|
||||||
|
public string Role { get; set; }
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user