diff --git a/Wonky.Client/Components/ActivityHeaderComponent.razor b/Wonky.Client/Components/ActivityHeaderComponent.razor index 1c1b22e1..06bd6b22 100644 --- a/Wonky.Client/Components/ActivityHeaderComponent.razor +++ b/Wonky.Client/Components/ActivityHeaderComponent.razor @@ -1,6 +1,6 @@ @using Wonky.Entity.Views - +
- - -
@@ -78,9 +78,6 @@
diff --git a/Wonky.Client/Components/ActivityLinesComponent.razor b/Wonky.Client/Components/ActivityLinesComponent.razor index a8074164..907a1259 100644 --- a/Wonky.Client/Components/ActivityLinesComponent.razor +++ b/Wonky.Client/Components/ActivityLinesComponent.razor @@ -1,8 +1,9 @@ @using Wonky.Entity.Views - +
+ @@ -16,6 +17,7 @@ @foreach (var line in ReportItem.Lines) { + diff --git a/Wonky.Client/Components/ActivityListComponent.razor b/Wonky.Client/Components/ActivityListComponent.razor index 55dc3971..dd99f7b0 100644 --- a/Wonky.Client/Components/ActivityListComponent.razor +++ b/Wonky.Client/Components/ActivityListComponent.razor @@ -18,6 +18,7 @@
Lok Antal Varnr Beskrivelse
@line.Location @line.Quantity @line.Sku @line.Description
+ @@ -25,7 +26,7 @@ - + @@ -34,7 +35,8 @@ @foreach (var activity in Activities) { - + + diff --git a/Wonky.Client/Components/ReportActivityListOfficeComponent.razor b/Wonky.Client/Components/ReportActivityListOfficeComponent.razor index d6e11d6a..47335aa0 100644 --- a/Wonky.Client/Components/ReportActivityListOfficeComponent.razor +++ b/Wonky.Client/Components/ReportActivityListOfficeComponent.razor @@ -18,89 +18,7 @@ @if (Activities.Any()) { -
Kunde Bynavn DemoNote SAS NORMAL
- - - - - - - - - - - - - - - - - @foreach (var activity in Activities) - { - - - - - - - - - - - - - - } - - - - - - - - - - - - - - - -
KundeBynavnDemoSalgNotesasBeløb - - - - - - - -
- @activity.Company.Name - @activity.Company.City@activity.Demo@activity.Sales@activity.OfficeNote@($"{activity.SasAmount:N2}")@(activity.StatusTypeEnum == "Quote" ? "" : $"{activity.OrderAmount:N2}") - @if (activity.OurRef.Contains("T:") || activity.OurRef.Contains("TLF:")) - { - - } - @if (activity.OurRef.Contains("WEB:")) - { - - } - - @if (activity.Express) - { - - } - - @if (activity.StatusTypeEnum == "Quote") - { - - } - - @if (activity.Lines.Any() && activity.StatusTypeEnum == "Order") - { - - } -
@(Activities.Sum(x => x.SasAmount))@(Activities.Sum(x => x.OrderAmount))
TOTAL@(Activities.Sum(x => x.SasAmount) + Activities.Sum(x => x.OrderAmount))
+ } else { diff --git a/Wonky.Client/Components/ReportSummaryComponent.razor b/Wonky.Client/Components/ReportDescriptionComponent.razor similarity index 100% rename from Wonky.Client/Components/ReportSummaryComponent.razor rename to Wonky.Client/Components/ReportDescriptionComponent.razor diff --git a/Wonky.Client/Components/ReportSummaryComponent.razor.cs b/Wonky.Client/Components/ReportDescriptionComponent.razor.cs similarity index 95% rename from Wonky.Client/Components/ReportSummaryComponent.razor.cs rename to Wonky.Client/Components/ReportDescriptionComponent.razor.cs index e5eb118b..191eed0e 100644 --- a/Wonky.Client/Components/ReportSummaryComponent.razor.cs +++ b/Wonky.Client/Components/ReportDescriptionComponent.razor.cs @@ -19,7 +19,7 @@ using Microsoft.AspNetCore.Components; namespace Wonky.Client.Components; -public partial class ReportSummaryComponent +public partial class ReportDescriptionComponent { [Parameter] public ReportDataView ReportDataView { get; set; } = new(); diff --git a/Wonky.Client/Components/ReportVisitComponent.razor b/Wonky.Client/Components/ReportVisitComponent.razor index 24f60d23..e40bb676 100644 --- a/Wonky.Client/Components/ReportVisitComponent.razor +++ b/Wonky.Client/Components/ReportVisitComponent.razor @@ -16,151 +16,12 @@ @using Wonky.Entity.Views -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-

@ReportItem.Company.Name

- @if (ReportItem.Express) - { -

HASTER

- } - @if (ReportItem.VisitTypeEnum == "Phone" || ReportItem.OurRef.Contains("T:")) - { -

TELEFONORDRE

- } - @if (ReportItem.StatusTypeEnum is "Quote") - { -

TILBUD

- } -
-
Vores Ref.@ReportItem.OurRefEOrdre@ReportItem.ESalesNumber
Dato@ReportItem.OrderDateKonto@ReportItem.Company.Account
Telefon@ReportItem.Company.PhoneKøber@ReportItem.YourRef
CVR/VAT@ReportItem.Company.VatNumberRekvisition@ReportItem.ReferenceNumber
Navn@ReportItem.Company.NameLev.Navn@ReportItem.DlvName
Adresse@ReportItem.Company.Address1Lev.Adresse@ReportItem.DlvAddress1
Adresse@ReportItem.Company.Address2Lev.Adresse@ReportItem.DlvAddress2
Postnr By@ReportItem.Company.ZipCode @ReportItem.Company.CityLev.Postnr By@ReportItem.DlvZipCity
Email@ReportItem.Company.Email
Vores Ref@ReportItem.OurRefOprettet af@ReportItem.CreatedBy
- - - - - - - - - - - - - - - @foreach (var line in ReportItem.Lines) - { - - - - - - - - - - - } - - - - - - - - - - - - - - - - - - - - - @if (ReportItem.Express) - { - - - - - } - +
+ + + + -
PlaceringAntalVarnrBeskrivelsePrisR%BeløbSAS
@line.Location@line.Quantity@line.Sku@line.Description@($"{line.Price:N2}")@($"{line.Discount:N2}")@($"{line.LineSum:N2}") - -
SAS@ReportItem.SasAmount
NORMAL@ReportItem.OrderAmount
TOTAL@(ReportItem.SasAmount + ReportItem.OrderAmount)
-
HASTER
-
@if (!string.IsNullOrWhiteSpace(ReportItem.OfficeNote)) {
diff --git a/Wonky.Client/Pages/AdvisorActivityCreatePage.razor b/Wonky.Client/Pages/AdvisorActivityCreatePage.razor index dc544878..ad1c7198 100644 --- a/Wonky.Client/Pages/AdvisorActivityCreatePage.razor +++ b/Wonky.Client/Pages/AdvisorActivityCreatePage.razor @@ -130,7 +130,8 @@ else
- +
@@ -155,7 +156,8 @@ else
- +
@@ -167,13 +169,15 @@ else
- +
- +
@@ -184,7 +188,8 @@ else
- +
diff --git a/Wonky.Client/Pages/AdvisorCustomerActivityViewEditPage.razor b/Wonky.Client/Pages/AdvisorCustomerActivityViewEditPage.razor index 737ac3e3..5e067c55 100644 --- a/Wonky.Client/Pages/AdvisorCustomerActivityViewEditPage.razor +++ b/Wonky.Client/Pages/AdvisorCustomerActivityViewEditPage.razor @@ -25,150 +25,6 @@ -@* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-

@ReportItem.Company.Name

-

@ReportItem.ESalesNumber

- @if (ReportItem.StatusTypeEnum.ToLower() is "quote") - { -

TILBUD

- } - @if (ReportItem.VisitTypeEnum.ToLower() == "phone" || - ReportItem.OurRef.Contains("T:") || - ReportItem.OurRef.Contains("TLF:")) - { -

TELEFONORDRE

- } - @if (ReportItem.Express) - { -

HASTER

- } -
-
Dato@ReportItem.OrderDateKonto@ReportItem.Company.Account
Telefon@ReportItem.Company.PhoneKøber@ReportItem.YourRef
CVR/VAT@ReportItem.Company.VatNumberRekvisition@ReportItem.ReferenceNumber
Navn@ReportItem.Company.NameLev.Navn@ReportItem.DlvName
Adresse@ReportItem.Company.Address1Lev.Adresse@ReportItem.DlvAddress1
Adresse@ReportItem.Company.Address2Lev.Adresse@ReportItem.DlvAddress2
Postnr By@ReportItem.Company.ZipCode @ReportItem.Company.CityLev.Postnr By@ReportItem.DlvZipCity
Email@ReportItem.Company.Email
Vores Ref@ReportItem.OurRefOprettet af@ReportItem.CreatedBy
-*@ - -@* - - - - - - - - - - - - - - @foreach (var line in ReportItem.Lines) - { - - - - - - - - - - } - - - - - - - - - - - - - - - - - - @if (ReportItem.Express) - { - - - - - } - -
AntalVarnrBeskrivelsePrisR%BeløbSAS
@line.Quantity@line.Sku@line.Description@($"{line.Price:N2}")@($"{line.Discount:N2}")@($"{line.LineSum:N2}") - @if (line.Sas) - { - - } -
SAS@ReportItem.SasAmount
NORMAL@ReportItem.OrderAmount
TOTAL@(ReportItem.SasAmount + ReportItem.OrderAmount)
-
HASTER
-
-*@ @* Office Note *@ @if (ReportItem is { ProcessStatusEnum: "None",Express: false } && AllowOfficeNoteUpdate()) diff --git a/Wonky.Client/Pages/AdvisorQuoteListPage.razor.cs b/Wonky.Client/Pages/AdvisorQuoteListPage.razor.cs index 4b900784..d8436681 100644 --- a/Wonky.Client/Pages/AdvisorQuoteListPage.razor.cs +++ b/Wonky.Client/Pages/AdvisorQuoteListPage.razor.cs @@ -85,7 +85,7 @@ public partial class AdvisorQuoteListPage : IDisposable // store quotes in local storage await Storage.SetItemAsync("quotes", QuoteList.OrderBy(x => x.Company.Name)); // filter quotes - if any - based on active filter - if(QuoteList.Any()) + if(QuoteList.Count != 0) await FilterQuotes(QuoteFilter); Working = false; // signal page state changed diff --git a/Wonky.Client/Pages/AdvisorReportViewPage.razor b/Wonky.Client/Pages/AdvisorReportViewPage.razor index 5f520115..d0c7c700 100644 --- a/Wonky.Client/Pages/AdvisorReportViewPage.razor +++ b/Wonky.Client/Pages/AdvisorReportViewPage.razor @@ -45,7 +45,7 @@
- +
diff --git a/Wonky.Client/Pages/OfficeAdvisorReportViewPage.razor b/Wonky.Client/Pages/OfficeAdvisorReportViewPage.razor index 766e07bf..2fec246c 100644 --- a/Wonky.Client/Pages/OfficeAdvisorReportViewPage.razor +++ b/Wonky.Client/Pages/OfficeAdvisorReportViewPage.razor @@ -48,13 +48,14 @@
- +
- + @* *@ + } else diff --git a/Wonky.Client/Pages/CommonReportPrintOrderPage.razor b/Wonky.Client/Pages/PrintReportOrderPage.razor similarity index 100% rename from Wonky.Client/Pages/CommonReportPrintOrderPage.razor rename to Wonky.Client/Pages/PrintReportOrderPage.razor diff --git a/Wonky.Client/Pages/CommonReportPrintOrderPage.razor.cs b/Wonky.Client/Pages/PrintReportOrderPage.razor.cs similarity index 96% rename from Wonky.Client/Pages/CommonReportPrintOrderPage.razor.cs rename to Wonky.Client/Pages/PrintReportOrderPage.razor.cs index b21c1e48..840e5b26 100644 --- a/Wonky.Client/Pages/CommonReportPrintOrderPage.razor.cs +++ b/Wonky.Client/Pages/PrintReportOrderPage.razor.cs @@ -28,7 +28,7 @@ using Wonky.Entity.Views; namespace Wonky.Client.Pages; -public partial class CommonReportPrintOrderPage +public partial class PrintReportOrderPage { [Parameter] public string CountryCode { get; set; } = ""; [Parameter] public string UserId { get; set; } = ""; @@ -37,7 +37,7 @@ public partial class CommonReportPrintOrderPage [Inject] public NavigationManager Navigator { get; set; } [Inject] public IOrderProcessRepository ProcessRepo { get; set; } [Inject] public IJSRuntime JsRuntime { get; set; } - [Inject] public ILogger Logger { get; set; } + [Inject] public ILogger Logger { get; set; } [Inject] public IToastService Toaster { get; set; } private ReportView Report { get; set; } = new(); private List Items { get; set; } = new(); diff --git a/Wonky.Client/Pages/CommonReportPrintSummaryPage.razor b/Wonky.Client/Pages/PrintReportSummaryLedgerPage.razor similarity index 89% rename from Wonky.Client/Pages/CommonReportPrintSummaryPage.razor rename to Wonky.Client/Pages/PrintReportSummaryLedgerPage.razor index ede4e7fc..49b79c3e 100644 --- a/Wonky.Client/Pages/CommonReportPrintSummaryPage.razor +++ b/Wonky.Client/Pages/PrintReportSummaryLedgerPage.razor @@ -39,12 +39,13 @@
- +
- + @* *@ + \ No newline at end of file diff --git a/Wonky.Client/Pages/CommonReportPrintSummaryPage.razor.cs b/Wonky.Client/Pages/PrintReportSummaryLedgerPage.razor.cs similarity index 95% rename from Wonky.Client/Pages/CommonReportPrintSummaryPage.razor.cs rename to Wonky.Client/Pages/PrintReportSummaryLedgerPage.razor.cs index 12e33d60..8bb500a2 100644 --- a/Wonky.Client/Pages/CommonReportPrintSummaryPage.razor.cs +++ b/Wonky.Client/Pages/PrintReportSummaryLedgerPage.razor.cs @@ -23,7 +23,7 @@ using Wonky.Entity.Views; namespace Wonky.Client.Pages; -public partial class CommonReportPrintSummaryPage +public partial class PrintReportSummaryLedgerPage { [Parameter] public string CountryCode { get; set; } = ""; [Parameter] public string UserId { get; set; } = ""; @@ -31,7 +31,7 @@ public partial class CommonReportPrintSummaryPage [Inject] public ILocalStorageService Storage { get; set; } [Inject] public NavigationManager Navigator { get; set; } [Inject] public IJSRuntime JsRuntime { get; set; } - [Inject] public ILogger Logger { get; set; } + [Inject] public ILogger Logger { get; set; } private ReportView Report { get; set; } = new(); private IJSObjectReference JsModule { get; set; } private string ReturnUrl { get; set; } = ""; diff --git a/Wonky.Client/Pages/SupervisorAdvisorReportViewPage.razor b/Wonky.Client/Pages/SupervisorAdvisorReportViewPage.razor index 773ab96d..4202e7fe 100644 --- a/Wonky.Client/Pages/SupervisorAdvisorReportViewPage.razor +++ b/Wonky.Client/Pages/SupervisorAdvisorReportViewPage.razor @@ -42,7 +42,7 @@
- +
diff --git a/Wonky.Client/Wonky.Client.csproj b/Wonky.Client/Wonky.Client.csproj index 1d4c11a2..5edc6d0e 100644 --- a/Wonky.Client/Wonky.Client.csproj +++ b/Wonky.Client/Wonky.Client.csproj @@ -30,6 +30,7 @@ PreserveNewest + @@ -3792,6 +3793,7 @@ + diff --git a/Wonky.Client/wwwroot/css/app.css b/Wonky.Client/wwwroot/css/app.css index 7cd3fce1..707b5f93 100644 --- a/Wonky.Client/wwwroot/css/app.css +++ b/Wonky.Client/wwwroot/css/app.css @@ -14,6 +14,7 @@ top: 1px; right: 10px; } + .workDate { font-variant: small-caps; } @@ -33,10 +34,12 @@ background-color: #a2a2ec; } +/* .table-* { background-color: #030303; color: white; } +*/ html, body { font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; diff --git a/Wonky.Client/wwwroot/css/print.css b/Wonky.Client/wwwroot/css/print.css index b7bb97c3..69174948 100644 --- a/Wonky.Client/wwwroot/css/print.css +++ b/Wonky.Client/wwwroot/css/print.css @@ -23,7 +23,7 @@ border: initial; border-radius: initial; box-shadow: initial; - font-size: 10px; + font-size: 11px; margin: auto; width: initial; -webkit-print-color-adjust: exact; @@ -39,7 +39,7 @@ border: initial; border-radius: initial; box-shadow: initial; - font-size: 10px; + font-size: 11px; min-height: 250mm; margin: 0; width: initial; @@ -47,7 +47,7 @@ color-adjust: exact; } .report-visit td { - font-size: 10px; + font-size: 11px; } .distance-ledger {} .report-ledger { @@ -57,7 +57,7 @@ break-before: avoid; break-inside: avoid; break-after: recto; - font-size: 10px; + font-size: 11px; min-height: 300px; } } \ No newline at end of file