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