Work on #26

cdemi · Oct 15, 2018 · 594fac8 · 594fac8
1 parent 8045151
commit 594fac8
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 10 deletions.
diff --git a/NewsletterCurator.Data/Category.cs b/NewsletterCurator.Data/Category.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
@@ -10,5 +11,6 @@ public class Category
         public Guid ID { get; set; }
         [Required]
         public string Name { get; set; }
+        public List<Newsitem> Newsitems { get; set; }
     }
 }
diff --git a/NewsletterCurator.Web/Controllers/HomeController.cs b/NewsletterCurator.Web/Controllers/HomeController.cs
@@ -1,6 +1,9 @@
 using System.Linq;
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
 using NewsletterCurator.Data;
+using NewsletterCurator.Web.Models;
 
 namespace NewsletterCurator.Web.Controllers
 {
@@ -13,9 +16,11 @@ public HomeController(NewsletterCuratorContext newsletterCuratorContext)
             this.newsletterCuratorContext = newsletterCuratorContext;
         }
 
-        public IActionResult Index()
+        public async Task<IActionResult> Index()
         {
-            return View(newsletterCuratorContext.Categories.ToList());
+            var categoryNewsItemsViewModels = await newsletterCuratorContext.Newsitems.Where(n => n.IsAlreadySent == false).GroupBy(n => n.Category).Select(c => new CategoryNewsItemsViewModel { Category = c.Key, Newsitems = c.ToList() }).ToListAsync();
+
+            return View(categoryNewsItemsViewModels);
         }
     }
 }
diff --git a/NewsletterCurator.Web/Models/CategoryNewsItemsViewModel.cs b/NewsletterCurator.Web/Models/CategoryNewsItemsViewModel.cs
@@ -0,0 +1,12 @@
+using System.Collections.Generic;
+using NewsletterCurator.Data;
+
+namespace NewsletterCurator.Web.Models
+{
+    public class CategoryNewsItemsViewModel
+    {
+        public Category Category { get; set; }
+
+        public List<Newsitem> Newsitems { get; set; }
+    }
+}
diff --git a/NewsletterCurator.Web/Views/Home/Index.cshtml b/NewsletterCurator.Web/Views/Home/Index.cshtml
@@ -1,13 +1,34 @@
-@model List<Category>
+@model List<CategoryNewsItemsViewModel>
 
 <div class="container">
-    <h1>Newsletter Curator</h1>
-    <ul>
-        @foreach (var category in Model)
-        {
-            <li>@category.ID - @category.Name</li>
-        }
-    </ul>
+    @foreach (var categoryNewsItemsViewModel in Model)
+    {
+        <h1>@categoryNewsItemsViewModel.Category.Name</h1>
+        <table class="table-striped table-bordered table-hover">
+            <thead>
+                <tr>
+                    <th width="5%" scope="col"></th>
+                    <th width="15%" scope="col">Title</th>
+                    <th width="80%" scope="col">Summary</th>
+                </tr>
+            </thead>
+            <tbody>
+                @foreach (var newsItem in categoryNewsItemsViewModel.Newsitems)
+                {
+                    <tr>
+                        <td><input type="checkbox" /></td>
+                        <td>@newsItem.Title</td>
+                        <td>@newsItem.Summary</td>
+                    </tr>
+                }
+            </tbody>
+        </table>
+    }
 
     <a href="javascript: document.location='@Url.AbsoluteAction("Add", "Newsitem")?url=' + encodeURIComponent(document.location)">Add to Newsletter</a>
+
+    <form method="get" asp-action="Add" asp-controller="Newsitem">
+        <input type="url" name="url" placeholder="URL" />
+        <input type="submit"  value="Submit"/>
+    </form>
 </div>