diff --git a/VeraxShield/.vs/ProjectEvaluation/veraxshield.metadata.v7.bin b/VeraxShield/.vs/ProjectEvaluation/veraxshield.metadata.v7.bin
index 6f66555..7d1f510 100644
Binary files a/VeraxShield/.vs/ProjectEvaluation/veraxshield.metadata.v7.bin and b/VeraxShield/.vs/ProjectEvaluation/veraxshield.metadata.v7.bin differ
diff --git a/VeraxShield/.vs/ProjectEvaluation/veraxshield.projects.v7.bin b/VeraxShield/.vs/ProjectEvaluation/veraxshield.projects.v7.bin
index 4656214..342ef17 100644
Binary files a/VeraxShield/.vs/ProjectEvaluation/veraxshield.projects.v7.bin and b/VeraxShield/.vs/ProjectEvaluation/veraxshield.projects.v7.bin differ
diff --git a/VeraxShield/.vs/VeraxShield/DesignTimeBuild/.dtbcache.v2 b/VeraxShield/.vs/VeraxShield/DesignTimeBuild/.dtbcache.v2
index 8d04657..dc02410 100644
Binary files a/VeraxShield/.vs/VeraxShield/DesignTimeBuild/.dtbcache.v2 and b/VeraxShield/.vs/VeraxShield/DesignTimeBuild/.dtbcache.v2 differ
diff --git a/VeraxShield/.vs/VeraxShield/FileContentIndex/5dcb261e-68dc-496a-8de1-dba32c3580cf.vsidx b/VeraxShield/.vs/VeraxShield/FileContentIndex/5dcb261e-68dc-496a-8de1-dba32c3580cf.vsidx
new file mode 100644
index 0000000..34fd7f0
Binary files /dev/null and b/VeraxShield/.vs/VeraxShield/FileContentIndex/5dcb261e-68dc-496a-8de1-dba32c3580cf.vsidx differ
diff --git a/VeraxShield/.vs/VeraxShield/FileContentIndex/a96b67ee-035b-4751-98a6-21c5cf7cbead.vsidx b/VeraxShield/.vs/VeraxShield/FileContentIndex/a96b67ee-035b-4751-98a6-21c5cf7cbead.vsidx
new file mode 100644
index 0000000..587ab78
Binary files /dev/null and b/VeraxShield/.vs/VeraxShield/FileContentIndex/a96b67ee-035b-4751-98a6-21c5cf7cbead.vsidx differ
diff --git a/VeraxShield/.vs/VeraxShield/FileContentIndex/f9a1c008-b84d-42ef-9aa6-a4de62b9ef42.vsidx b/VeraxShield/.vs/VeraxShield/FileContentIndex/f9a1c008-b84d-42ef-9aa6-a4de62b9ef42.vsidx
deleted file mode 100644
index 9a705c7..0000000
Binary files a/VeraxShield/.vs/VeraxShield/FileContentIndex/f9a1c008-b84d-42ef-9aa6-a4de62b9ef42.vsidx and /dev/null differ
diff --git a/VeraxShield/.vs/VeraxShield/v17/.futdcache.v2 b/VeraxShield/.vs/VeraxShield/v17/.futdcache.v2
index 607da88..370abb2 100644
Binary files a/VeraxShield/.vs/VeraxShield/v17/.futdcache.v2 and b/VeraxShield/.vs/VeraxShield/v17/.futdcache.v2 differ
diff --git a/VeraxShield/.vs/VeraxShield/v17/.suo b/VeraxShield/.vs/VeraxShield/v17/.suo
index 9302459..058ef47 100644
Binary files a/VeraxShield/.vs/VeraxShield/v17/.suo and b/VeraxShield/.vs/VeraxShield/v17/.suo differ
diff --git a/VeraxShield/VeraxShield/Pages/utilisateurs/ListeUtilisateurs.razor b/VeraxShield/VeraxShield/Pages/utilisateurs/ListeUtilisateurs.razor
index 650daf4..fadcace 100644
--- a/VeraxShield/VeraxShield/Pages/utilisateurs/ListeUtilisateurs.razor
+++ b/VeraxShield/VeraxShield/Pages/utilisateurs/ListeUtilisateurs.razor
@@ -3,19 +3,19 @@
@page "/utilisateurs/liste"
Utilisateurs de Verax
-
+
-
+
-
+
@@ -31,15 +31,10 @@
-
-
-
-
@context.TotalItems total items
-
@context.TotalItems
@@ -48,20 +43,20 @@
-
-
-
-
+
+
+
+
+
@@ -72,11 +67,14 @@
-
+
+
-
+
+
diff --git a/VeraxShield/VeraxShield/Pages/utilisateurs/ListeUtilisateurs.razor.cs b/VeraxShield/VeraxShield/Pages/utilisateurs/ListeUtilisateurs.razor.cs
index b9f86aa..dfea7a4 100644
--- a/VeraxShield/VeraxShield/Pages/utilisateurs/ListeUtilisateurs.razor.cs
+++ b/VeraxShield/VeraxShield/Pages/utilisateurs/ListeUtilisateurs.razor.cs
@@ -1,4 +1,5 @@
using Microsoft.AspNetCore.Components;
+using VeraxShield.composants.modals;
using VeraxShield.modele.utilisateurs;
using VeraxShield.services.UtilisateursDataService;
@@ -12,14 +13,18 @@ namespace VeraxShield.Pages.utilisateurs
public List Utilisateurs { get; set; }
[Inject]
- private NavigationManager NavgaManager { get; set; }
+ private NavigationManager NavigationManager { get; set; }
- private Utilisateur utilisateurSelectionne;
+ private Utilisateur? utilisateurSelectionne;
+
+ [Parameter]
+ public ModalSuppressionUtilisateur Modal {get; set;}
protected override async Task OnInitializedAsync()
{
//await this.utilisateursDataService.resetDataUtilisateurs();
+ this.utilisateurSelectionne = null;
this.Utilisateurs = await this.utilisateursDataService.getAllUtilisateurs();
await base.OnInitializedAsync();
}
@@ -29,5 +34,27 @@ namespace VeraxShield.Pages.utilisateurs
this.Utilisateurs = await this.utilisateursDataService.getAllUtilisateurs();
StateHasChanged(); // Actualiser la vue
}
+
+ public async Task fermetureModal(bool val) {
+
+ if (val) {
+ await this.supprimerUtilisateur(this.utilisateurSelectionne);
+ }
+ }
+
+ public async Task supprimerUtilisateur(Utilisateur u)
+ {
+ await this.utilisateursDataService.SupprimerUtilisateur(u);
+ this.Utilisateurs = await this.utilisateursDataService.getAllUtilisateurs();
+
+ this.NavigationManager.NavigateTo("/utilisateurs/liste");
+ }
+
+ public async Task afficherModal()
+ {
+ if (this.Modal != null) {
+ await this.Modal.afficher();
+ }
+ }
}
}
diff --git a/VeraxShield/VeraxShield/bin/Debug/net7.0/VeraxShield.dll b/VeraxShield/VeraxShield/bin/Debug/net7.0/VeraxShield.dll
index 6fb6884..d73cd21 100644
Binary files a/VeraxShield/VeraxShield/bin/Debug/net7.0/VeraxShield.dll and b/VeraxShield/VeraxShield/bin/Debug/net7.0/VeraxShield.dll differ
diff --git a/VeraxShield/VeraxShield/bin/Debug/net7.0/VeraxShield.exe b/VeraxShield/VeraxShield/bin/Debug/net7.0/VeraxShield.exe
index a0a824a..185cc30 100644
Binary files a/VeraxShield/VeraxShield/bin/Debug/net7.0/VeraxShield.exe and b/VeraxShield/VeraxShield/bin/Debug/net7.0/VeraxShield.exe differ
diff --git a/VeraxShield/VeraxShield/bin/Debug/net7.0/VeraxShield.pdb b/VeraxShield/VeraxShield/bin/Debug/net7.0/VeraxShield.pdb
index 61e5bf1..f176c99 100644
Binary files a/VeraxShield/VeraxShield/bin/Debug/net7.0/VeraxShield.pdb and b/VeraxShield/VeraxShield/bin/Debug/net7.0/VeraxShield.pdb differ
diff --git a/VeraxShield/VeraxShield/composants/modals/ConfirmationSuppressionUtilisateur.razor.cs b/VeraxShield/VeraxShield/composants/modals/ConfirmationSuppressionUtilisateur.razor.cs
deleted file mode 100644
index 87dc3c2..0000000
--- a/VeraxShield/VeraxShield/composants/modals/ConfirmationSuppressionUtilisateur.razor.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-using Blazorise;
-using Microsoft.AspNetCore.Components;
-using VeraxShield.modele.utilisateurs;
-using VeraxShield.services.UtilisateursDataService;
-
-namespace VeraxShield.composants.modals
-{
- public partial class ConfirmationSuppressionUtilisateur
- {
- private Modal modalRef;
-
- [Inject]
- private IUtilisateursDataService utilisateursDataService { get; set; }
-
- [Inject]
- private NavigationManager NavigationManager { get; set; }
-
- [Parameter]
- public Utilisateur utilisateur { get; set; }
-
- [Parameter]
- public List listeVueUtilisateurs { get; set; }
-
- [Parameter]
- public EventCallback OnUtilisateurSupprime { get; set; }
-
- public async Task fermetureModal(ModalClosingEventArgs e)
- {
- //this.NavigationManager.NavigateTo("/utilisateurs/liste");
- }
-
- protected async Task suppressionConfirmee()
- {
- await this.utilisateursDataService.SupprimerUtilisateur(this.utilisateur);
- this.listeVueUtilisateurs = await this.utilisateursDataService.getAllUtilisateurs();
- await this.HideModal();
- await OnUtilisateurSupprime.InvokeAsync(); // Notifier le composant de niveau supérieur
- }
-
- protected async Task suppressionAnnulee()
- {
- await this.HideModal();
- }
-
- private async Task ShowModal()
- {
- await modalRef.Show();
- }
-
- private Task HideModal()
- {
- return modalRef.Hide();
- }
- }
-}
diff --git a/VeraxShield/VeraxShield/composants/modals/ConfirmationSuppressionUtilisateur.razor b/VeraxShield/VeraxShield/composants/modals/ModalSuppressionUtilisateur.razor
similarity index 67%
rename from VeraxShield/VeraxShield/composants/modals/ConfirmationSuppressionUtilisateur.razor
rename to VeraxShield/VeraxShield/composants/modals/ModalSuppressionUtilisateur.razor
index 7134c6e..5c63090 100644
--- a/VeraxShield/VeraxShield/composants/modals/ConfirmationSuppressionUtilisateur.razor
+++ b/VeraxShield/VeraxShield/composants/modals/ModalSuppressionUtilisateur.razor
@@ -1,4 +1,4 @@
-
+
@@ -7,16 +7,18 @@
- Souhaitez-vous supprimer l'utilisateur ?
+ Souhaitez-vous supprimer l'Utilisateur
+ @if (utilisateur != null)
+ {
+ @utilisateur.Pseudo
+ }
+
+ ?
-
-
-
-
\ No newline at end of file
diff --git a/VeraxShield/VeraxShield/composants/modals/ModalSuppressionUtilisateur.razor.cs b/VeraxShield/VeraxShield/composants/modals/ModalSuppressionUtilisateur.razor.cs
new file mode 100644
index 0000000..bf06477
--- /dev/null
+++ b/VeraxShield/VeraxShield/composants/modals/ModalSuppressionUtilisateur.razor.cs
@@ -0,0 +1,43 @@
+using Blazorise;
+using Microsoft.AspNetCore.Components;
+using VeraxShield.modele.utilisateurs;
+using VeraxShield.services.UtilisateursDataService;
+
+namespace VeraxShield.composants.modals
+{
+ public partial class ModalSuppressionUtilisateur
+ {
+ private Modal modalRef;
+
+ [Parameter]
+ public Utilisateur? utilisateur { get; set; }
+
+ [Parameter]
+ public EventCallback modalFerme {get; set;}
+
+ protected async Task suppressionAnnulee()
+ {
+ await this.fermer();
+ await this.modalFerme.InvokeAsync(false);
+ }
+
+ protected async Task suppressionConfirmee()
+ {
+ await this.fermer();
+ await this.modalFerme.InvokeAsync(true);
+ }
+
+ public async Task afficher()
+ {
+ if (this.utilisateur != null)
+ {
+ await modalRef.Show();
+ }
+ }
+
+ private Task fermer()
+ {
+ return modalRef.Hide();
+ }
+ }
+}
diff --git a/VeraxShield/VeraxShield/obj/Debug/net7.0/VeraxShield.AssemblyInfo.cs b/VeraxShield/VeraxShield/obj/Debug/net7.0/VeraxShield.AssemblyInfo.cs
index afc9160..aceb419 100644
--- a/VeraxShield/VeraxShield/obj/Debug/net7.0/VeraxShield.AssemblyInfo.cs
+++ b/VeraxShield/VeraxShield/obj/Debug/net7.0/VeraxShield.AssemblyInfo.cs
@@ -13,7 +13,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("VeraxShield")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+3d717f1809a5111ebae261075a8f378f4039971e")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+289aaef1beb059a2f414fefc074f13b1e2f23fe7")]
[assembly: System.Reflection.AssemblyProductAttribute("VeraxShield")]
[assembly: System.Reflection.AssemblyTitleAttribute("VeraxShield")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git a/VeraxShield/VeraxShield/obj/Debug/net7.0/VeraxShield.AssemblyInfoInputs.cache b/VeraxShield/VeraxShield/obj/Debug/net7.0/VeraxShield.AssemblyInfoInputs.cache
index 2ff9fab..0e4a883 100644
--- a/VeraxShield/VeraxShield/obj/Debug/net7.0/VeraxShield.AssemblyInfoInputs.cache
+++ b/VeraxShield/VeraxShield/obj/Debug/net7.0/VeraxShield.AssemblyInfoInputs.cache
@@ -1 +1 @@
-90472af8f4064ccb58bab9f1de1949a8ed7ae526a4d30c720916f6885dae461d
+e5084db0badd53379098814e6b48963b76c16f5bcfb70eb45b38ace6d4ca9ded
diff --git a/VeraxShield/VeraxShield/obj/Debug/net7.0/VeraxShield.GeneratedMSBuildEditorConfig.editorconfig b/VeraxShield/VeraxShield/obj/Debug/net7.0/VeraxShield.GeneratedMSBuildEditorConfig.editorconfig
index 86f46c2..ba88648 100644
--- a/VeraxShield/VeraxShield/obj/Debug/net7.0/VeraxShield.GeneratedMSBuildEditorConfig.editorconfig
+++ b/VeraxShield/VeraxShield/obj/Debug/net7.0/VeraxShield.GeneratedMSBuildEditorConfig.editorconfig
@@ -30,8 +30,8 @@ build_metadata.AdditionalFiles.CssScope =
build_metadata.AdditionalFiles.TargetPath = Y29tcG9zYW50c1xmb3JtdWxhaXJlc1xfSW1wb3J0cy5yYXpvcg==
build_metadata.AdditionalFiles.CssScope =
-[c:/Users/jeanm/OneDrive/Documents/BUT/Blazor_SAE/VeraxShield/VeraxShield/composants/modals/ConfirmationSuppressionUtilisateur.razor]
-build_metadata.AdditionalFiles.TargetPath = Y29tcG9zYW50c1xtb2RhbHNcQ29uZmlybWF0aW9uU3VwcHJlc3Npb25VdGlsaXNhdGV1ci5yYXpvcg==
+[c:/Users/jeanm/OneDrive/Documents/BUT/Blazor_SAE/VeraxShield/VeraxShield/composants/modals/ModalSuppressionUtilisateur.razor]
+build_metadata.AdditionalFiles.TargetPath = Y29tcG9zYW50c1xtb2RhbHNcTW9kYWxTdXBwcmVzc2lvblV0aWxpc2F0ZXVyLnJhem9y
build_metadata.AdditionalFiles.CssScope =
[c:/Users/jeanm/OneDrive/Documents/BUT/Blazor_SAE/VeraxShield/VeraxShield/composants/modals/_Imports.razor]
diff --git a/VeraxShield/VeraxShield/obj/Debug/net7.0/VeraxShield.csproj.CoreCompileInputs.cache b/VeraxShield/VeraxShield/obj/Debug/net7.0/VeraxShield.csproj.CoreCompileInputs.cache
index 675693e..2799ad5 100644
--- a/VeraxShield/VeraxShield/obj/Debug/net7.0/VeraxShield.csproj.CoreCompileInputs.cache
+++ b/VeraxShield/VeraxShield/obj/Debug/net7.0/VeraxShield.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-c8127aa121574b52dba77ac8befc4002e3054ff43d495a19953b0a6402b9a71a
+93e1c9232111223b05115fd1d9ae73ec628ba0ee89fcc886f90e3413eb2ef36b
diff --git a/VeraxShield/VeraxShield/obj/Debug/net7.0/VeraxShield.dll b/VeraxShield/VeraxShield/obj/Debug/net7.0/VeraxShield.dll
index 6fb6884..d73cd21 100644
Binary files a/VeraxShield/VeraxShield/obj/Debug/net7.0/VeraxShield.dll and b/VeraxShield/VeraxShield/obj/Debug/net7.0/VeraxShield.dll differ
diff --git a/VeraxShield/VeraxShield/obj/Debug/net7.0/VeraxShield.pdb b/VeraxShield/VeraxShield/obj/Debug/net7.0/VeraxShield.pdb
index 61e5bf1..f176c99 100644
Binary files a/VeraxShield/VeraxShield/obj/Debug/net7.0/VeraxShield.pdb and b/VeraxShield/VeraxShield/obj/Debug/net7.0/VeraxShield.pdb differ
diff --git a/VeraxShield/VeraxShield/obj/Debug/net7.0/apphost.exe b/VeraxShield/VeraxShield/obj/Debug/net7.0/apphost.exe
index a0a824a..185cc30 100644
Binary files a/VeraxShield/VeraxShield/obj/Debug/net7.0/apphost.exe and b/VeraxShield/VeraxShield/obj/Debug/net7.0/apphost.exe differ
diff --git a/VeraxShield/VeraxShield/obj/Debug/net7.0/project.razor.vs.bin b/VeraxShield/VeraxShield/obj/Debug/net7.0/project.razor.vs.bin
index 6d7aed2..6f90389 100644
Binary files a/VeraxShield/VeraxShield/obj/Debug/net7.0/project.razor.vs.bin and b/VeraxShield/VeraxShield/obj/Debug/net7.0/project.razor.vs.bin differ
diff --git a/VeraxShield/VeraxShield/obj/Debug/net7.0/project.razor.vscode.bin b/VeraxShield/VeraxShield/obj/Debug/net7.0/project.razor.vscode.bin
index 5da722f..184390e 100644
Binary files a/VeraxShield/VeraxShield/obj/Debug/net7.0/project.razor.vscode.bin and b/VeraxShield/VeraxShield/obj/Debug/net7.0/project.razor.vscode.bin differ
diff --git a/VeraxShield/VeraxShield/obj/Debug/net7.0/ref/VeraxShield.dll b/VeraxShield/VeraxShield/obj/Debug/net7.0/ref/VeraxShield.dll
index bacb582..bce9674 100644
Binary files a/VeraxShield/VeraxShield/obj/Debug/net7.0/ref/VeraxShield.dll and b/VeraxShield/VeraxShield/obj/Debug/net7.0/ref/VeraxShield.dll differ
diff --git a/VeraxShield/VeraxShield/obj/Debug/net7.0/refint/VeraxShield.dll b/VeraxShield/VeraxShield/obj/Debug/net7.0/refint/VeraxShield.dll
index bacb582..bce9674 100644
Binary files a/VeraxShield/VeraxShield/obj/Debug/net7.0/refint/VeraxShield.dll and b/VeraxShield/VeraxShield/obj/Debug/net7.0/refint/VeraxShield.dll differ