From 12510a188945c46e6ba980b5c6fd93465ebc9b4d Mon Sep 17 00:00:00 2001
From: "patrick.brugiere" <patrick.BRUGIERE@etu.uca.fr>
Date: Fri, 12 Jan 2024 16:34:01 +0100
Subject: [PATCH] ajout de la validation sur add et edit

---
 .../adminBlazor/Factories/UserFactory.cs            |   4 ++--
 Project/adminBlazor/adminBlazor/Pages/Add.razor     |  12 +++++++++++-
 .../adminBlazor/adminBlazor/Pages/EditUser.razor    |   9 +++++++++
 .../adminBlazor/adminBlazor/Pages/EditUser.razor.cs |   2 +-
 Project/adminBlazor/adminBlazor/Pages/List.razor    |   2 +-
 .../images/{img_profil.jpeg => default.jpeg}        | Bin
 .../wwwroot/images/{default.png => default1.png}    | Bin
 7 files changed, 24 insertions(+), 5 deletions(-)
 rename Project/adminBlazor/adminBlazor/wwwroot/images/{img_profil.jpeg => default.jpeg} (100%)
 rename Project/adminBlazor/adminBlazor/wwwroot/images/{default.png => default1.png} (100%)

diff --git a/Project/adminBlazor/adminBlazor/Factories/UserFactory.cs b/Project/adminBlazor/adminBlazor/Factories/UserFactory.cs
index 46242a3..0d1b93f 100644
--- a/Project/adminBlazor/adminBlazor/Factories/UserFactory.cs
+++ b/Project/adminBlazor/adminBlazor/Factories/UserFactory.cs
@@ -18,7 +18,7 @@ namespace adminBlazor.Factories
                 Surname = user.Surname,
                 Nickname = user.Nickname,
                 ExtraTime = user.ExtraTime,
-                //Image = imageContent,
+                Image = imageContent,
                 Group = user.Group,
                 Password = user.Password,
                 Email = user.Email,
@@ -70,7 +70,7 @@ namespace adminBlazor.Factories
                 item.Email = user.Email;
 
             if (user.ImageBase64 != null && user.Image != null)
-            item.ImageBase64 = Convert.ToBase64String(user.Image);
+                item.ImageBase64 = Convert.ToBase64String(user.Image);
 
             if (user.Roles != null)
             {
diff --git a/Project/adminBlazor/adminBlazor/Pages/Add.razor b/Project/adminBlazor/adminBlazor/Pages/Add.razor
index e2f5ea6..20ca46b 100644
--- a/Project/adminBlazor/adminBlazor/Pages/Add.razor
+++ b/Project/adminBlazor/adminBlazor/Pages/Add.razor
@@ -10,18 +10,21 @@
         <label for="name">
             Name:
             <InputText id="name" @bind-Value="user.Name" />
+            <ValidationMessage For="@(() => user.Name)"/>
         </label>
     </p>
     <p>
         <label for="password">
             Password:
             <InputText  id="password" @bind-Value="user.Password" type="password" />
+            <ValidationMessage For="@(() => user.Password)" />
         </label>
     </p>
     <p>
         <label for="max-durability">
             Email:
             <InputText id="max-durability" @bind-Value="user.Email" />
+            <ValidationMessage For="@(() => user.Email)" />
         </label>
     </p>
     @*
@@ -49,12 +52,14 @@
         <label>
                 <input type="checkbox" @onchange="@(e => RolesCategoriesChange(role, e.Value))" />
             Student
+                        <ValidationMessage For="@(() => user.Roles)" />
         </label>
         break;
     }
     <label>
         <input type="checkbox" @onchange="@(e => RolesCategoriesChange(role, e.Value))" disabled="@disableOtherCheckboxes" checked="@user.Roles.Contains(currentItem)" />
         @currentItem
+                    <ValidationMessage For="@(() => user.Roles)" />
     </label>
     <br />
 }
@@ -64,30 +69,35 @@
         <label>
             Nickname
             <InputText @bind-Value="user.Nickname" />
+            <ValidationMessage For="@(() => user.Nickname)" />
         </label>
     </p>
     <p>
         <label>
             Surname
             <InputText @bind-Value="user.Surname" />
+            <ValidationMessage For="@(() => user.Surname)" />
         </label>
     </p>
     <p>
         <label>
             Image
-            <InputFile OnChange="@LoadImage" accept=".png, .jpeg" />
+            <InputFile OnChange="@LoadImage" accept=".png , .jpeg" />
+            <ValidationMessage For="@(() => user.Image)" />
         </label>
     </p>
     <p>
         <label>
             ExtraTime
             <InputCheckbox @bind-Value="user.ExtraTime" />
+            <ValidationMessage For="@(() => user.ExtraTime)" />
         </label>
     </p>
     <p>
         <label>
             Group
             <InputNumber @bind-Value="user.Group" />
+            <ValidationMessage For="@(() => user.Group)" />
         </label>
     </p>
 
diff --git a/Project/adminBlazor/adminBlazor/Pages/EditUser.razor b/Project/adminBlazor/adminBlazor/Pages/EditUser.razor
index 8c47877..dd9213a 100644
--- a/Project/adminBlazor/adminBlazor/Pages/EditUser.razor
+++ b/Project/adminBlazor/adminBlazor/Pages/EditUser.razor
@@ -12,18 +12,21 @@
         <label for="name">
             Name:
             <InputText id="name" @bind-Value="user.Name"  />
+            <ValidationMessage For="@(() => user.Name)" />
         </label>
     </p>
     <p>
         <label for="password">
             Password:
             <InputText id="password" @bind-Value="user.Password" type="password" />
+            <ValidationMessage For="@(() => user.Password)" />
         </label>
     </p>
     <p>
         <label for="max-durability">
             Email:
             <InputText id="max-durability" @bind-Value="user.Email" />
+            <ValidationMessage For="@(() => user.Email)" />
         </label>
     </p>
     @*
@@ -51,6 +54,7 @@
                     <label>
                         <input type="checkbox" @onchange="@(e => RolesCategoriesChange(role, e.Value))" checked="@(user.Roles.Contains(currentItem) ? "checked" : null)" />
                     @currentItem
+                    <ValidationMessage For="@(() => user.Roles)" />
                 </label>
                 <br />
             }
@@ -60,18 +64,21 @@
         <label>
             Nickname
             <InputText @bind-Value="user.Nickname" />
+            <ValidationMessage For="@(() => user.Nickname)" />
         </label>
     </p>
     <p>
         <label>
             Surname
             <InputText @bind-Value="user.Surname" />
+            <ValidationMessage For="@(() => user.Surname)" />
         </label>
     </p>
     <p>
         <label>
             Image
             <InputFile OnChange="@LoadImage" accept=".png, .jpeg" />
+            <ValidationMessage For="@(() => user.Image)" />
         </label>
     </p>
     <p>
@@ -84,12 +91,14 @@
         <label>
             ExtraTime
             <InputCheckbox @bind-Value="user.ExtraTime" />
+            <ValidationMessage For="@(() => user.ExtraTime)" />
         </label>
     </p>
     <p>
         <label>
             Group
             <InputNumber @bind-Value="user.Group" />
+            <ValidationMessage For="@(() => user.Group)" />
         </label>
     </p>
 
diff --git a/Project/adminBlazor/adminBlazor/Pages/EditUser.razor.cs b/Project/adminBlazor/adminBlazor/Pages/EditUser.razor.cs
index 90e61e8..255ea02 100644
--- a/Project/adminBlazor/adminBlazor/Pages/EditUser.razor.cs
+++ b/Project/adminBlazor/adminBlazor/Pages/EditUser.razor.cs
@@ -55,7 +55,7 @@ namespace adminBlazor.Pages
         {
             var item = await DataService.GetById(Id);
 
-               var fileContent = await File.ReadAllBytesAsync($"{WebHostEnvironment.WebRootPath}/images/default.png");
+               var fileContent = await File.ReadAllBytesAsync($"{WebHostEnvironment.WebRootPath}/images/default.jpeg");
 
             // Set the model with the item
 
diff --git a/Project/adminBlazor/adminBlazor/Pages/List.razor b/Project/adminBlazor/adminBlazor/Pages/List.razor
index 8d31060..89c23a7 100644
--- a/Project/adminBlazor/adminBlazor/Pages/List.razor
+++ b/Project/adminBlazor/adminBlazor/Pages/List.razor
@@ -30,7 +30,7 @@
             }
             else
             {
-                <img src="images/default.png" class="img-thumbnail" style="max-width: 150px" />
+                <img src="images/default.jpeg" class="img-thumbnail" style="max-width: 150px" />
             }
         </DisplayTemplate>
     </DataGridColumn>
diff --git a/Project/adminBlazor/adminBlazor/wwwroot/images/img_profil.jpeg b/Project/adminBlazor/adminBlazor/wwwroot/images/default.jpeg
similarity index 100%
rename from Project/adminBlazor/adminBlazor/wwwroot/images/img_profil.jpeg
rename to Project/adminBlazor/adminBlazor/wwwroot/images/default.jpeg
diff --git a/Project/adminBlazor/adminBlazor/wwwroot/images/default.png b/Project/adminBlazor/adminBlazor/wwwroot/images/default1.png
similarity index 100%
rename from Project/adminBlazor/adminBlazor/wwwroot/images/default.png
rename to Project/adminBlazor/adminBlazor/wwwroot/images/default1.png