diff --git a/Marechai/Areas/Admin/Controllers/MachineFamiliesController.cs b/Marechai/Areas/Admin/Controllers/MachineFamiliesController.cs deleted file mode 100644 index 9c69fde7..00000000 --- a/Marechai/Areas/Admin/Controllers/MachineFamiliesController.cs +++ /dev/null @@ -1,182 +0,0 @@ -/****************************************************************************** -// MARECHAI: Master repository of computing history artifacts information -// ---------------------------------------------------------------------------- -// -// Filename : MachineFamiliesController.cs -// Author(s) : Natalia Portillo -// -// --[ Description ] ---------------------------------------------------------- -// -// Machine families admin controller -// -// --[ 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 -*******************************************************************************/ - -using System.Linq; -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; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Query; - -namespace Marechai.Areas.Admin.Controllers -{ - [Area("Admin"), Authorize] - public class MachineFamiliesController : Controller - { - readonly MarechaiContext _context; - - public MachineFamiliesController(MarechaiContext context) => _context = context; - - // GET: Admin/MachineFamilies - public async Task Index() - { - IIncludableQueryable marechaiContext = - _context.MachineFamilies.Include(m => m.Company); - - return View(await marechaiContext.OrderBy(m => m.Company.Name).ThenBy(m => m.Name). - Select(m => new MachineFamilyViewModel - { - Id = m.Id, Company = m.Company.Name, Name = m.Name - }).ToListAsync()); - } - - // GET: Admin/MachineFamilies/Details/5 - public async Task Details(int? id) - { - if(id == null) - return NotFound(); - - MachineFamily machineFamily = - await _context.MachineFamilies.Include(m => m.Company).FirstOrDefaultAsync(m => m.Id == id); - - if(machineFamily == null) - return NotFound(); - - return View(machineFamily); - } - - // GET: Admin/MachineFamilies/Create - public IActionResult Create() - { - ViewData["CompanyId"] = new SelectList(_context.Companies, "Id", "Name"); - - return View(); - } - - // POST: Admin/MachineFamilies/Create - // To protect from overposting attacks, please enable the specific properties you want to bind to, for - // more details see http://go.microsoft.com/fwlink/?LinkId=317598. - [HttpPost, ValidateAntiForgeryToken] - public async Task Create([Bind("Id,CompanyId,Name")] MachineFamily machineFamily) - { - if(ModelState.IsValid) - { - _context.Add(machineFamily); - await _context.SaveChangesAsync(); - - return RedirectToAction(nameof(Index)); - } - - ViewData["CompanyId"] = new SelectList(_context.Companies, "Id", "Name", machineFamily.CompanyId); - - return View(machineFamily); - } - - // GET: Admin/MachineFamilies/Edit/5 - public async Task Edit(int? id) - { - if(id == null) - return NotFound(); - - MachineFamily machineFamily = await _context.MachineFamilies.FindAsync(id); - - if(machineFamily == null) - return NotFound(); - - ViewData["CompanyId"] = new SelectList(_context.Companies, "Id", "Name", machineFamily.CompanyId); - - return View(machineFamily); - } - - // POST: Admin/MachineFamilies/Edit/5 - // To protect from overposting attacks, please enable the specific properties you want to bind to, for - // more details see http://go.microsoft.com/fwlink/?LinkId=317598. - [HttpPost, ValidateAntiForgeryToken] - public async Task Edit(int id, [Bind("Id,CompanyId,Name")] MachineFamily machineFamily) - { - if(id != machineFamily.Id) - return NotFound(); - - if(ModelState.IsValid) - { - try - { - _context.Update(machineFamily); - await _context.SaveChangesAsync(); - } - catch(DbUpdateConcurrencyException) - { - if(!MachineFamilyExists(machineFamily.Id)) - return NotFound(); - - throw; - } - - return RedirectToAction(nameof(Index)); - } - - ViewData["CompanyId"] = new SelectList(_context.Companies, "Id", "Name", machineFamily.CompanyId); - - return View(machineFamily); - } - - // GET: Admin/MachineFamilies/Delete/5 - public async Task Delete(int? id) - { - if(id == null) - return NotFound(); - - MachineFamily machineFamily = - await _context.MachineFamilies.Include(m => m.Company).FirstOrDefaultAsync(m => m.Id == id); - - if(machineFamily == null) - return NotFound(); - - return View(machineFamily); - } - - // POST: Admin/MachineFamilies/Delete/5 - [HttpPost, ActionName("Delete"), ValidateAntiForgeryToken] - public async Task DeleteConfirmed(int id) - { - MachineFamily machineFamily = await _context.MachineFamilies.FindAsync(id); - _context.MachineFamilies.Remove(machineFamily); - await _context.SaveChangesAsync(); - - return RedirectToAction(nameof(Index)); - } - - bool MachineFamilyExists(int id) => _context.MachineFamilies.Any(e => e.Id == id); - } -} \ No newline at end of file diff --git a/Marechai/Areas/Admin/Views/MachineFamilies/Create.cshtml b/Marechai/Areas/Admin/Views/MachineFamilies/Create.cshtml deleted file mode 100644 index 6554669e..00000000 --- a/Marechai/Areas/Admin/Views/MachineFamilies/Create.cshtml +++ /dev/null @@ -1,70 +0,0 @@ -@{ - /****************************************************************************** -// MARECHAI: Master repository of computing history artifacts information -// ---------------------------------------------------------------------------- -// -// Filename : Create.cshtml -// Author(s) : Natalia Portillo -// -// --[ Description ] ---------------------------------------------------------- -// -// Admin view create -// -// --[ 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"] = "Create"; -} -

Create

-

Machine family

-
-
-
-
-
-
-
- - -
-
- - - - -
-
- - - Back to List - -
-
-
-
- -@section Scripts { - @{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); } -} \ No newline at end of file diff --git a/Marechai/Marechai.csproj b/Marechai/Marechai.csproj index 64f2249b..b4fb573d 100644 --- a/Marechai/Marechai.csproj +++ b/Marechai/Marechai.csproj @@ -136,5 +136,6 @@ <_ContentIncludedByDefault Remove="Areas\Admin\Views\InstructionSets\Create.cshtml" /> <_ContentIncludedByDefault Remove="Areas\Admin\Views\Licenses\Create.cshtml" /> <_ContentIncludedByDefault Remove="Areas\Admin\Views\Licenses\Edit.cshtml" /> + <_ContentIncludedByDefault Remove="Areas\Admin\Views\MachineFamilies\Create.cshtml" /> \ No newline at end of file diff --git a/Marechai/Pages/Admin/Details/MachineFamily.razor b/Marechai/Pages/Admin/Details/MachineFamily.razor index 24a455b5..4165614c 100644 --- a/Marechai/Pages/Admin/Details/MachineFamily.razor +++ b/Marechai/Pages/Admin/Details/MachineFamily.razor @@ -32,6 +32,7 @@ @page "/admin/machine_families/details/{Id:int}" @page "/admin/machine_families/edit/{Id:int}" +@page "/admin/machine_families/create" @inherits OwningComponentBase @inject IStringLocalizer L @inject CompaniesService CompaniesService diff --git a/Marechai/Pages/Admin/Details/MachineFamily.razor.cs b/Marechai/Pages/Admin/Details/MachineFamily.razor.cs index d845d4c8..6c6a0026 100644 --- a/Marechai/Pages/Admin/Details/MachineFamily.razor.cs +++ b/Marechai/Pages/Admin/Details/MachineFamily.razor.cs @@ -11,6 +11,7 @@ namespace Marechai.Pages.Admin.Details public partial class MachineFamily { List _companies; + bool _creating; bool _editing; bool _loaded; MachineFamilyViewModel _model; @@ -24,14 +25,20 @@ namespace Marechai.Pages.Admin.Details _loaded = true; - if(Id <= 0) + _creating = NavigationManager.ToBaseRelativePath(NavigationManager.Uri).ToLowerInvariant(). + StartsWith("admin/machine_families/create", + StringComparison.InvariantCulture); + + if(Id <= 0 && + !_creating) return; _companies = await CompaniesService.GetAsync(); - _model = await Service.GetAsync(Id); + _model = _creating ? new MachineFamilyViewModel() : await Service.GetAsync(Id); - _editing = NavigationManager.ToBaseRelativePath(NavigationManager.Uri).ToLowerInvariant(). - StartsWith("admin/machine_families/edit/", StringComparison.InvariantCulture); + _editing = _creating || NavigationManager.ToBaseRelativePath(NavigationManager.Uri).ToLowerInvariant(). + StartsWith("admin/machine_families/edit/", + StringComparison.InvariantCulture); StateHasChanged(); } @@ -45,7 +52,15 @@ namespace Marechai.Pages.Admin.Details async void OnCancelClicked() { _editing = false; - _model = await Service.GetAsync(Id); + + if(_creating) + { + NavigationManager.ToBaseRelativePath("admin/machine_families"); + + return; + } + + _model = await Service.GetAsync(Id); StateHasChanged(); } @@ -55,9 +70,14 @@ namespace Marechai.Pages.Admin.Details _model.Name?.Length > 255) return; - _editing = false; - await Service.UpdateAsync(_model); - _model = await Service.GetAsync(Id); + if(_creating) + Id = await Service.CreateAsync(_model); + else + await Service.UpdateAsync(_model); + + _editing = false; + _creating = false; + _model = await Service.GetAsync(Id); StateHasChanged(); } diff --git a/Marechai/Pages/Admin/MachineFamilies.razor b/Marechai/Pages/Admin/MachineFamilies.razor index f7116101..285558c0 100644 --- a/Marechai/Pages/Admin/MachineFamilies.razor +++ b/Marechai/Pages/Admin/MachineFamilies.razor @@ -42,9 +42,7 @@ return; }

- - @L["Create new"] - + @L["Create new"]

diff --git a/Marechai/Services/MachineFamiliesService.cs b/Marechai/Services/MachineFamiliesService.cs index 9ede9464..9c023773 100644 --- a/Marechai/Services/MachineFamiliesService.cs +++ b/Marechai/Services/MachineFamiliesService.cs @@ -39,6 +39,19 @@ namespace Marechai.Services await _context.SaveChangesAsync(); } + public async Task CreateAsync(MachineFamilyViewModel viewModel) + { + var model = new MachineFamily + { + Name = viewModel.Name, CompanyId = viewModel.CompanyId + }; + + await _context.MachineFamilies.AddAsync(model); + await _context.SaveChangesAsync(); + + return model.Id; + } + public async Task DeleteAsync(int id) { MachineFamily item = await _context.MachineFamilies.FindAsync(id);