Skip to content

Revert PR #141 and PR #142 from main #146

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
matayasdurr merged 2 commits into from
Apr 17, 2026
Merged

Revert PR #141 and PR #142 from main #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c8c1626
Revert "Merge pull request #142 from Culinary-Command/feature/assign-…
matayasdurr Apr 17, 2026
d733c12
Revert PR #141
matayasdurr Apr 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
87 changes: 16 additions & 71 deletions CulinaryCommandApp/Components/Custom/PrepTasksPanel.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,10 @@
@namespace CulinaryCommand.Components.Custom
@using CulinaryCommand.Data.Entities
@using CulinaryCommand.Data.Enums
@using Microsoft.AspNetCore.Components

<div class="card shadow-sm border-0 cc-card">
<div class="cc-card">
<div class="cc-card-header">
<div>
<div class="cc-section-label">Assigned Tasks</div>
<h3>Today’s Task List</h3>
<p>Review assigned work, expand general task notes, and complete prep with recipe context where needed.</p>
</div>
<span class="cc-count-pill">@Tasks.Count</span>
<h3>Today's Prep Tasks</h3>
</div>

@if (Tasks is null || Tasks.Count == 0)
Expand All @@ -32,55 +26,29 @@
</button>

<div class="cc-task-main">
<div class="cc-title-row">
<div class="cc-title">
@DisplayTitle(t)
</div>
<span class="cc-kind-badge @(IsPrepTask(t) ? "cc-kind-prep" : "cc-kind-general")">
@(IsPrepTask(t) ? "Recipe Prep" : "General")
</span>
<div class="cc-title">
@DisplayTitle(t)
</div>

@if (IsPrepTask(t))
{
<div class="cc-metrics">
<span>Par: <strong>@(t.Par?.ToString() ?? "0")</strong></span>
<span>Count: <strong>@(t.Count?.ToString() ?? "0")</strong></span>
<span>Prep: <strong>@t.Prep</strong></span>
</div>
}

<div class="cc-action-row">
@if (ShouldShowRecipeDetails(t))
{
<button class="btn btn-light border btn-sm cc-details-toggle"
type="button"
@onclick="() => OpenRecipe(t)">
Recipe Details
</button>
}

@if (!IsPrepTask(t) && !string.IsNullOrWhiteSpace(t.Notes))
{
<button class="btn btn-light border btn-sm cc-details-toggle"
type="button"
@onclick="() => ToggleDetails(t.Id)">
@(IsExpanded(t.Id) ? "Hide Details" : "Show Details")
</button>
}
<div class="cc-metrics">
<span>Par: <strong>@(t.Par?.ToString() ?? "-")</strong></span>
<span>Count: <strong>@(t.Count?.ToString() ?? "-")</strong></span>
<span>Prep: <strong>@t.Prep</strong></span>
</div>

@if (!IsPrepTask(t) && IsExpanded(t.Id) && !string.IsNullOrWhiteSpace(t.Notes))
@if (t.Recipe is not null)
{
<div class="cc-details">
@t.Notes
</div>
<button class="btn btn-light border btn-sm"
type="button"
@onclick="() => OpenRecipe(t)">
Recipe Details
</button>
}
</div>

<div class="cc-task-meta">
<div class="cc-duration">
@FormatAssignedDate(t)
@t.DueDate.ToString("MMM d · h:mm tt")
</div>
<button class="cc-mark"
@onclick="() => OnMarkDoneClicked(t)"
Expand Down Expand Up @@ -186,14 +154,13 @@

private bool showRecipe;
private Tasks? selectedTask;
private readonly HashSet<int> expandedTaskIds = new();

private string DisplayTitle(Tasks t)
{
if (t.Recipe is not null && !string.IsNullOrWhiteSpace(t.Recipe.Title))
return t.Recipe.Title;

return t.Name ?? "Untitled Task";
return t.Name;
}

private async Task OnMarkDoneClicked(Tasks t)
Expand All @@ -202,8 +169,6 @@
{
await OnMarkDone.InvokeAsync(t);
}

expandedTaskIds.Remove(t.Id);
}

private void OpenRecipe(Tasks t)
Expand Down Expand Up @@ -232,24 +197,4 @@

return q.ToString("0.##");
}

private static bool IsPrepTask(Tasks task) => task.Kind == WorkTaskKind.PrepFromRecipe;

private static bool ShouldShowRecipeDetails(Tasks task) => IsPrepTask(task) && task.Recipe is not null;

private bool IsExpanded(int taskId) => expandedTaskIds.Contains(taskId);

private void ToggleDetails(int taskId)
{
if (!expandedTaskIds.Add(taskId))
{
expandedTaskIds.Remove(taskId);
}
}

private static string FormatAssignedDate(Tasks task)
{
var date = task.Date ?? task.CreatedAt;
return date.ToString("MMM d");
}
}
Loading
Loading