mirror of
https://github.com/claunia/marechai.git
synced 2025-12-16 11:04:25 +00:00
Fix documentation by machine (family) getting invalid sort sequence.
This commit is contained in:
@@ -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.1825</Version>
|
<Version>4.0.0.1833</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>
|
||||||
|
|||||||
@@ -46,7 +46,7 @@ namespace Marechai.Services
|
|||||||
BookId = p.BookId,
|
BookId = p.BookId,
|
||||||
MachineFamilyId = p.MachineFamilyId,
|
MachineFamilyId = p.MachineFamilyId,
|
||||||
MachineFamily = p.MachineFamily.Name
|
MachineFamily = p.MachineFamily.Name
|
||||||
}).OrderBy(p => p.MachineFamily).ThenBy(p => p.Book).ToListAsync();
|
}).OrderBy(p => p.MachineFamily).ToListAsync();
|
||||||
|
|
||||||
public async Task DeleteAsync(long id, string userId)
|
public async Task DeleteAsync(long id, string userId)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -45,7 +45,7 @@ namespace Marechai.Services
|
|||||||
BookId = p.BookId,
|
BookId = p.BookId,
|
||||||
MachineId = p.MachineId,
|
MachineId = p.MachineId,
|
||||||
Machine = p.Machine.Name
|
Machine = p.Machine.Name
|
||||||
}).OrderBy(p => p.Machine).ThenBy(p => p.Book).ToListAsync();
|
}).OrderBy(p => p.Machine).ToListAsync();
|
||||||
|
|
||||||
public async Task DeleteAsync(long id, string userId)
|
public async Task DeleteAsync(long id, string userId)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -46,7 +46,7 @@ namespace Marechai.Services
|
|||||||
DocumentId = p.DocumentId,
|
DocumentId = p.DocumentId,
|
||||||
MachineFamilyId = p.MachineFamilyId,
|
MachineFamilyId = p.MachineFamilyId,
|
||||||
MachineFamily = p.MachineFamily.Name
|
MachineFamily = p.MachineFamily.Name
|
||||||
}).OrderBy(p => p.MachineFamily).ThenBy(p => p.Document).ToListAsync();
|
}).OrderBy(p => p.MachineFamily).ToListAsync();
|
||||||
|
|
||||||
public async Task DeleteAsync(long id, string userId)
|
public async Task DeleteAsync(long id, string userId)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -46,7 +46,7 @@ namespace Marechai.Services
|
|||||||
DocumentId = p.DocumentId,
|
DocumentId = p.DocumentId,
|
||||||
MachineId = p.MachineId,
|
MachineId = p.MachineId,
|
||||||
Machine = p.Machine.Name
|
Machine = p.Machine.Name
|
||||||
}).OrderBy(p => p.Machine).ThenBy(p => p.Document).ToListAsync();
|
}).OrderBy(p => p.Machine).ToListAsync();
|
||||||
|
|
||||||
public async Task DeleteAsync(long id, string userId)
|
public async Task DeleteAsync(long id, string userId)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -46,7 +46,7 @@ namespace Marechai.Services
|
|||||||
MagazineId = p.MagazineId,
|
MagazineId = p.MagazineId,
|
||||||
MachineFamilyId = p.MachineFamilyId,
|
MachineFamilyId = p.MachineFamilyId,
|
||||||
MachineFamily = p.MachineFamily.Name
|
MachineFamily = p.MachineFamily.Name
|
||||||
}).OrderBy(p => p.MachineFamily).ThenBy(p => p.Magazine).ToListAsync();
|
}).OrderBy(p => p.MachineFamily).ToListAsync();
|
||||||
|
|
||||||
public async Task DeleteAsync(long id, string userId)
|
public async Task DeleteAsync(long id, string userId)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -46,7 +46,7 @@ namespace Marechai.Services
|
|||||||
MagazineId = p.MagazineId,
|
MagazineId = p.MagazineId,
|
||||||
MachineId = p.MachineId,
|
MachineId = p.MachineId,
|
||||||
Machine = p.Machine.Name
|
Machine = p.Machine.Name
|
||||||
}).OrderBy(p => p.Machine).ThenBy(p => p.Magazine).ToListAsync();
|
}).OrderBy(p => p.Machine).ToListAsync();
|
||||||
|
|
||||||
public async Task DeleteAsync(long id, string userId)
|
public async Task DeleteAsync(long id, string userId)
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user