use activity list component with ViewAs parameter for link target
This commit is contained in:
parent
50a41ebd59
commit
e13c08937e
20 changed files with 47 additions and 399 deletions
|
@ -1,6 +1,6 @@
|
||||||
@using Wonky.Entity.Views
|
@using Wonky.Entity.Views
|
||||||
|
|
||||||
<table class="table table-sm table-striped d-print-table">
|
<table class="table table-striped d-print-table">
|
||||||
<thead>
|
<thead>
|
||||||
<tr class="table-light">
|
<tr class="table-light">
|
||||||
<th class="p-0" colspan="4">
|
<th class="p-0" colspan="4">
|
||||||
|
@ -78,9 +78,6 @@
|
||||||
</tr>
|
</tr>
|
||||||
</tbody>
|
</tbody>
|
||||||
<tfoot>
|
<tfoot>
|
||||||
<tr class="table-light">
|
|
||||||
<td colspan="4"></td>
|
|
||||||
</tr>
|
|
||||||
</tfoot>
|
</tfoot>
|
||||||
</table>
|
</table>
|
||||||
|
|
||||||
|
|
|
@ -1,8 +1,9 @@
|
||||||
@using Wonky.Entity.Views
|
@using Wonky.Entity.Views
|
||||||
|
|
||||||
<table class="table table-sm table-striped table-bordered">
|
<table class="table table-striped table-bordered d-print-table">
|
||||||
<thead>
|
<thead>
|
||||||
<tr class="bg-light text-black">
|
<tr class="bg-light text-black">
|
||||||
|
<th scope="col">Lok</th>
|
||||||
<th scope="col">Antal</th>
|
<th scope="col">Antal</th>
|
||||||
<th scope="col">Varnr</th>
|
<th scope="col">Varnr</th>
|
||||||
<th scope="col">Beskrivelse</th>
|
<th scope="col">Beskrivelse</th>
|
||||||
|
@ -16,6 +17,7 @@
|
||||||
@foreach (var line in ReportItem.Lines)
|
@foreach (var line in ReportItem.Lines)
|
||||||
{
|
{
|
||||||
<tr>
|
<tr>
|
||||||
|
<td class="fw-bold">@line.Location</td>
|
||||||
<td>@line.Quantity</td>
|
<td>@line.Quantity</td>
|
||||||
<td>@line.Sku</td>
|
<td>@line.Sku</td>
|
||||||
<td>@line.Description</td>
|
<td>@line.Description</td>
|
||||||
|
|
|
@ -18,6 +18,7 @@
|
||||||
<table class="table table-sm table-striped table-hover">
|
<table class="table table-sm table-striped table-hover">
|
||||||
<thead class="table-light">
|
<thead class="table-light">
|
||||||
<tr>
|
<tr>
|
||||||
|
<th scope="col" class=""><i class="bi-pin-map"></i></th>
|
||||||
<th scope="col" class="ps-2">Kunde</th>
|
<th scope="col" class="ps-2">Kunde</th>
|
||||||
<th scope="col">Bynavn</th>
|
<th scope="col">Bynavn</th>
|
||||||
<th scope="col">Demo</th>
|
<th scope="col">Demo</th>
|
||||||
|
@ -25,7 +26,7 @@
|
||||||
<th scope="col">Note</th>
|
<th scope="col">Note</th>
|
||||||
<th scope="col" class="text-end">SAS</th>
|
<th scope="col" class="text-end">SAS</th>
|
||||||
<th scope="col" class="text-end">NORMAL</th>
|
<th scope="col" class="text-end">NORMAL</th>
|
||||||
<th scope="col" class="text-center"><i style="font-size:1.3em;" class="bi-phone"></i></th>
|
<th scope="col" class="text-center"><i class="bi-phone"></i></th>
|
||||||
<th scope="col" class="text-center"><i class="bi-lightning-charge"></i></th>
|
<th scope="col" class="text-center"><i class="bi-lightning-charge"></i></th>
|
||||||
<th scope="col" class="text-center"><i class="bi-calculator"></i></th>
|
<th scope="col" class="text-center"><i class="bi-calculator"></i></th>
|
||||||
<th scope="col" class="text-center"><i class="bi-truck"></i></th>
|
<th scope="col" class="text-center"><i class="bi-truck"></i></th>
|
||||||
|
@ -34,7 +35,8 @@
|
||||||
<tbody>
|
<tbody>
|
||||||
@foreach (var activity in Activities)
|
@foreach (var activity in Activities)
|
||||||
{
|
{
|
||||||
<tr role="navigation" style="cursor: pointer" @onclick="() => OpenDocument(activity.Company.CompanyId, activity.ActivityId, activity.ProcessStatusEnum)">
|
<tr role="navigation" class="@(string.IsNullOrWhiteSpace(ViewAs) ? "" : "action-link-element")" @onclick="() => OpenDocument(activity.Company.CompanyId, activity.ActivityId, activity.ProcessStatusEnum)">
|
||||||
|
<td class="">@(activity.Company.Account.StartsWith("ny", StringComparison.InvariantCultureIgnoreCase) ? "N" : "R")</td>
|
||||||
<td class="text-sm-start ps-2">@activity.Company.Name</td>
|
<td class="text-sm-start ps-2">@activity.Company.Name</td>
|
||||||
<td class="text-sm-start">@activity.Company.City</td>
|
<td class="text-sm-start">@activity.Company.City</td>
|
||||||
<td class="text-sm-start">@activity.Demo</td>
|
<td class="text-sm-start">@activity.Demo</td>
|
||||||
|
|
|
@ -18,89 +18,7 @@
|
||||||
|
|
||||||
@if (Activities.Any())
|
@if (Activities.Any())
|
||||||
{
|
{
|
||||||
<table class="table table-sm table-bordered table-striped">
|
<ActivityListComponent Activities="Activities" ViewAs="office" />
|
||||||
<thead class="table-light">
|
|
||||||
<tr class="border-bottom">
|
|
||||||
<th scope="col">Kunde</th>
|
|
||||||
<th scope="col">Bynavn</th>
|
|
||||||
<th scope="col">Demo</th>
|
|
||||||
<th scope="col">Salg</th>
|
|
||||||
<th scope="col">Note</th>
|
|
||||||
<th class="text-end" scope="col">sas</th>
|
|
||||||
<th class="text-end" scope="col">Beløb</th>
|
|
||||||
<th class="text-center" scope="col">
|
|
||||||
<i class="bi-phone"></i>
|
|
||||||
</th>
|
|
||||||
<th class="text-center" scope="col">
|
|
||||||
<i class="bi-lightning-charge"></i>
|
|
||||||
</th>
|
|
||||||
<th class="text-center" scope="col">
|
|
||||||
<i class="bi-calculator"></i>
|
|
||||||
</th>
|
|
||||||
<th class="text-center" scope="col">
|
|
||||||
<i class="bi-truck"></i>
|
|
||||||
</th>
|
|
||||||
</tr>
|
|
||||||
</thead>
|
|
||||||
<tbody>
|
|
||||||
@foreach (var activity in Activities)
|
|
||||||
{
|
|
||||||
<tr class="border-bottom">
|
|
||||||
<td class="align-middle">
|
|
||||||
<a href="/office/customers/@activity.Company.CompanyId/orders/@activity.ActivityId">@activity.Company.Name</a>
|
|
||||||
</td>
|
|
||||||
<td class="align-middle">@activity.Company.City</td>
|
|
||||||
<td class="align-middle">@activity.Demo</td>
|
|
||||||
<td class="align-middle">@activity.Sales</td>
|
|
||||||
<td class="align-middle fw-bold">@activity.OfficeNote</td>
|
|
||||||
<td class="align-middle text-end">@($"{activity.SasAmount:N2}")</td>
|
|
||||||
<td class="align-middle text-end">@(activity.StatusTypeEnum == "Quote" ? "" : $"{activity.OrderAmount:N2}")</td>
|
|
||||||
<td class="align-middle text-center">
|
|
||||||
@if (activity.OurRef.Contains("T:") || activity.OurRef.Contains("TLF:"))
|
|
||||||
{
|
|
||||||
<i class="bi-phone"></i>
|
|
||||||
}
|
|
||||||
@if (activity.OurRef.Contains("WEB:"))
|
|
||||||
{
|
|
||||||
<i class="bi-app"></i>
|
|
||||||
}
|
|
||||||
</td>
|
|
||||||
<td class="align-middle text-center">
|
|
||||||
@if (activity.Express)
|
|
||||||
{
|
|
||||||
<i class="bi-lightning-charge"></i>
|
|
||||||
}
|
|
||||||
</td>
|
|
||||||
<td class="align-middle text-end">
|
|
||||||
@if (activity.StatusTypeEnum == "Quote")
|
|
||||||
{
|
|
||||||
<i class="bi-calculator"></i>
|
|
||||||
}
|
|
||||||
</td>
|
|
||||||
<td class="align-middle state">
|
|
||||||
@if (activity.Lines.Any() && activity.StatusTypeEnum == "Order")
|
|
||||||
{
|
|
||||||
<ProcessStateComponent StateClass="@Mapper.MapProcessStatus(activity.ProcessStatusEnum)"/>
|
|
||||||
}
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
}
|
|
||||||
</tbody>
|
|
||||||
<tfoot>
|
|
||||||
<tr>
|
|
||||||
<td colspan="5"></td>
|
|
||||||
<td class="text-end">@(Activities.Sum(x => x.SasAmount))</td>
|
|
||||||
<td class="text-end">@(Activities.Sum(x => x.OrderAmount))</td>
|
|
||||||
<td colspan="4"></td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td colspan="6" class="text-end">TOTAL</td>
|
|
||||||
<td class="text-end">@(Activities.Sum(x => x.SasAmount) + Activities.Sum(x => x.OrderAmount))</td>
|
|
||||||
<td colspan="4"></td>
|
|
||||||
</tr>
|
|
||||||
</tfoot>
|
|
||||||
|
|
||||||
</table>
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
|
@ -19,7 +19,7 @@ using Microsoft.AspNetCore.Components;
|
||||||
|
|
||||||
namespace Wonky.Client.Components;
|
namespace Wonky.Client.Components;
|
||||||
|
|
||||||
public partial class ReportSummaryComponent
|
public partial class ReportDescriptionComponent
|
||||||
{
|
{
|
||||||
[Parameter] public ReportDataView ReportDataView { get; set; } = new();
|
[Parameter] public ReportDataView ReportDataView { get; set; } = new();
|
||||||
|
|
|
@ -16,151 +16,12 @@
|
||||||
|
|
||||||
@using Wonky.Entity.Views
|
@using Wonky.Entity.Views
|
||||||
|
|
||||||
<div class="report-visit d-block d-print-block">
|
<div class="report-visit d-block">
|
||||||
<table class="table table-sm table-striped d-print-table">
|
|
||||||
<thead>
|
<ActivityHeaderComponent ReportItem="ReportItem"/>
|
||||||
<tr>
|
|
||||||
<th class="p-0" colspan="4">
|
<ActivityLinesComponent ReportItem="ReportItem"/>
|
||||||
<div class="alert d-print-block border border-1 border-dark pt-3 mb-2">
|
|
||||||
<h2 class="fw-bold text-center">@ReportItem.Company.Name</h2>
|
|
||||||
@if (ReportItem.Express)
|
|
||||||
{
|
|
||||||
<h2 class="fw-bold text-center"><i class="bi-lightning-charge the-fast" style="font-size: 3rem;"></i> HASTER</h2>
|
|
||||||
}
|
|
||||||
@if (ReportItem.VisitTypeEnum == "Phone" || ReportItem.OurRef.Contains("T:"))
|
|
||||||
{
|
|
||||||
<h4 class="text-center">TELEFONORDRE</h4>
|
|
||||||
}
|
|
||||||
@if (ReportItem.StatusTypeEnum is "Quote")
|
|
||||||
{
|
|
||||||
<h4 class="text-center">TILBUD</h4>
|
|
||||||
}
|
|
||||||
</div>
|
|
||||||
</th>
|
|
||||||
</tr>
|
|
||||||
</thead>
|
|
||||||
<tbody>
|
|
||||||
<tr>
|
|
||||||
<th scope="row">Vores Ref.</th>
|
|
||||||
<td class="fw-bold">@ReportItem.OurRef</td>
|
|
||||||
<th scope="row">EOrdre</th>
|
|
||||||
<td class="fw-bold">@ReportItem.ESalesNumber</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<th scope="row">Dato</th>
|
|
||||||
<td class="fw-bold">@ReportItem.OrderDate</td>
|
|
||||||
<th scope="row">Konto</th>
|
|
||||||
<td>@ReportItem.Company.Account</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<th scope="col">Telefon</th>
|
|
||||||
<td>@ReportItem.Company.Phone</td>
|
|
||||||
<th scope="col">Køber</th>
|
|
||||||
<td>@ReportItem.YourRef</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<th scope="col">CVR/VAT</th>
|
|
||||||
<td>@ReportItem.Company.VatNumber</td>
|
|
||||||
<th scope="col">Rekvisition</th>
|
|
||||||
<td>@ReportItem.ReferenceNumber</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<th scope="col">Navn</th>
|
|
||||||
<td>@ReportItem.Company.Name</td>
|
|
||||||
<th scope="col">Lev.Navn</th>
|
|
||||||
<td>@ReportItem.DlvName</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<th scope="col">Adresse</th>
|
|
||||||
<td>@ReportItem.Company.Address1</td>
|
|
||||||
<th scope="col">Lev.Adresse</th>
|
|
||||||
<td>@ReportItem.DlvAddress1</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<th scope="col">Adresse</th>
|
|
||||||
<td>@ReportItem.Company.Address2</td>
|
|
||||||
<th scope="col">Lev.Adresse</th>
|
|
||||||
<td>@ReportItem.DlvAddress2</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<th scope="col">Postnr By</th>
|
|
||||||
<td>@ReportItem.Company.ZipCode @ReportItem.Company.City</td>
|
|
||||||
<th scope="col">Lev.Postnr By</th>
|
|
||||||
<td>@ReportItem.DlvZipCity</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<th scope="col">Email</th>
|
|
||||||
<td colspan="3">@ReportItem.Company.Email</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<th scope="row">Vores Ref</th>
|
|
||||||
<td>@ReportItem.OurRef</td>
|
|
||||||
<th scope="row">Oprettet af</th>
|
|
||||||
<td>@ReportItem.CreatedBy</td>
|
|
||||||
</tr>
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
<table class="table table-sm table-striped table-bordered d-print-table">
|
|
||||||
<thead>
|
|
||||||
<tr class="bg-light text-black">
|
|
||||||
<th scope="col">Placering</th>
|
|
||||||
<th scope="col">Antal</th>
|
|
||||||
<th scope="col">Varnr</th>
|
|
||||||
<th scope="col">Beskrivelse</th>
|
|
||||||
<th class="text-end" scope="col">Pris</th>
|
|
||||||
<th class="text-end" scope="col">R%</th>
|
|
||||||
<th class="text-end" scope="col">Beløb</th>
|
|
||||||
<th class="text-center" scope="col">SAS</th>
|
|
||||||
</tr>
|
|
||||||
</thead>
|
|
||||||
<tbody>
|
|
||||||
@foreach (var line in ReportItem.Lines)
|
|
||||||
{
|
|
||||||
<tr>
|
|
||||||
<td class="fw-bold">@line.Location</td>
|
|
||||||
<td>@line.Quantity</td>
|
|
||||||
<td>@line.Sku</td>
|
|
||||||
<td>@line.Description</td>
|
|
||||||
<td class="text-end">@($"{line.Price:N2}")</td>
|
|
||||||
<td class="text-end">@($"{line.Discount:N2}")</td>
|
|
||||||
<td class="text-end">@($"{line.LineSum:N2}")</td>
|
|
||||||
<td class="text-center">
|
|
||||||
<i class="sas-check @(line.Sas ? "bi-check" : "")"></i>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
}
|
|
||||||
</tbody>
|
|
||||||
<tfoot class="table-light">
|
|
||||||
<tr>
|
|
||||||
<td colspan="5"></td>
|
|
||||||
<td>SAS</td>
|
|
||||||
<td class="text-end">@ReportItem.SasAmount</td>
|
|
||||||
<td></td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td colspan="5"></td>
|
|
||||||
<td>NORMAL</td>
|
|
||||||
<td class="text-end">@ReportItem.OrderAmount</td>
|
|
||||||
<td></td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td colspan="5"></td>
|
|
||||||
<td>TOTAL</td>
|
|
||||||
<td class="text-end">@(ReportItem.SasAmount + ReportItem.OrderAmount)</td>
|
|
||||||
<td></td>
|
|
||||||
</tr>
|
|
||||||
@if (ReportItem.Express)
|
|
||||||
{
|
|
||||||
<tr>
|
|
||||||
<td colspan="5"></td>
|
|
||||||
<td colspan="3">
|
|
||||||
<h5 class="fw-bold text-center"><i class="bi-lightning-charge the-fast" style="font-size: 2rem;"></i> HASTER</h5>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
}
|
|
||||||
</tfoot>
|
|
||||||
|
|
||||||
</table>
|
|
||||||
@if (!string.IsNullOrWhiteSpace(ReportItem.OfficeNote))
|
@if (!string.IsNullOrWhiteSpace(ReportItem.OfficeNote))
|
||||||
{
|
{
|
||||||
<div class="alert d-print-block border border-1 border-dark">
|
<div class="alert d-print-block border border-1 border-dark">
|
||||||
|
|
|
@ -130,7 +130,8 @@ else
|
||||||
</div>
|
</div>
|
||||||
<label for="orderMessage" class="col-sm-2 col-form-label-sm">Note /Kontor</label>
|
<label for="orderMessage" class="col-sm-2 col-form-label-sm">Note /Kontor</label>
|
||||||
<div class="col-sm-10">
|
<div class="col-sm-10">
|
||||||
<InputTextArea id="orderMessage" class="form-control" @bind-Value="_activity.OrderMessage"/>
|
<InputTextArea id="orderMessage" class="form-control"
|
||||||
|
maxlength="255" @bind-Value="_activity.OrderMessage"/>
|
||||||
<ValidationMessage For="@(() => _activity.OrderMessage)"></ValidationMessage>
|
<ValidationMessage For="@(() => _activity.OrderMessage)"></ValidationMessage>
|
||||||
</div>
|
</div>
|
||||||
<label for="crmNote" class="col-sm-2 col-form-label-sm">Note /Selv</label>
|
<label for="crmNote" class="col-sm-2 col-form-label-sm">Note /Selv</label>
|
||||||
|
@ -155,7 +156,8 @@ else
|
||||||
|
|
||||||
<label for="referenceNumber" class="col-sm-2 col-form-label-sm">Rekvisition</label>
|
<label for="referenceNumber" class="col-sm-2 col-form-label-sm">Rekvisition</label>
|
||||||
<div class="col-sm-4">
|
<div class="col-sm-4">
|
||||||
<InputText id="referenceNumber" class="form-control" @bind-Value="_activity.ReferenceNumber"/>
|
<InputText id="referenceNumber" class="form-control"
|
||||||
|
maxlength="20" @bind-Value="_activity.ReferenceNumber"/>
|
||||||
<ValidationMessage For="@(() => _activity.ReferenceNumber)"></ValidationMessage>
|
<ValidationMessage For="@(() => _activity.ReferenceNumber)"></ValidationMessage>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
@ -167,13 +169,15 @@ else
|
||||||
|
|
||||||
<label for="yourRef" class="col-sm-2 col-form-label-sm">Att/Ref</label>
|
<label for="yourRef" class="col-sm-2 col-form-label-sm">Att/Ref</label>
|
||||||
<div class="col-sm-4">
|
<div class="col-sm-4">
|
||||||
<InputText id="yourRef" class="form-control" @bind-Value="_activity.YourRef"/>
|
<InputText id="yourRef" class="form-control"
|
||||||
|
maxlength="35"@bind-Value="_activity.YourRef"/>
|
||||||
<ValidationMessage For="@(() => _activity.YourRef)"></ValidationMessage>
|
<ValidationMessage For="@(() => _activity.YourRef)"></ValidationMessage>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<label for="vatNumber" class="col-sm-2 col-form-label-sm">Cvr/Org nr.</label>
|
<label for="vatNumber" class="col-sm-2 col-form-label-sm">Cvr/Org nr.</label>
|
||||||
<div class="col-sm-2">
|
<div class="col-sm-2">
|
||||||
<InputText id="vatNumber" class="form-control" @bind-Value="_activity.VatNumber"/>
|
<InputText id="vatNumber" class="form-control"
|
||||||
|
maxlength="20" @bind-Value="_activity.VatNumber"/>
|
||||||
<ValidationMessage For="@(() => _activity.VatNumber)"/>
|
<ValidationMessage For="@(() => _activity.VatNumber)"/>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-sm-2">
|
<div class="col-sm-2">
|
||||||
|
@ -184,7 +188,8 @@ else
|
||||||
</div>
|
</div>
|
||||||
<label for="orderMessage" class="col-sm-2 col-form-label-sm">Note /Kontor</label>
|
<label for="orderMessage" class="col-sm-2 col-form-label-sm">Note /Kontor</label>
|
||||||
<div class="col-sm-4">
|
<div class="col-sm-4">
|
||||||
<InputTextArea id="orderMessage" class="form-control" @bind-Value="_activity.OrderMessage"/>
|
<InputTextArea id="orderMessage" class="form-control"
|
||||||
|
maxlength="255" @bind-Value="_activity.OrderMessage"/>
|
||||||
<ValidationMessage For="@(() => _activity.OrderMessage)"></ValidationMessage>
|
<ValidationMessage For="@(() => _activity.OrderMessage)"></ValidationMessage>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
|
@ -25,150 +25,6 @@
|
||||||
|
|
||||||
<ActivityHeaderComponent ReportItem="ReportItem" />
|
<ActivityHeaderComponent ReportItem="ReportItem" />
|
||||||
<ActivityLinesComponent ReportItem="ReportItem" />
|
<ActivityLinesComponent ReportItem="ReportItem" />
|
||||||
@*
|
|
||||||
<table class="table table-sm table-striped d-print-table">
|
|
||||||
<thead>
|
|
||||||
<tr>
|
|
||||||
<th class="p-0" colspan="4">
|
|
||||||
<div class="bg-light text-dark border border-1 rounded-3 pt-3 mb-2">
|
|
||||||
<h2 class="fw-bold text-center">@ReportItem.Company.Name</h2>
|
|
||||||
<h3 class="text-center font-monospace">@ReportItem.ESalesNumber</h3>
|
|
||||||
@if (ReportItem.StatusTypeEnum.ToLower() is "quote")
|
|
||||||
{
|
|
||||||
<h3 class="text-center">TILBUD</h3>
|
|
||||||
}
|
|
||||||
@if (ReportItem.VisitTypeEnum.ToLower() == "phone" ||
|
|
||||||
ReportItem.OurRef.Contains("T:") ||
|
|
||||||
ReportItem.OurRef.Contains("TLF:"))
|
|
||||||
{
|
|
||||||
<h3 class="text-center">TELEFONORDRE</h3>
|
|
||||||
}
|
|
||||||
@if (ReportItem.Express)
|
|
||||||
{
|
|
||||||
<h2 class="fw-bold text-center"><i class="bi-lightning-charge the-fast" style="font-size: 2rem;"></i> HASTER</h2>
|
|
||||||
}
|
|
||||||
</div>
|
|
||||||
</th>
|
|
||||||
</tr>
|
|
||||||
</thead>
|
|
||||||
<tbody>
|
|
||||||
<tr>
|
|
||||||
<th scope="row">Dato</th>
|
|
||||||
<td>@ReportItem.OrderDate</td>
|
|
||||||
<th scope="row">Konto</th>
|
|
||||||
<td>@ReportItem.Company.Account</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<th scope="col">Telefon</th>
|
|
||||||
<td>@ReportItem.Company.Phone</td>
|
|
||||||
<th scope="col">Køber</th>
|
|
||||||
<td>@ReportItem.YourRef</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<th scope="col">CVR/VAT</th>
|
|
||||||
<td>@ReportItem.Company.VatNumber</td>
|
|
||||||
<th scope="col">Rekvisition</th>
|
|
||||||
<td>@ReportItem.ReferenceNumber</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<th scope="col">Navn</th>
|
|
||||||
<td>@ReportItem.Company.Name</td>
|
|
||||||
<th scope="col">Lev.Navn</th>
|
|
||||||
<td>@ReportItem.DlvName</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<th scope="col">Adresse</th>
|
|
||||||
<td>@ReportItem.Company.Address1</td>
|
|
||||||
<th scope="col">Lev.Adresse</th>
|
|
||||||
<td>@ReportItem.DlvAddress1</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<th scope="col">Adresse</th>
|
|
||||||
<td>@ReportItem.Company.Address2</td>
|
|
||||||
<th scope="col">Lev.Adresse</th>
|
|
||||||
<td>@ReportItem.DlvAddress2</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<th scope="col">Postnr By</th>
|
|
||||||
<td>@ReportItem.Company.ZipCode @ReportItem.Company.City</td>
|
|
||||||
<th scope="col">Lev.Postnr By</th>
|
|
||||||
<td>@ReportItem.DlvZipCity</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<th scope="col">Email</th>
|
|
||||||
<td colspan="3">@ReportItem.Company.Email</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<th scope="row">Vores Ref</th>
|
|
||||||
<td>@ReportItem.OurRef</td>
|
|
||||||
<th scope="row">Oprettet af</th>
|
|
||||||
<td>@ReportItem.CreatedBy</td>
|
|
||||||
</tr>
|
|
||||||
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
*@
|
|
||||||
|
|
||||||
@*
|
|
||||||
<table class="table table-sm table-striped table-bordered">
|
|
||||||
<thead>
|
|
||||||
<tr class="bg-light text-black">
|
|
||||||
<th scope="col">Antal</th>
|
|
||||||
<th scope="col">Varnr</th>
|
|
||||||
<th scope="col">Beskrivelse</th>
|
|
||||||
<th class="text-end" scope="col">Pris</th>
|
|
||||||
<th class="text-end" scope="col">R%</th>
|
|
||||||
<th class="text-end" scope="col">Beløb</th>
|
|
||||||
<th class="text-center">SAS</th>
|
|
||||||
</tr>
|
|
||||||
</thead>
|
|
||||||
<tbody>
|
|
||||||
@foreach (var line in ReportItem.Lines)
|
|
||||||
{
|
|
||||||
<tr>
|
|
||||||
<td>@line.Quantity</td>
|
|
||||||
<td>@line.Sku</td>
|
|
||||||
<td>@line.Description</td>
|
|
||||||
<td class="text-end">@($"{line.Price:N2}")</td>
|
|
||||||
<td class="text-end">@($"{line.Discount:N2}")</td>
|
|
||||||
<td class="text-end">@($"{line.LineSum:N2}")</td>
|
|
||||||
<td class="text-center">
|
|
||||||
@if (line.Sas)
|
|
||||||
{
|
|
||||||
<i class="bi-check"></i>
|
|
||||||
}
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
}
|
|
||||||
</tbody>
|
|
||||||
<tfoot>
|
|
||||||
<tr>
|
|
||||||
<td colspan="4"></td>
|
|
||||||
<td>SAS</td>
|
|
||||||
<td class="text-end">@ReportItem.SasAmount</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td colspan="4"></td>
|
|
||||||
<td>NORMAL</td>
|
|
||||||
<td class="text-end">@ReportItem.OrderAmount</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td colspan="4"></td>
|
|
||||||
<td>TOTAL</td>
|
|
||||||
<td class="text-end">@(ReportItem.SasAmount + ReportItem.OrderAmount)</td>
|
|
||||||
</tr>
|
|
||||||
@if (ReportItem.Express)
|
|
||||||
{
|
|
||||||
<tr>
|
|
||||||
<td colspan="4"></td>
|
|
||||||
<td colspan="2">
|
|
||||||
<h5 class="fw-bold text-center"><i class="bi-lightning-charge the-fast" style="font-size: 2rem;"></i> HASTER</h5>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
}
|
|
||||||
</tfoot>
|
|
||||||
</table>
|
|
||||||
*@
|
|
||||||
|
|
||||||
@* Office Note *@
|
@* Office Note *@
|
||||||
@if (ReportItem is { ProcessStatusEnum: "None",Express: false } && AllowOfficeNoteUpdate())
|
@if (ReportItem is { ProcessStatusEnum: "None",Express: false } && AllowOfficeNoteUpdate())
|
||||||
|
|
|
@ -85,7 +85,7 @@ public partial class AdvisorQuoteListPage : IDisposable
|
||||||
// store quotes in local storage
|
// store quotes in local storage
|
||||||
await Storage.SetItemAsync("quotes", QuoteList.OrderBy(x => x.Company.Name));
|
await Storage.SetItemAsync("quotes", QuoteList.OrderBy(x => x.Company.Name));
|
||||||
// filter quotes - if any - based on active filter
|
// filter quotes - if any - based on active filter
|
||||||
if(QuoteList.Any())
|
if(QuoteList.Count != 0)
|
||||||
await FilterQuotes(QuoteFilter);
|
await FilterQuotes(QuoteFilter);
|
||||||
Working = false;
|
Working = false;
|
||||||
// signal page state changed
|
// signal page state changed
|
||||||
|
|
|
@ -45,7 +45,7 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="w-75">
|
<div class="w-75">
|
||||||
<ReportSummaryComponent ReportDataView="Report.ReportData"/>
|
<ReportDescriptionComponent ReportDataView="Report.ReportData"/>
|
||||||
</div>
|
</div>
|
||||||
<div class="w-25">
|
<div class="w-25">
|
||||||
<ReportLedgerDistanceComponent ReportDataView="Report.ReportData"/>
|
<ReportLedgerDistanceComponent ReportDataView="Report.ReportData"/>
|
||||||
|
|
|
@ -48,13 +48,14 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="w-75">
|
<div class="w-75">
|
||||||
<ReportSummaryComponent ReportDataView="Report.ReportData"/>
|
<ReportDescriptionComponent ReportDataView="Report.ReportData"/>
|
||||||
</div>
|
</div>
|
||||||
<div class="w-25">
|
<div class="w-25">
|
||||||
<ReportLedgerDistanceComponent ReportDataView="Report.ReportData"/>
|
<ReportLedgerDistanceComponent ReportDataView="Report.ReportData"/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<ReportActivityListOfficeComponent Activities="Report.ReportItems"/>
|
@* <ReportActivityListOfficeComponent Activities="Report.ReportItems"/> *@
|
||||||
|
<ActivityListComponent Activities="Report.ReportItems" ViewAs="office" />
|
||||||
<ReportLedgerActivityComponent ReportData="Report.ReportData"/>
|
<ReportLedgerActivityComponent ReportData="Report.ReportData"/>
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
|
@ -28,7 +28,7 @@ using Wonky.Entity.Views;
|
||||||
|
|
||||||
namespace Wonky.Client.Pages;
|
namespace Wonky.Client.Pages;
|
||||||
|
|
||||||
public partial class CommonReportPrintOrderPage
|
public partial class PrintReportOrderPage
|
||||||
{
|
{
|
||||||
[Parameter] public string CountryCode { get; set; } = "";
|
[Parameter] public string CountryCode { get; set; } = "";
|
||||||
[Parameter] public string UserId { get; set; } = "";
|
[Parameter] public string UserId { get; set; } = "";
|
||||||
|
@ -37,7 +37,7 @@ public partial class CommonReportPrintOrderPage
|
||||||
[Inject] public NavigationManager Navigator { get; set; }
|
[Inject] public NavigationManager Navigator { get; set; }
|
||||||
[Inject] public IOrderProcessRepository ProcessRepo { get; set; }
|
[Inject] public IOrderProcessRepository ProcessRepo { get; set; }
|
||||||
[Inject] public IJSRuntime JsRuntime { get; set; }
|
[Inject] public IJSRuntime JsRuntime { get; set; }
|
||||||
[Inject] public ILogger<CommonReportPrintOrderPage> Logger { get; set; }
|
[Inject] public ILogger<PrintReportOrderPage> Logger { get; set; }
|
||||||
[Inject] public IToastService Toaster { get; set; }
|
[Inject] public IToastService Toaster { get; set; }
|
||||||
private ReportView Report { get; set; } = new();
|
private ReportView Report { get; set; } = new();
|
||||||
private List<ReportItemView> Items { get; set; } = new();
|
private List<ReportItemView> Items { get; set; } = new();
|
|
@ -39,12 +39,13 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="w-75">
|
<div class="w-75">
|
||||||
<ReportSummaryComponent ReportDataView="Report.ReportData"/>
|
<ReportDescriptionComponent ReportDataView="Report.ReportData"/>
|
||||||
</div>
|
</div>
|
||||||
<div class="w-25">
|
<div class="w-25">
|
||||||
<ReportLedgerDistanceComponent ReportDataView="Report.ReportData"/>
|
<ReportLedgerDistanceComponent ReportDataView="Report.ReportData"/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<ReportActivityListOfficeComponent Activities="Report.ReportItems"/>
|
@* <ReportActivityListOfficeComponent Activities="Report.ReportItems"/> *@
|
||||||
|
<ActivityListComponent Activities="Report.ReportItems" />
|
||||||
<ReportLedgerActivityComponent ReportData="Report.ReportData"/>
|
<ReportLedgerActivityComponent ReportData="Report.ReportData"/>
|
||||||
</div>
|
</div>
|
|
@ -23,7 +23,7 @@ using Wonky.Entity.Views;
|
||||||
|
|
||||||
namespace Wonky.Client.Pages;
|
namespace Wonky.Client.Pages;
|
||||||
|
|
||||||
public partial class CommonReportPrintSummaryPage
|
public partial class PrintReportSummaryLedgerPage
|
||||||
{
|
{
|
||||||
[Parameter] public string CountryCode { get; set; } = "";
|
[Parameter] public string CountryCode { get; set; } = "";
|
||||||
[Parameter] public string UserId { get; set; } = "";
|
[Parameter] public string UserId { get; set; } = "";
|
||||||
|
@ -31,7 +31,7 @@ public partial class CommonReportPrintSummaryPage
|
||||||
[Inject] public ILocalStorageService Storage { get; set; }
|
[Inject] public ILocalStorageService Storage { get; set; }
|
||||||
[Inject] public NavigationManager Navigator { get; set; }
|
[Inject] public NavigationManager Navigator { get; set; }
|
||||||
[Inject] public IJSRuntime JsRuntime { get; set; }
|
[Inject] public IJSRuntime JsRuntime { get; set; }
|
||||||
[Inject] public ILogger<CommonReportPrintSummaryPage> Logger { get; set; }
|
[Inject] public ILogger<PrintReportSummaryLedgerPage> Logger { get; set; }
|
||||||
private ReportView Report { get; set; } = new();
|
private ReportView Report { get; set; } = new();
|
||||||
private IJSObjectReference JsModule { get; set; }
|
private IJSObjectReference JsModule { get; set; }
|
||||||
private string ReturnUrl { get; set; } = "";
|
private string ReturnUrl { get; set; } = "";
|
|
@ -42,7 +42,7 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="w-75">
|
<div class="w-75">
|
||||||
<ReportSummaryComponent ReportDataView="Report.ReportData"/>
|
<ReportDescriptionComponent ReportDataView="Report.ReportData"/>
|
||||||
</div>
|
</div>
|
||||||
<div class="w-25">
|
<div class="w-25">
|
||||||
<ReportLedgerDistanceComponent ReportDataView="Report.ReportData"/>
|
<ReportLedgerDistanceComponent ReportDataView="Report.ReportData"/>
|
||||||
|
|
|
@ -30,6 +30,7 @@
|
||||||
<Content Update="wwwroot\appsettings.json">
|
<Content Update="wwwroot\appsettings.json">
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
</Content>
|
</Content>
|
||||||
|
<Content Remove="Components\ReportActivityListOfficeComponent.razor" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
@ -3792,6 +3793,7 @@
|
||||||
<Compile Remove="wwwroot\icons\**" />
|
<Compile Remove="wwwroot\icons\**" />
|
||||||
<Compile Remove="Pages\AdvisorCustomerOrderViewPage.razor.cs" />
|
<Compile Remove="Pages\AdvisorCustomerOrderViewPage.razor.cs" />
|
||||||
<Compile Remove="Pages\OfficeUserAdvisorViewEditPage.razor.cs" />
|
<Compile Remove="Pages\OfficeUserAdvisorViewEditPage.razor.cs" />
|
||||||
|
<Compile Remove="Components\ReportActivityListOfficeComponent.razor.cs" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|
|
@ -14,6 +14,7 @@
|
||||||
top: 1px;
|
top: 1px;
|
||||||
right: 10px;
|
right: 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.workDate {
|
.workDate {
|
||||||
font-variant: small-caps;
|
font-variant: small-caps;
|
||||||
}
|
}
|
||||||
|
@ -33,10 +34,12 @@
|
||||||
background-color: #a2a2ec;
|
background-color: #a2a2ec;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
.table-* {
|
.table-* {
|
||||||
background-color: #030303;
|
background-color: #030303;
|
||||||
color: white;
|
color: white;
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
html, body {
|
html, body {
|
||||||
font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
|
font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
|
||||||
|
|
|
@ -23,7 +23,7 @@
|
||||||
border: initial;
|
border: initial;
|
||||||
border-radius: initial;
|
border-radius: initial;
|
||||||
box-shadow: initial;
|
box-shadow: initial;
|
||||||
font-size: 10px;
|
font-size: 11px;
|
||||||
margin: auto;
|
margin: auto;
|
||||||
width: initial;
|
width: initial;
|
||||||
-webkit-print-color-adjust: exact;
|
-webkit-print-color-adjust: exact;
|
||||||
|
@ -39,7 +39,7 @@
|
||||||
border: initial;
|
border: initial;
|
||||||
border-radius: initial;
|
border-radius: initial;
|
||||||
box-shadow: initial;
|
box-shadow: initial;
|
||||||
font-size: 10px;
|
font-size: 11px;
|
||||||
min-height: 250mm;
|
min-height: 250mm;
|
||||||
margin: 0;
|
margin: 0;
|
||||||
width: initial;
|
width: initial;
|
||||||
|
@ -47,7 +47,7 @@
|
||||||
color-adjust: exact;
|
color-adjust: exact;
|
||||||
}
|
}
|
||||||
.report-visit td {
|
.report-visit td {
|
||||||
font-size: 10px;
|
font-size: 11px;
|
||||||
}
|
}
|
||||||
.distance-ledger {}
|
.distance-ledger {}
|
||||||
.report-ledger {
|
.report-ledger {
|
||||||
|
@ -57,7 +57,7 @@
|
||||||
break-before: avoid;
|
break-before: avoid;
|
||||||
break-inside: avoid;
|
break-inside: avoid;
|
||||||
break-after: recto;
|
break-after: recto;
|
||||||
font-size: 10px;
|
font-size: 11px;
|
||||||
min-height: 300px;
|
min-height: 300px;
|
||||||
}
|
}
|
||||||
}
|
}
|
Loading…
Reference in a new issue