diff --git a/Wonky.Client/HttpInterceptors/HttpInterceptorService.cs b/Wonky.Client/HttpInterceptors/HttpInterceptorService.cs
index 1b7f5e3e..75b57d43 100644
--- a/Wonky.Client/HttpInterceptors/HttpInterceptorService.cs
+++ b/Wonky.Client/HttpInterceptors/HttpInterceptorService.cs
@@ -83,10 +83,10 @@ namespace Wonky.Client.HttpInterceptors
if (e.Response == null || e.Response.IsSuccessStatusCode)
return;
- string message = "An error happened";
+ var message = "En ukendt fejl er opstået";
var currDoc = _navigation.ToBaseRelativePath(_navigation.Uri);
- if (currDoc.Contains("login"))
- currDoc = "/";
+ if (currDoc.Contains("login/"))
+ currDoc = "";
switch (e.Response.StatusCode)
{
@@ -95,16 +95,24 @@ namespace Wonky.Client.HttpInterceptors
_toast.ShowInfo(message);
break;
case HttpStatusCode.BadRequest:
+ // message = "Der er et problem med data ...";
+ // _toast.ShowWarning(message);
+ break;
case HttpStatusCode.Unauthorized:
ClearInfo();
_navigation.NavigateTo($"/login/{currDoc}");
- message = "Login info skal fornyes ...";
- _toast.ShowInfo(message);
+ message = "Login skal fornyes ...";
+ _toast.ShowWarning(message);
break;
case HttpStatusCode.InternalServerError:
+ message = "Der er interne problemer på serveren ...";
+ _toast.ShowError(message);
+ break;
+ default:
+ _toast.ShowError(message);
break;
}
- throw new HttpResponseException(message);
+ // throw new HttpResponseException(message);
}
private async void ClearInfo()
diff --git a/Wonky.Client/Pages/ActivityNewVisitPage.razor b/Wonky.Client/Pages/ActivityNewVisitPage.razor
index e5fef4f1..0a5f2332 100644
--- a/Wonky.Client/Pages/ActivityNewVisitPage.razor
+++ b/Wonky.Client/Pages/ActivityNewVisitPage.razor
@@ -48,6 +48,7 @@
+
@@ -61,50 +62,63 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@* Order lines *@
diff --git a/Wonky.Client/Pages/ActivityNewVisitPage.razor.cs b/Wonky.Client/Pages/ActivityNewVisitPage.razor.cs
index 7afaee6d..d9c04f74 100644
--- a/Wonky.Client/Pages/ActivityNewVisitPage.razor.cs
+++ b/Wonky.Client/Pages/ActivityNewVisitPage.razor.cs
@@ -72,6 +72,7 @@ public partial class ActivityNewVisitPage : IDisposable
private UserInfoView _ux { get; set; } = new();
private DateTime _workDate { get; set; } = DateTime.Now;
private string _selectedDate { get; set; } = "";
+ private string _phone { get; set; } = "";
protected override async Task OnParametersSetAsync()
{
@@ -107,6 +108,15 @@ public partial class ActivityNewVisitPage : IDisposable
_ux = await _storage.GetItemAsync("_xu");
_company = await _companyRepo.GetCompanyById(CompanyId);
+ // variable to validate if customer needs update
+ _phone = _company.Phone;
+ if (string.IsNullOrWhiteSpace(_company.Phone)
+ && !string.IsNullOrWhiteSpace(_company.Account)
+ && _company.Account != "NY")
+ {
+ _company.Phone = _company.Account[..8];
+ }
+
// set up identification
_draft.CompanyId = _company.CompanyId;
_draft.BcId = _company.BcId;
@@ -152,15 +162,27 @@ public partial class ActivityNewVisitPage : IDisposable
return;
}
+ if (_draft.ActivityStatusEnum == "order" && DraftStateProvider.Draft.Items.Count == 0)
+ {
+ _toast.ShowError("Ved bestilling skal der angives et eller flere varenumre.");
+ return;
+ }
+
+ if (_draft.ActivityStatusEnum == "order" && string.IsNullOrWhiteSpace(_draft.Phone))
+ {
+ _toast.ShowError("Ved nye bestillinger skal en kundes telefon nummer angives.");
+ return;
+ }
+
HideButtons = true;
_draft.ActivityDate = _prefs.WorkDate;
- var activityType = _draft.ActivityTypeEnum switch
+ _draft.OurRef = _draft.ActivityTypeEnum switch
{
- "phone" => "T:",
- "onSite" => "B:",
+ "phone" => $"T:{_ux.FullName.Split(" ")[0]}",
+ "onSite" => $"B:{_ux.FullName.Split(" ")[0]}",
_ => ""
};
- _draft.OurRef = $"{activityType}{_ux.FullName.Split(" ")[0]}";
+
var ln = 0;
var lines = DraftStateProvider.Draft.Items.Select(item => new ActivityLineDto
{
@@ -176,6 +198,12 @@ public partial class ActivityNewVisitPage : IDisposable
})
.ToList();
_draft.Lines = lines;
+ if (_phone != _draft.Phone)
+ {
+ _company.Phone = _draft.Phone;
+ await _companyRepo.UpdateCompany(_company.CompanyId, _company);
+ _toast.ShowInfo("Kunde telefon nummer er opdateret.");
+ }
var result = await _activityRepo.CreateActivity(_draft);
_toast.ShowSuccess($"{result.Message}.");
await DraftStateProvider.DeleteDraftAsync();
diff --git a/Wonky.Client/Pages/AdminVewSalesReportPage.razor b/Wonky.Client/Pages/AdminViewSalesReportPage.razor
similarity index 100%
rename from Wonky.Client/Pages/AdminVewSalesReportPage.razor
rename to Wonky.Client/Pages/AdminViewSalesReportPage.razor
diff --git a/Wonky.Client/Pages/AdminVewSalesReportPage.razor.cs b/Wonky.Client/Pages/AdminViewSalesReportPage.razor.cs
similarity index 98%
rename from Wonky.Client/Pages/AdminVewSalesReportPage.razor.cs
rename to Wonky.Client/Pages/AdminViewSalesReportPage.razor.cs
index 7753fbbd..68415808 100644
--- a/Wonky.Client/Pages/AdminVewSalesReportPage.razor.cs
+++ b/Wonky.Client/Pages/AdminViewSalesReportPage.razor.cs
@@ -21,7 +21,7 @@ using Wonky.Entity.Views;
namespace Wonky.Client.Pages;
-public partial class AdminVewSalesReportPage : IDisposable
+public partial class AdminViewSalesReportPage : IDisposable
{
///
/// Country code from url parameter
diff --git a/Wonky.Client/Pages/SalesReportViewPage.razor b/Wonky.Client/Pages/SalesReportViewPage.razor
index 2f074a11..e1cb56f8 100644
--- a/Wonky.Client/Pages/SalesReportViewPage.razor
+++ b/Wonky.Client/Pages/SalesReportViewPage.razor
@@ -64,6 +64,8 @@
{
@foreach (var item in _items)
{
-
+
+
+
}
}
\ No newline at end of file
diff --git a/Wonky.Client/Shared/MainLayout.razor b/Wonky.Client/Shared/MainLayout.razor
index 3d78003d..6603a7d8 100644
--- a/Wonky.Client/Shared/MainLayout.razor
+++ b/Wonky.Client/Shared/MainLayout.razor
@@ -26,9 +26,6 @@
-
-
-
@Body
diff --git a/Wonky.Client/Shared/MainLayout.razor.css b/Wonky.Client/Shared/MainLayout.razor.css
index 106cf54d..39d8ca23 100644
--- a/Wonky.Client/Shared/MainLayout.razor.css
+++ b/Wonky.Client/Shared/MainLayout.razor.css
@@ -8,10 +8,6 @@ main {
flex: 1;
}
-.nav-icon-only {
- background-image: linear-gradient(180deg, rgb(22, 21, 23) 10%, #ffaa00 100%);
-}
-
.sidebar {
background-image: linear-gradient(180deg, rgb(22, 21, 23) 10%, #ffaa00 100%);
}
@@ -58,31 +54,12 @@ main {
}
}
-@media (max-width: 1024px){
- .nav-icon-only {
- display: block;
- }
-
- .sidebar {
- display: none;
- }
-
- .top-row {
- display: none;
- }
-}
-
@media (min-width: 1025px) {
.page {
flex-direction: row;
}
- .nav-icon-only {
- display: none;
- }
-
.sidebar {
- display: block;
width: 200px;
height: 100vh;
position: sticky;
@@ -90,7 +67,6 @@ main {
}
.top-row {
- display: block;
position: sticky;
top: 0;
z-index: 1;
diff --git a/Wonky.Client/Shared/NavIconOnly.razor b/Wonky.Client/Shared/NavIconOnly.razor
deleted file mode 100644
index 2cefc603..00000000
--- a/Wonky.Client/Shared/NavIconOnly.razor
+++ /dev/null
@@ -1,96 +0,0 @@
-@*
-// Copyright (C) 2022 FCS Frede's Computer Services.
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html]
-//
-*@
-
-@inject IWebAssemblyHostEnvironment HostEnvironment
-@using Wonky.Client.Components;
-
-