Merge b88529b into e86a7bf

sul-dlss · Oct 9, 2019 · bfba160 · bfba160
2 parents e86a7bf + b88529b
commit bfba160
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/app/views/digital_bookplates_batches/add_batch.html.erb b/app/views/digital_bookplates_batches/add_batch.html.erb
@@ -44,7 +44,7 @@
     </div>
   </div>
   <%= f.hidden_field :user_name, value: current_user.user_id %>
-  <%= f.hidden_field :submit_date, value: Time.current %>
+  <%= f.hidden_field :submit_date, value: Time.zone.now.strftime('%y%m%d%H%M%S%L%1N') %>
   <%= f.hidden_field :batch_type, value: 'add' %>
   <div class="btn-group">
     <br />

diff --git a/app/views/digital_bookplates_batches/delete_batch.html.erb b/app/views/digital_bookplates_batches/delete_batch.html.erb
@@ -44,7 +44,7 @@
     </div>
   </div>
   <%= f.hidden_field :user_name, value: current_user.user_id %>
-  <%= f.hidden_field :submit_date, value: Time.current %>
+  <%= f.hidden_field :submit_date, value: Time.zone.now.strftime('%y%m%d%H%M%S%L%1N') %>
   <%= f.hidden_field :batch_type, value: 'delete' %>
   <div class="btn-group">
     <br />

diff --git a/lib/tasks/webforms.rake b/lib/tasks/webforms.rake
@@ -6,7 +6,7 @@ namespace :webforms do
   task :transfer_items, %i[path_to_file current_lib new_lib new_homeloc new_curloc
                            new_itype email comments] => :environment do |_t, args|
     barcodes = IO.read(args[:path_to_file]).split("\n").uniq
-    @uni_updates_batch = UniUpdatesBatch.create(batch_date: Time.current,
+    @uni_updates_batch = UniUpdatesBatch.create(batch_date: Time.zone.now.strftime('%y%m%d%H%M%S%L%1N'),
                                                 user_name: 'batch',
                                                 user_email: args[:email],
                                                 action: 'TRANSFER',
@@ -33,7 +33,7 @@ namespace :webforms do
   desc 'Withdraw a batch'
   task :withdraw_items, %i[path_to_file current_lib email comments] => :environment do |_t, args|
     barcodes = IO.read(args[:path_to_file]).split("\n").uniq
-    @uni_updates_batch = UniUpdatesBatch.create(batch_date: Time.current,
+    @uni_updates_batch = UniUpdatesBatch.create(batch_date: Time.zone.now.strftime('%y%m%d%H%M%S%L%1N'),
                                                 user_name: 'batch',
                                                 user_email: args[:email],
                                                 action: 'WITHDRAW',
@@ -57,7 +57,7 @@ namespace :webforms do
   task :change_home_location, %i[path_to_file current_lib new_homeloc
                                  new_curloc new_itype email comments] => :environment do |_t, args|
     barcodes = IO.read(args[:path_to_file]).split("\n").uniq
-    @uni_updates_batch = UniUpdatesBatch.create(batch_date: Time.current,
+    @uni_updates_batch = UniUpdatesBatch.create(batch_date: Time.zone.now.strftime('%y%m%d%H%M%S%L%1N'),
                                                 user_name: 'batch',
                                                 user_email: args[:email],
                                                 action: 'UPDHOMELOC',
@@ -84,7 +84,7 @@ namespace :webforms do
   task :change_current_location, %i[path_to_file current_lib
                                     new_curloc email comments] => :environment do |_t, args|
     barcodes = IO.read(args[:path_to_file]).split("\n").uniq
-    @uni_updates_batch = UniUpdatesBatch.create(batch_date: Time.current,
+    @uni_updates_batch = UniUpdatesBatch.create(batch_date: Time.zone.now.strftime('%y%m%d%H%M%S%L%1N'),
                                                 user_name: 'batch',
                                                 user_email: args[:email],
                                                 action: 'UPDCURLOC',
@@ -109,7 +109,7 @@ namespace :webforms do
   task :change_item_type, %i[path_to_file current_lib new_itype
                              email comments] => :environment do |_t, args|
     barcodes = IO.read(args[:path_to_file]).split("\n").uniq
-    @uni_updates_batch = UniUpdatesBatch.create(batch_date: Time.current,
+    @uni_updates_batch = UniUpdatesBatch.create(batch_date: Time.zone.now.strftime('%y%m%d%H%M%S%L%1N'),
                                                 user_name: 'batch',
                                                 user_email: args[:email],
                                                 action: 'UPDITEMTYPE',