From 123e415a4fb102bf8d6e7e69ae63bcb6f7c19fbc Mon Sep 17 00:00:00 2001 From: Martin Artnik Date: Mon, 2 Aug 2021 11:11:11 +0200 Subject: [PATCH 1/3] Print status backend + FE integration [SCI-5942] --- .../sitewide/print_progress_modal.js | 24 ++++++++ .../sitewide/repository_row_info_modal.js | 2 +- app/controllers/label_printers_controller.rb | 18 +++++- app/controllers/repositories_controller.rb | 8 +-- app/controllers/repository_rows_controller.rb | 23 +++++++- app/jobs/label_printers/print_job.rb | 20 ++++++- app/models/label_printer.rb | 15 ++++- .../_print_progress_modal.html.erb | 25 +++++++++ .../repositories/_print_label_modal.html.erb | 56 ++++++++++--------- .../_print_progress_modal.html.erb | 38 ------------- app/views/repositories/show.html.erb | 6 +- config/locales/en.yml | 6 +- config/routes.rb | 5 ++ .../20210720112050_create_label_printers.rb | 3 + db/structure.sql | 3 + 15 files changed, 171 insertions(+), 81 deletions(-) create mode 100644 app/assets/javascripts/sitewide/print_progress_modal.js create mode 100644 app/views/label_printers/_print_progress_modal.html.erb delete mode 100644 app/views/repositories/_print_progress_modal.html.erb diff --git a/app/assets/javascripts/sitewide/print_progress_modal.js b/app/assets/javascripts/sitewide/print_progress_modal.js new file mode 100644 index 000000000..d324f33c2 --- /dev/null +++ b/app/assets/javascripts/sitewide/print_progress_modal.js @@ -0,0 +1,24 @@ +$(document).on('click', '.label-printing-progress-modal .close', function() { + $(this).parent().parent().remove(); +}); + +$(document).on('turbolinks:load', function() { + var modal = $(document).find('.label-printing-progress-modal'); + if (modal.length > 0) { + window.printerModalReloadInterval = setInterval(function() { + modal = $(document).find('.label-printing-progress-modal'); + + if (modal.length === 0) { + clearInterval(window.printerModalReloadInterval); + return; + } + $.getJSON( + `/label_printers/${modal.data('labelPrinterId')}/update_progress_modal` + + `?starting_item_count=${modal.data('startingItemCount')}`, + function(data) { modal.replaceWith(data.html); } + ); + }, 3000); + } else if (window.printerModalReloadInterval) { + clearInterval(window.printerModalReloadInterval); + } +}); diff --git a/app/assets/javascripts/sitewide/repository_row_info_modal.js b/app/assets/javascripts/sitewide/repository_row_info_modal.js index b80b1029f..2160e2c88 100644 --- a/app/assets/javascripts/sitewide/repository_row_info_modal.js +++ b/app/assets/javascripts/sitewide/repository_row_info_modal.js @@ -67,7 +67,7 @@ $(this).remove(); }); - dropdownSelector.init('#modal-print-repository-row-label #printers', { + dropdownSelector.init('#modal-print-repository-row-label #label_printer_id', { noEmptyOption: true, singleSelect: true, closeOnSelect: true, diff --git a/app/controllers/label_printers_controller.rb b/app/controllers/label_printers_controller.rb index 2bfe78332..bdffc7d2d 100644 --- a/app/controllers/label_printers_controller.rb +++ b/app/controllers/label_printers_controller.rb @@ -3,7 +3,7 @@ class LabelPrintersController < ApplicationController include InputSanitizeHelper - before_action :check_manage_permissions, except: :index + before_action :check_manage_permissions, except: %i(index update_progress_modal) before_action :find_label_printer, only: %i(edit update destroy) def index @@ -59,8 +59,22 @@ class LabelPrintersController < ApplicationController render json: { job_id: print_job.job_id } end + def update_progress_modal + render( + json: { + html: + render_to_string( + partial: 'label_printers/print_progress_modal', + locals: { + starting_item_count: params[:starting_item_count].to_i, + label_printer: LabelPrinter.find(params[:id]) + } + ) + } + ) + end + def create_fluics - # Placeholder for FLUICS printer management begin printers = LabelPrinters::Fluics::ApiClient.new(label_printer_params[:fluics_api_key]).list diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb index 6857e006d..5ff2ca8a4 100644 --- a/app/controllers/repositories_controller.rb +++ b/app/controllers/repositories_controller.rb @@ -49,12 +49,8 @@ class RepositoriesController < ApplicationController @display_delete_button = can_delete_repository_rows?(@repository) @display_duplicate_button = can_create_repository_rows?(@repository) @snapshot_provisioning = @repository.repository_snapshots.provisioning.any? - @printing = { - printer_name: 'Fluics label printer', - printer_status: :out_of_labels, - items: RepositoryRow.all, - printing_status: :waiting_labels - } + + @busy_printer = LabelPrinter.where.not(current_print_job_ids: []).first end def table_toolbar diff --git a/app/controllers/repository_rows_controller.rb b/app/controllers/repository_rows_controller.rb index 3aed09887..50185b50f 100644 --- a/app/controllers/repository_rows_controller.rb +++ b/app/controllers/repository_rows_controller.rb @@ -73,7 +73,7 @@ class RepositoryRowsController < ApplicationController def print_modal @repository_rows = @repository.repository_rows.where(id: params[:rows]) - @printers = [] + @printers = LabelPrinter.all respond_to do |format| format.json do render json: { @@ -85,6 +85,27 @@ class RepositoryRowsController < ApplicationController end end + def print + label_printer = LabelPrinter.find(params[:label_printer_id]) + label_printer.update!(status: :ready) # reset potential error state + + job_ids = RepositoryRow.where(id: params[:repository_row_ids]).flat_map do |repository_row| + Array.new(params[:copies].to_i).map do + LabelPrinters::PrintJob.perform_later( + label_printer, + LabelTemplate.first.render( # Currently we will only use the default template + item_id: repository_row.code, + item_name: repository_row.name + ) + ).job_id + end + end + + label_printer.update!(current_print_job_ids: job_ids) + + redirect_to repository_path(@repository) + end + def update row_update = RepositoryRows::UpdateRepositoryRowService .call(repository_row: @repository_row, user: current_user, params: update_params) diff --git a/app/jobs/label_printers/print_job.rb b/app/jobs/label_printers/print_job.rb index 96b4d4f54..6d6e5e740 100644 --- a/app/jobs/label_printers/print_job.rb +++ b/app/jobs/label_printers/print_job.rb @@ -14,8 +14,26 @@ module LabelPrinters api_client.print(label_printer.fluics_lid, payload) # wait for FLUICS printer to stop being busy - sleep(5) while api_clinet.status(label_printer.fluics_lid).dig('printerState', 'printerStatus') != '00' + loop do + status = + LabelPrinters::FLUICS_STATUS_MAP( + api_client.status(label_printer.fluics_lid).dig('printerState', 'printerStatus') + ) + label_printer.update!(status: status) + + break if status == :ready + + sleep 5 + end + end + + label_printer.with_lock do + label_printer.current_print_job_ids.delete(job_id) + label_printer.save! end end + rescue StandardError => e + label_printer.update(status: :error) + raise e end end diff --git a/app/models/label_printer.rb b/app/models/label_printer.rb index d05db4b26..a814b1e07 100644 --- a/app/models/label_printer.rb +++ b/app/models/label_printer.rb @@ -1,14 +1,25 @@ # frozen_string_literal: true class LabelPrinter < ApplicationRecord + FLUICS_STATUS_MAP = Hash.new(:error).merge( + { + '00' => :ready, + '50' => :busy, + '60' => :busy, + '01' => :out_of_labels, + '02' => :out_of_labels + } + ).freeze + enum type_of: { fluics: 0 } enum language_type: { zpl: 0 } + enum status: { ready: 0, busy: 1, out_of_labels: 2, unreachable: 3, error: 4 } validates :name, presence: true validates :type_of, presence: true validates :language_type, presence: true - def ready? - true # TODO + def display_name + "#{name} • #{description}" end end diff --git a/app/views/label_printers/_print_progress_modal.html.erb b/app/views/label_printers/_print_progress_modal.html.erb new file mode 100644 index 000000000..322c735ac --- /dev/null +++ b/app/views/label_printers/_print_progress_modal.html.erb @@ -0,0 +1,25 @@ +
+
+
+ <%= label_printer.name %> +
+
+ <% if label_printer.ready? %> + <%= t('label_printers.modal_printing_status.printer_status.ready') %> + <% elsif label_printer.out_of_labels? %> + <%= t('label_printers.modal_printing_status.printer_status.out_of_labels') %> + <% else %> + <%= t('label_printers.modal_printing_status.printer_status.not_ready') %> + <% end %> +
+ +
+
+
+ <%= t('label_printers.modal_printing_status.multiple_items', starting_item_count: starting_item_count, item_count: starting_item_count - label_printer.current_print_job_ids.length) %> +
+
+ <%= t("label_printers.modal_printing_status.printing_status.#{label_printer.current_print_job_ids.length == 0 ? 'done' : 'printing'}") %> +
+
+
diff --git a/app/views/repositories/_print_label_modal.html.erb b/app/views/repositories/_print_label_modal.html.erb index e9421ce14..c4f0aa024 100644 --- a/app/views/repositories/_print_label_modal.html.erb +++ b/app/views/repositories/_print_label_modal.html.erb @@ -1,34 +1,38 @@