From 25bddc1bbfaafa7f31a95e1059fe221e41af9245 Mon Sep 17 00:00:00 2001
From: "maxence.guitard" <maxence.guitard@etu.uca.fr>
Date: Mon, 18 Dec 2023 11:52:13 +0100
Subject: [PATCH] fix : conflit

---
 .../Pages/Admins/EditAdministrator.razor.cs   |  2 +-
 .../Pages/Chapters/EditChapter.razor.cs       | 83 ++++++++++---------
 2 files changed, 43 insertions(+), 42 deletions(-)

diff --git a/Blazor/Blazor/Pages/Admins/EditAdministrator.razor.cs b/Blazor/Blazor/Pages/Admins/EditAdministrator.razor.cs
index 978efdf..7108abc 100644
--- a/Blazor/Blazor/Pages/Admins/EditAdministrator.razor.cs
+++ b/Blazor/Blazor/Pages/Admins/EditAdministrator.razor.cs
@@ -66,7 +66,7 @@ namespace Blazor.Pages.Admins
             }
 
 
-            Logger.LogInformation("Chapter '{administratorsModelName}' edited", administratorsModel.Username);
+            Logger.LogInformation("Chapter '{administratorModelUserame}' edited", administratorModel.Username);
 
             NavigationManager.NavigateTo("administrators");
         }
diff --git a/Blazor/Blazor/Pages/Chapters/EditChapter.razor.cs b/Blazor/Blazor/Pages/Chapters/EditChapter.razor.cs
index 3a14c5d..232d151 100644
--- a/Blazor/Blazor/Pages/Chapters/EditChapter.razor.cs
+++ b/Blazor/Blazor/Pages/Chapters/EditChapter.razor.cs
@@ -1,46 +1,46 @@
-using Blazor.Models;
-using Blazor.Services;
-using Microsoft.AspNetCore.Components;
-
-namespace Blazor.Pages.Chapters;
-
-public partial class EditChapter
-{
-    [Parameter]
-    public int Id { get; set; }
-
-    private ChapterModel chapterModel = new();
-
-    [Inject]
-    public IDataService DataService { get; set; }
-
-    [Inject]
-    public NavigationManager NavigationManager { get; set; }
-
-    [Inject]
-    public IWebHostEnvironment WebHostEnvironment { get; set; }
-
+using Blazor.Models;
+using Blazor.Services;
+using Microsoft.AspNetCore.Components;
+
+namespace Blazor.Pages.Chapters;
+
+public partial class EditChapter
+{
+    [Parameter]
+    public int Id { get; set; }
+
+    private ChapterModel chapterModel = new();
+
+    [Inject]
+    public IDataService DataService { get; set; }
+
+    [Inject]
+    public NavigationManager NavigationManager { get; set; }
+
+    [Inject]
+    public IWebHostEnvironment WebHostEnvironment { get; set; }
+
     [Inject]
     public ILogger<EditChapter> Logger { get; set; }
 
     private string oldChapterName { get; set; }
 
-    protected override async Task OnInitializedAsync()
-    {
-        var chapter = await DataService.GetById(Id);
+    protected override async Task OnInitializedAsync()
+    {
+        var chapter = await DataService.GetById(Id);
         oldChapterName = chapter.Name;
-
-        // Set the model with the chapter
-        chapterModel = new ChapterModel
-        {
-            Id = chapter.Id,
-            Name = chapter.Name
-        };
-    }
-
-    private async void HandleValidSubmit()
-    {
-        await DataService.Update(Id, chapterModel);
+
+        // Set the model with the chapter
+        chapterModel = new ChapterModel
+        {
+            Id = chapter.Id,
+            Name = chapter.Name
+        };
+    }
+
+    private async void HandleValidSubmit()
+    {
+        await DataService.Update(Id, chapterModel);
         
         var formData = new List<KeyValuePair<string, string>>();
         formData.Add(new KeyValuePair<string, string>("name", chapterModel.Name));
@@ -65,7 +65,8 @@ public partial class EditChapter
             {
                 var errorResponse = await response.Content.ReadAsStringAsync();
             }
-        }
-        NavigationManager.NavigateTo("chapters");
-    }
-}
+        }
+        NavigationManager.NavigateTo("chapters");
+    }
+}
+