diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index b9fd256..64077c4 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -13,4 +13,5 @@ //= require jquery3 //= require rails-ujs //= require datatables +//= require bootstrap //= require_tree . diff --git a/app/assets/javascripts/reserves.js b/app/assets/javascripts/reserves.js index a458795..121e874 100644 --- a/app/assets/javascripts/reserves.js +++ b/app/assets/javascripts/reserves.js @@ -1,5 +1,11 @@ // Things that need to document to be loaded to do. $(document).ready(function(){ + $('#collapsePrint').on('show.bs.collapse', function() { + $('[data-target="#collapsePrint"] input[type="checkbox"]').prop( "checked", false ); + }) + $('#collapsePrint').on('hide.bs.collapse', function() { + $('[data-target="#collapsePrint"] input[type="checkbox"]').prop( "checked", true ); + }) $('#sw_url').on('keypress', function(e) { if (e.keyCode == 13) { e.preventDefault(); diff --git a/app/models/reserve_item.rb b/app/models/reserve_item.rb index 4e2fb35..06aad18 100644 --- a/app/models/reserve_item.rb +++ b/app/models/reserve_item.rb @@ -5,7 +5,7 @@ class ReserveItem include ActiveModel::Model - attr_accessor :title, :imprint, :ckey, :media, :online, :comment, :digital_type, :copies, :personal, :loan_period, :required + attr_accessor :title, :imprint, :ckey, :media, :online, :comment, :digital_type, :copies, :personal, :loan_period, :required, :print_needed def copies return @copies.presence.to_i if @copies.present? @@ -14,6 +14,10 @@ def copies 1 end + def print_needed + ActiveModel::Type::Boolean.new.cast(@print_needed) + end + def online? ActiveModel::Type::Boolean.new.cast(online) end diff --git a/app/views/reserves/_reserves_item.html.erb b/app/views/reserves/_reserves_item.html.erb index 03e360d..734afb4 100644 --- a/app/views/reserves/_reserves_item.html.erb +++ b/app/views/reserves/_reserves_item.html.erb @@ -30,27 +30,38 @@