From e68d4a3f053038e299c58093068b5ae0197c7ff8 Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Wed, 27 May 2020 20:39:08 +0100 Subject: [PATCH] Add document company editing in admin view. --- .../Admin/Views/DocumentCompanies/Edit.cshtml | 41 ------ .../Pages/Admin/Details/DocumentCompany.razor | 44 ++++-- .../Admin/Details/DocumentCompany.razor.cs | 64 ++++++++- Marechai/Pages/Admin/DocumentCompanies.razor | 4 +- .../Services/DocumentCompaniesService.en.resx | 125 ++++++++++++++++++ .../Services/DocumentCompaniesService.es.resx | 16 +++ Marechai/Services/DocumentCompaniesService.cs | 19 ++- 7 files changed, 254 insertions(+), 59 deletions(-) delete mode 100644 Marechai/Areas/Admin/Views/DocumentCompanies/Edit.cshtml create mode 100644 Marechai/Resources/Services/DocumentCompaniesService.en.resx diff --git a/Marechai/Areas/Admin/Views/DocumentCompanies/Edit.cshtml b/Marechai/Areas/Admin/Views/DocumentCompanies/Edit.cshtml deleted file mode 100644 index 955845ea..00000000 --- a/Marechai/Areas/Admin/Views/DocumentCompanies/Edit.cshtml +++ /dev/null @@ -1,41 +0,0 @@ -@model Marechai.Database.Models.DocumentCompany - -@{ - ViewData["Title"] = "Edit"; -} -

Edit

-

Document company

-
-
-
-
-
-
-
- - - - -
-
- - -
- -
- - Back to List -
-
-
-
- -@section Scripts { - @{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); } -} \ No newline at end of file diff --git a/Marechai/Pages/Admin/Details/DocumentCompany.razor b/Marechai/Pages/Admin/Details/DocumentCompany.razor index 102630b5..e8ca1673 100644 --- a/Marechai/Pages/Admin/Details/DocumentCompany.razor +++ b/Marechai/Pages/Admin/Details/DocumentCompany.razor @@ -31,9 +31,11 @@ } @page "/admin/document_companies/details/{Id:int}" +@page "/admin/document_companies/edit/{Id:int}" @inherits OwningComponentBase @inject IStringLocalizer L @inject CompaniesService CompaniesService +@inject NavigationManager NavigationManager @attribute [Authorize(Roles = "UberAdmin, Admin")]

@L["Document company details"]

@@ -48,22 +50,44 @@
@L["Name"] - + + + + @L["Please enter a valid name."] + + + - @if (_editable || _model.CompanyId != null) + @if (_editing || _model.CompanyId != null) { @L["Linked company"] - + @if (_editing) + { + @L["None (linked company)"] + } + @if (!_editing || + !_noLinkedCompany) + { + + } }
- @L["Edit"] - @L["Back to list"] + @if (!_editing) + { + + } + else + { + + + } + @L["Back to list"]
\ No newline at end of file diff --git a/Marechai/Pages/Admin/Details/DocumentCompany.razor.cs b/Marechai/Pages/Admin/Details/DocumentCompany.razor.cs index 95d3096d..a0500217 100644 --- a/Marechai/Pages/Admin/Details/DocumentCompany.razor.cs +++ b/Marechai/Pages/Admin/Details/DocumentCompany.razor.cs @@ -1,5 +1,8 @@ +using System; using System.Collections.Generic; using System.Threading.Tasks; +using Blazorise; +using Marechai.Shared; using Marechai.ViewModels; using Microsoft.AspNetCore.Components; @@ -7,10 +10,13 @@ namespace Marechai.Pages.Admin.Details { public partial class DocumentCompany { - List _companies; - bool _editable; - bool _loaded; - Database.Models.DocumentCompany _model; + List _companies; + bool _editing; + bool _loaded; + DocumentCompanyViewModel _model; + bool _noLinkedCompany; + bool _unknownName; + [Parameter] public int Id { get; set; } @@ -27,7 +33,57 @@ namespace Marechai.Pages.Admin.Details _companies = await CompaniesService.GetAsync(); _model = await Service.GetAsync(Id); + _editing = NavigationManager.ToBaseRelativePath(NavigationManager.Uri).ToLowerInvariant(). + StartsWith("admin/document_companies/edit/", + StringComparison.InvariantCulture); + + if(_editing) + SetCheckboxes(); + StateHasChanged(); } + + void SetCheckboxes() + { + _noLinkedCompany = !_model.CompanyId.HasValue; + _unknownName = string.IsNullOrWhiteSpace(_model.Name); + } + + void OnEditClicked() + { + _editing = true; + SetCheckboxes(); + StateHasChanged(); + } + + async void OnCancelClicked() + { + _editing = false; + _model = await Service.GetAsync(Id); + SetCheckboxes(); + StateHasChanged(); + } + + async void OnSaveClicked() + { + if(_noLinkedCompany) + _model.CompanyId = null; + else if(_model.CompanyId < 0) + return; + + if(_unknownName) + _model.Name = null; + else if(string.IsNullOrWhiteSpace(_model.Name)) + return; + + _editing = false; + await Service.UpdateAsync(_model); + _model = await Service.GetAsync(Id); + SetCheckboxes(); + StateHasChanged(); + } + + void ValidateName(ValidatorEventArgs e) => + Validators.ValidateString(e, L["Name must be smaller than 256 characters."], 256); } } \ No newline at end of file diff --git a/Marechai/Pages/Admin/DocumentCompanies.razor b/Marechai/Pages/Admin/DocumentCompanies.razor index cf46a59e..d033de04 100644 --- a/Marechai/Pages/Admin/DocumentCompanies.razor +++ b/Marechai/Pages/Admin/DocumentCompanies.razor @@ -72,9 +72,7 @@ @L["Details"] - - @L["Edit"] - + @L["Edit"] diff --git a/Marechai/Resources/Services/DocumentCompaniesService.en.resx b/Marechai/Resources/Services/DocumentCompaniesService.en.resx new file mode 100644 index 00000000..8cf5e54c --- /dev/null +++ b/Marechai/Resources/Services/DocumentCompaniesService.en.resx @@ -0,0 +1,125 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + None + None, referring to a linked company + + \ No newline at end of file diff --git a/Marechai/Resources/Services/DocumentCompaniesService.es.resx b/Marechai/Resources/Services/DocumentCompaniesService.es.resx index b3a1366d..2d5ad3f2 100644 --- a/Marechai/Resources/Services/DocumentCompaniesService.es.resx +++ b/Marechai/Resources/Services/DocumentCompaniesService.es.resx @@ -170,4 +170,20 @@ Volver a la lista Back to list + + Guardar + Save + + + Ninguna + None, referring to a linked company + + + Por favor introduce un nombre válido. + Please enter a valid name. + + + El nombre debe contener menos de 256 caracteres. + Name must be smaller than 256 characters. + \ No newline at end of file diff --git a/Marechai/Services/DocumentCompaniesService.cs b/Marechai/Services/DocumentCompaniesService.cs index 9db88c6e..d898cedb 100644 --- a/Marechai/Services/DocumentCompaniesService.cs +++ b/Marechai/Services/DocumentCompaniesService.cs @@ -22,7 +22,24 @@ namespace Marechai.Services CompanyId = d.CompanyId }).ToListAsync(); - public async Task GetAsync(int id) => await _context.DocumentCompanies.FindAsync(id); + public async Task GetAsync(int id) => + await _context.DocumentCompanies.Where(d => d.Id == id).Select(d => new DocumentCompanyViewModel + { + Id = d.Id, Name = d.Name, CompanyId = d.CompanyId + }).FirstOrDefaultAsync(); + + public async Task UpdateAsync(DocumentCompanyViewModel viewModel) + { + DocumentCompany model = await _context.DocumentCompanies.FindAsync(viewModel.Id); + + if(model is null) + return; + + model.CompanyId = viewModel.CompanyId; + model.Name = viewModel.Name; + + await _context.SaveChangesAsync(); + } public async Task DeleteAsync(int id) {