From de2c3693508bfb15c93127034ea928d860f4ac56 Mon Sep 17 00:00:00 2001 From: Marc Wieland Date: Wed, 15 Oct 2025 15:01:00 +0200 Subject: [PATCH] Project Details Page + Employees --- .../Components/Modals/ProjectModal.razor | 6 +- .../Pages/Projects/ProjectDetails.razor | 83 ++++++++++++- .../Pages/Projects/Projects.razor | 4 +- OnProfNext.Client/Pages/Users.razor | 5 +- OnProfNext.Client/Services/OrderApiService.cs | 48 +++++--- .../Services/ProjectApiService.cs | 10 +- OnProfNext.Client/Services/UserApiService.cs | 13 +- .../bin/Debug/net9.0/OnProfNext.Client.dll | Bin 114176 -> 130560 bytes .../bin/Debug/net9.0/OnProfNext.Client.pdb | Bin 66324 -> 72620 bytes ...Next.Client.staticwebassets.endpoints.json | 2 +- ...ofNext.Client.staticwebassets.runtime.json | 2 +- .../bin/Debug/net9.0/OnProfNext.Shared.dll | Bin 18432 -> 18432 bytes .../bin/Debug/net9.0/OnProfNext.Shared.pdb | Bin 17292 -> 17504 bytes .../wwwroot/_framework/blazor.boot.json | 18 +-- .../wwwroot/_framework/blazor.boot.json.gz | Bin 13271 -> 13272 bytes .../net9.0/OnProfNext.Client.AssemblyInfo.cs | 2 +- ...OnProfNext.Client.AssemblyInfoInputs.cache | 2 +- ...Next.Client.csproj.AssemblyReference.cache | Bin 20037 -> 20136 bytes ...rofNext.Client.csproj.FileListAbsolute.txt | 26 ++-- .../obj/Debug/net9.0/OnProfNext.Client.dll | Bin 114176 -> 130560 bytes .../obj/Debug/net9.0/OnProfNext.Client.pdb | Bin 66324 -> 72620 bytes .../obj/Debug/net9.0/blazor.boot.json | 18 +-- .../obj/Debug/net9.0/rbcswa.dswa.cache.json | 2 +- .../Debug/net9.0/ref/OnProfNext.Client.dll | Bin 22016 -> 23552 bytes .../Debug/net9.0/refint/OnProfNext.Client.dll | Bin 22016 -> 23552 bytes .../Debug/net9.0/rjsmcshtml.dswa.cache.json | 2 +- .../Debug/net9.0/rjsmrazor.dswa.cache.json | 2 +- .../obj/Debug/net9.0/rpswa.dswa.cache.json | 2 +- .../staticwebassets.build.endpoints.json | 2 +- .../Debug/net9.0/staticwebassets.build.json | 2 +- .../net9.0/staticwebassets.build.json.cache | 2 +- .../net9.0/staticwebassets.development.json | 2 +- .../net9.0/tmp-webcil/OnProfNext.Client.wasm | Bin 113941 -> 130325 bytes .../net9.0/tmp-webcil/OnProfNext.Shared.wasm | Bin 18197 -> 18197 bytes .../net9.0/webcil/OnProfNext.Client.wasm | Bin 113941 -> 130325 bytes .../net9.0/webcil/OnProfNext.Shared.wasm | Bin 18197 -> 18197 bytes .../Controllers/OrderUsersController.cs | 56 +++++++++ .../Controllers/OrdersController.cs | 113 +++++++++++++----- ...ectController.cs => ProjectsController.cs} | 4 +- .../Controllers/UsersController.cs | 39 ++++-- .../bin/Debug/net9.0/OnProfNext.Server.dll | Bin 116736 -> 123904 bytes .../bin/Debug/net9.0/OnProfNext.Server.exe | Bin 156160 -> 156160 bytes .../bin/Debug/net9.0/OnProfNext.Server.pdb | Bin 53832 -> 55028 bytes .../bin/Debug/net9.0/OnProfNext.Shared.dll | Bin 18432 -> 18432 bytes .../bin/Debug/net9.0/OnProfNext.Shared.pdb | Bin 17292 -> 17504 bytes .../net9.0/OnProfNext.Server.AssemblyInfo.cs | 2 +- ...OnProfNext.Server.AssemblyInfoInputs.cache | 2 +- ...Next.Server.csproj.AssemblyReference.cache | Bin 14134 -> 14233 bytes ...Next.Server.csproj.CoreCompileInputs.cache | 2 +- .../obj/Debug/net9.0/OnProfNext.Server.dll | Bin 116736 -> 123904 bytes .../obj/Debug/net9.0/OnProfNext.Server.pdb | Bin 53832 -> 55028 bytes .../obj/Debug/net9.0/apphost.exe | Bin 156160 -> 156160 bytes .../Debug/net9.0/ref/OnProfNext.Server.dll | Bin 25088 -> 26624 bytes .../Debug/net9.0/refint/OnProfNext.Server.dll | Bin 25088 -> 26624 bytes .../Debug/net9.0/rjsmcshtml.dswa.cache.json | 2 +- .../Debug/net9.0/rjsmrazor.dswa.cache.json | 2 +- .../Models/DTOs/OrderCreateDto.cs | 7 +- OnProfNext.Shared/Models/DTOs/OrderDto.cs | 7 ++ .../bin/Debug/net9.0/OnProfNext.Shared.dll | Bin 18432 -> 18432 bytes .../bin/Debug/net9.0/OnProfNext.Shared.pdb | Bin 17292 -> 17504 bytes .../net9.0/OnProfNext.Shared.AssemblyInfo.cs | 2 +- ...OnProfNext.Shared.AssemblyInfoInputs.cache | 2 +- .../obj/Debug/net9.0/OnProfNext.Shared.dll | Bin 18432 -> 18432 bytes .../obj/Debug/net9.0/OnProfNext.Shared.pdb | Bin 17292 -> 17504 bytes .../Debug/net9.0/ref/OnProfNext.Shared.dll | Bin 13312 -> 13824 bytes .../Debug/net9.0/refint/OnProfNext.Shared.dll | Bin 13312 -> 13824 bytes 66 files changed, 367 insertions(+), 128 deletions(-) create mode 100644 OnProfNext.Server/Controllers/OrderUsersController.cs rename OnProfNext.Server/Controllers/{ProjectController.cs => ProjectsController.cs} (94%) diff --git a/OnProfNext.Client/Components/Modals/ProjectModal.razor b/OnProfNext.Client/Components/Modals/ProjectModal.razor index 4f45985..9143d29 100644 --- a/OnProfNext.Client/Components/Modals/ProjectModal.razor +++ b/OnProfNext.Client/Components/Modals/ProjectModal.razor @@ -90,7 +90,7 @@ [Parameter] public EventCallback OnProjectCreated { get; set; } [Parameter] public string SearchText { get; set; } = ""; - private List? users; + private List? users; private string? errorMessage; protected override async Task OnInitializedAsync() @@ -112,8 +112,8 @@ } } - private IEnumerable FilteredUsers => users is null || string.IsNullOrWhiteSpace(SearchText) - ? Enumerable.Empty() + private IEnumerable FilteredUsers => users is null || string.IsNullOrWhiteSpace(SearchText) + ? Enumerable.Empty() : users.Where(u => $"{u.FirstName} {u.LastName} {u.Username}" .Contains(SearchText, StringComparison.OrdinalIgnoreCase)); diff --git a/OnProfNext.Client/Pages/Projects/ProjectDetails.razor b/OnProfNext.Client/Pages/Projects/ProjectDetails.razor index 1514db8..8a93cbb 100644 --- a/OnProfNext.Client/Pages/Projects/ProjectDetails.razor +++ b/OnProfNext.Client/Pages/Projects/ProjectDetails.razor @@ -139,8 +139,17 @@ else @o.Planstunden @o.Iststunden - - noch offen + @if (o.Mitarbeiter?.Any() == true) + { + @foreach (var m in o.Mitarbeiter) + { + @m.FirstName @m.LastName + } + } + else + { + keine zugewiesen + }