From 04ebd5d90d70c71fca89682a5b9c13c37655d915 Mon Sep 17 00:00:00 2001 From: Simon Martens Date: Tue, 4 Jul 2023 08:36:25 +0200 Subject: [PATCH] Integrated Person View --- HaWeb/Controllers/IndexController.cs | 2 +- HaWeb/Controllers/RegisterController.cs | 4 +-- HaWeb/Controllers/SucheController.cs | 4 +-- HaWeb/Models/CommentModel.cs | 4 ++- HaWeb/Views/HKB/Dynamic/Index.cshtml | 5 +++ HaWeb/Views/HKB/Dynamic/Suche.cshtml | 2 +- HaWeb/Views/Shared/_LetterHead.cshtml | 44 ++++++++++++------------- HaWeb/appsettings.json | 2 +- HaWeb/wwwroot/css/letterhead.css | 4 +-- HaWeb/wwwroot/css/output.css | 2 +- 10 files changed, 40 insertions(+), 33 deletions(-) diff --git a/HaWeb/Controllers/IndexController.cs b/HaWeb/Controllers/IndexController.cs index e616ce0..6fdc14f 100644 --- a/HaWeb/Controllers/IndexController.cs +++ b/HaWeb/Controllers/IndexController.cs @@ -177,7 +177,7 @@ public class IndexController : Controller { parsedSubComments.Add(HTMLHelpers.CommentHelpers.CreateHTML(lib, _readerService, subcomm.Value, "neuzeit", Settings.ParsingState.CommentType.Subcomment, true)); } } - return new CommentModel(parsedComment, parsedSubComments); + return new CommentModel(parsedComment, parsedSubComments, comment); } private IActionResult _error404() { diff --git a/HaWeb/Controllers/RegisterController.cs b/HaWeb/Controllers/RegisterController.cs index 1aee784..29807e0 100644 --- a/HaWeb/Controllers/RegisterController.cs +++ b/HaWeb/Controllers/RegisterController.cs @@ -159,7 +159,7 @@ public class RegisterController : Controller { parsedSubComments.Add(HTMLHelpers.CommentHelpers.CreateHTML(lib, _readerService, subcomm.Value, category, Settings.ParsingState.CommentType.Subcomment, generateBacklinks)); } } - res.Add(new CommentModel(parsedComment, parsedSubComments)); + res.Add(new CommentModel(parsedComment, parsedSubComments, comm.Index)); } return res; } @@ -177,7 +177,7 @@ public class RegisterController : Controller { parsedSubComments.Add(HTMLHelpers.CommentHelpers.CreateHTML(lib, _readerService, subcomm.Value, category, Settings.ParsingState.CommentType.Subcomment)); } } - res.Add(new CommentModel(parsedComment, parsedSubComments)); + res.Add(new CommentModel(parsedComment, parsedSubComments, comm.Index)); } return res; } diff --git a/HaWeb/Controllers/SucheController.cs b/HaWeb/Controllers/SucheController.cs index 060b14a..91beb00 100644 --- a/HaWeb/Controllers/SucheController.cs +++ b/HaWeb/Controllers/SucheController.cs @@ -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, true)) + .Select(y => Briefecontroller.GenerateMetaViewModel(lib, y, false)) .OrderBy(x => x.Meta.Sort) .ThenBy(x => x.Meta.Order) .ToList())) @@ -237,7 +237,7 @@ public class SucheController : Controller { parsedSubComments.Add(HTMLHelpers.CommentHelpers.CreateHTML(lib, _readerService, subcommobj, category, Settings.ParsingState.CommentType.Subcomment)); } } - res.Add(new CommentModel(parsedComment, parsedSubComments)); + res.Add(new CommentModel(parsedComment, parsedSubComments, comm.Item1)); } return res; } diff --git a/HaWeb/Models/CommentModel.cs b/HaWeb/Models/CommentModel.cs index 5d14237..44dd19e 100644 --- a/HaWeb/Models/CommentModel.cs +++ b/HaWeb/Models/CommentModel.cs @@ -6,10 +6,12 @@ using HaXMLReader.Interfaces; using HaXMLReader.EvArgs; public class CommentModel { + public string ID { get; private set; } public string ParsedComment { get; private set; } public List? ParsedSubComments { get; private set; } - public CommentModel(string parsedComment, List? parsedSubComments) { + public CommentModel(string parsedComment, List? parsedSubComments, string id) { + this.ID = id; this.ParsedComment = parsedComment; this.ParsedSubComments = parsedSubComments; } diff --git a/HaWeb/Views/HKB/Dynamic/Index.cshtml b/HaWeb/Views/HKB/Dynamic/Index.cshtml index 726077b..44d0310 100644 --- a/HaWeb/Views/HKB/Dynamic/Index.cshtml +++ b/HaWeb/Views/HKB/Dynamic/Index.cshtml @@ -22,6 +22,11 @@ ← Alle Briefe @Html.Raw(Model.PersonComment.ParsedComment) + @if (Model.PersonComment.ParsedSubComments != null && Model.PersonComment.ParsedSubComments.Any()) { +
+ Werke & Referenzstellen im Registereintrag → +
+ } } diff --git a/HaWeb/Views/HKB/Dynamic/Suche.cshtml b/HaWeb/Views/HKB/Dynamic/Suche.cshtml index 64df8d6..9d5bfb5 100644 --- a/HaWeb/Views/HKB/Dynamic/Suche.cshtml +++ b/HaWeb/Views/HKB/Dynamic/Suche.cshtml @@ -85,7 +85,7 @@ foreach (var letter in year.LetterList) {
- @await Html.PartialAsync("/Views/Shared/_LetterHead.cshtml", (letter, true, false)) + @Html.Partial("/Views/Shared/_LetterHead.cshtml", (letter, true, false)) @if (Model.SearchResults != null && Model.SearchResults.ContainsKey(letter.Meta.Index)) { diff --git a/HaWeb/Views/Shared/_LetterHead.cshtml b/HaWeb/Views/Shared/_LetterHead.cshtml index ac62ba1..cf2d7f3 100644 --- a/HaWeb/Views/Shared/_LetterHead.cshtml +++ b/HaWeb/Views/Shared/_LetterHead.cshtml @@ -2,14 +2,14 @@
@if (!Model.Compact) { -
-
- @Model.Letter.Meta.Autopsic +
+
+ @Model.Letter.Meta.Autopsic +
-
} @if (Model.Letter.HasText) { -