claunia/marechai
1
0
Fork 0
mirror of https://github.com/claunia/marechai.git synced 2025-12-16 19:14:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use BaseViewModel in admin.

Browse Source
This commit is contained in:
Natalia Portillo
2019-05-27 11:47:28 +01:00
parent cee69b1c52
commit 4829356281
21 changed files with 34 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cicm_web/Areas/Admin/Controllers/ProcessorsController.cs
View File

@@ -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;

1
cicm_web/Areas/Admin/Controllers/SoundSynthsController.cs
View File

@@ -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;

7
cicm_web/Areas/Admin/Models/BaseViewModel.cs Normal file
View File

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

3
cicm_web/Areas/Admin/Models/CompanyDescriptionViewModel.cs
View File

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

5
cicm_web/Areas/Admin/Models/CompanyLogoViewModel.cs
View File

@@ -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;
}
}

3
cicm_web/Areas/Admin/Models/CompanyViewModel.cs
View File

@@ -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)]

3
cicm_web/Areas/Admin/Models/GpuViewModel.cs
View File

@@ -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;

4
cicm_web/Areas/Admin/Models/GpusByMachineViewModel.cs
View File

@@ -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;
}
}

3
cicm_web/Areas/Admin/Models/InstructionSetExtensionsByProcessorViewModel.cs
View File

@@ -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;
}
}

3
cicm_web/Areas/Admin/Models/MachineFamilyViewModel.cs
View File

@@ -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;
}
}

4
cicm_web/Areas/Admin/Models/MachineViewModel.cs
View File

@@ -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; }
@@ -17,7 +16,6 @@ namespace cicm_web.Areas.Admin.Models
public string Family { get; set; }
[StringLength(50)]
public string Model { get; set; }
public string Company { get; set; }
[DisplayName("Introduced")]

3
cicm_web/Areas/Admin/Models/MemoryByMachineViewModel.cs
View File

@@ -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; }

6
cicm_web/Areas/Admin/Models/ProcessorViewModel.cs
View File

@@ -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")]

3
cicm_web/Areas/Admin/Models/ProcessorsByMachineViewModel.cs
View File

@@ -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)")]

3
cicm_web/Areas/Admin/Models/ResolutionsByGpuViewModel.cs
View File

@@ -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; }

3
cicm_web/Areas/Admin/Models/SoundByMachineViewModel.cs
View File

@@ -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; }

6
cicm_web/Areas/Admin/Models/SoundSynthViewModel.cs
View File

@@ -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; }

3
cicm_web/Areas/Admin/Models/StorageByMachineViewModel.cs
View File

@@ -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; }

4
cicm_web/Areas/Admin/Views/CompanyLogos/Index.cshtml
View File

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

4
cicm_web/Areas/Admin/Views/Processors/Index.cshtml
View File

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

4
cicm_web/Areas/Admin/Views/SoundSynths/Index.cshtml
View File

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