diff --git a/Wonky.Client/Components/AppVersion.razor b/Wonky.Client/Components/AppVersion.razor index 3887769c..59a555c9 100644 --- a/Wonky.Client/Components/AppVersion.razor +++ b/Wonky.Client/Components/AppVersion.razor @@ -27,14 +27,14 @@ else
app version @_app?.Version
} -@if (_app!.IsBeta) +@if (_app!.Rc) { -
Beta version
+
release candidate
} -@if (_app!.SandBox) +@if (_app!.Sandbox) { -
Sandkasse
+
sandbox
} @code { diff --git a/Wonky.Client/Components/TaskItemTableComponent.razor b/Wonky.Client/Components/TaskItemTableComponent.razor index 8fcb922e..3afe83b4 100644 --- a/Wonky.Client/Components/TaskItemTableComponent.razor +++ b/Wonky.Client/Components/TaskItemTableComponent.razor @@ -50,14 +50,17 @@ - - @if (task.TaskTypeEnum is "Recall" or "Revision") + @if (task.TaskTypeEnum is "Recall") { - } diff --git a/Wonky.Client/Pages/ActivityNewVisitPage.razor.cs b/Wonky.Client/Pages/ActivityNewVisitPage.razor.cs index 98b06eeb..642b42cd 100644 --- a/Wonky.Client/Pages/ActivityNewVisitPage.razor.cs +++ b/Wonky.Client/Pages/ActivityNewVisitPage.razor.cs @@ -108,11 +108,11 @@ public partial class ActivityNewVisitPage : IDisposable _ux = await _storage.GetItemAsync("_xu"); _company = await _companyRepo.GetCompanyById(CompanyId); - // variable to validate if customer needs update + // variable to validate if customer needs phone number update _phone = _company.Phone; if (string.IsNullOrWhiteSpace(_company.Phone) && !string.IsNullOrWhiteSpace(_company.Account) - && _company.Account != "NY") + && _company.Account != "NY" && _company.Account.Length > 7) { _company.Phone = _company.Account[..8]; } @@ -170,7 +170,7 @@ public partial class ActivityNewVisitPage : IDisposable if (_draft.ActivityStatusEnum == "order" && string.IsNullOrWhiteSpace(_draft.Phone)) { - _toast.ShowError("Ved nye bestillinger skal en kundes telefon nummer angives."); + _toast.ShowError("Ved bestilling til ny kunde skal telefon nummer angives."); return; } diff --git a/Wonky.Client/Pages/CustomerNewPage.razor b/Wonky.Client/Pages/CustomerNewPage.razor index 201d37ea..e0793d51 100644 --- a/Wonky.Client/Pages/CustomerNewPage.razor +++ b/Wonky.Client/Pages/CustomerNewPage.razor @@ -106,7 +106,7 @@ - + diff --git a/Wonky.Client/Pages/CustomerNewPage.razor.cs b/Wonky.Client/Pages/CustomerNewPage.razor.cs index b8737975..a35f0e60 100644 --- a/Wonky.Client/Pages/CustomerNewPage.razor.cs +++ b/Wonky.Client/Pages/CustomerNewPage.razor.cs @@ -123,6 +123,9 @@ namespace Wonky.Client.Pages } private async Task SubmitCompanyForm() { + _companyObject.LastVisit = $"{_lastVisit:yyyy-MM-dd}"; + _companyObject.NextVisit = $"{_nextVisit:yyyy-MM-dd}"; + var newId = await _companyRepo.CreateCompany(_companyObject); if (!string.IsNullOrWhiteSpace(newId)) @@ -138,9 +141,8 @@ namespace Wonky.Client.Pages private void HandleFieldChanged(object sender, FieldChangedEventArgs e) { - _companyObject.LastVisit = $"{_lastVisit:yyyy-MM-dd}"; - _companyObject.NextVisit = $"{_nextVisit:yyyy-MM-dd}"; - + _nextVisit = _lastVisit.AddDays(7 * _companyObject.Interval); + if (!_companyObject.ValidDateSpan()) { _toast.ShowError("Dato for næste besøg skal ligge efter sidste besøg."); diff --git a/Wonky.Client/Pages/CustomerViewPage.razor b/Wonky.Client/Pages/CustomerViewPage.razor index 278f4bc5..1f668b0f 100644 --- a/Wonky.Client/Pages/CustomerViewPage.razor +++ b/Wonky.Client/Pages/CustomerViewPage.razor @@ -163,8 +163,7 @@ - - Dato kan ikke vær før sidste besøg + Besøgt @@ -186,7 +185,8 @@ Historik - + + @@ -195,16 +195,16 @@