Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 19 additions & 3 deletions Hdnug.Web/Controllers/HomeController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,15 @@ public ActionResult Index()
var prizeSponsors = _repo.Find(new ActivePrizeSponsors()).ToList();
var currentMonthMeetings = meetings.Where(x => x.MeetingStartDateTime.Month == DateTime.Today.Month && x.MeetingStartDateTime.Year == DateTime.Today.Year);
var sponsors = currentMonthMeetings.SelectMany(x => x.Sponsors);
var upcomingMeetingCount = _repo.Find(new UpcomingMeetings()).ToList().Count;
var viewModel = new HomeViewModel
{
PresentationCount = presentationCount,
Meetings = meetings,
SliderImages = sliderImages,
Sponsors = sponsors,
PrizeSponsors = prizeSponsors
PrizeSponsors = prizeSponsors,
UpcomingMeetingCount = upcomingMeetingCount
};

return View(viewModel);
Expand All @@ -44,10 +46,12 @@ public ActionResult UpcomingMeetings()
{
var meetings = _repo.Find(new UpcomingMeetings()).ToList();
var presentationCount = meetings.Select(x => x.Presentations).Count();
var upcomingMeetingCount = meetings.Count;
var viewModel = new MeetingListViewModel
{
PresentationCount = presentationCount,
Meetings = meetings,
UpcomingMeetingCount = upcomingMeetingCount
};

return View(viewModel);
Expand All @@ -57,23 +61,35 @@ public ActionResult PastMeetings()
{
var meetings = _repo.Find(new PastMeetings()).ToList();
var presentationCount = meetings.Select(x => x.Presentations).Count();
var upcomingMeetingCount = _repo.Find(new UpcomingMeetings()).ToList().Count;
var viewModel = new MeetingListViewModel
{
PresentationCount = presentationCount,
Meetings = meetings,
UpcomingMeetingCount = upcomingMeetingCount
};

return View(viewModel);
}

public ActionResult About()
{
return View();
var upcomingMeetingCount = _repo.Find(new UpcomingMeetings()).ToList().Count;
var viewModel = new ViewModelBase
{
UpcomingMeetingCount = upcomingMeetingCount
};
return View(viewModel);
}

public ActionResult Contact()
{
return View();
var upcomingMeetingCount = _repo.Find(new UpcomingMeetings()).ToList().Count;
var viewModel = new ViewModelBase
{
UpcomingMeetingCount = upcomingMeetingCount
};
return View(viewModel);
}

[HttpPost]
Expand Down
4 changes: 3 additions & 1 deletion Hdnug.Web/Controllers/MeetingsController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,14 @@ public ActionResult Details(int meetingId, int id)
var presentation = meeting.Presentations.Single(x => x.Id == id);
var sponsors = meeting.Sponsors.ToList();
var prizeSponsors = _repository.Find(new ActivePrizeSponsors()).ToList();
var upcomingMeetingCount = _repository.Find(new UpcomingMeetings()).ToList().Count;
var meetingDetailsViewModel = new MeetingDetailsViewModel
{
Meeting = meeting,
Presentation = presentation,
Sponsors = sponsors,
PrizeSponsors = prizeSponsors
PrizeSponsors = prizeSponsors,
UpcomingMeetingCount = upcomingMeetingCount
};
return View(meetingDetailsViewModel);
}
Expand Down
1 change: 1 addition & 0 deletions Hdnug.Web/Hdnug.Web.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,7 @@
<Compile Include="Installers\InfrastructureInstaller.cs" />
<Compile Include="Installers\ServerMapPathProviderInstaller.cs" />
<Compile Include="Models\ViewModels\AccountViewModels.cs" />
<Compile Include="Models\ViewModels\ViewModelBase.cs" />
<Compile Include="Models\ViewModels\HomeViewModel.cs" />
<Compile Include="Areas\Admin\Models\ViewModels\MeetingViewModel.cs" />
<Compile Include="Models\ViewModels\MeetingDetailsViewModel.cs" />
Expand Down
2 changes: 1 addition & 1 deletion Hdnug.Web/Models/ViewModels/HomeViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

namespace Hdnug.Web.Models.ViewModels
{
public class HomeViewModel
public class HomeViewModel : ViewModelBase
{
public HomeViewModel()
{
Expand Down
2 changes: 1 addition & 1 deletion Hdnug.Web/Models/ViewModels/MeetingDetailsViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

namespace Hdnug.Web.Models.ViewModels
{
public class MeetingDetailsViewModel
public class MeetingDetailsViewModel : ViewModelBase
{
public Meeting Meeting { get; set; }

Expand Down
2 changes: 1 addition & 1 deletion Hdnug.Web/Models/ViewModels/MeetingListViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

namespace Hdnug.Web.Models.ViewModels
{
public class MeetingListViewModel
public class MeetingListViewModel : ViewModelBase
{
public int PresentationCount { get; set; }
public IEnumerable<Meeting> Meetings { get; set; } = new List<Meeting>();
Expand Down
10 changes: 10 additions & 0 deletions Hdnug.Web/Models/ViewModels/ViewModelBase.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
using System.Collections.Generic;
using Hdnug.Domain.Data.Models;

namespace Hdnug.Web.Models.ViewModels
{
public class ViewModelBase
{
public int UpcomingMeetingCount { get; set; }
}
}
5 changes: 3 additions & 2 deletions Hdnug.Web/Views/Shared/_Layout.cshtml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<!DOCTYPE html>
@model Hdnug.Web.Models.ViewModels.ViewModelBase
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
Expand Down Expand Up @@ -26,7 +27,7 @@
<div class="show-for-large" style="padding-top: 12px">
<ul class="menu">
<li>@Html.ActionLink("Home", "Index", "Home", null, new { @class = "menu-link" })</li>
<li>@Html.ActionLink("Upcoming", "UpcomingMeetings", "Home", null, new { @class = "menu-link" })</li>
<li>@Html.ActionLink(string.Format("Upcoming({0})", Model.UpcomingMeetingCount), "UpcomingMeetings", "Home", null, new { @class = "menu-link" })</li>
<li>@Html.ActionLink("Past", "PastMeetings", "Home", null, new { @class = "menu-link" })</li>
<li>@Html.ActionLink("Contact", "Contact", "Home", null, new { @class = "menu-link" })</li>
<li>@Html.ActionLink("About", "About", "Home", null, new { @class = "menu-link" })</li>
Expand Down