From 4581c5f0441a084f6924b2db8dad8b4cf1be323c Mon Sep 17 00:00:00 2001
From: Neil <nbuss848@gmail.com>
Date: Sun, 31 Jan 2021 16:34:40 -0600
Subject: [PATCH 1/2] Complete Subtask MVP by adding simple UI for viewing and
 adding a subtask

---
 .../Controllers/ProjectTaskController.cs      | 26 +++++++++++--
 Project.Web/Controllers/SubTaskController.cs  |  2 +-
 .../Models/SubTasks/SubTaskCreateViewModel.cs |  3 +-
 .../Views/ProjectTask/AddSubTask.cshtml       | 10 ++---
 .../ProjectTask/CreateProjectTask.cshtml      |  4 +-
 Project.Web/Views/ProjectTask/Index.cshtml    |  5 ++-
 .../Views/ProjectTask/SubTaskIndex.cshtml     | 37 +++++++++++++++++++
 7 files changed, 72 insertions(+), 15 deletions(-)
 create mode 100644 Project.Web/Views/ProjectTask/SubTaskIndex.cshtml

diff --git a/Project.Web/Controllers/ProjectTaskController.cs b/Project.Web/Controllers/ProjectTaskController.cs
index c05b197..1687e20 100644
--- a/Project.Web/Controllers/ProjectTaskController.cs
+++ b/Project.Web/Controllers/ProjectTaskController.cs
@@ -56,15 +56,35 @@ public IActionResult AddTask(int projectId)
 
         public IActionResult AddSubTask(int taskId)
         {
-           // var task = _context.Tasks.Where(x => x.TaskId == taskId).FirstOrDefault();
-
             var newSubTask = new SubTaskCreateViewModel()
             {
                 TaskId = taskId
             };
 
-            return View("CreateSubTask", newSubTask);
+            return View("AddSubTask", newSubTask);
         }
+
+        public IActionResult SubTaskIndex(int taskId)
+        {
+            var view = new SubTaskIndexViewModel();
+            var task = _context.Tasks.Where(x => x.TaskId == taskId).FirstOrDefault();
+
+            var project = _context.Projects.Where(x => x.Tasks.Contains(task)).FirstOrDefault();
+
+            view.ProjectName = project.Name;
+            view.Subtasks = _context.SubTasks.Where(x => x.Task.TaskId == taskId).Select(x=>
+                    new SubtaskListingViewModel()
+                    {
+                        Description = x.Description,
+                        Name = x.Name,
+                        Status = x.Status.Name
+                    }
+                );
+            view.Task = task.Name;
+
+            return View(view);
+        }
+
         [HttpPost]
         public async Task<IActionResult> AddNewSubTask(SubTaskCreateViewModel model)
         {
diff --git a/Project.Web/Controllers/SubTaskController.cs b/Project.Web/Controllers/SubTaskController.cs
index 7972897..76d2e8c 100644
--- a/Project.Web/Controllers/SubTaskController.cs
+++ b/Project.Web/Controllers/SubTaskController.cs
@@ -22,7 +22,7 @@ public IActionResult Index()
             return View();
         }
 
-        public IActionResult Create(int projectId, int taskId)
+        public IActionResult Create(int taskId)
         {
             var subtask = new SubtaskListingViewModel();
 
diff --git a/Project.Web/Models/SubTasks/SubTaskCreateViewModel.cs b/Project.Web/Models/SubTasks/SubTaskCreateViewModel.cs
index 8f8404d..4f374a2 100644
--- a/Project.Web/Models/SubTasks/SubTaskCreateViewModel.cs
+++ b/Project.Web/Models/SubTasks/SubTaskCreateViewModel.cs
@@ -7,7 +7,8 @@ namespace Project.Web.Models.SubTasks
 {
     public class SubTaskCreateViewModel
     {
-        public int TaskId { get; internal set; }
+        public int SubTaskId { get; set; }
+        public int TaskId { get; set; }
         public string Name { get; set; }
         public string Description { get; set; }
         public int Size { get; set; }
diff --git a/Project.Web/Views/ProjectTask/AddSubTask.cshtml b/Project.Web/Views/ProjectTask/AddSubTask.cshtml
index 02dcab8..63a79ce 100644
--- a/Project.Web/Views/ProjectTask/AddSubTask.cshtml
+++ b/Project.Web/Views/ProjectTask/AddSubTask.cshtml
@@ -4,18 +4,16 @@
     ViewData["Title"] = "AddSubTask";
 }
 
-<h1>AddSubTask</h1>
+<h1>Add Subtask</h1>
 
-<h4>SubTaskCreateViewModel</h4>
 <hr />
 <div class="row">
     <div class="col-md-4">
         <form asp-action="AddNewSubTask">
             <div asp-validation-summary="ModelOnly" class="text-danger"></div>
-            <div hidden class="form-group">
-                <label asp-for="TaskId" class="control-label"></label>
-                <input asp-for="TaskId" class="form-control" />
-                <span asp-validation-for="TaskId" class="text-danger"></span>
+            <div class="form-group">
+                <input asp-for="TaskId" value="@Model.TaskId" class="form-control" />
+
             </div>
             <div class="form-group">
                 <label asp-for="Name" class="control-label"></label>
diff --git a/Project.Web/Views/ProjectTask/CreateProjectTask.cshtml b/Project.Web/Views/ProjectTask/CreateProjectTask.cshtml
index c1d677f..28f0eea 100644
--- a/Project.Web/Views/ProjectTask/CreateProjectTask.cshtml
+++ b/Project.Web/Views/ProjectTask/CreateProjectTask.cshtml
@@ -5,9 +5,7 @@
     Layout = "~/Views/Shared/_Layout.cshtml";
 }
 
-<h1>CreateProjectTask</h1>
-
-<h4>ProjectTaskIndexViewModel</h4>
+<h4>Create Project</h4>
 <hr />
 <div class="row">
     <div class="col-md-4">
diff --git a/Project.Web/Views/ProjectTask/Index.cshtml b/Project.Web/Views/ProjectTask/Index.cshtml
index 5eec2b1..f583d96 100644
--- a/Project.Web/Views/ProjectTask/Index.cshtml
+++ b/Project.Web/Views/ProjectTask/Index.cshtml
@@ -37,7 +37,10 @@
                     @foreach (var task in Model.TaskList)
                     {
                         <tr>
-                            <td>@task.Name <span class="badge badge-info">@task.Status</span></td>
+                            <td>
+                                <a asp-action="SubTaskIndex" asp-controller="ProjectTask" asp-route-taskId="@task.TaskId">@task.Name</a> 
+                                <span class="badge badge-info">@task.Status</span>
+                            </td>
                             <td>
                                 <a asp-action="AddSubTask" asp-controller="ProjectTask" asp-route-taskId="@task.TaskId">
                                 <span class="">+</span></a>
diff --git a/Project.Web/Views/ProjectTask/SubTaskIndex.cshtml b/Project.Web/Views/ProjectTask/SubTaskIndex.cshtml
new file mode 100644
index 0000000..f96ac94
--- /dev/null
+++ b/Project.Web/Views/ProjectTask/SubTaskIndex.cshtml
@@ -0,0 +1,37 @@
+@model Project.Web.Models.SubTasks.SubTaskIndexViewModel
+
+<h1>
+    @Model.ProjectName
+</h1>
+
+<h4>
+    Current Task: @Model.Task
+</h4>
+
+<table class="table table-responsive">
+    <thead>
+
+        <tr>
+            <th>Name</th>
+            <th>Description</th>
+            <th>Status</th>
+        </tr>
+    </thead>
+    <tbody>
+
+        @foreach (var item in Model.Subtasks)
+        {
+            <tr>
+                <td>
+                    @item.Name
+                </td>
+                <td>
+                    @item.Description
+                </td>
+                <td>
+                    @item.Status
+                </td>
+            </tr>
+        }
+    </tbody>
+</table>
\ No newline at end of file

From 8dacc138ce5228c354afa634bca3df0df9d00ead Mon Sep 17 00:00:00 2001
From: Neil <nbuss848@gmail.com>
Date: Sun, 14 Feb 2021 20:21:45 -0600
Subject: [PATCH 2/2] Add default size

---
 Project.Core/Enums/Size.cs                       | 14 ++++++++++++++
 Project.Web/Controllers/ProjectTaskController.cs |  9 ++++++---
 2 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 Project.Core/Enums/Size.cs

diff --git a/Project.Core/Enums/Size.cs b/Project.Core/Enums/Size.cs
new file mode 100644
index 0000000..5cace73
--- /dev/null
+++ b/Project.Core/Enums/Size.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Project.Domain.Enums
+{
+    public enum Size
+    {
+        Mini = 1,
+        Small = 2,
+        Medium = 4,
+        Large = 8
+    }
+}
diff --git a/Project.Web/Controllers/ProjectTaskController.cs b/Project.Web/Controllers/ProjectTaskController.cs
index 1687e20..aff3ccd 100644
--- a/Project.Web/Controllers/ProjectTaskController.cs
+++ b/Project.Web/Controllers/ProjectTaskController.cs
@@ -48,7 +48,8 @@ public IActionResult AddTask(int projectId)
             var newTask = new ProjectTaskCreateViewModel()
             {
                 ProjectId = projectId,
-                TaskId = 0                
+                TaskId = 0, 
+                Size = 4                
             };
 
             return View("CreateProjectTask", newTask);
@@ -58,7 +59,8 @@ public IActionResult AddSubTask(int taskId)
         {
             var newSubTask = new SubTaskCreateViewModel()
             {
-                TaskId = taskId
+                TaskId = taskId,
+                Size = 1
             };
 
             return View("AddSubTask", newSubTask);
@@ -77,7 +79,8 @@ public IActionResult SubTaskIndex(int taskId)
                     {
                         Description = x.Description,
                         Name = x.Name,
-                        Status = x.Status.Name
+                        Status = x.Status.Name,
+                        Size = 1
                     }
                 );
             view.Task = task.Name;