REL: v.126.2 - supervisor functionality
This commit is contained in:
parent
9f88e94e20
commit
afed319b7b
28 changed files with 81 additions and 100 deletions
|
@ -40,7 +40,7 @@
|
||||||
{
|
{
|
||||||
@foreach (var report in ReportList)
|
@foreach (var report in ReportList)
|
||||||
{
|
{
|
||||||
<ReportListItemComponent OnShowReport="ShowThisReport" Report="@report" />
|
<ReportListItemComponent OnShowReport="ShowReport" Report="@report" />
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
|
@ -34,7 +34,7 @@ public partial class OfficeReportListComponent
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private void ShowThisReport(string reportDate)
|
private void ShowReport(string reportDate)
|
||||||
{
|
{
|
||||||
OnShowReport.InvokeAsync(reportDate);
|
OnShowReport.InvokeAsync(reportDate);
|
||||||
}
|
}
|
||||||
|
|
|
@ -38,7 +38,7 @@
|
||||||
{
|
{
|
||||||
@foreach (var report in ReportList)
|
@foreach (var report in ReportList)
|
||||||
{
|
{
|
||||||
<ReportListItemComponent Report="@report" OnShowReport="ShowThisReport" />
|
<ReportListItemComponent Report="@report" OnShowReport="ShowReport" OnShowDocument="ShowDocument" />
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
|
@ -24,20 +24,26 @@ public partial class ReportListComponent
|
||||||
// ###########################################################################
|
// ###########################################################################
|
||||||
[Parameter] public List<SalesReportListView> ReportList { get; set; } = new();
|
[Parameter] public List<SalesReportListView> ReportList { get; set; } = new();
|
||||||
[Parameter] public EventCallback<string> OnShowReport { get; set; }
|
[Parameter] public EventCallback<string> OnShowReport { get; set; }
|
||||||
|
[Parameter] public EventCallback<string> OnShowDocument { get; set; }
|
||||||
|
|
||||||
|
|
||||||
// ###########################################################################
|
// ###########################################################################
|
||||||
private List<SalesReportListView> Reports { get; set; } = new();
|
private List<SalesReportListView> Reports { get; set; } = new();
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
protected override void OnParametersSet()
|
protected override void OnParametersSet()
|
||||||
{
|
{
|
||||||
Reports = ReportList.OrderByDescending(x => x.ReportDate).ToList();
|
Reports = ReportList.OrderByDescending(x => x.ReportDate).ToList();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private void ShowThisReport(string reportDate)
|
private void ShowDocument(string documentId)
|
||||||
|
{
|
||||||
|
OnShowDocument.InvokeAsync(documentId);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
private void ShowReport(string reportDate)
|
||||||
{
|
{
|
||||||
OnShowReport.InvokeAsync(reportDate);
|
OnShowReport.InvokeAsync(reportDate);
|
||||||
}
|
}
|
||||||
|
|
|
@ -15,8 +15,7 @@
|
||||||
|
|
||||||
@using Wonky.Entity.Views
|
@using Wonky.Entity.Views
|
||||||
|
|
||||||
<button type="button" aria-role="navigation" class="list-group-item list-group-item-action" style="cursor: pointer"
|
<button type="button" aria-role="navigation" class="list-group-item list-group-item-action" style="cursor: pointer" @onclick="ShowReport">
|
||||||
@onclick="ShowThisReport">
|
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col">
|
<div class="col">
|
||||||
@Report.ReportDate
|
@Report.ReportDate
|
||||||
|
|
|
@ -23,9 +23,16 @@ public partial class ReportListItemComponent
|
||||||
// #############################################################
|
// #############################################################
|
||||||
[Parameter] public SalesReportListView Report { get; set; } = new();
|
[Parameter] public SalesReportListView Report { get; set; } = new();
|
||||||
[Parameter] public EventCallback<string> OnShowReport { get; set; }
|
[Parameter] public EventCallback<string> OnShowReport { get; set; }
|
||||||
|
[Parameter] public EventCallback<string> OnShowDocument { get; set; }
|
||||||
|
|
||||||
|
|
||||||
|
private void ShowDocument(string documentId)
|
||||||
|
{
|
||||||
|
OnShowDocument.InvokeAsync(documentId);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
private void ShowThisReport()
|
private void ShowReport()
|
||||||
{
|
{
|
||||||
OnShowReport.InvokeAsync(Report.ReportDate);
|
OnShowReport.InvokeAsync(Report.ReportDate);
|
||||||
}
|
}
|
||||||
|
|
|
@ -38,7 +38,7 @@
|
||||||
@foreach (var activity in ActivityList)
|
@foreach (var activity in ActivityList)
|
||||||
{
|
{
|
||||||
<tr class="border-bottom">
|
<tr class="border-bottom">
|
||||||
<td class="align-middle"><a class="link-info" href="#" @onclick="() => ShowDocument(activity.ActivityId)">@activity.Company.Name</a></td>
|
<td class="align-middle d-grid"><button aria-role="navigation" class="btn btn-info" @onclick="() => ShowDocument(activity.ActivityId)">@activity.Company.Name</button></td>
|
||||||
<td class="align-middle">@activity.Company.City</td>
|
<td class="align-middle">@activity.Company.City</td>
|
||||||
<td class="align-middle">@activity.Demo</td>
|
<td class="align-middle">@activity.Demo</td>
|
||||||
<td class="align-middle">@activity.Sales</td>
|
<td class="align-middle">@activity.Sales</td>
|
|
@ -19,7 +19,7 @@ using Wonky.Entity.Views;
|
||||||
|
|
||||||
namespace Wonky.Client.Components;
|
namespace Wonky.Client.Components;
|
||||||
|
|
||||||
public partial class ReportActivityListComponent
|
public partial class ReportViewActivityListComponent
|
||||||
{
|
{
|
||||||
// ##############################################################################
|
// ##############################################################################
|
||||||
[Parameter] public List<ReportItemView> ActivityList { get; set; } = new();
|
[Parameter] public List<ReportItemView> ActivityList { get; set; } = new();
|
|
@ -18,7 +18,7 @@ using Microsoft.AspNetCore.Components;
|
||||||
|
|
||||||
namespace Wonky.Client.Components;
|
namespace Wonky.Client.Components;
|
||||||
|
|
||||||
public partial class ReportDistanceLedgerComponent
|
public partial class ReportViewDistanceLedgerComponent
|
||||||
{
|
{
|
||||||
[Parameter] public ReportData ReportData { get; set; } = new();
|
[Parameter] public ReportData ReportData { get; set; } = new();
|
||||||
|
|
|
@ -19,7 +19,7 @@ using Microsoft.AspNetCore.Components;
|
||||||
|
|
||||||
namespace Wonky.Client.Components;
|
namespace Wonky.Client.Components;
|
||||||
|
|
||||||
public partial class ReportSummaryComponent
|
public partial class ReportViewSummaryComponent
|
||||||
{
|
{
|
||||||
[Parameter] public ReportData ReportData { get; set; } = new();
|
[Parameter] public ReportData ReportData { get; set; } = new();
|
||||||
|
|
|
@ -127,7 +127,7 @@
|
||||||
@if (ReportItem.Express)
|
@if (ReportItem.Express)
|
||||||
{
|
{
|
||||||
<tr>
|
<tr>
|
||||||
<td class="bg-dark" colspan="4"></td>
|
<td colspan="4"></td>
|
||||||
<td colspan="2">
|
<td colspan="2">
|
||||||
<h5 class="fw-bold text-end"><i class="bi-lightning-charge the-fast" style="font-size: 1rem;"></i> HASTER</h5>
|
<h5 class="fw-bold text-end"><i class="bi-lightning-charge the-fast" style="font-size: 1rem;"></i> HASTER</h5>
|
||||||
</td>
|
</td>
|
|
@ -18,12 +18,11 @@ using Wonky.Entity.Views;
|
||||||
|
|
||||||
namespace Wonky.Client.Components;
|
namespace Wonky.Client.Components;
|
||||||
|
|
||||||
public partial class ReportItemComponent
|
public partial class ReportVisitComponent
|
||||||
{
|
{
|
||||||
// ##############################################################################
|
// ##############################################################################
|
||||||
[Parameter] public ReportItemView ReportItem { get; set; } = new();
|
[Parameter] public ReportItemView ReportItem { get; set; } = new();
|
||||||
|
|
||||||
|
|
||||||
protected override void OnParametersSet()
|
protected override void OnParametersSet()
|
||||||
{
|
{
|
||||||
var lines = ReportItem.Lines.OrderBy(x => x.Location).ToList();
|
var lines = ReportItem.Lines.OrderBy(x => x.Location).ToList();
|
|
@ -44,14 +44,14 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="w-75">
|
<div class="w-75">
|
||||||
<ReportSummaryComponent ReportData="Report.ReportData"/>
|
<ReportViewSummaryComponent ReportData="Report.ReportData"/>
|
||||||
</div>
|
</div>
|
||||||
<div class="w-25">
|
<div class="w-25">
|
||||||
<ReportDistanceLedgerComponent ReportData="Report.ReportData"/>
|
<ReportViewDistanceLedgerComponent ReportData="Report.ReportData"/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<AdvisorActivityListComponent ActivityList="Report.ReportItems"/>
|
<AdvisorActivityListComponent ActivityList="Report.ReportItems"/>
|
||||||
<ReportActivityLedgerComponent ReportData="Report.ReportData"/>
|
<ReportViewActivityLedgerComponent ReportData="Report.ReportData"/>
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -65,6 +65,6 @@
|
||||||
{
|
{
|
||||||
@foreach (var item in Activities)
|
@foreach (var item in Activities)
|
||||||
{
|
{
|
||||||
<ReportItemComponent ReportItem="@item"></ReportItemComponent>
|
<ReportVisitComponent ReportItem="@item"></ReportVisitComponent>
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -38,7 +38,7 @@
|
||||||
{
|
{
|
||||||
foreach (var item in Items.Where(item => item.StatusTypeEnum.ToLower() == "order" && item.ProcessStatusEnum.ToLower() == "none"))
|
foreach (var item in Items.Where(item => item.StatusTypeEnum.ToLower() == "order" && item.ProcessStatusEnum.ToLower() == "none"))
|
||||||
{
|
{
|
||||||
<ReportItemComponent ReportItem="@item" />
|
<ReportVisitComponent ReportItem="@item" />
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
|
@ -39,12 +39,12 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="w-75">
|
<div class="w-75">
|
||||||
<ReportSummaryComponent ReportData="Report.ReportData"/>
|
<ReportViewSummaryComponent ReportData="Report.ReportData"/>
|
||||||
</div>
|
</div>
|
||||||
<div class="w-25">
|
<div class="w-25">
|
||||||
<ReportDistanceLedgerComponent ReportData="Report.ReportData"/>
|
<ReportViewDistanceLedgerComponent ReportData="Report.ReportData"/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<OfficeReportActivityListComponent ActivityList="Report.ReportItems"/>
|
<OfficeReportActivityListComponent ActivityList="Report.ReportItems"/>
|
||||||
<ReportActivityLedgerComponent ReportData="Report.ReportData"/>
|
<ReportViewActivityLedgerComponent ReportData="Report.ReportData"/>
|
||||||
</div>
|
</div>
|
|
@ -45,14 +45,14 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="w-75">
|
<div class="w-75">
|
||||||
<ReportSummaryComponent ReportData="Report.ReportData"/>
|
<ReportViewSummaryComponent ReportData="Report.ReportData"/>
|
||||||
</div>
|
</div>
|
||||||
<div class="w-25">
|
<div class="w-25">
|
||||||
<ReportDistanceLedgerComponent ReportData="Report.ReportData"/>
|
<ReportViewDistanceLedgerComponent ReportData="Report.ReportData"/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<OfficeReportActivityListComponent ActivityList="Report.ReportItems"/>
|
<OfficeReportActivityListComponent ActivityList="Report.ReportItems"/>
|
||||||
<ReportActivityLedgerComponent ReportData="Report.ReportData"/>
|
<ReportViewActivityLedgerComponent ReportData="Report.ReportData"/>
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -66,6 +66,6 @@
|
||||||
{
|
{
|
||||||
foreach (var item in Activities.Where(item => item.StatusTypeEnum.ToLower() == "order" && item.ProcessStatusEnum.ToLower() == "none"))
|
foreach (var item in Activities.Where(item => item.StatusTypeEnum.ToLower() == "order" && item.ProcessStatusEnum.ToLower() == "none"))
|
||||||
{
|
{
|
||||||
<ReportItemComponent ReportItem="@item" />
|
<ReportVisitComponent ReportItem="@item" />
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -29,14 +29,14 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="w-75">
|
<div class="w-75">
|
||||||
<ReportSummaryComponent ReportData="Report.ReportData"/>
|
<ReportViewSummaryComponent ReportData="Report.ReportData"/>
|
||||||
</div>
|
</div>
|
||||||
<div class="w-25">
|
<div class="w-25">
|
||||||
<ReportDistanceLedgerComponent ReportData="Report.ReportData"/>
|
<ReportViewDistanceLedgerComponent ReportData="Report.ReportData"/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<OfficeReportActivityListComponent ActivityList="Report.ReportItems"/>
|
<ReportViewActivityListComponent ActivityList="Report.ReportItems" OnShowDocument="ShowDocument"/>
|
||||||
<ReportActivityLedgerComponent ReportData="Report.ReportData"/>
|
<ReportViewActivityLedgerComponent ReportData="Report.ReportData"/>
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
|
@ -39,11 +39,11 @@ public partial class SupervisorAdvisorReportViewPage : IDisposable
|
||||||
[Inject] public ILogger<SupervisorAdvisorReportViewPage> Logger { get; set; }
|
[Inject] public ILogger<SupervisorAdvisorReportViewPage> Logger { get; set; }
|
||||||
[Inject] public ILocalStorageService Storage { get; set; }
|
[Inject] public ILocalStorageService Storage { get; set; }
|
||||||
[Inject] public UserPreferenceService PreferenceService { get; set; }
|
[Inject] public UserPreferenceService PreferenceService { get; set; }
|
||||||
[Inject] public IJSRuntime JsRuntime { get; set; }
|
|
||||||
[Inject] public IToastService Toaster { get; set; }
|
[Inject] public IToastService Toaster { get; set; }
|
||||||
[Inject] public IOrderProcessRepository ProcessRepo { get; set; }
|
[Inject] public IOrderProcessRepository ProcessRepo { get; set; }
|
||||||
|
// [Inject] public EventCallback<string> OnShowDocument { get; set; }
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// #############################################################
|
// #############################################################
|
||||||
[Parameter] public string CountryCode { get; set; } = "";
|
[Parameter] public string CountryCode { get; set; } = "";
|
||||||
[Parameter] public string UserId { get; set; } = "";
|
[Parameter] public string UserId { get; set; } = "";
|
||||||
|
@ -71,57 +71,18 @@ public partial class SupervisorAdvisorReportViewPage : IDisposable
|
||||||
await FetchUserReport(ReportDate);
|
await FetchUserReport(ReportDate);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
protected override async Task OnAfterRenderAsync(bool firstRender)
|
/// Event handler to show the document by Id
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="documentId"></param>
|
||||||
|
private void ShowDocument(string documentId)
|
||||||
{
|
{
|
||||||
if (firstRender)
|
// shoe order/activity document
|
||||||
{
|
// the supervisor version
|
||||||
JsModule = await JsRuntime
|
Navigator.NavigateTo($"/supervisor/advisors/{UserId}/reports/{ReportDate}/activities/{documentId}");
|
||||||
.InvokeAsync<IJSObjectReference>("import", "/scripts/print-invoke.js");
|
}
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// private void Print(PrintTarget target)
|
|
||||||
// {
|
|
||||||
// _returnUrl = new Uri(Navigator.Uri).AbsolutePath;
|
|
||||||
// switch (target)
|
|
||||||
// {
|
|
||||||
// case PrintTarget.OrderPage:
|
|
||||||
// Navigator.NavigateTo($"/report/print/orders/{CountryCode}/{UserId}/{ReportDate}?returnUrl={_returnUrl}");
|
|
||||||
// break;
|
|
||||||
// case PrintTarget.FrontPage:
|
|
||||||
// Navigator.NavigateTo($"/report/print/summary/{CountryCode}/{UserId}/{ReportDate}?returnUrl={_returnUrl}");
|
|
||||||
// break;
|
|
||||||
// case PrintTarget.None:
|
|
||||||
// break;
|
|
||||||
// case PrintTarget.All:
|
|
||||||
// break;
|
|
||||||
// default:
|
|
||||||
// throw new ArgumentOutOfRangeException(nameof(target), target, null);
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
//
|
|
||||||
// private async Task Print()
|
|
||||||
// {
|
|
||||||
// var current = 0;
|
|
||||||
// var orders = Report.ReportItems
|
|
||||||
// .Where(x => x is { StatusTypeEnum: "Order", ProcessStatusEnum: "None" } );
|
|
||||||
// var count = orders.Count();
|
|
||||||
// foreach (var item in orders)
|
|
||||||
// {
|
|
||||||
// Toaster.ShowInfo($"Behandler {current++} af {count} ordrer. Vent venligst");
|
|
||||||
// await ProcessRepo.UpdateWarehouseOrderStatus(new OrderProcessState
|
|
||||||
// {
|
|
||||||
// OrderId = item.ActivityId,
|
|
||||||
// ProcessStatusEnum = Utils.EnumToString(ProcessStatus.Printed)
|
|
||||||
// });
|
|
||||||
// }
|
|
||||||
// Toaster.ClearAll();
|
|
||||||
// await JsModule.InvokeVoidAsync("printInvoke");
|
|
||||||
// }
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Work date component event handler
|
/// Work date component event handler
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
@ -170,6 +131,7 @@ public partial class SupervisorAdvisorReportViewPage : IDisposable
|
||||||
Working = false;
|
Working = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private void ProfileServiceOnOnChange(UserPreference userPreference)
|
private void ProfileServiceOnOnChange(UserPreference userPreference)
|
||||||
{
|
{
|
||||||
Logger.LogDebug("OfficeReportViewPage => ProfileServiceOnOnChange");
|
Logger.LogDebug("OfficeReportViewPage => ProfileServiceOnOnChange");
|
||||||
|
@ -180,6 +142,7 @@ public partial class SupervisorAdvisorReportViewPage : IDisposable
|
||||||
StateHasChanged();
|
StateHasChanged();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public void Dispose()
|
public void Dispose()
|
||||||
{
|
{
|
||||||
Interceptor.DisposeEvent();
|
Interceptor.DisposeEvent();
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
Rapport Arkiv - @AdvisorInfo.FirstName @AdvisorInfo.LastName
|
Rapport Arkiv - @AdvisorInfo.FirstName @AdvisorInfo.LastName
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<OfficeReportListComponent OnShowReport="ShowThisReport" CountryCode="@AdvisorInfo.CountryCode" UserId="@UserId" ReportList="@ActivityReports" />
|
<ReportListComponent OnShowReport="ShowReport" ReportList="@ActivityReports" />
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@if (Working)
|
@if (Working)
|
||||||
|
|
|
@ -16,9 +16,11 @@ public partial class SupervisorAdvisorViewPage : IDisposable
|
||||||
[Inject] public NavigationManager Navigator { get; set; }
|
[Inject] public NavigationManager Navigator { get; set; }
|
||||||
[Inject] public ILogger<SupervisorAdvisorViewPage> Logger { get; set; }
|
[Inject] public ILogger<SupervisorAdvisorViewPage> Logger { get; set; }
|
||||||
|
|
||||||
|
|
||||||
// #############################################################
|
// #############################################################
|
||||||
[Parameter] public string UserId { get; set; } = "";
|
[Parameter] public string UserId { get; set; } = "";
|
||||||
|
|
||||||
|
|
||||||
// #############################################################
|
// #############################################################
|
||||||
private UserAdvisorInfoView AdvisorInfo { get; set; } = new();
|
private UserAdvisorInfoView AdvisorInfo { get; set; } = new();
|
||||||
private List<SalesReportListView> ActivityReports { get; set; } = new();
|
private List<SalesReportListView> ActivityReports { get; set; } = new();
|
||||||
|
@ -42,17 +44,19 @@ public partial class SupervisorAdvisorViewPage : IDisposable
|
||||||
ActivityReports = reports.OrderByDescending(x => x.ReportDate).ToList();
|
ActivityReports = reports.OrderByDescending(x => x.ReportDate).ToList();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
protected override void OnInitialized()
|
protected override void OnInitialized()
|
||||||
{
|
{
|
||||||
Working = false;
|
Working = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void ShowThisReport(string reportDate)
|
|
||||||
|
private void ShowReport(string reportDate)
|
||||||
{
|
{
|
||||||
var uri = new Uri(Navigator.Uri);
|
var uri = new Uri(Navigator.Uri);
|
||||||
var url = uri.AbsoluteUri;
|
var url = uri.AbsoluteUri;
|
||||||
Logger.LogDebug("ShowThisReport\n => {}\n =>{}", reportDate, url);
|
Logger.LogDebug("ShowReport\n => {}\n =>{}", reportDate, url);
|
||||||
Logger.LogDebug("ShowThisReport => NavigateTo => {}",$"{url}/report/{reportDate}");
|
Logger.LogDebug("ShowReport => NavigateTo => {}",$"{url}/reports/{reportDate}");
|
||||||
Navigator.NavigateTo($"{url}/reports/{reportDate}");
|
Navigator.NavigateTo($"{url}/reports/{reportDate}");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -16,8 +16,8 @@
|
||||||
|
|
||||||
@using Microsoft.AspNetCore.Authorization
|
@using Microsoft.AspNetCore.Authorization
|
||||||
@using Wonky.Client.Components
|
@using Wonky.Client.Components
|
||||||
@attribute [Authorize(Roles = "Admin,Office,Warehouse")]
|
@attribute [Authorize(Roles = "Supervisor")]
|
||||||
@page "/supervisor/advisors/{UserId}/reports/{ReportDate}/{ActivityId}"
|
@page "/supervisor/advisors/{UserId}/reports/{ReportDate}/activities/{DocumentId}"
|
||||||
<PageTitle>@ReportItem.ESalesNumber - @ReportItem.Company.Name</PageTitle>
|
<PageTitle>@ReportItem.ESalesNumber - @ReportItem.Company.Name</PageTitle>
|
||||||
<table class="table table-sm table-striped d-print-table">
|
<table class="table table-sm table-striped d-print-table">
|
||||||
<thead>
|
<thead>
|
||||||
|
@ -136,13 +136,13 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
<div class="card-title">
|
<div class="card-title fw-bold h5">
|
||||||
Kontor
|
Kontor
|
||||||
</div>
|
</div>
|
||||||
@ReportItem.OfficeNote
|
@ReportItem.OfficeNote
|
||||||
</div>
|
</div>
|
||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
<div class="card-title">
|
<div class="card-title fw-bold h5">
|
||||||
Kundekort
|
Kundekort
|
||||||
</div>
|
</div>
|
||||||
@ReportItem.CrmNote
|
@ReportItem.CrmNote
|
||||||
|
|
|
@ -40,10 +40,13 @@ public partial class SupervisorVisitViewPage : IDisposable
|
||||||
[Inject] public IToastService Toast { get; set; }
|
[Inject] public IToastService Toast { get; set; }
|
||||||
[Inject] public IUserInfoService UserInfoService { get; set; }
|
[Inject] public IUserInfoService UserInfoService { get; set; }
|
||||||
|
|
||||||
|
|
||||||
// #############################################################
|
// #############################################################
|
||||||
[Parameter] public string CompanyId { get; set; } = "";
|
[Parameter] public string UserId { get; set; } = "";
|
||||||
[Parameter] public string OrderId { get; set; } = "";
|
[Parameter] public string DocumentId { get; set; } = "";
|
||||||
|
[Parameter] public string ReportDate { get; set; } = "";
|
||||||
|
|
||||||
|
|
||||||
// #############################################################
|
// #############################################################
|
||||||
private ReportItemView ReportItem { get; set; } = new();
|
private ReportItemView ReportItem { get; set; } = new();
|
||||||
private bool IsNotified { get; set; }
|
private bool IsNotified { get; set; }
|
||||||
|
@ -59,7 +62,7 @@ public partial class SupervisorVisitViewPage : IDisposable
|
||||||
Interceptor.RegisterEvent();
|
Interceptor.RegisterEvent();
|
||||||
Interceptor.RegisterBeforeSendEvent();
|
Interceptor.RegisterBeforeSendEvent();
|
||||||
// fetch order from backend
|
// fetch order from backend
|
||||||
ReportItem = await AdvisorActivityRepo.GetReportItem(OrderId);
|
ReportItem = await AdvisorActivityRepo.GetReportItem(DocumentId);
|
||||||
Logger.LogDebug("ReportItem => \n {}", JsonSerializer.Serialize(ReportItem, _options));
|
Logger.LogDebug("ReportItem => \n {}", JsonSerializer.Serialize(ReportItem, _options));
|
||||||
Working = false;
|
Working = false;
|
||||||
}
|
}
|
||||||
|
|
|
@ -120,7 +120,7 @@
|
||||||
<AuthorizeView Roles="Admin">
|
<AuthorizeView Roles="Admin">
|
||||||
<div class="nav-item px-3">
|
<div class="nav-item px-3">
|
||||||
<NavLink class="nav-link ps-2" href="/system">
|
<NavLink class="nav-link ps-2" href="/system">
|
||||||
<i class="bi-gear-wide-connected pe-2" style="font-size:1.3em;" aria-hidden="true"></i> System
|
<i class="bi-gear-wide-connected pe-2" style="font-size:1.3em;" aria-hidden="true"></i> System Vedligehold
|
||||||
</NavLink>
|
</NavLink>
|
||||||
</div>
|
</div>
|
||||||
</AuthorizeView>
|
</AuthorizeView>
|
||||||
|
|
|
@ -1,15 +1,15 @@
|
||||||
{
|
{
|
||||||
"appInfo": {
|
"appInfo": {
|
||||||
"name": "Wonky Online",
|
"name": "Wonky Online",
|
||||||
"version": "0.126.0",
|
"version": "0.126.2",
|
||||||
"rc": true,
|
"rc": true,
|
||||||
"sandBox": false,
|
"sandBox": false,
|
||||||
"image": "grumpy-coder.png"
|
"image": "grumpy-coder.png"
|
||||||
},
|
},
|
||||||
"Logging": {
|
"Logging": {
|
||||||
"LogLevel": {
|
"LogLevel": {
|
||||||
"Default": "Debug",
|
"Default": "Information",
|
||||||
"System": "Debug",
|
"System": "Information",
|
||||||
"Microsoft": "Information"
|
"Microsoft": "Information"
|
||||||
},
|
},
|
||||||
"Debug": {
|
"Debug": {
|
||||||
|
@ -19,7 +19,7 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"apiConfig": {
|
"apiConfig": {
|
||||||
"baseUrl": "https://dev.innotec.dk",
|
"baseUrl": "https://zeta.innotec.dk",
|
||||||
"catalog": "api/v2/catalog/country",
|
"catalog": "api/v2/catalog/country",
|
||||||
"crmCustomers": "api/v2/crm/companies",
|
"crmCustomers": "api/v2/crm/companies",
|
||||||
"crmInventoryExt": "history/inventory",
|
"crmInventoryExt": "history/inventory",
|
||||||
|
|
Loading…
Reference in a new issue