From 65556383fd38b93b6582564a290cbbe9f869fb61 Mon Sep 17 00:00:00 2001 From: Frede Hundewadt Date: Fri, 24 Mar 2023 15:44:42 +0100 Subject: [PATCH] WIP: supervisor --- .../Components/OfficeLandingComponent.razor | 19 +++--- Wonky.Client/Pages/OfficeLandingPage.razor | 67 +------------------ .../Pages/SystemSupervisorViewEditPage.razor | 26 ++++--- .../SystemSupervisorViewEditPage.razor.cs | 5 +- Wonky.Client/Shared/NavMenu.razor.css | 5 ++ Wonky.Client/Wonky.Client.csproj | 8 +-- Wonky.Client/wwwroot/appsettings.json | 4 +- 7 files changed, 42 insertions(+), 92 deletions(-) diff --git a/Wonky.Client/Components/OfficeLandingComponent.razor b/Wonky.Client/Components/OfficeLandingComponent.razor index bb7c5e92..0bdb3c38 100644 --- a/Wonky.Client/Components/OfficeLandingComponent.razor +++ b/Wonky.Client/Components/OfficeLandingComponent.razor @@ -13,7 +13,6 @@ // along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html] *@ - @using Microsoft.AspNetCore.Authorization @using Wonky.Client.Components @@ -25,14 +24,14 @@
- Sælgere + Sælger Liste - Tlf.Ordre + Telefon Bestilling - Priser + Produkt Prisliste
@@ -46,14 +45,14 @@
- Sælgere + Sælger Liste - Tlf.Ordre + Telefon Bestilling - Priser + Produkt Prisliste
@@ -67,14 +66,14 @@
- Sælgere + Sælger Liste - Tlf.Ordre + Telefon Bestilling - Priser + Produkt Prisliste
diff --git a/Wonky.Client/Pages/OfficeLandingPage.razor b/Wonky.Client/Pages/OfficeLandingPage.razor index 370e9cae..633168e8 100644 --- a/Wonky.Client/Pages/OfficeLandingPage.razor +++ b/Wonky.Client/Pages/OfficeLandingPage.razor @@ -15,71 +15,10 @@ @using Microsoft.AspNetCore.Authorization +@using Wonky.Client.Components @attribute [Authorize(Roles = "Admin,Office,Warehouse")] @page "/office/country" -Kunde oversigt @CountryCode -
-
-
-
Danmark
-
-
- - - Sælger Liste - - - - Telefon Bestilling - - - Produkt Prisliste - -
-
-
-
-
-
-
Norge
-
-
- - - Sælger Liste - - - - Telefon Bestilling - - - Produkt Prisliste - -
-
-
-
+Kontor -
-
-
Sverige
-
-
- - - Sælger Liste - - - - Telefon Bestilling - - - Produkt Prisliste - -
-
-
-
- -
\ No newline at end of file + \ No newline at end of file diff --git a/Wonky.Client/Pages/SystemSupervisorViewEditPage.razor b/Wonky.Client/Pages/SystemSupervisorViewEditPage.razor index eee45ea5..b167e532 100644 --- a/Wonky.Client/Pages/SystemSupervisorViewEditPage.razor +++ b/Wonky.Client/Pages/SystemSupervisorViewEditPage.razor @@ -36,26 +36,30 @@
-
+
@UserData.FirstName @UserData.LastName
-
+
Supervisor for valgte sælgere
- @if (UserData.AssignedUsers.Any()) - { - foreach (var user in UserData.AssignedUsers) +
+ @if (UserData.AssignedUsers.Any()) { -
- - -
+ foreach (var user in UserData.AssignedUsers) + { +
+
+ + +
+
+ } } - } +
@@ -63,4 +67,4 @@
- + \ No newline at end of file diff --git a/Wonky.Client/Pages/SystemSupervisorViewEditPage.razor.cs b/Wonky.Client/Pages/SystemSupervisorViewEditPage.razor.cs index 1341cfdb..6bba6f44 100644 --- a/Wonky.Client/Pages/SystemSupervisorViewEditPage.razor.cs +++ b/Wonky.Client/Pages/SystemSupervisorViewEditPage.razor.cs @@ -14,6 +14,7 @@ // using System.Text.Json; +using Blazored.Toast.Services; using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components.Forms; using Wonky.Client.HttpInterceptors; @@ -29,7 +30,8 @@ public partial class SystemSupervisorViewEditPage : IDisposable // ############################################################# [Inject] public ISystemUserRepository UserRepo { get; set; } [Inject] public HttpInterceptorService Interceptor { get; set; } - [Inject] public ILogger Logger { get; set; } + [Inject] public ILogger Logger { get; set; } + [Inject] public IToastService Toaster { get; set; } // ############################################################# [Parameter] public string UserId { get; set; } = ""; @@ -60,6 +62,7 @@ public partial class SystemSupervisorViewEditPage : IDisposable private async Task SaveChanges() { await UserRepo.UpdateUserInfo(UserId, UserData); + Toaster.ShowSuccess("Tilknyttede sælgere er opdateret", "Det var det."); } public void Dispose() diff --git a/Wonky.Client/Shared/NavMenu.razor.css b/Wonky.Client/Shared/NavMenu.razor.css index e6cf40de..dfecd000 100644 --- a/Wonky.Client/Shared/NavMenu.razor.css +++ b/Wonky.Client/Shared/NavMenu.razor.css @@ -64,6 +64,11 @@ color: white; } +.list-group.panel > .list-group-item { + border-bottom-right-radius: 4px; + border-bottom-left-radius: 4px; +} + @media (min-width: 1025px) { .navbar-toggler { display: none; diff --git a/Wonky.Client/Wonky.Client.csproj b/Wonky.Client/Wonky.Client.csproj index abed7f80..1fb35ed4 100644 --- a/Wonky.Client/Wonky.Client.csproj +++ b/Wonky.Client/Wonky.Client.csproj @@ -11,10 +11,10 @@ - - - - + + + + diff --git a/Wonky.Client/wwwroot/appsettings.json b/Wonky.Client/wwwroot/appsettings.json index 3096dedf..f915e91f 100644 --- a/Wonky.Client/wwwroot/appsettings.json +++ b/Wonky.Client/wwwroot/appsettings.json @@ -1,7 +1,7 @@ { "appInfo": { "name": "Wonky Online", - "version": "0.121.0", + "version": "0.124.0", "rc": true, "sandBox": false, "image": "grumpy-coder.png" @@ -9,7 +9,7 @@ "Logging": { "LogLevel": { "Default": "Debug", - "System": "Information", + "System": "Debug", "Microsoft": "Information" }, "Debug": {