From c8c1626852385404aa1803a6ebda148c6510c2ff Mon Sep 17 00:00:00 2001 From: Matayas Durr Date: Fri, 17 Apr 2026 13:32:13 -0500 Subject: [PATCH 1/2] Revert "Merge pull request #142 from Culinary-Command/feature/assign-task-improvements" This reverts commit db2f8456466001070bda670e2c73a7924d50042f, reversing changes made to 9a6b36d8d549a66f495515f88bf9f7ce285a26f1. --- .../Components/Custom/PrepTasksPanel.razor | 87 +---- .../Custom/PrepTasksPanel.razor.css | 360 +++++++----------- .../Components/Layout/NavMenu.razor | 25 +- .../Pages/Assignments/AdminAssignTask.razor | 32 +- .../Assignments/AdminAssignTask.razor.css | 5 +- .../Assignments/CreateTaskListModal.razor | 121 +----- .../Assignments/CreateTaskListModal.razor.css | 75 ---- .../Assignments/CreateTaskTemplateModal.razor | 68 +--- .../CreateTaskTemplateModal.razor.css | 35 -- .../Assignments/EditTaskTemplateModal.razor | 68 +--- .../EditTaskTemplateModal.razor.css | 35 -- .../ManageTaskListTemplatesModal.razor | 163 +++----- .../ManageTaskListTemplatesModal.razor.css | 72 ---- .../Pages/Assignments/ManualTaskForm.razor | 41 +- .../Pages/Assignments/MyTasks.razor | 44 +-- .../Pages/Assignments/MyTasks.razor.css | 21 - .../Pages/Assignments/TaskBoardPanel.razor | 42 +- .../Assignments/TaskBoardPanel.razor.css | 23 -- .../Pages/Assignments/TaskFormModel.cs | 25 +- .../Pages/Assignments/TaskLibraryPanel.razor | 35 +- .../Assignments/TaskLibraryPanel.razor.css | 23 -- .../Pages/Assignments/TaskListsPanel.razor | 55 +-- .../Assignments/TaskListsPanel.razor.css | 23 -- .../Data/Models/CreateTaskListRequest.cs | 4 +- .../Data/Models/CreateTaskTemplateRequest.cs | 27 +- .../Data/Models/UpdateTaskTemplateRequest.cs | 27 +- .../Services/TaskLibraryService.cs | 103 +---- 27 files changed, 359 insertions(+), 1280 deletions(-) delete mode 100644 CulinaryCommandApp/Components/Pages/Assignments/CreateTaskListModal.razor.css delete mode 100644 CulinaryCommandApp/Components/Pages/Assignments/CreateTaskTemplateModal.razor.css delete mode 100644 CulinaryCommandApp/Components/Pages/Assignments/EditTaskTemplateModal.razor.css delete mode 100644 CulinaryCommandApp/Components/Pages/Assignments/ManageTaskListTemplatesModal.razor.css delete mode 100644 CulinaryCommandApp/Components/Pages/Assignments/MyTasks.razor.css delete mode 100644 CulinaryCommandApp/Components/Pages/Assignments/TaskBoardPanel.razor.css delete mode 100644 CulinaryCommandApp/Components/Pages/Assignments/TaskLibraryPanel.razor.css delete mode 100644 CulinaryCommandApp/Components/Pages/Assignments/TaskListsPanel.razor.css diff --git a/CulinaryCommandApp/Components/Custom/PrepTasksPanel.razor b/CulinaryCommandApp/Components/Custom/PrepTasksPanel.razor index 6216723..7480fff 100644 --- a/CulinaryCommandApp/Components/Custom/PrepTasksPanel.razor +++ b/CulinaryCommandApp/Components/Custom/PrepTasksPanel.razor @@ -1,16 +1,10 @@ @namespace CulinaryCommand.Components.Custom @using CulinaryCommand.Data.Entities -@using CulinaryCommand.Data.Enums @using Microsoft.AspNetCore.Components -
+
-
-
Assigned Tasks
-

Today’s Task List

-

Review assigned work, expand general task notes, and complete prep with recipe context where needed.

-
- @Tasks.Count +

Today's Prep Tasks

@if (Tasks is null || Tasks.Count == 0) @@ -32,55 +26,29 @@
-
-
- @DisplayTitle(t) -
- - @(IsPrepTask(t) ? "Recipe Prep" : "General") - +
+ @DisplayTitle(t)
- @if (IsPrepTask(t)) - { -
- Par: @(t.Par?.ToString() ?? "0") - Count: @(t.Count?.ToString() ?? "0") - Prep: @t.Prep -
- } - -
- @if (ShouldShowRecipeDetails(t)) - { - - } - - @if (!IsPrepTask(t) && !string.IsNullOrWhiteSpace(t.Notes)) - { - - } +
+ Par: @(t.Par?.ToString() ?? "-") + Count: @(t.Count?.ToString() ?? "-") + Prep: @t.Prep
- @if (!IsPrepTask(t) && IsExpanded(t.Id) && !string.IsNullOrWhiteSpace(t.Notes)) + @if (t.Recipe is not null) { -
- @t.Notes -
+ }
- @FormatAssignedDate(t) + @t.DueDate.ToString("MMM d · h:mm tt")
+
+ + Inventory + +
Recipes @@ -88,6 +94,23 @@ LocationState.OnChange += HandleLocationChange; } + private async Task GoToInventory() + { + var locId = LocationState.CurrentLocation?.Id; + + if (!locId.HasValue) + { + var ctx = await UserCtx.GetAsync(); + locId = ctx.AccessibleLocations.FirstOrDefault()?.Id; + } + + var href = locId.HasValue + ? $"/inventory-management/{locId.Value}" + : "/inventory-management"; + + Nav.NavigateTo(href); + } + private void HandleLocationChange() { InvokeAsync(StateHasChanged); @@ -97,4 +120,4 @@ { LocationState.OnChange -= HandleLocationChange; } -} +} \ No newline at end of file diff --git a/CulinaryCommandApp/Components/Pages/Assignments/AdminAssignTask.razor b/CulinaryCommandApp/Components/Pages/Assignments/AdminAssignTask.razor index f9f3f67..cf5e1ec 100644 --- a/CulinaryCommandApp/Components/Pages/Assignments/AdminAssignTask.razor +++ b/CulinaryCommandApp/Components/Pages/Assignments/AdminAssignTask.razor @@ -158,14 +158,12 @@ else IsOpen="@showCreateTemplateModal" LocationId="@(selectedLocationId ?? 0)" CreatedByUserId="@_ctx?.User?.Id" - Recipes="recipes" OnClose="CloseCreateTemplateModal" OnSave="SaveTemplate" /> @@ -173,7 +171,6 @@ else IsOpen="@showCreateTaskListModal" LocationId="@(selectedLocationId ?? 0)" CreatedByUserId="@_ctx?.User?.Id" - AvailableTemplates="@taskTemplates" OnClose="CloseCreateTaskListModal" OnSave="SaveTaskList" /> @@ -386,17 +383,12 @@ else if (!selectedLocationId.HasValue) return; - if (newTask.TaskType == WorkTaskKind.PrepFromRecipe && !newTask.RecipeId.HasValue) - { - SetError("Select a recipe for prep-from-recipe tasks."); - return; - } - // Decide final task name (auto-fill from recipe if prep task & name is blank) var name = newTask.Name?.Trim() ?? string.Empty; if (newTask.TaskType == WorkTaskKind.PrepFromRecipe && - newTask.RecipeId.HasValue) + newTask.RecipeId.HasValue && + string.IsNullOrWhiteSpace(name)) { var recipe = recipes.FirstOrDefault(r => r.RecipeId == newTask.RecipeId.Value); if (recipe != null && !string.IsNullOrWhiteSpace(recipe.Title)) @@ -405,12 +397,6 @@ else } } - if (string.IsNullOrWhiteSpace(name)) - { - SetError("Task name is required."); - return; - } - Tasks? task = new Tasks { Name = name, @@ -515,7 +501,6 @@ else showCreateTemplateModal = false; await LoadTaskTemplatesAsync(); - await LoadTaskListsAsync(); SetSuccess($"Template '{createdTemplate.Name}' created successfully."); } @@ -552,12 +537,6 @@ else showEditTemplateModal = false; editingTemplate = null; await LoadTaskTemplatesAsync(); - await LoadTaskListsAsync(); - - if (managingTaskList != null) - { - selectedTaskListTemplates = await TaskLibraryService.GetTemplatesForTaskListAsync(managingTaskList.Id); - } SetSuccess($"Template '{updatedTemplate.Name}' updated successfully."); } @@ -575,13 +554,6 @@ else { await TaskLibraryService.ArchiveTemplateAsync(templateId); await LoadTaskTemplatesAsync(); - await LoadTaskListsAsync(); - - if (managingTaskList != null) - { - selectedTaskListTemplates = await TaskLibraryService.GetTemplatesForTaskListAsync(managingTaskList.Id); - } - SetSuccess("Template removed successfully."); } catch (Exception ex) diff --git a/CulinaryCommandApp/Components/Pages/Assignments/AdminAssignTask.razor.css b/CulinaryCommandApp/Components/Pages/Assignments/AdminAssignTask.razor.css index 8a0553c..54205fd 100644 --- a/CulinaryCommandApp/Components/Pages/Assignments/AdminAssignTask.razor.css +++ b/CulinaryCommandApp/Components/Pages/Assignments/AdminAssignTask.razor.css @@ -17,10 +17,7 @@ .assign-task-page ::deep .form-control, .assign-task-page ::deep .form-select, -.assign-task-page ::deep .input-group-text { - border-radius: 1rem; -} - +.assign-task-page ::deep .input-group-text, .assign-task-page ::deep .btn { border-radius: 0.9rem; } diff --git a/CulinaryCommandApp/Components/Pages/Assignments/CreateTaskListModal.razor b/CulinaryCommandApp/Components/Pages/Assignments/CreateTaskListModal.razor index 8af717f..8dac8a1 100644 --- a/CulinaryCommandApp/Components/Pages/Assignments/CreateTaskListModal.razor +++ b/CulinaryCommandApp/Components/Pages/Assignments/CreateTaskListModal.razor @@ -1,12 +1,11 @@ @using CulinaryCommand.Data.Models -@using CulinaryCommand.Data.Entities @using Microsoft.AspNetCore.Components.Forms @if (IsOpen) { -
-
-
+
+
+
Create Task List
@@ -17,88 +16,14 @@
-
-
-
- - -
- -
- - -
- - @if (SelectedTemplateIds.Any()) - { -
-
-
Selected Templates
- @SelectedTemplateIds.Count -
- -
- @foreach (var template in SelectedTemplates) - { - @template.Name - } -
-
- } -
- -
-
-
-
-
Add Templates Now
-
Search and select templates to include in this new task list.
-
- @FilteredTemplates.Count() -
- -
- - -
- -
- @if (!FilteredTemplates.Any()) - { -
No templates match your search.
- } - else - { - @foreach (var template in FilteredTemplates) - { - var isSelected = SelectedTemplateIds.Contains(template.Id); +
+ + +
- - } - } -
-
-
+
+ +
@@ -120,14 +45,11 @@ [Parameter] public bool IsOpen { get; set; } [Parameter] public int LocationId { get; set; } [Parameter] public int? CreatedByUserId { get; set; } - [Parameter] public List AvailableTemplates { get; set; } = new(); [Parameter] public EventCallback OnClose { get; set; } [Parameter] public EventCallback OnSave { get; set; } private CreateTaskListRequest Model = new(); private bool IsSaving; - private string TemplateSearch = string.Empty; - private HashSet SelectedTemplateIds = new(); protected override void OnParametersSet() { @@ -139,8 +61,6 @@ CreatedByUserId = CreatedByUserId, IsActive = true }; - TemplateSearch = string.Empty; - SelectedTemplateIds = new HashSet(); } } @@ -149,31 +69,12 @@ IsSaving = true; Model.LocationId = LocationId; Model.CreatedByUserId = CreatedByUserId; - Model.TaskTemplateIds = SelectedTemplateIds.ToList(); await OnSave.InvokeAsync(Model); IsSaving = false; } - private IEnumerable FilteredTemplates => - AvailableTemplates.Where(t => - string.IsNullOrWhiteSpace(TemplateSearch) || - t.Name.Contains(TemplateSearch, StringComparison.OrdinalIgnoreCase) || - t.Station.Contains(TemplateSearch, StringComparison.OrdinalIgnoreCase) || - (t.Notes?.Contains(TemplateSearch, StringComparison.OrdinalIgnoreCase) ?? false)); - - private IEnumerable SelectedTemplates => - AvailableTemplates.Where(t => SelectedTemplateIds.Contains(t.Id)); - - private void ToggleTemplate(int templateId) - { - if (!SelectedTemplateIds.Add(templateId)) - { - SelectedTemplateIds.Remove(templateId); - } - } - private async Task Close() { await OnClose.InvokeAsync(); } -} +} \ No newline at end of file diff --git a/CulinaryCommandApp/Components/Pages/Assignments/CreateTaskListModal.razor.css b/CulinaryCommandApp/Components/Pages/Assignments/CreateTaskListModal.razor.css deleted file mode 100644 index 0ff8120..0000000 --- a/CulinaryCommandApp/Components/Pages/Assignments/CreateTaskListModal.razor.css +++ /dev/null @@ -1,75 +0,0 @@ -.task-list-modal-backdrop { - background-color: rgba(0, 0, 0, 0.45); -} - -.task-list-modal { - border-radius: 1.1rem; -} - -.task-list-modal .modal-header, -.task-list-modal .modal-footer { - padding: 1.25rem 1.5rem; -} - -.task-list-modal .modal-body { - padding: 1.5rem; -} - -.task-list-modal .btn { - border-radius: 0.9rem; -} - -.task-list-modal ::deep .assign-soft-input { - border-radius: 1rem !important; - min-height: 3rem; - padding: 0.75rem 1rem; -} - -.task-list-modal ::deep textarea.assign-soft-input { - min-height: 5.5rem; - resize: vertical; -} - -.task-list-modal .modal-search-group .input-group-text { - border-radius: 1rem 0 0 1rem; -} - -.task-list-modal .modal-search-group .form-control { - border-radius: 0 1rem 1rem 0; -} - -.task-list-modal-panel { - border: 1px solid #e9ecef; - border-radius: 1.05rem; - background: #ffffff; -} - -.task-list-template-list { - max-height: 360px; - overflow-y: auto; - display: flex; - flex-direction: column; - gap: 0.75rem; -} - -.task-list-template-item { - width: 100%; - display: flex; - align-items: flex-start; - gap: 0.75rem; - padding: 0.9rem 1rem; - border: 1px solid #e9ecef; - border-radius: 1.05rem; - background: #ffffff; - transition: border-color 0.15s ease, background-color 0.15s ease; -} - -.task-list-template-item:hover { - border-color: #cfd8dc; - background: #f8f9fa; -} - -.task-list-template-item.selected { - border-color: #009A3B; - background: #f0fbf4; -} diff --git a/CulinaryCommandApp/Components/Pages/Assignments/CreateTaskTemplateModal.razor b/CulinaryCommandApp/Components/Pages/Assignments/CreateTaskTemplateModal.razor index 2f3d038..357a721 100644 --- a/CulinaryCommandApp/Components/Pages/Assignments/CreateTaskTemplateModal.razor +++ b/CulinaryCommandApp/Components/Pages/Assignments/CreateTaskTemplateModal.razor @@ -1,13 +1,12 @@ @using CulinaryCommand.Data.Enums @using CulinaryCommand.Data.Models -@using CulinaryCommandApp.Recipe.Entities @using Microsoft.AspNetCore.Components.Forms @if (IsOpen) { -
+
-
+
Create Task Template
@@ -20,17 +19,14 @@
- @if (Model.Kind != WorkTaskKind.PrepFromRecipe) - { -
- - -
- } +
+ + +
- + @foreach (var station in StationOptions) { @@ -40,7 +36,7 @@
- + @@ -48,7 +44,7 @@
- + @foreach (var p in PriorityOptions) { @@ -58,41 +54,12 @@
- +
- @if (Model.Kind == WorkTaskKind.PrepFromRecipe) - { -
- - - - @foreach (var recipe in Recipes) - { - - } - -
- -
- - -
- -
- - -
- -
- - -
- } -
- +
@@ -116,7 +83,6 @@ [Parameter] public bool IsOpen { get; set; } [Parameter] public int LocationId { get; set; } [Parameter] public int? CreatedByUserId { get; set; } - [Parameter] public List Recipes { get; set; } = new(); [Parameter] public EventCallback OnClose { get; set; } [Parameter] public EventCallback OnSave { get; set; } @@ -155,24 +121,14 @@ Model.LocationId = LocationId; Model.CreatedByUserId = CreatedByUserId; - SyncRecipeName(); await OnSave.InvokeAsync(Model); IsSaving = false; } - private void SyncRecipeName() - { - if (Model.Kind != WorkTaskKind.PrepFromRecipe) - return; - - var recipeName = Recipes.FirstOrDefault(r => r.RecipeId == Model.RecipeId)?.Title; - Model.Name = recipeName?.Trim() ?? string.Empty; - } - private async Task Close() { await OnClose.InvokeAsync(); } -} +} \ No newline at end of file diff --git a/CulinaryCommandApp/Components/Pages/Assignments/CreateTaskTemplateModal.razor.css b/CulinaryCommandApp/Components/Pages/Assignments/CreateTaskTemplateModal.razor.css deleted file mode 100644 index 89ed627..0000000 --- a/CulinaryCommandApp/Components/Pages/Assignments/CreateTaskTemplateModal.razor.css +++ /dev/null @@ -1,35 +0,0 @@ -.template-modal-backdrop { - background-color: rgba(0, 0, 0, 0.45); -} - -.template-modal { - border-radius: 1.1rem; -} - -.template-modal .modal-header, -.template-modal .modal-footer { - padding: 1.25rem 1.5rem; -} - -.template-modal .modal-body { - padding: 1.5rem; -} - -.template-modal .btn { - border-radius: 0.9rem; -} - -.template-modal ::deep .assign-soft-input { - border-radius: 1rem; - min-height: 3rem; - padding: 0.75rem 1rem; -} - -.template-modal ::deep select.assign-soft-input { - padding-right: 2.75rem; -} - -.template-modal ::deep textarea.assign-soft-input { - min-height: 5.5rem; - resize: vertical; -} diff --git a/CulinaryCommandApp/Components/Pages/Assignments/EditTaskTemplateModal.razor b/CulinaryCommandApp/Components/Pages/Assignments/EditTaskTemplateModal.razor index c87464f..b852645 100644 --- a/CulinaryCommandApp/Components/Pages/Assignments/EditTaskTemplateModal.razor +++ b/CulinaryCommandApp/Components/Pages/Assignments/EditTaskTemplateModal.razor @@ -1,14 +1,13 @@ @using CulinaryCommand.Data.Entities @using CulinaryCommand.Data.Enums @using CulinaryCommand.Data.Models -@using CulinaryCommandApp.Recipe.Entities @using Microsoft.AspNetCore.Components.Forms @if (IsOpen && Template != null) { -
+
-
+
Edit Task Template
@@ -21,17 +20,14 @@
- @if (Model.Kind != WorkTaskKind.PrepFromRecipe) - { -
- - -
- } +
+ + +
- + @foreach (var station in StationOptions) { @@ -41,7 +37,7 @@
- + @@ -49,7 +45,7 @@
- + @foreach (var p in PriorityOptions) { @@ -59,41 +55,12 @@
- +
- @if (Model.Kind == WorkTaskKind.PrepFromRecipe) - { -
- - - - @foreach (var recipe in Recipes) - { - - } - -
- -
- - -
- -
- - -
- -
- - -
- } -
- +
@@ -116,7 +83,6 @@ @code { [Parameter] public bool IsOpen { get; set; } [Parameter] public TaskTemplate? Template { get; set; } - [Parameter] public List Recipes { get; set; } = new(); [Parameter] public EventCallback OnClose { get; set; } [Parameter] public EventCallback OnSave { get; set; } @@ -159,22 +125,12 @@ private async Task HandleSubmit() { IsSaving = true; - SyncRecipeName(); await OnSave.InvokeAsync(Model); IsSaving = false; } - private void SyncRecipeName() - { - if (Model.Kind != WorkTaskKind.PrepFromRecipe) - return; - - var recipeName = Recipes.FirstOrDefault(r => r.RecipeId == Model.RecipeId)?.Title; - Model.Name = recipeName?.Trim() ?? string.Empty; - } - private async Task Close() { await OnClose.InvokeAsync(); } -} +} \ No newline at end of file diff --git a/CulinaryCommandApp/Components/Pages/Assignments/EditTaskTemplateModal.razor.css b/CulinaryCommandApp/Components/Pages/Assignments/EditTaskTemplateModal.razor.css deleted file mode 100644 index 89ed627..0000000 --- a/CulinaryCommandApp/Components/Pages/Assignments/EditTaskTemplateModal.razor.css +++ /dev/null @@ -1,35 +0,0 @@ -.template-modal-backdrop { - background-color: rgba(0, 0, 0, 0.45); -} - -.template-modal { - border-radius: 1.1rem; -} - -.template-modal .modal-header, -.template-modal .modal-footer { - padding: 1.25rem 1.5rem; -} - -.template-modal .modal-body { - padding: 1.5rem; -} - -.template-modal .btn { - border-radius: 0.9rem; -} - -.template-modal ::deep .assign-soft-input { - border-radius: 1rem; - min-height: 3rem; - padding: 0.75rem 1rem; -} - -.template-modal ::deep select.assign-soft-input { - padding-right: 2.75rem; -} - -.template-modal ::deep textarea.assign-soft-input { - min-height: 5.5rem; - resize: vertical; -} diff --git a/CulinaryCommandApp/Components/Pages/Assignments/ManageTaskListTemplatesModal.razor b/CulinaryCommandApp/Components/Pages/Assignments/ManageTaskListTemplatesModal.razor index 60354fe..5fb3aea 100644 --- a/CulinaryCommandApp/Components/Pages/Assignments/ManageTaskListTemplatesModal.razor +++ b/CulinaryCommandApp/Components/Pages/Assignments/ManageTaskListTemplatesModal.razor @@ -2,109 +2,75 @@ @if (IsOpen && TaskList != null) { -
+
-
+
Manage Templates - @TaskList.Name
-
-
-
-
-
-
Available Templates
-
Search and select templates to add to this list.
+
+ +
+ @if (!AvailableTemplates.Any()) + { +
No templates available.
+ } + else + { + @foreach (var template in AvailableTemplates) + { + var isSelected = SelectedTemplateIds.Contains(template.Id); + +
+ +
- @FilteredAvailableTemplates.Count() -
- -
- - -
- -
- @if (!FilteredAvailableTemplates.Any()) - { -
No templates available.
- } - else - { - @foreach (var template in FilteredAvailableTemplates) - { - var isSelected = SelectedTemplateIds.Contains(template.Id); - - - } - } -
- -
- -
-
+ } + }
+
-
-
-
-
-
Currently In This List
-
Templates already included in @TaskList.Name.
-
- @CurrentTemplates.Count -
- -
- @if (!CurrentTemplates.Any()) - { -
No templates in this task list yet.
- } - else - { - @foreach (var template in CurrentTemplates) - { -
-
-
@template.Name
-
@template.Station
-
+
+ +
- -
- } - } -
-
+
+ +
+ + +
+ @if (!CurrentTemplates.Any()) + { +
No templates in this task list yet.
+ } + else + { + @foreach (var template in CurrentTemplates) + { +
+
+
@template.Name
+
@template.Station
+
+ + +
+ } + }
@@ -130,14 +96,12 @@ private HashSet SelectedTemplateIds = new(); private bool IsSaving; - private string TemplateSearch = string.Empty; protected override void OnParametersSet() { if (IsOpen) { SelectedTemplateIds = new HashSet(); - TemplateSearch = string.Empty; } } @@ -157,17 +121,8 @@ IsSaving = false; } - private IEnumerable FilteredAvailableTemplates => - AvailableTemplates - .Where(t => CurrentTemplates.All(current => current.Id != t.Id)) - .Where(t => - string.IsNullOrWhiteSpace(TemplateSearch) || - t.Name.Contains(TemplateSearch, StringComparison.OrdinalIgnoreCase) || - t.Station.Contains(TemplateSearch, StringComparison.OrdinalIgnoreCase) || - (t.Notes?.Contains(TemplateSearch, StringComparison.OrdinalIgnoreCase) ?? false)); - private async Task Close() { await OnClose.InvokeAsync(); } -} +} \ No newline at end of file diff --git a/CulinaryCommandApp/Components/Pages/Assignments/ManageTaskListTemplatesModal.razor.css b/CulinaryCommandApp/Components/Pages/Assignments/ManageTaskListTemplatesModal.razor.css deleted file mode 100644 index a0a80f8..0000000 --- a/CulinaryCommandApp/Components/Pages/Assignments/ManageTaskListTemplatesModal.razor.css +++ /dev/null @@ -1,72 +0,0 @@ -.manage-task-list-modal-backdrop { - background-color: rgba(0, 0, 0, 0.45); -} - -.manage-task-list-modal { - border-radius: 1.1rem; -} - -.manage-task-list-modal .modal-header, -.manage-task-list-modal .modal-footer { - padding: 1.25rem 1.5rem; -} - -.manage-task-list-modal .modal-body { - padding: 1.5rem; -} - -.manage-task-list-modal .btn { - border-radius: 0.9rem; -} - -.manage-task-list-modal .form-control, -.manage-task-list-modal .form-select, -.manage-task-list-modal .input-group-text { - border-radius: 1rem; -} - -.manage-task-list-modal .modal-search-group .input-group-text { - border-radius: 1rem 0 0 1rem; -} - -.manage-task-list-modal .modal-search-group .form-control { - border-radius: 0 1rem 1rem 0; -} - -.manage-task-list-panel { - border: 1px solid #e9ecef; - border-radius: 1.05rem; - background: #ffffff; -} - -.manage-task-list-template-list { - max-height: 360px; - overflow-y: auto; -} - -.manage-task-list-template-item { - width: 100%; - display: flex; - align-items: flex-start; - gap: 0.75rem; - padding: 0.9rem 1rem; - border: 1px solid #e9ecef; - border-radius: 1.05rem; - background: #ffffff; - margin-bottom: 0.75rem; - transition: border-color 0.15s ease, background-color 0.15s ease; -} - -.manage-task-list-current-item { - border-radius: 1.05rem; -} - -.manage-task-list-template-item:hover { - border-color: #cfd8dc; - background: #f8f9fa; -} - -.manage-task-list-template-item.selected { - border-color: #009A3B; - background: #f0fbf4; -} diff --git a/CulinaryCommandApp/Components/Pages/Assignments/ManualTaskForm.razor b/CulinaryCommandApp/Components/Pages/Assignments/ManualTaskForm.razor index a0a09d2..b4a3020 100644 --- a/CulinaryCommandApp/Components/Pages/Assignments/ManualTaskForm.razor +++ b/CulinaryCommandApp/Components/Pages/Assignments/ManualTaskForm.razor @@ -17,19 +17,16 @@
- +
- @if (Model.TaskType != WorkTaskKind.PrepFromRecipe) - { -
- - -
- } +
+ + +
@@ -57,7 +54,7 @@ {
- + @foreach (var recipe in Recipes) { @@ -75,10 +72,6 @@
-
- - -
} @@ -121,26 +114,4 @@ [Parameter] public EventCallback OnSubmit { get; set; } private Task HandleSubmit() => OnSubmit.InvokeAsync(); - - private void HandleTaskTypeChanged() - { - if (Model.TaskType == WorkTaskKind.PrepFromRecipe) - { - SyncRecipeName(); - return; - } - - Model.RecipeId = null; - Model.Par = null; - Model.Count = null; - } - - private void SyncRecipeName() - { - if (Model.TaskType != WorkTaskKind.PrepFromRecipe) - return; - - var recipeName = Recipes.FirstOrDefault(r => r.RecipeId == Model.RecipeId)?.Title; - Model.Name = recipeName?.Trim() ?? string.Empty; - } } diff --git a/CulinaryCommandApp/Components/Pages/Assignments/MyTasks.razor b/CulinaryCommandApp/Components/Pages/Assignments/MyTasks.razor index c797fbc..655235f 100644 --- a/CulinaryCommandApp/Components/Pages/Assignments/MyTasks.razor +++ b/CulinaryCommandApp/Components/Pages/Assignments/MyTasks.razor @@ -34,43 +34,15 @@ else if (_ctx?.IsAuthenticated != true) } else { -
-
-
-
Kitchen Operations
-

My Tasks

-

Track your assigned work, review recipe prep, and close out tasks quickly.

-
- -
-
-
Location
-
@SelectedLocationName
-
- -
- -
-
-
Open
-
@OpenTaskCount
-
-
-
Recipe Prep
-
@PrepTaskCount
-
-
-
-
+
+

Welcome, @username

+
Location: @SelectedLocationName
+
Here's what needs your attention today.
@if (prepTasks is null || prepTasks.Count == 0) { -
-
-
- You don't have any active tasks assigned right now. -
-
+
+ You don't have any prep tasks assigned right now.
} else @@ -201,10 +173,6 @@ else private string SelectedLocationName => LocationState.CurrentLocation?.Name ?? "No location selected"; - private int OpenTaskCount => prepTasks.Count; - - private int PrepTaskCount => prepTasks.Count(t => t.Kind == WorkTaskKind.PrepFromRecipe); - public void Dispose() { LocationState.OnChange -= HandleLocationStateChanged; diff --git a/CulinaryCommandApp/Components/Pages/Assignments/MyTasks.razor.css b/CulinaryCommandApp/Components/Pages/Assignments/MyTasks.razor.css deleted file mode 100644 index 405afb3..0000000 --- a/CulinaryCommandApp/Components/Pages/Assignments/MyTasks.razor.css +++ /dev/null @@ -1,21 +0,0 @@ -.my-tasks-page { - --mytasks-green: #009A3B; - --mytasks-green-soft: #2ca259; -} - -.my-tasks-page .page-heading { - border-left: 4px solid var(--mytasks-green-soft); - padding-left: 1rem; -} - -.my-tasks-page :deep(.card) { - border-radius: 1.1rem; - border: 1px solid #e9ecef; - box-shadow: 0 2px 10px rgba(0, 0, 0, 0.04); - overflow: hidden; - background: #ffffff; -} - -.my-tasks-page :deep(.card-body) { - padding: 1.5rem; -} diff --git a/CulinaryCommandApp/Components/Pages/Assignments/TaskBoardPanel.razor b/CulinaryCommandApp/Components/Pages/Assignments/TaskBoardPanel.razor index 1345623..98af6ee 100644 --- a/CulinaryCommandApp/Components/Pages/Assignments/TaskBoardPanel.razor +++ b/CulinaryCommandApp/Components/Pages/Assignments/TaskBoardPanel.razor @@ -9,7 +9,7 @@
-
+
@if (!tasks.Any()) { -
+
No tasks in this column.
} @@ -46,7 +46,7 @@ { @foreach (var task in tasks) { -
+
@task.Priority
@@ -61,7 +61,7 @@
@task.Notes
} -
+
@if (task.Status == WorkTaskStatus.Pending) { -
    -
  • - -
    • -
    • -
  • - -
    • -
-
+ + +
} diff --git a/CulinaryCommandApp/Components/Pages/Assignments/TaskBoardPanel.razor.css b/CulinaryCommandApp/Components/Pages/Assignments/TaskBoardPanel.razor.css deleted file mode 100644 index 00c721d..0000000 --- a/CulinaryCommandApp/Components/Pages/Assignments/TaskBoardPanel.razor.css +++ /dev/null @@ -1,23 +0,0 @@ -.assign-search-group .input-group-text { - border-radius: 1rem 0 0 1rem; -} - -.assign-search-group .form-control { - border-radius: 0 1rem 1rem 0; -} - -.assign-item-card { - border-radius: 1.05rem; -} - -.manage-action-menu { - border-radius: 1rem; - border: 1px solid #e9ecef; - box-shadow: 0 10px 24px rgba(15, 23, 42, 0.08); - padding: 0.4rem; -} - -.manage-action-menu .dropdown-item { - border-radius: 0.8rem; - padding: 0.55rem 0.8rem; -} diff --git a/CulinaryCommandApp/Components/Pages/Assignments/TaskFormModel.cs b/CulinaryCommandApp/Components/Pages/Assignments/TaskFormModel.cs index 6646438..7ef30df 100644 --- a/CulinaryCommandApp/Components/Pages/Assignments/TaskFormModel.cs +++ b/CulinaryCommandApp/Components/Pages/Assignments/TaskFormModel.cs @@ -3,9 +3,9 @@ namespace CulinaryCommandApp.Components.Pages.Assignments; -public class TaskFormModel : IValidatableObject +public class TaskFormModel { - [StringLength(128)] + [Required, StringLength(128)] public string Name { get; set; } = string.Empty; [Required] @@ -28,25 +28,4 @@ public class TaskFormModel : IValidatableObject public int? Count { get; set; } public int? RecipeId { get; set; } - - public int PrepNeeded => Math.Max((Par ?? 0) - (Count ?? 0), 0); - - public IEnumerable Validate(ValidationContext validationContext) - { - if (TaskType == WorkTaskKind.PrepFromRecipe) - { - if (!RecipeId.HasValue) - { - yield return new ValidationResult( - "A recipe is required for prep-from-recipe tasks.", - new[] { nameof(RecipeId) }); - } - } - else if (string.IsNullOrWhiteSpace(Name)) - { - yield return new ValidationResult( - "Task name is required.", - new[] { nameof(Name) }); - } - } } diff --git a/CulinaryCommandApp/Components/Pages/Assignments/TaskLibraryPanel.razor b/CulinaryCommandApp/Components/Pages/Assignments/TaskLibraryPanel.razor index 576e44c..ea96d4d 100644 --- a/CulinaryCommandApp/Components/Pages/Assignments/TaskLibraryPanel.razor +++ b/CulinaryCommandApp/Components/Pages/Assignments/TaskLibraryPanel.razor @@ -16,7 +16,7 @@
-
+
+
-
+
+ -
    -
  • - -
    • -
    • -
  • - -
    • -
diff --git a/CulinaryCommandApp/Components/Pages/Assignments/TaskLibraryPanel.razor.css b/CulinaryCommandApp/Components/Pages/Assignments/TaskLibraryPanel.razor.css deleted file mode 100644 index 00c721d..0000000 --- a/CulinaryCommandApp/Components/Pages/Assignments/TaskLibraryPanel.razor.css +++ /dev/null @@ -1,23 +0,0 @@ -.assign-search-group .input-group-text { - border-radius: 1rem 0 0 1rem; -} - -.assign-search-group .form-control { - border-radius: 0 1rem 1rem 0; -} - -.assign-item-card { - border-radius: 1.05rem; -} - -.manage-action-menu { - border-radius: 1rem; - border: 1px solid #e9ecef; - box-shadow: 0 10px 24px rgba(15, 23, 42, 0.08); - padding: 0.4rem; -} - -.manage-action-menu .dropdown-item { - border-radius: 0.8rem; - padding: 0.55rem 0.8rem; -} diff --git a/CulinaryCommandApp/Components/Pages/Assignments/TaskListsPanel.razor b/CulinaryCommandApp/Components/Pages/Assignments/TaskListsPanel.razor index e29fa4a..dd9b22f 100644 --- a/CulinaryCommandApp/Components/Pages/Assignments/TaskListsPanel.razor +++ b/CulinaryCommandApp/Components/Pages/Assignments/TaskListsPanel.razor @@ -16,7 +16,7 @@
-
+
+
@list.Name
@@ -48,44 +48,29 @@
-
+
-
- -
    -
  • - -
    • -
  • - -
    • -
    • -
  • - -
    • -
-
+ + + + +
diff --git a/CulinaryCommandApp/Components/Pages/Assignments/TaskListsPanel.razor.css b/CulinaryCommandApp/Components/Pages/Assignments/TaskListsPanel.razor.css deleted file mode 100644 index 00c721d..0000000 --- a/CulinaryCommandApp/Components/Pages/Assignments/TaskListsPanel.razor.css +++ /dev/null @@ -1,23 +0,0 @@ -.assign-search-group .input-group-text { - border-radius: 1rem 0 0 1rem; -} - -.assign-search-group .form-control { - border-radius: 0 1rem 1rem 0; -} - -.assign-item-card { - border-radius: 1.05rem; -} - -.manage-action-menu { - border-radius: 1rem; - border: 1px solid #e9ecef; - box-shadow: 0 10px 24px rgba(15, 23, 42, 0.08); - padding: 0.4rem; -} - -.manage-action-menu .dropdown-item { - border-radius: 0.8rem; - padding: 0.55rem 0.8rem; -} diff --git a/CulinaryCommandApp/Data/Models/CreateTaskListRequest.cs b/CulinaryCommandApp/Data/Models/CreateTaskListRequest.cs index 3f65851..4d80c3a 100644 --- a/CulinaryCommandApp/Data/Models/CreateTaskListRequest.cs +++ b/CulinaryCommandApp/Data/Models/CreateTaskListRequest.cs @@ -16,7 +16,5 @@ public class CreateTaskListRequest public int? CreatedByUserId { get; set; } public bool IsActive { get; set; } = true; - - public List TaskTemplateIds { get; set; } = new(); } -} +} \ No newline at end of file diff --git a/CulinaryCommandApp/Data/Models/CreateTaskTemplateRequest.cs b/CulinaryCommandApp/Data/Models/CreateTaskTemplateRequest.cs index 5621545..3dfe88a 100644 --- a/CulinaryCommandApp/Data/Models/CreateTaskTemplateRequest.cs +++ b/CulinaryCommandApp/Data/Models/CreateTaskTemplateRequest.cs @@ -3,9 +3,9 @@ namespace CulinaryCommand.Data.Models { - public class CreateTaskTemplateRequest : IValidatableObject + public class CreateTaskTemplateRequest { - [StringLength(256)] + [Required, StringLength(256)] public string Name { get; set; } = string.Empty; [Required, StringLength(128)] @@ -32,26 +32,5 @@ public class CreateTaskTemplateRequest : IValidatableObject public int? Par { get; set; } public int? Count { get; set; } - - public int PrepNeeded => Math.Max((Par ?? 0) - (Count ?? 0), 0); - - public IEnumerable Validate(ValidationContext validationContext) - { - if (Kind == WorkTaskKind.PrepFromRecipe) - { - if (!RecipeId.HasValue) - { - yield return new ValidationResult( - "A recipe is required for prep-from-recipe templates.", - new[] { nameof(RecipeId) }); - } - } - else if (string.IsNullOrWhiteSpace(Name)) - { - yield return new ValidationResult( - "Template name is required.", - new[] { nameof(Name) }); - } - } } -} +} \ No newline at end of file diff --git a/CulinaryCommandApp/Data/Models/UpdateTaskTemplateRequest.cs b/CulinaryCommandApp/Data/Models/UpdateTaskTemplateRequest.cs index 0486d57..14e2bc6 100644 --- a/CulinaryCommandApp/Data/Models/UpdateTaskTemplateRequest.cs +++ b/CulinaryCommandApp/Data/Models/UpdateTaskTemplateRequest.cs @@ -3,12 +3,12 @@ namespace CulinaryCommand.Data.Models { - public class UpdateTaskTemplateRequest : IValidatableObject + public class UpdateTaskTemplateRequest { [Required] public int Id { get; set; } - [StringLength(256)] + [Required, StringLength(256)] public string Name { get; set; } = string.Empty; [Required, StringLength(128)] @@ -35,26 +35,5 @@ public class UpdateTaskTemplateRequest : IValidatableObject public int? Count { get; set; } public bool IsActive { get; set; } = true; - - public int PrepNeeded => Math.Max((Par ?? 0) - (Count ?? 0), 0); - - public IEnumerable Validate(ValidationContext validationContext) - { - if (Kind == WorkTaskKind.PrepFromRecipe) - { - if (!RecipeId.HasValue) - { - yield return new ValidationResult( - "A recipe is required for prep-from-recipe templates.", - new[] { nameof(RecipeId) }); - } - } - else if (string.IsNullOrWhiteSpace(Name)) - { - yield return new ValidationResult( - "Template name is required.", - new[] { nameof(Name) }); - } - } } -} +} \ No newline at end of file diff --git a/CulinaryCommandApp/Services/TaskLibraryService.cs b/CulinaryCommandApp/Services/TaskLibraryService.cs index 68fd4b1..79f8b91 100644 --- a/CulinaryCommandApp/Services/TaskLibraryService.cs +++ b/CulinaryCommandApp/Services/TaskLibraryService.cs @@ -3,7 +3,6 @@ using CulinaryCommand.Data.Models; using Microsoft.EntityFrameworkCore; using CulinaryCommand.Data.Enums; -using RecipeEntity = CulinaryCommandApp.Recipe.Entities.Recipe; namespace CulinaryCommand.Services { @@ -31,8 +30,8 @@ public async Task> GetTaskListsByLocationAsync(int locationId) return await _db.TaskLists .AsNoTracking() .Where(l => l.LocationId == locationId && l.IsActive) - .Include(l => l.Items.Where(i => i.TaskTemplate != null && i.TaskTemplate.IsActive)) - .ThenInclude(i => i.TaskTemplate!) + .Include(l => l.Items) + .ThenInclude(i => i.TaskTemplate) .OrderBy(l => l.Name) .ToListAsync(); } @@ -57,13 +56,16 @@ public async Task> GetTemplatesForTaskListAsync(int taskListI public async Task CreateTemplateAsync(CreateTaskTemplateRequest request) { + if (string.IsNullOrWhiteSpace(request.Name)) + throw new ArgumentException("Template name is required."); + if (string.IsNullOrWhiteSpace(request.Station)) throw new ArgumentException("Station is required."); if (request.LocationId <= 0) throw new ArgumentException("A valid location is required."); - var normalizedName = await ResolveTemplateNameAsync(request); + var normalizedName = request.Name.Trim(); var normalizedStation = request.Station.Trim(); var normalizedPriority = string.IsNullOrWhiteSpace(request.Priority) ? "Normal" @@ -88,10 +90,10 @@ public async Task CreateTemplateAsync(CreateTaskTemplateRequest re DefaultEstimatedMinutes = request.DefaultEstimatedMinutes, LocationId = request.LocationId, CreatedByUserId = request.CreatedByUserId, - RecipeId = request.Kind == WorkTaskKind.PrepFromRecipe ? request.RecipeId : null, - IngredientId = request.Kind == WorkTaskKind.PrepFromRecipe ? request.IngredientId : null, - Par = request.Kind == WorkTaskKind.PrepFromRecipe ? request.Par : null, - Count = request.Kind == WorkTaskKind.PrepFromRecipe ? request.Count : null, + RecipeId = request.RecipeId, + IngredientId = request.IngredientId, + Par = request.Par, + Count = request.Count, IsActive = true, CreatedAt = DateTime.UtcNow, UpdatedAt = DateTime.UtcNow @@ -108,6 +110,9 @@ public async Task UpdateTemplateAsync(UpdateTaskTemplateRequest re if (request.Id <= 0) throw new ArgumentException("A valid template id is required."); + if (string.IsNullOrWhiteSpace(request.Name)) + throw new ArgumentException("Template name is required."); + if (string.IsNullOrWhiteSpace(request.Station)) throw new ArgumentException("Station is required."); @@ -116,7 +121,7 @@ public async Task UpdateTemplateAsync(UpdateTaskTemplateRequest re if (template == null) throw new InvalidOperationException("Task template not found."); - var normalizedName = await ResolveTemplateNameAsync(request); + var normalizedName = request.Name.Trim(); var normalizedStation = request.Station.Trim(); var normalizedPriority = string.IsNullOrWhiteSpace(request.Priority) ? "Normal" @@ -139,10 +144,10 @@ public async Task UpdateTemplateAsync(UpdateTaskTemplateRequest re template.Notes = string.IsNullOrWhiteSpace(request.Notes) ? null : request.Notes.Trim(); template.DefaultEstimatedMinutes = request.DefaultEstimatedMinutes; template.LocationId = request.LocationId; - template.RecipeId = request.Kind == WorkTaskKind.PrepFromRecipe ? request.RecipeId : null; - template.IngredientId = request.Kind == WorkTaskKind.PrepFromRecipe ? request.IngredientId : null; - template.Par = request.Kind == WorkTaskKind.PrepFromRecipe ? request.Par : null; - template.Count = request.Kind == WorkTaskKind.PrepFromRecipe ? request.Count : null; + template.RecipeId = request.RecipeId; + template.IngredientId = request.IngredientId; + template.Par = request.Par; + template.Count = request.Count; template.IsActive = request.IsActive; template.UpdatedAt = DateTime.UtcNow; @@ -196,33 +201,6 @@ public async Task CreateTaskListAsync(CreateTaskListRequest request) _db.TaskLists.Add(taskList); await _db.SaveChangesAsync(); - var validTemplateIds = await _db.TaskTemplates - .Where(t => - request.TaskTemplateIds.Contains(t.Id) && - t.LocationId == request.LocationId && - t.IsActive) - .OrderBy(t => t.Station) - .ThenBy(t => t.Name) - .Select(t => t.Id) - .ToListAsync(); - - if (validTemplateIds.Any()) - { - var sortOrder = 0; - foreach (var templateId in validTemplateIds.Distinct()) - { - _db.TaskListItems.Add(new TaskListItem - { - TaskListId = taskList.Id, - TaskTemplateId = templateId, - SortOrder = sortOrder++ - }); - } - - taskList.UpdatedAt = DateTime.UtcNow; - await _db.SaveChangesAsync(); - } - return taskList; } @@ -419,48 +397,5 @@ private static Tasks BuildTaskFromTemplate( Notes = template.Notes }; } - - private async Task ResolveTemplateNameAsync(CreateTaskTemplateRequest request) - { - if (request.Kind != WorkTaskKind.PrepFromRecipe) - { - if (string.IsNullOrWhiteSpace(request.Name)) - throw new ArgumentException("Template name is required."); - - return request.Name.Trim(); - } - - var recipe = await GetRecipeForTemplateAsync(request.LocationId, request.RecipeId); - return recipe.Title.Trim(); - } - - private async Task ResolveTemplateNameAsync(UpdateTaskTemplateRequest request) - { - if (request.Kind != WorkTaskKind.PrepFromRecipe) - { - if (string.IsNullOrWhiteSpace(request.Name)) - throw new ArgumentException("Template name is required."); - - return request.Name.Trim(); - } - - var recipe = await GetRecipeForTemplateAsync(request.LocationId, request.RecipeId); - return recipe.Title.Trim(); - } - - private async Task GetRecipeForTemplateAsync(int locationId, int? recipeId) - { - if (!recipeId.HasValue) - throw new ArgumentException("A recipe is required for prep-from-recipe templates."); - - var recipe = await _db.Recipes - .AsNoTracking() - .FirstOrDefaultAsync(r => r.RecipeId == recipeId.Value && r.LocationId == locationId); - - if (recipe == null) - throw new InvalidOperationException("The selected recipe could not be found for this location."); - - return recipe; - } } -} +} \ No newline at end of file From d733c12b1d4e41e7d56680f582027fcd90aa3df7 Mon Sep 17 00:00:00 2001 From: Matayas Durr Date: Fri, 17 Apr 2026 13:41:22 -0500 Subject: [PATCH 2/2] Revert PR #141 --- .../Pages/Assignments/AdminAssignTask.razor | 868 +++++++++++++----- .../Assignments/AdminAssignTask.razor.css | 52 -- .../Pages/Assignments/ManualTaskForm.razor | 117 --- .../Pages/Assignments/QuickAssignPanel.razor | 104 --- .../Pages/Assignments/TaskBoardPanel.razor | 126 --- .../Pages/Assignments/TaskFormModel.cs | 31 - .../Pages/Assignments/TaskLibraryPanel.razor | 120 --- .../Pages/Assignments/TaskListsPanel.razor | 109 --- 8 files changed, 648 insertions(+), 879 deletions(-) delete mode 100644 CulinaryCommandApp/Components/Pages/Assignments/AdminAssignTask.razor.css delete mode 100644 CulinaryCommandApp/Components/Pages/Assignments/ManualTaskForm.razor delete mode 100644 CulinaryCommandApp/Components/Pages/Assignments/QuickAssignPanel.razor delete mode 100644 CulinaryCommandApp/Components/Pages/Assignments/TaskBoardPanel.razor delete mode 100644 CulinaryCommandApp/Components/Pages/Assignments/TaskFormModel.cs delete mode 100644 CulinaryCommandApp/Components/Pages/Assignments/TaskLibraryPanel.razor delete mode 100644 CulinaryCommandApp/Components/Pages/Assignments/TaskListsPanel.razor diff --git a/CulinaryCommandApp/Components/Pages/Assignments/AdminAssignTask.razor b/CulinaryCommandApp/Components/Pages/Assignments/AdminAssignTask.razor index cf5e1ec..65c78e8 100644 --- a/CulinaryCommandApp/Components/Pages/Assignments/AdminAssignTask.razor +++ b/CulinaryCommandApp/Components/Pages/Assignments/AdminAssignTask.razor @@ -3,15 +3,15 @@ @using CulinaryCommand.Data.Entities @using CulinaryCommand.Services @using CulinaryCommand.Data.Enums; -@using WorkTaskStatus = CulinaryCommand.Data.Enums.TaskStatus @using CulinaryCommand.Services.UserContextSpace +@using CulinaryCommandApp.Recipe.Services; @using CulinaryCommandApp.Recipe.Services.Interfaces; @using CulinaryCommandApp.Recipe.Entities; -@using CulinaryCommandApp.Components.Pages.Assignments @using CulinaryCommand.Data.Models @inject IUserContextService UserCtx @inject NavigationManager Nav @inject ILocationService LocationService +@inject IUserService UserService @inject LocationState LocationState @inject ITaskAssignmentService TaskService @inject IRecipeService RecipeService @@ -37,21 +37,21 @@ else if (!allowed) else {
- @if (!string.IsNullOrWhiteSpace(pageSuccess)) - { -
- @pageSuccess -
- } + @if (!string.IsNullOrWhiteSpace(createTemplateSuccess)) + { +
+ @createTemplateSuccess +
+ } - @if (!string.IsNullOrWhiteSpace(pageError)) - { -
- @pageError -
- } + @if (!string.IsNullOrWhiteSpace(createTemplateError)) + { +
+ @createTemplateError +
+ }
-
+
Kitchen Operations

Task Assignment

Manage task lists, assign library tasks fast, and track progress in one place.

@@ -84,36 +84,280 @@ else
- +
+
+
+
+
Task Lists
+
Reusable groups like Dish Closing or Morning Prep
+
+ +
+ @taskLists.Count + +
+
+ +
+ + +
+ +
+ @if (!FilteredTaskLists.Any()) + { +
No task lists found.
+ } + else + { + @foreach (var list in FilteredTaskLists) + { +
+
+
+
@list.Name
+ + @if (!string.IsNullOrWhiteSpace(list.Description)) + { +
@list.Description
+ } + + + @(list.Items?.Count ?? 0) task@((list.Items?.Count ?? 0) == 1 ? "" : "s") + +
+ +
+ + + + + + + +
+
+
+ } + } +
+
+
- +
+
+
+
+
Task Library
+
Select one or more reusable tasks
+
+ +
+ @taskTemplates.Count + +
+
+ +
+ + +
+ + @if (selectedTemplateIds.Any()) + { +
+ @selectedTemplateIds.Count task@(selectedTemplateIds.Count == 1 ? "" : "s") selected +
+ } + +
+ @if (!FilteredTaskTemplates.Any()) + { +
No task templates found.
+ } + else + { + @foreach (var template in FilteredTaskTemplates) + { + var isSelected = selectedTemplateIds.Contains(template.Id); + +
+
+
+ + +
+
@template.Name
+
@template.Station
+ + @if (!string.IsNullOrWhiteSpace(template.Notes)) + { +
@template.Notes
+ } + +
+ @template.Priority + + @if (template.DefaultEstimatedMinutes.HasValue) + { + + @template.DefaultEstimatedMinutes min + + } +
+
+
+ + + + +
+ +
+ } + } +
+
+
- +
+ + Create Task Manually + Team: @teamMembers.Count + + +
+ + + + +
+ + + + + +
+ +
+ + +
+ +
+
+ + + @foreach (var station in stationOptions) + { + + } + +
+ +
+ + + @foreach (var p in priorityOptions) + { + + } + +
+
+ + @if (newTask.TaskType == WorkTaskKind.PrepFromRecipe) + { +
+ + + + @foreach (var r in recipes) + { + + } + +
+ +
+
+ + +
+
+ + +
+
+ } + +
+
+ + + + @foreach (var user in teamMembers) + { + + } + +
+ +
+ + +
+
+ +
+ + +
+ + + +
+
@@ -124,30 +368,169 @@ else @if (SelectedTemplates.Any()) { - +
+
+
+
+
Quick Assign
+
+ @SelectedTemplates.Count task@(SelectedTemplates.Count == 1 ? "" : "s") selected +
+
+ + +
+ +
+
+ @foreach (var template in SelectedTemplates) + { + + @template.Name + + } +
+
+ +
+
+ + + + @foreach (var user in teamMembers) + { + + } + +
+ +
+ + +
+ +
+ + + + @foreach (var p in priorityOptions) + { + + } + +
+
+ +
+ + +
+
+
} - + +
+
+
+
Kitchen Task Board
+
Track pending, active, and completed work
+
+ +
+
+ + +
+
+
+
+ + +
+ @foreach (var status in statusBuckets) + { +
+
+
+
+
@status
+ + @TasksByStatus(status).Count() + +
+ +
+ @if (!TasksByStatus(status).Any()) + { +
+ No tasks in this column. +
+ } + else + { + @foreach (var task in TasksByStatus(status)) + { +
+
+ @task.Priority +
+ +
@task.Name
+
@task.Station
+
@FormatAssignee(task.UserId)
+
Due @task.DueDate.ToString("MMM d")
+ + @if (!string.IsNullOrWhiteSpace(task.Notes)) + { +
@task.Notes
+ } + +
+ @if (task.Status == "Pending") + { + + } + + @if (task.Status != "Completed") + { + + } + + + + +
+
+ } + } +
+
+
+
+ } +
@@ -197,37 +580,38 @@ else private List assignments = new(); private TaskFormModel newTask = new(); private int? selectedLocationId; - private string taskBoardSearch = string.Empty; + private string searchTerm = string.Empty; + private List recipes = new(); + private List taskTemplates = new(); private List taskLists = new(); + private List selectedTemplateIds = new(); private string taskLibrarySearch = string.Empty; private string taskListSearch = string.Empty; + private int? quickAssignUserId; private DateTime quickAssignDueDate = DateTime.Today; private string quickAssignPriority = "Keep Original"; + + private readonly List stationOptions = new() { "Prep", "Grill", "Saute", "Expo", "Pastry", "Dish" }; + private readonly List priorityOptions = new() { "Low", "Normal", "High", "Critical" }; + private readonly List statusBuckets = new() { "Pending", "In Progress", "Completed" }; + private bool showCreateTemplateModal; + private string? createTemplateError; + private string? createTemplateSuccess; private bool showEditTemplateModal; private TaskTemplate? editingTemplate; private bool showCreateTaskListModal; private bool showEditTaskListModal; private bool showManageTaskListTemplatesModal; + private TaskList? editingTaskList; private TaskList? managingTaskList; - private List selectedTaskListTemplates = new(); - private string? pageError; - private string? pageSuccess; - - private readonly List stationOptions = new() { "Prep", "Grill", "Saute", "Expo", "Pastry", "Dish" }; - private readonly List priorityOptions = new() { "Low", "Normal", "High", "Critical" }; - private readonly List statusBuckets = new() - { - WorkTaskStatus.Pending, - WorkTaskStatus.InProgress, - WorkTaskStatus.Completed - }; + private List selectedTaskListTemplates = new(); protected override async Task OnInitializedAsync() { _ctx = await UserCtx.GetAsync(); @@ -238,6 +622,7 @@ else return; } + // Invite-only: authenticated but not in DB if (_ctx.User is null) { Nav.NavigateTo("/no-access", true); @@ -254,31 +639,25 @@ else return; } + // Ensure LocationState is hydrated if user deep-links here if (LocationState.ManagedLocations.Count == 0 && _ctx.AccessibleLocations.Any()) await LocationState.SetLocationsAsync(_ctx.AccessibleLocations); + // Source of truth: header-selected location selectedLocationId = LocationState.CurrentLocation?.Id; - LocationState.OnChange += HandleLocationStateChanged; - - await LoadPageDataAsync(); - ready = true; - } - - public void Dispose() - { - LocationState.OnChange -= HandleLocationStateChanged; - } + LocationState.OnChange += HandleLocationStateChanged; - private async Task LoadPageDataAsync() - { await LoadTeamAsync(); await LoadRecipesAsync(); await LoadAssignmentsAsync(); await LoadTaskTemplatesAsync(); await LoadTaskListsAsync(); + + ready = true; } + private async Task LoadTeamAsync() { teamMembers.Clear(); @@ -291,13 +670,12 @@ else } catch { + // fallback sample users } } if (!teamMembers.Any()) { - // Demo fallback so the page still renders assignable users - // if location-based user lookup fails or returns empty. teamMembers = new() { new User { Id = 101, Name = "Ava Thompson", Role = "Prep Cook" }, @@ -328,9 +706,7 @@ else private async Task LoadAssignmentsAsync() { - if (!selectedLocationId.HasValue) - return; - + if (!selectedLocationId.HasValue) return; assignments = await TaskService.GetByLocationAsync(selectedLocationId.Value); } @@ -368,16 +744,6 @@ else } } - private void HandleLocationStateChanged() - { - _ = InvokeAsync(async () => - { - selectedLocationId = LocationState.CurrentLocation?.Id; - await LoadPageDataAsync(); - StateHasChanged(); - }); - } - private async Task HandleSubmit() { if (!selectedLocationId.HasValue) @@ -402,7 +768,7 @@ else Name = name, Station = newTask.Station, Priority = newTask.Priority, - Status = WorkTaskStatus.Pending, + Status = "Pending", UserId = newTask.UserId, DueDate = newTask.DueDate ?? DateTime.Today, Notes = newTask.Notes?.Trim(), @@ -411,10 +777,10 @@ else Kind = newTask.TaskType, Par = newTask.Par, Count = newTask.Count, - RecipeId = newTask.RecipeId, + RecipeId = newTask.RecipeId, CreatedAt = DateTime.UtcNow, UpdatedAt = DateTime.UtcNow, - Date = DateTime.UtcNow + Date = DateTime.UtcNow // required DB field }; var created = await TaskService.CreateAsync(task); @@ -422,14 +788,17 @@ else newTask = new TaskFormModel { - TaskType = task.Kind, + TaskType = task.Kind, // keep last used type Station = task.Station, Priority = task.Priority, DueDate = task.DueDate, Notes = string.Empty + // RecipeId left null; choose fresh per task }; + // await TaskNotifier.NotifyTasksChangedAsync(selectedLocationId.Value); + await InvokeAsync(StateHasChanged); } @@ -445,7 +814,8 @@ else quickAssignUserId, quickAssignDueDate, assignerName, - quickAssignPriority == "Keep Original" ? null : quickAssignPriority); + quickAssignPriority == "Keep Original" ? null : quickAssignPriority + ); if (createdTasks.Any()) { @@ -460,6 +830,72 @@ else await InvokeAsync(StateHasChanged); } + private IEnumerable TasksByStatus(string status) => + assignments.Where(t => t.LocationId == (selectedLocationId ?? t.LocationId)) + .Where(t => string.Equals(t.Status, status, StringComparison.OrdinalIgnoreCase)) + .Where(FilterBySearch); + + private bool FilterBySearch(Tasks task) + { + if (string.IsNullOrWhiteSpace(searchTerm)) + return true; + + var term = searchTerm.Trim().ToLowerInvariant(); + return task.Name.ToLowerInvariant().Contains(term) + || task.Station.ToLowerInvariant().Contains(term) + || FormatAssignee(task.UserId).ToLowerInvariant().Contains(term); + } + + private async Task MoveToStatus(int id, string status) + { + await TaskService.UpdateStatusAsync(id, status); + + var t = assignments.FirstOrDefault(x => x.Id == id); + if (t == null) return; + + t.Status = status; + t.UpdatedAt = DateTime.UtcNow; + + await InvokeAsync(StateHasChanged); + } + + private Task MarkComplete(int id) => MoveToStatus(id, "Completed"); + private Task MarkInProgress(int id) => MoveToStatus(id, "In Progress"); + + private async Task BumpTask(int id) + { + await TaskService.BumpDueDateAsync(id, 1); + + var t = assignments.FirstOrDefault(x => x.Id == id); + if (t == null) return; + + t.DueDate = t.DueDate.AddDays(1); + t.UpdatedAt = DateTime.UtcNow; + + await InvokeAsync(StateHasChanged); + } + + private async Task DeleteTask(int id) + { + await TaskService.DeleteAsync(id); + assignments.RemoveAll(t => t.Id == id); + await InvokeAsync(StateHasChanged); + } + + private void HandleLocationStateChanged() + { + _ = InvokeAsync(async () => + { + selectedLocationId = LocationState.CurrentLocation?.Id; + await LoadTeamAsync(); + await LoadRecipesAsync(); + await LoadAssignmentsAsync(); + await LoadTaskTemplatesAsync(); + await LoadTaskListsAsync(); + StateHasChanged(); + }); + } + private void ToggleTemplateSelection(int templateId) { if (selectedTemplateIds.Contains(templateId)) @@ -481,7 +917,8 @@ else private void OpenCreateTemplateModal() { - ClearMessages(); + createTemplateError = null; + createTemplateSuccess = null; showCreateTemplateModal = true; } @@ -493,7 +930,8 @@ else private async Task SaveTemplate(CreateTaskTemplateRequest request) { - ClearMessages(); + createTemplateError = null; + createTemplateSuccess = null; try { @@ -502,11 +940,11 @@ else showCreateTemplateModal = false; await LoadTaskTemplatesAsync(); - SetSuccess($"Template '{createdTemplate.Name}' created successfully."); + createTemplateSuccess = $"Template '{createdTemplate.Name}' created successfully."; } catch (Exception ex) { - SetError(ex.Message); + createTemplateError = ex.Message; } await InvokeAsync(StateHasChanged); @@ -514,7 +952,9 @@ else private void OpenEditTemplateModal(TaskTemplate template) { - ClearMessages(); + createTemplateError = null; + createTemplateSuccess = null; + editingTemplate = template; showEditTemplateModal = true; } @@ -528,7 +968,8 @@ else private async Task SaveEditedTemplate(UpdateTaskTemplateRequest request) { - ClearMessages(); + createTemplateError = null; + createTemplateSuccess = null; try { @@ -536,13 +977,14 @@ else showEditTemplateModal = false; editingTemplate = null; + await LoadTaskTemplatesAsync(); - SetSuccess($"Template '{updatedTemplate.Name}' updated successfully."); + createTemplateSuccess = $"Template '{updatedTemplate.Name}' updated successfully."; } catch (Exception ex) { - SetError(ex.Message); + createTemplateError = ex.Message; } await InvokeAsync(StateHasChanged); @@ -554,17 +996,20 @@ else { await TaskLibraryService.ArchiveTemplateAsync(templateId); await LoadTaskTemplatesAsync(); - SetSuccess("Template removed successfully."); + + createTemplateSuccess = "Template removed successfully."; } catch (Exception ex) { - SetError(ex.Message); + createTemplateError = ex.Message; } } private async Task ConfirmArchive(int templateId) { - if (await ConfirmAsync("Delete this template?")) + var confirm = await JS.InvokeAsync("confirm", "Delete this template?"); + + if (confirm) { await ArchiveTemplate(templateId); } @@ -572,7 +1017,8 @@ else private void OpenCreateTaskListModal() { - ClearMessages(); + createTemplateError = null; + createTemplateSuccess = null; showCreateTaskListModal = true; } @@ -584,7 +1030,8 @@ else private async Task SaveTaskList(CreateTaskListRequest request) { - ClearMessages(); + createTemplateError = null; + createTemplateSuccess = null; try { @@ -593,11 +1040,11 @@ else showCreateTaskListModal = false; await LoadTaskListsAsync(); - SetSuccess($"Task list '{createdTaskList.Name}' created successfully."); + createTemplateSuccess = $"Task list '{createdTaskList.Name}' created successfully."; } catch (Exception ex) { - SetError(ex.Message); + createTemplateError = ex.Message; } await InvokeAsync(StateHasChanged); @@ -605,7 +1052,8 @@ else private void OpenEditTaskListModal(TaskList taskList) { - ClearMessages(); + createTemplateError = null; + createTemplateSuccess = null; editingTaskList = taskList; showEditTaskListModal = true; } @@ -619,7 +1067,8 @@ else private async Task SaveEditedTaskList(UpdateTaskListRequest request) { - ClearMessages(); + createTemplateError = null; + createTemplateSuccess = null; try { @@ -627,13 +1076,14 @@ else showEditTaskListModal = false; editingTaskList = null; + await LoadTaskListsAsync(); - SetSuccess($"Task list '{updatedTaskList.Name}' updated successfully."); + createTemplateSuccess = $"Task list '{updatedTaskList.Name}' updated successfully."; } catch (Exception ex) { - SetError(ex.Message); + createTemplateError = ex.Message; } await InvokeAsync(StateHasChanged); @@ -641,7 +1091,8 @@ else private async Task ConfirmArchiveTaskList(int taskListId) { - if (await ConfirmAsync("Delete this task list?")) + var confirm = await JS.InvokeAsync("confirm", "Delete this task list?"); + if (confirm) { await ArchiveTaskList(taskListId); } @@ -649,18 +1100,19 @@ else private async Task ArchiveTaskList(int taskListId) { - ClearMessages(); + createTemplateError = null; + createTemplateSuccess = null; try { await TaskLibraryService.ArchiveTaskListAsync(taskListId); await LoadTaskListsAsync(); - SetSuccess("Task list removed successfully."); + createTemplateSuccess = "Task list removed successfully."; } catch (Exception ex) { - SetError(ex.Message); + createTemplateError = ex.Message; } await InvokeAsync(StateHasChanged); @@ -668,7 +1120,9 @@ else private async Task OpenManageTaskListTemplatesModal(TaskList taskList) { - ClearMessages(); + createTemplateError = null; + createTemplateSuccess = null; + managingTaskList = taskList; selectedTaskListTemplates = await TaskLibraryService.GetTemplatesForTaskListAsync(taskList.Id); showManageTaskListTemplatesModal = true; @@ -687,7 +1141,8 @@ else if (managingTaskList == null || !templateIds.Any()) return; - ClearMessages(); + createTemplateError = null; + createTemplateSuccess = null; try { @@ -695,11 +1150,11 @@ else selectedTaskListTemplates = await TaskLibraryService.GetTemplatesForTaskListAsync(managingTaskList.Id); await LoadTaskListsAsync(); - SetSuccess("Templates added to task list."); + createTemplateSuccess = "Templates added to task list."; } catch (Exception ex) { - SetError(ex.Message); + createTemplateError = ex.Message; } await InvokeAsync(StateHasChanged); @@ -710,94 +1165,38 @@ else if (managingTaskList == null) return; - ClearMessages(); + createTemplateError = null; + createTemplateSuccess = null; try { await TaskLibraryService.RemoveTemplateFromTaskListAsync(managingTaskList.Id, templateId); selectedTaskListTemplates = await TaskLibraryService.GetTemplatesForTaskListAsync(managingTaskList.Id); - SetSuccess("Template removed from task list."); + createTemplateSuccess = "Template removed from task list."; } catch (Exception ex) { - SetError(ex.Message); + createTemplateError = ex.Message; } await InvokeAsync(StateHasChanged); } - - private IEnumerable TasksByStatus(string status) => - assignments.Where(t => t.LocationId == (selectedLocationId ?? t.LocationId)) - .Where(t => string.Equals(t.Status, status, StringComparison.OrdinalIgnoreCase)) - .Where(FilterBySearch); - - private bool FilterBySearch(Tasks task) - { - if (string.IsNullOrWhiteSpace(taskBoardSearch)) - return true; - - var term = taskBoardSearch.Trim().ToLowerInvariant(); - return (task.Name ?? string.Empty).ToLowerInvariant().Contains(term) - || (task.Station ?? string.Empty).ToLowerInvariant().Contains(term) - || FormatAssigneeName(task.UserId).ToLowerInvariant().Contains(term); - } - - private async Task MoveToStatus(int id, string status) - { - await TaskService.UpdateStatusAsync(id, status); - - var t = assignments.FirstOrDefault(x => x.Id == id); - if (t == null) - return; - - t.Status = status; - t.UpdatedAt = DateTime.UtcNow; - - await InvokeAsync(StateHasChanged); - } - - private Task MarkComplete(int id) => MoveToStatus(id, WorkTaskStatus.Completed); - - private Task MarkInProgress(int id) => MoveToStatus(id, WorkTaskStatus.InProgress); - - private async Task BumpTask(int id) - { - await TaskService.BumpDueDateAsync(id, 1); - - var t = assignments.FirstOrDefault(x => x.Id == id); - if (t == null) - return; - - t.DueDate = t.DueDate.AddDays(1); - t.UpdatedAt = DateTime.UtcNow; - - await InvokeAsync(StateHasChanged); - } - - private async Task DeleteTask(int id) - { - await TaskService.DeleteAsync(id); - assignments.RemoveAll(t => t.Id == id); - await InvokeAsync(StateHasChanged); - } - private string SelectedLocationName => LocationState.CurrentLocation?.Name ?? "Select a location"; private IEnumerable TasksForCurrentLocation => assignments.Where(t => !selectedLocationId.HasValue || t.LocationId == selectedLocationId.Value); - private int OpenTaskCount => TasksForCurrentLocation.Count(t => t.Status != WorkTaskStatus.Completed); - + private int OpenTaskCount => TasksForCurrentLocation.Count(t => t.Status != "Completed"); private int DueTodayCount => TasksForCurrentLocation.Count(t => t.DueDate.Date == DateTime.Today); private IEnumerable FilteredTaskTemplates => - taskTemplates.Where(t => - string.IsNullOrWhiteSpace(taskLibrarySearch) || - t.Name.Contains(taskLibrarySearch, StringComparison.OrdinalIgnoreCase) || - t.Station.Contains(taskLibrarySearch, StringComparison.OrdinalIgnoreCase) || - (t.Notes?.Contains(taskLibrarySearch, StringComparison.OrdinalIgnoreCase) ?? false)); + taskTemplates.Where(t => + string.IsNullOrWhiteSpace(taskLibrarySearch) || + t.Name.Contains(taskLibrarySearch, StringComparison.OrdinalIgnoreCase) || + t.Station.Contains(taskLibrarySearch, StringComparison.OrdinalIgnoreCase) || + (t.Notes?.Contains(taskLibrarySearch, StringComparison.OrdinalIgnoreCase) ?? false)); private IEnumerable FilteredTaskLists => taskLists.Where(t => @@ -808,15 +1207,13 @@ else private List SelectedTemplates => taskTemplates.Where(t => selectedTemplateIds.Contains(t.Id)).ToList(); - private string FormatAssigneeName(int? id) + private string FormatAssignee(int? id) { - if (!id.HasValue) - return "Unassigned"; - + if (!id.HasValue) return "Unassigned"; return teamMembers.FirstOrDefault(u => u.Id == id.Value)?.Name ?? "Unassigned"; } - private string GetPriorityBadgeClass(string priority) => priority switch + private string PriorityBadge(string priority) => priority switch { "Critical" => "badge bg-danger", "High" => "badge bg-warning text-dark", @@ -825,26 +1222,57 @@ else _ => "badge bg-secondary" }; - private void ClearMessages() + public void Dispose() { - pageError = null; - pageSuccess = null; + LocationState.OnChange -= HandleLocationStateChanged; } - private void SetSuccess(string message) + private class TaskFormModel { - pageError = null; - pageSuccess = message; + [Required, StringLength(128)] + public string Name { get; set; } = string.Empty; + + [Required] + public string Station { get; set; } = "Prep"; + + [Required] + public string Priority { get; set; } = "Normal"; + + public int? UserId { get; set; } + + [Required] + public DateTime? DueDate { get; set; } = DateTime.Today; + + [StringLength(512)] + public string? Notes { get; set; } = string.Empty; + + public WorkTaskKind TaskType { get; set; } = WorkTaskKind.Generic; + + public int? Par { get; set; } + public int? Count { get; set; } + + public int? RecipeId { get; set; } } +} - private void SetError(string message) - { - pageSuccess = null; - pageError = message; + + diff --git a/CulinaryCommandApp/Components/Pages/Assignments/AdminAssignTask.razor.css b/CulinaryCommandApp/Components/Pages/Assignments/AdminAssignTask.razor.css deleted file mode 100644 index 54205fd..0000000 --- a/CulinaryCommandApp/Components/Pages/Assignments/AdminAssignTask.razor.css +++ /dev/null @@ -1,52 +0,0 @@ -.assign-task-page { - --assign-green: #009A3B; - --assign-green-dark: #007a2f; - --assign-green-soft: #2ca259; -} - -.assign-task-page .page-heading { - border-left: 4px solid var(--assign-green-soft); - padding-left: 1rem; -} - -.assign-task-page ::deep .card { - border-radius: 1.1rem; - border: 1px solid #e9ecef; - box-shadow: 0 2px 10px rgba(0, 0, 0, 0.04); -} - -.assign-task-page ::deep .form-control, -.assign-task-page ::deep .form-select, -.assign-task-page ::deep .input-group-text, -.assign-task-page ::deep .btn { - border-radius: 0.9rem; -} - -.assign-task-page ::deep .btn-success, -.assign-task-page ::deep .btn-primary { - background-color: var(--assign-green); - border-color: var(--assign-green); -} - -.assign-task-page ::deep .btn-success:hover, -.assign-task-page ::deep .btn-primary:hover, -.assign-task-page ::deep .btn-success:focus, -.assign-task-page ::deep .btn-primary:focus { - background-color: var(--assign-green-dark); - border-color: var(--assign-green-dark); -} - -.assign-task-page ::deep .badge { - font-weight: 600; - border-radius: 999px; -} - -.assign-task-page ::deep .bg-success, -.assign-task-page ::deep .text-bg-success { - background-color: var(--assign-green) !important; - color: #ffffff !important; -} - -.assign-task-page ::deep details summary::-webkit-details-marker { - display: none; -} diff --git a/CulinaryCommandApp/Components/Pages/Assignments/ManualTaskForm.razor b/CulinaryCommandApp/Components/Pages/Assignments/ManualTaskForm.razor deleted file mode 100644 index b4a3020..0000000 --- a/CulinaryCommandApp/Components/Pages/Assignments/ManualTaskForm.razor +++ /dev/null @@ -1,117 +0,0 @@ -@using CulinaryCommand.Data.Entities -@using CulinaryCommand.Data.Enums -@using CulinaryCommandApp.Components.Pages.Assignments -@using CulinaryCommandApp.Recipe.Entities -@using Microsoft.AspNetCore.Components.Forms - -
- - Create Task Manually - Team: @TeamMembers.Count - - -
- - - - -
- - - - - -
- -
- - -
- -
-
- - - @foreach (var station in StationOptions) - { - - } - -
- -
- - - @foreach (var priority in PriorityOptions) - { - - } - -
-
- - @if (Model.TaskType == WorkTaskKind.PrepFromRecipe) - { -
- - - - @foreach (var recipe in Recipes) - { - - } - -
- -
-
- - -
-
- - -
-
- } - -
-
- - - - @foreach (var user in TeamMembers) - { - - } - -
- -
- - -
-
- -
- - -
- - - -
-
- -@code { - [Parameter] public TaskFormModel Model { get; set; } = default!; - [Parameter] public List TeamMembers { get; set; } = new(); - [Parameter] public List Recipes { get; set; } = new(); - [Parameter] public List StationOptions { get; set; } = new(); - [Parameter] public List PriorityOptions { get; set; } = new(); - [Parameter] public EventCallback OnSubmit { get; set; } - - private Task HandleSubmit() => OnSubmit.InvokeAsync(); -} diff --git a/CulinaryCommandApp/Components/Pages/Assignments/QuickAssignPanel.razor b/CulinaryCommandApp/Components/Pages/Assignments/QuickAssignPanel.razor deleted file mode 100644 index 2d712c7..0000000 --- a/CulinaryCommandApp/Components/Pages/Assignments/QuickAssignPanel.razor +++ /dev/null @@ -1,104 +0,0 @@ -@using CulinaryCommand.Data.Entities -@using Microsoft.AspNetCore.Components.Forms - -
-
-
-
-
Quick Assign
-
- @SelectedTemplates.Count task@(SelectedTemplates.Count == 1 ? "" : "s") selected -
-
- - -
- -
-
- @foreach (var template in SelectedTemplates) - { - - @template.Name - - } -
-
- -
-
- - - - @foreach (var user in TeamMembers) - { - - } - -
- -
- - -
- -
- - - - @foreach (var priority in PriorityOptions) - { - - } - -
-
- -
- - -
-
-
- -@code { - [Parameter] public List SelectedTemplates { get; set; } = new(); - [Parameter] public List TeamMembers { get; set; } = new(); - [Parameter] public List PriorityOptions { get; set; } = new(); - [Parameter] public int? AssignedUserId { get; set; } - [Parameter] public EventCallback AssignedUserIdChanged { get; set; } - [Parameter] public DateTime DueDate { get; set; } - [Parameter] public EventCallback DueDateChanged { get; set; } - [Parameter] public string Priority { get; set; } = "Keep Original"; - [Parameter] public EventCallback PriorityChanged { get; set; } - [Parameter] public EventCallback OnAssign { get; set; } - [Parameter] public EventCallback OnClear { get; set; } - - private int? AssignedUserIdValue - { - get => AssignedUserId; - set => _ = AssignedUserIdChanged.InvokeAsync(value); - } - - private DateTime DueDateValue - { - get => DueDate; - set => _ = DueDateChanged.InvokeAsync(value); - } - - private string PriorityValue - { - get => Priority; - set => _ = PriorityChanged.InvokeAsync(value); - } - - private Task HandleAssign() => OnAssign.InvokeAsync(); - - private Task HandleClear() => OnClear.InvokeAsync(); -} diff --git a/CulinaryCommandApp/Components/Pages/Assignments/TaskBoardPanel.razor b/CulinaryCommandApp/Components/Pages/Assignments/TaskBoardPanel.razor deleted file mode 100644 index 98af6ee..0000000 --- a/CulinaryCommandApp/Components/Pages/Assignments/TaskBoardPanel.razor +++ /dev/null @@ -1,126 +0,0 @@ -@using CulinaryCommand.Data.Entities -@using WorkTaskStatus = CulinaryCommand.Data.Enums.TaskStatus - -
-
-
-
Kitchen Task Board
-
Track pending, active, and completed work
-
- -
-
- - -
-
-
-
- -
- @foreach (var status in StatusBuckets) - { - var tasks = TasksForStatus(status).ToList(); - -
-
-
-
-
@status
- - @tasks.Count - -
- -
- @if (!tasks.Any()) - { -
- No tasks in this column. -
- } - else - { - @foreach (var task in tasks) - { -
-
- @task.Priority -
- -
@task.Name
-
@task.Station
-
@AssigneeLabel(task.UserId)
-
Due @task.DueDate.ToString("MMM d")
- - @if (!string.IsNullOrWhiteSpace(task.Notes)) - { -
@task.Notes
- } - -
- @if (task.Status == WorkTaskStatus.Pending) - { - - } - - @if (task.Status != WorkTaskStatus.Completed) - { - - } - - - - -
-
- } - } -
-
-
-
- } -
- -@code { - [Parameter] public string TaskBoardSearch { get; set; } = string.Empty; - [Parameter] public EventCallback TaskBoardSearchChanged { get; set; } - [Parameter] public List StatusBuckets { get; set; } = new(); - [Parameter] public Func> TasksForStatus { get; set; } = default!; - [Parameter] public Func PriorityBadgeClass { get; set; } = default!; - [Parameter] public Func AssigneeLabel { get; set; } = default!; - [Parameter] public EventCallback OnMarkInProgress { get; set; } - [Parameter] public EventCallback OnMarkComplete { get; set; } - [Parameter] public EventCallback OnBumpTask { get; set; } - [Parameter] public EventCallback OnDeleteTask { get; set; } - - private string TaskBoardSearchValue - { - get => TaskBoardSearch; - set => _ = TaskBoardSearchChanged.InvokeAsync(value); - } - - private Task HandleMarkInProgress(int taskId) => OnMarkInProgress.InvokeAsync(taskId); - - private Task HandleMarkComplete(int taskId) => OnMarkComplete.InvokeAsync(taskId); - - private Task HandleBumpTask(int taskId) => OnBumpTask.InvokeAsync(taskId); - - private Task HandleDeleteTask(int taskId) => OnDeleteTask.InvokeAsync(taskId); -} diff --git a/CulinaryCommandApp/Components/Pages/Assignments/TaskFormModel.cs b/CulinaryCommandApp/Components/Pages/Assignments/TaskFormModel.cs deleted file mode 100644 index 7ef30df..0000000 --- a/CulinaryCommandApp/Components/Pages/Assignments/TaskFormModel.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using CulinaryCommand.Data.Enums; - -namespace CulinaryCommandApp.Components.Pages.Assignments; - -public class TaskFormModel -{ - [Required, StringLength(128)] - public string Name { get; set; } = string.Empty; - - [Required] - public string Station { get; set; } = "Prep"; - - [Required] - public string Priority { get; set; } = "Normal"; - - public int? UserId { get; set; } - - [Required] - public DateTime? DueDate { get; set; } = DateTime.Today; - - [StringLength(512)] - public string? Notes { get; set; } = string.Empty; - - public WorkTaskKind TaskType { get; set; } = WorkTaskKind.Generic; - - public int? Par { get; set; } - public int? Count { get; set; } - - public int? RecipeId { get; set; } -} diff --git a/CulinaryCommandApp/Components/Pages/Assignments/TaskLibraryPanel.razor b/CulinaryCommandApp/Components/Pages/Assignments/TaskLibraryPanel.razor deleted file mode 100644 index ea96d4d..0000000 --- a/CulinaryCommandApp/Components/Pages/Assignments/TaskLibraryPanel.razor +++ /dev/null @@ -1,120 +0,0 @@ -@using CulinaryCommand.Data.Entities - -
-
-
-
-
Task Library
-
Select one or more reusable tasks
-
- -
- @TemplateCount - -
-
- -
- - -
- - @if (SelectedTemplateIds.Any()) - { -
- @SelectedTemplateIds.Count task@(SelectedTemplateIds.Count == 1 ? "" : "s") selected -
- } - -
- @if (!Templates.Any()) - { -
No task templates found.
- } - else - { - @foreach (var template in Templates) - { - var isSelected = SelectedTemplateIds.Contains(template.Id); - -
-
-
- - -
-
@template.Name
-
@template.Station
- - @if (!string.IsNullOrWhiteSpace(template.Notes)) - { -
@template.Notes
- } - -
- @template.Priority - - @if (template.DefaultEstimatedMinutes.HasValue) - { - - @template.DefaultEstimatedMinutes min - - } -
-
-
- -
- - -
-
-
- } - } -
-
-
- -@code { - [Parameter] public List Templates { get; set; } = new(); - [Parameter] public int TemplateCount { get; set; } - [Parameter] public string TaskLibrarySearch { get; set; } = string.Empty; - [Parameter] public EventCallback TaskLibrarySearchChanged { get; set; } - [Parameter] public IReadOnlyCollection SelectedTemplateIds { get; set; } = Array.Empty(); - [Parameter] public Func PriorityBadgeClass { get; set; } = default!; - [Parameter] public EventCallback OnToggleSelection { get; set; } - [Parameter] public EventCallback OnCreateTemplate { get; set; } - [Parameter] public EventCallback OnEditTemplate { get; set; } - [Parameter] public EventCallback OnArchiveTemplate { get; set; } - - private string TaskLibrarySearchValue - { - get => TaskLibrarySearch; - set => _ = TaskLibrarySearchChanged.InvokeAsync(value); - } - - private Task HandleToggleSelection(int templateId) => OnToggleSelection.InvokeAsync(templateId); - - private Task HandleCreateTemplate() => OnCreateTemplate.InvokeAsync(); - - private Task HandleEditTemplate(TaskTemplate template) => OnEditTemplate.InvokeAsync(template); - - private Task HandleArchiveTemplate(int templateId) => OnArchiveTemplate.InvokeAsync(templateId); -} diff --git a/CulinaryCommandApp/Components/Pages/Assignments/TaskListsPanel.razor b/CulinaryCommandApp/Components/Pages/Assignments/TaskListsPanel.razor deleted file mode 100644 index dd9b22f..0000000 --- a/CulinaryCommandApp/Components/Pages/Assignments/TaskListsPanel.razor +++ /dev/null @@ -1,109 +0,0 @@ -@using CulinaryCommand.Data.Entities - -
-
-
-
-
Task Lists
-
Reusable groups like Dish Closing or Morning Prep
-
- -
- @TaskListCount - -
-
- -
- - -
- -
- @if (!TaskLists.Any()) - { -
No task lists found.
- } - else - { - @foreach (var list in TaskLists) - { -
-
-
-
@list.Name
- - @if (!string.IsNullOrWhiteSpace(list.Description)) - { -
@list.Description
- } - - - @(list.Items?.Count ?? 0) task@((list.Items?.Count ?? 0) == 1 ? "" : "s") - -
- -
- - - - - - - -
-
-
- } - } -
-
-
- -@code { - [Parameter] public List TaskLists { get; set; } = new(); - [Parameter] public int TaskListCount { get; set; } - [Parameter] public string TaskListSearch { get; set; } = string.Empty; - [Parameter] public EventCallback TaskListSearchChanged { get; set; } - [Parameter] public EventCallback OnAssignList { get; set; } - [Parameter] public EventCallback OnCreateTaskList { get; set; } - [Parameter] public EventCallback OnEditTaskList { get; set; } - [Parameter] public EventCallback OnManageTemplates { get; set; } - [Parameter] public EventCallback OnArchiveTaskList { get; set; } - - private string TaskListSearchValue - { - get => TaskListSearch; - set => _ = TaskListSearchChanged.InvokeAsync(value); - } - - private Task HandleAssignList(int taskListId) => OnAssignList.InvokeAsync(taskListId); - - private Task HandleCreateTaskList() => OnCreateTaskList.InvokeAsync(); - - private Task HandleEditTaskList(TaskList taskList) => OnEditTaskList.InvokeAsync(taskList); - - private Task HandleManageTemplates(TaskList taskList) => OnManageTemplates.InvokeAsync(taskList); - - private Task HandleArchiveTaskList(int taskListId) => OnArchiveTaskList.InvokeAsync(taskListId); -}