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

Added broadcast feature from operator_jobs

Browse Source
This commit is contained in:
David Böhm
2024-08-15 21:44:52 +02:00
parent ad781b18cf
commit f672f8972e
2 changed files with 50 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/controllers/jobs_controller.rb
View File

@@ -43,8 +43,8 @@ class JobsController < ApplicationController
private private
def broadcast_update_status_cards_and_start_next_job_button def broadcast_update_status_cards_and_start_next_job_button
# FIXME: Duplicate code, see operator/jobs_controller, move to the model # FIXME: Duplicate code, see operator/jobs_controller, move to the model?
openjobs = Job.open.order(:status_changed_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)
paidjobs = Job.paid.status_changed_today.order(:status_changed_at) paidjobs = Job.paid.status_changed_today.order(:status_changed_at)
@@ -65,8 +65,8 @@ class JobsController < ApplicationController
def broadcast_update_job def broadcast_update_job
Turbo::StreamsChannel.broadcast_replace_later_to "jobs", target: @job, partial: "jobs/job_tr", locals: { job: @job} Turbo::StreamsChannel.broadcast_replace_later_to "jobs", target: @job, partial: "jobs/job_tr", locals: { job: @job}
Turbo::StreamsChannel.broadcast_remove_to "operator_jobs", target: @job
if @status_changed if @status_changed
Turbo::StreamsChannel.broadcast_remove_to "operator_jobs", target: @job
broadcast_update_status_cards_and_start_next_job_button broadcast_update_status_cards_and_start_next_job_button
case @job.status.to_sym 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 :canceled, :paid then Turbo::StreamsChannel.broadcast_append_later_to "operator_jobs", target: :paidcanceledjobs, partial: "operator/jobs/job_tr", locals: { job: @job }
@@ -75,7 +75,7 @@ class JobsController < ApplicationController
when :pickup then Turbo::StreamsChannel.broadcast_append_later_to "operator_jobs", target: :pickupjobs, 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 end
else else
Turbo::StreamsChannel.broadcast_replace_later_to "operator_jobs", target: job, partial: "operator/jobs/job_tr", locals: { job: @job } Turbo::StreamsChannel.broadcast_replace_later_to "operator_jobs", target: @job, partial: "operator/jobs/job_tr", locals: { job: @job }
end end
end end

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

@@ -1,15 +1,9 @@
class Operator::JobsController < ApplicationController class Operator::JobsController < ApplicationController
before_action :set_job, only: %i[show edit update destroy increment_page decrement_page] before_action :set_job, only: %i[show edit update destroy increment_page decrement_page]
before_action :set_job_lists, only: %i[index]
# 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)
@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)
@paidcanceledjobs = Job.paidcanceled.status_changed_today.order(:status_changed_at)
end end
# GET /jobs/1 or /jobs/1.json # GET /jobs/1 or /jobs/1.json
@@ -30,8 +24,7 @@ class Operator::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: "operator/jobs/job_tr", broadcast_create_job
locals: { job: @job }
format.html { redirect_to operator_jobs_url } format.html { redirect_to operator_jobs_url }
else else
format.html { render :new, status: :unprocessable_entity } format.html { render :new, status: :unprocessable_entity }
@@ -41,12 +34,6 @@ class Operator::JobsController < ApplicationController
# PATCH/PUT /jobs/1 or /jobs/1.json # PATCH/PUT /jobs/1 or /jobs/1.json
def update def update
# FIXME: Move to the model (orderstuff)
@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)
@job.assign_attributes(job_params) @job.assign_attributes(job_params)
@status_changed = @job.status_changed? @status_changed = @job.status_changed?
respond_to do |format| respond_to do |format|
@@ -55,6 +42,8 @@ class Operator::JobsController < ApplicationController
format.turbo_stream 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
flash[:alert] = "Job was not updated."
format.turbo_stream
format.html { render :edit, status: :unprocessable_entity } format.html { render :edit, status: :unprocessable_entity }
end end
end end
@@ -109,12 +98,52 @@ class Operator::JobsController < ApplicationController
@job = Job.find(params[:id]) @job = Job.find(params[:id])
end end
def broadcast_update_job def set_job_lists
Turbo::StreamsChannel.broadcast_replace_later_to "jobs", target: @job, partial: "jobs/job_tr", locals: { job: @job } # FIXME: Duplicate code, see jobs_controller, move to the model, Mabye moving to 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)
@paidcanceledjobs = Job.paidcanceled.status_changed_today.order(:status_changed_at)
end end
# Only allow a list of trusted parameters through. # Only allow a list of trusted parameters through.
def job_params def job_params
params.require(:job).permit(:operator_id, :costumer_id, :operator_firstname, :operator_lastname, :costumer_firstname, :costumer_lastname, :status) params.require(:job).permit(:operator_id, :costumer_id, :operator_firstname, :operator_lastname, :costumer_firstname, :costumer_lastname, :status)
end end
# FIXME: Move broadcast to model though i don't think view logic belongs in the model
def broadcast_update_status_cards_and_start_next_job_button
set_job_lists
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 }
Turbo::StreamsChannel.broadcast_replace_to "operator_jobs", target: "start_next_job_btn", partial: "operator/jobs/start_next_job_btn", locals: { jobs: @openjobs }
end
def broadcast_create_job
Turbo::StreamsChannel.broadcast_prepend_later_to "jobs", target: :jobs, partial: "jobs/job_tr", locals: { job: @job }
Turbo::StreamsChannel.broadcast_append_later_to "operator_jobs", target: :openjobs, partial: "operator/jobs/job_tr", locals: { job: @job }
broadcast_update_status_cards_and_start_next_job_button
end
def broadcast_update_job
Turbo::StreamsChannel.broadcast_replace_later_to "jobs", target: @job, partial: "jobs/job_tr", locals: { job: @job}
if @status_changed
Turbo::StreamsChannel.broadcast_remove_to "operator_jobs", target: @job
broadcast_update_status_cards_and_start_next_job_button
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_update_to "operator_jobs", target: :openjobs, partial: "operator/jobs/job_tr", collection: @openjobs, as: :job
# 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_to "operator_jobs", target: @job, partial: "operator/jobs/job_tr", locals: { job: @job }
end
end
end end