diff --git a/Wonky.Client/Components/ReportItemComponent.razor b/Wonky.Client/Components/ReportItemComponent.razor
index 61ce7e01..3b1fd4e0 100644
--- a/Wonky.Client/Components/ReportItemComponent.razor
+++ b/Wonky.Client/Components/ReportItemComponent.razor
@@ -1,105 +1,98 @@
@using Wonky.Entity.Views
-
-
-
-
BESTILLING
-
-
-
-
- Dato
- @ReportItem.OrderDate
- Konto
- @ReportItem.Company.Account
-
-
- Telefon
- @ReportItem.Company.Phone
- Køber
- @ReportItem.YourRef
-
-
- CVR/VAT
- @ReportItem.Company.VatNumber
- Rekvisition
- @ReportItem.ReferenceNumber
-
-
- Navn
- @ReportItem.Company.Name
- Lev.Navn
- @ReportItem.DlvName
-
-
- Adresse
- @ReportItem.Company.Address1
- Lev.Adresse
- @ReportItem.DlvAddress1
-
-
- Adresse
- @ReportItem.Company.Address2
- Lev.Adresse
- @ReportItem.DlvAddress2
-
-
- Postnr By
- @ReportItem.Company.ZipCode @ReportItem.Company.City
- Lev.Postnr By
- @ReportItem.DlvZipCity
-
-
-
-
-
-
-
-
Ordre linjer
-
-
-
-
- Antal
- Varnr
- Beskrivelse
- Pris
- R%
- Beløb
-
-
-
- @foreach (var line in ReportItem.Lines)
- {
-
- @line.Quantity
- @line.Sku
- @line.Description
- @($"{line.Price:N2}")
- @($"{line.Discount:N2}")
- @($"{line.LineSum:N2}")
-
- }
-
-
- Ordresum
- @ReportItem.OrderAmount
-
-
-
-
-
-
-
-
-
- @ReportItem.OfficeNote
-
-
-
-
+
+
Ordre @ReportItem.OrderDate
+
+
+
+ EOrdre nr.
+ @ReportItem.ESalesNumber
+ Konto
+ @ReportItem.Company.Account
+
+
+ Telefon
+ @ReportItem.Company.Phone
+ Køber
+ @ReportItem.YourRef
+
+
+ CVR/VAT
+ @ReportItem.Company.VatNumber
+ Rekvisition
+ @ReportItem.ReferenceNumber
+
+
+ Navn
+ @ReportItem.Company.Name
+ Lev.Navn
+ @ReportItem.DlvName
+
+
+ Adresse
+ @ReportItem.Company.Address1
+ Lev.Adresse
+ @ReportItem.DlvAddress1
+
+
+ Adresse
+ @ReportItem.Company.Address2
+ Lev.Adresse
+ @ReportItem.DlvAddress2
+
+
+ Postnr By
+ @ReportItem.Company.ZipCode @ReportItem.Company.City
+ Lev.Postnr By
+ @ReportItem.DlvZipCity
+
+
+
+
+
+
Varer
+
+
+
+
+ Antal
+ Varnr
+ Beskrivelse
+ Pris
+ R%
+ Beløb
+
+
+
+ @foreach (var line in ReportItem.Lines)
+ {
+
+ @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
+
+
+}
+
@code{
[Parameter]
diff --git a/Wonky.Client/HttpRepository/ITaskItemHttpRepository.cs b/Wonky.Client/HttpRepository/ITaskItemHttpRepository.cs
index 768c0688..47deb58d 100644
--- a/Wonky.Client/HttpRepository/ITaskItemHttpRepository.cs
+++ b/Wonky.Client/HttpRepository/ITaskItemHttpRepository.cs
@@ -4,7 +4,7 @@ namespace Wonky.Client.HttpRepository;
public interface ITaskItemHttpRepository
{
- Task
?> GetTaskList();
- Task CreateTaskItem(TaskItemView taskItem);
- Task GetTaskItem(string taskItemId);
+ Task?> GetTaskList();
+ Task CreateTaskItem(TaskItemViewPage taskItem);
+ Task GetTaskItem(string taskItemId);
}
\ No newline at end of file
diff --git a/Wonky.Client/HttpRepository/TaskItemHttpRepository.cs b/Wonky.Client/HttpRepository/TaskItemHttpRepository.cs
index 341a252e..5f4b0cd2 100644
--- a/Wonky.Client/HttpRepository/TaskItemHttpRepository.cs
+++ b/Wonky.Client/HttpRepository/TaskItemHttpRepository.cs
@@ -30,18 +30,18 @@ public class TaskItemHttpRepository : ITaskItemHttpRepository
_apiConfig = configuration.Value;
}
- public async Task?> GetTaskList()
+ public async Task?> GetTaskList()
{
- return await _client.GetFromJsonAsync>($"{_apiConfig.TaskUri}");
+ return await _client.GetFromJsonAsync>($"{_apiConfig.TaskUri}");
}
- public async Task CreateTaskItem(TaskItemView taskItem)
+ public async Task CreateTaskItem(TaskItemViewPage taskItem)
{
await _client.PostAsJsonAsync($"{_apiConfig.TaskUri}", taskItem);
}
- public async Task GetTaskItem(string taskItemId)
+ public async Task GetTaskItem(string taskItemId)
{
- return await _client.GetFromJsonAsync($"{_apiConfig.TaskUri}/{taskItemId}");
+ return await _client.GetFromJsonAsync($"{_apiConfig.TaskUri}/{taskItemId}");
}
}
\ No newline at end of file
diff --git a/Wonky.Client/Pages/ActivityVisitNew.razor b/Wonky.Client/Pages/ActivityNewVisitPage.razor
similarity index 100%
rename from Wonky.Client/Pages/ActivityVisitNew.razor
rename to Wonky.Client/Pages/ActivityNewVisitPage.razor
diff --git a/Wonky.Client/Pages/ActivityVisitNew.razor.cs b/Wonky.Client/Pages/ActivityNewVisitPage.razor.cs
similarity index 98%
rename from Wonky.Client/Pages/ActivityVisitNew.razor.cs
rename to Wonky.Client/Pages/ActivityNewVisitPage.razor.cs
index e0cfdcef..1d58abb3 100644
--- a/Wonky.Client/Pages/ActivityVisitNew.razor.cs
+++ b/Wonky.Client/Pages/ActivityNewVisitPage.razor.cs
@@ -31,13 +31,13 @@ using Wonky.Entity.Views;
namespace Wonky.Client.Pages;
-public partial class ActivityVisitNew : IDisposable
+public partial class ActivityNewVisitPage : IDisposable
{
// Parameters
[CascadingParameter] DraftStateProvider DraftStateProvider { get; set; }
[Parameter] public string CompanyId { get; set; }
// Services
- [Inject] private ILogger _logger { get; set; }
+ [Inject] private ILogger _logger { get; set; }
[Inject] private HttpInterceptorService _interceptor { get; set; }
[Inject] private UserPreferenceService _userPrefs { get; set; }
[Inject] private IToastService _toast { get; set; }
diff --git a/Wonky.Client/Pages/ActivityToday.razor b/Wonky.Client/Pages/ActivityTodayListPage.razor
similarity index 100%
rename from Wonky.Client/Pages/ActivityToday.razor
rename to Wonky.Client/Pages/ActivityTodayListPage.razor
diff --git a/Wonky.Client/Pages/ActivityToday.razor.cs b/Wonky.Client/Pages/ActivityTodayListPage.razor.cs
similarity index 97%
rename from Wonky.Client/Pages/ActivityToday.razor.cs
rename to Wonky.Client/Pages/ActivityTodayListPage.razor.cs
index bc6a1acf..6e864136 100644
--- a/Wonky.Client/Pages/ActivityToday.razor.cs
+++ b/Wonky.Client/Pages/ActivityTodayListPage.razor.cs
@@ -8,7 +8,7 @@ using Wonky.Entity.Views;
namespace Wonky.Client.Pages;
-public partial class ActivityToday
+public partial class ActivityTodayListPage
{
[Inject] private UserPreferenceService _preferenceService { get; set; }
[Inject] private ILogger _logger { get; set; }
diff --git a/Wonky.Client/Pages/AdminAdviserCompanyList.razor b/Wonky.Client/Pages/AdminAdviserCompanyListPage.razor
similarity index 100%
rename from Wonky.Client/Pages/AdminAdviserCompanyList.razor
rename to Wonky.Client/Pages/AdminAdviserCompanyListPage.razor
diff --git a/Wonky.Client/Pages/AdminAdviserCompanyList.razor.cs b/Wonky.Client/Pages/AdminAdviserCompanyListPage.razor.cs
similarity index 96%
rename from Wonky.Client/Pages/AdminAdviserCompanyList.razor.cs
rename to Wonky.Client/Pages/AdminAdviserCompanyListPage.razor.cs
index 8acfa1d4..9c1720ab 100644
--- a/Wonky.Client/Pages/AdminAdviserCompanyList.razor.cs
+++ b/Wonky.Client/Pages/AdminAdviserCompanyListPage.razor.cs
@@ -7,12 +7,12 @@ using Wonky.Entity.Requests;
namespace Wonky.Client.Pages;
-public partial class AdminAdviserCompanyList : IDisposable
+public partial class AdminAdviserCompanyListPage : IDisposable
{
[Parameter] public string UserId { get; set; } = "";
[Parameter] public string CountryCode { get; set; } = "";
- [Inject] private ILogger _logger { get; set; }
+ [Inject] private ILogger _logger { get; set; }
[Inject] private HttpInterceptorService _interceptor { get; set; }
[Inject] private UserPreferenceService _preferenceService { get; set; }
[Inject] private ICompanyHttpRepository _companyRepo { get; set; }
diff --git a/Wonky.Client/Pages/AdminAdviserUserList.razor b/Wonky.Client/Pages/AdminAdviserUserListPage.razor
similarity index 100%
rename from Wonky.Client/Pages/AdminAdviserUserList.razor
rename to Wonky.Client/Pages/AdminAdviserUserListPage.razor
diff --git a/Wonky.Client/Pages/AdminAdviserUserList.razor.cs b/Wonky.Client/Pages/AdminAdviserUserListPage.razor.cs
similarity index 93%
rename from Wonky.Client/Pages/AdminAdviserUserList.razor.cs
rename to Wonky.Client/Pages/AdminAdviserUserListPage.razor.cs
index b2a5b0c5..7e76cf9d 100644
--- a/Wonky.Client/Pages/AdminAdviserUserList.razor.cs
+++ b/Wonky.Client/Pages/AdminAdviserUserListPage.razor.cs
@@ -6,7 +6,7 @@ using Wonky.Entity.Views;
namespace Wonky.Client.Pages;
-public partial class AdminAdviserUserList : IDisposable
+public partial class AdminAdviserUserListPage : IDisposable
{
[Parameter] public string CountryCode { get; set; } = "";
[Inject] private HttpInterceptorService _interceptor { get; set; }
diff --git a/Wonky.Client/Pages/AdminAdviserView.razor b/Wonky.Client/Pages/AdminAdviserViewPage.razor
similarity index 100%
rename from Wonky.Client/Pages/AdminAdviserView.razor
rename to Wonky.Client/Pages/AdminAdviserViewPage.razor
diff --git a/Wonky.Client/Pages/AdminAdviserView.razor.cs b/Wonky.Client/Pages/AdminAdviserViewPage.razor.cs
similarity index 96%
rename from Wonky.Client/Pages/AdminAdviserView.razor.cs
rename to Wonky.Client/Pages/AdminAdviserViewPage.razor.cs
index 1d987086..b223dae6 100644
--- a/Wonky.Client/Pages/AdminAdviserView.razor.cs
+++ b/Wonky.Client/Pages/AdminAdviserViewPage.razor.cs
@@ -9,13 +9,13 @@ using Wonky.Entity.DTO;
namespace Wonky.Client.Pages;
-public partial class AdminAdviserView : IDisposable
+public partial class AdminAdviserViewPage : IDisposable
{
[Parameter] public string UserId { get; set; } = "";
[Parameter] public string CountryCode { get; set; } = "";
[Inject] private HttpInterceptorService _interceptor { get; set; }
[Inject] private IUserHttpRepository _userRepo { get; set; }
- [Inject] private ILogger _logger { get; set; }
+ [Inject] private ILogger _logger { get; set; }
[Inject] private NavigationManager _navigator { get; set; }
[Inject] private IToastService _toast { get; set; }
private AdminUserInfoDto AdminUserInfo { get; set; } = new();
diff --git a/Wonky.Client/Pages/AdminCompanyList.razor b/Wonky.Client/Pages/AdminCompanyListPage.razor
similarity index 100%
rename from Wonky.Client/Pages/AdminCompanyList.razor
rename to Wonky.Client/Pages/AdminCompanyListPage.razor
diff --git a/Wonky.Client/Pages/AdminCompanyList.razor.cs b/Wonky.Client/Pages/AdminCompanyListPage.razor.cs
similarity index 81%
rename from Wonky.Client/Pages/AdminCompanyList.razor.cs
rename to Wonky.Client/Pages/AdminCompanyListPage.razor.cs
index 521f9a5e..a7f5922e 100644
--- a/Wonky.Client/Pages/AdminCompanyList.razor.cs
+++ b/Wonky.Client/Pages/AdminCompanyListPage.razor.cs
@@ -5,12 +5,12 @@ using Wonky.Entity.DTO;
namespace Wonky.Client.Pages;
-public partial class AdminCompanyList
+public partial class AdminCompanyListPage
{
[Parameter] public string UserId { get; set; } = "";
[Parameter] public string CountryCode { get; set; } = "";
- [Inject] private ILogger _logger { get; set; }
+ [Inject] private ILogger _logger { get; set; }
[Inject] private HttpInterceptorService _interceptor { get; set; }
[Inject] private UserPreferenceService _userPrefs { get; set; }
diff --git a/Wonky.Client/Pages/AdminOfficeList.razor b/Wonky.Client/Pages/AdminOfficeUserListPage.razor
similarity index 100%
rename from Wonky.Client/Pages/AdminOfficeList.razor
rename to Wonky.Client/Pages/AdminOfficeUserListPage.razor
diff --git a/Wonky.Client/Pages/AdminOfficeList.razor.cs b/Wonky.Client/Pages/AdminOfficeUserListPage.razor.cs
similarity index 93%
rename from Wonky.Client/Pages/AdminOfficeList.razor.cs
rename to Wonky.Client/Pages/AdminOfficeUserListPage.razor.cs
index fbbcc7b9..59e57289 100644
--- a/Wonky.Client/Pages/AdminOfficeList.razor.cs
+++ b/Wonky.Client/Pages/AdminOfficeUserListPage.razor.cs
@@ -6,7 +6,7 @@ using Wonky.Entity.Views;
namespace Wonky.Client.Pages;
-public partial class AdminOfficeList : IDisposable
+public partial class AdminOfficeUserListPage : IDisposable
{
[Parameter] public string CountryCode { get; set; } = "";
[Inject] private HttpInterceptorService _interceptor { get; set; }
diff --git a/Wonky.Client/Pages/AdminOfficeView.razor b/Wonky.Client/Pages/AdminOfficeUserViewPage.razor
similarity index 100%
rename from Wonky.Client/Pages/AdminOfficeView.razor
rename to Wonky.Client/Pages/AdminOfficeUserViewPage.razor
diff --git a/Wonky.Client/Pages/AdminOfficeView.razor.cs b/Wonky.Client/Pages/AdminOfficeUserViewPage.razor.cs
similarity index 96%
rename from Wonky.Client/Pages/AdminOfficeView.razor.cs
rename to Wonky.Client/Pages/AdminOfficeUserViewPage.razor.cs
index 8a7c1904..87010b13 100644
--- a/Wonky.Client/Pages/AdminOfficeView.razor.cs
+++ b/Wonky.Client/Pages/AdminOfficeUserViewPage.razor.cs
@@ -9,13 +9,13 @@ using Wonky.Entity.DTO;
namespace Wonky.Client.Pages;
-public partial class AdminOfficeView : IDisposable
+public partial class AdminOfficeUserViewPage : IDisposable
{
[Parameter] public string UserId { get; set; } = "";
[Parameter] public string CountryCode { get; set; } = "";
[Inject] private HttpInterceptorService _interceptor { get; set; }
[Inject] private IUserHttpRepository _userRepo { get; set; }
- [Inject] private ILogger _logger { get; set; }
+ [Inject] private ILogger _logger { get; set; }
[Inject] private NavigationManager _navigator { get; set; }
[Inject] private IToastService _toast { get; set; }
private AdminUserInfoDto AdminUserInfo { get; set; } = new();
diff --git a/Wonky.Client/Pages/AdminSalesReportList.razor b/Wonky.Client/Pages/AdminSalesReportListPage.razor
similarity index 100%
rename from Wonky.Client/Pages/AdminSalesReportList.razor
rename to Wonky.Client/Pages/AdminSalesReportListPage.razor
diff --git a/Wonky.Client/Pages/AdminSalesReportList.razor.cs b/Wonky.Client/Pages/AdminSalesReportListPage.razor.cs
similarity index 93%
rename from Wonky.Client/Pages/AdminSalesReportList.razor.cs
rename to Wonky.Client/Pages/AdminSalesReportListPage.razor.cs
index 277964b6..101fff61 100644
--- a/Wonky.Client/Pages/AdminSalesReportList.razor.cs
+++ b/Wonky.Client/Pages/AdminSalesReportListPage.razor.cs
@@ -6,7 +6,7 @@ using Wonky.Entity.Views;
namespace Wonky.Client.Pages;
-public partial class AdminSalesReportList : IDisposable
+public partial class AdminSalesReportListPage : IDisposable
{
[Parameter] public string UserId { get; set; } = "";
[Parameter] public string CountryCode { get; set; } = "";
diff --git a/Wonky.Client/Pages/AdminSalesReportView.razor b/Wonky.Client/Pages/AdminSalesReportView.razor
deleted file mode 100644
index 9318a739..00000000
--- a/Wonky.Client/Pages/AdminSalesReportView.razor
+++ /dev/null
@@ -1,79 +0,0 @@
-@*
-// 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 Wonky.Client.Components
-@using Microsoft.AspNetCore.Authorization
-@page "/admin/users/advisers/{CountryCode}/{UserId}/reports/{ReportDate}"
-@attribute [Authorize(Roles = "Admin")]
-
-@if (Report != null)
-{
- @Report.ReportData.Name
-
-
-
- @if (!string.IsNullOrWhiteSpace(ReportDate))
- {
-
@DateTime.Parse(ReportDate).ToLongDateString()
- }
-
-
-
-
-
- Print
-
-
-
@Report.ReportData.Name
-
-
-
-
-
-
-
-
-}
-else
-{
-
-}
-@if (_items.Any())
-{
- @foreach (var item in _items)
- {
-
-
-
-
- }
-}
diff --git a/Wonky.Client/Pages/AdminSalesReportViewPage.razor b/Wonky.Client/Pages/AdminSalesReportViewPage.razor
new file mode 100644
index 00000000..d3ef9c07
--- /dev/null
+++ b/Wonky.Client/Pages/AdminSalesReportViewPage.razor
@@ -0,0 +1,76 @@
+@*
+// 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 Wonky.Client.Components
+@using Microsoft.AspNetCore.Authorization
+@page "/admin/users/advisers/{CountryCode}/{UserId}/reports/{ReportDate}"
+@attribute [Authorize(Roles = "Admin")]
+
+@if (Report != null)
+{
+
+
@Report.ReportData.Name
+
+
+
+ @if (!string.IsNullOrWhiteSpace(ReportDate))
+ {
+
@DateTime.Parse(ReportDate).ToLongDateString()
+ }
+
+
+
+
+
+ Print
+
+
+
@Report.ReportData.Name
+
+
+
+
+
+
+
+
+
+
+ @if (_items.Any())
+ {
+
+ @foreach (var item in _items)
+ {
+
+ }
+ }
+}
+else
+{
+
+}
\ No newline at end of file
diff --git a/Wonky.Client/Pages/AdminSalesReportView.razor.cs b/Wonky.Client/Pages/AdminSalesReportViewPage.razor.cs
similarity index 97%
rename from Wonky.Client/Pages/AdminSalesReportView.razor.cs
rename to Wonky.Client/Pages/AdminSalesReportViewPage.razor.cs
index c33dcaef..c724a3f0 100644
--- a/Wonky.Client/Pages/AdminSalesReportView.razor.cs
+++ b/Wonky.Client/Pages/AdminSalesReportViewPage.razor.cs
@@ -6,7 +6,7 @@ using Wonky.Entity.Views;
namespace Wonky.Client.Pages;
-public partial class AdminSalesReportView : IDisposable
+public partial class AdminSalesReportViewPage : IDisposable
{
///
/// Country code from url parameter
diff --git a/Wonky.Client/Pages/CompanyList.razor b/Wonky.Client/Pages/CompanyListPage.razor
similarity index 100%
rename from Wonky.Client/Pages/CompanyList.razor
rename to Wonky.Client/Pages/CompanyListPage.razor
diff --git a/Wonky.Client/Pages/CompanyList.razor.cs b/Wonky.Client/Pages/CompanyListPage.razor.cs
similarity index 98%
rename from Wonky.Client/Pages/CompanyList.razor.cs
rename to Wonky.Client/Pages/CompanyListPage.razor.cs
index 96278fdf..0c5b6b21 100644
--- a/Wonky.Client/Pages/CompanyList.razor.cs
+++ b/Wonky.Client/Pages/CompanyListPage.razor.cs
@@ -26,7 +26,7 @@ using Wonky.Entity.Requests;
namespace Wonky.Client.Pages
{
- public partial class CompanyList : IDisposable
+ public partial class CompanyListPage : IDisposable
{
[Inject] private ILocalStorageService _storage { get; set; }
[Inject] private UserPreferenceService _preferenceService { get; set; }
diff --git a/Wonky.Client/Pages/CompanyNew.razor b/Wonky.Client/Pages/CompanyNewPage.razor
similarity index 100%
rename from Wonky.Client/Pages/CompanyNew.razor
rename to Wonky.Client/Pages/CompanyNewPage.razor
diff --git a/Wonky.Client/Pages/CompanyNew.razor.cs b/Wonky.Client/Pages/CompanyNewPage.razor.cs
similarity index 98%
rename from Wonky.Client/Pages/CompanyNew.razor.cs
rename to Wonky.Client/Pages/CompanyNewPage.razor.cs
index 2832fd6e..7202a74d 100644
--- a/Wonky.Client/Pages/CompanyNew.razor.cs
+++ b/Wonky.Client/Pages/CompanyNewPage.razor.cs
@@ -35,10 +35,10 @@ using Wonky.Entity.Views;
namespace Wonky.Client.Pages
{
- public partial class CompanyNew : IDisposable
+ public partial class CompanyNewPage : IDisposable
{
[Inject] private IToastService _toast { get; set; }
- [Inject] private ILogger _logger { get; set; }
+ [Inject] private ILogger _logger { get; set; }
[Inject] private ILocalStorageService _storage { get; set; }
[Inject] private NavigationManager _navigator { get; set; }
[Inject] private ICompanyHttpRepository _companyRepo { get; set; }
diff --git a/Wonky.Client/Pages/CompanyView.razor b/Wonky.Client/Pages/CompanyViewPage.razor
similarity index 100%
rename from Wonky.Client/Pages/CompanyView.razor
rename to Wonky.Client/Pages/CompanyViewPage.razor
diff --git a/Wonky.Client/Pages/CompanyView.razor.cs b/Wonky.Client/Pages/CompanyViewPage.razor.cs
similarity index 98%
rename from Wonky.Client/Pages/CompanyView.razor.cs
rename to Wonky.Client/Pages/CompanyViewPage.razor.cs
index 33dbc79f..1ac59ab8 100644
--- a/Wonky.Client/Pages/CompanyView.razor.cs
+++ b/Wonky.Client/Pages/CompanyViewPage.razor.cs
@@ -33,11 +33,11 @@ using Wonky.Entity.Views;
namespace Wonky.Client.Pages;
-public partial class CompanyView : IDisposable
+public partial class CompanyViewPage : IDisposable
{
[Parameter] public string CompanyId { get; set; } = "";
[Inject] private IToastService _toast { get; set; }
- [Inject] private ILogger _logger { get; set; }
+ [Inject] private ILogger _logger { get; set; }
[Inject] private NavigationManager _navigator { get; set; }
[Inject] private ICompanyHttpRepository _companyRepo { get; set; }
[Inject] private IHistoryHttpRepository _historyRepo { get; set; }
diff --git a/Wonky.Client/Pages/ItemCatalog.razor b/Wonky.Client/Pages/ItemCatalogPage.razor
similarity index 100%
rename from Wonky.Client/Pages/ItemCatalog.razor
rename to Wonky.Client/Pages/ItemCatalogPage.razor
diff --git a/Wonky.Client/Pages/ItemCatalog.razor.cs b/Wonky.Client/Pages/ItemCatalogPage.razor.cs
similarity index 98%
rename from Wonky.Client/Pages/ItemCatalog.razor.cs
rename to Wonky.Client/Pages/ItemCatalogPage.razor.cs
index 38ab8aff..a1b4aab5 100644
--- a/Wonky.Client/Pages/ItemCatalog.razor.cs
+++ b/Wonky.Client/Pages/ItemCatalogPage.razor.cs
@@ -28,7 +28,7 @@ using Wonky.Entity.Views;
namespace Wonky.Client.Pages;
-public partial class ItemCatalog : IDisposable
+public partial class ItemCatalogPage : IDisposable
{
[Inject] private ILocalStorageService _storage { get; set; }
[Inject] private ISalesItemHttpRepository _itemRepo { get; set; }
diff --git a/Wonky.Client/Pages/ItemView.razor b/Wonky.Client/Pages/KrvItemViewPage.razor
similarity index 100%
rename from Wonky.Client/Pages/ItemView.razor
rename to Wonky.Client/Pages/KrvItemViewPage.razor
diff --git a/Wonky.Client/Pages/ItemView.razor.cs b/Wonky.Client/Pages/KrvItemViewPage.razor.cs
similarity index 97%
rename from Wonky.Client/Pages/ItemView.razor.cs
rename to Wonky.Client/Pages/KrvItemViewPage.razor.cs
index 6bd8b3c7..755bdab7 100644
--- a/Wonky.Client/Pages/ItemView.razor.cs
+++ b/Wonky.Client/Pages/KrvItemViewPage.razor.cs
@@ -23,7 +23,7 @@ using Wonky.Entity.Views;
namespace Wonky.Client.Pages;
-public partial class ItemView : IDisposable
+public partial class KrvItemViewPage : IDisposable
{
[Parameter] public string SalesItemId { get; set; } = "";
private SalesItemView _item { get; set; } = new ();
diff --git a/Wonky.Client/Pages/ItemView.razor.css b/Wonky.Client/Pages/KrvItemViewPage.razor.css
similarity index 100%
rename from Wonky.Client/Pages/ItemView.razor.css
rename to Wonky.Client/Pages/KrvItemViewPage.razor.css
diff --git a/Wonky.Client/Pages/ProductHistoryItem.razor b/Wonky.Client/Pages/ProductHistoryItemPage.razor
similarity index 100%
rename from Wonky.Client/Pages/ProductHistoryItem.razor
rename to Wonky.Client/Pages/ProductHistoryItemPage.razor
diff --git a/Wonky.Client/Pages/ProductHistoryItem.razor.cs b/Wonky.Client/Pages/ProductHistoryItemPage.razor.cs
similarity index 94%
rename from Wonky.Client/Pages/ProductHistoryItem.razor.cs
rename to Wonky.Client/Pages/ProductHistoryItemPage.razor.cs
index 66b1695c..5837c256 100644
--- a/Wonky.Client/Pages/ProductHistoryItem.razor.cs
+++ b/Wonky.Client/Pages/ProductHistoryItemPage.razor.cs
@@ -6,7 +6,7 @@ using Wonky.Entity.Views;
namespace Wonky.Client.Pages;
-public partial class ProductHistoryItem : IDisposable
+public partial class ProductHistoryItemPage : IDisposable
{
[Parameter] public string Sku { get; set; } = "";
[Parameter] public string CompanyId { get; set; } = "";
diff --git a/Wonky.Client/Pages/ProductHistoryList.razor b/Wonky.Client/Pages/ProductHistoryListPage.razor
similarity index 100%
rename from Wonky.Client/Pages/ProductHistoryList.razor
rename to Wonky.Client/Pages/ProductHistoryListPage.razor
diff --git a/Wonky.Client/Pages/ProductHistoryList.razor.cs b/Wonky.Client/Pages/ProductHistoryListPage.razor.cs
similarity index 94%
rename from Wonky.Client/Pages/ProductHistoryList.razor.cs
rename to Wonky.Client/Pages/ProductHistoryListPage.razor.cs
index ec2d8a1f..a6a2848e 100644
--- a/Wonky.Client/Pages/ProductHistoryList.razor.cs
+++ b/Wonky.Client/Pages/ProductHistoryListPage.razor.cs
@@ -6,7 +6,7 @@ using Wonky.Entity.Views;
namespace Wonky.Client.Pages;
-public partial class ProductHistoryList : IDisposable
+public partial class ProductHistoryListPage : IDisposable
{
[Parameter] public string CompanyId { get; set; } = "";
[Inject] private HttpInterceptorService _interceptor { get; set; }
diff --git a/Wonky.Client/Pages/ProductInventory.razor b/Wonky.Client/Pages/ProductInventoryPage.razor
similarity index 100%
rename from Wonky.Client/Pages/ProductInventory.razor
rename to Wonky.Client/Pages/ProductInventoryPage.razor
diff --git a/Wonky.Client/Pages/ProductInventory.razor.cs b/Wonky.Client/Pages/ProductInventoryPage.razor.cs
similarity index 94%
rename from Wonky.Client/Pages/ProductInventory.razor.cs
rename to Wonky.Client/Pages/ProductInventoryPage.razor.cs
index d0718fc3..ed50dd38 100644
--- a/Wonky.Client/Pages/ProductInventory.razor.cs
+++ b/Wonky.Client/Pages/ProductInventoryPage.razor.cs
@@ -6,7 +6,7 @@ using Wonky.Entity.Views;
namespace Wonky.Client.Pages;
-public partial class ProductInventory : IDisposable
+public partial class ProductInventoryPage : IDisposable
{
[Parameter] public string CompanyId { get; set; } = "";
diff --git a/Wonky.Client/Pages/SalesReportList.razor b/Wonky.Client/Pages/SalesReportListPage.razor
similarity index 100%
rename from Wonky.Client/Pages/SalesReportList.razor
rename to Wonky.Client/Pages/SalesReportListPage.razor
diff --git a/Wonky.Client/Pages/SalesReportList.razor.cs b/Wonky.Client/Pages/SalesReportListPage.razor.cs
similarity index 92%
rename from Wonky.Client/Pages/SalesReportList.razor.cs
rename to Wonky.Client/Pages/SalesReportListPage.razor.cs
index 676859fb..086c06e1 100644
--- a/Wonky.Client/Pages/SalesReportList.razor.cs
+++ b/Wonky.Client/Pages/SalesReportListPage.razor.cs
@@ -6,7 +6,7 @@ using Wonky.Entity.Views;
namespace Wonky.Client.Pages;
-public partial class SalesReportList : IDisposable
+public partial class SalesReportListPage : IDisposable
{
[Inject] private IReportHttpRepository _reportRepo { get; set; }
[Inject] private HttpInterceptorService _interceptor { get; set; }
diff --git a/Wonky.Client/Pages/SalesReportNew.razor b/Wonky.Client/Pages/SalesReportNewPage.razor
similarity index 100%
rename from Wonky.Client/Pages/SalesReportNew.razor
rename to Wonky.Client/Pages/SalesReportNewPage.razor
diff --git a/Wonky.Client/Pages/SalesReportNew.razor.cs b/Wonky.Client/Pages/SalesReportNewPage.razor.cs
similarity index 98%
rename from Wonky.Client/Pages/SalesReportNew.razor.cs
rename to Wonky.Client/Pages/SalesReportNewPage.razor.cs
index 97a03d33..7db9b447 100644
--- a/Wonky.Client/Pages/SalesReportNew.razor.cs
+++ b/Wonky.Client/Pages/SalesReportNewPage.razor.cs
@@ -29,14 +29,14 @@ using Wonky.Entity.Views;
namespace Wonky.Client.Pages;
-public partial class SalesReportNew : IDisposable
+public partial class SalesReportNewPage : IDisposable
{
[Inject] private HttpInterceptorService _interceptor { get; set; }
[Inject] private UserPreferenceService _userPrefs { get; set; }
[Inject] private IActivityHttpRepository _activityRepo { get; set; }
[Inject] private IReportHttpRepository _reportRepo { get; set; }
[Inject] private NavigationManager _navigator { get; set; }
- [Inject] private ILogger _logger { get; set; }
+ [Inject] private ILogger _logger { get; set; }
[Inject] private IToastService _toast { get; set; }
private EditContext _editContext { get; set; }
private ReportDto _report { get; set; } = new();
diff --git a/Wonky.Client/Pages/SalesReportView.razor b/Wonky.Client/Pages/SalesReportView.razor
deleted file mode 100644
index b10c91de..00000000
--- a/Wonky.Client/Pages/SalesReportView.razor
+++ /dev/null
@@ -1,78 +0,0 @@
-@*
-// 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 Wonky.Client.Components
-@using Microsoft.AspNetCore.Authorization
-@page "/sales-reports/view/{ReportDate}"
-@attribute [Authorize(Roles = "Adviser,Admin,Supervisor")]
-
-@if (_report != null)
-{
- @_report.ReportData.Name
-
-
-
- @if (!string.IsNullOrWhiteSpace(ReportDate))
- {
-
@DateTime.Parse(ReportDate).ToLongDateString()
- }
-
-
-
-
-
- Print
-
-
-
@_report.ReportData.Name
-
-
-
-
-
-
-
-}
-else
-{
-
-}
-@if (_items.Any())
-{
- @foreach (var item in _items)
- {
-
-
-
-
- }
-}
diff --git a/Wonky.Client/Pages/SalesReportViewPage.razor b/Wonky.Client/Pages/SalesReportViewPage.razor
new file mode 100644
index 00000000..d99dcd30
--- /dev/null
+++ b/Wonky.Client/Pages/SalesReportViewPage.razor
@@ -0,0 +1,79 @@
+@*
+// 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 Wonky.Client.Components
+@using Microsoft.AspNetCore.Authorization
+@page "/sales-reports/view/{ReportDate}"
+@attribute [Authorize(Roles = "Adviser,Admin,Supervisor")]
+
+@if (_report != null)
+{
+
+
@_report.ReportData.Name
+
+
+
+ @if (!string.IsNullOrWhiteSpace(ReportDate))
+ {
+
@DateTime.Parse(ReportDate).ToLongDateString()
+ }
+
+
+
+
+
+ Print
+
+
+
@_report.ReportData.Name
+
+
+
+
+
+
+
+
+}
+else
+{
+
+}
+@if (_items.Any())
+{
+ @foreach (var item in _items)
+ {
+
+
+
+ }
+}
diff --git a/Wonky.Client/Pages/SalesReportView.razor.cs b/Wonky.Client/Pages/SalesReportViewPage.razor.cs
similarity index 95%
rename from Wonky.Client/Pages/SalesReportView.razor.cs
rename to Wonky.Client/Pages/SalesReportViewPage.razor.cs
index 87b414f8..1045d85e 100644
--- a/Wonky.Client/Pages/SalesReportView.razor.cs
+++ b/Wonky.Client/Pages/SalesReportViewPage.razor.cs
@@ -5,7 +5,7 @@ using Wonky.Entity.Views;
namespace Wonky.Client.Pages;
-public partial class SalesReportView
+public partial class SalesReportViewPage
{
[Parameter] public string ReportDate { get; set; }
[Inject] private IReportHttpRepository _reportRepo { get; set; }
diff --git a/Wonky.Client/Pages/TaskItemList.razor b/Wonky.Client/Pages/TaskItemListPage.razor
similarity index 100%
rename from Wonky.Client/Pages/TaskItemList.razor
rename to Wonky.Client/Pages/TaskItemListPage.razor
diff --git a/Wonky.Client/Pages/TaskItemList.razor.cs b/Wonky.Client/Pages/TaskItemListPage.razor.cs
similarity index 96%
rename from Wonky.Client/Pages/TaskItemList.razor.cs
rename to Wonky.Client/Pages/TaskItemListPage.razor.cs
index 5fef5904..38ed49d8 100644
--- a/Wonky.Client/Pages/TaskItemList.razor.cs
+++ b/Wonky.Client/Pages/TaskItemListPage.razor.cs
@@ -8,7 +8,7 @@ using Wonky.Entity.Views;
namespace Wonky.Client.Pages;
-public partial class TaskItemList : IDisposable
+public partial class TaskItemListPage : IDisposable
{
[Inject] public UserPreferenceService UserPrefs { get; set; }
[Inject] public ILogger Logger { get; set; }
diff --git a/Wonky.Client/Pages/TaskItemView.razor b/Wonky.Client/Pages/TaskItemViewPage.razor
similarity index 100%
rename from Wonky.Client/Pages/TaskItemView.razor
rename to Wonky.Client/Pages/TaskItemViewPage.razor
diff --git a/Wonky.Client/Pages/TaskItemView.razor.cs b/Wonky.Client/Pages/TaskItemViewPage.razor.cs
similarity index 89%
rename from Wonky.Client/Pages/TaskItemView.razor.cs
rename to Wonky.Client/Pages/TaskItemViewPage.razor.cs
index f853441e..7bf38570 100644
--- a/Wonky.Client/Pages/TaskItemView.razor.cs
+++ b/Wonky.Client/Pages/TaskItemViewPage.razor.cs
@@ -3,7 +3,7 @@ using Wonky.Client.HttpInterceptors;
namespace Wonky.Client.Pages;
-public partial class TaskItemView : IDisposable
+public partial class TaskItemViewPage : IDisposable
{
[Inject] private HttpInterceptorService _interceptor { get; set; }
[Parameter] public string TaskItemId { get; set; }
diff --git a/Wonky.Client/Shared/NavMenu.razor b/Wonky.Client/Shared/NavMenu.razor
index 5f597944..627fc98a 100644
--- a/Wonky.Client/Shared/NavMenu.razor
+++ b/Wonky.Client/Shared/NavMenu.razor
@@ -34,7 +34,12 @@
-
+
+ Start
+
+
+
+
Log ind
diff --git a/Wonky.Client/wwwroot/appsettings.json b/Wonky.Client/wwwroot/appsettings.json
index 2770571a..03c4521d 100644
--- a/Wonky.Client/wwwroot/appsettings.json
+++ b/Wonky.Client/wwwroot/appsettings.json
@@ -1,7 +1,7 @@
{
"appInfo": {
"name": "Wonky Client",
- "version": "0.8.102",
+ "version": "0.8.115",
"isBeta": true,
"image": "grumpy-coder.png"
},
diff --git a/Wonky.Client/wwwroot/css/report-print-10.css b/Wonky.Client/wwwroot/css/report-print-10.css
new file mode 100644
index 00000000..e184d22a
--- /dev/null
+++ b/Wonky.Client/wwwroot/css/report-print-10.css
@@ -0,0 +1,103 @@
+/* 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: 0.8em;
+ 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/css/report-print.css b/Wonky.Client/wwwroot/css/report-print.css
deleted file mode 100644
index c7aabd1e..00000000
--- a/Wonky.Client/wwwroot/css/report-print.css
+++ /dev/null
@@ -1,32 +0,0 @@
-@font-face {
- font-family: 'Montserrat';
- src: url('https://fonts.googleapis.com/css2?family=Montserrat&display=swap');
-}
-
-/* printer classes */
-@media print {
- html, body {
- height: 290mm;
- width: 210mm;
- -webkit-print-color-adjust: exact;
- color-adjust: exact;
- }
- .content {
- padding: 0;
- }
- .page-break {
- page-break-before: always;
- }
- .report-page {
- font-size: 10px;
- border: initial;
- border-radius: initial;
- box-shadow: initial;
- margin: 0;
- min-height: initial;
- page-break-after: always;
- width: initial;
- -webkit-print-color-adjust: exact;
- color-adjust: exact;
- }
-}
\ No newline at end of file
diff --git a/Wonky.Client/wwwroot/index.html b/Wonky.Client/wwwroot/index.html
index 57682872..bc7f38ad 100644
--- a/Wonky.Client/wwwroot/index.html
+++ b/Wonky.Client/wwwroot/index.html
@@ -5,9 +5,11 @@
Inno Web CRM
-
-
-
+
@@ -19,7 +21,7 @@
-
+
diff --git a/Wonky.Entity/Views/ReportItemView.cs b/Wonky.Entity/Views/ReportItemView.cs
index 2fbeefd8..37009fe5 100644
--- a/Wonky.Entity/Views/ReportItemView.cs
+++ b/Wonky.Entity/Views/ReportItemView.cs
@@ -14,6 +14,11 @@ public class ReportItemView
/// Closed sale
///
public bool Closed { get; set; }
+
+ ///
+ /// ESales number
+ ///
+ public string ESalesNumber { get; set; } = "";
///
/// Order amount
///