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 17:25:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Small bugfix; Pills & Marginal Sort-Tag 1

Browse Source
This commit is contained in:
Simon Martens
2023-10-16 14:01:17 +02:00
parent 7d48065aae
commit d85611182f
4 changed files with 35 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
HaWeb/Settings/ParsingRules/TextRules.cs
View File

@@ -233,7 +233,9 @@ public class TextRules {
{ {
if(reader.State.ParsedMarginals == null) reader.State.ParsedMarginals = new List<(string, string, string)>(); if(reader.State.ParsedMarginals == null) reader.State.ParsedMarginals = new List<(string, string, string)>();
var sb2 = new StringBuilder(); var sb2 = new StringBuilder();
if (margs.Count() > 1) margs = margs.OrderBy(x => Int32.Parse(x.Sort));
// Sortiert an dieser String, nicht nach Zahl: sort 1-9 ist möglich, es gibt keine Abstürze bei fehlerhaften Werten
if (margs.Count() > 1) margs = margs.OrderBy(x => x.Sort ?? " ");
sb.Append(HaWeb.HTMLHelpers.TagHelpers.CreateElement(DEFAULTELEMENT, CSSClasses.COMMENTMARKERCLASS, "ma-" + reader.State.currpage + "-" + reader.State.currline)); sb.Append(HaWeb.HTMLHelpers.TagHelpers.CreateElement(DEFAULTELEMENT, CSSClasses.COMMENTMARKERCLASS, "ma-" + reader.State.currpage + "-" + reader.State.currline));
sb.Append(HaWeb.HTMLHelpers.TagHelpers.CreateEndElement(DEFAULTELEMENT)); sb.Append(HaWeb.HTMLHelpers.TagHelpers.CreateEndElement(DEFAULTELEMENT));
sb.Append(HaWeb.HTMLHelpers.TagHelpers.CreateElement(DEFAULTELEMENT, CSSClasses.MARGINGALBOXCLASS)); sb.Append(HaWeb.HTMLHelpers.TagHelpers.CreateElement(DEFAULTELEMENT, CSSClasses.MARGINGALBOXCLASS));

4
HaWeb/Views/Shared/_Pills.cshtml
View File

@@ -18,7 +18,7 @@
</div> </div>
} }
@if (Model.Letter.Meta.hasOriginal.HasValue && Model.Letter.Meta.hasOriginal.Value == true) { @if (Model.Letter.Meta.hasOriginal.HasValue && Model.Letter.Meta.hasOriginal.Value == false) {
<div class="ha-tooltip"> <div class="ha-tooltip">
<div class="ha-pill"> <div class="ha-pill">
<span class="ha-cross">Orig</span> <span class="ha-cross">Orig</span>
@@ -28,7 +28,7 @@
</div> </div>
</div> </div>
} }
else { else if (Model.Letter.Meta.hasOriginal.HasValue && Model.Letter.Meta.hasOriginal.Value == true) {
<div class="ha-tooltip"> <div class="ha-tooltip">
<div class="ha-pill"> <div class="ha-pill">
Orig Orig

57
HaWeb/appsettings.Development.json
View File

@@ -1,31 +1,30 @@
{ {
"Logging": { "Logging": {
"LogLevel": { "LogLevel": {
"Default": "Information", "Default": "Information",
"Microsoft.AspNetCore": "Warning" "Microsoft.AspNetCore": "Warning"
} }
}, },
"FeatureManagement": { "FeatureManagement": {
"AdminService": true, "AdminService": true,
"LocalPublishService": true, "LocalPublishService": true,
"SyntaxCheck": true, "SyntaxCheck": true,
"Notifications": true "Notifications": true
}, },
"AllowedWebSocketConnections": "*", "AllowedWebSocketConnections": "*",
"AllowedHosts": "*", "AllowedHosts": "*",
"HamannFileStoreLinux": "/var/www/vhosts/development.hamann-ausgabe.de/httpdocs/Hamann/", "HamannFileStoreLinux": "/home/simon/test/",
"HamannFileStoreWindows": "C:/Users/simon/Downloads/test/", "HamannFileStoreWindows": "C:/Users/simon/Downloads/test/",
"BareRepositoryPathLinux": "/var/www/vhosts/development.hamann-ausgabe.de/httpdocs/Bare/", "BareRepositoryPathLinux": "/home/simon/source/hamann-xml/.git/",
"BareRepositoryPathWindows": "C:/Users/simon/source/hamann-xml/.git/", "BareRepositoryPathWindows": "C:/Users/simon/source/hamann-xml/.git/",
"WorkingTreePathLinux": "/var/www/vhosts/development.hamann-ausgabe.de/httpdocs/Repo/", "WorkingTreePathLinux": "/home/simon/source/hamann-xml/marginal-tests/",
"WorkingTreePathWindows": "C:/Users/simon/source/hamann-xml/transformations_2023-9-14_test/", "WorkingTreePathWindows": "C:/Users/simon/source/hamann-xml/transformations_2023-9-14_test/",
"RepositoryBranch": "testdata", "RepositoryBranch": "testdata",
"RepositoryURL": "https://github.com/Theodor-Springmann-Stiftung/hamann-xml", "RepositoryURL": "https://github.com/Theodor-Springmann-Stiftung/hamann-xml",
"StoredPDFPathWindows": "", "StoredPDFPathWindows": "",
"StoredPDFPathLinux": "", "StoredPDFPathLinux": "",
"FileSizeLimit": 52428800, "FileSizeLimit": 52428800,
"AvailableStartYear": 1700, "AvailableStartYear": 1700,
"AvailableEndYear": 1800, "AvailableEndYear": 1800,
"LettersOnPage": 80 "LettersOnPage": 80
} }

2
HaWeb/wwwroot/css/output.css
View File

File diff suppressed because one or more lines are too long