claunia/marechai
1
0
Fork 0
mirror of https://github.com/claunia/marechai.git synced 2025-12-16 19:14:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix method naming.

Browse Source
This commit is contained in:
Natalia Portillo
2020-08-09 20:24:38 +01:00
parent 139618f41f
commit ed3bf80b1b
11 changed files with 47 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Marechai/Marechai.csproj
View File

@@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web"> <Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>netcoreapp3.1</TargetFramework>
<Version>4.0.0.1820</Version> <Version>4.0.0.1821</Version>
<Company>Canary Islands Computer Museum</Company> <Company>Canary Islands Computer Museum</Company>
<Copyright>Copyright © 2003-2020 Natalia Portillo</Copyright> <Copyright>Copyright © 2003-2020 Natalia Portillo</Copyright>
<Product>Canary Islands Computer Museum Website</Product> <Product>Canary Islands Computer Museum Website</Product>

8
Marechai/Pages/Admin/Details/Book.razor.cs
View File

@@ -287,9 +287,11 @@ namespace Marechai.Pages.Admin.Details
void ModalClosing(ModalClosingEventArgs obj) void ModalClosing(ModalClosingEventArgs obj)
{ {
_deleteInProgress = false; _deleteInProgress = false;
_deletingCompanyByBook = false; _deletingCompanyByBook = false;
_currentCompanyByBook = null; _currentCompanyByBook = null;
_deletingBookByMachineFamily = false;
_currentCompanyByBook = null;
} }
void HideModal() => _frmDelete.Hide(); void HideModal() => _frmDelete.Hide();

8
Marechai/Pages/Admin/Details/Document.razor.cs
View File

@@ -236,9 +236,11 @@ namespace Marechai.Pages.Admin.Details
void ModalClosing(ModalClosingEventArgs obj) void ModalClosing(ModalClosingEventArgs obj)
{ {
_deleteInProgress = false; _deleteInProgress = false;
_deletingCompanyByDocument = false; _deletingCompanyByDocument = false;
_currentCompanyByDocument = null; _currentCompanyByDocument = null;
_deletingDocumentByMachineFamily = false;
_currentDocumentByMachineFamily = null;
} }
void HideModal() => _frmDelete.Hide(); void HideModal() => _frmDelete.Hide();

6
Marechai/Pages/Admin/Details/Magazine.razor
View File

@@ -186,8 +186,8 @@
} }
</Select> </Select>
</Field> </Field>
<Button Color="Color.Primary" Clicked="@CancelAddCpu" Disabled="@_savingCompany">@L["Cancel"]</Button> <Button Color="Color.Primary" Clicked="@CancelAddCompany" Disabled="@_savingCompany">@L["Cancel"]</Button>
<Button Color="Color.Success" Clicked="@ConfirmAddCpu" Disabled="@_savingCompany">@L["Add"]</Button> <Button Color="Color.Success" Clicked="@ConfirmAddCompany" Disabled="@_savingCompany">@L["Add"]</Button>
</div> </div>
} }
@if (_magazineCompanies?.Count > 0) @if (_magazineCompanies?.Count > 0)
@@ -216,7 +216,7 @@
@item.Role @item.Role
</td> </td>
<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> </td>
</tr> </tr>
} }

12
Marechai/Pages/Admin/Details/Magazine.razor.cs
View File

@@ -182,19 +182,19 @@ namespace Marechai.Pages.Admin.Details
_addingCompanyId = _companies.First().Id; _addingCompanyId = _companies.First().Id;
} }
void CancelAddCpu() void CancelAddCompany()
{ {
_addingCompany = false; _addingCompany = false;
_savingCompany = false; _savingCompany = false;
_addingCompanyId = null; _addingCompanyId = null;
} }
async Task ConfirmAddCpu() async Task ConfirmAddCompany()
{ {
if(_addingCompanyId is null || if(_addingCompanyId is null ||
_addingCompanyId <= 0) _addingCompanyId <= 0)
{ {
CancelAddCpu(); CancelAddCompany();
return; return;
} }
@@ -220,7 +220,7 @@ namespace Marechai.Pages.Admin.Details
StateHasChanged(); StateHasChanged();
} }
void ShowCpuDeleteModal(long itemId) void ShowCompanyDeleteModal(long itemId)
{ {
_currentCompanyByMagazine = _magazineCompanies.FirstOrDefault(n => n.Id == itemId); _currentCompanyByMagazine = _magazineCompanies.FirstOrDefault(n => n.Id == itemId);
_deletingCompanyByMagazine = true; _deletingCompanyByMagazine = true;
@@ -245,10 +245,10 @@ namespace Marechai.Pages.Admin.Details
async void ConfirmDelete() async void ConfirmDelete()
{ {
if(_deletingCompanyByMagazine) if(_deletingCompanyByMagazine)
await ConfirmDeleteCpuByMachine(); await ConfirmDeleteCompanyByMachine();
} }
async Task ConfirmDeleteCpuByMachine() async Task ConfirmDeleteCompanyByMachine()
{ {
if(_currentCompanyByMagazine is null) if(_currentCompanyByMagazine is null)
return; return;

6
Marechai/Pages/Admin/Details/SoftwareFamily.razor
View File

@@ -143,8 +143,8 @@
} }
</Select> </Select>
</Field> </Field>
<Button Color="Color.Primary" Clicked="@CancelAddCpu" Disabled="@_savingCompany">@L["Cancel"]</Button> <Button Color="Color.Primary" Clicked="@CancelAddCompany" Disabled="@_savingCompany">@L["Cancel"]</Button>
<Button Color="Color.Success" Clicked="@ConfirmAddCpu" Disabled="@_savingCompany">@L["Add"]</Button> <Button Color="Color.Success" Clicked="@ConfirmAddCompany" Disabled="@_savingCompany">@L["Add"]</Button>
</div> </div>
} }
@if (_softwareFamilyCompanies?.Count > 0) @if (_softwareFamilyCompanies?.Count > 0)
@@ -173,7 +173,7 @@
@item.Role @item.Role
</td> </td>
<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> </td>
</tr> </tr>
} }

12
Marechai/Pages/Admin/Details/SoftwareFamily.razor.cs
View File

@@ -163,19 +163,19 @@ namespace Marechai.Pages.Admin.Details
_addingCompanyId = _companies.First().Id; _addingCompanyId = _companies.First().Id;
} }
void CancelAddCpu() void CancelAddCompany()
{ {
_addingCompany = false; _addingCompany = false;
_savingCompany = false; _savingCompany = false;
_addingCompanyId = null; _addingCompanyId = null;
} }
async Task ConfirmAddCpu() async Task ConfirmAddCompany()
{ {
if(_addingCompanyId is null || if(_addingCompanyId is null ||
_addingCompanyId <= 0) _addingCompanyId <= 0)
{ {
CancelAddCpu(); CancelAddCompany();
return; return;
} }
@@ -201,7 +201,7 @@ namespace Marechai.Pages.Admin.Details
StateHasChanged(); StateHasChanged();
} }
void ShowCpuDeleteModal(ulong itemId) void ShowCompanyDeleteModal(ulong itemId)
{ {
_currentCompanyBySoftwareFamily = _softwareFamilyCompanies.FirstOrDefault(n => n.Id == itemId); _currentCompanyBySoftwareFamily = _softwareFamilyCompanies.FirstOrDefault(n => n.Id == itemId);
_deletingCompanyBySoftwareFamily = true; _deletingCompanyBySoftwareFamily = true;
@@ -226,10 +226,10 @@ namespace Marechai.Pages.Admin.Details
async void ConfirmDelete() async void ConfirmDelete()
{ {
if(_deletingCompanyBySoftwareFamily) if(_deletingCompanyBySoftwareFamily)
await ConfirmDeleteCpuByMachine(); await ConfirmDeleteCompanyByMachine();
} }
async Task ConfirmDeleteCpuByMachine() async Task ConfirmDeleteCompanyByMachine()
{ {
if(_currentCompanyBySoftwareFamily is null) if(_currentCompanyBySoftwareFamily is null)
return; return;

6
Marechai/Pages/Admin/Details/SoftwareVariant.razor
View File

@@ -346,8 +346,8 @@
} }
</Select> </Select>
</Field> </Field>
<Button Color="Color.Primary" Clicked="@CancelAddCpu" Disabled="@_savingCompany">@L["Cancel"]</Button> <Button Color="Color.Primary" Clicked="@CancelAddCompany" Disabled="@_savingCompany">@L["Cancel"]</Button>
<Button Color="Color.Success" Clicked="@ConfirmAddCpu" Disabled="@_savingCompany">@L["Add"]</Button> <Button Color="Color.Success" Clicked="@ConfirmAddCompany" Disabled="@_savingCompany">@L["Add"]</Button>
</div> </div>
} }
@if (_softwareVariantCompanies?.Count > 0) @if (_softwareVariantCompanies?.Count > 0)
@@ -376,7 +376,7 @@
@item.Role @item.Role
</td> </td>
<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> </td>
</tr> </tr>
} }

12
Marechai/Pages/Admin/Details/SoftwareVariant.razor.cs
View File

@@ -234,19 +234,19 @@ namespace Marechai.Pages.Admin.Details
_addingCompanyId = _companies.First().Id; _addingCompanyId = _companies.First().Id;
} }
void CancelAddCpu() void CancelAddCompany()
{ {
_addingCompany = false; _addingCompany = false;
_savingCompany = false; _savingCompany = false;
_addingCompanyId = null; _addingCompanyId = null;
} }
async Task ConfirmAddCpu() async Task ConfirmAddCompany()
{ {
if(_addingCompanyId is null || if(_addingCompanyId is null ||
_addingCompanyId <= 0) _addingCompanyId <= 0)
{ {
CancelAddCpu(); CancelAddCompany();
return; return;
} }
@@ -272,7 +272,7 @@ namespace Marechai.Pages.Admin.Details
StateHasChanged(); StateHasChanged();
} }
void ShowCpuDeleteModal(ulong itemId) void ShowCompanyDeleteModal(ulong itemId)
{ {
_currentCompanyBySoftwareVariant = _softwareVariantCompanies.FirstOrDefault(n => n.Id == itemId); _currentCompanyBySoftwareVariant = _softwareVariantCompanies.FirstOrDefault(n => n.Id == itemId);
_deletingCompanyBySoftwareVariant = true; _deletingCompanyBySoftwareVariant = true;
@@ -297,10 +297,10 @@ namespace Marechai.Pages.Admin.Details
async void ConfirmDelete() async void ConfirmDelete()
{ {
if(_deletingCompanyBySoftwareVariant) if(_deletingCompanyBySoftwareVariant)
await ConfirmDeleteCpuByMachine(); await ConfirmDeleteCompanyByMachine();
} }
async Task ConfirmDeleteCpuByMachine() async Task ConfirmDeleteCompanyByMachine()
{ {
if(_currentCompanyBySoftwareVariant is null) if(_currentCompanyBySoftwareVariant is null)
return; return;

6
Marechai/Pages/Admin/Details/SoftwareVersion.razor
View File

@@ -216,8 +216,8 @@
} }
</Select> </Select>
</Field> </Field>
<Button Color="Color.Primary" Clicked="@CancelAddCpu" Disabled="@_savingCompany">@L["Cancel"]</Button> <Button Color="Color.Primary" Clicked="@CancelAddCompany" Disabled="@_savingCompany">@L["Cancel"]</Button>
<Button Color="Color.Success" Clicked="@ConfirmAddCpu" Disabled="@_savingCompany">@L["Add"]</Button> <Button Color="Color.Success" Clicked="@ConfirmAddCompany" Disabled="@_savingCompany">@L["Add"]</Button>
</div> </div>
} }
@if (_softwareVersionCompanies?.Count > 0) @if (_softwareVersionCompanies?.Count > 0)
@@ -246,7 +246,7 @@
@item.Role @item.Role
</td> </td>
<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> </td>
</tr> </tr>
} }

12
Marechai/Pages/Admin/Details/SoftwareVersion.razor.cs
View File

@@ -194,19 +194,19 @@ namespace Marechai.Pages.Admin.Details
_addingCompanyId = _companies.First().Id; _addingCompanyId = _companies.First().Id;
} }
void CancelAddCpu() void CancelAddCompany()
{ {
_addingCompany = false; _addingCompany = false;
_savingCompany = false; _savingCompany = false;
_addingCompanyId = null; _addingCompanyId = null;
} }
async Task ConfirmAddCpu() async Task ConfirmAddCompany()
{ {
if(_addingCompanyId is null || if(_addingCompanyId is null ||
_addingCompanyId <= 0) _addingCompanyId <= 0)
{ {
CancelAddCpu(); CancelAddCompany();
return; return;
} }
@@ -232,7 +232,7 @@ namespace Marechai.Pages.Admin.Details
StateHasChanged(); StateHasChanged();
} }
void ShowCpuDeleteModal(ulong itemId) void ShowCompanyDeleteModal(ulong itemId)
{ {
_currentCompanyBySoftwareVersion = _softwareVersionCompanies.FirstOrDefault(n => n.Id == itemId); _currentCompanyBySoftwareVersion = _softwareVersionCompanies.FirstOrDefault(n => n.Id == itemId);
_deletingCompanyBySoftwareVersion = true; _deletingCompanyBySoftwareVersion = true;
@@ -257,10 +257,10 @@ namespace Marechai.Pages.Admin.Details
async void ConfirmDelete() async void ConfirmDelete()
{ {
if(_deletingCompanyBySoftwareVersion) if(_deletingCompanyBySoftwareVersion)
await ConfirmDeleteCpuByMachine(); await ConfirmDeleteCompanyByMachine();
} }
async Task ConfirmDeleteCpuByMachine() async Task ConfirmDeleteCompanyByMachine()
{ {
if(_currentCompanyBySoftwareVersion is null) if(_currentCompanyBySoftwareVersion is null)
return; return;