refactor naming in preparation for supervisor reporting

This commit is contained in:
Frede Hundewadt 2022-12-30 06:19:08 +01:00
parent 76ea8d8fba
commit 3dd4a2fc61
62 changed files with 61 additions and 67 deletions

View file

@ -18,7 +18,7 @@ using Wonky.Entity.Views;
namespace Wonky.Client.Components;
public partial class AdvisorActivityTableComponent
public partial class ActivityTableCrmComponent
{
[Parameter] public List<ReportItemView> ActivityList { get; set; } = new();
[Inject] public NavigationManager Navigator { get; set; }

View file

@ -18,7 +18,7 @@ using Wonky.Entity.Views;
namespace Wonky.Client.Components;
public partial class OfficeActivityTableComponent
public partial class ReportActivityTableOfficeComponent
{
[Parameter] public List<ReportItemView> ActivityList { get; set; } = new();
[Inject] public NavigationManager Navigator { get; set; }

View file

@ -19,7 +19,7 @@ using Wonky.Entity.Views;
namespace Wonky.Client.Components;
public partial class ReportTableComponent
public partial class ReportTableCrmComponent
{
[Parameter] public List<SalesReportListView> ReportList { get; set; } = new();
[Parameter] public EventCallback<string> OnShowReport { get; set; }

View file

@ -18,7 +18,7 @@ using Wonky.Entity.Views;
namespace Wonky.Client.Components;
public partial class OfficeReportTableComponent
public partial class ReportTableOfficeComponent
{
[Parameter] public List<SalesReportListView> ReportList { get; set; } = new();
[Parameter] public string UserId { get; set; } = "";

View file

@ -31,13 +31,13 @@ using Wonky.Entity.Views;
namespace Wonky.Client.Pages;
public partial class ActivityCreatePage : IDisposable
public partial class ActivityCreateCrmPage : IDisposable
{
// Parameters
[CascadingParameter] DraftStateProvider DraftProvider { get; set; }
[Parameter] public string CompanyId { get; set; }
// Services
[Inject] public ILogger<ActivityCreatePage> Logger { get; set; }
[Inject] public ILogger<ActivityCreateCrmPage> Logger { get; set; }
[Inject] public HttpInterceptorService Interceptor { get; set; }
[Inject] public UserProfileService Profiles { get; set; }
[Inject] public IToastService Toast { get; set; }

View file

@ -25,7 +25,7 @@ using Wonky.Entity.Views;
namespace Wonky.Client.Pages;
public partial class CustomerActivityListPage : IDisposable
public partial class ActivityListCustomerPage : IDisposable
{
[Parameter] public string CompanyId { get; set; } = "";
[Inject] public HttpInterceptorService _interceptor { get; set; }

View file

@ -40,7 +40,7 @@
</div>
@if (ReportStatusView.ReportItems.Any())
{
<AdvisorActivityTableComponent ActivityList="ReportStatusView.ReportItems"/>
<ActivityTableCrmComponent ActivityList="ReportStatusView.ReportItems"/>
}
@if (Working)
{

View file

@ -25,10 +25,10 @@ using Wonky.Entity.Views;
namespace Wonky.Client.Pages;
public partial class ActivityListTodayPage : IDisposable
public partial class ActivityListTodayCrmPage : IDisposable
{
[Inject] public UserProfileService UserProfileService { get; set; }
[Inject] public ILogger<ActivityListTodayPage> Logger { get; set; }
[Inject] public ILogger<ActivityListTodayCrmPage> Logger { get; set; }
[Inject] public HttpInterceptorService Interceptor { get; set; }
[Inject] public NavigationManager Navigator { get; set; }
[Inject] public ICrmActivityHttpRepository CrmActivityRepo { get; set; }

View file

@ -29,13 +29,13 @@ using Wonky.Entity.Views;
namespace Wonky.Client.Pages;
public partial class ActivityViewPage : IDisposable
public partial class ActivityViewCrmPage : IDisposable
{
[Parameter] public string CompanyId { get; set; } = "";
[Parameter] public string OrderId { get; set; } = "";
[Inject] public HttpInterceptorService Interceptor { get; set; }
[Inject] public ICrmActivityHttpRepository ActivityRepo { get; set; }
[Inject] public ILogger<ActivityViewPage> Logger { get; set; }
[Inject] public ILogger<ActivityViewCrmPage> Logger { get; set; }
[Inject] public IToastService Toaster { get; set; }
[Inject] public NavigationManager Navigator { get; set; }
private ReportItemView ReportItem { get; set; } = new();

View file

@ -37,10 +37,10 @@ using Wonky.Entity.Views;
namespace Wonky.Client.Pages
{
public partial class CustomerCardCreatePage : IDisposable
public partial class CustomerCreateCrmPage : IDisposable
{
[Inject] public IToastService Toaster { get; set; }
[Inject] public ILogger<CustomerCardCreatePage> Logger { get; set; }
[Inject] public ILogger<CustomerCreateCrmPage> Logger { get; set; }
[Inject] public ILocalStorageService Storage { get; set; }
[Inject] public NavigationManager Navigator { get; set; }
[Inject] public ICrmCompanyHttpRepository CompanyRepo { get; set; }

View file

@ -11,7 +11,7 @@ using Wonky.Entity.Views;
namespace Wonky.Client.Pages;
public partial class CustomerInvoiceListPage : IDisposable
public partial class CustomerInvoiceListCrmPage : IDisposable
{
[Parameter] public string CompanyId { get; set; } = "";
[Inject] public ICrmCompanyHttpRepository CompanyRepo { get; set; }
@ -19,7 +19,7 @@ public partial class CustomerInvoiceListPage : IDisposable
[Inject] public ICrmHistoryHttpRepository HistoryRepo { get; set; }
[Inject] public IToastService Toaster { get; set; }
[Inject] public ILocalStorageService Storage { get; set; }
[Inject] public ILogger<CustomerInvoiceListPage> Logger { get; set; }
[Inject] public ILogger<CustomerInvoiceListCrmPage> Logger { get; set; }
private InvoiceListView CompanyInvoices { get; set; } = new();
private CompanyDto Company { get; set; } = new();
private bool Working { get; set; } = true;

View file

@ -28,7 +28,7 @@ using Wonky.Entity.Views;
namespace Wonky.Client.Pages
{
public partial class CustomerListPage : IDisposable
public partial class CustomerListCrmPage : IDisposable
{
[Inject] public ILocalStorageService Storage { get; set; }
[Inject] public UserProfileService ProfileService { get; set; }

View file

@ -22,12 +22,12 @@ using Wonky.Entity.Requests;
namespace Wonky.Client.Pages;
public partial class OfficeCustomerListPage : IDisposable
public partial class CustomerListOfficePage : IDisposable
{
[Parameter] public string UserId { get; set; } = "";
[Parameter] public string CountryCode { get; set; } = "dk";
[Inject] public ILogger<OfficeCustomerListPage> Logger { get; set; }
[Inject] public ILogger<CustomerListOfficePage> Logger { get; set; }
[Inject] public HttpInterceptorService Interceptor { get; set; }
[Inject] public IOfficeCustomerHttpRepository CustomerRepo { get; set; }
[Inject] public UserProfileService UserProfileService { get; set; }

View file

@ -27,14 +27,14 @@ using Wonky.Entity.Views;
namespace Wonky.Client.Pages;
public partial class CustomerProductListPage : IDisposable
public partial class CustomerProductListCrmPage : IDisposable
{
[Parameter] public string CompanyId { get; set; } = "";
[Inject] public ICrmHistoryHttpRepository HistoryRepo { get; set; }
[Inject] public ICrmCompanyHttpRepository CompanyRepo { get; set; }
[Inject] public HttpInterceptorService Interceptor { get; set; }
[Inject] public IToastService Toaster { get; set; }
[Inject] public ILogger<CustomerProductListPage> Logger { get; set; }
[Inject] public ILogger<CustomerProductListCrmPage> Logger { get; set; }
[Inject] public ILocalStorageService Storage { get; set; }
private CompanyDto Company { get; set; } = new();
private List<ProductInventoryView> Inventory { get; set; } = new();

View file

@ -31,11 +31,11 @@ using Wonky.Entity.Views;
namespace Wonky.Client.Pages;
public partial class CustomerCardPage : IDisposable
public partial class CustomerViewCrmPage : IDisposable
{
[Parameter] public string CompanyId { get; set; } = "";
[Inject] public IToastService Toaster { get; set; }
[Inject] public ILogger<CustomerCardPage> Logger { get; set; }
[Inject] public ILogger<CustomerViewCrmPage> Logger { get; set; }
[Inject] public NavigationManager Navigator { get; set; }
[Inject] public ICrmCompanyHttpRepository CompanyRepo { get; set; }
[Inject] public ICrmHistoryHttpRepository HistoryRepo { get; set; }

View file

@ -24,7 +24,7 @@ using Wonky.Entity.Views;
namespace Wonky.Client.Pages;
public partial class AdminKrvItemViewPage : IDisposable
public partial class KrvItemViewAdminPage : IDisposable
{
[Parameter] public string SalesItemId { get; set; } = "";
private SalesItemView _item { get; set; } = new ();

View file

@ -28,7 +28,7 @@ using Wonky.Entity.Views;
namespace Wonky.Client.Pages;
public partial class OfficeOrderNewPage : IDisposable
public partial class OrderCreateOfficePage : IDisposable
{
[CascadingParameter] DraftStateProvider DraftStateProvider { get; set; }
[Parameter] public string CompanyId { get; set; }
@ -37,7 +37,7 @@ public partial class OfficeOrderNewPage : IDisposable
[Inject] public IUserHttpRepository UserRepo { get; set; }
[Inject] public ICatalogHttpRepository CatalogRepo { get; set; }
[Inject] public ICrmActivityHttpRepository CrmActivityRepo { get; set; }
[Inject] public ILogger<OfficeOrderNewPage> Logger { get; set; }
[Inject] public ILogger<OrderCreateOfficePage> Logger { get; set; }
private ActivityDto _activity { get; set; } = new();
private EditContext _editContext { get; set; }

View file

@ -30,7 +30,7 @@ using Wonky.Client.Services;
namespace Wonky.Client.Pages;
public partial class OfficeOrderViewPage : IDisposable
public partial class OrderViewOfficePage : IDisposable
{
[Parameter] public string CompanyId { get; set; } = "";
[Parameter] public string OrderId { get; set; } = "";
@ -39,7 +39,7 @@ public partial class OfficeOrderViewPage : IDisposable
[Inject] public ISendMailService MailService { get; set; }
[Inject] public ILocalStorageService Storage { get; set; }
[Inject] public IUserHttpRepository UserRepo { get; set; }
[Inject] public ILogger<OfficeOrderViewPage> Logger { get; set; }
[Inject] public ILogger<OrderViewOfficePage> Logger { get; set; }
[Inject] public IToastService Toast { get; set; }
private ReportItemView _reportItem { get; set; } = new();
private bool _isNotified { get; set; }

View file

@ -25,14 +25,14 @@ using Wonky.Entity.Views;
namespace Wonky.Client.Pages;
public partial class WarehouseOrderViewPage : IDisposable
public partial class OrderViewWarehousePage : IDisposable
{
[Parameter] public string OrderId { get; set; } = "";
[Inject] public HttpInterceptorService _interceptor { get; set; }
[Inject] public IWarehouseHttpRepository _warehouseRepo { get; set; }
[Inject] public NavigationManager _navigator { get; set; }
[Inject] public IToastService _toast { get; set; }
[Inject] public ILogger<WarehouseOrderViewPage> _logger { get; set; }
[Inject] public ILogger<OrderViewWarehousePage> _logger { get; set; }
private WarehouseOrderView _order { get; set; } = new();
private bool Loading { get; set; }

View file

@ -44,6 +44,6 @@
<ReportDistanceLedgerComponent ReportData="Report.ReportData"/>
</div>
</div>
<OfficeActivityTableComponent ActivityList="Report.ReportItems"/>
<ReportActivityTableOfficeComponent ActivityList="Report.ReportItems"/>
<ReportActivityLedgerComponent ReportData="Report.ReportData"/>
</div>

View file

@ -13,11 +13,11 @@ using Wonky.Entity.Views;
namespace Wonky.Client.Pages;
public partial class QuoteListPage : IDisposable
public partial class QuoteListCrmPage : IDisposable
{
[Inject] public ICrmActivityHttpRepository ActivityRepo { get; set; }
[Inject] public HttpInterceptorService Interceptor { get; set; }
[Inject] public ILogger<QuoteListPage> Logger { get; set; }
[Inject] public ILogger<QuoteListCrmPage> Logger { get; set; }
[Inject] public IToastService Toaster { get; set; }
[Inject] public ILocalStorageService Storage { get; set; }
private List<ReportItemView> Quotes { get; set; } = new();

View file

@ -18,13 +18,13 @@
@using Wonky.Client.Components
@page "/sales-reports"
<div class="row bg-dark text-white rounded-2">
<div class="col">
<h3>Rapport Arkiv --- crmreportlistpage</h3>
<div class="card">
<div class="card-header">
<h3>Rapport Arkiv</h3>
</div>
<ReportTableCrmComponent ReportList="ReportList" OnShowReport="ShowThisReport"/>
</div>
<ReportTableComponent ReportList="ReportList" OnShowReport="ShowThisReport" />
@if (Working)
{

View file

@ -22,12 +22,12 @@ using Wonky.Entity.Views;
namespace Wonky.Client.Pages;
public partial class CrmReportListPage : IDisposable
public partial class ReportListCrmPage : IDisposable
{
[Inject] public ICrmReportHttpRepository ReportRepo { get; set; }
[Inject] public HttpInterceptorService Interceptor { get; set; }
[Inject] public NavigationManager Navigator { get; set; }
[Inject] public ILogger<CrmReportListPage> Logger { get; set; }
[Inject] public ILogger<ReportListCrmPage> Logger { get; set; }
private List<SalesReportListView> ReportList { get; set; } = new();
private bool Working { get; set; } = true;
@ -46,7 +46,7 @@ public partial class CrmReportListPage : IDisposable
private void ShowThisReport(string reportDate)
{
Logger.LogDebug("crmreportlistpage => showthisreport <= {}", reportDate);
Logger.LogDebug("CrmReportListPage => ShowThisReport <= {}", reportDate);
Navigator.NavigateTo($"/sales-reports/view/{reportDate}");
}

View file

@ -21,16 +21,10 @@
@page "/office/users/advisors/{CountryCode}/{UserId}/reports"
<div class="card">
<div class="card-header bg-dark text-white">
<div class="row">
<div class="col">
<h3>Rapport Arkiv - @UserInfo.FirstName @UserInfo.LastName</h3>
</div>
</div>
</div>
<div class="card-body">
<OfficeReportTableComponent OnShowReport="ShowThisReport" CountryCode="@CountryCode" UserId="@UserId" ReportList="@ActivityReports" />
<div class="card-header">
<h3>Rapport Arkiv - @UserInfo.FirstName @UserInfo.LastName</h3>
</div>
<ReportTableOfficeComponent OnShowReport="ShowThisReport" CountryCode="@CountryCode" UserId="@UserId" ReportList="@ActivityReports" />
</div>

View file

@ -23,7 +23,7 @@ using Wonky.Entity.Views;
namespace Wonky.Client.Pages;
public partial class OfficeReportListPage : IDisposable
public partial class ReportListOfficePage : IDisposable
{
[Parameter] public string UserId { get; set; } = "";
[Parameter] public string CountryCode { get; set; } = "";

View file

@ -27,14 +27,14 @@ using Wonky.Entity.Views;
namespace Wonky.Client.Pages;
public partial class CrmReportNewPage : IDisposable
public partial class ReportNewCrmPage : IDisposable
{
[Inject] public HttpInterceptorService Interceptor { get; set; }
[Inject] public UserProfileService ProfileService { get; set; }
[Inject] public ICrmActivityHttpRepository CrmActivityRepo { get; set; }
[Inject] public ICrmReportHttpRepository CrmReportRepo { get; set; }
[Inject] public NavigationManager Navigator { get; set; }
[Inject] public ILogger<CrmReportNewPage> Logger { get; set; }
[Inject] public ILogger<ReportNewCrmPage> Logger { get; set; }
[Inject] public IToastService Toaster { get; set; }
private EditContext ReportContext { get; set; }
private ReportDto Report { get; set; } = new();

View file

@ -51,7 +51,7 @@
<ReportDistanceLedgerComponent ReportData="Report.ReportData"/>
</div>
</div>
<OfficeActivityTableComponent ActivityList="Report.ReportItems"/>
<ReportActivityTableOfficeComponent ActivityList="Report.ReportItems"/>
<ReportActivityLedgerComponent ReportData="Report.ReportData"/>
}
else

View file

@ -23,14 +23,14 @@ using Wonky.Entity.Views;
namespace Wonky.Client.Pages;
public partial class CrmReportViewPage : IDisposable
public partial class ReportViewCrmPage : IDisposable
{
[Parameter] public string ReportDate { get; set; }
[Inject] public ICrmReportHttpRepository ReportRepo { get; set; }
[Inject] public NavigationManager Navigator { get; set; }
[Inject] public ILocalStorageService Storage { get; set; }
[Inject] public HttpInterceptorService Interceptor { get; set; }
[Inject] public ILogger<CrmReportViewPage> Logger { get; set; }
[Inject] public ILogger<ReportViewCrmPage> Logger { get; set; }
[Inject] public UserProfileService ProfileService { get; set; }
private UserPref Prefs { get; set; } = new();

View file

@ -53,7 +53,7 @@
<ReportDistanceLedgerComponent ReportData="Report.ReportData"/>
</div>
</div>
<OfficeActivityTableComponent ActivityList="Report.ReportItems"/>
<ReportActivityTableOfficeComponent ActivityList="Report.ReportItems"/>
<ReportActivityLedgerComponent ReportData="Report.ReportData"/>
}
else

View file

@ -23,7 +23,7 @@ using Wonky.Entity.Views;
namespace Wonky.Client.Pages;
public partial class OfficeReportViewPage : IDisposable
public partial class ReportViewOfficePage : IDisposable
{
/// <summary>
/// Country code from url parameter
@ -64,7 +64,7 @@ public partial class OfficeReportViewPage : IDisposable
/// Logger service
/// </summary>
[Inject]
public ILogger<OfficeReportViewPage> Logger { get; set; }
public ILogger<ReportViewOfficePage> Logger { get; set; }
/// <summary>
/// Storage service

View file

@ -25,10 +25,10 @@ using Wonky.Entity.Views;
namespace Wonky.Client.Pages;
public partial class CrmTaskItemListPage : IDisposable
public partial class TaskItemListCrmPage : IDisposable
{
[Inject] public UserProfileService UserProfileService { get; set; }
[Inject] public ILogger<CrmTaskItemListPage> Logger { get; set; }
[Inject] public ILogger<TaskItemListCrmPage> Logger { get; set; }
[Inject] public HttpInterceptorService Interceptor { get; set; }
[Inject] public NavigationManager Navigator { get; set; }
[Inject] public ICrmTaskItemHttpRepository TaskItemRepo { get; set; }

View file

@ -24,7 +24,7 @@ using Wonky.Entity.DTO;
namespace Wonky.Client.Pages;
public partial class CrmTaskItemViewPage : IDisposable
public partial class TaskItemViewCrmPage : IDisposable
{
[Parameter] public string TaskItemId { get; set; }
[Inject] public HttpInterceptorService _interceptor { get; set; }

View file

@ -22,7 +22,7 @@ using Wonky.Entity.Views;
namespace Wonky.Client.Pages;
public partial class OfficeUserListPage : IDisposable
public partial class UserListOfficePage : IDisposable
{
[Parameter] public string CountryCode { get; set; } = "";
[Inject] public HttpInterceptorService _interceptor { get; set; }

View file

@ -22,12 +22,12 @@ using Wonky.Entity.Requests;
namespace Wonky.Client.Pages;
public partial class OfficeCustomerSalesRepListPage : IDisposable
public partial class UserListSalesRepPage : IDisposable
{
[Parameter] public string UserId { get; set; } = "";
[Parameter] public string CountryCode { get; set; } = "dk";
[Inject] public ILogger<OfficeCustomerSalesRepListPage> Logger { get; set; }
[Inject] public ILogger<UserListSalesRepPage> Logger { get; set; }
[Inject] public HttpInterceptorService Interceptor { get; set; }
[Inject] public IOfficeCustomerHttpRepository CustomerRepo { get; set; }
[Inject] public UserProfileService UserProfileService { get; set; }

View file

@ -26,13 +26,13 @@ using Wonky.Entity.Views;
namespace Wonky.Client.Pages;
public partial class OfficeUserViewPage : IDisposable
public partial class UserViewOfficePage : IDisposable
{
[Parameter] public string UserId { get; set; } = "";
[Parameter] public string CountryCode { get; set; } = "";
[Inject] public HttpInterceptorService _interceptor { get; set; }
[Inject] public IUserHttpRepository UserRepo { get; set; }
[Inject] public ILogger<OfficeUserViewPage> _logger { get; set; }
[Inject] public ILogger<UserViewOfficePage> _logger { get; set; }
[Inject] public NavigationManager _navigator { get; set; }
[Inject] public IToastService _toast { get; set; }
private WebUserInfoView _userInfo { get; set; } = new();