From 48293562810884a7a4afdf4d50d0ed995f1f70f5 Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Mon, 27 May 2019 11:47:28 +0100 Subject: [PATCH] Use BaseViewModel in admin. --- cicm_web/Areas/Admin/Controllers/ProcessorsController.cs | 1 + cicm_web/Areas/Admin/Controllers/SoundSynthsController.cs | 1 + cicm_web/Areas/Admin/Models/BaseViewModel.cs | 7 +++++++ cicm_web/Areas/Admin/Models/CompanyDescriptionViewModel.cs | 3 +-- cicm_web/Areas/Admin/Models/CompanyLogoViewModel.cs | 5 ++--- cicm_web/Areas/Admin/Models/CompanyViewModel.cs | 3 +-- cicm_web/Areas/Admin/Models/GpuViewModel.cs | 3 +-- cicm_web/Areas/Admin/Models/GpusByMachineViewModel.cs | 4 +--- .../Models/InstructionSetExtensionsByProcessorViewModel.cs | 3 +-- cicm_web/Areas/Admin/Models/MachineFamilyViewModel.cs | 3 +-- cicm_web/Areas/Admin/Models/MachineViewModel.cs | 6 ++---- cicm_web/Areas/Admin/Models/MemoryByMachineViewModel.cs | 3 +-- cicm_web/Areas/Admin/Models/ProcessorViewModel.cs | 6 ++---- .../Areas/Admin/Models/ProcessorsByMachineViewModel.cs | 3 +-- cicm_web/Areas/Admin/Models/ResolutionsByGpuViewModel.cs | 3 +-- cicm_web/Areas/Admin/Models/SoundByMachineViewModel.cs | 3 +-- cicm_web/Areas/Admin/Models/SoundSynthViewModel.cs | 6 ++---- cicm_web/Areas/Admin/Models/StorageByMachineViewModel.cs | 3 +-- cicm_web/Areas/Admin/Views/CompanyLogos/Index.cshtml | 4 ++-- cicm_web/Areas/Admin/Views/Processors/Index.cshtml | 4 ++-- cicm_web/Areas/Admin/Views/SoundSynths/Index.cshtml | 4 ++-- 21 files changed, 34 insertions(+), 44 deletions(-) create mode 100644 cicm_web/Areas/Admin/Models/BaseViewModel.cs diff --git a/cicm_web/Areas/Admin/Controllers/ProcessorsController.cs b/cicm_web/Areas/Admin/Controllers/ProcessorsController.cs index 1082081d..946d9909 100644 --- a/cicm_web/Areas/Admin/Controllers/ProcessorsController.cs +++ b/cicm_web/Areas/Admin/Controllers/ProcessorsController.cs @@ -31,6 +31,7 @@ using System.Linq; using System.Threading.Tasks; using Cicm.Database.Models; +using cicm_web.Areas.Admin.Models; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Rendering; diff --git a/cicm_web/Areas/Admin/Controllers/SoundSynthsController.cs b/cicm_web/Areas/Admin/Controllers/SoundSynthsController.cs index ea3972bc..17e0780b 100644 --- a/cicm_web/Areas/Admin/Controllers/SoundSynthsController.cs +++ b/cicm_web/Areas/Admin/Controllers/SoundSynthsController.cs @@ -31,6 +31,7 @@ using System.Linq; using System.Threading.Tasks; using Cicm.Database.Models; +using cicm_web.Areas.Admin.Models; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Rendering; diff --git a/cicm_web/Areas/Admin/Models/BaseViewModel.cs b/cicm_web/Areas/Admin/Models/BaseViewModel.cs new file mode 100644 index 00000000..1313f1ff --- /dev/null +++ b/cicm_web/Areas/Admin/Models/BaseViewModel.cs @@ -0,0 +1,7 @@ +namespace cicm_web.Areas.Admin.Models +{ + public class BaseViewModel + { + public TKey Id; + } +} \ No newline at end of file diff --git a/cicm_web/Areas/Admin/Models/CompanyDescriptionViewModel.cs b/cicm_web/Areas/Admin/Models/CompanyDescriptionViewModel.cs index 886758e1..7f3f027a 100644 --- a/cicm_web/Areas/Admin/Models/CompanyDescriptionViewModel.cs +++ b/cicm_web/Areas/Admin/Models/CompanyDescriptionViewModel.cs @@ -30,9 +30,8 @@ namespace cicm_web.Areas.Admin.Models { - public class CompanyDescriptionViewModel + public class CompanyDescriptionViewModel : BaseViewModel { public string Company; - public int Id; } } \ No newline at end of file diff --git a/cicm_web/Areas/Admin/Models/CompanyLogoViewModel.cs b/cicm_web/Areas/Admin/Models/CompanyLogoViewModel.cs index 55a23e33..05e14f58 100644 --- a/cicm_web/Areas/Admin/Models/CompanyLogoViewModel.cs +++ b/cicm_web/Areas/Admin/Models/CompanyLogoViewModel.cs @@ -28,12 +28,11 @@ // Copyright © 2003-2018 Natalia Portillo *******************************************************************************/ -namespace Cicm.Database.Models +namespace cicm_web.Areas.Admin.Models { - public class CompanyLogoViewModel + public class CompanyLogoViewModel : BaseViewModel { public string Company; - public int Id; public int? Year; } } \ No newline at end of file diff --git a/cicm_web/Areas/Admin/Models/CompanyViewModel.cs b/cicm_web/Areas/Admin/Models/CompanyViewModel.cs index bab1489c..bf8cacc4 100644 --- a/cicm_web/Areas/Admin/Models/CompanyViewModel.cs +++ b/cicm_web/Areas/Admin/Models/CompanyViewModel.cs @@ -6,9 +6,8 @@ using Cicm.Database; namespace cicm_web.Areas.Admin.Models { - public class CompanyViewModel + public class CompanyViewModel : BaseViewModel { - public int Id { get; set; } public string Name { get; set; } [DisplayFormat(DataFormatString = "{0:d}", ApplyFormatInEditMode = true)] [DataType(DataType.Date)] diff --git a/cicm_web/Areas/Admin/Models/GpuViewModel.cs b/cicm_web/Areas/Admin/Models/GpuViewModel.cs index 0b1033c6..7cea30fe 100644 --- a/cicm_web/Areas/Admin/Models/GpuViewModel.cs +++ b/cicm_web/Areas/Admin/Models/GpuViewModel.cs @@ -36,10 +36,9 @@ using System.ComponentModel.DataAnnotations.Schema; namespace cicm_web.Areas.Admin.Models { - public class GpuViewModel + public class GpuViewModel : BaseViewModel { public string Company; - public int Id; [DisplayFormat(DataFormatString = "{0:d}")] [DataType(DataType.Date)] public DateTime? Introduced; diff --git a/cicm_web/Areas/Admin/Models/GpusByMachineViewModel.cs b/cicm_web/Areas/Admin/Models/GpusByMachineViewModel.cs index feea1f18..a71ffc1d 100644 --- a/cicm_web/Areas/Admin/Models/GpusByMachineViewModel.cs +++ b/cicm_web/Areas/Admin/Models/GpusByMachineViewModel.cs @@ -29,15 +29,13 @@ *******************************************************************************/ using System.ComponentModel; -using Cicm.Database.Models; namespace cicm_web.Areas.Admin.Models { - public class GpusByMachineViewModel : BaseModel + public class GpusByMachineViewModel : BaseViewModel { [DisplayName("GPU")] public string Gpu; - public long Id; public string Machine; } } \ No newline at end of file diff --git a/cicm_web/Areas/Admin/Models/InstructionSetExtensionsByProcessorViewModel.cs b/cicm_web/Areas/Admin/Models/InstructionSetExtensionsByProcessorViewModel.cs index ec63972c..36257b2c 100644 --- a/cicm_web/Areas/Admin/Models/InstructionSetExtensionsByProcessorViewModel.cs +++ b/cicm_web/Areas/Admin/Models/InstructionSetExtensionsByProcessorViewModel.cs @@ -1,9 +1,8 @@ namespace cicm_web.Areas.Admin.Models { - public class InstructionSetExtensionsByProcessorViewModel + public class InstructionSetExtensionsByProcessorViewModel : BaseViewModel { public string Extension; - public int Id; public string Processor; } } \ No newline at end of file diff --git a/cicm_web/Areas/Admin/Models/MachineFamilyViewModel.cs b/cicm_web/Areas/Admin/Models/MachineFamilyViewModel.cs index 8236a52a..b8fa31b9 100644 --- a/cicm_web/Areas/Admin/Models/MachineFamilyViewModel.cs +++ b/cicm_web/Areas/Admin/Models/MachineFamilyViewModel.cs @@ -1,9 +1,8 @@ namespace cicm_web.Areas.Admin.Models { - public class MachineFamilyViewModel + public class MachineFamilyViewModel : BaseViewModel { public string Company; - public int Id; public string Name; } } \ No newline at end of file diff --git a/cicm_web/Areas/Admin/Models/MachineViewModel.cs b/cicm_web/Areas/Admin/Models/MachineViewModel.cs index 2237c3d9..ed972ee1 100644 --- a/cicm_web/Areas/Admin/Models/MachineViewModel.cs +++ b/cicm_web/Areas/Admin/Models/MachineViewModel.cs @@ -5,9 +5,8 @@ using Cicm.Database; namespace cicm_web.Areas.Admin.Models { - public class MachineViewModel + public class MachineViewModel : BaseViewModel { - public int Id { get; set; } [StringLength(255)] public string Name { get; set; } public MachineType Type { get; set; } @@ -16,8 +15,7 @@ namespace cicm_web.Areas.Admin.Models public DateTime? Introduced { get; set; } public string Family { get; set; } [StringLength(50)] - public string Model { get; set; } - + public string Model { get; set; } public string Company { get; set; } [DisplayName("Introduced")] diff --git a/cicm_web/Areas/Admin/Models/MemoryByMachineViewModel.cs b/cicm_web/Areas/Admin/Models/MemoryByMachineViewModel.cs index 2ee5d810..8fb0a0d0 100644 --- a/cicm_web/Areas/Admin/Models/MemoryByMachineViewModel.cs +++ b/cicm_web/Areas/Admin/Models/MemoryByMachineViewModel.cs @@ -33,9 +33,8 @@ using Cicm.Database; namespace cicm_web.Areas.Admin.Models { - public class MemoryByMachineViewModel + public class MemoryByMachineViewModel : BaseViewModel { - public long Id; public MemoryType Type { get; set; } public MemoryUsage Usage { get; set; } public long? Size { get; set; } diff --git a/cicm_web/Areas/Admin/Models/ProcessorViewModel.cs b/cicm_web/Areas/Admin/Models/ProcessorViewModel.cs index 871d6960..4c9da5b1 100644 --- a/cicm_web/Areas/Admin/Models/ProcessorViewModel.cs +++ b/cicm_web/Areas/Admin/Models/ProcessorViewModel.cs @@ -34,12 +34,10 @@ using System.ComponentModel; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -namespace Cicm.Database.Models +namespace cicm_web.Areas.Admin.Models { - public class ProcessorViewModel + public class ProcessorViewModel : BaseViewModel { - public int Id; - public string Name { get; set; } public string Company { get; set; } [DisplayName("Model code")] diff --git a/cicm_web/Areas/Admin/Models/ProcessorsByMachineViewModel.cs b/cicm_web/Areas/Admin/Models/ProcessorsByMachineViewModel.cs index 0a731198..88b752a0 100644 --- a/cicm_web/Areas/Admin/Models/ProcessorsByMachineViewModel.cs +++ b/cicm_web/Areas/Admin/Models/ProcessorsByMachineViewModel.cs @@ -32,9 +32,8 @@ using System.ComponentModel; namespace cicm_web.Areas.Admin.Models { - public class ProcessorsByMachineViewModel + public class ProcessorsByMachineViewModel : BaseViewModel { - public long Id { get; set; } public string Processor { get; set; } public string Machine { get; set; } [DisplayName("Speed (MHz)")] diff --git a/cicm_web/Areas/Admin/Models/ResolutionsByGpuViewModel.cs b/cicm_web/Areas/Admin/Models/ResolutionsByGpuViewModel.cs index 9b2f0538..b06ce14f 100644 --- a/cicm_web/Areas/Admin/Models/ResolutionsByGpuViewModel.cs +++ b/cicm_web/Areas/Admin/Models/ResolutionsByGpuViewModel.cs @@ -33,10 +33,9 @@ using Cicm.Database.Models; namespace cicm_web.Areas.Admin.Models { - public class ResolutionsByGpuViewModel + public class ResolutionsByGpuViewModel : BaseViewModel { public string GpuCompany; - public long Id; [DisplayName("GPU")] public string Gpu { get; set; } public Resolution Resolution { get; set; } diff --git a/cicm_web/Areas/Admin/Models/SoundByMachineViewModel.cs b/cicm_web/Areas/Admin/Models/SoundByMachineViewModel.cs index 03993ce5..122c7938 100644 --- a/cicm_web/Areas/Admin/Models/SoundByMachineViewModel.cs +++ b/cicm_web/Areas/Admin/Models/SoundByMachineViewModel.cs @@ -32,9 +32,8 @@ using System.ComponentModel; namespace cicm_web.Areas.Admin.Models { - public class SoundByMachineViewModel + public class SoundByMachineViewModel : BaseViewModel { - public long Id; public string Machine { get; set; } [DisplayName("Sound synthetizer")] public string SoundSynth { get; set; } diff --git a/cicm_web/Areas/Admin/Models/SoundSynthViewModel.cs b/cicm_web/Areas/Admin/Models/SoundSynthViewModel.cs index da6f3b96..3ea3c884 100644 --- a/cicm_web/Areas/Admin/Models/SoundSynthViewModel.cs +++ b/cicm_web/Areas/Admin/Models/SoundSynthViewModel.cs @@ -33,13 +33,11 @@ using System.ComponentModel; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -namespace Cicm.Database.Models +namespace cicm_web.Areas.Admin.Models { - public class SoundSynthViewModel + public class SoundSynthViewModel : BaseViewModel { - public int Id; - public string Name { get; set; } [DisplayName("Model code")] public string ModelCode { get; set; } diff --git a/cicm_web/Areas/Admin/Models/StorageByMachineViewModel.cs b/cicm_web/Areas/Admin/Models/StorageByMachineViewModel.cs index 0d9fcbea..28faf1c4 100644 --- a/cicm_web/Areas/Admin/Models/StorageByMachineViewModel.cs +++ b/cicm_web/Areas/Admin/Models/StorageByMachineViewModel.cs @@ -32,10 +32,9 @@ using Cicm.Database; namespace cicm_web.Areas.Admin.Models { - public class StorageByMachineViewModel + public class StorageByMachineViewModel : BaseViewModel { public string Company; - public long Id; public string Machine; public StorageType Type { get; set; } public StorageInterface Interface { get; set; } diff --git a/cicm_web/Areas/Admin/Views/CompanyLogos/Index.cshtml b/cicm_web/Areas/Admin/Views/CompanyLogos/Index.cshtml index 82c7f7ca..de94c2e3 100644 --- a/cicm_web/Areas/Admin/Views/CompanyLogos/Index.cshtml +++ b/cicm_web/Areas/Admin/Views/CompanyLogos/Index.cshtml @@ -1,5 +1,5 @@ -@using Cicm.Database.Models -@model IEnumerable +@using cicm_web.Areas.Admin.Models +@model IEnumerable @{ ViewData["Title"] = "Index"; diff --git a/cicm_web/Areas/Admin/Views/Processors/Index.cshtml b/cicm_web/Areas/Admin/Views/Processors/Index.cshtml index 0d04aacc..b54c7fde 100644 --- a/cicm_web/Areas/Admin/Views/Processors/Index.cshtml +++ b/cicm_web/Areas/Admin/Views/Processors/Index.cshtml @@ -29,8 +29,8 @@ // Copyright © 2003-2018 Natalia Portillo *******************************************************************************/ } -@using Cicm.Database.Models -@model IEnumerable +@using cicm_web.Areas.Admin.Models +@model IEnumerable @{ ViewData["Title"] = "Processors (Admin)"; diff --git a/cicm_web/Areas/Admin/Views/SoundSynths/Index.cshtml b/cicm_web/Areas/Admin/Views/SoundSynths/Index.cshtml index ec73f2a5..8b7a5ed7 100644 --- a/cicm_web/Areas/Admin/Views/SoundSynths/Index.cshtml +++ b/cicm_web/Areas/Admin/Views/SoundSynths/Index.cshtml @@ -29,8 +29,8 @@ // Copyright © 2003-2018 Natalia Portillo *******************************************************************************/ } -@using Cicm.Database.Models -@model IEnumerable +@using cicm_web.Areas.Admin.Models +@model IEnumerable @{ ViewData["Title"] = "Sound synthetizers (Admin)";