publish v.0.8.122 to production
This commit is contained in:
parent
cf495eefd9
commit
e782e7cac2
16 changed files with 329 additions and 366 deletions
|
@ -18,13 +18,35 @@
|
|||
@using Wonky.Entity.Configuration
|
||||
@using Microsoft.Extensions.Options
|
||||
|
||||
<span class="version">@_app?.Version</span>@if(_app!.IsBeta){<span class="version">-beta</span>}
|
||||
@if (_production)
|
||||
{
|
||||
<div class="badge text-bg-success mx-3">app version @_app?.Version</div>
|
||||
}
|
||||
else
|
||||
{
|
||||
<div class="badge text-bg-info mx-3">app version @_app?.Version</div>
|
||||
}
|
||||
|
||||
@if (_app!.IsBeta)
|
||||
{
|
||||
<div class="badge text-bg-warning mx-3">Beta version</div>
|
||||
}
|
||||
|
||||
@if (_app!.SandBox)
|
||||
{
|
||||
<div class="badge text-bg-danger mx-3">Sandkasse</div>
|
||||
}
|
||||
@code
|
||||
{
|
||||
[Inject] IOptions<AppInfo?>? AppInfo { get; set; }
|
||||
private AppInfo? _app;
|
||||
private bool _production = true;
|
||||
|
||||
protected override void OnInitialized()
|
||||
{
|
||||
_app = AppInfo?.Value;
|
||||
var revision = _app?.Version.Split(".");
|
||||
var x = Convert.ToInt32(revision?[^1]);
|
||||
_production = x % 2 == 0;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -15,70 +15,73 @@
|
|||
//
|
||||
*@
|
||||
|
||||
<table class="table table-sm table-bordered table-striped d-print-table">
|
||||
<thead>
|
||||
<tr class="bg-dark text-white opacity-75 border-bottom">
|
||||
<th></th>
|
||||
<th class="text-center" colspan="2" scope="col">Dagens Demo @(ReportData.NewDemoCount + ReportData.RecallDemoCount)</th>
|
||||
<th class="text-center border-end" colspan="2" scope="col">Dagens Resultat</th>
|
||||
<th class="text-center" colspan="4" scope="col">Måneds Resultat</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr class="bg-dark bg-opacity-50 border-bottom">
|
||||
<td></td>
|
||||
<th class="text-end text-white" scope="col">Besøg</th>
|
||||
<th class="text-end text-white" scope="col">Demo</th>
|
||||
<th class="text-end text-white" scope="col">Salg</th>
|
||||
<th class="text-end text-white border-end" scope="col">Beløb</th>
|
||||
<th class="text-end text-white" scope="col">Besøg</th>
|
||||
<th class="text-end text-white" scope="col">Demo</th>
|
||||
<th class="text-end text-white" scope="col">Salg</th>
|
||||
<th class="text-end text-white" scope="col">Beløb</th>
|
||||
</tr>
|
||||
<tr>
|
||||
<th scope="row">N</th>
|
||||
<td class="text-end">@ReportData.NewVisitCount</td>
|
||||
<td class="text-end">@ReportData.NewDemoCount</td>
|
||||
<td class="text-end">@ReportData.NewSaleCount</td>
|
||||
<td class="text-end border-end">@ReportData.NewTurnover</td>
|
||||
<td class="text-end">@ReportData.NewVisitCountMonth</td>
|
||||
<td class="text-end">@ReportData.NewDemoCountMonth</td>
|
||||
<td class="text-end">@ReportData.NewSaleCountMonth</td>
|
||||
<td class="text-end">@ReportData.NewTurnoverMonth</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th scope="row">R</th>
|
||||
<td class="text-end">@ReportData.RecallVisitCount</td>
|
||||
<td class="text-end">@ReportData.RecallDemoCount</td>
|
||||
<td class="text-end">@ReportData.RecallSaleCount</td>
|
||||
<td class="text-end border-end">@ReportData.RecallTurnover</td>
|
||||
<td class="text-end">@ReportData.RecallVisitCountMonth</td>
|
||||
<td class="text-end">@ReportData.RecallDemoCountMonth</td>
|
||||
<td class="text-end">@ReportData.RecallSaleCountMonth</td>
|
||||
<td class="text-end">@ReportData.RecallTurnoverMonth</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th scope="row">SAS</th>
|
||||
<td class="bg-light"></td>
|
||||
<td class="bg-light"></td>
|
||||
<td class="text-end">@ReportData.SasCount</td>
|
||||
<td class="text-end border-end">@ReportData.SasTurnover</td>
|
||||
<td class="bg-light"></td>
|
||||
<td class="bg-light"></td>
|
||||
<td class="text-end">@ReportData.SasCountMonth</td>
|
||||
<td class="text-end">@ReportData.SasTurnoverMonth</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th scope="row">TOTAL</th>
|
||||
<td class="text-end">@ReportData.TotalVisitCount</td>
|
||||
<td class="text-end">@ReportData.TotalDemoCount</td>
|
||||
<td class="text-end">@ReportData.TotalSaleCount</td>
|
||||
<td class="text-end border-end">@ReportData.TotalTurnover</td>
|
||||
<td class="text-end">@ReportData.TotalVisitCountMonth</td>
|
||||
<td class="text-end">@ReportData.TotalDemoCountMonth</td>
|
||||
<td class="text-end">@ReportData.TotalSaleCountMonth</td>
|
||||
<td class="text-end">@ReportData.TotalTurnoverMonth</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
<div class="report-ledger">
|
||||
<table class="table table-sm table-bordered table-striped">
|
||||
<thead>
|
||||
<tr class="bg-dark text-white opacity-75 border-bottom">
|
||||
<th></th>
|
||||
<th class="text-center" colspan="2" scope="col">Dagens Demo @(ReportData.NewDemoCount + ReportData.RecallDemoCount)</th>
|
||||
<th class="text-center border-end" colspan="2" scope="col">Dagens Resultat</th>
|
||||
<th class="text-center" colspan="4" scope="col">Måneds Resultat</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr class="bg-dark bg-opacity-50 border-bottom">
|
||||
<td></td>
|
||||
<th class="text-end text-white" scope="col">Besøg</th>
|
||||
<th class="text-end text-white" scope="col">Demo</th>
|
||||
<th class="text-end text-white" scope="col">Salg</th>
|
||||
<th class="text-end text-white border-end" scope="col">Beløb</th>
|
||||
<th class="text-end text-white" scope="col">Besøg</th>
|
||||
<th class="text-end text-white" scope="col">Demo</th>
|
||||
<th class="text-end text-white" scope="col">Salg</th>
|
||||
<th class="text-end text-white" scope="col">Beløb</th>
|
||||
</tr>
|
||||
<tr>
|
||||
<th scope="row">N</th>
|
||||
<td class="text-end">@ReportData.NewVisitCount</td>
|
||||
<td class="text-end">@ReportData.NewDemoCount</td>
|
||||
<td class="text-end">@ReportData.NewSaleCount</td>
|
||||
<td class="text-end border-end">@ReportData.NewTurnover</td>
|
||||
<td class="text-end">@ReportData.NewVisitCountMonth</td>
|
||||
<td class="text-end">@ReportData.NewDemoCountMonth</td>
|
||||
<td class="text-end">@ReportData.NewSaleCountMonth</td>
|
||||
<td class="text-end">@ReportData.NewTurnoverMonth</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th scope="row">R</th>
|
||||
<td class="text-end">@ReportData.RecallVisitCount</td>
|
||||
<td class="text-end">@ReportData.RecallDemoCount</td>
|
||||
<td class="text-end">@ReportData.RecallSaleCount</td>
|
||||
<td class="text-end border-end">@ReportData.RecallTurnover</td>
|
||||
<td class="text-end">@ReportData.RecallVisitCountMonth</td>
|
||||
<td class="text-end">@ReportData.RecallDemoCountMonth</td>
|
||||
<td class="text-end">@ReportData.RecallSaleCountMonth</td>
|
||||
<td class="text-end">@ReportData.RecallTurnoverMonth</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th scope="row">SAS</th>
|
||||
<td class="bg-light"></td>
|
||||
<td class="bg-light"></td>
|
||||
<td class="text-end">@ReportData.SasCount</td>
|
||||
<td class="text-end border-end">@ReportData.SasTurnover</td>
|
||||
<td class="bg-light"></td>
|
||||
<td class="bg-light"></td>
|
||||
<td class="text-end">@ReportData.SasCountMonth</td>
|
||||
<td class="text-end">@ReportData.SasTurnoverMonth</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th scope="row">TOTAL</th>
|
||||
<td class="text-end">@ReportData.TotalVisitCount</td>
|
||||
<td class="text-end">@ReportData.TotalDemoCount</td>
|
||||
<td class="text-end">@ReportData.TotalSaleCount</td>
|
||||
<td class="text-end border-end">@ReportData.TotalTurnover</td>
|
||||
<td class="text-end">@ReportData.TotalVisitCountMonth</td>
|
||||
<td class="text-end">@ReportData.TotalDemoCountMonth</td>
|
||||
<td class="text-end">@ReportData.TotalSaleCountMonth</td>
|
||||
<td class="text-end">@ReportData.TotalTurnoverMonth</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
</div>
|
|
@ -15,38 +15,41 @@
|
|||
//
|
||||
*@
|
||||
|
||||
<table class="table table-sm table-bordered table-striped d-print-table">
|
||||
<thead>
|
||||
<tr class="bg-dark text-white opacity-75 border-bottom">
|
||||
<th colspan="2">
|
||||
Km regnskab
|
||||
</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr>
|
||||
<th scope="row">Aften</th>
|
||||
<td class="text-end">@ReportData.KmEvening</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th scope="row">Morgen</th>
|
||||
<td class="text-end">@ReportData.KmMorning</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th scope="row">Kørt Dag</th>
|
||||
<td class="text-end">@ReportData.Distance</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th scope="row">Kørt Md.</th>
|
||||
<td class="text-end">@ReportData.DistanceMonth</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th scope="row">Privat</th>
|
||||
<td class="text-end">@ReportData.DistancePrivate</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th scope="row">Privat Md.</th>
|
||||
<td class="text-end">@ReportData.DistancePrivateMonth</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
<div class="distance-ledger">
|
||||
<table class="table table-sm table-bordered table-striped">
|
||||
<thead>
|
||||
<tr class="bg-dark text-white opacity-75 border-bottom">
|
||||
<th colspan="2">
|
||||
Km regnskab
|
||||
</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr>
|
||||
<th scope="row">Aften</th>
|
||||
<td class="text-end">@ReportData.KmEvening</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th scope="row">Morgen</th>
|
||||
<td class="text-end">@ReportData.KmMorning</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th scope="row">Kørt Dag</th>
|
||||
<td class="text-end">@ReportData.Distance</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th scope="row">Kørt Md.</th>
|
||||
<td class="text-end">@ReportData.DistanceMonth</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th scope="row">Privat</th>
|
||||
<td class="text-end">@ReportData.DistancePrivate</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th scope="row">Privat Md.</th>
|
||||
<td class="text-end">@ReportData.DistancePrivateMonth</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
</div>
|
|
@ -17,94 +17,100 @@
|
|||
|
||||
@using Wonky.Entity.Views
|
||||
|
||||
<h2 class="text-center">Ordre @ReportItem.OrderDate</h2>
|
||||
|
||||
<table class="table table-sm table-striped table-bordered d-print-table">
|
||||
<tbody>
|
||||
<tr>
|
||||
<th scope="row">EOrdre nr.</th>
|
||||
<td>@ReportItem.ESalesNumber</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>
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<h3 class="text-center">Varer</h3>
|
||||
<table class="table table-sm table-striped table-bordered d-print-table">
|
||||
<thead>
|
||||
<tr>
|
||||
<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>
|
||||
</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>
|
||||
<div class="report-page">
|
||||
@* <table class="table table-sm table-striped table-bordered d-print-table"> *@
|
||||
<table class="table table-sm table-striped table-bordered">
|
||||
<thead>
|
||||
<tr class="bg-light text-black">
|
||||
<th colspan="4">
|
||||
Ordre @ReportItem.ESalesNumber
|
||||
</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>
|
||||
</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>
|
||||
</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>
|
||||
</tr>
|
||||
}
|
||||
<tr>
|
||||
<td colspan="4"></td>
|
||||
<td>Ordresum</td>
|
||||
<td class="text-end">@ReportItem.OrderAmount</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
@if (!string.IsNullOrWhiteSpace(@ReportItem.OfficeNote))
|
||||
{
|
||||
<div class="alert alert-dark d-print-block">
|
||||
<h4 class="text-center">
|
||||
@ReportItem.OfficeNote
|
||||
</h4>
|
||||
</div>
|
||||
}
|
||||
<tr>
|
||||
<td colspan="4"></td>
|
||||
<td>Ordresum</td>
|
||||
<td class="text-end">@ReportItem.OrderAmount</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
@if (!string.IsNullOrWhiteSpace(@ReportItem.OfficeNote))
|
||||
{
|
||||
<div class="alert alert-dark d-print-block">
|
||||
<h4 class="text-center">
|
||||
@ReportItem.OfficeNote
|
||||
</h4>
|
||||
</div>
|
||||
}
|
||||
</div>
|
||||
|
||||
@code{
|
||||
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
//
|
||||
*@
|
||||
|
||||
<table class="table table-sm table-bordered table-striped d-print-table">
|
||||
<table class="table table-sm table-bordered table-striped">
|
||||
<thead>
|
||||
<tr class="bg-dark text-white opacity-75 border-bottom">
|
||||
<th colspan="3">
|
||||
|
@ -33,7 +33,7 @@
|
|||
<td colspan="2">@ReportData.SupervisedBy</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th scope="row">Indhold</th>
|
||||
<th scope="row">Dækkende</th>
|
||||
<td colspan="2">
|
||||
@{
|
||||
switch (ReportData.DayTypeEnum)
|
||||
|
@ -61,7 +61,7 @@
|
|||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th scope="row">Fra/Til</th>
|
||||
<th scope="row">Periode</th>
|
||||
<td>
|
||||
@{
|
||||
switch (ReportData.DayTypeEnum)
|
||||
|
|
|
@ -22,53 +22,49 @@
|
|||
|
||||
@if (Report != null)
|
||||
{
|
||||
<div class="report-page d-print-table">
|
||||
<PageTitle>@Report.ReportData.Name</PageTitle>
|
||||
<div class="row">
|
||||
<div class="col-md-6 d-print-none align-content-center">
|
||||
@if (!string.IsNullOrWhiteSpace(ReportDate))
|
||||
{
|
||||
<h3 class="workDate">@DateTime.Parse(ReportDate).ToLongDateString()</h3>
|
||||
}
|
||||
</div>
|
||||
<div class="col col-md-4 d-print-none align-content-center">
|
||||
<WorkDateComponent SelectedDate="@ReportDate" OnChanged="GetReport"></WorkDateComponent>
|
||||
</div>
|
||||
<div class="col col-md-1 d-print-none align-content-center">
|
||||
<button class="btn btn-warning" type="button" onclick="window.print();">Print</button>
|
||||
</div>
|
||||
<div class="col d-none d-print-block text-center align-content-center">
|
||||
<h3>@Report.ReportData.Name</h3>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="w-75">
|
||||
<ReportSummaryComponent ReportData="Report.ReportData"></ReportSummaryComponent>
|
||||
</div>
|
||||
<div class="w-25">
|
||||
<ReportDistanceLedgerComponent ReportData="Report.ReportData"></ReportDistanceLedgerComponent>
|
||||
</div>
|
||||
</div>
|
||||
<ActivityTableComponent Activities="Report.ReportItems"></ActivityTableComponent>
|
||||
<ReportActivityLedgerComponent ReportData="Report.ReportData"></ReportActivityLedgerComponent>
|
||||
</div>
|
||||
|
||||
@* <div class="page-break d-block d-print-block"></div> *@
|
||||
|
||||
@if (_items.Any())
|
||||
{
|
||||
|
||||
@foreach (var item in _items)
|
||||
{
|
||||
<div class="report-page">
|
||||
<div class="d-print-block">
|
||||
<ReportItemComponent ReportItem="@item"></ReportItemComponent>
|
||||
<div class="report-page">
|
||||
<div class="d-print-block">
|
||||
<PageTitle>@Report.ReportData.Name</PageTitle>
|
||||
<div class="row">
|
||||
<div class="col-md-6 d-print-none align-content-center">
|
||||
@if (!string.IsNullOrWhiteSpace(ReportDate))
|
||||
{
|
||||
<h3 class="workDate">@DateTime.Parse(ReportDate).ToLongDateString()</h3>
|
||||
}
|
||||
</div>
|
||||
<div class="col col-md-4 d-print-none align-content-center">
|
||||
<WorkDateComponent SelectedDate="@ReportDate" OnChanged="GetReport"></WorkDateComponent>
|
||||
</div>
|
||||
<div class="col col-md-1 d-print-none align-content-center">
|
||||
<button class="btn btn-warning" type="button" onclick="window.print();">Print</button>
|
||||
</div>
|
||||
<div class="col d-none d-print-block text-center align-content-center">
|
||||
<h3>@Report.ReportData.Name</h3>
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
}
|
||||
<div class="row">
|
||||
<div class="w-75">
|
||||
<ReportSummaryComponent ReportData="Report.ReportData"></ReportSummaryComponent>
|
||||
</div>
|
||||
<div class="w-25">
|
||||
<ReportDistanceLedgerComponent ReportData="Report.ReportData"></ReportDistanceLedgerComponent>
|
||||
</div>
|
||||
</div>
|
||||
<ActivityTableComponent Activities="Report.ReportItems"></ActivityTableComponent>
|
||||
<ReportActivityLedgerComponent ReportData="Report.ReportData"></ReportActivityLedgerComponent>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
else
|
||||
{
|
||||
<AppSpinner></AppSpinner>
|
||||
}
|
||||
|
||||
@if (_items.Any())
|
||||
{
|
||||
@foreach (var item in _items)
|
||||
{
|
||||
<ReportItemComponent ReportItem="@item"></ReportItemComponent>
|
||||
}
|
||||
}
|
|
@ -47,11 +47,13 @@ public partial class AdminSalesReportViewPage : IDisposable
|
|||
/// Navigation Manager
|
||||
/// </summary>
|
||||
[Inject] private NavigationManager _navigator { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Report to render
|
||||
/// </summary>
|
||||
private ReportView Report { get; set; }
|
||||
private List<ReportItemView> _items { get; set; }
|
||||
private ReportView Report { get; set; } = new();
|
||||
|
||||
private List<ReportItemView> _items { get; set; } = new();
|
||||
|
||||
protected override async Task OnParametersSetAsync()
|
||||
{
|
||||
|
|
|
@ -21,14 +21,14 @@
|
|||
@using Microsoft.AspNetCore.Authorization
|
||||
@page "/info"
|
||||
|
||||
@attribute [Authorize(Roles = "Adviser,Admin")]
|
||||
@attribute [Authorize(Roles = "Adviser,Admin,Office,Warehouse")]
|
||||
<div class="row mb-2">
|
||||
<div class="col col-md-2">
|
||||
<img class="grumpy-coder" src="@_app?.Image" alt="Wonky Logo"/>
|
||||
</div>
|
||||
<div class="col">
|
||||
<h5>Browservalg</h5>
|
||||
De nyeste udgaver af Firefox, Edge, Safari, Vivaldi, Chrome eller Chromium.
|
||||
Den nyeste udgave af Google Chrome, Chromium, Microsoft Edge, Apple Safari eller Vivaldi.
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
|
@ -38,10 +38,7 @@
|
|||
</div>
|
||||
<div class="row">
|
||||
<div class="col">
|
||||
<h5>
|
||||
App version <AppVersion></AppVersion>
|
||||
</h5>
|
||||
|
||||
<AppVersion></AppVersion>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -22,7 +22,7 @@
|
|||
|
||||
@if (_report != null)
|
||||
{
|
||||
<div class="report-page d-block d-print-block">
|
||||
<div class="report-page d-print-block">
|
||||
<PageTitle>@_report.ReportData.Name</PageTitle>
|
||||
<div class="row">
|
||||
<div class="col-md-6 d-print-none align-content-center">
|
||||
|
@ -60,18 +60,16 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@* <div class="page-break d-block d-print-block"></div> *@
|
||||
}
|
||||
else
|
||||
{
|
||||
<AppSpinner></AppSpinner>
|
||||
}
|
||||
|
||||
@if (_items.Any())
|
||||
{
|
||||
@foreach (var item in _items)
|
||||
{
|
||||
<div class="report-page d-block d-print-block">
|
||||
<ReportItemComponent ReportItem="@item"></ReportItemComponent>
|
||||
</div>
|
||||
<ReportItemComponent ReportItem="@item"></ReportItemComponent>
|
||||
}
|
||||
}
|
||||
|
|
|
@ -69,11 +69,6 @@
|
|||
<span class="oi oi-calendar" aria-hidden="true"></span> ToDo
|
||||
</NavLink>
|
||||
</div>
|
||||
<div class="nav-item px-3">
|
||||
<NavLink class="nav-link ps-2" href="/activity-today">
|
||||
<span class="oi oi-dashboard" aria-hidden="true"></span> Aktivitet
|
||||
</NavLink>
|
||||
</div>
|
||||
<div class="nav-item px-3">
|
||||
<NavLink class="nav-link ps-2" href="/companies">
|
||||
<span class="oi oi-file" aria-hidden="true"></span> Firmaer
|
||||
|
@ -84,6 +79,11 @@
|
|||
<span class="oi oi-spreadsheet" aria-hidden="true"></span> Priskatalog
|
||||
</NavLink>
|
||||
</div>
|
||||
<div class="nav-item px-3">
|
||||
<NavLink class="nav-link ps-2" href="/activity-today">
|
||||
<span class="oi oi-dashboard" aria-hidden="true"></span> Aktivitet
|
||||
</NavLink>
|
||||
</div>
|
||||
<div class="nav-item px-3">
|
||||
<NavLink class="nav-link ps-2" href="/sales-reports">
|
||||
<span class="oi oi-document" aria-hidden="true"></span> Dagsrapporter
|
||||
|
|
|
@ -1,12 +1,13 @@
|
|||
{
|
||||
"appInfo": {
|
||||
"name": "Wonky Client",
|
||||
"version": "0.8.118",
|
||||
"version": "0.8.122",
|
||||
"isBeta": true,
|
||||
"sandBox": true,
|
||||
"image": "grumpy-coder.png"
|
||||
},
|
||||
"apiConfig": {
|
||||
"innoBaseUrl": "https://production.innotec.dk",
|
||||
"innoBaseUrl": "https://staging.innotec.dk",
|
||||
"glsTrackUrl": "https://www.gls-group.eu/276-I-PORTAL-WEB/content/GLS/DK01/DA/5004.htm?txtAction=71000&txtRefNo=",
|
||||
"glsId": "",
|
||||
"virkUrl": "api/v2/services/virk",
|
||||
|
|
|
@ -121,4 +121,43 @@ footer.version {
|
|||
display: block;
|
||||
font-weight: bold;
|
||||
padding: 0 10px 0 0;
|
||||
}
|
||||
|
||||
.report-page {
|
||||
page-break-after: always;
|
||||
}
|
||||
|
||||
/* printer classes */
|
||||
@media print {
|
||||
@page {
|
||||
size: a4;
|
||||
}
|
||||
@font-face {
|
||||
font-family: 'Montserrat';
|
||||
src: url('https://fonts.googleapis.com/css2?family=Montserrat&display=swap');
|
||||
}
|
||||
html, body {
|
||||
height: 290mm;
|
||||
width: 210mm;
|
||||
-webkit-print-color-adjust: exact;
|
||||
color-adjust: exact;
|
||||
}
|
||||
.report-page {
|
||||
page-break-before: always;
|
||||
page-break-after: always;
|
||||
page-break-inside: avoid;
|
||||
height: initial;
|
||||
font-size: 10px;
|
||||
border: initial;
|
||||
border-radius: initial;
|
||||
box-shadow: initial;
|
||||
margin: 0;
|
||||
width: initial;
|
||||
-webkit-print-color-adjust: exact;
|
||||
color-adjust: exact;
|
||||
}
|
||||
.distance-ledger {}
|
||||
.report-ledger {
|
||||
page-break-inside: avoid;
|
||||
}
|
||||
}
|
|
@ -1,103 +0,0 @@
|
|||
/* printer classes */
|
||||
@media print {
|
||||
@page {
|
||||
size: a4;
|
||||
}
|
||||
@font-face {
|
||||
font-family: 'Montserrat';
|
||||
src: url('https://fonts.googleapis.com/css2?family=Montserrat&display=swap');
|
||||
}
|
||||
html, body {
|
||||
/*height: 290mm;*/
|
||||
/*width: 210mm;*/
|
||||
-webkit-print-color-adjust: exact;
|
||||
color-adjust: exact;
|
||||
}
|
||||
.page-break {
|
||||
page-break-before: always;
|
||||
}
|
||||
.report-page {
|
||||
page-break-after: always;
|
||||
height: initial;
|
||||
font-size: 10px;
|
||||
border: initial;
|
||||
border-radius: initial;
|
||||
box-shadow: initial;
|
||||
margin: 0;
|
||||
width: initial;
|
||||
-webkit-print-color-adjust: exact;
|
||||
color-adjust: exact;
|
||||
}
|
||||
}
|
||||
/*
|
||||
@media print {
|
||||
*,
|
||||
*::before,
|
||||
*::after {
|
||||
text-shadow: none !important;
|
||||
box-shadow: none !important;
|
||||
}
|
||||
a:not(.btn) {
|
||||
text-decoration: underline;
|
||||
}
|
||||
abbr[title]::after {
|
||||
content: " (" attr(title) ")";
|
||||
}
|
||||
pre {
|
||||
white-space: pre-wrap !important;
|
||||
}
|
||||
pre,
|
||||
blockquote {
|
||||
border: 1px solid #adb5bd;
|
||||
page-break-inside: avoid;
|
||||
}
|
||||
tr,
|
||||
img {
|
||||
page-break-inside: avoid;
|
||||
}
|
||||
p,
|
||||
h2,
|
||||
h3 {
|
||||
orphans: 3;
|
||||
widows: 3;
|
||||
}
|
||||
h2 {
|
||||
page-break-before: always;
|
||||
page-break-after: avoid;
|
||||
}
|
||||
h3 {
|
||||
page-break-after: avoid;
|
||||
}
|
||||
@page {
|
||||
size: a4;
|
||||
}
|
||||
body {
|
||||
min-width: 992px !important;
|
||||
}
|
||||
.container {
|
||||
min-width: 992px !important;
|
||||
}
|
||||
.badge {
|
||||
border: 1px solid #000;
|
||||
}
|
||||
.table {
|
||||
border-collapse: collapse !important;
|
||||
}
|
||||
.table td,
|
||||
.table th {
|
||||
background-color: #fff !important;
|
||||
}
|
||||
.table-bordered th,
|
||||
.table-bordered td {
|
||||
border: 1px solid #dee2e6 !important;
|
||||
}
|
||||
.table-dark {
|
||||
color: inherit;
|
||||
}
|
||||
.table-dark th,
|
||||
.table-dark td,
|
||||
.table-dark thead th,
|
||||
.table-dark tbody + tbody {
|
||||
border-color: #dee2e6;
|
||||
}
|
||||
}*/
|
|
@ -5,11 +5,6 @@
|
|||
<title>Inno Web CRM</title>
|
||||
<meta charset="utf-8" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
|
||||
<!--
|
||||
<meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
|
||||
<meta http-equiv="Pragma" content="no-cache" />
|
||||
<meta http-equiv="Expires" content="3600" />
|
||||
-->
|
||||
<link rel="apple-touch-icon" sizes="180x180" href="apple-touch-icon.png">
|
||||
<link rel="icon" type="image/png" sizes="32x32" href="favicon-32x32.png">
|
||||
<link rel="icon" type="image/png" sizes="16x16" href="favicon-16x16.png">
|
||||
|
@ -21,12 +16,11 @@
|
|||
<link href="css/app.css" rel="stylesheet" />
|
||||
<link href="Wonky.Client.styles.css" rel="stylesheet" />
|
||||
<link href="_content/Blazored.Toast/blazored-toast.min.css" rel="stylesheet" />
|
||||
<link href="css/report-print-21.css" rel="stylesheet" />
|
||||
</head>
|
||||
<body>
|
||||
<div id="app">
|
||||
<div>
|
||||
<img class="spinner" src="loader.gif" alt="Vent venligst..."/> Henter data...
|
||||
<div class="spinner-border text-warning" role="status">
|
||||
<span class="visually-hidden">Indlæser siden ...</span>
|
||||
</div>
|
||||
</div>
|
||||
<script src="/bootstrap/js/bootstrap.bundle.min.js"></script>
|
||||
|
|
|
@ -36,4 +36,9 @@ public class AppInfo
|
|||
/// Application beta version flag
|
||||
/// </summary>
|
||||
public bool IsBeta { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Sandbox version
|
||||
/// </summary>
|
||||
public bool SandBox { get; set; }
|
||||
}
|
Loading…
Reference in a new issue