Theodor-Springmann-Stiftung/hamann-ausgabe-core
1
0
Fork 0
mirror of https://github.com/Theodor-Springmann-Stiftung/hamann-ausgabe-core.git synced 2025-10-29 09:15:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Seperated css files; added search form to register and styled the button

Browse Source
This commit is contained in:
schnulller
2022-06-09 16:40:27 +02:00
parent d41dffd46a
commit 5f0c84bfd1
24 changed files with 6507 additions and 2416 deletions
Download Patch File Download Diff File Expand all files Collapse all files

107
HaWeb/Controllers/RegisterController.cs
View File

@@ -1,3 +1,4 @@
namespace HaWeb.Controllers;
using System.Diagnostics;
using Microsoft.AspNetCore.Mvc;
using HaWeb.Models;
@@ -9,8 +10,18 @@ using HaXMLReader.EvArgs;
using HaDocument.Models;
using System.Collections.Concurrent;
using HaWeb.FileHelpers;
namespace HaWeb.Controllers;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.WebUtilities;
using Microsoft.Extensions.Configuration;
using Microsoft.Net.Http.Headers;
using HaWeb.Filters;
using HaWeb.XMLParser;
using System.Text.Json.Serialization;
using System.Text.Json;
using Microsoft.FeatureManagement.Mvc;
using System.Runtime.InteropServices;
using Microsoft.AspNetCore.Http.Features;
[Route("Register/[action]/{id?}")]
public class RegisterController : Controller {
@@ -26,6 +37,7 @@ public class RegisterController : Controller {
_readerService = readerService;
}
[HttpGet]
public IActionResult Register(string? id) {
// Setup settings and variables
var lib = _lib.GetLibrary();
@@ -47,21 +59,10 @@ public class RegisterController : Controller {
if (comments == null) return error404();
// Parsing
var res = new List<CommentModel>();
foreach (var comm in comments) {
var parsedComment = HTMLHelpers.CommentHelpers.CreateHTML(lib, _readerService, comm, category, Settings.ParsingState.CommentType.Comment);
List<string>? parsedSubComments = null;
if (comm.Kommentare != null) {
parsedSubComments = new List<string>();
foreach (var subcomm in comm.Kommentare.OrderBy(x => x.Value.Order)) {
parsedSubComments.Add(HTMLHelpers.CommentHelpers.CreateHTML(lib, _readerService, subcomm.Value, category, Settings.ParsingState.CommentType.Subcomment));
}
}
res.Add(new CommentModel(parsedComment, parsedSubComments));
}
var res = _createCommentModelForschungRegister(category, comments);
// Model instantiation
var model = new RegisterViewModel(category, id, res, title, false) {
var model = new RegisterViewModel(category, id, res, title, false, true) {
AvailableCategories = availableCategories,
};
@@ -69,6 +70,7 @@ public class RegisterController : Controller {
return View("Index", model);
}
[HttpGet]
public IActionResult Bibelstellen(string? id) {
// Setup settings and variables
var lib = _lib.GetLibrary();
@@ -90,21 +92,10 @@ public class RegisterController : Controller {
if (comments == null) return error404();
// Parsing
var res = new List<CommentModel>();
foreach (var comm in comments) {
var parsedComment = HTMLHelpers.CommentHelpers.CreateHTML(lib, _readerService, comm, category, Settings.ParsingState.CommentType.Comment);
List<string>? parsedSubComments = null;
if (comm.Kommentare != null) {
parsedSubComments = new List<string>();
foreach (var subcomm in comm.Kommentare.OrderBy(x => x.Value.Lemma.Length).ThenBy(x => x.Value.Lemma)) {
parsedSubComments.Add(HTMLHelpers.CommentHelpers.CreateHTML(lib, _readerService, subcomm.Value, category, Settings.ParsingState.CommentType.Subcomment));
}
}
res.Add(new CommentModel(parsedComment, parsedSubComments));
}
var res = _createCommentModelBibel(category, comments);
// Model instantiation
var model = new RegisterViewModel(category, id, res, title, false) {
var model = new RegisterViewModel(category, id, res, title, false, false) {
AvailableCategories = availableCategories,
};
@@ -112,6 +103,7 @@ public class RegisterController : Controller {
return View("Index", model);
}
[HttpGet]
public IActionResult Forschung(string? id) {
// Setup settings and variables
var lib = _lib.GetLibrary();
@@ -140,21 +132,10 @@ public class RegisterController : Controller {
if (comments == null) return error404();
// Parsing
var res = new List<CommentModel>();
foreach (var comm in comments) {
var parsedComment = HTMLHelpers.CommentHelpers.CreateHTML(lib, _readerService, comm, category, Settings.ParsingState.CommentType.Comment);
List<string>? parsedSubComments = null;
if (comm.Kommentare != null) {
parsedSubComments = new List<string>();
foreach (var subcomm in comm.Kommentare.OrderBy(x => x.Value.Order)) {
parsedSubComments.Add(HTMLHelpers.CommentHelpers.CreateHTML(lib, _readerService, subcomm.Value, category, Settings.ParsingState.CommentType.Subcomment));
}
}
res.Add(new CommentModel(parsedComment, parsedSubComments));
}
var res = _createCommentModelForschungRegister(category, comments);
// Model instantiation
var model = new RegisterViewModel(category, id, res, title, true) {
var model = new RegisterViewModel(category, id, res, title, true, true) {
AvailableCategories = availableCategories,
AvailableSideCategories = AvailableSideCategories
};
@@ -163,6 +144,16 @@ public class RegisterController : Controller {
return View("Index", model);
}
[HttpPost]
[DisableFormValueModelBinding]
[ValidateAntiForgeryToken]
[Route("/Register/Forschung/{id}")]
[Route("/Register/Register/{id}")]
[Route("/Register/Bibelstellen/{id}")]
public IActionResult Search(string? id) {
return Ok();
}
private string? normalizeID(string? id, string defaultid) {
if (id == null) return null;
return id.ToUpper();
@@ -181,6 +172,40 @@ public class RegisterController : Controller {
return Redirect("/Error404");
}
private List<CommentModel> _createCommentModelForschungRegister(string category, IOrderedEnumerable<Comment>? comments) {
var lib = _lib.GetLibrary();
var res = new List<CommentModel>();
foreach (var comm in comments) {
var parsedComment = HTMLHelpers.CommentHelpers.CreateHTML(lib, _readerService, comm, category, Settings.ParsingState.CommentType.Comment);
List<string>? parsedSubComments = null;
if (comm.Kommentare != null) {
parsedSubComments = new List<string>();
foreach (var subcomm in comm.Kommentare.OrderBy(x => x.Value.Order)) {
parsedSubComments.Add(HTMLHelpers.CommentHelpers.CreateHTML(lib, _readerService, subcomm.Value, category, Settings.ParsingState.CommentType.Subcomment));
}
}
res.Add(new CommentModel(parsedComment, parsedSubComments));
}
return res;
}
private List<CommentModel> _createCommentModelBibel(string category, IOrderedEnumerable<Comment>? comments) {
var lib = _lib.GetLibrary();
var res = new List<CommentModel>();
foreach (var comm in comments) {
var parsedComment = HTMLHelpers.CommentHelpers.CreateHTML(lib, _readerService, comm, category, Settings.ParsingState.CommentType.Comment);
List<string>? parsedSubComments = null;
if (comm.Kommentare != null) {
parsedSubComments = new List<string>();
foreach (var subcomm in comm.Kommentare.OrderBy(x => x.Value.Lemma.Length).ThenBy(x => x.Value.Lemma)) {
parsedSubComments.Add(HTMLHelpers.CommentHelpers.CreateHTML(lib, _readerService, subcomm.Value, category, Settings.ParsingState.CommentType.Subcomment));
}
}
res.Add(new CommentModel(parsedComment, parsedSubComments));
}
return res;
}
// private IEnumerable<Comment> Search(IEnumerable<Comment> all) {
// var ret = new ConcurrentBag<Comment>();
// var cnt = 0;