Merge branch 'blazor' of https://codefirst.iut.uca.fr/git/antoine.jourdain/SAE_2A_Anglais into blazor

Project/adminBlazor/adminBlazor/Factories/UserFactory.cs

@@ -26,9 +26,9 @@ namespace adminBlazor.Factories
             };
         }
 
-        public static UserModel Create(UserModel user)
+        public static User Create(UserModel user)
         {
-            return new UserModel
+            return new User
             {
                 Id = user.Id,
                 Name = user.Name,
@@ -55,13 +55,12 @@ namespace adminBlazor.Factories
             if (!string.IsNullOrEmpty(user.Nickname))
                 item.Nickname = user.Nickname;
 
-            if (user.ExtraTime!=null)
                 item.ExtraTime = user.ExtraTime;
 
             if (!string.IsNullOrEmpty(user.Image))
                 item.Image = user.Image;
 
-            if (user.Group!=null)
+            if (user.Group != 0)
                 item.Group = user.Group;
 
             if (!string.IsNullOrEmpty(user.Password))
@@ -71,8 +70,33 @@ namespace adminBlazor.Factories
                 item.Email = user.Email;
 
             if (user.Roles != null)
-                item.Roles = user.Roles;
+            {
+
+                if (user.Roles.Contains("student"))
+                {
+                    item.Roles = new List<string>();
+                    item.Roles.Add("Student");
+                }
+                else
+                {
+                    if (user.Roles.Contains("teacher") || user.Roles.Contains("admin"))
+                    {
+                        item.Roles = new List<string>();
+                        if (user.Roles.Contains("teacher"))
+                        {
+                            item.Roles.Add("Teacher");
+                        }
+                        if (user.Roles.Contains("admin"))
+                        {
+                            item.Roles.Add("Admin");
+                        }
+                    }
+                }
+
             }
                             
                 }
             }
+
+    }
+

Project/adminBlazor/adminBlazor/Pages/Add.razor.cs

@@ -3,6 +3,7 @@ using Microsoft.AspNetCore.Components.Forms;
 using Microsoft.AspNetCore.Components;
 using adminBlazor.Models;
 using Microsoft.AspNetCore.Mvc.RazorPages;
+using adminBlazor.Services;
 
 namespace adminBlazor.Pages
 {
@@ -12,6 +13,8 @@ namespace adminBlazor.Pages
         public NavigationManager NavigationManager { get; set; }
         [Inject]
         public ILocalStorageService LocalStorage { get; set; }
+        [Inject]
+        public IDataService DataService { get; set; }
 
         [Inject]
         public IWebHostEnvironment WebHostEnvironment { get; set; }
@@ -33,44 +36,8 @@ namespace adminBlazor.Pages
 
         private async void HandleValidSubmit()
         {
-            // Get the current data
-            var currentData = await LocalStorage.GetItemAsync<List<UserModel>>("data");
-
-            // Simulate the Id
-            user.Id = currentData.Max(s => s.Id) + 1;
-
-            // Add the item to the current data
-            currentData.Add(new UserModel
-            {
-                Id = user.Id,
-                Name = user.Name,
-                Surname = user.Surname,
-                Nickname = user.Nickname,
-                ExtraTime = user.ExtraTime,
-                Image = user.Image,
-                Group = user.Group,
-                Password = user.Password,
-                Email = user.Email,
-                Roles = user.Roles
-            });
-
-            // Save the image
-            var imagePathInfo = new DirectoryInfo($"{WebHostEnvironment.WebRootPath}/images");
-
-            // Check if the folder "images" exist
-            if (!imagePathInfo.Exists)
-            {
-                imagePathInfo.Create();
-            }
-
-            // Determine the image name
-            var fileName = new FileInfo($"{imagePathInfo}/{user.Image}.png");
-
-            // Write the file content
-           //await File.WriteAllBytesAsync(fileName.FullName, users.Image);
+            await DataService.Add(user);
             
-            // Save the data
-            await LocalStorage.SetItemAsync("data", currentData);
 
             NavigationManager.NavigateTo("list");
         }

Project/adminBlazor/adminBlazor/Pages/EditUser.razor

@@ -47,16 +47,9 @@
             @foreach (var role in roles)
             {
                 var currentItem = role; // Capturer la variable locale pour éviter les problèmes de fermeture
-                @if (currentItem == "student")
-                {
+
                     <label>
                         <input type="checkbox" @onchange="@(e => RolesCategoriesChange(role, e.Value))" checked="@(user.Roles.Contains(currentItem) ? "checked" : null)" />
-                        Student
-                    </label>
-                    break;
-                }
-                <label>
-                    <input type="checkbox" @onchange="@(e => RolesCategoriesChange(role, e.Value))" disabled="@disableOtherCheckboxes" checked="@(user.Roles.Contains(currentItem) ? "checked" : null)" />
                     @currentItem
                 </label>
                 <br />

Project/adminBlazor/adminBlazor/Pages/EditUser.razor.cs

@@ -23,6 +23,8 @@ namespace adminBlazor.Pages
         [Inject]
         public IWebHostEnvironment WebHostEnvironment { get; set; }
 
+        public User currUser;
+
 
         /// <summary>
         /// The default enchant categories.
@@ -52,6 +54,7 @@ namespace adminBlazor.Pages
         protected override async Task OnInitializedAsync()
         {
             var item = await DataService.GetById(Id);
+            // currentUser = item;
             //    var fileContent = await File.ReadAllBytesAsync($"{WebHostEnvironment.WebRootPath}/images/default.png");
 
             if (File.Exists($"{WebHostEnvironment.WebRootPath}/images/{user.Name}.png"))
@@ -106,7 +109,7 @@ namespace adminBlazor.Pages
                 {
                     // Désactiver les autres cases à cocher si "Étudiant" est décochée
                     disableOtherCheckboxes = false;
-                    user.Roles.Remove(currentItem);
+                    //user.Roles.Remove(currentItem);
                 }
             }
         }
@@ -126,13 +129,12 @@ namespace adminBlazor.Pages
             {
                 // Sinon, activer les autres cases
                 disableOtherCheckboxes = false;
-                user.Roles.Remove(currentItem);
+                //user.Roles.Remove(currentItem);
             }
         }
         private void RolesCategoriesChange(string item, object checkedValue)
         {
-            if (item == "student")
-            {
+
             isStudentChecked = (bool)checkedValue;
 
             if (isStudentChecked)
@@ -148,29 +150,9 @@ namespace adminBlazor.Pages
             {
                 // Désactiver les autres cases à cocher si "Étudiant" est décochée
                 disableOtherCheckboxes = false;
-                    user.Roles.Remove(item);
-                }
-            }
-            else
-            {
-                if (disableOtherCheckboxes)
-                {
-                    //la case student a été coché ducoup on n'ajoute pas les autres rôles cochés
-                    return;
-                    if ((bool)checkedValue)
-                    {
-                        if (!user.Roles.Contains(item))
-                        {
-                            user.Roles.Add(item);
-                        }
-                    }
-                    else
-                    {
-                        user.Roles.Remove(item);
-                    }
-                }
-            }
+                //user.Roles.Remove(item);
             }
         }
 
     }
+}

Project/adminBlazor/adminBlazor/Services/DataLocalService.cs

@@ -30,9 +30,35 @@ namespace adminBlazor.Services
             _localStorage = localStorage; // Assure-toi que LocalStorage est initialisé correctement ici
         }
 
-        public Task Add(User model)
+        public async Task Add(UserModel model)
         {
-            throw new NotImplementedException();
+            var currentData = await _localStorage.GetItemAsync<List<User>>("data");
+
+            // Simulate the Id
+            model.Id = currentData.Max(s => s.Id) + 1;
+
+            // Add the item to the current data
+            currentData.Add(UserFactory.Create(model));
+
+            // Save the image
+            var imagePathInfo = new DirectoryInfo($"{_webHostEnvironment.WebRootPath}/images");
+
+            // Check if the folder "images" exist
+            if (!imagePathInfo.Exists)
+            {
+                imagePathInfo.Create();
+            }
+
+            // Determine the image name
+            var fileName = new FileInfo($"{imagePathInfo}/{model.Name}.png");
+
+            // Write the file content
+            //await File.WriteAllBytesAsync(fileName.FullName, model.ImageContent);
+
+            // Save the data
+            await _localStorage.SetItemAsync("data", currentData);
+
+
         }
 
         public Task<int> Count()
@@ -64,7 +90,7 @@ namespace adminBlazor.Services
         public async Task Update(int id, UserModel model)
         {
             // Get the current data
-            var currentData = await _localStorage.GetItemAsync<List<User>>("data");
+            var currentData = await _localStorage.GetItemAsync<User[]>("data");
 
             var user = currentData.FirstOrDefault(w => w.Id == id);
 

Project/adminBlazor/adminBlazor/Services/IDataService.cs

@@ -7,7 +7,7 @@ namespace adminBlazor.Services
     public interface IDataService
     {
 
-        Task Add(User model);
+        Task Add(UserModel model);
 
         Task<int> Count();