From 86cfb40ed8602ccf34493524831b427d2f5d6a33 Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Wed, 27 May 2020 14:36:49 +0100 Subject: [PATCH] Add machine family editing in admin view. --- .../Admin/Views/MachineFamilies/Edit.cshtml | 73 ------------------- .../Pages/Admin/Details/MachineFamily.razor | 26 ++++++- .../Admin/Details/MachineFamily.razor.cs | 42 ++++++++++- Marechai/Pages/Admin/MachineFamilies.razor | 4 +- .../Services/MachineFamiliesService.es.resx | 16 ++++ Marechai/Services/MachineFamiliesService.cs | 19 ++++- Marechai/ViewModels/MachineFamilyViewModel.cs | 5 +- 7 files changed, 99 insertions(+), 86 deletions(-) delete mode 100644 Marechai/Areas/Admin/Views/MachineFamilies/Edit.cshtml diff --git a/Marechai/Areas/Admin/Views/MachineFamilies/Edit.cshtml b/Marechai/Areas/Admin/Views/MachineFamilies/Edit.cshtml deleted file mode 100644 index caa875cb..00000000 --- a/Marechai/Areas/Admin/Views/MachineFamilies/Edit.cshtml +++ /dev/null @@ -1,73 +0,0 @@ -@{ - /****************************************************************************** -// MARECHAI: Master repository of computing history artifacts information -// ---------------------------------------------------------------------------- -// -// Filename : Edit.cshtml -// Author(s) : Natalia Portillo -// -// --[ Description ] ---------------------------------------------------------- -// -// Admin view edit -// -// --[ 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 . -// -// ---------------------------------------------------------------------------- -// Copyright © 2003-2020 Natalia Portillo -*******************************************************************************/ -} -@model Marechai.Database.Models.MachineFamily - -@{ - ViewData["Title"] = "Edit"; -} -

Edit

-

Machine family

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

@L["Machine family details"]

@@ -48,7 +50,7 @@
@L["Company"] - @foreach (var company in _companies) { @company.Name @@ -57,10 +59,28 @@ @L["Name"] - + + + + @L["Please enter a valid name."] + + + + @if (_editing) + { + @L["Must not contain \"family\" or \"series\". Different regional names should be separated with /. Different numbers should be separated with comma."] + }
- @L["Edit"] + @if (!_editing) + { + + } + else + { + + + } @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 index b277899e..d845d4c8 100644 --- a/Marechai/Pages/Admin/Details/MachineFamily.razor.cs +++ b/Marechai/Pages/Admin/Details/MachineFamily.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,10 @@ namespace Marechai.Pages.Admin.Details { public partial class MachineFamily { - List _companies; - bool _editable; - bool _loaded; - Database.Models.MachineFamily _model; + List _companies; + bool _editing; + bool _loaded; + MachineFamilyViewModel _model; [Parameter] public int Id { get; set; } @@ -27,7 +30,38 @@ namespace Marechai.Pages.Admin.Details _companies = await CompaniesService.GetAsync(); _model = await Service.GetAsync(Id); + _editing = NavigationManager.ToBaseRelativePath(NavigationManager.Uri).ToLowerInvariant(). + StartsWith("admin/machine_families/edit/", StringComparison.InvariantCulture); + StateHasChanged(); } + + void OnEditClicked() + { + _editing = true; + StateHasChanged(); + } + + async void OnCancelClicked() + { + _editing = false; + _model = await Service.GetAsync(Id); + StateHasChanged(); + } + + async void OnSaveClicked() + { + if(string.IsNullOrWhiteSpace(_model.Name) || + _model.Name?.Length > 255) + return; + + _editing = false; + await Service.UpdateAsync(_model); + _model = await Service.GetAsync(Id); + StateHasChanged(); + } + + void ValidateName(ValidatorEventArgs e) => + Validators.ValidateString(e, L["Family name must contain less than 255 characters."], 255); } } \ No newline at end of file diff --git a/Marechai/Pages/Admin/MachineFamilies.razor b/Marechai/Pages/Admin/MachineFamilies.razor index 599dd7b1..93cce20f 100644 --- a/Marechai/Pages/Admin/MachineFamilies.razor +++ b/Marechai/Pages/Admin/MachineFamilies.razor @@ -70,9 +70,7 @@ @L["Details"] - - @L["Edit"] - + @L["Edit"] diff --git a/Marechai/Resources/Services/MachineFamiliesService.es.resx b/Marechai/Resources/Services/MachineFamiliesService.es.resx index ee72f2b1..af1211a9 100644 --- a/Marechai/Resources/Services/MachineFamiliesService.es.resx +++ b/Marechai/Resources/Services/MachineFamiliesService.es.resx @@ -170,4 +170,20 @@ Volver a la lista Back to list + + Guardar + Save + + + Por favor introduce un nombre válido. + Please enter a valid name. + + + No debe contener "familia" or "serie/quot;. Diferentes nombres regionales deben separarse con /. Diferentes números deben separarse con coma. + Must not contain "family" or "series". Different regional names should be separated with /. Different numbers should be separated with comma. + + + El nombre de la familia debe contener menos de 255 caracteres. + Family name must contain less than 255 characters. + \ No newline at end of file diff --git a/Marechai/Services/MachineFamiliesService.cs b/Marechai/Services/MachineFamiliesService.cs index 945650aa..9ede9464 100644 --- a/Marechai/Services/MachineFamiliesService.cs +++ b/Marechai/Services/MachineFamiliesService.cs @@ -20,7 +20,24 @@ 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 GetAsync(int id) => + await _context.MachineFamilies.Where(f => f.Id == id).Select(m => new MachineFamilyViewModel + { + Id = m.Id, CompanyId = m.CompanyId, Name = m.Name + }).FirstOrDefaultAsync(); + + public async Task UpdateAsync(MachineFamilyViewModel viewModel) + { + MachineFamily model = await _context.MachineFamilies.FindAsync(viewModel.Id); + + if(model is null) + return; + + model.Name = viewModel.Name; + model.CompanyId = viewModel.CompanyId; + + await _context.SaveChangesAsync(); + } public async Task DeleteAsync(int id) { diff --git a/Marechai/ViewModels/MachineFamilyViewModel.cs b/Marechai/ViewModels/MachineFamilyViewModel.cs index 759feca7..60cf8499 100644 --- a/Marechai/ViewModels/MachineFamilyViewModel.cs +++ b/Marechai/ViewModels/MachineFamilyViewModel.cs @@ -2,7 +2,8 @@ { public class MachineFamilyViewModel : BaseViewModel { - public string Company; - public string Name; + public string Company { get; set; } + public string Name { get; set; } + public int CompanyId { get; set; } } } \ No newline at end of file