diff --git a/Wonky.Client/AppId.cs b/Wonky.Client/AppId.cs index c8d0ff11..f346bc71 100644 --- a/Wonky.Client/AppId.cs +++ b/Wonky.Client/AppId.cs @@ -2,7 +2,7 @@ namespace Wonky.Client; public class AppId { - public string Version { get; set; } = "0.2.4"; + public string Version { get; set; } = "0.2.6"; public string Name { get; set; } = "Wonky Online"; public bool IsBeta { get; set; } = false; diff --git a/Wonky.Client/Components/CompanyTable.razor b/Wonky.Client/Components/CompanyTable.razor index 524f33bc..1d2cda13 100644 --- a/Wonky.Client/Components/CompanyTable.razor +++ b/Wonky.Client/Components/CompanyTable.razor @@ -22,7 +22,6 @@ @foreach (var company in Companies) {
-
@company.Name
@company.Account
@company.City
diff --git a/Wonky.Client/Pages/CompanyUpdate.razor b/Wonky.Client/Pages/CompanyUpdate.razor index 20fffb11..2c507f88 100644 --- a/Wonky.Client/Pages/CompanyUpdate.razor +++ b/Wonky.Client/Pages/CompanyUpdate.razor @@ -17,96 +17,139 @@ @page "/company/{account}/update" @using Microsoft.AspNetCore.Authorization -@using Wonky.Client.Components @using Microsoft.AspNetCore.Components @attribute [Authorize(Roles = "Adviser")] +@using Wonky.Client.Components @if (_companyDto != null) { -
-
- - -
- -
- - -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- - -
-
-
- -
- - -
-
-
- -
- - -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
- -
-
- -
-
- +
+
+ +
-
-
-
- Tilbage +
+
+ + @if (VInfos.Any()) + { + @foreach (var info in VInfos) + { +
+
+ @info.VatNumber +
+
+ @info.Name +
+
+ @info.States[^1].State +
+
+ +
+
+ } + } +
+
+
+
+ + +
+ +
+ + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ + +
+
+
+ +
+ + +
+
+
+ +
+ + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ + +
+
+ + +
+
+ + +
+
+
+ +
+
+ +
+
+
+
+ Tilbage +
-
} else { diff --git a/Wonky.Client/Pages/CompanyUpdate.razor.cs b/Wonky.Client/Pages/CompanyUpdate.razor.cs index e08927f2..4165c29c 100644 --- a/Wonky.Client/Pages/CompanyUpdate.razor.cs +++ b/Wonky.Client/Pages/CompanyUpdate.razor.cs @@ -14,6 +14,7 @@ // using System; +using System.Globalization; using System.Threading.Tasks; using Blazored.Toast.Services; using Wonky.Client.HttpInterceptors; @@ -21,7 +22,11 @@ using Wonky.Client.HttpRepository; using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components.Forms; using Microsoft.Extensions.Logging; +using Wonky.Client.Models; +using Wonky.Client.Services; using Wonky.Entity.DTO; +using Wonky.Entity.Models; +using Wonky.Entity.Requests; namespace Wonky.Client.Pages; @@ -30,17 +35,23 @@ public partial class CompanyUpdate : IDisposable private CompanyDto _companyDto; private EditContext _editContext; private bool _formInvalid = true; - + private DateTime LastVisit { get; set; } + private DateTime NextVisit { get; set; } + private List VInfos { get; set; } + private VirkRegInfo _virkRegInfo { get; set; } = new(); [Inject] public ICompanyHttpRepository CompanyRepo { get; set; } [Inject] public HttpInterceptorService Interceptor { get; set; } [Inject] public IToastService ToastService { get; set; } [Inject] public ILogger Logger { get; set; } [Inject] public NavigationManager Navigation { get; set; } + [Inject] public VirkRegistryService VirkRegistryService { get; set; } [Parameter] public string Account { get; set; } = null!; protected override async Task OnInitializedAsync() { _companyDto = await CompanyRepo.GetCompanyByAccount(Account); + LastVisit = DateTime.Parse(_companyDto.LastVisit); + NextVisit = DateTime.Parse(_companyDto.NextVisit); _editContext = new EditContext(_companyDto); _editContext.OnFieldChanged += HandleFieldChanged!; Interceptor.RegisterEvent(); @@ -49,10 +60,67 @@ public partial class CompanyUpdate : IDisposable private async Task Update() { + // todo convert date input to ISO string + await CompanyRepo.UpdateCompany(_companyDto); ToastService.ShowSuccess($"Godt så. Firma '{_companyDto!.Name}' er opdateret."); Navigation.NavigateTo($"/company/{_companyDto.CompanyId}"); } + + private async Task GetInfoFromAddress(VatAddress address) + { + VInfos = await VirkRegistryService.QueryVirkRegistry( + new VirkParams + { + StreetName = address.StreetName, + HouseNumber = address.HouseNumber, + ZipCode = address.ZipCode + }); + if (!VInfos.Any()) + { + ToastService.ShowError($"Ingen virksomheder fundet."); + } + } + private async Task GetInfoFromVat(string vatNumber) + { + var result = await VirkRegistryService + .QueryVirkRegistry(new VirkParams {VatNumber = vatNumber}); + + if (!result.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; + } + + private void SelectCompany(string vatNumber) + { + _virkRegInfo = (from x in VInfos where x.VatNumber == vatNumber select x).First(); + _companyDto.Name = _virkRegInfo.Name; + _companyDto.Address1 = _virkRegInfo.CoName; + _companyDto.Address2 = _virkRegInfo.Address; + _companyDto.ZipCode = _virkRegInfo.ZipCode; + _companyDto.City = _virkRegInfo.City; + _companyDto.VatNumber = _virkRegInfo.VatNumber; + } + private void LastVisitChanged(DateTime lastDate) + { + + } + + private void NextVisitChanged(DateTime nextDate) + { + + } + private void HandleFieldChanged(object sender, FieldChangedEventArgs e) { _formInvalid = !_editContext!.Validate(); diff --git a/Wonky.Client/Pages/DraftDocument.razor.cs b/Wonky.Client/Pages/DraftDocument.razor.cs index 38505d51..800122a8 100644 --- a/Wonky.Client/Pages/DraftDocument.razor.cs +++ b/Wonky.Client/Pages/DraftDocument.razor.cs @@ -37,6 +37,7 @@ public partial class DraftDocument : IDisposable } private async Task GetSalesItems() { + _paging.PageSize = 5; var response = await ItemRepo.GetSalesItemsPaged(_paging); SalesItems = response.Items!; _meta = response.MetaData;