winzer/elwig
2
1
Fork 0
Code Issues 8 Pull Requests Actions Releases 46 Activity

Add optional Document Id to Documents

Browse Source
This commit is contained in:
Lorenz Stechauner
2023-08-12 20:21:52 +02:00
parent cbb57f7039
commit 65bcc7bbb1
4 changed files with 57 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

105
Elwig/Documents/DeliveryNote.cshtml
View File

@ -6,64 +6,65 @@
<div class="date">@Model.Location, am @($"{Model.Date:dd.MM.yyyy}")</div>
<h1>@Model.Title</h1>
<table class="delivery">
<colgroup>
<col span="1" style="width: 1cm;"/>
<col span="1" style="width: 50%;"/>
<col span="1" style="width: 50%;"/>
<col span="1" style="width: 3cm;"/>
<col span="1" style="width: 1.25cm;"/>
<col span="1" style="width: 1.25cm;"/>
<col span="1" style="width: 1.5cm;"/>
</colgroup>
<thead>
<tr>
<th class="main" rowspan="2" style="text-align: center;">Pos.</th>
<th class="main" rowspan="2">Sorte</th>
<th class="main" rowspan="2">Attribut(e)</th>
<th class="main" rowspan="2">Qualitätsstufe</th>
<th colspan="2">Gradation</th>
<th>Gewicht</th>
</tr>
<tr>
<th style="font-size: 8pt">[°Oe]</th>
<th style="font-size: 8pt">[°KMW]</th>
<th style="font-size: 8pt">[kg]</th>
</tr>
</thead>
<tbody>
@foreach (var part in Model.Delivery.Parts.OrderBy(p => p.DPNr)) {
<tr class="main">
<td style="text-align: center;">@part.DPNr</td>
<td>@part.Variant.Name</td>
<td>@string.Join(" / ", part.Attributes)</td>
<td>@part.Quality.Name</td>
<td class="narrow" style="text-align: center;">@($"{part.Oe:N0}")</td>
<td class="narrow" style="text-align: center;">@($"{part.Kmw:N1}")</td>
<td class="narrow" style="text-align: right;">@($"{part.Weight:N0}")</td>
<colgroup>
<col style="width: 1cm;"/>
<col style="width: 50%;"/>
<col style="width: 50%;"/>
<col style="width: 3cm;"/>
<col style="width: 1.25cm;"/>
<col style="width: 1.25cm;"/>
<col style="width: 1.5cm;"/>
</colgroup>
<thead>
<tr>
<th class="main" rowspan="2" style="text-align: center;">Pos.</th>
<th class="main" rowspan="2">Sorte</th>
<th class="main" rowspan="2">Attribut(e)</th>
<th class="main" rowspan="2">Qualitätsstufe</th>
<th colspan="2">Gradation</th>
<th>Gewicht</th>
</tr>
<tr><td></td><td colspan="3" style="font-size: 8pt; white-space: pre">Herkunft: @part.OriginString</td></tr>
<tr><td></td><td colspan="3" style="font-size: 8pt;">
@(part.ManualWeighing ? "Handwiegung" : $"Waage: {part.ScaleId ?? "?"}, ID: {part.WeighingId ?? "?"}") (@(part.IsGerebelt ? "gerebelt gewogen" : "nicht gerebelt gewogen"))
</td></tr>
@if (part.Comment != null) {
<tr><td></td><td colspan="3" style="font-size: 8pt;">Anmerkung: @part.Comment</td></tr>
}
@if (part.Temperature != null || part.Acid != null) {
<tr>
<th style="font-size: 8pt;">[°Oe]</th>
<th style="font-size: 8pt;">[°KMW]</th>
<th style="font-size: 8pt;">[kg]</th>
</tr>
</thead>
<tbody>
@foreach (var part in Model.Delivery.Parts.OrderBy(p => p.DPNr)) {
<tr class="main">
<td style="text-align: center;">@part.DPNr</td>
<td>@part.Variant.Name</td>
<td>@string.Join(" / ", part.Attributes)</td>
<td>@part.Quality.Name</td>
<td class="narrow" style="text-align: center;">@($"{part.Oe:N0}")</td>
<td class="narrow" style="text-align: center;">@($"{part.Kmw:N1}")</td>
<td class="narrow" style="text-align: right;">@($"{part.Weight:N0}")</td>
</tr>
<tr><td></td><td colspan="3" style="font-size: 8pt; white-space: pre">Herkunft: @part.OriginString</td></tr>
<tr><td></td><td colspan="3" style="font-size: 8pt;">
@(part.ManualWeighing ? "Handwiegung" : $"Waage: {part.ScaleId ?? "?"}, ID: {part.WeighingId ?? "?"}") (@(part.IsGerebelt ? "gerebelt gewogen" : "nicht gerebelt gewogen"))
</td></tr>
@if (part.Comment != null) {
<tr><td></td><td colspan="3" style="font-size: 8pt;">Anmerkung: @part.Comment</td></tr>
}
@if (part.Temperature != null || part.Acid != null) {
<tr><td></td><td colspan="3" style="font-size: 8pt;">@(part.Temperature != null ? $"Temperatur: {part.Temperature:N1} °C" : "")@(part.Temperature != null && part.Acid != null ? ", " : "")@(part.Acid != null ? $"Säure: {part.Acid:N1} g/l" : "")</td></tr>
}
}
</tbody>
</tbody>
</table>
@if (Model.Delivery.Comment != null) {
<p class="comment">Amerkung zur Lieferung: @Model.Delivery.Comment</p>
}
<div class="bottom">
<!-- FIXME page breaking -->
@if (Model.Text != null) {
<p class="comment">@Model.Text</p>
}
<div class="signatures">
<div>Genossenschaft</div>
<div>Mitglied</div>
@for (int i = 0; i < 2; i++) {
<div class="@(i == 0 ? "bottom" : "hidden")">
@if (Model.Text != null) {
<p class="comment">@Model.Text</p>
}
<div class="signatures">
<div>Genossenschaft</div>
<div>Mitglied</div>
</div>
</div>
</div>
}

1
Elwig/Documents/DeliveryNote.cshtml.cs
View File

@ -15,6 +15,7 @@ namespace Elwig.Documents {
$"<tr><th>Zweigstelle</th><td>{d.Branch.Name}</td></tr>" +
$"</tbody></table>";
Text = App.Client.DeliveryNoteText;
DocumentId = d.LsNr;
}
}
}

3
Elwig/Documents/Document.cshtml
View File

@ -21,14 +21,15 @@
<div class="m1"></div>
<div class="m2"></div>
<div class="m3"></div>
<header>@Raw(Model.Header)</header>
<div class="footer-wrapper">
<div class="pre-footer">
<span class="date">@($"{Model.Date:dddd, d. MMMM yyyy}")</span>
<span class="doc-id">@Model.DocumentId</span>
<span class="page"></span>
</div>
<footer>@Raw(Model.Footer)</footer>
</div>
<header>@Raw(Model.Header)</header>
<div class="spacing"></div>
<div class="main-wrapper">
@RenderBody()

1
Elwig/Documents/Document.cshtml.cs
View File

@ -36,6 +36,7 @@ namespace Elwig.Documents {
public string Header { get; set; }
public string Footer { get; set; }
public DateTime Date { get; set; }
public string? DocumentId { get; set; }
private async Task<string> Render() {
string name;