Use BaseViewModel in admin.

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;

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;

cicm_web/Areas/Admin/Models/BaseViewModel.cs

@@ -0,0 +1,7 @@
+namespace cicm_web.Areas.Admin.Models
+{
+    public class BaseViewModel<TKey>
+    {
+        public TKey Id;
+    }
+}

cicm_web/Areas/Admin/Models/CompanyDescriptionViewModel.cs

@@ -30,9 +30,8 @@
 
 namespace cicm_web.Areas.Admin.Models
 {
-    public class CompanyDescriptionViewModel
+    public class CompanyDescriptionViewModel : BaseViewModel<int>
     {
         public string Company;
-        public int    Id;
     }
 }

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<int>
     {
         public string Company;
-        public int    Id;
         public int?   Year;
     }
 }

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<int>
     {
-        public int    Id   { get; set; }
         public string Name { get; set; }
         [DisplayFormat(DataFormatString = "{0:d}", ApplyFormatInEditMode = true)]
         [DataType(DataType.Date)]

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<int>
     {
         public string Company;
-        public int    Id;
         [DisplayFormat(DataFormatString = "{0:d}")]
         [DataType(DataType.Date)]
         public DateTime? Introduced;

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<long>
+    public class GpusByMachineViewModel : BaseViewModel<long>
     {
         [DisplayName("GPU")]
         public string Gpu;
-        public long   Id;
         public string Machine;
     }
 }

cicm_web/Areas/Admin/Models/InstructionSetExtensionsByProcessorViewModel.cs

@@ -1,9 +1,8 @@
 namespace cicm_web.Areas.Admin.Models
 {
-    public class InstructionSetExtensionsByProcessorViewModel
+    public class InstructionSetExtensionsByProcessorViewModel : BaseViewModel<int>
     {
         public string Extension;
-        public int    Id;
         public string Processor;
     }
 }

cicm_web/Areas/Admin/Models/MachineFamilyViewModel.cs

@@ -1,9 +1,8 @@
 namespace cicm_web.Areas.Admin.Models
 {
-    public class MachineFamilyViewModel
+    public class MachineFamilyViewModel : BaseViewModel<int>
     {
         public string Company;
-        public int    Id;
         public string Name;
     }
 }

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<int>
     {
-        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")]

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<long>
     {
-        public long        Id;
         public MemoryType  Type  { get; set; }
         public MemoryUsage Usage { get; set; }
         public long?       Size  { get; set; }

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<int>
     {
-        public int Id;
-
         public string Name    { get; set; }
         public string Company { get; set; }
         [DisplayName("Model code")]

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<long>
     {
-        public long   Id        { get; set; }
         public string Processor { get; set; }
         public string Machine   { get; set; }
         [DisplayName("Speed (MHz)")]

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<long>
     {
         public string GpuCompany;
-        public long   Id;
         [DisplayName("GPU")]
         public string Gpu { get;            set; }
         public Resolution Resolution { get; set; }

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<long>
     {
-        public long   Id;
         public string Machine { get; set; }
         [DisplayName("Sound synthetizer")]
         public string SoundSynth { get; set; }

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<int>
 
     {
-        public int Id;
-
         public string Name { get; set; }
         [DisplayName("Model code")]
         public string ModelCode { get; set; }

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<long>
     {
         public string           Company;
-        public long             Id;
         public string           Machine;
         public StorageType      Type      { get; set; }
         public StorageInterface Interface { get; set; }

cicm_web/Areas/Admin/Views/CompanyLogos/Index.cshtml

@@ -1,5 +1,5 @@
-@using Cicm.Database.Models
+@using cicm_web.Areas.Admin.Models
-@model IEnumerable<Cicm.Database.Models.CompanyLogoViewModel>
+@model IEnumerable<cicm_web.Areas.Admin.Models.CompanyLogoViewModel>
 
 @{
     ViewData["Title"] = "Index";

cicm_web/Areas/Admin/Views/Processors/Index.cshtml

@@ -29,8 +29,8 @@
 // Copyright © 2003-2018 Natalia Portillo
 *******************************************************************************/
 }
-@using Cicm.Database.Models
+@using cicm_web.Areas.Admin.Models
-@model IEnumerable<Cicm.Database.Models.ProcessorViewModel>
+@model IEnumerable<cicm_web.Areas.Admin.Models.ProcessorViewModel>
 
 @{
     ViewData["Title"] = "Processors (Admin)";

cicm_web/Areas/Admin/Views/SoundSynths/Index.cshtml

@@ -29,8 +29,8 @@
 // Copyright © 2003-2018 Natalia Portillo
 *******************************************************************************/
 }
-@using Cicm.Database.Models
+@using cicm_web.Areas.Admin.Models
-@model IEnumerable<Cicm.Database.Models.SoundSynthViewModel>
+@model IEnumerable<cicm_web.Areas.Admin.Models.SoundSynthViewModel>
 
 @{
     ViewData["Title"] = "Sound synthetizers (Admin)";