root/Wonky.Client
root/Wonky.Client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

WIP make all injects private

Browse source
This commit is contained in:
Frede Hundewadt 2023-01-16 16:40:56 +01:00
parent d9f4e71470
commit 5fa35bce7c
66 changed files with 290 additions and 272 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Wonky.Client/Components/AdvisorActivityKmStartComponent.razor
View file

@ -8,7 +8,7 @@
@code {
[Inject] public UserProfileService ProfileService { get; set; }
[Inject] private UserProfileService ProfileService { get; set; }
private int KmMorning { get; set; }
private UserPref Prefs { get; set; } = new();

2
Wonky.Client/Components/AdvisorActivityListComponent.razor.cs
View file

@ -21,6 +21,6 @@ namespace Wonky.Client.Components;
public partial class AdvisorActivityListComponent
{
[Parameter] public List<ReportItemView> ActivityList { get; set; } = new();
[Inject] public NavigationManager Navigator { get; set; }
[Inject] private NavigationManager Navigator { get; set; }
}

4
Wonky.Client/Components/AdvisorCustomerListComponent.razor.cs
View file

@ -32,8 +32,8 @@ namespace Wonky.Client.Components
[Parameter] public List<CompanyDto> CompanyList { get; set; } = new();
[Parameter] public EventCallback<string> OnDelete { get; set; }
[Parameter] public EventCallback<string> OnSelect { get; set; }
[Inject] public NavigationManager Navigator { get; set; }
[Inject] public IJSRuntime Js { get; set; }
[Inject] private NavigationManager Navigator { get; set; }
[Inject] private IJSRuntime Js { get; set; }
private Lazy<IJSObjectReference> BsTooltip = new();

4
Wonky.Client/Components/CatalogGroupComponent.razor.cs
View file

@ -22,8 +22,8 @@ namespace Wonky.Client.Components;
public partial class CatalogGroupComponent
{
[Inject] public ILocalStorageService Storage { get; set; }
[Inject] public UserProfileService ProfileService { get; set; }
[Inject] private ILocalStorageService Storage { get; set; }
[Inject] private UserProfileService ProfileService { get; set; }
[Parameter] public EventCallback<string> OnChanged { get; set; }
private Dictionary<string, string> Items { get; set; } = new();
private UserPref Prefs = new();

2
Wonky.Client/Components/CatalogListComponent.razor.cs
View file

@ -24,5 +24,5 @@ namespace Wonky.Client.Components;
public partial class CatalogListComponent
{
[Parameter] public List<SalesItemView> ItemList { get; set; } = new();
[Inject] public IToastService ToastService { get; set; }
[Inject] private IToastService ToastService { get; set; }
}

2
Wonky.Client/Components/CatalogSearchComponent.razor.cs
View file

@ -24,7 +24,7 @@ public partial class CatalogSearchComponent : IDisposable
/// <summary>
/// User preference service
/// </summary>
[Inject] public UserProfileService ProfileService { get; set; }
[Inject] private UserProfileService ProfileService { get; set; }
/// <summary>
/// OnChanged event callback

2
Wonky.Client/Components/CatalogSortComponent.razor.cs
View file

@ -24,7 +24,7 @@ public partial class CatalogSortComponent : IDisposable
/// <summary>
/// User preference service
/// </summary>
[Inject] public UserProfileService ProfileService { get; set; }
[Inject] private UserProfileService ProfileService { get; set; }
/// <summary>
/// OnChanged callback function

2
Wonky.Client/Components/CustomerInventoryListComponent.razor.cs
View file

@ -27,7 +27,7 @@ namespace Wonky.Client.Components;
public partial class CustomerInventoryListComponent
{
[Inject] public ILocalStorageService Storage { get; set; }
[Inject] private ILocalStorageService Storage { get; set; }
// Parameters
[Parameter] public List<ProductInventoryView> Inventory { get; set; } = new();
[Parameter] public string CompanyId { get; set; } = "";

2
Wonky.Client/Components/CustomerProductCheckListComponent.razor.cs
View file

@ -28,7 +28,7 @@ public partial class CustomerProductCheckListComponent
{
[Parameter] public List<ProductInventoryView> ProductList { get; set; } = new();
[Parameter] public string CompanyId { get; set; } = "";
[Inject] public ILocalStorageService Storage { get; set; }
[Inject] private ILocalStorageService Storage { get; set; }
// private variables
private bool Descending { get; set; }

4
Wonky.Client/Components/CustomerSearchColumnComponent.razor.cs
View file

@ -24,8 +24,8 @@ namespace Wonky.Client.Components;
public partial class CustomerSearchColumnComponent : IDisposable
{
[Inject] public ILocalStorageService Storage { get; set; }
[Inject] public UserProfileService ProfileService { get; set; }
[Inject] private ILocalStorageService Storage { get; set; }
[Inject] private UserProfileService ProfileService { get; set; }
[Parameter] public EventCallback<string> OnChanged { get; set; }
private Dictionary<string, string> Items { get; set; } = new();
private UserPref Prefs { get; set; } = new();

2
Wonky.Client/Components/CustomerSearchPhraseComponent.razor.cs
View file

@ -25,7 +25,7 @@ namespace Wonky.Client.Components
private Timer InputTimer { get; set; } = new();
private string SearchTerm { get; set; } = "";
private UserPref Prefs { get; set; } = new ();
[Inject] public UserProfileService ProfileService { get; set; }
[Inject] private UserProfileService ProfileService { get; set; }
[Parameter] public EventCallback<string> OnChanged { get; set; }
protected override async Task OnInitializedAsync()

4
Wonky.Client/Components/CustomerSortComponent.razor.cs
View file

@ -23,8 +23,8 @@ namespace Wonky.Client.Components
{
public partial class CustomerSortComponent : IDisposable
{
[Inject] public ILocalStorageService Storage { get; set; }
[Inject] public UserProfileService ProfileService { get; set; }
[Inject] private ILocalStorageService Storage { get; set; }
[Inject] private UserProfileService ProfileService { get; set; }
[Parameter] public EventCallback<string> OnChanged { get; set; }
private Dictionary<string, string> Items { get; set; } = new();
private UserPref Prefs = new();

2
Wonky.Client/Components/LandingComponentAdvisor.razor.cs
View file

@ -32,7 +32,7 @@ using Wonky.Entity.Views;
namespace Wonky.Client.Components;
public partial class LandingComponentAdvisor
{
[Inject] public UserProfileService ProfileService { get; set; }
[Inject] private UserProfileService ProfileService { get; set; }
private readonly JsonSerializerOptions JsonOptions = new JsonSerializerOptions
{

2
Wonky.Client/Components/LandingComponentOffice.razor.cs
View file

@ -32,7 +32,7 @@ using Wonky.Entity.Views;
namespace Wonky.Client.Components;
public partial class LandingComponentOffice
{
[Inject] public UserProfileService ProfileService { get; set; }
[Inject] private UserProfileService ProfileService { get; set; }
private readonly JsonSerializerOptions _options = new JsonSerializerOptions
{

2
Wonky.Client/Components/OfficeReportActivityListComponent.razor.cs
View file

@ -21,7 +21,7 @@ namespace Wonky.Client.Components;
public partial class OfficeReportActivityListComponent
{
[Parameter] public List<ReportItemView> ActivityList { get; set; } = new();
[Inject] public NavigationManager Navigator { get; set; }
[Inject] private NavigationManager Navigator { get; set; }
private static string GetProcessStatus(string processStatus)
{

4
Wonky.Client/Components/PageSizeComponent.razor.cs
View file

@ -23,8 +23,8 @@ namespace Wonky.Client.Components
{
public partial class PageSizeComponent : IDisposable
{
[Inject] public ILocalStorageService Storage { get; set; }
[Inject] public UserProfileService ProfileService { get; set; }
[Inject] private ILocalStorageService Storage { get; set; }
[Inject] private UserProfileService ProfileService { get; set; }
[Parameter] public EventCallback<string> OnChanged { get; set; }
private Dictionary<string, string> Items { get; set; } = new();
private UserPref Prefs = new();

2
Wonky.Client/Components/TaskItemTableComponent.razor
View file

@ -81,7 +81,7 @@
}
</tbody>
</table>
<ConfirmationModal BodyMessage="Handlingen kan ikke gøres om. Vil du slette opgaven?" OnOkClicked="DeleteTask" @ref="_confirmationModal"/>
<ConfirmationModal BodyMessage="Handlingen kan ikke gøres om. Vil du slette opgaven?" OnOkClicked="DeleteTask" OnCancelClicked="" @ref="_confirmationModal"/>
}
else
{

22
Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs
View file

@ -36,17 +36,17 @@ public partial class AdvisorActivityCreatePage : IDisposable
[CascadingParameter] DraftStateProvider DraftProvider { get; set; }
[Parameter] public string CompanyId { get; set; }
// Services
[Inject] public ILogger<AdvisorActivityCreatePage> Logger { get; set; }
[Inject] public HttpInterceptorService Interceptor { get; set; }
[Inject] public UserProfileService Profiles { get; set; }
[Inject] public IToastService Toast { get; set; }
[Inject] public NavigationManager Navigator { get; set; }
[Inject] public ILocalStorageService Storage { get; set; }
[Inject] public ICountryCatalogRepository Catalog { get; set; }
[Inject] public IAdvisorCustomerRepository Companies { get; set; }
[Inject] public IAdvisorActivityRepository Actitivites { get; set; }
[Inject] public IAdvisorReportRepository Reports { get; set; }
[Inject] public IAdvisorCustomerHistoryRepository CustomerHistory { get; set; }
[Inject] private ILogger<AdvisorActivityCreatePage> Logger { get; set; }
[Inject] private HttpInterceptorService Interceptor { get; set; }
[Inject] private UserProfileService Profiles { get; set; }
[Inject] private IToastService Toast { get; set; }
[Inject] private NavigationManager Navigator { get; set; }
[Inject] private ILocalStorageService Storage { get; set; }
[Inject] private ICountryCatalogRepository Catalog { get; set; }
[Inject] private IAdvisorCustomerRepository Companies { get; set; }
[Inject] private IAdvisorActivityRepository Actitivites { get; set; }
[Inject] private IAdvisorReportRepository Reports { get; set; }
[Inject] private IAdvisorCustomerHistoryRepository CustomerHistory { get; set; }
// variables
private readonly JsonSerializerOptions _options = new() {PropertyNameCaseInsensitive = true};
private SalesItemView SelectedItem { get; set; } = new();

14
Wonky.Client/Pages/AdvisorActivityTodayListPage.razor.cs
View file

@ -27,13 +27,13 @@ namespace Wonky.Client.Pages;
public partial class AdvisorActivityTodayListPage : IDisposable
{
[Inject] public UserProfileService UserProfileService { get; set; }
[Inject] public ILogger<AdvisorActivityTodayListPage> Logger { get; set; }
[Inject] public HttpInterceptorService Interceptor { get; set; }
[Inject] public NavigationManager Navigator { get; set; }
[Inject] public IAdvisorActivityRepository AdvisorActivityRepo { get; set; }
[Inject] public IAdvisorReportRepository AdvisorReportRepo { get; set; }
[Inject] public IToastService Toaster { get; set; }
[Inject] private UserProfileService UserProfileService { get; set; }
[Inject] private ILogger<AdvisorActivityTodayListPage> Logger { get; set; }
[Inject] private HttpInterceptorService Interceptor { get; set; }
[Inject] private NavigationManager Navigator { get; set; }
[Inject] private IAdvisorActivityRepository AdvisorActivityRepo { get; set; }
[Inject] private IAdvisorReportRepository AdvisorReportRepo { get; set; }
[Inject] private IToastService Toaster { get; set; }
private ReportStatusView? ReportStatusView { get; set; } = new();
private UserPref UserPref { get; set; } = new();
private DateTime SelectedDate { get; set; }

10
Wonky.Client/Pages/AdvisorActivityViewPage.razor.cs
View file

@ -33,11 +33,11 @@ public partial class AdvisorActivityViewPage : IDisposable
{
[Parameter] public string CompanyId { get; set; } = "";
[Parameter] public string OrderId { get; set; } = "";
[Inject] public HttpInterceptorService Interceptor { get; set; }
[Inject] public IAdvisorActivityRepository AdvisorActivityRepo { get; set; }
[Inject] public ILogger<AdvisorActivityViewPage> Logger { get; set; }
[Inject] public IToastService Toaster { get; set; }
[Inject] public NavigationManager Navigator { get; set; }
[Inject] private HttpInterceptorService Interceptor { get; set; }
[Inject] private IAdvisorActivityRepository AdvisorActivityRepo { get; set; }
[Inject] private ILogger<AdvisorActivityViewPage> Logger { get; set; }
[Inject] private IToastService Toaster { get; set; }
[Inject] private NavigationManager Navigator { get; set; }
private ReportItemView ReportItem { get; set; } = new();
private ActivityOfficeNote Note { get; set; } = new();
private EditContext NoteContext { get; set; }

6
Wonky.Client/Pages/AdvisorCustomerActivityListPage.razor.cs
View file

@ -28,9 +28,9 @@ namespace Wonky.Client.Pages;
public partial class AdvisorCustomerActivityListPage : IDisposable
{
[Parameter] public string CompanyId { get; set; } = "";
[Inject] public HttpInterceptorService _interceptor { get; set; }
[Inject] public IAdvisorActivityRepository AdvisorActivityRepo { get; set; }
[Inject] public IAdvisorCustomerRepository CompanyRepo { get; set; }
[Inject] private HttpInterceptorService _interceptor { get; set; }
[Inject] private IAdvisorActivityRepository AdvisorActivityRepo { get; set; }
[Inject] private IAdvisorCustomerRepository CompanyRepo { get; set; }
private List<ReportItemView> Activities { get; set; } = new();
private CompanyDto Company { get; set; } = new();
private bool Working { get; set; } = true;

14
Wonky.Client/Pages/AdvisorCustomerCreatePage.razor.cs
View file

@ -39,13 +39,13 @@ namespace Wonky.Client.Pages
{
public partial class AdvisorCustomerCreatePage : IDisposable
{
[Inject] public IToastService Toaster { get; set; }
[Inject] public ILogger<AdvisorCustomerCreatePage> Logger { get; set; }
[Inject] public ILocalStorageService Storage { get; set; }
[Inject] public NavigationManager Navigator { get; set; }
[Inject] public IAdvisorCustomerRepository CompanyRepo { get; set; }
[Inject] public HttpInterceptorService Interceptor { get; set; }
[Inject] public VatInfoLookupService VatService { get; set; }
[Inject] private IToastService Toaster { get; set; }
[Inject] private ILogger<AdvisorCustomerCreatePage> Logger { get; set; }
[Inject] private ILocalStorageService Storage { get; set; }
[Inject] private NavigationManager Navigator { get; set; }
[Inject] private IAdvisorCustomerRepository CompanyRepo { get; set; }
[Inject] private HttpInterceptorService Interceptor { get; set; }
[Inject] private VatInfoLookupService VatService { get; set; }
private EditContext CompanyContext { get; set; }
private CompanyDto Company { get; set; } = new();
private VirkRegInfo CompanyRegInfo { get; set; } = new();

14
Wonky.Client/Pages/AdvisorCustomerInventoryListPage.razor.cs
View file

@ -28,13 +28,13 @@ namespace Wonky.Client.Pages;
public partial class AdvisorCustomerInventoryListPage : IDisposable
{
[Inject] public IAdvisorCustomerHistoryRepository CustomerHistory { get; set; }
[Inject] public IAdvisorCustomerRepository Customers { get; set; }
[Inject] public HttpInterceptorService Interceptor { get; set; }
[Inject] public IToastService Toaster { get; set; }
[Inject] public ILogger<AdvisorCustomerInventoryListPage> Logger { get; set; }
[Inject] public ILocalStorageService Storage { get; set; }
[Inject] public ICountryCatalogRepository Catalog { get; set; }
[Inject] private IAdvisorCustomerHistoryRepository CustomerHistory { get; set; }
[Inject] private IAdvisorCustomerRepository Customers { get; set; }
[Inject] private HttpInterceptorService Interceptor { get; set; }
[Inject] private IToastService Toaster { get; set; }
[Inject] private ILogger<AdvisorCustomerInventoryListPage> Logger { get; set; }
[Inject] private ILocalStorageService Storage { get; set; }
[Inject] private ICountryCatalogRepository Catalog { get; set; }
[CascadingParameter] public DraftStateProvider DraftStateProvider { get; set; } = new();
[Parameter] public string CompanyId { get; set; } = "";

12
Wonky.Client/Pages/AdvisorCustomerInvoiceListPage.razor.cs
View file

@ -15,12 +15,12 @@ namespace Wonky.Client.Pages;
public partial class AdvisorCustomerInvoiceListPage : IDisposable
{
[Parameter] public string CompanyId { get; set; } = "";
[Inject] public IAdvisorCustomerRepository CompanyRepo { get; set; }
[Inject] public HttpInterceptorService Interceptor { get; set; }
[Inject] public IAdvisorCustomerHistoryRepository HistoryRepo { get; set; }
[Inject] public IToastService Toaster { get; set; }
[Inject] public ILocalStorageService Storage { get; set; }
[Inject] public ILogger<AdvisorCustomerInvoiceListPage> Logger { get; set; }
[Inject] private IAdvisorCustomerRepository CompanyRepo { get; set; }
[Inject] private HttpInterceptorService Interceptor { get; set; }
[Inject] private IAdvisorCustomerHistoryRepository HistoryRepo { get; set; }
[Inject] private IToastService Toaster { get; set; }
[Inject] private ILocalStorageService Storage { get; set; }
[Inject] private ILogger<AdvisorCustomerInvoiceListPage> Logger { get; set; }
private InvoiceListView CompanyInvoices { get; set; } = new();
private CompanyDto Company { get; set; } = new();
private bool Working { get; set; }

10
Wonky.Client/Pages/AdvisorCustomerListPage.razor.cs
View file

@ -30,11 +30,11 @@ namespace Wonky.Client.Pages
{
public partial class AdvisorCustomerListPage : IDisposable
{
[Inject] public ILocalStorageService Storage { get; set; }
[Inject] public UserProfileService ProfileService { get; set; }
[Inject] public IAdvisorCustomerRepository CompanyRepo { get; set; }
[Inject] public HttpInterceptorService Interceptor { get; set; }
[Inject] public NavigationManager Navigator { get; set; }
[Inject] private ILocalStorageService Storage { get; set; }
[Inject] private UserProfileService ProfileService { get; set; }
[Inject] private IAdvisorCustomerRepository CompanyRepo { get; set; }
[Inject] private HttpInterceptorService Interceptor { get; set; }
[Inject] private NavigationManager Navigator { get; set; }
private List<CompanyDto> Companies { get; set; } = new();
private UserPref Prefs { get; set; } = new();
private UserInfoView UserInfo { get; set; } = new();

18
Wonky.Client/Pages/AdvisorCustomerViewPage.razor.cs
View file

@ -34,15 +34,15 @@ namespace Wonky.Client.Pages;
public partial class AdvisorCustomerViewPage : IDisposable
{
[Parameter] public string CompanyId { get; set; } = "";
[Inject] public IToastService Toaster { get; set; }
[Inject] public ILogger<AdvisorCustomerViewPage> Logger { get; set; }
[Inject] public NavigationManager Navigator { get; set; }
[Inject] public IAdvisorCustomerRepository CompanyRepo { get; set; }
[Inject] public IAdvisorCustomerHistoryRepository HistoryRepo { get; set; }
[Inject] public IAdvisorContactRepository AdvisorContactRepo { get; set; }
[Inject] public HttpInterceptorService Interceptor { get; set; }
[Inject] public VatInfoLookupService VatService { get; set; }
[Inject] public ILocalStorageService Storage { get; set; }
[Inject] private IToastService Toaster { get; set; }
[Inject] private ILogger<AdvisorCustomerViewPage> Logger { get; set; }
[Inject] private NavigationManager Navigator { get; set; }
[Inject] private IAdvisorCustomerRepository CompanyRepo { get; set; }
[Inject] private IAdvisorCustomerHistoryRepository HistoryRepo { get; set; }
[Inject] private IAdvisorContactRepository AdvisorContactRepo { get; set; }
[Inject] private HttpInterceptorService Interceptor { get; set; }
[Inject] private VatInfoLookupService VatService { get; set; }
[Inject] private ILocalStorageService Storage { get; set; }
private readonly JsonSerializerOptions _options = new () { PropertyNameCaseInsensitive = true };
private CompanyDto Company { get; set; } = new();
private EditContext ErpContext { get; set; }

10
Wonky.Client/Pages/AdvisorQuoteListPage.razor.cs
View file

@ -16,11 +16,11 @@ namespace Wonky.Client.Pages;
public partial class AdvisorQuoteListPage : IDisposable
{
[Inject] public IAdvisorActivityRepository AdvisorActivityRepo { get; set; }
[Inject] public HttpInterceptorService Interceptor { get; set; }
[Inject] public ILogger<AdvisorQuoteListPage> Logger { get; set; }
[Inject] public IToastService Toaster { get; set; }
[Inject] public ILocalStorageService Storage { get; set; }
[Inject] private IAdvisorActivityRepository AdvisorActivityRepo { get; set; }
[Inject] private HttpInterceptorService Interceptor { get; set; }
[Inject] private ILogger<AdvisorQuoteListPage> Logger { get; set; }
[Inject] private IToastService Toaster { get; set; }
[Inject] private ILocalStorageService Storage { get; set; }
private List<ReportItemView> Quotes { get; set; } = new();
private List<ReportItemView> _quotes { get; set; } = new();
private bool Working { get; set; }

2
Wonky.Client/Pages/AdvisorReportCreatePage.razor
View file

@ -168,7 +168,7 @@
<AdvisorReportActivityLedgerComponent ReportData="Report.Figures" />
</div>
</EditForm>
<ConfirmationModal BodyMessage="@Prompt" OnOkClicked="ConfirmReportCallback" @ref="ConfirmReportModal"/>
<ConfirmationModal BodyMessage="@Prompt" OnOkClicked="ConfirmReportCallback" OnCancelClicked="" @ref="ConfirmReportModal"/>
@if (Working)
{

14
Wonky.Client/Pages/AdvisorReportCreatePage.razor.cs
View file

@ -29,13 +29,13 @@ namespace Wonky.Client.Pages;
public partial class AdvisorReportCreatePage : IDisposable
{
[Inject] public HttpInterceptorService Interceptor { get; set; }
[Inject] public UserProfileService ProfileService { get; set; }
[Inject] public IAdvisorActivityRepository AdvisorActivityRepo { get; set; }
[Inject] public IAdvisorReportRepository AdvisorReportRepo { get; set; }
[Inject] public NavigationManager Navigator { get; set; }
[Inject] public ILogger<AdvisorReportCreatePage> Logger { get; set; }
[Inject] public IToastService Toaster { get; set; }
[Inject] private HttpInterceptorService Interceptor { get; set; }
[Inject] private UserProfileService ProfileService { get; set; }
[Inject] private IAdvisorActivityRepository AdvisorActivityRepo { get; set; }
[Inject] private IAdvisorReportRepository AdvisorReportRepo { get; set; }
[Inject] private NavigationManager Navigator { get; set; }
[Inject] private ILogger<AdvisorReportCreatePage> Logger { get; set; }
[Inject] private IToastService Toaster { get; set; }
private EditContext ReportContext { get; set; }
private ReportDto Report { get; set; } = new();
private List<ReportItemView> Activities { get; set; } = new();

8
Wonky.Client/Pages/AdvisorReportListPage.razor.cs
View file

@ -24,10 +24,10 @@ namespace Wonky.Client.Pages;
public partial class AdvisorReportListPage : IDisposable
{
[Inject] public IAdvisorReportRepository AdvisorReportRepo { get; set; }
[Inject] public HttpInterceptorService Interceptor { get; set; }
[Inject] public NavigationManager Navigator { get; set; }
[Inject] public ILogger<AdvisorReportListPage> Logger { get; set; }
[Inject] private IAdvisorReportRepository AdvisorReportRepo { get; set; }
[Inject] private HttpInterceptorService Interceptor { get; set; }
[Inject] private NavigationManager Navigator { get; set; }
[Inject] private ILogger<AdvisorReportListPage> Logger { get; set; }
private List<SalesReportListView> ReportList { get; set; } = new();
private bool Working { get; set; }

12
Wonky.Client/Pages/AdvisorReportViewPage.razor.cs
View file

@ -26,12 +26,12 @@ namespace Wonky.Client.Pages;
public partial class AdvisorReportViewPage : IDisposable
{
[Parameter] public string ReportDate { get; set; }
[Inject] public IAdvisorReportRepository AdvisorReportRepo { get; set; }
[Inject] public NavigationManager Navigator { get; set; }
[Inject] public ILocalStorageService Storage { get; set; }
[Inject] public HttpInterceptorService Interceptor { get; set; }
[Inject] public ILogger<AdvisorReportViewPage> Logger { get; set; }
[Inject] public UserProfileService ProfileService { get; set; }
[Inject] private IAdvisorReportRepository AdvisorReportRepo { get; set; }
[Inject] private NavigationManager Navigator { get; set; }
[Inject] private ILocalStorageService Storage { get; set; }
[Inject] private HttpInterceptorService Interceptor { get; set; }
[Inject] private ILogger<AdvisorReportViewPage> Logger { get; set; }
[Inject] private UserProfileService ProfileService { get; set; }
private UserPref Prefs { get; set; } = new();
private ReportView Report { get; set; } = new();

12
Wonky.Client/Pages/AdvisorTaskItemListCrmPage.razor.cs
View file

@ -27,12 +27,12 @@ namespace Wonky.Client.Pages;
public partial class AdvisorTaskItemListCrmPage : IDisposable
{
[Inject] public UserProfileService UserProfileService { get; set; }
[Inject] public ILogger<AdvisorTaskItemListCrmPage> Logger { get; set; }
[Inject] public HttpInterceptorService Interceptor { get; set; }
[Inject] public NavigationManager Navigator { get; set; }
[Inject] public IAdvisorTaskItemRepository AdvisorTaskRepo { get; set; }
[Inject] public IToastService Toaster { get; set; }
[Inject] private UserProfileService UserProfileService { get; set; }
[Inject] private ILogger<AdvisorTaskItemListCrmPage> Logger { get; set; }
[Inject] private HttpInterceptorService Interceptor { get; set; }
[Inject] private NavigationManager Navigator { get; set; }
[Inject] private IAdvisorTaskItemRepository AdvisorTaskRepo { get; set; }
[Inject] private IToastService Toaster { get; set; }
private UserPref Prefs { get; set; } = new();
private string WorkDate { get; set; } = $"{DateTime.Now:yyyy-MM-dd}";
private bool ReportExist = false;

4
Wonky.Client/Pages/AdvisorTaskItemViewCrmPage.razor.cs
View file

@ -27,8 +27,8 @@ namespace Wonky.Client.Pages;
public partial class AdvisorTaskItemViewCrmPage : IDisposable
{
[Parameter] public string TaskItemId { get; set; }
[Inject] public HttpInterceptorService _interceptor { get; set; }
[Inject] public IAdvisorTaskItemRepository AdvisorTaskRepo { get; set; }
[Inject] private HttpInterceptorService _interceptor { get; set; }
[Inject] private IAdvisorTaskItemRepository AdvisorTaskRepo { get; set; }
private TaskItemDto _taskItem = new ();
private EditContext _editContext { get; set; }
private bool Working { get; set; } = true;

4
Wonky.Client/Pages/AdvisorWorkplaceDocumentListPage.razor.cs
View file

@ -26,8 +26,8 @@ public partial class AdvisorWorkplaceDocumentListPage
[Parameter] public string CompanyId { get; set; } = "";
[Parameter] public string WorkplaceId { get; set; } = "";
[Inject] public HttpInterceptorService _interceptor { get; set; }
[Inject] public IAdvisorWorkplaceRepository Workplaces { get; set; }
[Inject] private HttpInterceptorService _interceptor { get; set; }
[Inject] private IAdvisorWorkplaceRepository Workplaces { get; set; }
private bool Working { get; set; } = true;
}

6
Wonky.Client/Pages/AdvisorWorkplaceListPage.razor.cs
View file

@ -27,9 +27,9 @@ namespace Wonky.Client.Pages;
public partial class AdvisorWorkplaceListPage : IDisposable
{
[Parameter] public string CompanyId { get; set; } = "";
[Inject] public IAdvisorWorkplaceRepository Workplaces { get; set; }
[Inject] public IAdvisorCustomerRepository _companyRepo { get; set; }
[Inject] public HttpInterceptorService _interceptor { get; set; }
[Inject] private IAdvisorWorkplaceRepository Workplaces { get; set; }
[Inject] private IAdvisorCustomerRepository _companyRepo { get; set; }
[Inject] private HttpInterceptorService _interceptor { get; set; }
private List<WorkplaceListView> _workplaces { get; set; } = new();
private CompanyDto Company { get; set; } = new();
private bool Working { get; set; } = true;

8
Wonky.Client/Pages/AdvisorWorkplaceViewPage.razor.cs
View file

@ -29,10 +29,10 @@ public partial class AdvisorWorkplaceViewPage : IDisposable
{
[Parameter] public string CompanyId { get; set; } = "";
[Parameter] public string WorkplaceId { get; set; } = "";
[Inject] public IAdvisorWorkplaceRepository Workplaces { get; set; }
[Inject] public IAdvisorCustomerRepository _companyRepo { get; set; }
[Inject] public HttpInterceptorService _interceptor { get; set; }
[Inject] public NavigationManager _navigator { get; set; }
[Inject] private IAdvisorWorkplaceRepository Workplaces { get; set; }
[Inject] private IAdvisorCustomerRepository _companyRepo { get; set; }
[Inject] private HttpInterceptorService _interceptor { get; set; }
[Inject] private NavigationManager _navigator { get; set; }
private WorkplaceDto Workplace { get; set; } = new();
private EditContext _editContext { get; set; }
private bool Working { get; set; } = true;

12
Wonky.Client/Pages/CatalogCountryPage.razor.cs
View file

@ -27,12 +27,12 @@ namespace Wonky.Client.Pages;
public partial class CatalogCountryPage : IDisposable
{
[Inject] public ILocalStorageService Storage { get; set; }
[Inject] public ICountryCatalogRepository Catalog { get; set; }
[Inject] public HttpInterceptorService Interceptor { get; set; }
[Inject] public UserProfileService ProfileService { get; set; }
[Inject] public ILogger<CatalogCountryPage> Logger { get; set; }
[Inject] public NavigationManager Navigator { get; set; }
[Inject] private ILocalStorageService Storage { get; set; }
[Inject] private ICountryCatalogRepository Catalog { get; set; }
[Inject] private HttpInterceptorService Interceptor { get; set; }
[Inject] private UserProfileService ProfileService { get; set; }
[Inject] private ILogger<CatalogCountryPage> Logger { get; set; }
[Inject] private NavigationManager Navigator { get; set; }
[Parameter] public string CountryCode { get; set; } = "";

6
Wonky.Client/Pages/CatalogCountryPrintPage.razor.cs
View file

@ -32,9 +32,9 @@ namespace Wonky.Client.Pages;
public partial class CatalogCountryPrintPage : IDisposable
{
[Inject] public ILocalStorageService Storage { get; set; }
[Inject] public ICountryCatalogRepository Catalog { get; set; }
[Inject] public HttpInterceptorService Interceptor { get; set; }
[Inject] private ILocalStorageService Storage { get; set; }
[Inject] private ICountryCatalogRepository Catalog { get; set; }
[Inject] private HttpInterceptorService Interceptor { get; set; }
[Parameter] public string CountryCode { get; set; } = "";
private List<SalesItemView> Items { get; set; } = new();
private bool Working { get; set; } = true;

2
Wonky.Client/Pages/ErrorPage404.razor.cs
View file

@ -19,7 +19,7 @@ namespace Wonky.Client.Pages;
public partial class ErrorPage404
{
[Inject] public NavigationManager NavigationManager { get; set; }
[Inject] private NavigationManager NavigationManager { get; set; }
private void NavigateToHome()
{

6
Wonky.Client/Pages/Login.razor.cs
View file

@ -22,9 +22,9 @@ namespace Wonky.Client.Pages;
public partial class Login
{
[Inject] public NavigationManager NavigationManager { get; set; }
[Inject] public IAuthenticationService AuthenticationService { get; set; }
[Inject] public ILogger<Login> Logger { get; set; }
[Inject] private NavigationManager NavigationManager { get; set; }
[Inject] private IAuthenticationService AuthenticationService { get; set; }
[Inject] private ILogger<Login> Logger { get; set; }
[Parameter] public string ReturnUrl { get; set; }
private CredentialDto _credentialDto = new ();
private bool ShowAuthError { get; set; }

6
Wonky.Client/Pages/Logout.razor.cs
View file

@ -22,9 +22,9 @@ namespace Wonky.Client.Pages;
public partial class Logout
{
[Inject] public IAuthenticationService AuthenticationService { get; set; }
[Inject] public NavigationManager NavigationManager { get; set; }
[Inject] public ILocalStorageService LocalStorage { get; set; }
[Inject] private IAuthenticationService AuthenticationService { get; set; }
[Inject] private NavigationManager NavigationManager { get; set; }
[Inject] private ILocalStorageService LocalStorage { get; set; }
protected override async Task OnInitializedAsync()
{

10
Wonky.Client/Pages/OfficeCustomerCountryListPage.razor.cs
View file

@ -31,11 +31,11 @@ namespace Wonky.Client.Pages
public partial class OfficeCustomerCountryListPage : IDisposable
{
[Parameter] public string CountryCode { get; set; } = "";
[Inject] public ILocalStorageService Storage { get; set; }
[Inject] public UserProfileService ProfileService { get; set; }
[Inject] public ICountryCustomerRepository Customers { get; set; }
[Inject] public HttpInterceptorService Interceptor { get; set; }
[Inject] public NavigationManager Navigator { get; set; }
[Inject] private ILocalStorageService Storage { get; set; }
[Inject] private UserProfileService ProfileService { get; set; }
[Inject] private ICountryCustomerRepository Customers { get; set; }
[Inject] private HttpInterceptorService Interceptor { get; set; }
[Inject] private NavigationManager Navigator { get; set; }
private List<CompanyDto> Companies { get; set; } = new();
private UserPref Prefs { get; set; } = new();
private UserInfoView UserInfo { get; set; } = new();

14
Wonky.Client/Pages/OfficeCustomerCreatePhoneOrderPage.razor.cs
View file

@ -28,13 +28,13 @@ namespace Wonky.Client.Pages;
public partial class OfficeCustomerCreatePhoneOrderPage : IDisposable
{
[Inject] public ILogger<OfficeCustomerCreatePhoneOrderPage> Logger { get; set; }
[Inject] public HttpInterceptorService Interceptor { get; set; }
[Inject] public ICountryCustomerRepository CustomerRepo { get; set; }
[Inject] public ICountryCustomerHistoryRepository InventoryRepo { get; set; }
[Inject] public ICountryReportRepository ReportRepo { get; set; }
[Inject] public ISystemUserRepository UserRepo { get; set; }
[Inject] public ICountryCatalogRepository Catalog { get; set; }
[Inject] private ILogger<OfficeCustomerCreatePhoneOrderPage> Logger { get; set; }
[Inject] private HttpInterceptorService Interceptor { get; set; }
[Inject] private ICountryCustomerRepository CustomerRepo { get; set; }
[Inject] private ICountryCustomerHistoryRepository InventoryRepo { get; set; }
[Inject] private ICountryReportRepository ReportRepo { get; set; }
[Inject] private ISystemUserRepository UserRepo { get; set; }
[Inject] private ICountryCatalogRepository Catalog { get; set; }
// parameters
[Parameter] public string CompanyId { get; set; } = "";
[Parameter] public string CountryCode { get; set; } = "";

14
Wonky.Client/Pages/OfficeCustomerOrderViewPage.razor.cs
View file

@ -34,13 +34,13 @@ public partial class OfficeCustomerOrderViewPage : IDisposable
{
[Parameter] public string CompanyId { get; set; } = "";
[Parameter] public string OrderId { get; set; } = "";
[Inject] public HttpInterceptorService Interceptor { get; set; }
[Inject] public IAdvisorActivityRepository AdvisorActivityRepo { get; set; }
[Inject] public ISystemSendMailService MailService { get; set; }
[Inject] public ILocalStorageService Storage { get; set; }
[Inject] public ISystemUserRepository SystemUserRepo { get; set; }
[Inject] public ILogger<OfficeCustomerOrderViewPage> Logger { get; set; }
[Inject] public IToastService Toast { get; set; }
[Inject] private HttpInterceptorService Interceptor { get; set; }
[Inject] private IAdvisorActivityRepository AdvisorActivityRepo { get; set; }
[Inject] private ISystemSendMailService MailService { get; set; }
[Inject] private ILocalStorageService Storage { get; set; }
[Inject] private ISystemUserRepository SystemUserRepo { get; set; }
[Inject] private ILogger<OfficeCustomerOrderViewPage> Logger { get; set; }
[Inject] private IToastService Toast { get; set; }
private ReportItemView _reportItem { get; set; } = new();
private bool _isNotified { get; set; }
private bool Working { get; set; } = true;

8
Wonky.Client/Pages/OfficeUserAdvisorCustomerListPage.razor.cs
View file

@ -27,10 +27,10 @@ public partial class OfficeUserAdvisorCustomerListPage : IDisposable
{
[Parameter] public string UserId { get; set; } = "";
[Parameter] public string CountryCode { get; set; } = "dk";
[Inject] public HttpInterceptorService Interceptor { get; set; }
[Inject] public ICountryCustomerRepository CustomerRepo { get; set; }
[Inject] public UserProfileService UserProfileService { get; set; }
[Inject] public ISystemUserRepository UserRepo { get; set; }
[Inject] private HttpInterceptorService Interceptor { get; set; }
[Inject] private ICountryCustomerRepository CustomerRepo { get; set; }
[Inject] private UserProfileService UserProfileService { get; set; }
[Inject] private ISystemUserRepository UserRepo { get; set; }
private List<CompanyDto> CompanyList { get; set; } = new();
private MetaData ResponseMeta { get; set; } = new();
private CustomerPaging Paging = new();

4
Wonky.Client/Pages/OfficeUserAdvisorListPage.razor.cs
View file

@ -8,8 +8,8 @@ namespace Wonky.Client.Pages;
public partial class OfficeUserAdvisorListPage :IDisposable
{
[Inject] public HttpInterceptorService Interceptor { get; set; }
[Inject] public ISystemUserRepository SystemUserRepo { get; set; }
[Inject] private HttpInterceptorService Interceptor { get; set; }
[Inject] private ISystemUserRepository SystemUserRepo { get; set; }
[Parameter] public string CountryCode { get; set; } = "";
private List<UserListAdminView> SalesReps { get; set; } = new();
private bool Working { get; set; } = true;

8
Wonky.Client/Pages/OfficeUserAdvisorReportListPage.razor.cs
View file

@ -27,10 +27,10 @@ public partial class OfficeUserAdvisorReportListPage : IDisposable
{
[Parameter] public string UserId { get; set; } = "";
[Parameter] public string CountryCode { get; set; } = "";
[Inject] public ICountryReportRepository ReportRepo { get; set; }
[Inject] public HttpInterceptorService Interceptor { get; set; }
[Inject] public ISystemUserRepository SystemUserRepo { get; set; }
[Inject] public NavigationManager Navigator { get; set; }
[Inject] private ICountryReportRepository ReportRepo { get; set; }
[Inject] private HttpInterceptorService Interceptor { get; set; }
[Inject] private ISystemUserRepository SystemUserRepo { get; set; }
[Inject] private NavigationManager Navigator { get; set; }
private List<SalesReportListView> ActivityReports { get; set; } = new();
private bool Working { get; set; } = true;
private WebUserInfoView UserInfo { get; set; } = new();

4
Wonky.Client/Pages/OfficeUserAdvisorReportViewPage.razor
View file

@ -32,7 +32,7 @@
<button class="btn btn-success" @onclick="() => Print(PTarget.OrderPage)"><i class="bi-printer"></i> Ordrer</button>
</div>
<div class="col-sm-2 d-grid">
<button class="btn btn-primary" type="button" onclick="window.print();"><i class="bi-printer"></i> Rapport</button>
<button class="btn btn-primary" type="button" @onclick="() => Print(PTarget.All)"><i class="bi-printer"></i> Rapport</button>
</div>
</div>
@ -71,3 +71,5 @@
<ReportItemComponent ReportItem="@item" />
}
}
<ConfirmationModal BodyMessage="@BodyMessage" OnOkClicked="OnOkCallBack" OnCancelClicked="OnCancelCallback" />

117
Wonky.Client/Pages/OfficeUserAdvisorReportViewPage.razor.cs
View file

@ -14,78 +14,44 @@
//
using Blazored.LocalStorage;
using Blazored.Toast.Services;
using Microsoft.AspNetCore.Components;
using Microsoft.JSInterop;
using Wonky.Client.Helpers;
using Wonky.Client.HttpInterceptors;
using Wonky.Client.HttpInterfaces;
using Wonky.Client.Models;
using Wonky.Client.Services;
using Wonky.Client.Shared;
using Wonky.Entity.DTO;
using Wonky.Entity.Views;
namespace Wonky.Client.Pages;
public partial class OfficeUserAdvisorReportViewPage : IDisposable
{
/// <summary>
/// Country code from url parameter
/// </summary>
[Parameter]
public string CountryCode { get; set; } = "";
/// <summary>
/// User entity Id from url parameter
/// </summary>
[Parameter]
public string UserId { get; set; } = "";
/// <summary>
/// Report Date
/// </summary>
[Parameter]
public string ReportDate { get; set; } = "";
/// <summary>
/// Injected interceptor service
/// </summary>
[Inject]
public HttpInterceptorService Interceptor { get; set; }
/// <summary>
/// Injected administrative report http repo
/// </summary>
[Inject]
public ICountryReportRepository ReportRepo { get; set; }
/// <summary>
/// Navigation Manager
/// </summary>
[Inject]
public NavigationManager Navigator { get; set; }
/// <summary>
/// Logger service
/// </summary>
[Inject]
public ILogger<OfficeUserAdvisorReportViewPage> Logger { get; set; }
/// <summary>
/// Storage service
/// </summary>
[Inject]
public ILocalStorageService Storage { get; set; }
/// <summary>
/// Preference service
/// </summary>
[Inject]
public UserProfileService ProfileService { get; set; }
[Parameter] public string CountryCode { get; set; } = "";
[Parameter] public string UserId { get; set; } = "";
[Parameter] public string ReportDate { get; set; } = "";
[Inject] private HttpInterceptorService Interceptor { get; set; }
[Inject] private ICountryReportRepository ReportRepo { get; set; }
[Inject] private NavigationManager Navigator { get; set; }
[Inject] private ILogger<OfficeUserAdvisorReportViewPage> Logger { get; set; }
[Inject] private ILocalStorageService Storage { get; set; }
[Inject] private UserProfileService ProfileService { get; set; }
[Inject] private IJSRuntime JSRuntime { get; set; }
[Inject] private IToastService Toaster { get; set; }
[Inject] private IOrderProcessRepository ProcessRepo { get; set; }
private IJSObjectReference JsModule { get; set; }
private ReportView Report { get; set; } = new();
private List<ReportItemView> Activities { get; set; } = new();
private bool Working { get; set; } = true;
private UserPref Prefs = new();
private string ReturnUrl = "";
private string PrintUrl = "";
private ConfirmationModal ConfirmAccepted { get; set; }
private string BodyMessage { get; set; } = "";
protected override async Task OnParametersSetAsync()
{
Interceptor.RegisterEvent();
@ -97,6 +63,14 @@ public partial class OfficeUserAdvisorReportViewPage : IDisposable
await FetchUserReport(ReportDate);
}
protected override async Task OnAfterRenderAsync(bool firstRender)
{
if (firstRender)
{
JsModule = await JSRuntime
.InvokeAsync<IJSObjectReference>("import", "/scripts/print-invoke.js");
}
}
private void Print(PTarget target)
{
ReturnUrl = new Uri(Navigator.Uri).AbsolutePath;
@ -116,7 +90,40 @@ public partial class OfficeUserAdvisorReportViewPage : IDisposable
throw new ArgumentOutOfRangeException(nameof(target), target, null);
}
}
private void ShowConfirmationModal()
{
BodyMessage = "<p>Vil du sætte ordrestatus til accepteret i CRM?</p><p>Dette sikrer at ordrelisten kun udskrives en gang.</p>";
ConfirmAccepted.Show();
}
private async Task OnOkCallBack()
{
var current = 0;
var all = Report.ReportItems.Count;
foreach (var item in Report.ReportItems)
{
Toaster.ShowInfo($"Behandler {current++} af {all} ordrer. Vent venligst");
await ProcessRepo.UpdateWarehouseOrderStatus(new OrderProcessState
{
OrderId = item.ActivityId,
ProcessStatusEnum = Utils.EnumToString(PStatus.Accepted)
});
}
Toaster.ShowInfo("Ordrer er klar til udskrift.");
await Print();
}
private void OnCancelCallback()
{
Print();
}
private async Task Print()
{
await JsModule.InvokeVoidAsync("printInvoke");
}
/// <summary>
/// Work date component event handler
/// </summary>

10
Wonky.Client/Pages/OfficeUserAdvisorViewEditPage.razor.cs
View file

@ -30,11 +30,11 @@ public partial class OfficeUserAdvisorViewEditPage : IDisposable
{
[Parameter] public string UserId { get; set; } = "";
[Parameter] public string CountryCode { get; set; } = "";
[Inject] public HttpInterceptorService _interceptor { get; set; }
[Inject] public ISystemUserRepository SystemUserRepo { get; set; }
[Inject] public ILogger<OfficeUserAdvisorViewEditPage> _logger { get; set; }
[Inject] public NavigationManager _navigator { get; set; }
[Inject] public IToastService _toast { get; set; }
[Inject] private HttpInterceptorService _interceptor { get; set; }
[Inject] private ISystemUserRepository SystemUserRepo { get; set; }
[Inject] private ILogger<OfficeUserAdvisorViewEditPage> _logger { get; set; }
[Inject] private NavigationManager _navigator { get; set; }
[Inject] private IToastService _toast { get; set; }
private WebUserInfoView UserInfo { get; set; } = new();
private EditContext _editContext { get; set; }
private UserUpdateDto _updateInfo { get; set; } = new();

5
Wonky.Client/Pages/ReportPrintOrderPage.razor
View file

@ -28,7 +28,10 @@
<AuthorizeView Roles="Admin,Office">
<button class="btn btn-primary" type="button" @onclick="ShowConfirmationModal"><i class="bi-printer"></i> Udskriv</button>
</AuthorizeView>
<button class="btn btn-primary" type="button" @onclick="Print"><i class="bi-printer"></i> Udskriv</button>
<AuthorizeView Roles="Advisor">
<button class="btn btn-primary" type="button" @onclick="Print"><i class="bi-printer"></i> Udskriv</button>
</AuthorizeView>
</div>
</div>

33
Wonky.Client/Pages/ReportPrintOrderPage.razor.cs
View file

@ -14,6 +14,7 @@
//
using Blazored.LocalStorage;
using Blazored.Toast.Services;
using Microsoft.AspNetCore.Components;
using Microsoft.JSInterop;
using Wonky.Client.Helpers;
@ -30,11 +31,12 @@ public partial class ReportPrintOrderPage
[Parameter] public string CountryCode { get; set; } = "";
[Parameter] public string UserId { get; set; } = "";
[Parameter] public string ReportDate { get; set; } = "";
[Inject] public ILocalStorageService Storage { get; set; }
[Inject] public NavigationManager Navigator { get; set; }
[Inject] public IOrderProcessRepository ProcessRepo { get; set; }
[Inject] private ILocalStorageService Storage { get; set; }
[Inject] private NavigationManager Navigator { get; set; }
[Inject] private IOrderProcessRepository ProcessRepo { get; set; }
[Inject] private IJSRuntime JSRuntime { get; set; }
[Inject] public ILogger<ReportPrintOrderPage> Logger { get; set; }
[Inject] private ILogger<ReportPrintOrderPage> Logger { get; set; }
[Inject] private IToastService Toaster { get; set; }
private ReportView Report { get; set; } = new();
private List<ReportItemView> Items { get; set; } = new();
private IJSObjectReference JsModule { get; set; }
@ -68,21 +70,24 @@ public partial class ReportPrintOrderPage
private async Task OnOkCallBack()
{
foreach (var process in Report.ReportItems.Select(item => new OrderProcessState
{
OrderId = item.ActivityId,
ProcessStatusEnum = Utils.EnumToString(PStatus.Accepted)
}))
var current = 0;
var all = Items.Count;
foreach (var item in Items)
{
await ProcessRepo.UpdateWarehouseOrderStatus(process);
}
Toaster.ShowInfo($"Behandler {current++} af {all} ordrer. Vent venligst");
await ProcessRepo.UpdateWarehouseOrderStatus(new OrderProcessState
{
OrderId = item.ActivityId,
ProcessStatusEnum = Utils.EnumToString(PStatus.Accepted)
});
}
Toaster.ShowInfo("Ordrer er klar til udskrift.");
await Print();
}
private async Task OnCancelCallback()
private void OnCancelCallback()
{
await Print();
Print();
}
private async Task Print()

6
Wonky.Client/Pages/ReportPrintSummaryPage.razor.cs
View file

@ -27,10 +27,10 @@ public partial class ReportPrintSummaryPage
[Parameter] public string CountryCode { get; set; } = "";
[Parameter] public string UserId { get; set; } = "";
[Parameter] public string ReportDate { get; set; } = "";
[Inject] public ILocalStorageService Storage { get; set; }
[Inject] public NavigationManager Navigator { get; set; }
[Inject] private ILocalStorageService Storage { get; set; }
[Inject] private NavigationManager Navigator { get; set; }
[Inject] private IJSRuntime JSRuntime { get; set; }
[Inject] public ILogger<ReportPrintSummaryPage> Logger { get; set; }
[Inject] private ILogger<ReportPrintSummaryPage> Logger { get; set; }
private ReportView Report { get; set; } = new();
private IJSObjectReference JsModule { get; set; }
private string ReturnUrl { get; set; } = "";

8
Wonky.Client/Pages/WarehouseOrderListPage.razor.cs
View file

@ -12,9 +12,9 @@ public partial class WarehouseOrderListPage : IDisposable
{
[Parameter] public string Status { get; set; } = "none";
[Inject] public HttpInterceptorService Interceptor { get; set; }
[Inject] public IOrderProcessRepository OrderProcessRepo { get; set; }
[Inject] public NavigationManager Navigator { get; set; }
[Inject] private HttpInterceptorService Interceptor { get; set; }
[Inject] private IOrderProcessRepository OrderProcessRepo { get; set; }
[Inject] private NavigationManager Navigator { get; set; }
private List<WarehouseOrderView> OrderList { get; set; }
private bool Working { get; set; } = true;
private string Header { get; set; } = "Ubehandlet";
@ -32,7 +32,7 @@ public partial class WarehouseOrderListPage : IDisposable
OrderList = new List<WarehouseOrderView>();
switch (status)
{
case PStatus.None:
case PStatus.None or PStatus.Accepted:
Header = "Ubehandlede ordrer";
ReadyToShip = false;
break;

2
Wonky.Client/Pages/WarehouseOrderViewPage.razor
View file

@ -106,7 +106,7 @@
<div class="col-md-3">
</div>
<div class="col-md-4">
@if (Order.ProcessStatusEnum.ToLower() == "none")
@if (Order.ProcessStatusEnum.ToLower() is "none" or "accepted")
{
<button class="btn btn-lg btn-warning text-nowrap" type="button" @onclick="SetProcessStatusPicked" disabled="@Working">Sæt status plukket</button>
}

10
Wonky.Client/Pages/WarehouseOrderViewPage.razor.cs
View file

@ -29,11 +29,11 @@ namespace Wonky.Client.Pages;
public partial class WarehouseOrderViewPage : IDisposable
{
[Parameter] public string OrderId { get; set; } = "";
[Inject] public HttpInterceptorService Interceptor { get; set; }
[Inject] public IOrderProcessRepository OrderProcessRepo { get; set; }
[Inject] public NavigationManager Navigator { get; set; }
[Inject] public IToastService Toast { get; set; }
[Inject] public ILogger<WarehouseOrderViewPage> Logger { get; set; }
[Inject] private HttpInterceptorService Interceptor { get; set; }
[Inject] private IOrderProcessRepository OrderProcessRepo { get; set; }
[Inject] private NavigationManager Navigator { get; set; }
[Inject] private IToastService Toast { get; set; }
[Inject] private ILogger<WarehouseOrderViewPage> Logger { get; set; }
private WarehouseOrderView Order { get; set; } = new();
private bool Working { get; set; } = true;

2
Wonky.Client/Shared/ConfirmationModal.razor
View file

@ -26,7 +26,7 @@
@((MarkupString) BodyMessage)
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @onclick="Hide">Afbryd</button>
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @onclick="CancelSelected">Afbryd</button>
<button type="button" class="btn btn-primary" data-bs-dismiss="modal" @onclick="OkSelected">OK</button>
</div>
</div>

5
Wonky.Client/Shared/ConfirmationModal.razor.cs
View file

@ -23,7 +23,7 @@ public partial class ConfirmationModal
private bool _showBackdrop;
[Parameter] public string BodyMessage { get; set; } = "";
[Parameter] public EventCallback OnOkClicked { get; set; }
[Parameter] public EventCallback? OnCancelClicked { get; set; }
[Parameter] public EventCallback OnCancelClicked { get; set; }
private void OkSelected()
{
@ -33,7 +33,8 @@ public partial class ConfirmationModal
private void CancelSelected()
{
OnCancelClicked?.InvokeAsync();
if(OnCancelClicked.HasDelegate)
OnCancelClicked.InvokeAsync();
Hide();
}

2
Wonky.Client/Shared/DraftStateProvider.razor.cs
View file

@ -23,7 +23,7 @@ public partial class DraftStateProvider
{
[Parameter] public RenderFragment ChildContent { get; set; }
[Parameter] public string DraftId { get; set; } = "";
[Inject] public ILocalStorageService LocalStorageService { get; set; }
[Inject] private ILocalStorageService LocalStorageService { get; set; }
public Draft Draft { get; set; } = new();
private bool _hasLoaded;

2
Wonky.Client/Shared/InventoryReorderModal.razor.cs
View file

@ -29,7 +29,7 @@ public partial class InventoryReorderModal
{
[Parameter] public string CompanyId { get; set; } = "";
[Parameter] public SalesItemView SalesItem { get; set; } = new();
[Inject] public IAdvisorCustomerHistoryRepository HistoryRepo { get; set; }
[Inject] private IAdvisorCustomerHistoryRepository HistoryRepo { get; set; }
[Parameter] public EventCallback<DraftItem> OnSelected { get; set; }
private List<ProductHistoryView>? History { get; set; } = new();
private DraftItem SelectedItem { get; set; } = new();

4
Wonky.Client/Shared/InvoiceViewModal.razor.cs
View file

@ -29,8 +29,8 @@ public partial class InvoiceViewModal : IDisposable
{
[Parameter] public string CompanyId { get; set; } = "";
[Parameter] public string InvoiceId { get; set; } = "";
[Inject] public HttpInterceptorService Interceptor { get; set; }
[Inject] public IAdvisorCustomerHistoryRepository HistoryRepo { get; set; }
[Inject] private HttpInterceptorService Interceptor { get; set; }
[Inject] private IAdvisorCustomerHistoryRepository HistoryRepo { get; set; }
private string _modalDisplay = "";
private bool _showBackdrop;
private InvoiceView Invoice { get; set; } = new();

6
Wonky.Client/Shared/PriceCatalogModal.razor.cs
View file

@ -28,9 +28,9 @@ public partial class PriceCatalogModal : IDisposable
{
[Parameter] public string CountryCode { get; set; } = "";
[Parameter] public EventCallback<SelectedSku> OnSelected { get; set; }
[Inject] public ICountryCatalogRepository Catalog { get; set; }
[Inject] public HttpInterceptorService Interceptor { get; set; }
[Inject] public UserProfileService ProfileService { get; set; }
[Inject] private ICountryCatalogRepository Catalog { get; set; }
[Inject] private HttpInterceptorService Interceptor { get; set; }
[Inject] private UserProfileService ProfileService { get; set; }
private string _modalDisplay = "";
private bool _showBackdrop;

2
Wonky.Client/Shared/ProductHistoryModal.razor.cs
View file

@ -29,7 +29,7 @@ public partial class ProductHistoryModal
// [Parameter] public EventCallback<decimal> OnSelected { get; set; }
[Parameter] public string CompanyId { get; set; } = "";
[Parameter] public string ItemSku { get; set; } = "";
[Inject] public IAdvisorCustomerHistoryRepository HistoryRepo { get; set; }
[Inject] private IAdvisorCustomerHistoryRepository HistoryRepo { get; set; }
private List<ProductHistoryView>? History { get; set; }
private string ProductName { get; set; } = "";
private string _modalDisplay = "";

2
Wonky.Client/Shared/ProductPriceHistoryModal.razor.cs
View file

@ -29,7 +29,7 @@ public partial class ProductPriceHistoryModal
[Parameter] public EventCallback<decimal> OnSelected { get; set; }
[Parameter] public string CompanyId { get; set; } = "";
[Parameter] public string Sku { get; set; } = "";
[Inject] public IAdvisorCustomerHistoryRepository HistoryRepo { get; set; }
[Inject] private IAdvisorCustomerHistoryRepository HistoryRepo { get; set; }
private List<ProductHistoryView>? History { get; set; }
private string ProductName { get; set; } = "";
private string _modalDisplay = "";

6
Wonky.Client/Shared/VatLookupDkModal.razor.cs
View file

@ -35,9 +35,9 @@ public partial class VatLookupDkModal
[Parameter] public string EntityName { get; set; } = "";
[Parameter] public string VatNumber { get; set; } = "";
[Parameter] public EventCallback<VirkRegInfo> OnSelectedCompany { get; set; }
[Inject] public VatInfoLookupService VatService { get; set; }
[Inject] public IToastService Toaster { get; set; }
[Inject] public ILogger<VatLookupDkModal> Logger { get; set; }
[Inject] private VatInfoLookupService VatService { get; set; }
[Inject] private IToastService Toaster { get; set; }
[Inject] private ILogger<VatLookupDkModal> Logger { get; set; }
private VirkRegInfo CompanyRegInfo { get; set; } = new();
private List<VirkRegInfo> VatInfos { get; set; } = new();
private VatAddress _vatAddress { get; set; } = new();

2
Wonky.Client/wwwroot/appsettings.json
View file

@ -7,7 +7,7 @@
"image": "grumpy-coder.png"
},
"apiConfig": {
"baseUrl": "https://zeta.innotec.dk",
"baseUrl": "https://dev.innotec.dk",
"catalog": "api/v2/catalog/country",
"crmCustomers": "api/v2/crm/companies",
"crmInventoryExt": "history/inventory",