diff --git a/Wonky.Client/Components/CustomerVisitListComponent.razor b/Wonky.Client/Components/CustomerVisitListComponent.razor
new file mode 100644
index 00000000..2d50f39f
--- /dev/null
+++ b/Wonky.Client/Components/CustomerVisitListComponent.razor
@@ -0,0 +1,75 @@
+@*
+// Copyright (C) 2022 FCS Frede's Computer Services.
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html]
+//
+*@
+
+
+
+
\ No newline at end of file
diff --git a/Wonky.Client/Components/CustomerVisitListComponent.razor.cs b/Wonky.Client/Components/CustomerVisitListComponent.razor.cs
new file mode 100644
index 00000000..e33aaf63
--- /dev/null
+++ b/Wonky.Client/Components/CustomerVisitListComponent.razor.cs
@@ -0,0 +1,41 @@
+// Copyright (C) 2022 FCS Frede's Computer Services.
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html]
+//
+
+using System.Globalization;
+using System.Runtime.InteropServices;
+using Blazored.LocalStorage;
+using Microsoft.AspNetCore.Components;
+using Wonky.Client.HttpInterfaces;
+using Wonky.Client.Models;
+using Wonky.Client.Shared;
+using Wonky.Entity.DTO;
+using Wonky.Entity.Views;
+
+namespace Wonky.Client.Components;
+
+public partial class CustomerVisitListComponent
+{
+ [Parameter] public List Activities { get; set; } = new();
+ private CustomerActivityViewModalOverlay ActivityViewOverlay { get; set; } = new();
+
+ private ReportItemView Activity { get; set; } = new();
+
+ private void ShowVisitOverlay(string activityId)
+ {
+ Activity = Activities.First(x => x.ActivityId == activityId);
+ ActivityViewOverlay.Show();
+ }
+
+}
\ No newline at end of file
diff --git a/Wonky.Client/Components/ReportItemComponent.razor b/Wonky.Client/Components/ReportItemComponent.razor
index ea3dedab..d37c73e6 100644
--- a/Wonky.Client/Components/ReportItemComponent.razor
+++ b/Wonky.Client/Components/ReportItemComponent.razor
@@ -22,7 +22,7 @@
diff --git a/Wonky.Client/Shared/ConfirmProductCheckOverlay.razor b/Wonky.Client/Shared/ConfirmProductCheckModalOverlay.razor
similarity index 100%
rename from Wonky.Client/Shared/ConfirmProductCheckOverlay.razor
rename to Wonky.Client/Shared/ConfirmProductCheckModalOverlay.razor
diff --git a/Wonky.Client/Shared/ConfirmProductCheckOverlay.razor.cs b/Wonky.Client/Shared/ConfirmProductCheckModalOverlay.razor.cs
similarity index 96%
rename from Wonky.Client/Shared/ConfirmProductCheckOverlay.razor.cs
rename to Wonky.Client/Shared/ConfirmProductCheckModalOverlay.razor.cs
index 2fc90c97..bd270a99 100644
--- a/Wonky.Client/Shared/ConfirmProductCheckOverlay.razor.cs
+++ b/Wonky.Client/Shared/ConfirmProductCheckModalOverlay.razor.cs
@@ -18,7 +18,7 @@ using Wonky.Entity.Views;
namespace Wonky.Client.Shared;
-public partial class ConfirmProductCheckOverlay
+public partial class ConfirmProductCheckModalOverlay
{
private string _modalDisplay = "";
private bool _showBackdrop;
diff --git a/Wonky.Client/Shared/ConfirmWorkDateOverlay.razor b/Wonky.Client/Shared/ConfirmWorkDateModalOverlay.razor
similarity index 100%
rename from Wonky.Client/Shared/ConfirmWorkDateOverlay.razor
rename to Wonky.Client/Shared/ConfirmWorkDateModalOverlay.razor
diff --git a/Wonky.Client/Shared/ConfirmWorkDateOverlay.razor.cs b/Wonky.Client/Shared/ConfirmWorkDateModalOverlay.razor.cs
similarity index 96%
rename from Wonky.Client/Shared/ConfirmWorkDateOverlay.razor.cs
rename to Wonky.Client/Shared/ConfirmWorkDateModalOverlay.razor.cs
index 63f0b047..1ef8619f 100644
--- a/Wonky.Client/Shared/ConfirmWorkDateOverlay.razor.cs
+++ b/Wonky.Client/Shared/ConfirmWorkDateModalOverlay.razor.cs
@@ -17,7 +17,7 @@ using Microsoft.AspNetCore.Components;
namespace Wonky.Client.Shared;
-public partial class ConfirmWorkDateOverlay
+public partial class ConfirmWorkDateModalOverlay
{
private string _modalDisplay = "";
private bool _showBackdrop;
diff --git a/Wonky.Client/Shared/CustomerActivityListModalOverlay.razor b/Wonky.Client/Shared/CustomerActivityListModalOverlay.razor
new file mode 100644
index 00000000..b6c2cbed
--- /dev/null
+++ b/Wonky.Client/Shared/CustomerActivityListModalOverlay.razor
@@ -0,0 +1,19 @@
+@using Wonky.Client.Components
+
+
+
+
+
+
@CompanyName - Aktivitet oversigt
+
+
+
+
+
+
+
+
+@if (_showBackdrop)
+{
+
+}
diff --git a/Wonky.Client/Shared/CustomerActivityListModalOverlay.razor.cs b/Wonky.Client/Shared/CustomerActivityListModalOverlay.razor.cs
new file mode 100644
index 00000000..e8899d4a
--- /dev/null
+++ b/Wonky.Client/Shared/CustomerActivityListModalOverlay.razor.cs
@@ -0,0 +1,34 @@
+using System.Text.Json;
+using Microsoft.AspNetCore.Components;
+using Wonky.Client.HttpInterceptors;
+using Wonky.Client.HttpInterfaces;
+using Wonky.Client.Models;
+using Wonky.Client.Shared;
+using Wonky.Entity.DTO;
+using Wonky.Entity.Views;
+
+namespace Wonky.Client.Shared;
+
+public partial class CustomerActivityListModalOverlay
+{
+ [Parameter] public string CompanyName { get; set; } = "";
+ [Parameter] public List Activities { get; set; } = new();
+
+ private string _modalDisplay = "";
+ private bool _showBackdrop;
+
+ public void Show()
+ {
+ _modalDisplay = "block;";
+ _showBackdrop = true;
+ StateHasChanged();
+ }
+
+ private void Hide()
+ {
+ _modalDisplay = "none;";
+ _showBackdrop = false;
+ StateHasChanged();
+ }
+
+}
\ No newline at end of file
diff --git a/Wonky.Client/Shared/CustomerActivityViewModalOverlay.razor b/Wonky.Client/Shared/CustomerActivityViewModalOverlay.razor
new file mode 100644
index 00000000..f807b9af
--- /dev/null
+++ b/Wonky.Client/Shared/CustomerActivityViewModalOverlay.razor
@@ -0,0 +1,109 @@
+@*
+// Copyright (C) 2022 FCS Frede's Computer Services.
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html]
+//
+*@
+
+
+
+
+
+
+
+
+
+
+
+
Besøg - @ReportItem.Company.Name
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Varenr
+
Beskrivelse
+
Antal
+
Pris
+
Rabat
+
+
+
+ @foreach (var line in ReportItem.Lines)
+ {
+
+
@line.Sku
+
@line.Description
+
@line.Quantity
+
@line.Price
+
@line.Discount
+
+ }
+
+
+
+
+
+
+
+
+
+@if (_showBackdrop)
+{
+
+}
\ No newline at end of file
diff --git a/Wonky.Client/Shared/CustomerActivityViewModalOverlay.razor.cs b/Wonky.Client/Shared/CustomerActivityViewModalOverlay.razor.cs
new file mode 100644
index 00000000..64629634
--- /dev/null
+++ b/Wonky.Client/Shared/CustomerActivityViewModalOverlay.razor.cs
@@ -0,0 +1,48 @@
+// Copyright (C) 2022 FCS Frede's Computer Services.
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html]
+//
+
+using System.Text.Json;
+using Microsoft.AspNetCore.Components;
+using Wonky.Client.HttpInterceptors;
+using Wonky.Client.HttpInterfaces;
+using Wonky.Client.HttpRepository;
+using Wonky.Client.Models;
+using Wonky.Client.Services;
+using Wonky.Entity.Requests;
+using Wonky.Entity.Views;
+
+namespace Wonky.Client.Shared;
+
+public partial class CustomerActivityViewModalOverlay
+{
+ [Parameter] public ReportItemView ReportItem { get; set; } = new();
+ private string _modalDisplay = "";
+ private bool _showBackdrop;
+
+ public void Show()
+ {
+ _modalDisplay = "block;";
+ _showBackdrop = true;
+ StateHasChanged();
+ }
+
+ private void Hide()
+ {
+ _modalDisplay = "none;";
+ _showBackdrop = false;
+ StateHasChanged();
+ }
+
+}
\ No newline at end of file
diff --git a/Wonky.Client/Shared/CustomerInventoryOverlay.razor b/Wonky.Client/Shared/CustomerInventoryModalOverlay.razor
similarity index 85%
rename from Wonky.Client/Shared/CustomerInventoryOverlay.razor
rename to Wonky.Client/Shared/CustomerInventoryModalOverlay.razor
index c52f3846..308d2ad5 100644
--- a/Wonky.Client/Shared/CustomerInventoryOverlay.razor
+++ b/Wonky.Client/Shared/CustomerInventoryModalOverlay.razor
@@ -17,4 +17,4 @@
{
}
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/Wonky.Client/Shared/CustomerInventoryOverlay.razor.cs b/Wonky.Client/Shared/CustomerInventoryModalOverlay.razor.cs
similarity index 88%
rename from Wonky.Client/Shared/CustomerInventoryOverlay.razor.cs
rename to Wonky.Client/Shared/CustomerInventoryModalOverlay.razor.cs
index 8e4c1409..83720d24 100644
--- a/Wonky.Client/Shared/CustomerInventoryOverlay.razor.cs
+++ b/Wonky.Client/Shared/CustomerInventoryModalOverlay.razor.cs
@@ -9,11 +9,11 @@ using Wonky.Entity.Views;
namespace Wonky.Client.Shared;
-public partial class CustomerInventoryOverlay : IDisposable
+public partial class CustomerInventoryModalOverlay : IDisposable
{
[Inject] private HttpInterceptorService Interceptor { get; set; }
[Inject] private ICountryCatalogRepository Catalog { get; set; }
- [Inject] private ILogger Logger { get; set; }
+ [Inject] private ILogger Logger { get; set; }
[Parameter] public string CompanyName { get; set; } = "";
[Parameter] public string CompanyId { get; set; } = "";
@@ -28,7 +28,7 @@ public partial class CustomerInventoryOverlay : IDisposable
private List _inventory { get; set; } = new();
private DraftItem DraftItem { get; set; } = new();
private SalesItemView SalesItem { get; set; } = new();
- private InventoryReorderModal ReorderModal { get; set; } = new();
+ private InventoryReorderModalOverlay InventoryOverlay { get; set; } = new();
protected override void OnInitialized()
{
@@ -40,7 +40,7 @@ public partial class CustomerInventoryOverlay : IDisposable
private async Task OnReorderCallback(string sku)
{
SalesItem = await Catalog.GetSalesItemSku(CountryCode.ToLower(), sku);
- ReorderModal.Show();
+ InventoryOverlay.Show();
}
private async Task OnSelectedItem(DraftItem draftItem)
diff --git a/Wonky.Client/Shared/CustomerInvoiceOverlay.razor b/Wonky.Client/Shared/CustomerInvoiceModalOverlay.razor
similarity index 89%
rename from Wonky.Client/Shared/CustomerInvoiceOverlay.razor
rename to Wonky.Client/Shared/CustomerInvoiceModalOverlay.razor
index d8364461..7dffa315 100644
--- a/Wonky.Client/Shared/CustomerInvoiceOverlay.razor
+++ b/Wonky.Client/Shared/CustomerInvoiceModalOverlay.razor
@@ -16,7 +16,7 @@
-
+
diff --git a/Wonky.Client/Shared/CustomerInvoiceOverlay.razor.cs b/Wonky.Client/Shared/CustomerInvoiceModalOverlay.razor.cs
similarity index 87%
rename from Wonky.Client/Shared/CustomerInvoiceOverlay.razor.cs
rename to Wonky.Client/Shared/CustomerInvoiceModalOverlay.razor.cs
index fe28f524..00445c0f 100644
--- a/Wonky.Client/Shared/CustomerInvoiceOverlay.razor.cs
+++ b/Wonky.Client/Shared/CustomerInvoiceModalOverlay.razor.cs
@@ -6,12 +6,12 @@ using Wonky.Entity.Views;
namespace Wonky.Client.Shared;
-public partial class CustomerInvoiceOverlay
+public partial class CustomerInvoiceModalOverlay
{
[Parameter] public InvoiceListView CustomerInvoices { get; set; } = new();
- [Inject] private ILogger Logger { get; set; }
- private InvoiceViewModal InvoiceView { get; set; } = new();
+ [Inject] private ILogger Logger { get; set; }
+ private InvoiceViewModalOverlay InvoiceView { get; set; } = new();
private string InvoiceId { get; set; } = "";
private string _modalDisplay = "";
private bool _showBackdrop;
diff --git a/Wonky.Client/Shared/InventoryReorderModal.razor b/Wonky.Client/Shared/InventoryReorderModalOverlay.razor
similarity index 100%
rename from Wonky.Client/Shared/InventoryReorderModal.razor
rename to Wonky.Client/Shared/InventoryReorderModalOverlay.razor
diff --git a/Wonky.Client/Shared/InventoryReorderModal.razor.cs b/Wonky.Client/Shared/InventoryReorderModalOverlay.razor.cs
similarity index 98%
rename from Wonky.Client/Shared/InventoryReorderModal.razor.cs
rename to Wonky.Client/Shared/InventoryReorderModalOverlay.razor.cs
index 54d6e849..10f20509 100644
--- a/Wonky.Client/Shared/InventoryReorderModal.razor.cs
+++ b/Wonky.Client/Shared/InventoryReorderModalOverlay.razor.cs
@@ -25,7 +25,7 @@ using Wonky.Entity.Views;
namespace Wonky.Client.Shared;
-public partial class InventoryReorderModal
+public partial class InventoryReorderModalOverlay
{
[Parameter] public string CompanyId { get; set; } = "";
[Parameter] public SalesItemView SalesItem { get; set; } = new();
diff --git a/Wonky.Client/Shared/InvoiceViewModal.razor b/Wonky.Client/Shared/InvoiceViewModalOverlay.razor
similarity index 100%
rename from Wonky.Client/Shared/InvoiceViewModal.razor
rename to Wonky.Client/Shared/InvoiceViewModalOverlay.razor
diff --git a/Wonky.Client/Shared/InvoiceViewModal.razor.cs b/Wonky.Client/Shared/InvoiceViewModalOverlay.razor.cs
similarity index 97%
rename from Wonky.Client/Shared/InvoiceViewModal.razor.cs
rename to Wonky.Client/Shared/InvoiceViewModalOverlay.razor.cs
index 5988eaad..5a14283b 100644
--- a/Wonky.Client/Shared/InvoiceViewModal.razor.cs
+++ b/Wonky.Client/Shared/InvoiceViewModalOverlay.razor.cs
@@ -25,7 +25,7 @@ using Wonky.Entity.Views;
namespace Wonky.Client.Shared;
-public partial class InvoiceViewModal : IDisposable
+public partial class InvoiceViewModalOverlay : IDisposable
{
[Parameter] public string CompanyId { get; set; } = "";
[Parameter] public string InvoiceId { get; set; } = "";
@@ -45,7 +45,6 @@ public partial class InvoiceViewModal : IDisposable
Invoice = await HistoryRepo.FetchInvoice(CompanyId, InvoiceId);
}
}
-
public void Show()
{
diff --git a/Wonky.Client/Shared/PriceCatalogOverlay.razor b/Wonky.Client/Shared/PriceCatalogModalOverlay.razor
similarity index 100%
rename from Wonky.Client/Shared/PriceCatalogOverlay.razor
rename to Wonky.Client/Shared/PriceCatalogModalOverlay.razor
diff --git a/Wonky.Client/Shared/PriceCatalogOverlay.razor.cs b/Wonky.Client/Shared/PriceCatalogModalOverlay.razor.cs
similarity index 98%
rename from Wonky.Client/Shared/PriceCatalogOverlay.razor.cs
rename to Wonky.Client/Shared/PriceCatalogModalOverlay.razor.cs
index 6624cc16..cf5663a8 100644
--- a/Wonky.Client/Shared/PriceCatalogOverlay.razor.cs
+++ b/Wonky.Client/Shared/PriceCatalogModalOverlay.razor.cs
@@ -24,7 +24,7 @@ using Wonky.Entity.Views;
namespace Wonky.Client.Shared;
-public partial class PriceCatalogOverlay : IDisposable
+public partial class PriceCatalogModalOverlay : IDisposable
{
[Parameter] public string CountryCode { get; set; } = "";
[Parameter] public EventCallback OnSelected { get; set; }
diff --git a/Wonky.Client/Shared/ProductHistoryOverlay.razor b/Wonky.Client/Shared/ProductHistoryModalOverlay.razor
similarity index 100%
rename from Wonky.Client/Shared/ProductHistoryOverlay.razor
rename to Wonky.Client/Shared/ProductHistoryModalOverlay.razor
diff --git a/Wonky.Client/Shared/ProductHistoryOverlay.razor.cs b/Wonky.Client/Shared/ProductHistoryModalOverlay.razor.cs
similarity index 97%
rename from Wonky.Client/Shared/ProductHistoryOverlay.razor.cs
rename to Wonky.Client/Shared/ProductHistoryModalOverlay.razor.cs
index e3145378..c812cc7b 100644
--- a/Wonky.Client/Shared/ProductHistoryOverlay.razor.cs
+++ b/Wonky.Client/Shared/ProductHistoryModalOverlay.razor.cs
@@ -24,7 +24,7 @@ using Wonky.Entity.Views;
namespace Wonky.Client.Shared;
-public partial class ProductHistoryOverlay
+public partial class ProductHistoryModalOverlay
{
// [Parameter] public EventCallback OnSelected { get; set; }
[Parameter] public string CompanyId { get; set; } = "";
diff --git a/Wonky.Client/wwwroot/appsettings.json b/Wonky.Client/wwwroot/appsettings.json
index 8a70a3a3..79fd7127 100644
--- a/Wonky.Client/wwwroot/appsettings.json
+++ b/Wonky.Client/wwwroot/appsettings.json
@@ -1,14 +1,14 @@
{
"appInfo": {
"name": "Wonky Online",
- "version": "0.108.1",
+ "version": "0.110.1",
"rc": true,
"sandBox": false,
"image": "grumpy-coder.png"
},
"Logging": {
"LogLevel": {
- "Default": "Information",
+ "Default": "Debug",
"System": "Information",
"Microsoft": "Information"
},
diff --git a/Wonky.Client/wwwroot/css/print.css b/Wonky.Client/wwwroot/css/print.css
index 7701984e..82f06565 100644
--- a/Wonky.Client/wwwroot/css/print.css
+++ b/Wonky.Client/wwwroot/css/print.css
@@ -15,15 +15,16 @@
}
.report-main {
font-size: 10px;
+ page-break-before: always;
+ page-break-after: always;
break-before: page;
break-after: page;
break-inside: avoid;
- page-break-after: always;
- height: 280mm;
+ /*min-height: 280mm;*/
border: initial;
border-radius: initial;
box-shadow: initial;
- margin: 0;
+ margin: auto;
width: initial;
-webkit-print-color-adjust: exact;
color-adjust: exact;