daboh/plottservice
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added broadcast feature to operator_jobs when job is canceled

Browse Source
This commit is contained in:
David Böhm
2024-08-15 15:50:41 +02:00
parent 32be24bca9
commit 3d7a4ae677
5 changed files with 55 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
app/controllers/jobs_controller.rb
View File

@@ -16,8 +16,7 @@ class JobsController < ApplicationController
respond_to do |format| respond_to do |format|
if @job.save if @job.save
flash[:notice] = "Job was successfully created." flash[:notice] = "Job was successfully created."
Turbo::StreamsChannel.broadcast_prepend_later_to "jobs", target: :jobs, partial: "jobs/job_tr", broadcast_create_job job: @job
locals: { job: @job }
format.html { redirect_to jobs_url } format.html { redirect_to jobs_url }
else else
format.html { render :new, status: :unprocessable_entity } format.html { render :new, status: :unprocessable_entity }
@@ -34,7 +33,7 @@ class JobsController < ApplicationController
end end
respond_to do |format| respond_to do |format|
broadcast_update_job broadcast_update_job(job: @job, status_changed: true)
format.turbo_stream format.turbo_stream
format.html { redirect_to jobs_url } format.html { redirect_to jobs_url }
end end
@@ -42,8 +41,40 @@ class JobsController < ApplicationController
private private
def broadcast_update_job def broadcast_update_status_cards(job:)
Turbo::StreamsChannel.broadcast_replace_later_to "jobs", target: @job, partial: "jobs/job_tr", locals: { job: @job } # FIXME: Duplicate code, see operator/jobs_controller, move to the model
openjobs = Job.open.order(:created_at)
printingjobs = Job.printing.order(:status_changed_at)
pickupjobs = Job.pickup.order(:status_changed_at)
paidjobs = Job.paid.status_changed_today.order(:status_changed_at)
canceledjobs = Job.canceled.status_changed_today.order(:status_changed_at)
Turbo::StreamsChannel.broadcast_remove_to "operator_jobs", target: job
Turbo::StreamsChannel.broadcast_replace_to "operator_jobs", target: "openjobs_status_card", partial: "operator/jobs/job_status_card", locals: { jobs: openjobs, status: :open }
Turbo::StreamsChannel.broadcast_replace_to "operator_jobs", target: "printingjobs_status_card", partial: "operator/jobs/job_status_card", locals: { jobs: printingjobs, status: :printing }
Turbo::StreamsChannel.broadcast_replace_to "operator_jobs", target: "pickupjobs_status_card", partial: "operator/jobs/job_status_card", locals: { jobs: pickupjobs, status: :pickup }
Turbo::StreamsChannel.broadcast_replace_to "operator_jobs", target: "paidjobs_status_card", partial: "operator/jobs/job_status_card", locals: { jobs: paidjobs, status: :paid }
Turbo::StreamsChannel.broadcast_replace_to "operator_jobs", target: "canceledjobs_status_card", partial: "operator/jobs/job_status_card", locals: { jobs: canceledjobs, status: :canceled }
end
def broadcast_create_job(job:)
Turbo::StreamsChannel.broadcast_prepend_later_to "jobs", target: :jobs, partial: "jobs/job_tr", locals: { job: job }
Turbo::StreamsChannel.broadcast_prepend_later_to "operator_jobs", target: :openjobs, partial: "operator/jobs/job_tr", locals: { job: job }
broadcast_update_status_cards job: job
end
def broadcast_update_job(job:, status_changed: false)
Turbo::StreamsChannel.broadcast_replace_later_to "jobs", target: job, partial: "jobs/job_tr", locals: { job: }
if status_changed
broadcast_update_status_cards job: job
case job.status.to_sym
when :canceled, :paid then Turbo::StreamsChannel.broadcast_append_later_to "operator_jobs", target: :paidcanceledjobs, partial: "operator/jobs/job_tr", locals: { job: job }
when :open then Turbo::StreamsChannel.broadcast_append_later_to "operator_jobs", target: :openjobs, partial: "operator/jobs/job_tr", locals: { job: job }
when :printing then Turbo::StreamsChannel.broadcast_append_later_to "operator_jobs", target: :printingjobs, partial: "operator/jobs/job_tr", locals: { job: job }
when :pickup then Turbo::StreamsChannel.broadcast_append_later_to "operator_jobs", target: :pickupjobs, partial: "operator/jobs/job_tr", locals: { job: job }
end
else
Turbo::StreamsChannel.broadcast_replace_later_to "operator_jobs", target: job, partial: "operator/jobs/job_tr", locals: { job: job }
end
end end
# Only allow a list of trusted parameters through. # Only allow a list of trusted parameters through.

6
app/controllers/operator/jobs_controller.rb
View File

@@ -1,8 +1,9 @@
class Operator::JobsController < ApplicationController class Operator::JobsController < ApplicationController
before_action :set_job, only: %i[show edit update destroy cancel increment_page decrement_page] before_action :set_job, only: %i[show edit update destroy increment_page decrement_page]
# GET /jobs or /jobs.json # GET /jobs or /jobs.json
def index def index
# FIXME: Move to the model (orderstuff)
@openjobs = Job.open.order(:created_at) @openjobs = Job.open.order(:created_at)
@printingjobs = Job.printing.order(:status_changed_at) @printingjobs = Job.printing.order(:status_changed_at)
@pickupjobs = Job.pickup.order(:status_changed_at) @pickupjobs = Job.pickup.order(:status_changed_at)
@@ -43,6 +44,7 @@ class Operator::JobsController < ApplicationController
respond_to do |format| respond_to do |format|
if @job.update(job_params) if @job.update(job_params)
broadcast_update_job broadcast_update_job
# format.turbo_stream
format.html { redirect_to operator_jobs_url, notice: "Job was successfully updated." } format.html { redirect_to operator_jobs_url, notice: "Job was successfully updated." }
else else
format.html { render :edit, status: :unprocessable_entity } format.html { render :edit, status: :unprocessable_entity }
@@ -69,6 +71,7 @@ class Operator::JobsController < ApplicationController
respond_to do |format| respond_to do |format|
broadcast_update_job broadcast_update_job
# format.turbo_stream
format.html { redirect_to operator_jobs_url } format.html { redirect_to operator_jobs_url }
end end
end end
@@ -82,6 +85,7 @@ class Operator::JobsController < ApplicationController
respond_to do |format| respond_to do |format|
broadcast_update_job broadcast_update_job
# format.turbo_stream
format.html { redirect_to operator_jobs_url } format.html { redirect_to operator_jobs_url }
end end
end end

9
app/views/operator/jobs/_job_status_card.html.erb Normal file
View File

@@ -0,0 +1,9 @@
<%= link_to "##{[:paid, :canceled].include?(status.to_sym) && "paidcanceled" || status}jobs-h", class: "flex-1", id: "#{status}jobs_status_card" do %>
<div class="flex-1 card-status bg-status-<%= status %>-light text-status-<%= status %>">
<h3 class="p-3 text-2xl font-bold">
<%= icon("inbox-stack", class: "text-status-#{status} icon icon-nohover") %>
<%= status %>
<span class="block text-3xl text-right"><%= jobs.count %></span>
</h3>
</div>
<% end %>

50
app/views/operator/jobs/index.html.erb
View File

@@ -3,51 +3,11 @@
<div class="grid gap-4 grids-cols-2"> <div class="grid gap-4 grids-cols-2">
</div> </div>
<div class="flex space-x-4 justify-items-center"> <div class="flex space-x-4 justify-items-center">
<%= link_to "#openjobs-h", class: "flex-1" do %> <%= render partial: "job_status_card", locals: { jobs: @openjobs, status: :open } %>
<div class="flex-1 card-status bg-status-open-light text-status-open"> <%= render partial: "job_status_card", locals: { jobs: @printingjobs, status: :printing } %>
<h3 class="p-3 text-2xl font-bold"> <%= render partial: "job_status_card", locals: { jobs: @pickupjobs, status: :pickup } %>
<%= icon("inbox-stack", class: "text-status-open icon icon-nohover") %> <%= render partial: "job_status_card", locals: { jobs: @paidjobs, status: :paid } %>
Open <%= render partial: "job_status_card", locals: { jobs: @canceledjobs, status: :canceled } %>
<span class="block text-3xl text-right"><%= @openjobs.count %></span>
</h3>
</div>
<% end %>
<%= link_to "#printingjobs-h", class: "flex-1" do %>
<div class="flex-1 card-status bg-status-printing-light text-status-printing">
<h3 class="p-3 text-2xl font-bold">
<%= icon("printer", class: "text-status-printing icon icon-nohover") %>
Printing
<span class="block text-right"><%= @printingjobs.count %></span>
</h3>
</div>
<% end %>
<%= link_to "#pickupjobs-h", class: "flex-1" do %>
<div class="flex-1 card-status bg-status-pickup-light text-status-pickup">
<h3 class="p-3 text-2xl font-bold">
<%= icon("arrow-up-tray", class: "text-status-pickup icon icon-nohover") %>
Pickup
<span class="block text-right"><%= @pickupjobs.count %></span>
</h3>
</div>
<% end %>
<%= link_to "#paidcanceledjobs-h", class: "flex-1" do %>
<div class="flex-1 card-status bg-status-paid-light text-status-paid">
<h3 class="p-3 text-2xl font-bold">
<%= icon("banknotes", class: "text-status-paid icon icon-nohover") %>
Paid
<span class="block text-right"><%= @paidjobs.count %></span>
</h3>
</div>
<% end %>
<%= link_to "#paidcanceledjobs-h", class: "flex-1" do %>
<div class="flex-1 card-status bg-status-canceled-light text-status-canceled">
<h3 class="p-3 text-2xl font-bold">
<%= icon("x-circle", class: "text-status-canceled icon icon-nohover") %>
Canceled
<span class="block text-right"><%= @canceledjobs.count %></span>
</h3>
</div>
<% end %>
</div> </div>
<div class="w-full"> <div class="w-full">
<div id="printingjobs-h" class="flex items-center justify-between py-4"> <div id="printingjobs-h" class="flex items-center justify-between py-4">

0
app/views/operator/jobs/cancel.turbo_stream.erb → app/views/operator/jobs/update.turbo_stream.erb
View File