wip
This commit is contained in:
parent
b54f89e727
commit
4e9c811868
10 changed files with 11 additions and 12 deletions
|
@ -38,8 +38,4 @@
|
||||||
}
|
}
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
<AppSpinner/>
|
|
||||||
}
|
}
|
|
@ -22,7 +22,7 @@ using Wonky.Client.Services;
|
||||||
|
|
||||||
namespace Wonky.Client.Components;
|
namespace Wonky.Client.Components;
|
||||||
|
|
||||||
public partial class CompanySearchComponent : IDisposable
|
public partial class CompanySearchColumnComponent : IDisposable
|
||||||
{
|
{
|
||||||
[Inject] private ILocalStorageService LocalStorage { get; set; }
|
[Inject] private ILocalStorageService LocalStorage { get; set; }
|
||||||
[Inject] private UserPreferenceService UserPreferenceService { get; set; }
|
[Inject] private UserPreferenceService UserPreferenceService { get; set; }
|
|
@ -19,7 +19,7 @@ using Timer = System.Timers.Timer;
|
||||||
|
|
||||||
namespace Wonky.Client.Components
|
namespace Wonky.Client.Components
|
||||||
{
|
{
|
||||||
public partial class SearchPhrase
|
public partial class SearchPhraseComponent
|
||||||
{
|
{
|
||||||
private Timer _timer = new();
|
private Timer _timer = new();
|
||||||
private string SearchTerm { get; set; } = "";
|
private string SearchTerm { get; set; } = "";
|
|
@ -138,7 +138,7 @@
|
||||||
<ItemSearchComponent OnChanged="SetSearchCol"/>
|
<ItemSearchComponent OnChanged="SetSearchCol"/>
|
||||||
</div>
|
</div>
|
||||||
<div class="col">
|
<div class="col">
|
||||||
<SearchPhrase OnChanged="SetSearchPhrase"/>
|
<SearchPhraseComponent OnChanged="SetSearchPhrase"/>
|
||||||
</div>
|
</div>
|
||||||
<div class="col">
|
<div class="col">
|
||||||
<ItemSortComponent OnChanged="SetSortCol"/>
|
<ItemSortComponent OnChanged="SetSortCol"/>
|
||||||
|
|
|
@ -24,10 +24,10 @@
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<div class="row mb-3">
|
<div class="row mb-3">
|
||||||
<div class="col-md-3">
|
<div class="col-md-3">
|
||||||
<CompanySearchComponent OnChanged="SetSearchCol"/>
|
<CompanySearchColumnComponent OnChanged="SetSearchCol"/>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-3">
|
<div class="col-md-3">
|
||||||
<SearchPhrase SavedSearch="@_savedSearch" OnChanged="SetSearchPhrase"/>
|
<SearchPhraseComponent SavedSearch="@_savedSearch" OnChanged="SetSearchPhrase"/>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-3">
|
<div class="col-md-3">
|
||||||
<CompanySortComponent OnChanged="SetSortCol"/>
|
<CompanySortComponent OnChanged="SetSortCol"/>
|
||||||
|
|
|
@ -46,9 +46,11 @@ namespace Wonky.Client.Pages
|
||||||
_paging.SearchColumn = _preferences.CompanySearch;
|
_paging.SearchColumn = _preferences.CompanySearch;
|
||||||
_paging.PageSize = Convert.ToInt32(_preferences.PageSize);
|
_paging.PageSize = Convert.ToInt32(_preferences.PageSize);
|
||||||
|
|
||||||
|
// load saved search
|
||||||
_savedSearch = string.IsNullOrWhiteSpace(_preferences.CompanyFilterPhrase)
|
_savedSearch = string.IsNullOrWhiteSpace(_preferences.CompanyFilterPhrase)
|
||||||
? "" : _preferences.CompanyFilterPhrase;
|
? "" : _preferences.CompanyFilterPhrase;
|
||||||
_paging.SearchTerm = _savedSearch;
|
if(!string.IsNullOrWhiteSpace(_savedSearch))
|
||||||
|
_paging.SearchTerm = _savedSearch;
|
||||||
|
|
||||||
Interceptor.RegisterEvent();
|
Interceptor.RegisterEvent();
|
||||||
Interceptor.RegisterBeforeSendEvent();
|
Interceptor.RegisterBeforeSendEvent();
|
||||||
|
@ -82,6 +84,7 @@ namespace Wonky.Client.Pages
|
||||||
{
|
{
|
||||||
if(string.IsNullOrWhiteSpace(searchTerm))
|
if(string.IsNullOrWhiteSpace(searchTerm))
|
||||||
await UserPrefService.SetCompanyFilterPhrase("");
|
await UserPrefService.SetCompanyFilterPhrase("");
|
||||||
|
|
||||||
Companies = new List<CompanyDto>();
|
Companies = new List<CompanyDto>();
|
||||||
_paging.PageNumber = 1;
|
_paging.PageNumber = 1;
|
||||||
_paging.SearchTerm = searchTerm;
|
_paging.SearchTerm = searchTerm;
|
||||||
|
|
|
@ -29,7 +29,7 @@
|
||||||
<ItemSearchComponent OnChanged="SetSearchCol"/>
|
<ItemSearchComponent OnChanged="SetSearchCol"/>
|
||||||
</div>
|
</div>
|
||||||
<div class="col">
|
<div class="col">
|
||||||
<SearchPhrase OnChanged="SetSearchPhrase"/>
|
<SearchPhraseCompanonent OnChanged="SetSearchPhrase"/>
|
||||||
</div>
|
</div>
|
||||||
<div class="col">
|
<div class="col">
|
||||||
<ItemSortComponent OnChanged="SetSortCol"/>
|
<ItemSortComponent OnChanged="SetSortCol"/>
|
||||||
|
|
|
@ -4,11 +4,11 @@ namespace Wonky.Client.Services;
|
||||||
|
|
||||||
public record Preferences
|
public record Preferences
|
||||||
{
|
{
|
||||||
|
public string? CompanyFilterPhrase { get; set; } = "";
|
||||||
public string? CompanySearch { get; set; } = "name";
|
public string? CompanySearch { get; set; } = "name";
|
||||||
public string? CompanySort { get; set; } = "name";
|
public string? CompanySort { get; set; } = "name";
|
||||||
public string? ItemSearch { get; set; } = "name";
|
public string? ItemSearch { get; set; } = "name";
|
||||||
public string? ItemSort { get; set; } = "name";
|
public string? ItemSort { get; set; } = "name";
|
||||||
public string? CompanyFilterPhrase { get; set; } = "";
|
|
||||||
public string PageSize { get; set; } = "10";
|
public string PageSize { get; set; } = "10";
|
||||||
public string WorkDate { get; set; } = "";
|
public string WorkDate { get; set; } = "";
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue