TemplateDesigner: Klausur-Deckblatt einrichten und Punktetabelle in der Vorschau
CI / build-and-test (push) Canceled after 0s
CI / build-and-test (push) Canceled after 0s
Platzhalterkatalog und Tabellen-Zeichner liegen jetzt in LehrerApp.Templating, damit Designer und Hauptapp dieselbe Tabelle zeichnen. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
dd92128464
commit
98c5f9eba0
11 files changed
+400
-114
No files matched your search
@@ -169,8 +169,51 @@ public partial class DesignerViewModel : ObservableObject
|
||||
public ITemplateDataProvider BuildDataProvider() => new DesignerDataProvider(Placeholders.ToDictionary(
|
||||
x => x.Name.Trim(), x => x.ToValue(), StringComparer.Ordinal));
|
||||
|
||||
public byte[] RenderCurrentPdf() =>
|
||||
new QuestTemplateRenderer().RenderToPdf(BuildLoaded(), BuildDataProvider());
|
||||
public byte[] RenderCurrentPdf()
|
||||
{
|
||||
var loaded = BuildLoaded();
|
||||
return new QuestTemplateRenderer().RenderToPdf(loaded, FitSampleData(loaded, BuildDataProvider()));
|
||||
}
|
||||
|
||||
/// <summary>Beispieldaten, deren Aussehen von der Vorlage abhängt: die Punktetabelle des
|
||||
/// Klausur-Deckblatts richtet ihre Blockbreite nach der im Layout deklarierten Box, genau wie
|
||||
/// später in der Hauptapp.</summary>
|
||||
private static ITemplateDataProvider FitSampleData(LoadedTemplate template, ITemplateDataProvider provider)
|
||||
{
|
||||
var values = provider.GetValues();
|
||||
if (values.GetValueOrDefault(ExamPointsTableDrawing.PlaceholderName) is not DrawingValue) return provider;
|
||||
return new DesignerDataProvider(new Dictionary<string, PlaceholderValue>(values, StringComparer.Ordinal)
|
||||
{ [ExamPointsTableDrawing.PlaceholderName] = ExamCoverPlaceholders.SampleTable(template) });
|
||||
}
|
||||
|
||||
public bool IsExamCover => MetadataItems.Any(x =>
|
||||
x.Name.Trim().Equals(TemplateMetadataKeys.ReportType, StringComparison.OrdinalIgnoreCase)
|
||||
&& x.Value.Trim().Equals(TemplateReportTypes.ExamCover, StringComparison.OrdinalIgnoreCase));
|
||||
|
||||
/// <summary>Macht das Projekt zur Klausur-Deckblatt-Vorlage: setzt den Vorlagentyp und legt
|
||||
/// alle Platzhalter an, die die Hauptapp dafür befüllt (mit Beispielwerten für die Vorschau).
|
||||
/// Vorhandene Platzhalter und das Layout bleiben unangetastet.</summary>
|
||||
public void SetUpExamCover()
|
||||
{
|
||||
var reportType = MetadataItems.FirstOrDefault(x =>
|
||||
x.Name.Trim().Equals(TemplateMetadataKeys.ReportType, StringComparison.OrdinalIgnoreCase));
|
||||
if (reportType is null) MetadataItems.Add(new(TemplateMetadataKeys.ReportType, TemplateReportTypes.ExamCover));
|
||||
else reportType.Value = TemplateReportTypes.ExamCover;
|
||||
|
||||
var conflicts = new List<string>();
|
||||
var added = 0;
|
||||
foreach (var known in ExamCoverPlaceholders.All)
|
||||
{
|
||||
var existing = Placeholders.FirstOrDefault(p => p.Name.Trim() == known.Name);
|
||||
if (existing is null) { Placeholders.Add(new(known.Name, known.Type, false, known.Sample)); added++; }
|
||||
else if (existing.Type != known.Type) conflicts.Add(known.Name);
|
||||
}
|
||||
CanExport = false;
|
||||
if (conflicts.Count > 0)
|
||||
SetStatus($"Als Klausur-Deckblatt eingerichtet, {added} Platzhalter ergänzt. Achtung, abweichender Typ bei: {string.Join(", ", conflicts)} — die Hauptapp liefert dafür einen anderen Typ.", true);
|
||||
else
|
||||
SetStatus($"Als Klausur-Deckblatt eingerichtet, {added} Platzhalter ergänzt. Die Punktetabelle steht unter „LehrerApp-Sonderinhalte“.", false);
|
||||
}
|
||||
|
||||
public void ApplyPdfImport(PdfImportResult import)
|
||||
{
|
||||
@@ -226,7 +269,8 @@ public partial class DesignerViewModel : ObservableObject
|
||||
NewContent = "$" + special.PlaceholderName;
|
||||
NewWidth = special.RecommendedWidth;
|
||||
NewHeight = special.RecommendedHeight;
|
||||
NewAttributes = "";
|
||||
NewAttributes = special.RecommendedAttributes;
|
||||
if (special.InContentFlow) NewElementScope = "Content-Flow";
|
||||
CanExport = false;
|
||||
SetStatus($"„{special.DisplayName}“ vorbereitet. Position und Größe prüfen, dann ins Layout übernehmen.", false);
|
||||
}
|
||||
@@ -255,7 +299,7 @@ public partial class DesignerViewModel : ObservableObject
|
||||
Placeholders.Clear();
|
||||
foreach (var placeholder in template.Manifest.Placeholders)
|
||||
Placeholders.Add(new(placeholder.Name, placeholder.Type, placeholder.Required,
|
||||
placeholder.IsConstant ? placeholder.ConstantValue ?? "" : DesignerPlaceholder.SampleFor(placeholder.Type),
|
||||
placeholder.IsConstant ? placeholder.ConstantValue ?? "" : DesignerPlaceholder.SampleFor(placeholder.Name, placeholder.Type),
|
||||
placeholder.IsConstant, placeholder.Bold, placeholder.Italic, placeholder.Underline));
|
||||
SelectedPlaceholder = Placeholders.FirstOrDefault();
|
||||
Assets.Clear(); AssetItems.Clear();
|
||||
@@ -305,14 +349,13 @@ public partial class DesignerViewModel : ObservableObject
|
||||
|
||||
public void PreviewTemplate(LoadedTemplate template)
|
||||
{
|
||||
var provider = BuildSampleDataProvider(template.Manifest);
|
||||
RenderPreviewPages(template, provider);
|
||||
RenderPreviewPages(template, BuildSampleDataProvider(template.Manifest));
|
||||
SetStatus($"Vorschau von „{template.Manifest.Name}“ mit {PreviewPages.Count} Seite(n).", false);
|
||||
}
|
||||
|
||||
public void RenderPreviewPages(LoadedTemplate template, ITemplateDataProvider provider)
|
||||
{
|
||||
var pages = new QuestTemplateRenderer().RenderPagesToPng(template, provider);
|
||||
var pages = new QuestTemplateRenderer().RenderPagesToPng(template, FitSampleData(template, provider));
|
||||
ClearPreviewPages();
|
||||
for (var index = 0; index < pages.Count; index++)
|
||||
{
|
||||
@@ -331,7 +374,8 @@ public partial class DesignerViewModel : ObservableObject
|
||||
var canvasLayout = new TemplateLayout(loaded.Layout.Width, loaded.Layout.Height, loaded.Layout.Unit,
|
||||
pageTemplate.Elements);
|
||||
var canvasTemplate = new LoadedTemplate(loaded.Manifest, canvasLayout, loaded.Assets, loaded.SourceName);
|
||||
var bytes = new QuestTemplateRenderer().RenderFirstPageToPng(canvasTemplate, BuildDataProvider());
|
||||
var bytes = new QuestTemplateRenderer().RenderFirstPageToPng(canvasTemplate,
|
||||
FitSampleData(canvasTemplate, BuildDataProvider()));
|
||||
using var stream = new MemoryStream(bytes);
|
||||
_pageTemplatePreview?.Dispose(); _pageTemplatePreview = new Bitmap(stream);
|
||||
SelectedPreviewPage = null; PreviewImage = _pageTemplatePreview;
|
||||
@@ -385,7 +429,7 @@ public partial class DesignerViewModel : ObservableObject
|
||||
|
||||
private static ITemplateDataProvider BuildSampleDataProvider(TemplateManifest manifest) =>
|
||||
new DesignerDataProvider(manifest.Placeholders.ToDictionary(x => x.Name,
|
||||
x => new DesignerPlaceholder(x.Name, x.Type, x.Required, DesignerPlaceholder.SampleFor(x.Type)).ToValue(),
|
||||
x => new DesignerPlaceholder(x.Name, x.Type, x.Required, DesignerPlaceholder.SampleFor(x.Name, x.Type)).ToValue(),
|
||||
StringComparer.Ordinal));
|
||||
|
||||
public void AddElement()
|
||||
@@ -739,7 +783,8 @@ public sealed record DesignerPreviewPage(int Number, Bitmap Image)
|
||||
}
|
||||
|
||||
public sealed record SpecialContentItem(string DisplayName, string PlaceholderName, string Description,
|
||||
string RecommendedElementType, string RecommendedWidth, string RecommendedHeight);
|
||||
string RecommendedElementType, string RecommendedWidth, string RecommendedHeight,
|
||||
string RecommendedAttributes = "", bool InContentFlow = false);
|
||||
|
||||
public static class SpecialContentCatalog
|
||||
{
|
||||
@@ -751,6 +796,9 @@ public static class SpecialContentCatalog
|
||||
new("Fehltage nach Datum", "Student.AbsenceDays",
|
||||
"Chronologische Liste mit Datum, Fehlzeit oder ganzem Fehltag sowie Entschuldigungsstatus.",
|
||||
"FLOWDRAWBOX", "170", "140"),
|
||||
new("Punktetabelle (Klausur-Deckblatt)", ExamPointsTableDrawing.PlaceholderName,
|
||||
"Aufgabe / Max. Punktzahl / Punktzahl mit festen Spaltenbreiten; bei vielen Aufgaben folgt ein weiterer Block, und die Elemente darunter im Content-Flow wandern mit. Die Breite bestimmt, wie viele Aufgaben nebeneinander passen (165 = sechs).",
|
||||
"FLOWDRAWBOX", "165", "150", "fit=content", InContentFlow: true),
|
||||
];
|
||||
|
||||
public static DrawingValue SampleDrawing(string placeholderName) => placeholderName switch
|
||||
@@ -776,6 +824,7 @@ public static class SpecialContentCatalog
|
||||
new DrawString(42, 27, "Ganzer Fehltag", 7, "#374151"),
|
||||
new DrawString(116, 27, "Entschuldigt", 7, "#2E7D32"),
|
||||
], 38),
|
||||
ExamPointsTableDrawing.PlaceholderName => ExamPointsTableDrawing.Build(ExamCoverPlaceholders.SampleColumns, 165),
|
||||
_ => DesignerPlaceholder.GenericSampleDrawing(),
|
||||
};
|
||||
}
|
||||
@@ -837,6 +886,11 @@ public partial class DesignerPlaceholder : ObservableObject
|
||||
PlaceholderType.Drawing => SpecialContentCatalog.SampleDrawing(Name),
|
||||
_ => new TextValue(Sample),
|
||||
};
|
||||
/// <summary>Bekannte LehrerApp-Platzhalter (Klausur-Deckblatt) bekommen einen sprechenden
|
||||
/// Beispielwert statt des allgemeinen je Typ.</summary>
|
||||
public static string SampleFor(string name, PlaceholderType type) =>
|
||||
ExamCoverPlaceholders.Find(name.Trim()) is { } known && known.Type == type && type != PlaceholderType.Drawing
|
||||
? known.Sample : SampleFor(type);
|
||||
public static string SampleFor(PlaceholderType type) => type switch
|
||||
{ PlaceholderType.Date => DateTime.Today.ToString("yyyy-MM-dd"), PlaceholderType.Number => "42,5",
|
||||
PlaceholderType.Table => "Datum;Grund|01.09.;Krank", PlaceholderType.Chart => "Sep:2;Okt:3;Nov:1",
|
||||
|
||||
@@ -85,6 +85,8 @@
|
||||
</DataGrid.Columns>
|
||||
</DataGrid>
|
||||
<Button Content="Markierten Metadateneintrag entfernen" HorizontalAlignment="Left" Click="OnRemoveMetadata"/>
|
||||
<Button Content="Als Klausur-Deckblatt einrichten" HorizontalAlignment="Left" Click="OnSetUpExamCover"
|
||||
ToolTip.Tip="Setzt report-type=exam-cover und legt alle Platzhalter an, die die LehrerApp für Deckblätter befüllt (Exam.*, Result.*, …) — mit Beispielwerten für die Vorschau."/>
|
||||
</StackPanel>
|
||||
</ScrollViewer>
|
||||
</TabItem>
|
||||
|
||||
@@ -38,6 +38,7 @@ public partial class MainWindow : Window
|
||||
if (_viewModel.SelectedMetadata is not { } selected) return;
|
||||
_viewModel.MetadataItems.Remove(selected); _viewModel.SelectedMetadata = null; _viewModel.CanExport = false;
|
||||
}
|
||||
private void OnSetUpExamCover(object? sender, RoutedEventArgs e) => _viewModel.SetUpExamCover();
|
||||
private void OnRemovePlaceholder(object? sender, RoutedEventArgs e) => _viewModel.RemoveSelectedPlaceholder();
|
||||
private void OnBoldSelection(object? sender, RoutedEventArgs e) => WrapPlaceholderSelection("[b]", "[/b]");
|
||||
private void OnItalicSelection(object? sender, RoutedEventArgs e) => WrapPlaceholderSelection("[i]", "[/i]");
|
||||
|
||||
Reference in new issue
Block a user