diff --git a/CulinaryCommandApp/Components/Custom/PrepTasksPanel.razor b/CulinaryCommandApp/Components/Custom/PrepTasksPanel.razor index 6216723..97681c5 100644 --- a/CulinaryCommandApp/Components/Custom/PrepTasksPanel.razor +++ b/CulinaryCommandApp/Components/Custom/PrepTasksPanel.razor @@ -2,6 +2,7 @@ @using CulinaryCommand.Data.Entities @using CulinaryCommand.Data.Enums @using Microsoft.AspNetCore.Components +@inject NavigationManager Nav
@@ -208,6 +209,12 @@ private void OpenRecipe(Tasks t) { + if (t.RecipeId.HasValue) + { + Nav.NavigateTo($"/recipes/view/{t.RecipeId.Value}?from=mytasks"); + return; + } + selectedTask = t; showRecipe = true; } diff --git a/CulinaryCommandApp/Components/Pages/Assignments/AdminAssignTask.razor b/CulinaryCommandApp/Components/Pages/Assignments/AdminAssignTask.razor index f9f3f67..a21de41 100644 --- a/CulinaryCommandApp/Components/Pages/Assignments/AdminAssignTask.razor +++ b/CulinaryCommandApp/Components/Pages/Assignments/AdminAssignTask.razor @@ -147,7 +147,8 @@ else OnMarkInProgress="MarkInProgress" OnMarkComplete="MarkComplete" OnBumpTask="BumpTask" - OnDeleteTask="DeleteTask" /> + OnDeleteTask="DeleteTask" + OnStartAllPending="StartAllPending" />
@@ -789,6 +790,18 @@ else private Task MarkInProgress(int id) => MoveToStatus(id, WorkTaskStatus.InProgress); + private async Task StartAllPending() + { + var pendingTaskIds = TasksByStatus(WorkTaskStatus.Pending) + .Select(t => t.Id) + .ToList(); + + foreach (var taskId in pendingTaskIds) + { + await MarkInProgress(taskId); + } + } + private async Task BumpTask(int id) { await TaskService.BumpDueDateAsync(id, 1); diff --git a/CulinaryCommandApp/Components/Pages/Assignments/TaskBoardPanel.razor b/CulinaryCommandApp/Components/Pages/Assignments/TaskBoardPanel.razor index 1345623..7844055 100644 --- a/CulinaryCommandApp/Components/Pages/Assignments/TaskBoardPanel.razor +++ b/CulinaryCommandApp/Components/Pages/Assignments/TaskBoardPanel.razor @@ -35,6 +35,16 @@ + @if (status == WorkTaskStatus.Pending && tasks.Any()) + { +
+ +
+ } +
@if (!tasks.Any()) { @@ -125,6 +135,7 @@ [Parameter] public EventCallback OnMarkComplete { get; set; } [Parameter] public EventCallback OnBumpTask { get; set; } [Parameter] public EventCallback OnDeleteTask { get; set; } + [Parameter] public EventCallback OnStartAllPending { get; set; } private string TaskBoardSearchValue { @@ -139,4 +150,6 @@ private Task HandleBumpTask(int taskId) => OnBumpTask.InvokeAsync(taskId); private Task HandleDeleteTask(int taskId) => OnDeleteTask.InvokeAsync(taskId); + + private Task HandleStartAllPending() => OnStartAllPending.InvokeAsync(); } diff --git a/CulinaryCommandApp/Components/Pages/FeedbackPage.razor b/CulinaryCommandApp/Components/Pages/FeedbackPage.razor index a0a1ebb..7713820 100644 --- a/CulinaryCommandApp/Components/Pages/FeedbackPage.razor +++ b/CulinaryCommandApp/Components/Pages/FeedbackPage.razor @@ -4,7 +4,26 @@ @inject IFeedbackService FeedbackSvc