mirror of
https://github.com/Theodor-Springmann-Stiftung/hamann-ausgabe-core.git
synced 2025-10-29 09:15:33 +00:00
Small bugfix; Pills & Marginal Sort-Tag 1
This commit is contained in:
@@ -233,7 +233,9 @@ public class TextRules {
|
||||
{
|
||||
if(reader.State.ParsedMarginals == null) reader.State.ParsedMarginals = new List<(string, string, string)>();
|
||||
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.CreateEndElement(DEFAULTELEMENT));
|
||||
sb.Append(HaWeb.HTMLHelpers.TagHelpers.CreateElement(DEFAULTELEMENT, CSSClasses.MARGINGALBOXCLASS));
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
</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-pill">
|
||||
<span class="ha-cross">Orig</span>
|
||||
@@ -28,7 +28,7 @@
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
else {
|
||||
else if (Model.Letter.Meta.hasOriginal.HasValue && Model.Letter.Meta.hasOriginal.Value == true) {
|
||||
<div class="ha-tooltip">
|
||||
<div class="ha-pill">
|
||||
Orig
|
||||
|
||||
@@ -1,31 +1,30 @@
|
||||
{
|
||||
"Logging": {
|
||||
"LogLevel": {
|
||||
"Default": "Information",
|
||||
"Microsoft.AspNetCore": "Warning"
|
||||
}
|
||||
},
|
||||
"FeatureManagement": {
|
||||
"AdminService": true,
|
||||
"LocalPublishService": true,
|
||||
"SyntaxCheck": true,
|
||||
"Notifications": true
|
||||
},
|
||||
"AllowedWebSocketConnections": "*",
|
||||
"AllowedHosts": "*",
|
||||
"HamannFileStoreLinux": "/var/www/vhosts/development.hamann-ausgabe.de/httpdocs/Hamann/",
|
||||
"HamannFileStoreWindows": "C:/Users/simon/Downloads/test/",
|
||||
"BareRepositoryPathLinux": "/var/www/vhosts/development.hamann-ausgabe.de/httpdocs/Bare/",
|
||||
"BareRepositoryPathWindows": "C:/Users/simon/source/hamann-xml/.git/",
|
||||
"WorkingTreePathLinux": "/var/www/vhosts/development.hamann-ausgabe.de/httpdocs/Repo/",
|
||||
"WorkingTreePathWindows": "C:/Users/simon/source/hamann-xml/transformations_2023-9-14_test/",
|
||||
"RepositoryBranch": "testdata",
|
||||
"RepositoryURL": "https://github.com/Theodor-Springmann-Stiftung/hamann-xml",
|
||||
"StoredPDFPathWindows": "",
|
||||
"StoredPDFPathLinux": "",
|
||||
"FileSizeLimit": 52428800,
|
||||
"AvailableStartYear": 1700,
|
||||
"AvailableEndYear": 1800,
|
||||
"LettersOnPage": 80
|
||||
"Logging": {
|
||||
"LogLevel": {
|
||||
"Default": "Information",
|
||||
"Microsoft.AspNetCore": "Warning"
|
||||
}
|
||||
},
|
||||
"FeatureManagement": {
|
||||
"AdminService": true,
|
||||
"LocalPublishService": true,
|
||||
"SyntaxCheck": true,
|
||||
"Notifications": true
|
||||
},
|
||||
"AllowedWebSocketConnections": "*",
|
||||
"AllowedHosts": "*",
|
||||
"HamannFileStoreLinux": "/home/simon/test/",
|
||||
"HamannFileStoreWindows": "C:/Users/simon/Downloads/test/",
|
||||
"BareRepositoryPathLinux": "/home/simon/source/hamann-xml/.git/",
|
||||
"BareRepositoryPathWindows": "C:/Users/simon/source/hamann-xml/.git/",
|
||||
"WorkingTreePathLinux": "/home/simon/source/hamann-xml/marginal-tests/",
|
||||
"WorkingTreePathWindows": "C:/Users/simon/source/hamann-xml/transformations_2023-9-14_test/",
|
||||
"RepositoryBranch": "testdata",
|
||||
"RepositoryURL": "https://github.com/Theodor-Springmann-Stiftung/hamann-xml",
|
||||
"StoredPDFPathWindows": "",
|
||||
"StoredPDFPathLinux": "",
|
||||
"FileSizeLimit": 52428800,
|
||||
"AvailableStartYear": 1700,
|
||||
"AvailableEndYear": 1800,
|
||||
"LettersOnPage": 80
|
||||
}
|
||||
|
||||
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user