diff --git a/Wonky.Client/Components/AppVersion.razor b/Wonky.Client/Components/AppVersion.razor index 99b378cc..3887769c 100644 --- a/Wonky.Client/Components/AppVersion.razor +++ b/Wonky.Client/Components/AppVersion.razor @@ -18,13 +18,35 @@ @using Wonky.Entity.Configuration @using Microsoft.Extensions.Options -@_app?.Version@if(_app!.IsBeta){-beta} +@if (_production) +{ +
app version @_app?.Version
+} +else +{ +
app version @_app?.Version
+} + +@if (_app!.IsBeta) +{ +
Beta version
+} + +@if (_app!.SandBox) +{ +
Sandkasse
+} @code { [Inject] IOptions? 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; } } diff --git a/Wonky.Client/Components/ReportActivityLedgerComponent.razor b/Wonky.Client/Components/ReportActivityLedgerComponent.razor index 29435473..153d2759 100644 --- a/Wonky.Client/Components/ReportActivityLedgerComponent.razor +++ b/Wonky.Client/Components/ReportActivityLedgerComponent.razor @@ -15,70 +15,73 @@ // *@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Dagens Demo @(ReportData.NewDemoCount + ReportData.RecallDemoCount)Dagens ResultatMåneds Resultat
BesøgDemoSalgBeløbBesøgDemoSalgBeløb
N@ReportData.NewVisitCount@ReportData.NewDemoCount@ReportData.NewSaleCount@ReportData.NewTurnover@ReportData.NewVisitCountMonth@ReportData.NewDemoCountMonth@ReportData.NewSaleCountMonth@ReportData.NewTurnoverMonth
R@ReportData.RecallVisitCount@ReportData.RecallDemoCount@ReportData.RecallSaleCount@ReportData.RecallTurnover@ReportData.RecallVisitCountMonth@ReportData.RecallDemoCountMonth@ReportData.RecallSaleCountMonth@ReportData.RecallTurnoverMonth
SAS@ReportData.SasCount@ReportData.SasTurnover@ReportData.SasCountMonth@ReportData.SasTurnoverMonth
TOTAL@ReportData.TotalVisitCount@ReportData.TotalDemoCount@ReportData.TotalSaleCount@ReportData.TotalTurnover@ReportData.TotalVisitCountMonth@ReportData.TotalDemoCountMonth@ReportData.TotalSaleCountMonth@ReportData.TotalTurnoverMonth
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Dagens Demo @(ReportData.NewDemoCount + ReportData.RecallDemoCount)Dagens ResultatMåneds Resultat
BesøgDemoSalgBeløbBesøgDemoSalgBeløb
N@ReportData.NewVisitCount@ReportData.NewDemoCount@ReportData.NewSaleCount@ReportData.NewTurnover@ReportData.NewVisitCountMonth@ReportData.NewDemoCountMonth@ReportData.NewSaleCountMonth@ReportData.NewTurnoverMonth
R@ReportData.RecallVisitCount@ReportData.RecallDemoCount@ReportData.RecallSaleCount@ReportData.RecallTurnover@ReportData.RecallVisitCountMonth@ReportData.RecallDemoCountMonth@ReportData.RecallSaleCountMonth@ReportData.RecallTurnoverMonth
SAS@ReportData.SasCount@ReportData.SasTurnover@ReportData.SasCountMonth@ReportData.SasTurnoverMonth
TOTAL@ReportData.TotalVisitCount@ReportData.TotalDemoCount@ReportData.TotalSaleCount@ReportData.TotalTurnover@ReportData.TotalVisitCountMonth@ReportData.TotalDemoCountMonth@ReportData.TotalSaleCountMonth@ReportData.TotalTurnoverMonth
+ +
\ No newline at end of file diff --git a/Wonky.Client/Components/ReportDistanceLedgerComponent.razor b/Wonky.Client/Components/ReportDistanceLedgerComponent.razor index 3ec53550..6d28b980 100644 --- a/Wonky.Client/Components/ReportDistanceLedgerComponent.razor +++ b/Wonky.Client/Components/ReportDistanceLedgerComponent.razor @@ -15,38 +15,41 @@ // *@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Km regnskab -
Aften@ReportData.KmEvening
Morgen@ReportData.KmMorning
Kørt Dag@ReportData.Distance
Kørt Md.@ReportData.DistanceMonth
Privat@ReportData.DistancePrivate
Privat Md.@ReportData.DistancePrivateMonth
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Km regnskab +
Aften@ReportData.KmEvening
Morgen@ReportData.KmMorning
Kørt Dag@ReportData.Distance
Kørt Md.@ReportData.DistanceMonth
Privat@ReportData.DistancePrivate
Privat Md.@ReportData.DistancePrivateMonth
+ +
\ No newline at end of file diff --git a/Wonky.Client/Components/ReportItemComponent.razor b/Wonky.Client/Components/ReportItemComponent.razor index b18845c3..7be30a3a 100644 --- a/Wonky.Client/Components/ReportItemComponent.razor +++ b/Wonky.Client/Components/ReportItemComponent.razor @@ -17,94 +17,100 @@ @using Wonky.Entity.Views -

Ordre @ReportItem.OrderDate

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
EOrdre nr.@ReportItem.ESalesNumberKonto@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
- -

Varer

- - - - - - - - - - - - - @foreach (var line in ReportItem.Lines) - { - - - - - - - +
+ @*
AntalVarnrBeskrivelsePrisR%Beløb
@line.Quantity@line.Sku@line.Description@($"{line.Price:N2}")@($"{line.Discount:N2}")@($"{line.LineSum:N2}")
*@ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Ordre @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
+ + + + + + + + + + + + + @foreach (var line in ReportItem.Lines) + { + + + + + + + + + } + + + + + + +
AntalVarnrBeskrivelsePrisR%Beløb
@line.Quantity@line.Sku@line.Description@($"{line.Price:N2}")@($"{line.Discount:N2}")@($"{line.LineSum:N2}")
Ordresum@ReportItem.OrderAmount
+ @if (!string.IsNullOrWhiteSpace(@ReportItem.OfficeNote)) + { +
+

+ @ReportItem.OfficeNote +

+
} - - - Ordresum - @ReportItem.OrderAmount - - - -@if (!string.IsNullOrWhiteSpace(@ReportItem.OfficeNote)) -{ -
-

- @ReportItem.OfficeNote -

-
-} + @code{ diff --git a/Wonky.Client/Components/ReportSummaryComponent.razor b/Wonky.Client/Components/ReportSummaryComponent.razor index 08e8b1c2..c835468a 100644 --- a/Wonky.Client/Components/ReportSummaryComponent.razor +++ b/Wonky.Client/Components/ReportSummaryComponent.razor @@ -15,7 +15,7 @@ // *@ - +
- + - +
@@ -33,7 +33,7 @@ @ReportData.SupervisedBy
IndholdDækkende @{ switch (ReportData.DayTypeEnum) @@ -61,7 +61,7 @@
Fra/TilPeriode @{ switch (ReportData.DayTypeEnum) diff --git a/Wonky.Client/Pages/AdminSalesReportViewPage.razor b/Wonky.Client/Pages/AdminSalesReportViewPage.razor index 68cc74bb..ec2c8d67 100644 --- a/Wonky.Client/Pages/AdminSalesReportViewPage.razor +++ b/Wonky.Client/Pages/AdminSalesReportViewPage.razor @@ -22,53 +22,49 @@ @if (Report != null) { -
- @Report.ReportData.Name -
-
- @if (!string.IsNullOrWhiteSpace(ReportDate)) - { -

@DateTime.Parse(ReportDate).ToLongDateString()

- } -
-
- -
-
- -
-
-

@Report.ReportData.Name

-
-
-
-
- -
-
- -
-
- - -
- - @*
*@ - - @if (_items.Any()) - { - - @foreach (var item in _items) - { -
-
- +
+
+ @Report.ReportData.Name +
+
+ @if (!string.IsNullOrWhiteSpace(ReportDate)) + { +

@DateTime.Parse(ReportDate).ToLongDateString()

+ } +
+
+ +
+
+ +
+
+

@Report.ReportData.Name

- } - } +
+
+ +
+
+ +
+
+ + + +
+
} else { +} + +@if (_items.Any()) +{ + @foreach (var item in _items) + { + + } } \ No newline at end of file diff --git a/Wonky.Client/Pages/AdminSalesReportViewPage.razor.cs b/Wonky.Client/Pages/AdminSalesReportViewPage.razor.cs index 93c0d6fd..452b52d8 100644 --- a/Wonky.Client/Pages/AdminSalesReportViewPage.razor.cs +++ b/Wonky.Client/Pages/AdminSalesReportViewPage.razor.cs @@ -47,11 +47,13 @@ public partial class AdminSalesReportViewPage : IDisposable /// Navigation Manager /// [Inject] private NavigationManager _navigator { get; set; } + /// /// Report to render /// - private ReportView Report { get; set; } - private List _items { get; set; } + private ReportView Report { get; set; } = new(); + + private List _items { get; set; } = new(); protected override async Task OnParametersSetAsync() { diff --git a/Wonky.Client/Pages/Info.razor b/Wonky.Client/Pages/HelpPage.razor similarity index 87% rename from Wonky.Client/Pages/Info.razor rename to Wonky.Client/Pages/HelpPage.razor index cdbca79d..62716294 100644 --- a/Wonky.Client/Pages/Info.razor +++ b/Wonky.Client/Pages/HelpPage.razor @@ -21,14 +21,14 @@ @using Microsoft.AspNetCore.Authorization @page "/info" -@attribute [Authorize(Roles = "Adviser,Admin")] +@attribute [Authorize(Roles = "Adviser,Admin,Office,Warehouse")]
Wonky Logo
Browservalg
- De nyeste udgaver af Firefox, Edge, Safari, Vivaldi, Chrome eller Chromium. + Den nyeste udgave af Google Chrome, Chromium, Microsoft Edge, Apple Safari eller Vivaldi.
@@ -38,10 +38,7 @@
-
- App version -
- +
diff --git a/Wonky.Client/Pages/Info.razor.css b/Wonky.Client/Pages/HelpPage.razor.css similarity index 100% rename from Wonky.Client/Pages/Info.razor.css rename to Wonky.Client/Pages/HelpPage.razor.css diff --git a/Wonky.Client/Pages/SalesReportViewPage.razor b/Wonky.Client/Pages/SalesReportViewPage.razor index ccc50cde..e84c789d 100644 --- a/Wonky.Client/Pages/SalesReportViewPage.razor +++ b/Wonky.Client/Pages/SalesReportViewPage.razor @@ -22,7 +22,7 @@ @if (_report != null) { -
+
@_report.ReportData.Name
@@ -60,18 +60,16 @@
- @*
*@ } else { } + @if (_items.Any()) { @foreach (var item in _items) { -
- -
+ } } diff --git a/Wonky.Client/Shared/NavMenu.razor b/Wonky.Client/Shared/NavMenu.razor index 627fc98a..dddc574f 100644 --- a/Wonky.Client/Shared/NavMenu.razor +++ b/Wonky.Client/Shared/NavMenu.razor @@ -69,11 +69,6 @@ ToDo
-
- - Aktivitet - -
Firmaer @@ -84,6 +79,11 @@ Priskatalog
+
+ + Aktivitet + +
Dagsrapporter diff --git a/Wonky.Client/wwwroot/appsettings.json b/Wonky.Client/wwwroot/appsettings.json index 2ee2ad3f..8eb4f28e 100644 --- a/Wonky.Client/wwwroot/appsettings.json +++ b/Wonky.Client/wwwroot/appsettings.json @@ -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", diff --git a/Wonky.Client/wwwroot/css/app.css b/Wonky.Client/wwwroot/css/app.css index d22a2fa2..a9fa47ee 100644 --- a/Wonky.Client/wwwroot/css/app.css +++ b/Wonky.Client/wwwroot/css/app.css @@ -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; + } } \ No newline at end of file diff --git a/Wonky.Client/wwwroot/css/report-print-21.css b/Wonky.Client/wwwroot/css/report-print-21.css deleted file mode 100644 index a313a304..00000000 --- a/Wonky.Client/wwwroot/css/report-print-21.css +++ /dev/null @@ -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; - } -}*/ diff --git a/Wonky.Client/wwwroot/index.html b/Wonky.Client/wwwroot/index.html index b616da2c..8ac4b78a 100644 --- a/Wonky.Client/wwwroot/index.html +++ b/Wonky.Client/wwwroot/index.html @@ -5,11 +5,6 @@ Inno Web CRM - @@ -21,12 +16,11 @@ -
-
- Henter data... +
diff --git a/Wonky.Entity/Configuration/AppInfo.cs b/Wonky.Entity/Configuration/AppInfo.cs index 2e603fe2..ca133243 100644 --- a/Wonky.Entity/Configuration/AppInfo.cs +++ b/Wonky.Entity/Configuration/AppInfo.cs @@ -36,4 +36,9 @@ public class AppInfo /// Application beta version flag /// public bool IsBeta { get; set; } + + /// + /// Sandbox version + /// + public bool SandBox { get; set; } } \ No newline at end of file