From ed3bf80b1bd95328423516852c0df5057b55936d Mon Sep 17 00:00:00 2001
From: Natalia Portillo <claunia@claunia.com>
Date: Sun, 9 Aug 2020 20:24:38 +0100
Subject: [PATCH] Fix method naming.

---
 Marechai/Marechai.csproj                             |  2 +-
 Marechai/Pages/Admin/Details/Book.razor.cs           |  8 +++++---
 Marechai/Pages/Admin/Details/Document.razor.cs       |  8 +++++---
 Marechai/Pages/Admin/Details/Magazine.razor          |  6 +++---
 Marechai/Pages/Admin/Details/Magazine.razor.cs       | 12 ++++++------
 Marechai/Pages/Admin/Details/SoftwareFamily.razor    |  6 +++---
 Marechai/Pages/Admin/Details/SoftwareFamily.razor.cs | 12 ++++++------
 Marechai/Pages/Admin/Details/SoftwareVariant.razor   |  6 +++---
 .../Pages/Admin/Details/SoftwareVariant.razor.cs     | 12 ++++++------
 Marechai/Pages/Admin/Details/SoftwareVersion.razor   |  6 +++---
 .../Pages/Admin/Details/SoftwareVersion.razor.cs     | 12 ++++++------
 11 files changed, 47 insertions(+), 43 deletions(-)

diff --git a/Marechai/Marechai.csproj b/Marechai/Marechai.csproj
index 7bc348be..dd3b3e58 100644
--- a/Marechai/Marechai.csproj
+++ b/Marechai/Marechai.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <Version>4.0.0.1820</Version>
+    <Version>4.0.0.1821</Version>
     <Company>Canary Islands Computer Museum</Company>
     <Copyright>Copyright © 2003-2020 Natalia Portillo</Copyright>
     <Product>Canary Islands Computer Museum Website</Product>
diff --git a/Marechai/Pages/Admin/Details/Book.razor.cs b/Marechai/Pages/Admin/Details/Book.razor.cs
index e79c86a3..60828c47 100644
--- a/Marechai/Pages/Admin/Details/Book.razor.cs
+++ b/Marechai/Pages/Admin/Details/Book.razor.cs
@@ -287,9 +287,11 @@ namespace Marechai.Pages.Admin.Details
 
         void ModalClosing(ModalClosingEventArgs obj)
         {
-            _deleteInProgress      = false;
-            _deletingCompanyByBook = false;
-            _currentCompanyByBook  = null;
+            _deleteInProgress            = false;
+            _deletingCompanyByBook       = false;
+            _currentCompanyByBook        = null;
+            _deletingBookByMachineFamily = false;
+            _currentCompanyByBook        = null;
         }
 
         void HideModal() => _frmDelete.Hide();
diff --git a/Marechai/Pages/Admin/Details/Document.razor.cs b/Marechai/Pages/Admin/Details/Document.razor.cs
index daed6fe5..08b24260 100644
--- a/Marechai/Pages/Admin/Details/Document.razor.cs
+++ b/Marechai/Pages/Admin/Details/Document.razor.cs
@@ -236,9 +236,11 @@ namespace Marechai.Pages.Admin.Details
 
         void ModalClosing(ModalClosingEventArgs obj)
         {
-            _deleteInProgress          = false;
-            _deletingCompanyByDocument = false;
-            _currentCompanyByDocument  = null;
+            _deleteInProgress                = false;
+            _deletingCompanyByDocument       = false;
+            _currentCompanyByDocument        = null;
+            _deletingDocumentByMachineFamily = false;
+            _currentDocumentByMachineFamily  = null;
         }
 
         void HideModal() => _frmDelete.Hide();
diff --git a/Marechai/Pages/Admin/Details/Magazine.razor b/Marechai/Pages/Admin/Details/Magazine.razor
index cdbb06e1..ee5b2437 100644
--- a/Marechai/Pages/Admin/Details/Magazine.razor
+++ b/Marechai/Pages/Admin/Details/Magazine.razor
@@ -186,8 +186,8 @@
                     }
                 </Select>
             </Field>
-            <Button Color="Color.Primary" Clicked="@CancelAddCpu" Disabled="@_savingCompany">@L["Cancel"]</Button>
-            <Button Color="Color.Success" Clicked="@ConfirmAddCpu" Disabled="@_savingCompany">@L["Add"]</Button>
+            <Button Color="Color.Primary" Clicked="@CancelAddCompany" Disabled="@_savingCompany">@L["Cancel"]</Button>
+            <Button Color="Color.Success" Clicked="@ConfirmAddCompany" Disabled="@_savingCompany">@L["Add"]</Button>
         </div>
     }
     @if (_magazineCompanies?.Count > 0)
@@ -216,7 +216,7 @@
                             @item.Role
                         </td>
                         <td>
-                            <Button Color="Color.Danger" Clicked="() => {ShowCpuDeleteModal(item.Id);}" Disabled="@_addingCompany">@L["Delete"]</Button>
+                            <Button Color="Color.Danger" Clicked="() => {ShowCompanyDeleteModal(item.Id);}" Disabled="@_addingCompany">@L["Delete"]</Button>
                         </td>
                     </tr>
                 }
diff --git a/Marechai/Pages/Admin/Details/Magazine.razor.cs b/Marechai/Pages/Admin/Details/Magazine.razor.cs
index b3a14d3a..072583fe 100644
--- a/Marechai/Pages/Admin/Details/Magazine.razor.cs
+++ b/Marechai/Pages/Admin/Details/Magazine.razor.cs
@@ -182,19 +182,19 @@ namespace Marechai.Pages.Admin.Details
             _addingCompanyId = _companies.First().Id;
         }
 
-        void CancelAddCpu()
+        void CancelAddCompany()
         {
             _addingCompany   = false;
             _savingCompany   = false;
             _addingCompanyId = null;
         }
 
-        async Task ConfirmAddCpu()
+        async Task ConfirmAddCompany()
         {
             if(_addingCompanyId is null ||
                _addingCompanyId <= 0)
             {
-                CancelAddCpu();
+                CancelAddCompany();
 
                 return;
             }
@@ -220,7 +220,7 @@ namespace Marechai.Pages.Admin.Details
             StateHasChanged();
         }
 
-        void ShowCpuDeleteModal(long itemId)
+        void ShowCompanyDeleteModal(long itemId)
         {
             _currentCompanyByMagazine  = _magazineCompanies.FirstOrDefault(n => n.Id == itemId);
             _deletingCompanyByMagazine = true;
@@ -245,10 +245,10 @@ namespace Marechai.Pages.Admin.Details
         async void ConfirmDelete()
         {
             if(_deletingCompanyByMagazine)
-                await ConfirmDeleteCpuByMachine();
+                await ConfirmDeleteCompanyByMachine();
         }
 
-        async Task ConfirmDeleteCpuByMachine()
+        async Task ConfirmDeleteCompanyByMachine()
         {
             if(_currentCompanyByMagazine is null)
                 return;
diff --git a/Marechai/Pages/Admin/Details/SoftwareFamily.razor b/Marechai/Pages/Admin/Details/SoftwareFamily.razor
index 9f3523b0..2bad85d3 100644
--- a/Marechai/Pages/Admin/Details/SoftwareFamily.razor
+++ b/Marechai/Pages/Admin/Details/SoftwareFamily.razor
@@ -143,8 +143,8 @@
                     }
                 </Select>
             </Field>
-            <Button Color="Color.Primary" Clicked="@CancelAddCpu" Disabled="@_savingCompany">@L["Cancel"]</Button>
-            <Button Color="Color.Success" Clicked="@ConfirmAddCpu" Disabled="@_savingCompany">@L["Add"]</Button>
+            <Button Color="Color.Primary" Clicked="@CancelAddCompany" Disabled="@_savingCompany">@L["Cancel"]</Button>
+            <Button Color="Color.Success" Clicked="@ConfirmAddCompany" Disabled="@_savingCompany">@L["Add"]</Button>
         </div>
     }
     @if (_softwareFamilyCompanies?.Count > 0)
@@ -173,7 +173,7 @@
                             @item.Role
                         </td>
                         <td>
-                            <Button Color="Color.Danger" Clicked="() => {ShowCpuDeleteModal(item.Id);}" Disabled="@_addingCompany">@L["Delete"]</Button>
+                            <Button Color="Color.Danger" Clicked="() => {ShowCompanyDeleteModal(item.Id);}" Disabled="@_addingCompany">@L["Delete"]</Button>
                         </td>
                     </tr>
                 }
diff --git a/Marechai/Pages/Admin/Details/SoftwareFamily.razor.cs b/Marechai/Pages/Admin/Details/SoftwareFamily.razor.cs
index c0860351..5de188c0 100644
--- a/Marechai/Pages/Admin/Details/SoftwareFamily.razor.cs
+++ b/Marechai/Pages/Admin/Details/SoftwareFamily.razor.cs
@@ -163,19 +163,19 @@ namespace Marechai.Pages.Admin.Details
             _addingCompanyId = _companies.First().Id;
         }
 
-        void CancelAddCpu()
+        void CancelAddCompany()
         {
             _addingCompany   = false;
             _savingCompany   = false;
             _addingCompanyId = null;
         }
 
-        async Task ConfirmAddCpu()
+        async Task ConfirmAddCompany()
         {
             if(_addingCompanyId is null ||
                _addingCompanyId <= 0)
             {
-                CancelAddCpu();
+                CancelAddCompany();
 
                 return;
             }
@@ -201,7 +201,7 @@ namespace Marechai.Pages.Admin.Details
             StateHasChanged();
         }
 
-        void ShowCpuDeleteModal(ulong itemId)
+        void ShowCompanyDeleteModal(ulong itemId)
         {
             _currentCompanyBySoftwareFamily  = _softwareFamilyCompanies.FirstOrDefault(n => n.Id == itemId);
             _deletingCompanyBySoftwareFamily = true;
@@ -226,10 +226,10 @@ namespace Marechai.Pages.Admin.Details
         async void ConfirmDelete()
         {
             if(_deletingCompanyBySoftwareFamily)
-                await ConfirmDeleteCpuByMachine();
+                await ConfirmDeleteCompanyByMachine();
         }
 
-        async Task ConfirmDeleteCpuByMachine()
+        async Task ConfirmDeleteCompanyByMachine()
         {
             if(_currentCompanyBySoftwareFamily is null)
                 return;
diff --git a/Marechai/Pages/Admin/Details/SoftwareVariant.razor b/Marechai/Pages/Admin/Details/SoftwareVariant.razor
index 6b5cb2a4..b9d86089 100644
--- a/Marechai/Pages/Admin/Details/SoftwareVariant.razor
+++ b/Marechai/Pages/Admin/Details/SoftwareVariant.razor
@@ -346,8 +346,8 @@
                     }
                 </Select>
             </Field>
-            <Button Color="Color.Primary" Clicked="@CancelAddCpu" Disabled="@_savingCompany">@L["Cancel"]</Button>
-            <Button Color="Color.Success" Clicked="@ConfirmAddCpu" Disabled="@_savingCompany">@L["Add"]</Button>
+            <Button Color="Color.Primary" Clicked="@CancelAddCompany" Disabled="@_savingCompany">@L["Cancel"]</Button>
+            <Button Color="Color.Success" Clicked="@ConfirmAddCompany" Disabled="@_savingCompany">@L["Add"]</Button>
         </div>
     }
     @if (_softwareVariantCompanies?.Count > 0)
@@ -376,7 +376,7 @@
                             @item.Role
                         </td>
                         <td>
-                            <Button Color="Color.Danger" Clicked="() => {ShowCpuDeleteModal(item.Id);}" Disabled="@_addingCompany">@L["Delete"]</Button>
+                            <Button Color="Color.Danger" Clicked="() => {ShowCompanyDeleteModal(item.Id);}" Disabled="@_addingCompany">@L["Delete"]</Button>
                         </td>
                     </tr>
                 }
diff --git a/Marechai/Pages/Admin/Details/SoftwareVariant.razor.cs b/Marechai/Pages/Admin/Details/SoftwareVariant.razor.cs
index 5fef93a4..ba860682 100644
--- a/Marechai/Pages/Admin/Details/SoftwareVariant.razor.cs
+++ b/Marechai/Pages/Admin/Details/SoftwareVariant.razor.cs
@@ -234,19 +234,19 @@ namespace Marechai.Pages.Admin.Details
             _addingCompanyId = _companies.First().Id;
         }
 
-        void CancelAddCpu()
+        void CancelAddCompany()
         {
             _addingCompany   = false;
             _savingCompany   = false;
             _addingCompanyId = null;
         }
 
-        async Task ConfirmAddCpu()
+        async Task ConfirmAddCompany()
         {
             if(_addingCompanyId is null ||
                _addingCompanyId <= 0)
             {
-                CancelAddCpu();
+                CancelAddCompany();
 
                 return;
             }
@@ -272,7 +272,7 @@ namespace Marechai.Pages.Admin.Details
             StateHasChanged();
         }
 
-        void ShowCpuDeleteModal(ulong itemId)
+        void ShowCompanyDeleteModal(ulong itemId)
         {
             _currentCompanyBySoftwareVariant  = _softwareVariantCompanies.FirstOrDefault(n => n.Id == itemId);
             _deletingCompanyBySoftwareVariant = true;
@@ -297,10 +297,10 @@ namespace Marechai.Pages.Admin.Details
         async void ConfirmDelete()
         {
             if(_deletingCompanyBySoftwareVariant)
-                await ConfirmDeleteCpuByMachine();
+                await ConfirmDeleteCompanyByMachine();
         }
 
-        async Task ConfirmDeleteCpuByMachine()
+        async Task ConfirmDeleteCompanyByMachine()
         {
             if(_currentCompanyBySoftwareVariant is null)
                 return;
diff --git a/Marechai/Pages/Admin/Details/SoftwareVersion.razor b/Marechai/Pages/Admin/Details/SoftwareVersion.razor
index 1b467933..61eaa660 100644
--- a/Marechai/Pages/Admin/Details/SoftwareVersion.razor
+++ b/Marechai/Pages/Admin/Details/SoftwareVersion.razor
@@ -216,8 +216,8 @@
                     }
                 </Select>
             </Field>
-            <Button Color="Color.Primary" Clicked="@CancelAddCpu" Disabled="@_savingCompany">@L["Cancel"]</Button>
-            <Button Color="Color.Success" Clicked="@ConfirmAddCpu" Disabled="@_savingCompany">@L["Add"]</Button>
+            <Button Color="Color.Primary" Clicked="@CancelAddCompany" Disabled="@_savingCompany">@L["Cancel"]</Button>
+            <Button Color="Color.Success" Clicked="@ConfirmAddCompany" Disabled="@_savingCompany">@L["Add"]</Button>
         </div>
     }
     @if (_softwareVersionCompanies?.Count > 0)
@@ -246,7 +246,7 @@
                             @item.Role
                         </td>
                         <td>
-                            <Button Color="Color.Danger" Clicked="() => {ShowCpuDeleteModal(item.Id);}" Disabled="@_addingCompany">@L["Delete"]</Button>
+                            <Button Color="Color.Danger" Clicked="() => {ShowCompanyDeleteModal(item.Id);}" Disabled="@_addingCompany">@L["Delete"]</Button>
                         </td>
                     </tr>
                 }
diff --git a/Marechai/Pages/Admin/Details/SoftwareVersion.razor.cs b/Marechai/Pages/Admin/Details/SoftwareVersion.razor.cs
index 39025b3e..0c5d9bec 100644
--- a/Marechai/Pages/Admin/Details/SoftwareVersion.razor.cs
+++ b/Marechai/Pages/Admin/Details/SoftwareVersion.razor.cs
@@ -194,19 +194,19 @@ namespace Marechai.Pages.Admin.Details
             _addingCompanyId = _companies.First().Id;
         }
 
-        void CancelAddCpu()
+        void CancelAddCompany()
         {
             _addingCompany   = false;
             _savingCompany   = false;
             _addingCompanyId = null;
         }
 
-        async Task ConfirmAddCpu()
+        async Task ConfirmAddCompany()
         {
             if(_addingCompanyId is null ||
                _addingCompanyId <= 0)
             {
-                CancelAddCpu();
+                CancelAddCompany();
 
                 return;
             }
@@ -232,7 +232,7 @@ namespace Marechai.Pages.Admin.Details
             StateHasChanged();
         }
 
-        void ShowCpuDeleteModal(ulong itemId)
+        void ShowCompanyDeleteModal(ulong itemId)
         {
             _currentCompanyBySoftwareVersion  = _softwareVersionCompanies.FirstOrDefault(n => n.Id == itemId);
             _deletingCompanyBySoftwareVersion = true;
@@ -257,10 +257,10 @@ namespace Marechai.Pages.Admin.Details
         async void ConfirmDelete()
         {
             if(_deletingCompanyBySoftwareVersion)
-                await ConfirmDeleteCpuByMachine();
+                await ConfirmDeleteCompanyByMachine();
         }
 
-        async Task ConfirmDeleteCpuByMachine()
+        async Task ConfirmDeleteCompanyByMachine()
         {
             if(_currentCompanyBySoftwareVersion is null)
                 return;