diff --git a/Wonky.Client/Components/ReportItemComponent.razor b/Wonky.Client/Components/ReportItemComponent.razor index 656452d4..a3baa0e3 100644 --- a/Wonky.Client/Components/ReportItemComponent.razor +++ b/Wonky.Client/Components/ReportItemComponent.razor @@ -17,7 +17,7 @@ @using Wonky.Entity.Views -
+
diff --git a/Wonky.Client/Components/TaskItemTableComponent.razor b/Wonky.Client/Components/TaskItemTableComponent.razor index d9386ae5..13baf054 100644 --- a/Wonky.Client/Components/TaskItemTableComponent.razor +++ b/Wonky.Client/Components/TaskItemTableComponent.razor @@ -27,6 +27,7 @@ + @@ -46,15 +47,15 @@ - @* - *@ + + @@ -242,12 +244,15 @@ + + } +
- + + + Note sas BeløbTH
@activity.OfficeNote @activity.SasAmount @activity.OrderAmount@if(activity.OurRef.Contains("T:")){}@if(activity.Express){}
Total @_activities.Sum(x => x.OrderAmount)
diff --git a/Wonky.Client/Pages/ReportViewPageAdvisor.razor b/Wonky.Client/Pages/ReportViewPageAdvisor.razor index 958d47ce..5a68886c 100644 --- a/Wonky.Client/Pages/ReportViewPageAdvisor.razor +++ b/Wonky.Client/Pages/ReportViewPageAdvisor.razor @@ -20,7 +20,7 @@ @page "/sales-reports/view/{ReportDate}" @attribute [Authorize(Roles = "Advisor,Admin,Supervisor")] -
+

@DateTime.Parse(ReportDate).ToLongDateString()

@@ -57,6 +57,11 @@
}
+ +
+   +
+ @if (_items.Any()) { @foreach (var item in _items) diff --git a/Wonky.Client/Pages/ReportViewPageOffice.razor b/Wonky.Client/Pages/ReportViewPageOffice.razor index 22638e22..361bbd05 100644 --- a/Wonky.Client/Pages/ReportViewPageOffice.razor +++ b/Wonky.Client/Pages/ReportViewPageOffice.razor @@ -62,6 +62,10 @@
+
+   +
+ @if (_items.Any()) { @foreach (var item in _items) diff --git a/Wonky.Client/wwwroot/appsettings.json b/Wonky.Client/wwwroot/appsettings.json index bb871969..b84764cc 100644 --- a/Wonky.Client/wwwroot/appsettings.json +++ b/Wonky.Client/wwwroot/appsettings.json @@ -1,7 +1,7 @@ { "appInfo": { "name": "Wonky Client", - "version": "0.10.93", + "version": "0.10.101", "rc": true, "sandBox": false, "image": "grumpy-coder.png" diff --git a/Wonky.Client/wwwroot/css/app.css b/Wonky.Client/wwwroot/css/app-v0.10.101.css similarity index 90% rename from Wonky.Client/wwwroot/css/app.css rename to Wonky.Client/wwwroot/css/app-v0.10.101.css index fdc0765a..ccf96ea8 100644 --- a/Wonky.Client/wwwroot/css/app.css +++ b/Wonky.Client/wwwroot/css/app-v0.10.101.css @@ -149,11 +149,24 @@ footer.version { color-adjust: exact; } .report-page { - /*break-before: page;*/ break-after: page; - + /*break-before: page;*/ + + height: initial; + + border: initial; + border-radius: initial; + box-shadow: initial; + margin: 0; + width: initial; + -webkit-print-color-adjust: exact; + color-adjust: exact; + } + .report-page-item { + break-after: page; + break-inside: avoid-page; + height: initial; - /*font-size: 10px;*/ border: initial; border-radius: initial; box-shadow: initial; diff --git a/Wonky.Client/wwwroot/index.html b/Wonky.Client/wwwroot/index.html index 5f869b56..c47f9adf 100644 --- a/Wonky.Client/wwwroot/index.html +++ b/Wonky.Client/wwwroot/index.html @@ -13,7 +13,7 @@ - +