notazof/yavsc
1
0
Fork 0
Code Issues Pull requests Projects 1 Releases 3 Packages Wiki Activity Actions

refact

Browse source
This commit is contained in:
Paul Schneider 2017-02-13 01:32:03 +01:00
commit cea0defaf4
16 changed files with 309 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Yavsc/Controllers/FrontOfficeController.cs
View file

@ -58,8 +58,8 @@ namespace Yavsc.Controllers
return View(result);
}
[Route("Book/{id}"), HttpPost, AllowAnonymous]
public ActionResult Book(BookQuery bookQuery)
[Route("Profiles/{id}"), HttpPost, AllowAnonymous]
public ActionResult Profiles(BookQuery bookQuery)
{
if (ModelState.IsValid)
{
@ -85,7 +85,7 @@ namespace Yavsc.Controllers
return View("Index");
}
ViewBag.Activities = _context.ActivityItems(null);
return View("Book", _context.Performers.Include(p => p.Performer).Where
return View("Profiles", _context.Performers.Include(p => p.Performer).Where
(p => p.Active).OrderBy(
x => x.MinDailyCost
));

14
Yavsc/Controllers/HairTaintsController.cs
View file

@ -1,12 +1,13 @@
using System.Threading.Tasks;
using Microsoft.AspNet.Authorization;
using Microsoft.AspNet.Mvc;
using Microsoft.AspNet.Mvc.Rendering;
using Microsoft.Data.Entity;
using Yavsc.Models;
using Yavsc.Models.Haircut;
namespace Yavsc.Controllers
{
using Models;
using Models.Haircut;
[Authorize("AdministratorOnly")]
public class HairTaintsController : Controller
{
@ -14,13 +15,14 @@ namespace Yavsc.Controllers
public HairTaintsController(ApplicationDbContext context)
{
_context = context;
_context = context;
}
// GET: HairTaints
public async Task<IActionResult> Index()
{
return View(await _context.HairTaint.ToListAsync());
var applicationDbContext = _context.HairTaint.Include(h => h.Color);
return View(await applicationDbContext.ToListAsync());
}
// GET: HairTaints/Details/5
@ -43,6 +45,7 @@ namespace Yavsc.Controllers
// GET: HairTaints/Create
public IActionResult Create()
{
ViewBag.ColorId = new SelectList(_context.Color, "Id", "Name");
return View();
}
@ -57,6 +60,7 @@ namespace Yavsc.Controllers
await _context.SaveChangesAsync();
return RedirectToAction("Index");
}
ViewBag.ColorId = new SelectList(_context.Color, "Id", "Name", hairTaint.ColorId);
return View(hairTaint);
}
@ -73,6 +77,7 @@ namespace Yavsc.Controllers
{
return HttpNotFound();
}
ViewBag.ColorId = new SelectList(_context.Color, "Id", "Name",hairTaint.ColorId);
return View(hairTaint);
}
@ -87,6 +92,7 @@ namespace Yavsc.Controllers
await _context.SaveChangesAsync();
return RedirectToAction("Index");
}
ViewBag.ColorId = new SelectList(_context.Color, "Id", "Name", hairTaint.ColorId);
return View(hairTaint);
}