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

Optimize view of companies.

Browse Source
This commit is contained in:
Natalia Portillo
2019-05-20 01:44:22 +01:00
parent 43e472732f
commit 11933dbc3d
6 changed files with 78 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
cicm_web/Controllers/CompanyController.cs
View File

@@ -30,8 +30,10 @@
using System.Linq;
using Cicm.Database.Models;
using cicm_web.Models;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore;
namespace cicm_web.Controllers
{
@@ -56,9 +58,16 @@ namespace cicm_web.Controllers
ViewBag.Letter = id;
ViewBag.WebRootPath = hostingEnvironment.WebRootPath;
return View(id == '\0'
? _context.Companies.ToArray()
: _context.Companies.Where(c => c.Name.StartsWith(id)).ToArray());
if(id == '\0') return RedirectToAction(nameof(Index));
return View(_context.Companies.Include(c => c.Logos).Where(c => c.Name.StartsWith(id)).OrderBy(c => c.Name)
.Select(c => new CompanyViewModel
{
Id = c.Id,
LastLogo = c.Logos.OrderByDescending(l => l.Year).FirstOrDefault().Guid,
Name = c.Name
}).ToList());
}
public IActionResult View(int id)
@@ -77,16 +86,33 @@ namespace cicm_web.Controllers
{
ViewBag.Iso3166 = _context.Iso31661Numeric.FirstOrDefault(i => i.Id == id);
if(ViewBag.Iso3166 is null) RedirectToAction(nameof(Index));
ViewBag.WebRootPath = hostingEnvironment.WebRootPath;
return View(ViewBag.Iso3166 == null
? _context.Companies.ToArray()
: _context.Companies.Where(c => c.CountryId == id).ToArray());
return View(_context.Companies.Include(c => c.Logos).Where(c => c.CountryId == id).OrderBy(c => c.Name)
.Select(c => new CompanyViewModel
{
Id = c.Id,
LastLogo = c.Logos.OrderByDescending(l => l.Year).FirstOrDefault().Guid,
Name = c.Name
}).ToList());
}
public IActionResult Index()
{
ViewBag.WebRootPath = hostingEnvironment.WebRootPath;
return View(_context.Companies.ToArray());
return View(_context.Companies.Include(c => c.Logos).OrderBy(c => c.Name).Select(c => new CompanyViewModel
{
Id = c.Id,
LastLogo = c
.Logos
.OrderByDescending(l =>
l.Year)
.FirstOrDefault()
.Guid,
Name = c.Name
}).ToList());
}
}
}