activity list refactor
This commit is contained in:
parent
6e2eef2ec4
commit
c7e953d874
10 changed files with 39 additions and 14 deletions
|
@ -15,7 +15,7 @@
|
||||||
|
|
||||||
@using Wonky.Entity.Views
|
@using Wonky.Entity.Views
|
||||||
@* Report activities *@
|
@* Report activities *@
|
||||||
<table class="table table-sm table-striped">
|
<table class="table table-sm table-striped table-hover">
|
||||||
<thead class="table-light">
|
<thead class="table-light">
|
||||||
<tr>
|
<tr>
|
||||||
<th scope="col" class="ps-2">Kunde</th>
|
<th scope="col" class="ps-2">Kunde</th>
|
||||||
|
@ -34,7 +34,7 @@
|
||||||
<tbody>
|
<tbody>
|
||||||
@foreach (var activity in Activities)
|
@foreach (var activity in Activities)
|
||||||
{
|
{
|
||||||
<tr>
|
<tr role="navigation" style="cursor: pointer" @onclick="() => OpenDocument(activity.Company.CompanyId, activity.ActivityId, activity.ProcessStatusEnum)">
|
||||||
<td class="text-sm-start ps-2">@activity.Company.Name</td>
|
<td class="text-sm-start ps-2">@activity.Company.Name</td>
|
||||||
<td class="text-sm-start">@activity.Company.City</td>
|
<td class="text-sm-start">@activity.Company.City</td>
|
||||||
<td class="text-sm-start">@activity.Demo</td>
|
<td class="text-sm-start">@activity.Demo</td>
|
||||||
|
|
|
@ -15,13 +15,33 @@
|
||||||
|
|
||||||
using Microsoft.AspNetCore.Components;
|
using Microsoft.AspNetCore.Components;
|
||||||
using Wonky.Entity.Views;
|
using Wonky.Entity.Views;
|
||||||
|
#pragma warning disable CS8618
|
||||||
|
|
||||||
namespace Wonky.Client.Components;
|
namespace Wonky.Client.Components;
|
||||||
|
|
||||||
public partial class ActivityListComponent
|
public partial class ActivityListComponent
|
||||||
{
|
{
|
||||||
|
[Inject] public NavigationManager Navigator { get; set; }
|
||||||
[Parameter] public List<ReportItemView> Activities { get; set; } = new();
|
[Parameter] public List<ReportItemView> Activities { get; set; } = new();
|
||||||
[Parameter] public string ViewUrl { get; set; } = "";
|
[Parameter] public string ViewAs { get; set; } = "";
|
||||||
|
|
||||||
|
|
||||||
|
private void OpenDocument(string companyId, string documentId, string processStatus)
|
||||||
|
{
|
||||||
|
switch (ViewAs)
|
||||||
|
{
|
||||||
|
case "advisor":
|
||||||
|
if (processStatus.Equals("quote", StringComparison.CurrentCultureIgnoreCase))
|
||||||
|
{
|
||||||
|
Navigator.NavigateTo($"/advisor/customers/{companyId}/quotes/{documentId}");
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
Navigator.NavigateTo($"/advisor/customers/{companyId}/orders/{documentId}");
|
||||||
|
break;
|
||||||
|
case "office":
|
||||||
|
Navigator.NavigateTo($"/office/customers/{companyId}/orders/{documentId}");
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
|
@ -39,7 +39,7 @@
|
||||||
</div>
|
</div>
|
||||||
@if (ReportStatusView.ReportItems.Any())
|
@if (ReportStatusView.ReportItems.Any())
|
||||||
{
|
{
|
||||||
<ActivityListComponent Activities="ReportStatusView.ReportItems"/>
|
<ActivityListComponent Activities="ReportStatusView.ReportItems" ViewAs="advisor"/>
|
||||||
}
|
}
|
||||||
@if (Working)
|
@if (Working)
|
||||||
{
|
{
|
||||||
|
|
|
@ -35,7 +35,7 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<CustomerActivityListComponent Activities="Activities"/>
|
<CustomerActivityListComponent Activities="Activities" />
|
||||||
}
|
}
|
||||||
@if (Working)
|
@if (Working)
|
||||||
{
|
{
|
||||||
|
|
|
@ -26,15 +26,18 @@ using Wonky.Entity.Views;
|
||||||
|
|
||||||
namespace Wonky.Client.Pages;
|
namespace Wonky.Client.Pages;
|
||||||
|
|
||||||
public partial class AdvisorActivityViewEditPage : IDisposable
|
public partial class AdvisorCustomerActivityViewEditPage : IDisposable
|
||||||
{
|
{
|
||||||
|
// ##############################################################
|
||||||
[Parameter] public string CompanyId { get; set; } = "";
|
[Parameter] public string CompanyId { get; set; } = "";
|
||||||
[Parameter] public string OrderId { get; set; } = "";
|
[Parameter] public string OrderId { get; set; } = "";
|
||||||
|
// ##############################################################
|
||||||
[Inject] public HttpInterceptorService Interceptor { get; set; }
|
[Inject] public HttpInterceptorService Interceptor { get; set; }
|
||||||
[Inject] public IAdvisorActivityRepository AdvisorActivityRepo { get; set; }
|
[Inject] public IAdvisorActivityRepository AdvisorActivityRepo { get; set; }
|
||||||
[Inject] public ILogger<AdvisorActivityViewEditPage> Logger { get; set; }
|
[Inject] public ILogger<AdvisorCustomerActivityViewEditPage> Logger { get; set; }
|
||||||
[Inject] public IToastService Toaster { get; set; }
|
[Inject] public IToastService Toaster { get; set; }
|
||||||
[Inject] public NavigationManager Navigator { get; set; }
|
[Inject] public NavigationManager Navigator { get; set; }
|
||||||
|
// ##############################################################
|
||||||
private ReportItemView ReportItem { get; set; } = new();
|
private ReportItemView ReportItem { get; set; } = new();
|
||||||
private ActivityOfficeNote Note { get; set; } = new();
|
private ActivityOfficeNote Note { get; set; } = new();
|
||||||
private EditContext NoteContext { get; set; }
|
private EditContext NoteContext { get; set; }
|
|
@ -185,7 +185,7 @@
|
||||||
@if (_activities.Any())
|
@if (_activities.Any())
|
||||||
{
|
{
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<ActivityListComponent Activities="_activities"/>
|
<ActivityListComponent Activities="_activities" ViewAs="advisor"/>
|
||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -51,7 +51,7 @@
|
||||||
<ReportLedgerDistanceComponent ReportDataView="Report.ReportData"/>
|
<ReportLedgerDistanceComponent ReportDataView="Report.ReportData"/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<ActivityListComponent Activities="Report.ReportItems"/>
|
<ActivityListComponent Activities="Report.ReportItems" ViewAs="advisor"/>
|
||||||
<ReportLedgerActivityComponent ReportDataView="Report.ReportData"/>
|
<ReportLedgerActivityComponent ReportDataView="Report.ReportData"/>
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
|
@ -30,7 +30,7 @@ namespace Wonky.Client.Pages;
|
||||||
|
|
||||||
public partial class AdvisorReportViewPage : IDisposable
|
public partial class AdvisorReportViewPage : IDisposable
|
||||||
{
|
{
|
||||||
[Parameter] public string ReportDate { get; set; }
|
// ##############################################################
|
||||||
[Inject] public IAdvisorSalesReportRepository AdvisorSalesReportRepo { get; set; }
|
[Inject] public IAdvisorSalesReportRepository AdvisorSalesReportRepo { get; set; }
|
||||||
[Inject] public NavigationManager Navigator { get; set; }
|
[Inject] public NavigationManager Navigator { get; set; }
|
||||||
[Inject] public ILocalStorageService Storage { get; set; }
|
[Inject] public ILocalStorageService Storage { get; set; }
|
||||||
|
@ -38,7 +38,9 @@ public partial class AdvisorReportViewPage : IDisposable
|
||||||
[Inject] public ILogger<AdvisorReportViewPage> Logger { get; set; }
|
[Inject] public ILogger<AdvisorReportViewPage> Logger { get; set; }
|
||||||
[Inject] public UserPreferenceService PreferenceService { get; set; }
|
[Inject] public UserPreferenceService PreferenceService { get; set; }
|
||||||
[Inject] public IUserInfoService UserInfoService { get; set; }
|
[Inject] public IUserInfoService UserInfoService { get; set; }
|
||||||
|
// ##############################################################
|
||||||
|
[Parameter] public string ReportDate { get; set; }
|
||||||
|
// ##############################################################
|
||||||
private UserPreference Profiles { get; set; } = new();
|
private UserPreference Profiles { get; set; } = new();
|
||||||
private ReportView Report { get; set; } = new();
|
private ReportView Report { get; set; } = new();
|
||||||
private List<ReportItemView> Activities { get; set; } = new ();
|
private List<ReportItemView> Activities { get; set; } = new ();
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
"appInfo": {
|
"appInfo": {
|
||||||
"name": "Wonky Online",
|
"name": "Wonky Online",
|
||||||
"version": "283.0",
|
"version": "285.0",
|
||||||
"rc": true,
|
"rc": true,
|
||||||
"sandBox": true,
|
"sandBox": true,
|
||||||
"image": "grumpy-coder.png",
|
"image": "grumpy-coder.png",
|
||||||
|
|
Loading…
Reference in a new issue