Code re-style.

This commit is contained in:
2020-08-05 21:00:35 +01:00
parent 6f728047c3
commit 569eaa09f6
142 changed files with 5327 additions and 2877 deletions

View File

@@ -40,10 +40,12 @@ namespace Marechai.Services
public async Task<List<ScreenViewModel>> GetAsync() => (await _context.Screens.Select(s => new ScreenViewModel
{
Diagonal = s.Diagonal,
EffectiveColors = s.EffectiveColors,
Height = s.Height, Id = s.Id, Type = s.Type,
Width = s.Width,
Diagonal = s.Diagonal,
EffectiveColors = s.EffectiveColors,
Height = s.Height,
Id = s.Id,
Type = s.Type,
Width = s.Width,
NativeResolutionId = s.NativeResolutionId,
NativeResolution = new ResolutionViewModel
{
@@ -56,23 +58,29 @@ namespace Marechai.Services
Width = s.NativeResolution.Width
}
}).ToListAsync()).OrderBy(s => s.Diagonal).
ThenBy(s => s.EffectiveColors).
ThenBy(s => s.NativeResolution.
ToString()).
ThenBy(s => s.Type).
ThenBy(s => s.Size).ToList();
ThenBy(s => s.EffectiveColors).ThenBy(s => s.NativeResolution.ToString()).ThenBy(s => s.Type).
ThenBy(s => s.Size).ToList();
public async Task<ScreenViewModel> GetAsync(int id) =>
await _context.Screens.Where(s => s.Id == id).Select(s => new ScreenViewModel
{
Diagonal = s.Diagonal, EffectiveColors = s.EffectiveColors, Height = s.Height, Id = s.Id,
Diagonal = s.Diagonal,
EffectiveColors = s.EffectiveColors,
Height = s.Height,
Id = s.Id,
NativeResolution = new ResolutionViewModel
{
Chars = s.NativeResolution.Chars, Colors = s.NativeResolution.Colors,
Grayscale = s.NativeResolution.Grayscale, Height = s.NativeResolution.Height,
Id = s.NativeResolution.Id, Palette = s.NativeResolution.Palette, Width = s.NativeResolution.Width
Chars = s.NativeResolution.Chars,
Colors = s.NativeResolution.Colors,
Grayscale = s.NativeResolution.Grayscale,
Height = s.NativeResolution.Height,
Id = s.NativeResolution.Id,
Palette = s.NativeResolution.Palette,
Width = s.NativeResolution.Width
},
NativeResolutionId = s.NativeResolutionId, Type = s.Type, Width = s.Width
NativeResolutionId = s.NativeResolutionId,
Type = s.Type,
Width = s.Width
}).FirstOrDefaultAsync();
public async Task UpdateAsync(ScreenViewModel viewModel, string userId)
@@ -101,8 +109,12 @@ namespace Marechai.Services
{
var model = new Screen
{
Diagonal = viewModel.Diagonal, EffectiveColors = viewModel.EffectiveColors, Height = viewModel.Height,
NativeResolutionId = viewModel.NativeResolutionId, Type = viewModel.Type, Width = viewModel.Width
Diagonal = viewModel.Diagonal,
EffectiveColors = viewModel.EffectiveColors,
Height = viewModel.Height,
NativeResolutionId = viewModel.NativeResolutionId,
Type = viewModel.Type,
Width = viewModel.Width
};
await _context.Screens.AddAsync(model);