L
@inject ResolutionsService ResolutionsService
+@inject NavigationManager NavigationManager
@attribute [Authorize(Roles = "UberAdmin, Admin")]
@L["Screen details"]
@@ -46,41 +48,104 @@
}
- @if (_editable || _model.Width.HasValue)
+ @if (_editing || _model.Width.HasValue)
{
@L["Width (mm)"]
-
+ @if (_editing)
+ {
+ @L["Unknown (width)"]
+ }
+ @if (!_editing ||
+ !_unknownWidth)
+ {
+
+
+
+ @L["Please enter a valid width in millimeters."]
+
+
+
+ }
}
- @if (_editable || _model.Height.HasValue)
+ @if (_editing || _model.Height.HasValue)
{
@L["Height (mm)"]
-
+ @if (_editing)
+ {
+ @L["Unknown (height)"]
+ }
+ @if (!_editing ||
+ !_unknownHeight)
+ {
+
+
+
+ @L["Please enter a valid height in millimeters."]
+
+
+
+ }
+
}
@L["Diagonal (inches)"]
-
+
+
+
+ @L["Please enter a correct diagonal size in inches."]
+
+
+
- @if (_editable || _model.EffectiveColors.HasValue)
+ @if (_editing || _model.EffectiveColors.HasValue)
{
@L["Effective colors"]
-
+ @if (_editing)
+ {
+ @L["Unknown (effective colors)"]
+ }
+ @if (!_editing ||
+ !_unknownColors)
+ {
+
+
+
+ @L["Please enter a number of effective colors."]
+
+
+
+ }
}
- @if (_editable || _model.Type != null)
+ @if (_editing || _model.Type != null)
{
@L["Type"]
-
+ @if (_editing)
+ {
+ @L["Unknown (type)"]
+ }
+ @if (!_editing ||
+ !_unknownType)
+ {
+
+
+
+ @L["Please enter a valid screen type."]
+
+
+
+ }
}
@L["Native resolution"]
-
-
@L["Edit"]
+ @if (!_editing)
+ {
+
+ }
+ else
+ {
+
+
+ }
@L["Back to list"]
@L["Details"]
-
- @L["Edit"]
-
+ @L["Edit"]
|
diff --git a/Marechai/Resources/Services/ScreensService.en.resx b/Marechai/Resources/Services/ScreensService.en.resx
new file mode 100644
index 00000000..a976b945
--- /dev/null
+++ b/Marechai/Resources/Services/ScreensService.en.resx
@@ -0,0 +1,137 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ Unknown
+ Unknown, referring to a screen width in millimeters
+
+
+ Unknown
+ Unknown, referring to a screen height in millimeters
+
+
+ Unknown
+ Unknown, referring to a screen effective colors
+
+
+ Unknown
+ Unknown, referring to a screen type
+
+
\ No newline at end of file
diff --git a/Marechai/Resources/Services/ScreensService.es.resx b/Marechai/Resources/Services/ScreensService.es.resx
index 499c8786..dc29872e 100644
--- a/Marechai/Resources/Services/ScreensService.es.resx
+++ b/Marechai/Resources/Services/ScreensService.es.resx
@@ -194,4 +194,48 @@
Diagonal (pulgadas)
Diagonal (inches)
+
+ Guardar
+ Save
+
+
+ Desconocido
+ Unknown, referring to a screen width in millimeters
+
+
+ Desconocido
+ Unknown, referring to a screen height in millimeters
+
+
+ Desconocidos
+ Unknown, referring to a screen effective colors
+
+
+ Desconocido
+ Unknown, referring to a screen type
+
+
+ Por favor introduce un ancho válido en milímetros
+ Please enter a valid width in millimeters.
+
+
+ Por favor introduce una altura válida en milímetros
+ Please enter a valid height in millimeters.
+
+
+ Por favor introduce una diagonal válida en pulgadas
+ Please enter a correct diagonal size in inches.
+
+
+ Por favor introduce un número válido de colores efectivos
+ Please enter a number of effective colors.
+
+
+ Por favor introduce un tipo de pantalla válido
+ Please enter a valid screen type.
+
+
+ El tipo de pantalla no puede tener más de 256 caracteres.
+ Screen type cannot be bigger than 256 characters.
+
\ No newline at end of file
diff --git a/Marechai/Services/ScreensService.cs b/Marechai/Services/ScreensService.cs
index 0a739da2..3dc86249 100644
--- a/Marechai/Services/ScreensService.cs
+++ b/Marechai/Services/ScreensService.cs
@@ -2,6 +2,8 @@ using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Marechai.Database.Models;
+using Marechai.ViewModels;
+using Microsoft.EntityFrameworkCore;
namespace Marechai.Services
{
@@ -15,7 +17,40 @@ namespace Marechai.Services
ThenBy(s => s.EffectiveColors).ThenBy(s => s.NativeResolution.ToString()).
ThenBy(s => s.Type).ThenBy(s => s.Size).ToList();
- public async Task GetAsync(int id) => await _context.Screens.FindAsync(id);
+ public async Task 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,
+ 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
+ },
+ NativeResolutionId = s.NativeResolutionId, Type = s.Type, Width = s.Width
+ }).FirstOrDefaultAsync();
+
+ public async Task UpdateAsync(ScreenViewModel viewModel)
+ {
+ Screen model = await _context.Screens.FindAsync(viewModel.Id);
+
+ if(model is null)
+ return;
+
+ Resolution nativeResolution = await _context.Resolutions.FindAsync(viewModel.NativeResolutionId);
+
+ if(nativeResolution is null)
+ return;
+
+ model.Diagonal = viewModel.Diagonal;
+ model.EffectiveColors = viewModel.EffectiveColors;
+ model.Height = viewModel.Height;
+ model.NativeResolutionId = viewModel.NativeResolutionId;
+ model.Type = viewModel.Type;
+ model.Width = viewModel.Width;
+
+ await _context.SaveChangesAsync();
+ }
public async Task DeleteAsync(int id)
{
diff --git a/Marechai/Shared/Validators.cs b/Marechai/Shared/Validators.cs
index d82c43fc..d736d548 100644
--- a/Marechai/Shared/Validators.cs
+++ b/Marechai/Shared/Validators.cs
@@ -28,19 +28,28 @@ namespace Marechai.Shared
e.Status = ValidationStatus.Success;
}
- public static void ValidateNullableDoubleBiggerThanZero(ValidatorEventArgs e)
+ public static void ValidateDoubleBiggerThanZero(ValidatorEventArgs e, double minValue = 0, double maxValue = double.MaxValue)
{
if(!(e.Value is double item) ||
- item < 0)
+ item < minValue || item > maxValue)
e.Status = ValidationStatus.Error;
else
e.Status = ValidationStatus.Success;
}
- public static void ValidateNullableIntegerBiggerThanZero(ValidatorEventArgs e)
+ public static void ValidateIntegerBiggerThanZero(ValidatorEventArgs e, int minValue = 0, int maxValue = int.MaxValue)
{
if(!(e.Value is int item) ||
- item < 0)
+ item < minValue || item > maxValue)
+ e.Status = ValidationStatus.Error;
+ else
+ e.Status = ValidationStatus.Success;
+ }
+
+ public static void ValidateLongBiggerThanZero(ValidatorEventArgs e, long minValue = 0, long maxValue = long.MaxValue)
+ {
+ if(!(e.Value is long item) ||
+ item < minValue || item > maxValue)
e.Status = ValidationStatus.Error;
else
e.Status = ValidationStatus.Success;
diff --git a/Marechai/ViewModels/ScreenViewModel.cs b/Marechai/ViewModels/ScreenViewModel.cs
new file mode 100644
index 00000000..a7fa135e
--- /dev/null
+++ b/Marechai/ViewModels/ScreenViewModel.cs
@@ -0,0 +1,31 @@
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Marechai.ViewModels
+{
+ public class ScreenViewModel : BaseViewModel
+ {
+ public double? Width { get; set; }
+ public double? Height { get; set; }
+ public double Diagonal { get; set; }
+ public int NativeResolutionId { get; set; }
+ public ResolutionViewModel NativeResolution { get; set; }
+ public long? EffectiveColors { get; set; }
+ public string Type { get; set; }
+
+ [NotMapped]
+ public long? Colors => EffectiveColors ?? NativeResolution.Colors;
+
+ [NotMapped]
+ public string Size
+ {
+ get
+ {
+ if(Width != null &&
+ Height != null)
+ return$"{Width}x{Height} mm";
+
+ return"Unknown";
+ }
+ }
+ }
+}
\ No newline at end of file