From 799354b37b777ec927a923385dca88c9ce5bdfd9 Mon Sep 17 00:00:00 2001 From: Frede Hundewadt <22748698+fhdk@users.noreply.github.com> Date: Tue, 22 Mar 2022 13:28:46 +0100 Subject: [PATCH] wip --- .../Components/CompanySearchDropdown.razor.cs | 8 +- .../Components/CompanySortDropdown.razor.cs | 6 +- .../Components/ItemGroupDropdown.razor.cs | 2 +- .../Components/ItemSearchDropdown.razor.cs | 2 +- .../Components/ItemSortDropdown.razor.cs | 2 +- .../Components/PageSizeDropdown.razor.cs | 2 +- Wonky.Client/Components/SearchPhrase.razor.cs | 2 +- Wonky.Client/Pages/CompanyCreate.razor | 203 ++++++++++-------- Wonky.Client/Pages/CompanyCreate.razor.cs | 23 +- Wonky.Client/Pages/CompanyList.razor.cs | 20 +- Wonky.Client/Pages/CompanyUpdate.razor.cs | 2 +- Wonky.Client/Pages/CompanyView.razor | 2 +- 12 files changed, 146 insertions(+), 128 deletions(-) diff --git a/Wonky.Client/Components/CompanySearchDropdown.razor.cs b/Wonky.Client/Components/CompanySearchDropdown.razor.cs index 3bbd8a9e..252ff5dd 100644 --- a/Wonky.Client/Components/CompanySearchDropdown.razor.cs +++ b/Wonky.Client/Components/CompanySearchDropdown.razor.cs @@ -28,8 +28,8 @@ public partial class CompanySearchDropdown : IDisposable [Inject] private UserPreferenceService UserPreferenceService { get; set; } [Parameter] public EventCallback OnChanged { get; set; } private Dictionary Items { get; set; } = new(); - private Preferences _preferences = new(); - private string? Selection { get; set; } + private Preferences _preferences = new(); + private string Selection { get; set; } = "name"; protected override async Task OnInitializedAsync() { UserPreferenceService.OnChange += ProfileServiceOnOnChange; @@ -39,9 +39,7 @@ public partial class CompanySearchDropdown : IDisposable private async Task OnSelectionChanged(ChangeEventArgs e) { var val = e.Value.ToString(); - if (val == "-1") - { - val = "name"; }; + if (val == "-1") return; await OnChanged.InvokeAsync(val); await UserPreferenceService.SetCompanySearch(val); } diff --git a/Wonky.Client/Components/CompanySortDropdown.razor.cs b/Wonky.Client/Components/CompanySortDropdown.razor.cs index 1d7e6c75..a91621db 100644 --- a/Wonky.Client/Components/CompanySortDropdown.razor.cs +++ b/Wonky.Client/Components/CompanySortDropdown.razor.cs @@ -27,8 +27,8 @@ namespace Wonky.Client.Components [Inject] private UserPreferenceService UserPreferenceService { get; set; } [Parameter] public EventCallback OnChanged { get; set; } private Dictionary Items { get; set; } = new(); - private Preferences _preferences = new(); - private string? Selection { get; set; } + private Preferences _preferences = new(); + private string Selection { get; set; } = "name"; protected override async Task OnInitializedAsync() { UserPreferenceService.OnChange += ProfileServiceOnOnChange; @@ -38,7 +38,7 @@ namespace Wonky.Client.Components private async Task OnSelectionChanged(ChangeEventArgs e) { var val = e.Value.ToString(); - if (val == "-1") {val = "name";}; + if (val == "-1") return; await OnChanged.InvokeAsync(val); await UserPreferenceService.SetCompanySort(val); } diff --git a/Wonky.Client/Components/ItemGroupDropdown.razor.cs b/Wonky.Client/Components/ItemGroupDropdown.razor.cs index 9e72a588..f9069ada 100644 --- a/Wonky.Client/Components/ItemGroupDropdown.razor.cs +++ b/Wonky.Client/Components/ItemGroupDropdown.razor.cs @@ -31,7 +31,7 @@ public partial class ItemGroupDropdown private async Task OnSelectionChanged(ChangeEventArgs e) { var val = e.Value.ToString(); - if (val == "-1") {val = "0";}; + if (val == "-1") return; await OnChanged.InvokeAsync(val); } } \ No newline at end of file diff --git a/Wonky.Client/Components/ItemSearchDropdown.razor.cs b/Wonky.Client/Components/ItemSearchDropdown.razor.cs index f7792dc0..91e1a168 100644 --- a/Wonky.Client/Components/ItemSearchDropdown.razor.cs +++ b/Wonky.Client/Components/ItemSearchDropdown.razor.cs @@ -36,7 +36,7 @@ public partial class ItemSearchDropdown : IDisposable private async Task OnSelectChanged(ChangeEventArgs e) { var val = e.Value.ToString(); - if (val == "-1") {val = "name";}; + if (val == "-1") return; await OnChanged.InvokeAsync(val); await UserPreferenceService.SetItemSearch(val); } diff --git a/Wonky.Client/Components/ItemSortDropdown.razor.cs b/Wonky.Client/Components/ItemSortDropdown.razor.cs index 86c4518b..7095ca01 100644 --- a/Wonky.Client/Components/ItemSortDropdown.razor.cs +++ b/Wonky.Client/Components/ItemSortDropdown.razor.cs @@ -36,7 +36,7 @@ public partial class ItemSortDropdown : IDisposable private async Task OnSelectChanged(ChangeEventArgs e) { var val = e.Value.ToString(); - if (val == "-1") {val = "name";}; + if (val == "-1") return; await OnChanged.InvokeAsync(val); await UserPreferenceService.SetItemSort(val); } diff --git a/Wonky.Client/Components/PageSizeDropdown.razor.cs b/Wonky.Client/Components/PageSizeDropdown.razor.cs index 347c29ba..8001c2d5 100644 --- a/Wonky.Client/Components/PageSizeDropdown.razor.cs +++ b/Wonky.Client/Components/PageSizeDropdown.razor.cs @@ -38,7 +38,7 @@ namespace Wonky.Client.Components private async Task OnSelectChanged(ChangeEventArgs e) { var val = e.Value.ToString(); - if (val == "-1") {val = "10";}; + if (val == "-1") return; await OnChanged.InvokeAsync(val); await UserPreferenceService.SetPageSize(val); } diff --git a/Wonky.Client/Components/SearchPhrase.razor.cs b/Wonky.Client/Components/SearchPhrase.razor.cs index 174ac397..e8358703 100644 --- a/Wonky.Client/Components/SearchPhrase.razor.cs +++ b/Wonky.Client/Components/SearchPhrase.razor.cs @@ -27,7 +27,7 @@ namespace Wonky.Client.Components private void SearchChanged() { - _timer = new Timer(1000); + _timer = new Timer(500); _timer.Elapsed += OnTimerElapsed; _timer.AutoReset = false; _timer.Enabled = true; diff --git a/Wonky.Client/Pages/CompanyCreate.razor b/Wonky.Client/Pages/CompanyCreate.razor index 5bf420a9..7d1814cc 100644 --- a/Wonky.Client/Pages/CompanyCreate.razor +++ b/Wonky.Client/Pages/CompanyCreate.razor @@ -21,103 +21,123 @@ @attribute [Authorize(Roles = "Adviser")]

Opret firma

-
-
- +
+
+ CVR data
-
-
-
- - @if (VInfos.Any()) +
+ +
+
+ +
+ @if (VInfos.Any()) + { +
+ @foreach (var info in VInfos) { - @foreach (var info in VInfos) - { -
-
- @info.VatNumber -
-
- @info.Name -
-
- @info.States[^1].State -
-
- -
-
- } +
+
+ @info.VatNumber +
+
+ @info.Name +
+
+ @info.States[^1].State +
+
+ +
+
} -
+
+ }
- - +
+ -
- -
- - -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- - -
-
-
- -
- - -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Reg.nr. + +
Firmanavn + + +
Adresse + +
Adresse2 + +
Postnr + + +
Bynavn + + +
Telefon + +
Mobil + +
Email + +
Attention + +
@@ -125,3 +145,4 @@
+
diff --git a/Wonky.Client/Pages/CompanyCreate.razor.cs b/Wonky.Client/Pages/CompanyCreate.razor.cs index 38579d93..2938cd82 100644 --- a/Wonky.Client/Pages/CompanyCreate.razor.cs +++ b/Wonky.Client/Pages/CompanyCreate.razor.cs @@ -34,10 +34,6 @@ namespace Wonky.Client.Pages { public partial class CompanyCreate : IDisposable { - private CompanyDto _companyDto = new(); - private VirkRegInfo _virkRegInfo = new(); - private EditContext _editContext; - private bool _formInvalid = true; private List VInfos { get; set; } = new(); [Inject] public ICompanyHttpRepository CompanyRepo { get; set; } [Inject] public HttpInterceptorService Interceptor { get; set; } @@ -46,6 +42,11 @@ namespace Wonky.Client.Pages [Inject] public VirkRegistryService VirkRegistryService { get; set; } [Inject] public ILocalStorageService StorageService { get; set; } [Inject] public NavigationManager Navigation { get; set; } + private CompanyDto _companyDto = new(); + private VirkRegInfo _virkRegInfo = new(); + private EditContext _editContext; + private bool _formInvalid = true; + private string RegState { get; set; } = ""; protected override async Task OnInitializedAsync() { @@ -75,27 +76,21 @@ namespace Wonky.Client.Pages } private async Task GetInfoFromVat(string vatNumber) { - var result = await VirkRegistryService + VInfos = await VirkRegistryService .QueryVirkRegistry(new VirkParams {VatNumber = vatNumber}); - if (!result.Any()) + if (!VInfos.Any()) { ToastService.ShowError($"Firma med CVR '{vatNumber}' findes ikke."); return; } ToastService.ShowSuccess($"Data for '{vatNumber}' er hentet."); - _virkRegInfo = result[0]; - _companyDto.Name = _virkRegInfo.Name; - _companyDto.Address1 = _virkRegInfo.CoName; - _companyDto.Address2 = _virkRegInfo.Address; - _companyDto.ZipCode = _virkRegInfo.ZipCode; - _companyDto.City = _virkRegInfo.City; - _companyDto.VatNumber = _virkRegInfo.VatNumber; + SelectCompany(vatNumber); } - private void SelectCompany(string vatNumber) { _virkRegInfo = (from x in VInfos where x.VatNumber == vatNumber select x).First(); + RegState = _virkRegInfo.States[^1].State == "NORMAL" ? "the-good" : "the-ugly"; _companyDto.Name = _virkRegInfo.Name; _companyDto.Address1 = _virkRegInfo.CoName; _companyDto.Address2 = _virkRegInfo.Address; diff --git a/Wonky.Client/Pages/CompanyList.razor.cs b/Wonky.Client/Pages/CompanyList.razor.cs index 8f941d0a..e660510b 100644 --- a/Wonky.Client/Pages/CompanyList.razor.cs +++ b/Wonky.Client/Pages/CompanyList.razor.cs @@ -39,13 +39,16 @@ namespace Wonky.Client.Pages protected override async Task OnInitializedAsync() { + // set preferences _preferences = await UserPrefService.GetPreferences(); _paging.OrderBy = _preferences.CompanySort; _paging.SearchColumn = _preferences.CompanySearch; _paging.PageSize = Convert.ToInt32(_preferences.PageSize); + // Interceptor.RegisterEvent(); Interceptor.RegisterBeforeSendEvent(); + // get companies await GetCompanies(); } @@ -54,14 +57,7 @@ namespace Wonky.Client.Pages _paging.PageNumber = page; await GetCompanies(); } - - private async Task GetCompanies() - { - var pagingResponse = await CompanyRepo.GetCompaniesPaged(_paging); - Companies = pagingResponse.Items; - MetaData = pagingResponse.MetaData; - } - + private async Task SetSearchCol(string searchColumn) { _paging.SearchColumn = searchColumn; @@ -95,6 +91,14 @@ namespace Wonky.Client.Pages _paging.PageNumber--; await GetCompanies(); } + + private async Task GetCompanies() + { + var pagingResponse = await CompanyRepo.GetCompaniesPaged(_paging); + Companies = pagingResponse.Items; + MetaData = pagingResponse.MetaData; + } + public void Dispose() => Interceptor.DisposeEvent(); } } diff --git a/Wonky.Client/Pages/CompanyUpdate.razor.cs b/Wonky.Client/Pages/CompanyUpdate.razor.cs index 06ed60f9..2338b648 100644 --- a/Wonky.Client/Pages/CompanyUpdate.razor.cs +++ b/Wonky.Client/Pages/CompanyUpdate.razor.cs @@ -67,7 +67,7 @@ public partial class CompanyUpdate : IDisposable { await CompanyRepo.UpdateCompany(_companyDto); ToastService.ShowSuccess($"Godt så. Firma '{_companyDto!.Name}' er opdateret."); - Navigation.NavigateTo($"/company/account{_companyDto.Account}"); + Navigation.NavigateTo($"/company/account/{_companyDto.Account}"); } } diff --git a/Wonky.Client/Pages/CompanyView.razor b/Wonky.Client/Pages/CompanyView.razor index a3771846..62503c52 100644 --- a/Wonky.Client/Pages/CompanyView.razor +++ b/Wonky.Client/Pages/CompanyView.razor @@ -42,7 +42,7 @@ @CompanyDto.ZipCode - Postnummer + Bynavn @CompanyDto.City