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

Person Pages

Browse Source
This commit is contained in:
Simon Martens
2023-06-26 22:30:05 +02:00
parent e18f053865
commit cf0bc3cddf
18 changed files with 8571 additions and 495514 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
HaWeb/Controllers/BriefeContoller.cs
View File

@@ -58,9 +58,9 @@ public class Briefecontroller : Controller {
// Model creation
var hasMarginals = false;
if (marginals != null && marginals.Any()) hasMarginals = true;
var model = new BriefeViewModel(id, index, GenerateMetaViewModel(lib, meta));
if (nextmeta != null) model.MetaData.Next = (GenerateMetaViewModel(lib, nextmeta), url + nextmeta.Autopsic);
if (prevmeta != null) model.MetaData.Prev = (GenerateMetaViewModel(lib, prevmeta), url + prevmeta.Autopsic);
var model = new BriefeViewModel(id, index, GenerateMetaViewModel(lib, meta, true));
if (nextmeta != null) model.MetaData.Next = (GenerateMetaViewModel(lib, nextmeta, false), url + nextmeta.Autopsic);
if (prevmeta != null) model.MetaData.Prev = (GenerateMetaViewModel(lib, prevmeta, false), url + prevmeta.Autopsic);
if (hands != null && hands.Any()) model.ParsedHands = HaWeb.HTMLHelpers.LetterHelpers.CreateHands(lib, hands);
if (editreasons != null && editreasons.Any()) model.ParsedEdits = HaWeb.HTMLHelpers.LetterHelpers.CreateEdits(lib, _readerService, editreasons);
model.DefaultCategory = lib.Apps.ContainsKey("-1") ? lib.Apps["-1"].Category : null;
@@ -129,40 +129,68 @@ public class Briefecontroller : Controller {
return Redirect("/Error404");
}
internal static BriefeMetaViewModel GenerateMetaViewModel(ILibrary lib, Meta meta) {
internal static BriefeMetaViewModel GenerateMetaViewModel(ILibrary lib, Meta meta, bool generatePersonLinks) {
var hasText = lib.Letters.ContainsKey(meta.Index) ? true : false;
var hasMarginals = lib.MarginalsByLetter.Contains(meta.Index) ? true : false;
var senders = meta.Senders.Select(x => lib.Persons[x].Name) ?? new List<string>();
var recivers = meta.Receivers.Select(x => lib.Persons[x].Name) ?? new List<string>();
var senders = meta.Senders.Select(x => lib.Persons[x]).ToList() ?? new List<Person>();
var receivers = meta.Receivers.Select(x => lib.Persons[x]).ToList() ?? new List<Person>();
var zhstring = meta.ZH != null ? HaWeb.HTMLHelpers.LetterHelpers.CreateZHString(meta) : null;
return new BriefeMetaViewModel(meta, hasMarginals) {
ParsedZHString = zhstring,
SenderReceiver = generateSendersRecievers(senders, recivers),
SenderReceiver = generateSendersRecievers(senders, receivers, generatePersonLinks),
HasText = hasText,
};
}
private static List<(string Sender, string Receiver)> generateSendersRecievers(IEnumerable<string>? senders, IEnumerable<string>? receivers) {
private static List<(string Sender, string Receiver)> generateSendersRecievers(List<Person>? senders, List<Person>? receivers, bool generatePersonLinks) {
var res = new List<(string Sender, string Receiver)>();
if (senders != null && receivers != null) {
if (senders == null || receivers == null) return null;
if (!generatePersonLinks) {
if (senders.Any(x => receivers.Contains(x))) {
var s = senders.ToList();
var r = receivers.ToList();
for (var i = 0; i < r.Count || i < s.Count; i++) {
for (var i = 0; i < receivers.Count || i < senders.Count; i++) {
res.Add((
s[i],
r[i]
senders[i].Name,
receivers[i].Name
));
}
}
else {
res.Add((
HTMLHelpers.StringHelpers.GetEnumerationString(senders),
HTMLHelpers.StringHelpers.GetEnumerationString(receivers)
HTMLHelpers.StringHelpers.GetEnumerationString(senders.Select(x => x.Name)),
HTMLHelpers.StringHelpers.GetEnumerationString(receivers.Select(x => x.Name))
));
}
} else {
if (senders.Any(x => receivers.Contains(x))) {
for (var i = 0; i < receivers.Count || i < senders.Count; i++) {
res.Add((
HTMLHelpers.TagHelpers.CreateElement("a", "", "/HKB/Person/" + senders[i].Index) + senders[i].Name + HTMLHelpers.TagHelpers.CreateEndElement("a"),
HTMLHelpers.TagHelpers.CreateElement("a", "", "/HKB/Person/" + receivers[i].Index) + receivers[i].Name + HTMLHelpers.TagHelpers.CreateEndElement("a")
));
}
}
else {
res.Add((
GetEnumerationStringLinks(senders),
GetEnumerationStringLinks(receivers)
));
}
}
return res;
}
public static string GetEnumerationStringLinks(IEnumerable<Person> strlist) {
var res = string.Empty;
foreach (var str in strlist) {
if (str != strlist.First())
if (str == strlist.Last())
res += " und " + HTMLHelpers.TagHelpers.CreateElement("a", "", "/HKB/Person/" + str.Index) + str.Name + HTMLHelpers.TagHelpers.CreateEndElement("a");
else
res += ", " + HTMLHelpers.TagHelpers.CreateElement("a", "", "/HKB/Person/" + str.Index) + str.Name + HTMLHelpers.TagHelpers.CreateEndElement("a");
else
res += HTMLHelpers.TagHelpers.CreateElement("a", "", "/HKB/Person/" + str.Index) + str.Name + HTMLHelpers.TagHelpers.CreateEndElement("a");
}
return res;
}
}

41
HaWeb/Controllers/IndexController.cs
View File

@@ -59,7 +59,7 @@ public class IndexController : Controller {
var metas = lib.Metas.Where(x => letters.Contains(x.Key)).Select(x => x.Value);
if (metas == null) return _error404();
var metasbyyear = metas.ToLookup(x => x.Sort.Year).OrderBy(x => x.Key).ToList();
return _paginateSend(lib, 0, metasbyyear, null, zhvolume, zhpage);
return _paginateSend(lib, 0, metasbyyear, null, null, zhvolume, zhpage);
}
return _error404();
}
@@ -76,25 +76,27 @@ public class IndexController : Controller {
[Route("/HKB/Person/{person}")]
public IActionResult Person(string person, int page = 0) {
var lib = _lib.GetLibrary();
if (String.IsNullOrWhiteSpace(person)) return _error404();
person = person.Trim();
var lib = _lib.GetLibrary();
if (!lib.Persons.ContainsKey(person)) return _error404();
List<IGrouping<int, Meta>>? metasbyyear = null;
Person p = lib.Persons[person];
CommentModel? comment = null;
if (p.Komm != null) comment = _getPersonComment(p.Komm);
var letters = lib.Metas
.Where(x => x.Value.Senders.Contains(person) || x.Value.Receivers.Contains(person))
.Select(x => x.Value);
if (letters == null) return _error404();
metasbyyear = letters.ToLookup(x => x.Sort.Year).OrderBy(x => x.Key).ToList();
return _paginateSend(lib, page, metasbyyear, person);
return _paginateSend(lib, page, metasbyyear, person, comment);
}
private List<(string Key, string Person)>? _getAvailablePersons(ILibrary lib) {
if (!lib.Persons.Any()) return null;
return lib.Persons
.OrderBy(x => x.Value.Surname)
.ThenBy(x => x.Value.Prename)
.Select(x => (x.Key, x.Value.Name))
private List<(string Key, string Person)>? _getAvailablePersons() {
if (_lib.GetAvailablePersons() == null || !_lib.GetAvailablePersons()!.Any()) return null;
return _lib.GetAvailablePersons()!
.Select(x => (x.Index, x.Name))
.ToList();
}
@@ -126,6 +128,7 @@ public class IndexController : Controller {
int page,
List<IGrouping<int, Meta>> metasbyyear,
string? person = null,
CommentModel? personcomment = null,
string? zhvolume = null,
string? zhpage = null) {
var pages = Paginate(metasbyyear, _lettersForPage);
@@ -136,7 +139,7 @@ public class IndexController : Controller {
letters = metasbyyear
.Where(x => x.Key >= pages[page].StartYear && x.Key <= pages[page].EndYear)
.Select(x => (x.Key, x
.Select(y => Briefecontroller.GenerateMetaViewModel(lib, y))
.Select(y => Briefecontroller.GenerateMetaViewModel(lib, y, false))
.OrderBy(x => x.Meta.Sort)
.ThenBy(x => x.Meta.Order)
.ToList()))
@@ -152,15 +155,31 @@ public class IndexController : Controller {
_endYear.ToString(),
"ZH " + HTMLHelpers.ConversionHelpers.ToRoman(Int32.Parse(lastletter.ZH.Volume)) + ", S. " + lastletter.ZH.Page,
pages,
_getAvailablePersons(lib),
_getAvailablePersons(),
availablePages.OrderBy(x => x.Volume).ToList(),
zhvolume,
zhpage,
person
);
model.PersonComment = personcomment;
return View("~/Views/HKB/Dynamic/Index.cshtml", model);
}
private CommentModel? _getPersonComment(string comment) {
var lib = _lib.GetLibrary();
if (!lib.Comments.ContainsKey(comment)) return null;
var comm = lib.Comments[comment];
var parsedComment = HTMLHelpers.CommentHelpers.CreateHTML(lib, _readerService, comm, "neuzeit", Settings.ParsingState.CommentType.Comment, true); // Maybe true for Backlinks
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, "neuzeit", Settings.ParsingState.CommentType.Subcomment, true));
}
}
return new CommentModel(parsedComment, parsedSubComments);
}
private IActionResult _error404() {
Response.StatusCode = 404;
return Redirect("/Error404");

18
HaWeb/Controllers/RegisterController.cs
View File

@@ -1,27 +1,9 @@
namespace HaWeb.Controllers;
using System.Diagnostics;
using Microsoft.AspNetCore.Mvc;
using HaWeb.Models;
using HaDocument.Interfaces;
using HaXMLReader.Interfaces;
using System.Text;
using HaXMLReader;
using HaXMLReader.EvArgs;
using HaDocument.Models;
using System.Collections.Concurrent;
using HaWeb.FileHelpers;
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("/HKB/Register/[action]/{id?}")]
public class RegisterController : Controller {

2
HaWeb/Controllers/SucheController.cs
View File

@@ -137,7 +137,7 @@ public class SucheController : Controller {
letters = metasbyyear
.Where(x => x.Key >= pages[page].StartYear && x.Key <= pages[page].EndYear)
.Select(x => (x.Key, x
.Select(y => Briefecontroller.GenerateMetaViewModel(lib, y))
.Select(y => Briefecontroller.GenerateMetaViewModel(lib, y, true))
.OrderBy(x => x.Meta.Sort)
.ThenBy(x => x.Meta.Order)
.ToList()))