From 8b49769223d4e142c06c76c957a59ae020e3c483 Mon Sep 17 00:00:00 2001
From: Natalia Portillo <claunia@claunia.com>
Date: Sun, 30 Jun 2019 21:10:36 +0100
Subject: [PATCH] Implement index page for people.

---
 Cicm.Database/Models/Person.cs                |  1 +
 .../Areas/Admin/Views/People/Index.cshtml     | 38 ++++++++-----------
 cicm_web/cicm_web.csproj                      |  2 +-
 3 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/Cicm.Database/Models/Person.cs b/Cicm.Database/Models/Person.cs
index b68f53e3..044f9976 100644
--- a/Cicm.Database/Models/Person.cs
+++ b/Cicm.Database/Models/Person.cs
@@ -30,6 +30,7 @@ namespace Cicm.Database.Models
         public int?   DocumentPersonId { get; set; }
 
         [NotMapped]
+        [DisplayName("Name")]
         public string FullName => $"{Name} {Surname}";
 
         public         short?                       CountryOfBirthId { get; set; }
diff --git a/cicm_web/Areas/Admin/Views/People/Index.cshtml b/cicm_web/Areas/Admin/Views/People/Index.cshtml
index fb6dc4c0..2d46b36c 100644
--- a/cicm_web/Areas/Admin/Views/People/Index.cshtml
+++ b/cicm_web/Areas/Admin/Views/People/Index.cshtml
@@ -1,22 +1,19 @@
 @model IEnumerable<Cicm.Database.Models.Person>
 
 @{
-    ViewData["Title"] = "Index";
+    ViewData["Title"] = "People";
 }
 
-<h1>Index</h1>
+<h1>People</h1>
 
 <p>
-    <a asp-action="Create">Create New</a>
+    <a asp-action="Create" class="btn btn-primary">Create New</a>
 </p>
 <table class="table">
     <thead>
         <tr>
             <th>
-                @Html.DisplayNameFor(model => model.Name)
-            </th>
-            <th>
-                @Html.DisplayNameFor(model => model.Surname)
+                @Html.DisplayNameFor(model => model.FullName)
             </th>
             <th>
                 @Html.DisplayNameFor(model => model.CountryOfBirth)
@@ -36,9 +33,6 @@
             <th>
                 @Html.DisplayNameFor(model => model.Facebook)
             </th>
-            <th>
-                @Html.DisplayNameFor(model => model.Photo)
-            </th>
             <th></th>
         </tr>
     </thead>
@@ -46,10 +40,7 @@
 @foreach (var item in Model) {
         <tr>
             <td>
-                @Html.DisplayFor(modelItem => item.Name)
-            </td>
-            <td>
-                @Html.DisplayFor(modelItem => item.Surname)
+                @Html.DisplayFor(modelItem => item.FullName)
             </td>
             <td>
                 @Html.DisplayFor(modelItem => item.CountryOfBirth.Name)
@@ -64,18 +55,21 @@
                 @Html.DisplayFor(modelItem => item.Webpage)
             </td>
             <td>
-                @Html.DisplayFor(modelItem => item.Twitter)
+                @if(item.Twitter != null)
+                {
+                    <a href="https://twitter.com/@Html.DisplayFor(modelItem => item.Twitter)">@Html.DisplayFor(modelItem => item.Twitter)</a>
+                }
             </td>
             <td>
-                @Html.DisplayFor(modelItem => item.Facebook)
+                @if(item.Facebook != null)
+                {
+                    <a href="https://www.facebook.com/@Html.DisplayFor(modelItem => item.Facebook)">@Html.DisplayFor(modelItem => item.Facebook)</a>
+                }
             </td>
             <td>
-                @Html.DisplayFor(modelItem => item.Photo)
-            </td>
-            <td>
-                <a asp-action="Edit" asp-route-id="@item.Id">Edit</a> |
-                <a asp-action="Details" asp-route-id="@item.Id">Details</a> |
-                <a asp-action="Delete" asp-route-id="@item.Id">Delete</a>
+                <a asp-action="Details" asp-route-id="@item.Id" class="btn btn-primary">Details</a>
+                <a asp-action="Edit" asp-route-id="@item.Id" class="btn btn-secondary">Edit</a>
+                <a asp-action="Delete" asp-route-id="@item.Id" class="btn btn-danger">Delete</a>
             </td>
         </tr>
 }
diff --git a/cicm_web/cicm_web.csproj b/cicm_web/cicm_web.csproj
index ec2129c4..e6094c1a 100644
--- a/cicm_web/cicm_web.csproj
+++ b/cicm_web/cicm_web.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
     <TargetFramework>netcoreapp2.2</TargetFramework>
-    <Version>3.0.99.865</Version>
+    <Version>3.0.99.867</Version>
     <Company>Canary Islands Computer Museum</Company>
     <Copyright>Copyright © 2003-2018 Natalia Portillo</Copyright>
     <Product>Canary Islands Computer Museum Website</Product>