wip
This commit is contained in:
parent
2d58f0c14f
commit
f707dc2d87
19 changed files with 34 additions and 31 deletions
|
@ -44,9 +44,9 @@
|
|||
<td>@user.FullName</td>
|
||||
<td>@user.PhoneNumber</td>
|
||||
<td>@user.Email</td>
|
||||
<td><a class="btn btn-outline-dark" href="/admin/users/Advisors/@user.CountryCode.ToLower()/@user.UserId/reports">Rapporter</a></td>
|
||||
<td><a class="btn btn-outline-dark" href="/admin/users/Advisors/@user.CountryCode.ToLower()/@user.UserId/companies">Kunder</a></td>
|
||||
<td><a class="btn btn-outline-dark" href="/admin/users/Advisors/@user.CountryCode.ToLower()/@user.UserId/view">Rediger</a></td>
|
||||
<td><a class="btn btn-outline-dark" href="/admin/users/advisors/@user.CountryCode.ToLower()/@user.UserId/reports">Rapporter</a></td>
|
||||
<td><a class="btn btn-outline-dark" href="/admin/users/advisors/@user.CountryCode.ToLower()/@user.UserId/companies">Kunder</a></td>
|
||||
<td><a class="btn btn-outline-dark" href="/admin/users/advisors/@user.CountryCode.ToLower()/@user.UserId/view">Rediger</a></td>
|
||||
</tr>
|
||||
}
|
||||
</tbody>
|
||||
|
|
|
@ -41,7 +41,7 @@
|
|||
</div>
|
||||
@foreach (var report in ReportList)
|
||||
{
|
||||
<a class="list-group-item list-group-item-action" href="/admin/users/Advisors/@CountryCode/@UserId/reports/@report.ReportDate">
|
||||
<a class="list-group-item list-group-item-action" href="/admin/users/advisors/@CountryCode/@UserId/reports/@report.ReportDate">
|
||||
<div class="row">
|
||||
<div class="col">
|
||||
@report.ReportDate
|
||||
|
|
|
@ -29,10 +29,10 @@ using Wonky.Entity.Models;
|
|||
using Wonky.Entity.Views;
|
||||
|
||||
namespace Wonky.Client.Components;
|
||||
public partial class Home : IDisposable
|
||||
public partial class AdvisorLandingComponent : IDisposable
|
||||
{
|
||||
[Inject] private UserPreferenceService _preferenceService { get; set; }
|
||||
[Inject] private ILogger<Home> _logger { get; set; }
|
||||
[Inject] private ILogger<AdvisorLandingComponent> _logger { get; set; }
|
||||
[Inject] private HttpInterceptorService _interceptor { get; set; }
|
||||
[Inject] private IToastService _toast { get; set; }
|
||||
[Inject] private ITaskItemHttpRepository _taskItemRepo { get; set; }
|
||||
|
@ -72,8 +72,7 @@ public partial class Home : IDisposable
|
|||
{
|
||||
await _preferenceService.SetWorkDate(DateTime.Now);
|
||||
var item = _taskItems.Find(x => x.TaskItemId == taskItemId);
|
||||
_navigator.NavigateTo($"/companies/{item.ReferenceId}/activities/new");
|
||||
|
||||
_navigator.NavigateTo($"/companies/{item.ReferenceId}/activities/new");
|
||||
}
|
||||
|
||||
private async Task GetTaskItems(string workDate)
|
|
@ -26,7 +26,7 @@ namespace Wonky.Client.Pages;
|
|||
public partial class ActivityTodayListPage
|
||||
{
|
||||
[Inject] private UserPreferenceService _preferenceService { get; set; }
|
||||
[Inject] private ILogger<Home> _logger { get; set; }
|
||||
[Inject] private ILogger<AdvisorLandingComponent> _logger { get; set; }
|
||||
[Inject] private HttpInterceptorService _interceptor { get; set; }
|
||||
[Inject] private NavigationManager _navigator { get; set; }
|
||||
[Inject] private IActivityHttpRepository _activityRepo { get; set; }
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
*@
|
||||
|
||||
@using Wonky.Client.Components
|
||||
@page "/admin/users/Advisors/{CountryCode}/{UserId}/companies"
|
||||
@page "/admin/users/advisors/{CountryCode}/{UserId}/companies"
|
||||
|
||||
<div class="card">
|
||||
<div class="card-header bg-dark text-white">
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
@using Wonky.Client.Components
|
||||
@using Microsoft.AspNetCore.Authorization
|
||||
@attribute [Authorize(Roles = "Admin")]
|
||||
@page "/admin/users/Advisors/{CountryCode}"
|
||||
@page "/admin/users/advisors/{CountryCode}"
|
||||
|
||||
<div class="card">
|
||||
<div class="card-header bg-dark text-white">
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
//
|
||||
*@
|
||||
|
||||
@page "/admin/users/Advisors/{CountryCode}/{UserId}/view"
|
||||
@page "/admin/users/advisors/{CountryCode}/{UserId}/view"
|
||||
@using Microsoft.AspNetCore.Authorization
|
||||
@attribute [Authorize(Roles = "Admin")]
|
||||
|
||||
|
@ -96,10 +96,10 @@
|
|||
<button type="submit" class="btn btn-primary">Gem</button>
|
||||
</div>
|
||||
<div class="col">
|
||||
<a class="btn btn-primary" href="/admin/users/Advisors/@CountryCode">Tilbage</a>
|
||||
<a class="btn btn-primary" href="/admin/users/advisors/@CountryCode">Tilbage</a>
|
||||
</div>
|
||||
<div class="col">
|
||||
<a class="btn btn-primary" href="/admin/users/Advisors/@CountryCode/@UserId/reports">Salg</a>
|
||||
<a class="btn btn-primary" href="/admin/users/advisors/@CountryCode/@UserId/reports">Salg</a>
|
||||
</div>
|
||||
</div>
|
||||
</EditForm>
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
@using Wonky.Client.Components
|
||||
@using Microsoft.AspNetCore.Authorization
|
||||
@attribute [Authorize(Roles = "Admin")]
|
||||
@page "/admin/users/Advisors/{CountryCode}/{UserId}/reports"
|
||||
@page "/admin/users/advisors/{CountryCode}/{UserId}/reports"
|
||||
|
||||
<div class="card">
|
||||
<div class="card-header bg-dark text-white">
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
@using Wonky.Client.Components
|
||||
@using Microsoft.AspNetCore.Authorization
|
||||
@page "/admin/users/Advisors/{CountryCode}/{UserId}/reports/{ReportDate}"
|
||||
@page "/admin/users/advisors/{CountryCode}/{UserId}/reports/{ReportDate}"
|
||||
@attribute [Authorize(Roles = "Admin")]
|
||||
|
||||
<div class="report-page">
|
||||
|
|
|
@ -72,7 +72,7 @@ public partial class AdminReportViewPage : IDisposable
|
|||
{
|
||||
if (workDate != ReportDate)
|
||||
{
|
||||
_navigator.NavigateTo($"/admin/users/Advisors/{CountryCode}/{UserId}/reports/{workDate}");
|
||||
_navigator.NavigateTo($"/admin/users/advisors/{CountryCode}/{UserId}/reports/{workDate}");
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
@ -23,7 +23,10 @@
|
|||
|
||||
@attribute [Authorize(Roles = "Advisor,Admin,Supervisor,Office,Warehouse")]
|
||||
|
||||
<Home></Home>
|
||||
<AuthorizeView Roles="Advisor">
|
||||
<AdvisorLandingComponent />
|
||||
</AuthorizeView>
|
||||
|
||||
|
||||
@code{
|
||||
}
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
@using Microsoft.AspNetCore.Authorization
|
||||
@attribute [Authorize(Roles = "Admin")]
|
||||
@page "/admin/users/Advisors"
|
||||
@page "/admin/users/advisors"
|
||||
|
||||
<div class="card">
|
||||
<div class="card-header bg-dark text-white">
|
||||
|
@ -27,9 +27,9 @@
|
|||
</div>
|
||||
<div class="card-body">
|
||||
<div class="list-group list-group-flush">
|
||||
<a class="list-group-item list-group-item-action" href="/admin/users/Advisors/dk">Danmark</a>
|
||||
<a class="list-group-item list-group-item-action" href="/admin/users/Advisors/no">Norge</a>
|
||||
<a class="list-group-item list-group-item-action" href="/admin/users/Advisors/se">Sverige</a>
|
||||
<a class="list-group-item list-group-item-action" href="/admin/users/advisors/dk">Danmark</a>
|
||||
<a class="list-group-item list-group-item-action" href="/admin/users/advisors/no">Norge</a>
|
||||
<a class="list-group-item list-group-item-action" href="/admin/users/advisors/se">Sverige</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
@ -27,7 +27,7 @@ namespace Wonky.Client.Pages;
|
|||
public partial class TaskItemListPage : IDisposable
|
||||
{
|
||||
[Inject] public UserPreferenceService UserPrefs { get; set; }
|
||||
[Inject] public ILogger<Home> Logger { get; set; }
|
||||
[Inject] public ILogger<AdvisorLandingComponent> Logger { get; set; }
|
||||
[Inject] private HttpInterceptorService _interceptor { get; set; }
|
||||
[Inject] private NavigationManager _navigator { get; set; }
|
||||
[Inject] private ITaskItemHttpRepository _taskItemRepo { get; set; }
|
||||
|
|
|
@ -92,7 +92,7 @@
|
|||
}
|
||||
@if (_order.ProcessStatusEnum.ToLower() == "packed")
|
||||
{
|
||||
<button class="btn btn-lg btn-primary text-nowrap" type="button" @onclick="SetProcessStatusPacked">Sæt status afsendt</button>
|
||||
<button class="btn btn-lg btn-primary text-nowrap" type="button" @onclick="SetProcessStatusShipped">Sæt status afsendt</button>
|
||||
}
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
@ -52,6 +52,7 @@ public partial class WarehouseOrderViewPage : IDisposable
|
|||
ProcessStatusEnum = "shipped"
|
||||
};
|
||||
await _warehouseRepo.UpdateWarehouseOrderStatus(process);
|
||||
_navigator.NavigateTo("/warehouse/orders");
|
||||
}
|
||||
|
||||
public void Dispose()
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
<div class="top-row ps-3 navbar navbar-dark">
|
||||
<div class="container-fluid">
|
||||
<a class="navbar-brand" href="">
|
||||
<a class="navbar-brand" href="/">
|
||||
<TopbarDisplayUser></TopbarDisplayUser>
|
||||
</a>
|
||||
<button title="Navigation menu" class="navbar-toggler" @onclick="ToggleNavMenu">
|
||||
|
@ -56,7 +56,7 @@
|
|||
|
||||
<AuthorizeView Roles="Admin">
|
||||
<div class="nav-item px-3">
|
||||
<NavLink class="nav-link ps-2" href="/admin/users/Advisors">
|
||||
<NavLink class="nav-link ps-2" href="/admin/users/advisors">
|
||||
<span class="oi oi-people" aria-hidden="true"></span> Sælgere
|
||||
</NavLink>
|
||||
</div>
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"appInfo": {
|
||||
"name": "Wonky Client",
|
||||
"version": "0.9.17",
|
||||
"version": "0.9.19",
|
||||
"rc": true,
|
||||
"sandBox": false,
|
||||
"image": "grumpy-coder.png"
|
||||
|
@ -16,14 +16,14 @@
|
|||
"tokenUri": "token",
|
||||
"userInfoUri": "api/auth/userinfo",
|
||||
"catalogUri": "api/v2/crm/catalog",
|
||||
"activityUri": "api/v2/crm/Advisors/sales",
|
||||
"reportUri": "api/v2/crm/Advisors/reports",
|
||||
"taskUri": "api/v2/crm/Advisors/tasks",
|
||||
"activityUri": "api/v2/crm/advisors/sales",
|
||||
"reportUri": "api/v2/crm/advisors/reports",
|
||||
"taskUri": "api/v2/crm/advisors/tasks",
|
||||
"companyUri": "api/v2/crm/companies",
|
||||
"inventoryUri": "history/inventory",
|
||||
"productUri": "history/products",
|
||||
"syncUri": "history/sync",
|
||||
"adminAdvisorUri": "api/v2/admin/users/Advisors",
|
||||
"adminAdvisorUri": "api/v2/admin/users/advisors",
|
||||
"adminUserUri": "api/v2/admin/users/office",
|
||||
"adminPasswdUri": "api/v2/admin/users/passwd",
|
||||
"adminReportUri": "reports",
|
||||
|
|
Loading…
Reference in a new issue