Tokk/Multiplechoicetrainer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bearbeitung von Lektion und Kurs

Browse Source
This commit is contained in:
Tokk
2020-06-09 16:00:08 +02:00
parent 6a49e1b8f7
commit 01585fc9ef
13 changed files with 317 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
MultipleChoiceTrainer/Controllers/CategoriesController.cs
View File

@@ -6,6 +6,7 @@ using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Rendering;
using Microsoft.EntityFrameworkCore;
using MultipleChoiceTrainer.Data;
using MultipleChoiceTrainer.Models;
using MultipleChoiceTrainer.Models.DataModels;
namespace MultipleChoiceTrainer.Controllers
@@ -19,24 +20,6 @@ namespace MultipleChoiceTrainer.Controllers
_context = context;
}
// GET: Categories/Details/5
public async Task<IActionResult> Details(int? id)
{
if (id == null)
{
return NotFound();
}
var category = await _context.Categories
.FirstOrDefaultAsync(m => m.Id == id);
if (category == null)
{
return NotFound();
}
return View(category);
}
// GET: Categories/Create
public IActionResult Create()
{
@@ -48,15 +31,15 @@ namespace MultipleChoiceTrainer.Controllers
// more details, see http://go.microsoft.com/fwlink/?LinkId=317598.
[HttpPost]
[ValidateAntiForgeryToken]
public async Task<IActionResult> Create([Bind("Id,Name,Description")] Category category)
public async Task<IActionResult> Create(CategoryEditViewModel editViewModel)
{
if (ModelState.IsValid)
{
_context.Add(category);
_context.Add(editViewModel.Entity);
await _context.SaveChangesAsync();
return RedirectToAction(nameof(Index), "Home");
return RedirectToAction(nameof(Index), "Home", new { categoryId = editViewModel.Entity.Id });
}
return View(category);
return View(editViewModel);
}
// GET: Categories/Edit/5
@@ -72,7 +55,7 @@ namespace MultipleChoiceTrainer.Controllers
{
return NotFound();
}
return View(category);
return View(new CategoryEditViewModel() { Entity = category });
}
// POST: Categories/Edit/5
@@ -80,23 +63,18 @@ namespace MultipleChoiceTrainer.Controllers
// more details, see http://go.microsoft.com/fwlink/?LinkId=317598.
[HttpPost]
[ValidateAntiForgeryToken]
public async Task<IActionResult> Edit(int id, [Bind("Id,Name,Description")] Category category)
public async Task<IActionResult> Edit(CategoryEditViewModel editViewModel)
{
if (id != category.Id)
{
return NotFound();
}
if (ModelState.IsValid)
{
try
{
_context.Update(category);
_context.Update(editViewModel.Entity);
await _context.SaveChangesAsync();
}
catch (DbUpdateConcurrencyException)
{
if (!CategoryExists(category.Id))
if (!CategoryExists(editViewModel.Entity.Id))
{
return NotFound();
}
@@ -105,9 +83,9 @@ namespace MultipleChoiceTrainer.Controllers
throw;
}
}
return RedirectToAction(nameof(Index), "Home");
return RedirectToAction(nameof(Index), "Home", new { categoryId = editViewModel.Entity.Id });
}
return View(category);
return View(editViewModel);
}
private bool CategoryExists(int id)

5
MultipleChoiceTrainer/Controllers/HomeController.cs
View File

@@ -25,12 +25,13 @@ namespace MultipleChoiceTrainer.Controllers
this.context = context;
}
public IActionResult Index()
public IActionResult Index(int? categoryId)
{
if (signInManager.IsSignedIn(User))
{
var categories = context.Categories.Include(e => e.Sections).ThenInclude(e => e.Questions).ToList();
return View(categories);
var selectedCategory = categoryId.HasValue ? categoryId.Value : categories.First().Id;
return View(new HomeViewModel() { Categories = categories, SelectedCategoryId = selectedCategory });
}
return View();
}

111
MultipleChoiceTrainer/Controllers/SectionsController.cs Normal file
View File

@@ -0,0 +1,111 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Rendering;
using Microsoft.EntityFrameworkCore;
using MultipleChoiceTrainer.Data;
using MultipleChoiceTrainer.Models;
using MultipleChoiceTrainer.Models.DataModels;
namespace MultipleChoiceTrainer.Controllers
{
public class SectionsController : Controller
{
private readonly ApplicationDbContext _context;
public SectionsController(ApplicationDbContext context)
{
_context = context;
}
// GET: Sections/Create
public IActionResult Create(int? categoryId)
{
if(!categoryId.HasValue)
{
categoryId = _context.Categories.First().Id;
}
ViewData["CategoryId"] = new SelectList(_context.Categories, "Id", "Name", categoryId);
return View();
}
// POST: Sections/Create
// To protect from overposting attacks, 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<IActionResult> Create([Bind("Id,Name,Description,CategoryId")] Section section)
{
if (ModelState.IsValid)
{
_context.Add(section);
await _context.SaveChangesAsync();
return RedirectToAction(nameof(Index), "Home", new { categoryId = section.CategoryId });
}
ViewData["CategoryId"] = new SelectList(_context.Categories, "Id", "Name", section.CategoryId);
return View(section);
}
// GET: Sections/Edit/5
public async Task<IActionResult> Edit(int? id)
{
if (id == null)
{
return NotFound();
}
var section = await _context.Sections.FindAsync(id);
if (section == null)
{
return NotFound();
}
ViewData["CategoryId"] = new SelectList(_context.Categories, "Id", "Name", section.CategoryId);
return View(section);
}
// POST: Sections/Edit/5
// To protect from overposting attacks, 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<IActionResult> Edit(int id, [Bind("Id,Name,Description,CategoryId")] Section section)
{
if (id != section.Id)
{
return NotFound();
}
if (ModelState.IsValid)
{
try
{
_context.Update(section);
await _context.SaveChangesAsync();
}
catch (DbUpdateConcurrencyException)
{
if (!SectionExists(section.Id))
{
return NotFound();
}
else
{
throw;
}
}
return RedirectToAction(nameof(Index), "Home", new { categoryId = section.CategoryId });
}
ViewData["CategoryId"] = new SelectList(_context.Categories, "Id", "Name", section.CategoryId);
return View(section);
}
private bool SectionExists(int id)
{
return _context.Sections.Any(e => e.Id == id);
}
}
}