From ca113ceb61ce9d2bc8e8438f7309ff10a581e3d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20B=C3=B6hm?= Date: Fri, 16 Aug 2024 23:18:11 +0200 Subject: [PATCH] Rubocop style update with some files --- app/controllers/jobs_controller.rb | 4 ++-- app/controllers/operator/jobs_controller.rb | 9 +++++++-- app/models/user.rb | 4 ++-- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/app/controllers/jobs_controller.rb b/app/controllers/jobs_controller.rb index 7269c29..763ac44 100644 --- a/app/controllers/jobs_controller.rb +++ b/app/controllers/jobs_controller.rb @@ -65,7 +65,7 @@ class JobsController < ApplicationController end 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 } if @status_changed Turbo::StreamsChannel.broadcast_remove_to "operator_jobs", target: @job broadcast_update_status_cards_and_start_next_job_button @@ -73,7 +73,7 @@ class JobsController < ApplicationController 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 } + 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 } diff --git a/app/controllers/operator/jobs_controller.rb b/app/controllers/operator/jobs_controller.rb index 97007ef..5a5ffc8 100644 --- a/app/controllers/operator/jobs_controller.rb +++ b/app/controllers/operator/jobs_controller.rb @@ -14,6 +14,11 @@ class Operator::JobsController < ApplicationController @job = Job.new end + def egal + asdf + ddfd + end + # GET /jobs/1/edit def edit; end @@ -131,7 +136,7 @@ class Operator::JobsController < ApplicationController end 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 } if @status_changed Turbo::StreamsChannel.broadcast_remove_to "operator_jobs", target: @job broadcast_update_status_cards_and_start_next_job_button @@ -140,7 +145,7 @@ class Operator::JobsController < ApplicationController 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 } + 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 } diff --git a/app/models/user.rb b/app/models/user.rb index db45e26..93e7e81 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,4 +1,4 @@ class User < ApplicationRecord - has_many :jobs_as_costumer, foreign_key: :costumer_id, class_name: 'Job' - has_many :jobs_as_operator, foreign_key: :operator_id, class_name: 'Job' + has_many :jobs_as_costumer, foreign_key: :costumer_id, class_name: "Job" + has_many :jobs_as_operator, foreign_key: :operator_id, class_name: "Job" end