diff --git a/Wonky.Client/Components/ActivityListComponent.razor b/Wonky.Client/Components/ActivityListComponent.razor
index de447b4c..7575c12f 100644
--- a/Wonky.Client/Components/ActivityListComponent.razor
+++ b/Wonky.Client/Components/ActivityListComponent.razor
@@ -15,7 +15,7 @@
@using Wonky.Entity.Views
@* Report activities *@
-
+
Kunde |
@@ -34,7 +34,7 @@
@foreach (var activity in Activities)
{
-
+
OpenDocument(activity.Company.CompanyId, activity.ActivityId, activity.ProcessStatusEnum)">
@activity.Company.Name |
@activity.Company.City |
@activity.Demo |
diff --git a/Wonky.Client/Components/ActivityListComponent.razor.cs b/Wonky.Client/Components/ActivityListComponent.razor.cs
index 19523d1d..2e260a49 100644
--- a/Wonky.Client/Components/ActivityListComponent.razor.cs
+++ b/Wonky.Client/Components/ActivityListComponent.razor.cs
@@ -15,13 +15,33 @@
using Microsoft.AspNetCore.Components;
using Wonky.Entity.Views;
+#pragma warning disable CS8618
namespace Wonky.Client.Components;
public partial class ActivityListComponent
{
+ [Inject] public NavigationManager Navigator { get; set; }
[Parameter] public List 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;
+ }
+ }
}
\ No newline at end of file
diff --git a/Wonky.Client/Pages/AdvisorActivityTodayListPage.razor b/Wonky.Client/Pages/AdvisorActivityTodayListPage.razor
index 0e68fb8c..fb656edd 100644
--- a/Wonky.Client/Pages/AdvisorActivityTodayListPage.razor
+++ b/Wonky.Client/Pages/AdvisorActivityTodayListPage.razor
@@ -39,7 +39,7 @@
@if (ReportStatusView.ReportItems.Any())
{
-
+
}
@if (Working)
{
diff --git a/Wonky.Client/Pages/AdvisorCustomerActivityListPage.razor b/Wonky.Client/Pages/AdvisorCustomerActivityListPage.razor
index 87cc8df6..029d5013 100644
--- a/Wonky.Client/Pages/AdvisorCustomerActivityListPage.razor
+++ b/Wonky.Client/Pages/AdvisorCustomerActivityListPage.razor
@@ -35,7 +35,7 @@
-
+
}
@if (Working)
{
diff --git a/Wonky.Client/Pages/AdvisorActivityViewEditPage.razor b/Wonky.Client/Pages/AdvisorCustomerActivityViewEditPage.razor
similarity index 100%
rename from Wonky.Client/Pages/AdvisorActivityViewEditPage.razor
rename to Wonky.Client/Pages/AdvisorCustomerActivityViewEditPage.razor
diff --git a/Wonky.Client/Pages/AdvisorActivityViewEditPage.razor.cs b/Wonky.Client/Pages/AdvisorCustomerActivityViewEditPage.razor.cs
similarity index 89%
rename from Wonky.Client/Pages/AdvisorActivityViewEditPage.razor.cs
rename to Wonky.Client/Pages/AdvisorCustomerActivityViewEditPage.razor.cs
index a2da8d68..c34f7fa2 100644
--- a/Wonky.Client/Pages/AdvisorActivityViewEditPage.razor.cs
+++ b/Wonky.Client/Pages/AdvisorCustomerActivityViewEditPage.razor.cs
@@ -26,15 +26,18 @@ using Wonky.Entity.Views;
namespace Wonky.Client.Pages;
-public partial class AdvisorActivityViewEditPage : IDisposable
+public partial class AdvisorCustomerActivityViewEditPage : 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 Logger { get; set; }
+ [Inject] public ILogger Logger { get; set; }
[Inject] public IToastService Toaster { get; set; }
[Inject] public NavigationManager Navigator { get; set; }
+ // ##############################################################
private ReportItemView ReportItem { get; set; } = new();
private ActivityOfficeNote Note { get; set; } = new();
private EditContext NoteContext { get; set; }
diff --git a/Wonky.Client/Pages/AdvisorReportCreatePage.razor b/Wonky.Client/Pages/AdvisorReportCreatePage.razor
index f7c7c70c..f661f80a 100644
--- a/Wonky.Client/Pages/AdvisorReportCreatePage.razor
+++ b/Wonky.Client/Pages/AdvisorReportCreatePage.razor
@@ -185,7 +185,7 @@
@if (_activities.Any())
{
}
}
diff --git a/Wonky.Client/Pages/AdvisorReportViewPage.razor b/Wonky.Client/Pages/AdvisorReportViewPage.razor
index e64c24db..ea0eafc4 100644
--- a/Wonky.Client/Pages/AdvisorReportViewPage.razor
+++ b/Wonky.Client/Pages/AdvisorReportViewPage.razor
@@ -51,7 +51,7 @@
-
+
}
else
diff --git a/Wonky.Client/Pages/AdvisorReportViewPage.razor.cs b/Wonky.Client/Pages/AdvisorReportViewPage.razor.cs
index 70a9bf1d..b0a36b39 100644
--- a/Wonky.Client/Pages/AdvisorReportViewPage.razor.cs
+++ b/Wonky.Client/Pages/AdvisorReportViewPage.razor.cs
@@ -30,7 +30,7 @@ namespace Wonky.Client.Pages;
public partial class AdvisorReportViewPage : IDisposable
{
- [Parameter] public string ReportDate { get; set; }
+ // ##############################################################
[Inject] public IAdvisorSalesReportRepository AdvisorSalesReportRepo { get; set; }
[Inject] public NavigationManager Navigator { get; set; }
[Inject] public ILocalStorageService Storage { get; set; }
@@ -38,7 +38,9 @@ public partial class AdvisorReportViewPage : IDisposable
[Inject] public ILogger Logger { get; set; }
[Inject] public UserPreferenceService PreferenceService { get; set; }
[Inject] public IUserInfoService UserInfoService { get; set; }
-
+ // ##############################################################
+ [Parameter] public string ReportDate { get; set; }
+ // ##############################################################
private UserPreference Profiles { get; set; } = new();
private ReportView Report { get; set; } = new();
private List Activities { get; set; } = new ();
diff --git a/Wonky.Client/wwwroot/appsettings.json b/Wonky.Client/wwwroot/appsettings.json
index 148ce161..159de21b 100644
--- a/Wonky.Client/wwwroot/appsettings.json
+++ b/Wonky.Client/wwwroot/appsettings.json
@@ -1,7 +1,7 @@
{
"appInfo": {
"name": "Wonky Online",
- "version": "283.0",
+ "version": "285.0",
"rc": true,
"sandBox": true,
"image": "grumpy-coder.png",