From be61f12ed769b6932781be77cd5b5c727d2ff5c1 Mon Sep 17 00:00:00 2001 From: Paul Schneider Date: Fri, 9 Dec 2016 13:40:37 +0100 Subject: [PATCH 1/4] show performer device usage --- Yavsc/Controllers/FrontOfficeController.cs | 3 ++- Yavsc/Views/Shared/_PerformerPartial.cshtml | 9 +++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Yavsc/Controllers/FrontOfficeController.cs b/Yavsc/Controllers/FrontOfficeController.cs index e3a0959f..bb395661 100644 --- a/Yavsc/Controllers/FrontOfficeController.cs +++ b/Yavsc/Controllers/FrontOfficeController.cs @@ -48,7 +48,8 @@ namespace Yavsc.Controllers a => a.Code == id); return View( - _context.Performers.Include(p => p.Performer).Where + _context.Performers.Include(p => p.Performer) + .Include(p=>p.Performer.Devices).Where (p => p.ActivityCode == id && p.Active).OrderBy( x => x.MinDailyCost ) diff --git a/Yavsc/Views/Shared/_PerformerPartial.cshtml b/Yavsc/Views/Shared/_PerformerPartial.cshtml index 7b8496c0..b245a5d2 100644 --- a/Yavsc/Views/Shared/_PerformerPartial.cshtml +++ b/Yavsc/Views/Shared/_PerformerPartial.cshtml @@ -2,9 +2,14 @@
@if (Model.Performer != null) { - + @if (Model.Performer.Avatar != null) { + avatar + } + @Model.Performer.UserName +