Updated implementation

Author: Shama-K

4-WebApp-your-API/4-3-AnyOrg/ToDoListClient/Controllers/ToDoListController.cs

@@ -23,6 +23,7 @@ public ToDoListController(IToDoListService todoListService)
         // GET: TodoList
         public async Task<ActionResult> Index()
         {
+            TempData["SignedInUser"] = User.GetDisplayName();
             return View(await _todoListService.GetAsync());
         }
 
@@ -40,6 +41,7 @@ public async Task<IActionResult> Create()
                     Text = u
                 }).ToList();
                 TempData["TenantId"] = HttpContext.User.GetTenantId();
+                TempData["AssignedBy"] = HttpContext.User.GetDisplayName();
                 return View(todo);
             }
             catch (WebApiMsalUiRequiredException ex)
@@ -51,7 +53,7 @@ public async Task<IActionResult> Create()
         // POST: TodoList/Create
         [HttpPost]
         [ValidateAntiForgeryToken]
-        public async Task<ActionResult> Create([Bind("Title,Owner,TenantId")] ToDoItem todo)
+        public async Task<ActionResult> Create([Bind("Title,AssignedTo,AssignedBy,TenantId")] ToDoItem todo)
         {
             await _todoListService.AddAsync(todo);
             return RedirectToAction("Index");
@@ -73,7 +75,7 @@ public async Task<ActionResult> Edit(int id)
         // POST: TodoList/Edit/5
         [HttpPost]
         [ValidateAntiForgeryToken]
-        public async Task<ActionResult> Edit(int id, [Bind("Id,Title,Owner,TenantId")] ToDoItem todo)
+        public async Task<ActionResult> Edit(int id, [Bind("Id,Title,AssignedTo,AssignedBy,TenantId")] ToDoItem todo)
         {
             await _todoListService.EditAsync(todo);
             return RedirectToAction("Index");
@@ -95,7 +97,7 @@ public async Task<ActionResult> Delete(int id)
         // POST: TodoList/Delete/5
         [HttpPost]
         [ValidateAntiForgeryToken]
-        public async Task<ActionResult> Delete(int id, [Bind("Id,Title,Owner")] ToDoItem todo)
+        public async Task<ActionResult> Delete(int id, [Bind("Id,Title,AssignedTo")] ToDoItem todo)
         {
             await _todoListService.DeleteAsync(id);
             return RedirectToAction("Index");

4-WebApp-your-API/4-3-AnyOrg/ToDoListClient/Models/ToDoItem.cs

@@ -11,7 +11,10 @@ public class ToDoItem
 
         public string Title { get; set; }
 
-        public string Owner { get; set; }
+        public string AssignedTo { get; set; }
+
+        public string AssignedBy { get; set; }
+        
         public string TenantId { get; set; }
     }
 }

4-WebApp-your-API/4-3-AnyOrg/ToDoListClient/Views/ToDoList/Create.cshtml

@@ -10,17 +10,18 @@
 <div class="row">
     <div class="col-md-4">
         <form asp-action="Create">
-            <input type="hidden" asp-for="TenantId" value="@((string)TempData["TenantId"])"/>
+            <input type="hidden" asp-for="TenantId" value="@((string)TempData["TenantId"])" />
+            <input type="hidden" asp-for="AssignedBy" value="@((string)TempData["AssignedBy"])" />
             <div asp-validation-summary="ModelOnly" class="text-danger"></div>
             <div class="form-group">
                 <label asp-for="Title" class="control-label"></label>
                 <input asp-for="Title" class="form-control" />
                 <span asp-validation-for="Title" class="text-danger"></span>
             </div>
             <div class="form-group">
-               <label asp-for="Owner" class="control-label"></label>
+                <label asp-for="AssignedTo" class="control-label"></label>
 
-                <select class="form-control" asp-for="Owner" asp-items="@((List<SelectListItem>)TempData["UsersDropDown"])"></select>
+                <select class="form-control" asp-for="AssignedTo" asp-items="@((List<SelectListItem>)TempData["UsersDropDown"])"></select>
 
             </div>
             <div class="form-group">

4-WebApp-your-API/4-3-AnyOrg/ToDoListClient/Views/ToDoList/Delete.cshtml

@@ -18,10 +18,10 @@
             @Html.DisplayFor(model => model.Title)
         </dd>
         <dt class="col-sm-2">
-            @Html.DisplayNameFor(model => model.Owner)
+            @Html.DisplayNameFor(model => model.AssignedTo)
         </dt>
         <dd class="col-sm-10">
-            @Html.DisplayFor(model => model.Owner)
+            @Html.DisplayFor(model => model.AssignedTo)
         </dd>
     </dl>
 

4-WebApp-your-API/4-3-AnyOrg/ToDoListClient/Views/ToDoList/Edit.cshtml

@@ -9,16 +9,17 @@
     <form asp-action="Edit">
         <div asp-validation-summary="ModelOnly" class="text-danger"></div>
         <input type="hidden" asp-for="Id" />
-        <input type="hidden" asp-for="TenantId"/>
+        <input type="hidden" asp-for="TenantId" />
+        <input type="hidden" asp-for="AssignedBy"/>
         <div class="form-group">
             <label asp-for="Title" class="control-label"></label>
             <input asp-for="Title" class="form-control" />
             <span asp-validation-for="Title" class="text-danger"></span>
         </div>
         <div class="form-group">
-            <label asp-for="Owner" class="control-label"></label>
-            <input asp-for="Owner" class="form-control" readonly="readonly"/>
-            <span asp-validation-for="Owner" class="text-danger"></span>
+            <label asp-for="AssignedTo" class="control-label"></label>
+            <input asp-for="AssignedTo" class="form-control" readonly="readonly" />
+            <span asp-validation-for="AssignedTo" class="text-danger"></span>
         </div>
         <div class="form-group">
             <input type="submit" value="Save" class="btn btn-primary" />

4-WebApp-your-API/4-3-AnyOrg/ToDoListClient/Views/ToDoList/Index.cshtml

@@ -9,7 +9,8 @@
 <p>
     <a asp-action="Create">Create New</a>
 </p>
-<table class="table">
+<p> Tasks assigned to signed-in User</p>
+<table class="table table-bordered">
     <thead>
         <tr>
             <th>
@@ -19,31 +20,69 @@
                 @Html.DisplayNameFor(model => model.Title)
             </th>
             <th>
-                @Html.DisplayNameFor(model => model.Owner)
+                @Html.DisplayNameFor(model => model.AssignedBy)
+            </th>
+        </tr>
+    </thead>
+    <tbody>
+        @foreach (var item in Model)
+        {
+            if (item.AssignedTo == TempData["SignedInUser"].ToString())
+            {
+                <tr>
+                    <td>
+                        @Html.DisplayFor(modelItem => item.Id)
+                    </td>
+                    <td>
+                        @Html.DisplayFor(modelItem => item.Title)
+                    </td>
+                    <td>
+                        @Html.DisplayFor(modelItem => item.AssignedBy)
+                    </td>
+                </tr>
+            }
+        }
+    </tbody>
+</table>
+<p>Tasks created by signed-in User</p>
+<table class="table table-bordered">
+    <thead>
+        <tr>
+            <th>
+                @Html.DisplayNameFor(model => model.Id)
+            </th>
+            <th>
+                @Html.DisplayNameFor(model => model.Title)
+            </th>
+            <th>
+                @Html.DisplayNameFor(model => model.AssignedTo)
             </th>
             <th>
                 Actions
             </th>
         </tr>
     </thead>
     <tbody>
-        @foreach (var item in Model)
+        @foreach (var item2 in Model)
         {
-            <tr>
-                <td>
-                    @Html.DisplayFor(modelItem => item.Id)
-                </td>
-                <td>
-                    @Html.DisplayFor(modelItem => item.Title)
-                </td>
-                <td>
-                    @Html.DisplayFor(modelItem => item.Owner)
-                </td>
-                <td>
-                    @Html.ActionLink("Edit", "Edit", new { id = item.Id }) |
-                    @Html.ActionLink("Delete", "Delete", new { id = item.Id })
-                </td>
-            </tr>
+            if (item2.AssignedBy == TempData["SignedInUser"].ToString())
+            {
+                <tr>
+                    <td>
+                        @Html.DisplayFor(modelItem => item2.Id)
+                    </td>
+                    <td>
+                        @Html.DisplayFor(modelItem => item2.Title)
+                    </td>
+                    <td>
+                        @Html.DisplayFor(modelItem => item2.AssignedTo)
+                    </td>
+                    <td>
+                        @Html.ActionLink("Edit", "Edit", new { id = item2.Id }) |
+                        @Html.ActionLink("Delete", "Delete", new { id = item2.Id })
+                    </td>
+                </tr>
+            }
         }
     </tbody>
 </table>

4-WebApp-your-API/4-3-AnyOrg/TodoListService/Controllers/TodoListController.cs

@@ -40,6 +40,7 @@ public async Task<ActionResult<IEnumerable<TodoItem>>> GetTodoItems()
         {
             HttpContext.VerifyUserHasAnyAcceptedScope(scopeRequiredByApi);
             string userTenantId = HttpContext.User.GetTenantId();
+            var signedInUser = HttpContext.User.GetDisplayName();
             try
             {
                 Microsoft.Graph.User user = new User();
@@ -49,7 +50,8 @@ public async Task<ActionResult<IEnumerable<TodoItem>>> GetTodoItems()
             {
                 throw;
             }
-            return await _context.TodoItems.Where(x => x.TenantId == userTenantId).ToListAsync();
+            return await _context.TodoItems.Where
+                (x => x.TenantId == userTenantId && (x.AssignedTo == signedInUser || x.Assignedby== signedInUser)).ToListAsync();
         }
 
         // GET: api/TodoItems/5

4-WebApp-your-API/4-3-AnyOrg/TodoListService/Models/TodoItem.cs

@@ -11,7 +11,8 @@ public class TodoItem
 
         public string Title { get; set; }
 
-        public string Owner { get; set; }
+        public string AssignedTo { get; set; }
+        public string Assignedby { get; set; }
         public string TenantId { get; set; }
     }
 }