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 machine photo view model in machine photos index admin page.

Browse Source
This commit is contained in:
Natalia Portillo
2019-05-27 15:44:27 +01:00
parent 4829356281
commit e16daed730
4 changed files with 93 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cicm_web/Areas/Admin/Controllers/MachinePhotosController.cs
View File

@@ -2,6 +2,7 @@ using System;
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.EntityFrameworkCore;
@@ -23,7 +24,17 @@ namespace cicm_web.Areas.Admin.Controllers
public async Task<IActionResult> Index()
{
return View(await _context.MachinePhotos.Include(m => m.Machine).Include(m => m.Machine.Company)
.Include(m => m.User).ToListAsync());
.Include(m => m.User).Select(p => new MachinePhotoViewModel
{
Id = p.Id,
Author = p.Author,
License = p.License,
Machine =
$"{p.Machine.Company.Name} {p.Machine.Name}",
UploadDate = p.UploadDate,
UploadUser = p.User.UserName
}).OrderBy(p => p.Machine)
.ThenBy(p => p.UploadUser).ThenBy(p => p.UploadDate).ToListAsync());
}
// GET: MachinePhotos/Details/5

16
cicm_web/Areas/Admin/Models/MachinePhotoViewModel.cs Normal file
View File

@@ -0,0 +1,16 @@
using System;
using System.ComponentModel;
namespace cicm_web.Areas.Admin.Models
{
public class MachinePhotoViewModel : BaseViewModel<Guid>
{
public string Author;
public string License;
public string Machine;
[DisplayName("Uploaded")]
public DateTime UploadDate;
[DisplayName("Uploaded by")]
public string UploadUser;
}
}

236
cicm_web/Areas/Admin/Views/MachinePhotos/Index.cshtml
View File

@@ -1,244 +1,76 @@
@using Cicm.Database.Models
@model IEnumerable<Cicm.Database.Models.MachinePhoto>
@using cicm_web.Areas.Admin.Models
@model IEnumerable<cicm_web.Areas.Admin.Models.MachinePhotoViewModel>
@{
ViewData["Title"] = "Index";
}
<h1>Index</h1>
<h1>Machine photos</h1>
<p>
<a asp-action="Create">Create New</a>
<a asp-action="Create"
class="btn btn-primary">
Create New
</a>
</p>
<table class="table">
<thead>
<tr>
<thead>
<tr>
<th>
@Html.DisplayNameFor(model => model.Author)
@Html.DisplayNameFor(model => model.Machine)
</th>
<th>
@Html.DisplayNameFor(model => model.CameraManufacturer)
</th>
<th>
@Html.DisplayNameFor(model => model.CameraModel)
</th>
<th>
@Html.DisplayNameFor(model => model.ColorSpace)
</th>
<th>
@Html.DisplayNameFor(model => model.Comments)
</th>
<th>
@Html.DisplayNameFor(model => model.Contrast)
</th>
<th>
@Html.DisplayNameFor(model => model.CreationDate)
</th>
<th>
@Html.DisplayNameFor(model => model.DigitalZoomRatio)
</th>
<th>
@Html.DisplayNameFor(model => model.ExifVersion)
</th>
<th>
@Html.DisplayNameFor(model => model.Exposure)
</th>
<th>
@Html.DisplayNameFor(model => model.ExposureMethod)
</th>
<th>
@Html.DisplayNameFor(model => model.ExposureProgram)
</th>
<th>
@Html.DisplayNameFor(model => model.Flash)
</th>
<th>
@Html.DisplayNameFor(model => model.Focal)
</th>
<th>
@Html.DisplayNameFor(model => model.FocalLength)
</th>
<th>
@Html.DisplayNameFor(model => model.FocalLengthEquivalent)
</th>
<th>
@Html.DisplayNameFor(model => model.HorizontalResolution)
</th>
<th>
@Html.DisplayNameFor(model => model.IsoRating)
</th>
<th>
@Html.DisplayNameFor(model => model.Lens)
</th>
<th>
@Html.DisplayNameFor(model => model.License)
</th>
<th>
@Html.DisplayNameFor(model => model.LightSource)
</th>
<th>
@Html.DisplayNameFor(model => model.MeteringMode)
</th>
<th>
@Html.DisplayNameFor(model => model.Orientation)
</th>
<th>
@Html.DisplayNameFor(model => model.PixelComposition)
</th>
<th>
@Html.DisplayNameFor(model => model.Saturation)
</th>
<th>
@Html.DisplayNameFor(model => model.SceneCaptureType)
</th>
<th>
@Html.DisplayNameFor(model => model.SceneControl)
</th>
<th>
@Html.DisplayNameFor(model => model.SensingMethod)
</th>
<th>
@Html.DisplayNameFor(model => model.Sharpness)
</th>
<th>
@Html.DisplayNameFor(model => model.SoftwareUsed)
</th>
<th>
@Html.DisplayNameFor(model => model.SubjectDistanceRange)
@Html.DisplayNameFor(model => model.UploadUser)
</th>
<th>
@Html.DisplayNameFor(model => model.UploadDate)
</th>
<th>
@Html.DisplayNameFor(model => model.VerticalResolution)
@Html.DisplayNameFor(model => model.Author)
</th>
<th>
@Html.DisplayNameFor(model => model.WhiteBalance)
@Html.DisplayNameFor(model => model.License)
</th>
<th></th>
</tr>
</thead>
<tbody>
@foreach(MachinePhoto item in Model)
{
</tr>
</thead>
<tbody>
@foreach(MachinePhotoViewModel item in Model)
{
<tr>
<td>
@Html.DisplayFor(modelItem => item.Author)
@Html.DisplayFor(modelItem => item.Machine)
</td>
<td>
@Html.DisplayFor(modelItem => item.CameraManufacturer)
</td>
<td>
@Html.DisplayFor(modelItem => item.CameraModel)
</td>
<td>
@Html.DisplayFor(modelItem => item.ColorSpace)
</td>
<td>
@Html.DisplayFor(modelItem => item.Comments)
</td>
<td>
@Html.DisplayFor(modelItem => item.Contrast)
</td>
<td>
@Html.DisplayFor(modelItem => item.CreationDate)
</td>
<td>
@Html.DisplayFor(modelItem => item.DigitalZoomRatio)
</td>
<td>
@Html.DisplayFor(modelItem => item.ExifVersion)
</td>
<td>
@Html.DisplayFor(modelItem => item.Exposure)
</td>
<td>
@Html.DisplayFor(modelItem => item.ExposureMethod)
</td>
<td>
@Html.DisplayFor(modelItem => item.ExposureProgram)
</td>
<td>
@Html.DisplayFor(modelItem => item.Flash)
</td>
<td>
@Html.DisplayFor(modelItem => item.Focal)
</td>
<td>
@Html.DisplayFor(modelItem => item.FocalLength)
</td>
<td>
@Html.DisplayFor(modelItem => item.FocalLengthEquivalent)
</td>
<td>
@Html.DisplayFor(modelItem => item.HorizontalResolution)
</td>
<td>
@Html.DisplayFor(modelItem => item.IsoRating)
</td>
<td>
@Html.DisplayFor(modelItem => item.Lens)
</td>
<td>
@Html.DisplayFor(modelItem => item.License)
</td>
<td>
@Html.DisplayFor(modelItem => item.LightSource)
</td>
<td>
@Html.DisplayFor(modelItem => item.MeteringMode)
</td>
<td>
@Html.DisplayFor(modelItem => item.Orientation)
</td>
<td>
@Html.DisplayFor(modelItem => item.PixelComposition)
</td>
<td>
@Html.DisplayFor(modelItem => item.Saturation)
</td>
<td>
@Html.DisplayFor(modelItem => item.SceneCaptureType)
</td>
<td>
@Html.DisplayFor(modelItem => item.SceneControl)
</td>
<td>
@Html.DisplayFor(modelItem => item.SensingMethod)
</td>
<td>
@Html.DisplayFor(modelItem => item.Sharpness)
</td>
<td>
@Html.DisplayFor(modelItem => item.SoftwareUsed)
</td>
<td>
@Html.DisplayFor(modelItem => item.SubjectDistanceRange)
@Html.DisplayFor(modelItem => item.UploadUser)
</td>
<td>
@Html.DisplayFor(modelItem => item.UploadDate)
</td>
<td>
@Html.DisplayFor(modelItem => item.VerticalResolution)
@Html.DisplayFor(modelItem => item.Author)
</td>
<td>
@Html.DisplayFor(modelItem => item.WhiteBalance)
@Html.DisplayFor(modelItem => item.License)
</td>
<td>
<a asp-action="Edit"
asp-route-id="@item.Id">
Edit
</a> |
<a asp-action="Details"
asp-route-id="@item.Id">
asp-route-id="@item.Id"
class="btn btn-primary">
Details
</a> |
</a>
<a asp-action="Edit"
asp-route-id="@item.Id"
class="btn btn-secondary">
Edit
</a>
<a asp-action="Delete"
asp-route-id="@item.Id">
asp-route-id="@item.Id"
class="btn btn-danger">
Delete
</a>
</td>
</tr>
}
</tbody>
}
</tbody>
</table>

2
cicm_web/cicm_web.csproj
View File

@@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>netcoreapp2.2</TargetFramework>
<Version>3.0.99.582</Version>
<Version>3.0.99.583</Version>
<Company>Canary Islands Computer Museum</Company>
<Copyright>Copyright © 2003-2018 Natalia Portillo</Copyright>
<Product>Canary Islands Computer Museum Website</Product>