Run rubocop --fix-layout and remove encoding comments

This commit is contained in:
Patrick Gansterer 2021-03-01 15:27:26 +01:00
parent fa63e6e81d
commit ea2862fdef
283 changed files with 1164 additions and 1969 deletions

View file

@ -23,8 +23,6 @@ end
APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
load 'rails/tasks/engine.rake'
Bundler::GemHelper.install_tasks
require 'rake/testtask'
@ -36,5 +34,4 @@ Rake::TestTask.new(:test) do |t|
t.verbose = false
end
task :default => :test

View file

@ -36,6 +36,7 @@ class PrinterController < ApplicationController
json = JSON.parse data, symbolize_names: true
job = PrinterJob.unfinished.find_by_id(json[:id])
return unless job
if json[:state]
job.add_update! json[:state], json[:message]
end
@ -54,5 +55,4 @@ class PrinterController < ApplicationController
return head(:unauthorized) unless bearer_token
return head(:forbidden) if bearer_token != FoodsoftConfig[:printer_token]
end
end

View file

@ -17,6 +17,7 @@ class PrinterJobsController < ApplicationController
PrinterJob.transaction do
%w(articles fax groups matrix).each do |document|
next unless FoodsoftConfig["printer_print_order_#{document}"]
job = PrinterJob.create! order: order, document: document, created_by: current_user
job.add_update! state
count += 1

View file

@ -1,5 +1,4 @@
class PrinterJob < ActiveRecord::Base
belongs_to :order
belongs_to :created_by, class_name: 'User', foreign_key: 'created_by_user_id'
belongs_to :finished_by, optional: true, class_name: 'User', foreign_key: 'finished_by_user_id'
@ -7,8 +6,8 @@ class PrinterJob < ActiveRecord::Base
scope :finished, -> { where.not(finished_at: nil) }
scope :unfinished, -> { where(finished_at: nil).order(:id) }
scope :pending, -> { unfinished.includes(:order).where.not(orders: {state: 'open'}) }
scope :queued, -> { unfinished.includes(:order).where(orders: {state: 'open'}) }
scope :pending, -> { unfinished.includes(:order).where.not(orders: { state: 'open' }) }
scope :queued, -> { unfinished.includes(:order).where(orders: { state: 'open' }) }
def last_update_at
printer_job_updates.order(:created_at).last.try(&:created_at)
@ -18,14 +17,15 @@ class PrinterJob < ActiveRecord::Base
printer_job_updates.order(:created_at).last.try(&:state)
end
def add_update!(state, message=nil)
def add_update!(state, message = nil)
return unless finished_at.nil?
PrinterJobUpdate.create! printer_job: self, state: state, message: message
end
def finish!(user=nil)
def finish!(user = nil)
return unless finished_at.nil?
update_attributes finished_at: Time.now, finished_by: user
end
end

View file

@ -1,5 +1,3 @@
class PrinterJobUpdate < ActiveRecord::Base
belongs_to :printer_job
end

View file

@ -2,6 +2,7 @@ module FoodsoftPrinter
class Engine < ::Rails::Engine
def navigation(primary, context)
return unless FoodsoftPrinter.enabled?
unless primary[:orders].nil?
sub_nav = primary[:orders].sub_navigation
sub_nav.items <<

View file

@ -1,5 +1,4 @@
module FoodsoftPrinter
module OrderPrinterJobs
def self.included(base) # :nodoc:
base.class_eval do
@ -22,5 +21,4 @@ module FoodsoftPrinter
Order.send :include, self
end
end
end