WIP - namespace refactor

This commit is contained in:
Frede Hundewadt 2023-01-16 14:37:20 +01:00
parent 431fef2d4b
commit 7a99f8c6b1
21 changed files with 21 additions and 20 deletions

View file

@ -18,7 +18,7 @@
@if (ActivityList.Any()) @if (ActivityList.Any())
{ {
<table class="table table-bordered d-print-table table-striped"> <table class="table table-sm table-bordered d-print-table table-striped">
<thead> <thead>
<tr class="bg-dark text-white opacity-75 border-bottom"> <tr class="bg-dark text-white opacity-75 border-bottom">
<th scope="col">Kunde</th> <th scope="col">Kunde</th>

View file

@ -17,7 +17,7 @@
@if (ActivityList.Any()) @if (ActivityList.Any())
{ {
<table class="table table-bordered d-print-table table-striped"> <table class="table table-sm table-bordered d-print-table table-striped">
<thead> <thead>
<tr class="bg-dark text-white opacity-75 border-bottom"> <tr class="bg-dark text-white opacity-75 border-bottom">
<th scope="col">Kunde</th> <th scope="col">Kunde</th>

View file

@ -26,9 +26,9 @@ using Wonky.Entity.Views;
namespace Wonky.Client.Pages; namespace Wonky.Client.Pages;
public partial class OfficeCustomerCountryCreateOrderPage : IDisposable public partial class OfficeCustomerCreatePhoneOrderPage : IDisposable
{ {
[Inject] public ILogger<OfficeCustomerCountryCreateOrderPage> Logger { get; set; } [Inject] public ILogger<OfficeCustomerCreatePhoneOrderPage> Logger { get; set; }
[Inject] public HttpInterceptorService Interceptor { get; set; } [Inject] public HttpInterceptorService Interceptor { get; set; }
[Inject] public ICountryCustomerRepository CustomerRepo { get; set; } [Inject] public ICountryCustomerRepository CustomerRepo { get; set; }
[Inject] public ICountryCustomerHistoryRepository InventoryRepo { get; set; } [Inject] public ICountryCustomerHistoryRepository InventoryRepo { get; set; }

View file

@ -25,7 +25,7 @@
<div class="card-header">Danmark</div> <div class="card-header">Danmark</div>
<div class="card-body"> <div class="card-body">
<div class="list-group list-group-flush"> <div class="list-group list-group-flush">
<AuthorizeView Roles="Admin"> <AuthorizeView Roles="Admin,Office">
<a class="list-group-item list-group-item-action list-group-item-warning" href="/office/users/advisors/dk"> <a class="list-group-item list-group-item-action list-group-item-warning" href="/office/users/advisors/dk">
<i class="bi-activity"></i> Sælgere <i class="bi-activity"></i> Sælgere
</a> </a>
@ -46,7 +46,7 @@
<div class="card-header">Norge</div> <div class="card-header">Norge</div>
<div class="card-body"> <div class="card-body">
<div class="list-group"> <div class="list-group">
<AuthorizeView Roles="Admin"> <AuthorizeView Roles="Admin,Office">
<a class="list-group-item list-group-item-action list-group-item-warning" href="/office/users/advisors/no"> <a class="list-group-item list-group-item-action list-group-item-warning" href="/office/users/advisors/no">
<i class="bi-activity"></i> Sælgere <i class="bi-activity"></i> Sælgere
</a> </a>
@ -67,7 +67,7 @@
<div class="card-header">Sverige</div> <div class="card-header">Sverige</div>
<div class="card-body"> <div class="card-body">
<div class="list-group"> <div class="list-group">
<AuthorizeView Roles="Admin"> <AuthorizeView Roles="Admin,Office">
<a class="list-group-item list-group-item-action list-group-item-warning" href="/office/users/advisors/se"> <a class="list-group-item list-group-item-action list-group-item-warning" href="/office/users/advisors/se">
<i class="bi-activity"></i> Sælgere <i class="bi-activity"></i> Sælgere
</a> </a>

View file

@ -4,7 +4,7 @@ using Wonky.Entity.Views;
namespace Wonky.Client.Pages; namespace Wonky.Client.Pages;
public partial class OfficeCountryLandingPage public partial class OfficeLandingPage
{ {
[Parameter] public string CountryCode { get; set; } = ""; [Parameter] public string CountryCode { get; set; } = "";
} }

View file

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

View file

@ -6,7 +6,7 @@ using Wonky.Entity.Views;
namespace Wonky.Client.Pages; namespace Wonky.Client.Pages;
public partial class OfficeUserAdvisorCountryListPage :IDisposable public partial class OfficeUserAdvisorListPage :IDisposable
{ {
[Inject] public HttpInterceptorService Interceptor { get; set; } [Inject] public HttpInterceptorService Interceptor { get; set; }
[Inject] public ISystemUserRepository SystemUserRepo { get; set; } [Inject] public ISystemUserRepository SystemUserRepo { get; set; }

View file

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

View file

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

View file

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

View file

@ -33,7 +33,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"></ReportItemComponent> <ReportItemComponent ReportItem="@item" />
} }
} }
else else

View file

@ -56,7 +56,6 @@ public partial class ReportPrintOrderPage
private async Task Print() private async Task Print()
{ {
await JsModule.InvokeVoidAsync("printInvoke"); await JsModule.InvokeVoidAsync("printInvoke");
Navigator.NavigateTo(ReturnUrl); Navigator.NavigateTo(ReturnUrl);
} }

View file

@ -29,7 +29,7 @@
</div> </div>
</div> </div>
<div class="report-main d-print-grid"> <div class="report-main d-print-table">
<PageTitle>@Report.ReportData.Name</PageTitle> <PageTitle>@Report.ReportData.Name</PageTitle>
<div class="row"> <div class="row">
<div class="col text-center align-content-center"> <div class="col text-center align-content-center">

View file

@ -1,7 +1,7 @@
{ {
"appInfo": { "appInfo": {
"name": "Wonky Client", "name": "Wonky Client",
"version": "0.97.1", "version": "0.97.2",
"rc": true, "rc": true,
"sandBox": false, "sandBox": false,
"image": "grumpy-coder.png" "image": "grumpy-coder.png"

View file

@ -17,8 +17,9 @@
font-size: 10px; font-size: 10px;
break-before: page; break-before: page;
break-after: page; break-after: page;
break-inside: avoid;
page-break-after: always; page-break-after: always;
height: initial; height: 280mm;
border: initial; border: initial;
border-radius: initial; border-radius: initial;
box-shadow: initial; box-shadow: initial;
@ -45,6 +46,7 @@
} }
.distance-ledger {} .distance-ledger {}
.report-ledger { .report-ledger {
page-break-before: avoid;
page-break-inside: avoid; page-break-inside: avoid;
page-break-after: always; page-break-after: always;
break-after: recto; break-after: recto;