thecore_print_commons 2.0.7 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86c74b9cadc64d8b0f75bd0b67364a79c84117947cf4729f993d4734bd0a9838
-  data.tar.gz: 4ba907d65c9d61530f5da4a26669f686705acf67e62421b7f2a79bec449ed4d3
+  metadata.gz: b3d14d2d7122107560e3483a45aaab2f69efb513fae2f2c4368f996e79b61067
+  data.tar.gz: 69c327df788227be6659c6a6dd7ddcfda0af077bc18b82fb177b20ae3046a8f2
 SHA512:
-  metadata.gz: 5496efffaa44df68348d5a8622bde49880f133990dafd1f59716c21f7f7900830d1a8e4c1c7a74fb3372ded750e91fcc709d6dfb8442219f8754db9912d25910
-  data.tar.gz: e2ca1d4b65cbcd51ab76488e38bbc53346266dff3aec30c252a53bb598e3e05f6a34ae250835098408723c492d79673da85a176a630fc19916b66a096e29e3be
+  metadata.gz: 9841914519bfb9b77f1dd53c2f4ffcc344e411f083830a5104101be69b5ee4821636203d0c9a77cd09a7d39209b43a43098b4965236fa1f823ee6a365501c6f1
+  data.tar.gz: 826d5bd6e22ef43312e244b63ce864b6223b836f0f3ae4612516d555943b6760385b6839735f8445f96f90694bd5390c5980dbf8a42b0be87847b787aa7fc809

data/app/models/concerns/api/printer.rb

@@ -27,7 +27,7 @@ module Api::Printer
         #     { test: [ :first, :second, :third ], id: id, params: params}
         # end
 
-        def self.custom_action_print_single_barcode id, params
+        def self.custom_action_print_single_barcode params
             # Example Usage:
             # item = ::Item.joins(:projects).where(projects: {id: params[:order_id].to_i}).first
             # printer = ::Printer.where(supplier_id: current_user.supplier_id, default: true).first
@@ -36,10 +36,42 @@ module Api::Printer
             # # Preso l'ordine mi recupero l'item e ne stampo la quantità richiesta
             # ::PrintWorker.perform_async(printer.ip, text)
 
-            printer = Printer.find(id)
+            printer = Printer.find(params[:id])
             text = printer.print_template.template.gsub(printer.print_template.translation_matrix.lines.first, params[:barcode])
             ::PrintWorker.perform_async(printer.ip, printer.port, text)
             { info: "Print job sent in background to #{printer.ip} on port #{printer.port}" }
         end
+
+        def self.custom_action_printer_status params
+            printer = Printer.find(params[:id])
+            ip = printer.ip
+            port = printer.port
+            begin
+                s = Socket.tcp ip, port, connect_timeout: 0.5
+                # Must create intepolation between item and template
+                # Printer.template può essere anche
+                # una parola di comando epr chiedere lo stato della stampante, solo nel caso sia ok,
+                # Allora mando la stampa
+                s.puts("~hs")
+                # Attende per la risposta (si mette in wait)
+                response = []
+                while (response_text = s.gets)
+                    response << response_text
+                    break if response.count == 3
+                end
+                s.close
+                # Rails.logger.info "PrintIt: RESPONSE: #{response.inspect}"
+                first = response[0].split(",")
+                second = response[1].split(",")
+                return "HEAD UP" if second[2].to_i == 1
+                return "RIBBON OUT" if second[3].to_i == 1
+                return "PAPER OUT" if first[1].to_i == 1
+                return "PAUSE" if first[2].to_i == 1
+                return "OK"
+            rescue
+                Rails.logger.info "PrintIt: STATUS: UNREACHABLE"
+                return "UNREACHABLE"
+            end
+        end
     end
 end

data/app/models/concerns/rails_admin/printer.rb

@@ -17,11 +17,28 @@ module RailsAdmin::Printer
             field :default, :toggle
             field :temperature
             field :description
+            field :online? do
+                read_only true
+                formatted_value do # used in form views
+                    (value ? "<strong style='color:green'>👍</strong>" : "<strong style='color:red'>👎</strong>").html_safe
+                end
+                
+                pretty_value do # used in list view columns and show views, defaults to formatted_value for non-association fields
+                    (value ? "<strong style='color:green'>👍</strong>" : "<strong style='color:red'>👎</strong>").html_safe
+                end
+                
+                export_value do
+                    value ? "OK" : "KO" # used in exports, where no html/data is allowed
+                end
+            end
             
             list do
                 configure :description do
                     visible false
                 end
+                configure :temperature do
+                    visible false
+                end
             end
         end
     end

data/app/models/printer.rb

@@ -2,11 +2,11 @@ class Printer < ApplicationRecord
   include Api::Printer
   include RailsAdmin::Printer
   #serialize :translation, Hash
-
+  
   # before_save :check_if_unique_default
   # validates :qty, presence: true, numericality: { only_integer: true, greater_than: 0 }
   # validates :translation, presence: true
-
+  
   # def template_enum
   #   PrintTemplate.descendants
   # end
@@ -32,7 +32,7 @@ class Printer < ApplicationRecord
   # def self.assigned_to section
   #   where(used_in: (USED.index(section.to_sym) + 1))
   # end
-
+  
   # Usable with CUPS (STUB)
   # def ip_enum
   #   # Getting from CUPS the list of configured printers
@@ -44,20 +44,22 @@ class Printer < ApplicationRecord
   #     CupsPrinter.get_all_printer_names hostname: Settings.ns(:printer_commons).cups_server
   #   end 
   # end
-
+  
   belongs_to :print_template, inverse_of: :printers
   has_many :print_jobs, dependent: :destroy, inverse_of: :printer
-
+  
   validates :name, presence: true
   validates :ip, presence: true
   validates :port, presence: true
   validates :print_template, presence: true
-
   
-  # private
-  # def check_if_unique_default
-  #   if self.default?
-  #     Printer.where.not(id: self.id)
-  #   end
-  # end
+  def online?
+    begin
+      Socket.tcp(self.ip, self.port, connect_timeout: 0.5).close
+    rescue
+      return false
+    end
+    true
+  end
+
 end

data/app/workers/print_worker.rb

@@ -7,73 +7,13 @@ class PrintWorker
     # ZPL print
     def perform ip, port, text
         @pjob = PrintJob.create(printer_id: Printer.find_by(ip: ip), finished: false, iserror: false, total: 0, printed: 0)
-        status = check_status(ip)
-        print_job_status = false
-        if status == "OK"
-            begin
-                streamSock = TCPSocket.new ip, port
-                streamSock.send text, 0
-                streamSock.close
-                print_job_status = true
-            rescue
-                @pjob.update(iserror: true, description: "PRINTER ERROR: TIMEOUT")
-                print_job_status = false
-            end
-        else
-            @pjob.update(iserror: true, description: "PRINTER ERROR: #{status}")
-            print_job_status = false
-        end
+        streamSock = Socket.tcp ip, port, connect_timeout: 0.5
+        streamSock.send text, 0
+        streamSock.close
         # '~hs alla posizione 56 per 8 caratteri la quantità di etichette rimaste'
         total = text.scan(/~PQ(\d+)/).last.first.to_i rescue 0
-        @pjob.update(printed: (print_job_status ? total : 0)) # Se risultato true, allora ha stampato tutto, altrimenti non ha stampato nulla
+        @pjob.update(printed: total) # Se risultato true, allora ha stampato tutto, altrimenti non ha stampato nulla
         @pjob.update(total: total) # In realtà è inutile, ora manda tutto quello che può alla stampante, solo lei può andare storta
-        @pjob.update(finished: print_job_status)
+        @pjob.update(finished: true)
     end
-    
-    def check_status printer
-        begin
-            s = TCPSocket.new(printer, 9100)
-            # Must create intepolation between item and template
-            # Printer.template può essere anche
-            # una parola di comando epr chiedere lo stato della stampante, solo nel caso sia ok,
-            # Allora mando la stampa
-            s.puts("~hs")
-            # Attende per la risposta (si mette in wait)
-            response = []
-            while (response_text = s.gets)
-                response << response_text
-                break if response.count == 3
-            end
-            s.close
-            Rails.logger.info "PrintIt: RESPONSE: #{response.inspect}"
-            first = response[0].split(",")
-            second = response[1].split(",")
-            return "HEAD UP" if second[2].to_i == 1
-            return "RIBBON OUT" if second[3].to_i == 1
-            return "PAPER OUT" if first[1].to_i == 1
-            return "PAUSE" if first[2].to_i == 1
-            return "OK"
-        rescue
-            Rails.logger.info "PrintIt: STATUS: UNREACHABLE"
-            return "UNREACHABLE"
-        end
-    end
-    
-    # This is for cups only
-    # def perform printer_cups_name, text
-    #     # if Settings.ns(:printer_commons).cups_server.blank? || ['127.0.0.1', 'localhost'].contains(Settings.ns(:printer_commons).cups_server)
-    #     #     printer = CupsPrinter.new printer_cups_name
-    #     #     printer.print_data text, 'text/plain'
-    #     #     printer.close
-    #     # else
-    #     print_file = "/tmp/print-#{printer_cups_name}-#{Time.now.strftime '%Y%m%d%H%M%S%L'}"
-    #     puts "Creating temp file: #{print_file}"
-    #     IO.write(print_file, text)
-    #     # CupsPrinter.new printer_cups_name, hostname: Settings.ns(:printer_commons).cups_server
-    #     # printer.print_data text, 'text/plain', hostname: Settings.ns(:printer_commons).cups_server
-    #     puts "Printing with lp command on #{printer_cups_name} of #{Settings.ns(:printer_commons).cups_server} "
-    #     `cupsenable "#{printer_cups_name}";lp -d "#{printer_cups_name}" -h "#{Settings.ns(:printer_commons).cups_server}" -o raw "#{print_file}"`
-    #     File.delete print_file
-    #     # end
-    # end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thecore_print_commons
 version: !ruby/object:Gem::Version
-  version: 2.0.7
+  version: 2.1.3
 platform: ruby
 authors:
 - Gabriele Tassoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-08 00:00:00.000000000 Z
+date: 2021-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thecore_background_jobs