From 0e1f64ae881e0a832d3163ee7892511132668ee9 Mon Sep 17 00:00:00 2001 From: Frede Hundewadt <22748698+fhdk@users.noreply.github.com> Date: Thu, 24 Mar 2022 16:44:34 +0100 Subject: [PATCH] wip --- Wonky.Client/Components/CompanyTable.razor | 3 ++- .../Components/DisplayStateComponent.razor | 2 +- Wonky.Client/Helpers/Utils.cs | 13 +++++++++ Wonky.Client/Pages/CompanyUpdate.razor | 8 +++--- Wonky.Client/Pages/CompanyUpdate.razor.cs | 27 +++++++++---------- Wonky.Client/Pages/CompanyView.razor | 18 ++++++++----- Wonky.Client/wwwroot/css/app.css | 5 ++++ Wonky.Entity/VirkState.cs | 9 ------- 8 files changed, 51 insertions(+), 34 deletions(-) delete mode 100644 Wonky.Entity/VirkState.cs diff --git a/Wonky.Client/Components/CompanyTable.razor b/Wonky.Client/Components/CompanyTable.razor index 05f11496..4437a562 100644 --- a/Wonky.Client/Components/CompanyTable.razor +++ b/Wonky.Client/Components/CompanyTable.razor @@ -16,6 +16,7 @@ *@ @using Wonky.Client.Components; +@using Wonky.Client.Helpers; @if (Companies.Any()) { @@ -23,7 +24,7 @@ @foreach (var company in Companies) { - + diff --git a/Wonky.Client/Components/DisplayStateComponent.razor b/Wonky.Client/Components/DisplayStateComponent.razor index 42998ab2..e2dec1db 100644 --- a/Wonky.Client/Components/DisplayStateComponent.razor +++ b/Wonky.Client/Components/DisplayStateComponent.razor @@ -15,7 +15,7 @@ // *@ -state +state @code{ [Parameter] public string StateClass { get; set; } = "the-ugly"; } diff --git a/Wonky.Client/Helpers/Utils.cs b/Wonky.Client/Helpers/Utils.cs index f5e8e107..a761bd24 100644 --- a/Wonky.Client/Helpers/Utils.cs +++ b/Wonky.Client/Helpers/Utils.cs @@ -23,4 +23,17 @@ public static class Utils { return DateTime.Now.ToFileTimeUtc().GetHashCode(); } + + public static string GetVisitState(string dtNextVisit) + { + if (dtNextVisit == "1970-01-01") + return "the-draw"; + var dtNow = DateTime.Now; + var dtValid = DateTime.TryParse(dtNextVisit, out var dtNext); + if (!dtValid) + return "the-draw"; + if (dtNow >= dtNext) + return "the-ugly"; + return (dtNow > dtNext.AddDays(-14)) ? "the-bad" : "the-good"; + } } \ No newline at end of file diff --git a/Wonky.Client/Pages/CompanyUpdate.razor b/Wonky.Client/Pages/CompanyUpdate.razor index 827dd29f..038c0fb6 100644 --- a/Wonky.Client/Pages/CompanyUpdate.razor +++ b/Wonky.Client/Pages/CompanyUpdate.razor @@ -25,11 +25,13 @@ {
-
CVR status "@RegState"
+
CVR status
Konto @_companyDto.Account
CompanyId @_companyDto.CompanyId
-
EDIT Næste besøg @NextVisit
EDIT Sidst besøgt @LastVisit
-
DB Næste besøg @_companyDto.NextVisit
DB Sidst besøgt @_companyDto.LastVisit
+
EDIT Næste besøg @NextVisit
+
EDIT Sidst besøgt @LastVisit
+
DB Næste besøg @_companyDto.NextVisit
+
DB Sidst besøgt @_companyDto.LastVisit
diff --git a/Wonky.Client/Pages/CompanyUpdate.razor.cs b/Wonky.Client/Pages/CompanyUpdate.razor.cs index bc891836..e90eef2f 100644 --- a/Wonky.Client/Pages/CompanyUpdate.razor.cs +++ b/Wonky.Client/Pages/CompanyUpdate.razor.cs @@ -51,8 +51,8 @@ public partial class CompanyUpdate : IDisposable _editContext = new EditContext(_companyDto); Interceptor.RegisterEvent(); Interceptor.RegisterBeforeSendEvent(); - - await GetInfoFromVat(_companyDto.VatNumber); + if(!string.IsNullOrWhiteSpace(_companyDto.VatNumber)) + await GetInfoFromVat(_companyDto.VatNumber); } private async Task Update() @@ -78,26 +78,25 @@ public partial class CompanyUpdate : IDisposable ToastService.ShowError($"CVR nummer mangler."); return; } - var result = await VirkRegistryService + VInfos = await VirkRegistryService .QueryVirkRegistry( new VirkParams { VatNumber = vatNumber }); - if (string.IsNullOrWhiteSpace(result[0].VatNumber)) + if (string.IsNullOrWhiteSpace(VInfos[0].VatNumber)) { - ToastService.ShowError($"CVR '{vatNumber}' findes ikke."); + ToastService.ShowError($"CVR nummer '{vatNumber}' findes ikke."); return; } - ToastService.ShowSuccess($"Data for '{vatNumber}' er hentet."); - _virkRegInfo = result[0]; - RegState = _virkRegInfo.States[^1].State == "NORMAL" ? "the-good" : "the-ugly"; - _companyDto.Name = _virkRegInfo.Name; - _companyDto.Address1 = _virkRegInfo.CoName; - _companyDto.Address2 = _virkRegInfo.Address; - _companyDto.ZipCode = _virkRegInfo.ZipCode; - _companyDto.City = _virkRegInfo.City; - _companyDto.VatNumber = _virkRegInfo.VatNumber; + // 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; } diff --git a/Wonky.Client/Pages/CompanyView.razor b/Wonky.Client/Pages/CompanyView.razor index 62503c52..3f1efb8b 100644 --- a/Wonky.Client/Pages/CompanyView.razor +++ b/Wonky.Client/Pages/CompanyView.razor @@ -19,9 +19,13 @@ @page "/company/id/{companyId}" @using Microsoft.AspNetCore.Authorization @using Wonky.Client.Components; +@using Wonky.Client.Helpers @attribute [Authorize(Roles = "Adviser")]
+
+ +
@company.Name @company.Account @company.City
@@ -64,18 +68,20 @@ - +
Næste besøg @CompanyDto.NextVisit
-
-
- Tilbage - Aktivitet - Rediger +
+
+ Tilbage + Rediger +
+
+ Aktivitet
diff --git a/Wonky.Client/wwwroot/css/app.css b/Wonky.Client/wwwroot/css/app.css index 336c1d5f..001cb20d 100644 --- a/Wonky.Client/wwwroot/css/app.css +++ b/Wonky.Client/wwwroot/css/app.css @@ -7,12 +7,16 @@ height: 48px; } +/* Display visit state classes */ .state { width: 24px; height: 24px; min-width: 24px; min-height: 24px; } +.the-draw { + background-color: purple; +} .the-good { background-color: green; } @@ -22,6 +26,7 @@ .the-ugly { background-color: red; } +/* end visit state classes*/ html, body { font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; diff --git a/Wonky.Entity/VirkState.cs b/Wonky.Entity/VirkState.cs deleted file mode 100644 index c3c53584..00000000 --- a/Wonky.Entity/VirkState.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace Wonky.Entity; - -public enum VirkState -{ - None, - Good, - Bad, - Ugly -} \ No newline at end of file