Remove 'done' from task form. Add newest to top. Move done tasks to bottom
This commit is contained in:
@@ -2,19 +2,21 @@
|
||||
<p><%= @project.description %></p>
|
||||
|
||||
<%= turbo_frame_tag "tasks" do %>
|
||||
<ul id="tasks_list">
|
||||
<% # First: pending or in-progress tasks %>
|
||||
<%= render @project.tasks.reject { |t| t.status == "done" } %>
|
||||
|
||||
<% done_tasks = @project.tasks.select { |t| t.status == "done" } %>
|
||||
<% if done_tasks.any? %>
|
||||
<%= render done_tasks %>
|
||||
<ul id="active_tasks">
|
||||
<% @project.tasks.where(status: %w[to_do in_progress]).each do |task| %>
|
||||
<%= render partial: "tasks/task", locals: { task: task } %>
|
||||
<% end %>
|
||||
</ul>
|
||||
|
||||
<ul id="done_tasks">
|
||||
<% @project.tasks.where(status: "done").each do |task| %>
|
||||
<%= render partial: "tasks/task", locals: { task: task } %>
|
||||
<% end %>
|
||||
</ul>
|
||||
|
||||
<% end %>
|
||||
|
||||
<%= turbo_frame_tag "new_task" do %>
|
||||
<br>
|
||||
<h2>Add New Task</h2>
|
||||
<%= render "tasks/form", project: @project, task: Task.new %>
|
||||
<% end %>
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
<h2>Add New Task</h2>
|
||||
|
||||
<%= form_with model: [project, task], local: false do |f| %>
|
||||
<p>
|
||||
<%= f.label :title %><br>
|
||||
@@ -6,7 +8,7 @@
|
||||
|
||||
<p>
|
||||
<%= f.label :status %><br>
|
||||
<%= f.select :status, Task.statuses.keys %>
|
||||
<%= f.select :status, Task.statuses.keys.reject { |s| s == "done" } %>
|
||||
</p>
|
||||
|
||||
<%= f.submit "Create Task" %>
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
<turbo-frame id="<%= dom_id(task) %>">
|
||||
<li id="<%= dom_id(task) %>" class="task-item <%= 'done-task' if task.status == 'done' %>">
|
||||
<div class="task-title"><%= task.title %></div>
|
||||
<div class="task-status"><%= task.status.titleize %></div>
|
||||
@@ -17,4 +16,3 @@
|
||||
class: "task-btn destroy-btn" %>
|
||||
</div>
|
||||
</li>
|
||||
</turbo-frame>
|
||||
@@ -1,3 +1,3 @@
|
||||
<%= turbo_stream.replace dom_id(@task) do %>
|
||||
<%= render @task %>
|
||||
<%= render partial: "tasks/task", locals: { task: @task } %>
|
||||
<% end %>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<%= turbo_stream.append "tasks" do %>
|
||||
<%= render @task %> <!-- renders _task.html.erb -->
|
||||
<%= turbo_stream.prepend "active_tasks" do %>
|
||||
<%= render partial: "tasks/task", locals: { task: @task } %>
|
||||
<% end %>
|
||||
|
||||
<%= turbo_stream.replace "new_task" do %>
|
||||
|
||||
Reference in New Issue
Block a user