Merge branch 'release_1.83'

Author: aploshay

app/models/cylinder_tm.rb

@@ -62,14 +62,12 @@ class CylinderTm < ActiveRecord::Base
       'Locked grooves at the end' => [:pres, :presInt, :prod],
       'False start at the beginning' => [:pres, :presInt, :prod]
     }.freeze,
-    text_comment_uses: [:pres, :presInt, :prod].freeze,
     timestamp_comments: {
-      :locked_grooves => [:pres, :presInt, :prod],
-      :speed_change => [:pres, :presInt, :prod],
-      :speed_fluctuations => [:pres, :presInt, :prod],
-      :second_attempt => [:pres, :presInt, :prod]
+      :locked_grooves => [:pres],
+      :speed_change => [:pres],
+      :speed_fluctuations => [:pres],
+      :second_attempt => [:pres]
     }.freeze,
-    timestamp_comment_uses: [:pres].freeze,
     file_uses: {
       default: [:pres, :presRef, :presInt, :intRef, :prod],
       optional: []

app/views/returns/return_bin.html.erb

@@ -190,5 +190,7 @@
     });
     //set barcode focus, only if no warning div content was set
     if (!$.trim($("div.warning").html())) { $("#mdpi_barcode").focus() };
+    //alert if return_to notification
+    if ($.trim($("div.notice").html()).match(/Return to:.*notify/i)) { alert($.trim($("div.notice").html()).match(/Return to:.*notify.*/i)) }
   });
 </script>

config/environments/development.rb

@@ -38,6 +38,6 @@
 
   # this sets up log rotating first arg the log file location, second arg the number of files to rotate through
   # third arg the size of each file
-  # config.logger = Logger.new("#{Rails.root}/log/#{Rails.env}.log", 10, 10.kilobyte)
+  config.logger = Logger.new("#{Rails.root}/log/#{Rails.env}.log", 10, 10.megabytes)
 
 end

config/environments/test.rb

@@ -48,4 +48,9 @@
 
   # Test workaround for resolving routing issue in assets/images
   config.assets.debug = true
+
+  # this sets up log rotating first arg the log file location, second arg the number of files to rotate through
+  # third arg the size of each file
+  config.logger = Logger.new("#{Rails.root}/log/#{Rails.env}.log", 10, 10.megabytes)
+
 end

lib/tasks/log_duplicate_mdpi_barcodes.rake

@@ -0,0 +1,22 @@
+# log_duplicate_mdpi_barcodes.rake
+# Rake tasks for logging duplicate non-zero MDPI barcodes
+#
+# Example use:
+# rake pod:log_duplicate_mdpi_barcodes
+#
+namespace :pod do
+  desc "Log duplicate MDPI barcodes"
+    task :log_duplicate_mdpi_barcodes => :environment do |task|
+      @logger = Logger.new(Rails.root.join('log', 'find_duplicate_barcodes.log'))
+      duplicates = PhysicalObject.where.not(mdpi_barcode: '0').select(:mdpi_barcode).group(:mdpi_barcode).having("count('mdpi_barcode') > 1").size
+      if duplicates.empty?
+        @logger.info 'No duplicates found'
+      else
+        @logger.info "#{duplicates.size} duplicate cases found."
+        @logger.info duplicates.to_yaml
+        duplicates.keys.each do |barcode|
+          PhysicalObject.where(mdpi_barcode: barcode).each { |po| @logger.info po.inspect }
+        end
+      end
+    end
+end