enju_circulation 0.1.2 → 0.2.0.beta.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.rdoc +3 -3
- data/app/controllers/carrier_type_has_checkout_types_controller.rb +14 -4
- data/app/controllers/checked_items_controller.rb +13 -2
- data/app/controllers/checkins_controller.rb +13 -3
- data/app/controllers/checkout_types_controller.rb +12 -2
- data/app/controllers/checkouts_controller.rb +26 -25
- data/app/controllers/circulation_statuses_controller.rb +11 -1
- data/app/controllers/concerns/enju_circulation/controller.rb +12 -0
- data/app/controllers/demands_controller.rb +12 -2
- data/app/controllers/item_has_use_restrictions_controller.rb +13 -2
- data/app/controllers/lending_policies_controller.rb +18 -4
- data/app/controllers/manifestation_checkout_stats_controller.rb +14 -6
- data/app/controllers/manifestation_reserve_stats_controller.rb +15 -4
- data/app/controllers/reserves_controller.rb +17 -9
- data/app/controllers/use_restrictions_controller.rb +11 -1
- data/app/controllers/user_checkout_stats_controller.rb +14 -4
- data/app/controllers/user_group_has_checkout_types_controller.rb +12 -2
- data/app/controllers/user_reserve_stats_controller.rb +14 -4
- data/app/helpers/items_helper.rb +2 -2
- data/app/jobs/manifestation_checkout_stat_job.rb +7 -0
- data/app/jobs/manifestation_reserve_stat_job.rb +7 -0
- data/app/jobs/user_checkout_stat_job.rb +7 -0
- data/app/jobs/user_reserve_stat_job.rb +7 -0
- data/app/models/checked_item.rb +1 -1
- data/app/models/concerns/enju_circulation/enju_accept.rb +16 -0
- data/app/models/concerns/enju_circulation/enju_basket.rb +30 -0
- data/app/models/concerns/enju_circulation/enju_carrier_type.rb +11 -0
- data/app/models/concerns/enju_circulation/enju_item.rb +157 -0
- data/app/models/concerns/enju_circulation/enju_manifestation.rb +77 -0
- data/app/models/concerns/enju_circulation/enju_profile.rb +13 -0
- data/app/models/concerns/enju_circulation/enju_user.rb +50 -0
- data/app/models/concerns/enju_circulation/enju_user_group.rb +17 -0
- data/app/models/concerns/enju_circulation/enju_withdraw.rb +16 -0
- data/app/models/manifestation_checkout_stat_state_machine.rb +1 -1
- data/app/models/reserve.rb +7 -2
- data/app/policies/carrier_type_has_checkout_type_policy.rb +21 -0
- data/app/policies/checked_item_policy.rb +21 -0
- data/app/policies/checkin_policy.rb +21 -0
- data/app/policies/checkout_policy.rb +39 -0
- data/app/policies/checkout_type_policy.rb +23 -0
- data/app/policies/circulation_status_policy.rb +23 -0
- data/app/policies/demand_policy.rb +21 -0
- data/app/policies/item_has_use_restriction_policy.rb +21 -0
- data/app/policies/item_policy.rb +27 -0
- data/app/policies/lending_policy_policy.rb +21 -0
- data/app/policies/manifestation_checkout_stat_policy.rb +21 -0
- data/app/policies/manifestation_reserve_stat_policy.rb +21 -0
- data/app/policies/reserve_policy.rb +37 -0
- data/app/policies/use_restriction_policy.rb +23 -0
- data/app/policies/user_checkout_stat_policy.rb +21 -0
- data/app/policies/user_group_has_checkout_type_policy.rb +21 -0
- data/app/policies/user_reserve_stat_policy.rb +21 -0
- data/app/views/carrier_type_has_checkout_types/index.html.erb +3 -3
- data/app/views/carrier_type_has_checkout_types/show.html.erb +1 -1
- data/app/views/carrier_types/_carrier_type_has_checkout_type_fields.html.erb +5 -0
- data/app/views/carrier_types/_checkout_form.html.erb +2 -4
- data/app/views/checkout_types/index.html.erb +4 -4
- data/app/views/checkout_types/show.html.erb +2 -2
- data/app/views/checkouts/_index.html.erb +1 -1
- data/app/views/checkouts/_index_overdue.html.erb +4 -5
- data/app/views/checkouts/_index_user.html.erb +5 -5
- data/app/views/checkouts/_list.html.erb +2 -2
- data/app/views/checkouts/_reserved_facet.html.erb +2 -2
- data/app/views/checkouts/edit.html.erb +1 -1
- data/app/views/checkouts/index.html.erb +2 -2
- data/app/views/checkouts/index.rss.builder +2 -2
- data/app/views/checkouts/index.txt.erb +1 -1
- data/app/views/checkouts/show.html.erb +10 -6
- data/app/views/circulation_statuses/index.html.erb +4 -4
- data/app/views/circulation_statuses/show.html.erb +1 -1
- data/app/views/reserves/_state_facet.html.erb +2 -2
- data/app/views/reserves/index.html.erb +6 -4
- data/app/views/reserves/show.html.erb +1 -1
- data/app/views/use_restrictions/index.html.erb +4 -4
- data/app/views/use_restrictions/show.html.erb +1 -1
- data/app/views/user_group_has_checkout_types/index.html.erb +3 -3
- data/app/views/user_group_has_checkout_types/show.html.erb +1 -1
- data/app/views/user_groups/_checkout_form.html.erb +2 -16
- data/app/views/user_groups/_user_group_has_checkout_type_fields.html.erb +14 -0
- data/db/migrate/20160703184619_add_most_recent_to_reserve_transitions.rb +9 -0
- data/db/migrate/20160703184650_add_most_recent_to_manifestation_checkout_stat_transitions.rb +9 -0
- data/db/migrate/20160703184723_add_most_recent_to_manifestation_reserve_stat_transitions.rb +9 -0
- data/db/migrate/20160703184747_add_most_recent_to_user_checkout_stat_transitions.rb +9 -0
- data/db/migrate/20160703184805_add_most_recent_to_user_reserve_stat_transitions.rb +9 -0
- data/db/migrate/20160703190209_add_foreign_key_on_manifestation_id_to_reserve.rb +5 -0
- data/lib/enju_circulation/version.rb +1 -1
- data/lib/enju_circulation.rb +0 -20
- data/lib/generators/enju_circulation/setup/setup_generator.rb +16 -4
- data/lib/tasks/enju_circulation_tasks.rake +1 -1
- data/spec/controllers/carrier_type_has_checkout_types_controller_spec.rb +13 -13
- data/spec/controllers/checked_items_controller_spec.rb +6 -6
- data/spec/controllers/checkins_controller_spec.rb +6 -6
- data/spec/controllers/checkout_types_controller_spec.rb +11 -11
- data/spec/controllers/checkouts_controller_spec.rb +72 -71
- data/spec/controllers/circulation_statuses_controller_spec.rb +12 -12
- data/spec/controllers/item_has_use_restrictions_controller_spec.rb +11 -11
- data/spec/controllers/lending_policies_controller_spec.rb +14 -14
- data/spec/controllers/manifestation_checkout_stats_controller_spec.rb +6 -6
- data/spec/controllers/manifestation_reserve_stats_controller_spec.rb +6 -6
- data/spec/controllers/reserves_controller_spec.rb +5 -5
- data/spec/controllers/use_restrictions_controller_spec.rb +14 -14
- data/spec/controllers/user_checkout_stats_controller_spec.rb +8 -8
- data/spec/controllers/user_group_has_checkout_types_controller_spec.rb +11 -11
- data/spec/controllers/user_reserve_stats_controller_spec.rb +8 -8
- data/spec/dummy/app/assets/javascripts/application.js +1 -0
- data/spec/dummy/app/controllers/application_controller.rb +8 -4
- data/spec/dummy/app/models/user.rb +3 -5
- data/spec/dummy/config/application.rb +6 -37
- data/spec/dummy/config/environments/development.rb +22 -18
- data/spec/dummy/config/environments/production.rb +46 -34
- data/spec/dummy/config/environments/test.rb +19 -14
- data/spec/dummy/config/initializers/enju_leaf.rb +5 -0
- data/spec/dummy/db/migrate/20150924115059_create_withdraws.rb +13 -0
- data/spec/dummy/db/migrate/20151213070943_add_translation_table_to_library_group.rb +13 -0
- data/spec/dummy/db/migrate/20151213072705_add_footer_banner_to_library_group.rb +9 -0
- data/spec/dummy/db/schema.rb +30 -2
- data/spec/fixtures/profiles.yml +1 -1
- data/spec/models/manifestation_checkout_stat_spec.rb +3 -4
- data/spec/models/manifestation_reserve_stat_spec.rb +1 -1
- data/spec/models/user_checkout_stat_spec.rb +1 -1
- data/spec/models/user_reserve_stat_spec.rb +1 -1
- data/spec/support/devise.rb +2 -2
- data/spec/views/checkout_types/index.html.erb_spec.rb +1 -0
- data/spec/views/checkout_types/show.html.erb_spec.rb +1 -0
- data/spec/views/checkouts/index.html.erb_spec.rb +1 -3
- data/spec/views/checkouts/show.html.erb_spec.rb +5 -4
- data/spec/views/profiles/show.html.erb_spec.rb +2 -1
- data/spec/views/reserves/index.html.erb_spec.rb +3 -0
- data/spec/views/use_restrictions/index.html.erb_spec.rb +1 -0
- data/spec/views/use_restrictions/show.html.erb_spec.rb +1 -0
- metadata +147 -38
- data/app/models/enju_circulation/ability.rb +0 -114
- data/app/views/circulation_statuses/show.mobile.erb +0 -24
- data/app/workers/manifestation_checkout_stat_queue.rb +0 -7
- data/app/workers/manifestation_reserve_stat_queue.rb +0 -7
- data/app/workers/user_checkout_stat_queue.rb +0 -7
- data/app/workers/user_reserve_stat_queue.rb +0 -7
- data/lib/enju_circulation/accept.rb +0 -23
- data/lib/enju_circulation/basket.rb +0 -37
- data/lib/enju_circulation/carrier_type.rb +0 -15
- data/lib/enju_circulation/controller.rb +0 -21
- data/lib/enju_circulation/item.rb +0 -166
- data/lib/enju_circulation/manifestation.rb +0 -84
- data/lib/enju_circulation/profile.rb +0 -23
- data/lib/enju_circulation/user.rb +0 -61
- data/lib/enju_circulation/user_group.rb +0 -21
- data/lib/enju_circulation/withdraw.rb +0 -23
- data/spec/dummy/app/models/ability.rb +0 -111
- data/spec/dummy/app/models/local_agent.rb +0 -13
- data/spec/dummy/config/application.yml +0 -42
@@ -1,8 +1,7 @@
|
|
1
|
-
# -*- encoding: utf-8 -*-
|
2
1
|
require 'spec_helper'
|
3
2
|
|
4
3
|
describe "checkouts/show" do
|
5
|
-
fixtures :checkouts, :users, :user_has_roles, :roles
|
4
|
+
fixtures :checkouts, :users, :user_has_roles, :roles, :profiles
|
6
5
|
|
7
6
|
before(:each) do
|
8
7
|
@checkout = assign(:checkout, stub_model(Checkout,
|
@@ -10,14 +9,16 @@ describe "checkouts/show" do
|
|
10
9
|
item_id: 1
|
11
10
|
))
|
12
11
|
assign(:library_group, LibraryGroup.site_config)
|
12
|
+
I18n.locale = :en
|
13
13
|
view.stub(:current_user).and_return(User.where(username: 'enjuadmin').first)
|
14
14
|
end
|
15
15
|
|
16
16
|
it "renders attributes in <p>" do
|
17
|
+
allow(view).to receive(:policy).and_return double(update?: true, destroy?: true)
|
17
18
|
render
|
18
19
|
# Run the generator again with the --webrat flag if you want to use webrat matchers
|
19
|
-
rendered.should match(
|
20
|
+
rendered.should match(/Due date/)
|
20
21
|
# Run the generator again with the --webrat flag if you want to use webrat matchers
|
21
|
-
rendered.should match(
|
22
|
+
rendered.should match(/Item identifier/)
|
22
23
|
end
|
23
24
|
end
|
@@ -10,9 +10,10 @@ describe "profiles/show" do
|
|
10
10
|
end
|
11
11
|
|
12
12
|
it "renders attributes in <p>" do
|
13
|
+
allow(view).to receive(:policy).and_return double(update?: true, destroy?: true)
|
13
14
|
render
|
14
15
|
# Run the generator again with the --webrat flag if you want to use webrat matchers
|
15
|
-
rendered.should match(
|
16
|
+
rendered.should match(/Due date/)
|
16
17
|
# Run the generator again with the --webrat flag if you want to use webrat matchers
|
17
18
|
assert_select "tr:nth-child(2)>td:nth-child(2)", /00014/
|
18
19
|
end
|
@@ -8,9 +8,11 @@ describe "reserves/index" do
|
|
8
8
|
|
9
9
|
assign(:reserves, Reserve.page(1))
|
10
10
|
view.stub(:current_user).and_return(User.where(username: 'enjuadmin').first)
|
11
|
+
view.stub(:params).and_return(ActionController::Parameters.new)
|
11
12
|
end
|
12
13
|
|
13
14
|
it "renders a list of reserves" do
|
15
|
+
allow(view).to receive(:policy).and_return double(create?: true, update?: true, destroy?: true)
|
14
16
|
render
|
15
17
|
# Run the generator again with the --webrat flag if you want to use webrat matchers
|
16
18
|
assert_select "tr>td:nth-child(1)", :text => reserves(:reserve_00001).id.to_s
|
@@ -21,6 +23,7 @@ describe "reserves/index" do
|
|
21
23
|
it "renders a list of reserves when a reserve does not have expired_at" do
|
22
24
|
reserve = FactoryGirl.create(:reserve, :expired_at => nil)
|
23
25
|
assign(:reserves, Reserve.page(2))
|
26
|
+
allow(view).to receive(:policy).and_return double(create?: true, update?: true, destroy?: true)
|
24
27
|
render
|
25
28
|
rendered.should match /<td/
|
26
29
|
end
|
@@ -23,6 +23,7 @@ describe "use_restrictions/index" do
|
|
23
23
|
end
|
24
24
|
|
25
25
|
it "renders a list of use_restrictions" do
|
26
|
+
allow(view).to receive(:policy).and_return double(create?: true, update?: true, destroy?: true)
|
26
27
|
render
|
27
28
|
# Run the generator again with the --webrat flag if you want to use webrat matchers
|
28
29
|
assert_select "tr>td:nth-child(3)", /Not For Loan/
|
@@ -11,6 +11,7 @@ describe "use_restrictions/show" do
|
|
11
11
|
end
|
12
12
|
|
13
13
|
it "renders attributes in <p>" do
|
14
|
+
allow(view).to receive(:policy).and_return double(update?: true)
|
14
15
|
render
|
15
16
|
# Run the generator again with the --webrat flag if you want to use webrat matchers
|
16
17
|
rendered.should match(/Name/)
|
metadata
CHANGED
@@ -1,43 +1,99 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: enju_circulation
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.1
|
4
|
+
version: 0.2.0.beta.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Kosuke Tanabe
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2016-
|
11
|
+
date: 2016-07-31 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
|
-
name:
|
14
|
+
name: enju_event
|
15
15
|
requirement: !ruby/object:Gem::Requirement
|
16
16
|
requirements:
|
17
17
|
- - "~>"
|
18
18
|
- !ruby/object:Gem::Version
|
19
|
-
version:
|
19
|
+
version: 0.2.0.beta.1
|
20
20
|
type: :runtime
|
21
21
|
prerelease: false
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
23
23
|
requirements:
|
24
24
|
- - "~>"
|
25
25
|
- !ruby/object:Gem::Version
|
26
|
-
version:
|
26
|
+
version: 0.2.0.beta.1
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
|
-
name:
|
28
|
+
name: cocoon
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
30
30
|
requirements:
|
31
|
-
- - "
|
31
|
+
- - ">="
|
32
32
|
- !ruby/object:Gem::Version
|
33
|
-
version: 0
|
33
|
+
version: '0'
|
34
34
|
type: :runtime
|
35
35
|
prerelease: false
|
36
|
+
version_requirements: !ruby/object:Gem::Requirement
|
37
|
+
requirements:
|
38
|
+
- - ">="
|
39
|
+
- !ruby/object:Gem::Version
|
40
|
+
version: '0'
|
41
|
+
- !ruby/object:Gem::Dependency
|
42
|
+
name: enju_leaf
|
43
|
+
requirement: !ruby/object:Gem::Requirement
|
44
|
+
requirements:
|
45
|
+
- - "~>"
|
46
|
+
- !ruby/object:Gem::Version
|
47
|
+
version: 1.2.0.beta.1
|
48
|
+
type: :development
|
49
|
+
prerelease: false
|
50
|
+
version_requirements: !ruby/object:Gem::Requirement
|
51
|
+
requirements:
|
52
|
+
- - "~>"
|
53
|
+
- !ruby/object:Gem::Version
|
54
|
+
version: 1.2.0.beta.1
|
55
|
+
- !ruby/object:Gem::Dependency
|
56
|
+
name: enju_library
|
57
|
+
requirement: !ruby/object:Gem::Requirement
|
58
|
+
requirements:
|
59
|
+
- - "~>"
|
60
|
+
- !ruby/object:Gem::Version
|
61
|
+
version: 0.2.0.beta.1
|
62
|
+
type: :development
|
63
|
+
prerelease: false
|
64
|
+
version_requirements: !ruby/object:Gem::Requirement
|
65
|
+
requirements:
|
66
|
+
- - "~>"
|
67
|
+
- !ruby/object:Gem::Version
|
68
|
+
version: 0.2.0.beta.1
|
69
|
+
- !ruby/object:Gem::Dependency
|
70
|
+
name: enju_biblio
|
71
|
+
requirement: !ruby/object:Gem::Requirement
|
72
|
+
requirements:
|
73
|
+
- - "~>"
|
74
|
+
- !ruby/object:Gem::Version
|
75
|
+
version: 0.2.0.beta.1
|
76
|
+
type: :development
|
77
|
+
prerelease: false
|
78
|
+
version_requirements: !ruby/object:Gem::Requirement
|
79
|
+
requirements:
|
80
|
+
- - "~>"
|
81
|
+
- !ruby/object:Gem::Version
|
82
|
+
version: 0.2.0.beta.1
|
83
|
+
- !ruby/object:Gem::Dependency
|
84
|
+
name: enju_manifestation_viewer
|
85
|
+
requirement: !ruby/object:Gem::Requirement
|
86
|
+
requirements:
|
87
|
+
- - "~>"
|
88
|
+
- !ruby/object:Gem::Version
|
89
|
+
version: 0.2.0.beta.1
|
90
|
+
type: :development
|
91
|
+
prerelease: false
|
36
92
|
version_requirements: !ruby/object:Gem::Requirement
|
37
93
|
requirements:
|
38
94
|
- - "~>"
|
39
95
|
- !ruby/object:Gem::Version
|
40
|
-
version: 0.1
|
96
|
+
version: 0.2.0.beta.1
|
41
97
|
- !ruby/object:Gem::Dependency
|
42
98
|
name: sqlite3
|
43
99
|
requirement: !ruby/object:Gem::Requirement
|
@@ -56,16 +112,16 @@ dependencies:
|
|
56
112
|
name: mysql2
|
57
113
|
requirement: !ruby/object:Gem::Requirement
|
58
114
|
requirements:
|
59
|
-
- - "
|
115
|
+
- - ">="
|
60
116
|
- !ruby/object:Gem::Version
|
61
|
-
version: 0
|
117
|
+
version: '0'
|
62
118
|
type: :development
|
63
119
|
prerelease: false
|
64
120
|
version_requirements: !ruby/object:Gem::Requirement
|
65
121
|
requirements:
|
66
|
-
- - "
|
122
|
+
- - ">="
|
67
123
|
- !ruby/object:Gem::Version
|
68
|
-
version: 0
|
124
|
+
version: '0'
|
69
125
|
- !ruby/object:Gem::Dependency
|
70
126
|
name: pg
|
71
127
|
requirement: !ruby/object:Gem::Requirement
|
@@ -179,7 +235,21 @@ dependencies:
|
|
179
235
|
- !ruby/object:Gem::Version
|
180
236
|
version: '0'
|
181
237
|
- !ruby/object:Gem::Dependency
|
182
|
-
name:
|
238
|
+
name: coveralls
|
239
|
+
requirement: !ruby/object:Gem::Requirement
|
240
|
+
requirements:
|
241
|
+
- - ">="
|
242
|
+
- !ruby/object:Gem::Version
|
243
|
+
version: '0'
|
244
|
+
type: :development
|
245
|
+
prerelease: false
|
246
|
+
version_requirements: !ruby/object:Gem::Requirement
|
247
|
+
requirements:
|
248
|
+
- - ">="
|
249
|
+
- !ruby/object:Gem::Version
|
250
|
+
version: '0'
|
251
|
+
- !ruby/object:Gem::Dependency
|
252
|
+
name: redis-rails
|
183
253
|
requirement: !ruby/object:Gem::Requirement
|
184
254
|
requirements:
|
185
255
|
- - ">="
|
@@ -192,6 +262,20 @@ dependencies:
|
|
192
262
|
- - ">="
|
193
263
|
- !ruby/object:Gem::Version
|
194
264
|
version: '0'
|
265
|
+
- !ruby/object:Gem::Dependency
|
266
|
+
name: resque
|
267
|
+
requirement: !ruby/object:Gem::Requirement
|
268
|
+
requirements:
|
269
|
+
- - "~>"
|
270
|
+
- !ruby/object:Gem::Version
|
271
|
+
version: '1.26'
|
272
|
+
type: :development
|
273
|
+
prerelease: false
|
274
|
+
version_requirements: !ruby/object:Gem::Requirement
|
275
|
+
requirements:
|
276
|
+
- - "~>"
|
277
|
+
- !ruby/object:Gem::Version
|
278
|
+
version: '1.26'
|
195
279
|
description: Circulation management for Next-L Enju
|
196
280
|
email:
|
197
281
|
- nabeta@fastmail.fm
|
@@ -208,6 +292,7 @@ files:
|
|
208
292
|
- app/controllers/checkout_types_controller.rb
|
209
293
|
- app/controllers/checkouts_controller.rb
|
210
294
|
- app/controllers/circulation_statuses_controller.rb
|
295
|
+
- app/controllers/concerns/enju_circulation/controller.rb
|
211
296
|
- app/controllers/demands_controller.rb
|
212
297
|
- app/controllers/item_has_use_restrictions_controller.rb
|
213
298
|
- app/controllers/lending_policies_controller.rb
|
@@ -220,6 +305,10 @@ files:
|
|
220
305
|
- app/controllers/user_reserve_stats_controller.rb
|
221
306
|
- app/helpers/items_helper.rb
|
222
307
|
- app/helpers/reserves_helper.rb
|
308
|
+
- app/jobs/manifestation_checkout_stat_job.rb
|
309
|
+
- app/jobs/manifestation_reserve_stat_job.rb
|
310
|
+
- app/jobs/user_checkout_stat_job.rb
|
311
|
+
- app/jobs/user_reserve_stat_job.rb
|
223
312
|
- app/models/carrier_type_has_checkout_type.rb
|
224
313
|
- app/models/checked_item.rb
|
225
314
|
- app/models/checkin.rb
|
@@ -228,8 +317,16 @@ files:
|
|
228
317
|
- app/models/checkout_stat_has_user.rb
|
229
318
|
- app/models/checkout_type.rb
|
230
319
|
- app/models/circulation_status.rb
|
320
|
+
- app/models/concerns/enju_circulation/enju_accept.rb
|
321
|
+
- app/models/concerns/enju_circulation/enju_basket.rb
|
322
|
+
- app/models/concerns/enju_circulation/enju_carrier_type.rb
|
323
|
+
- app/models/concerns/enju_circulation/enju_item.rb
|
324
|
+
- app/models/concerns/enju_circulation/enju_manifestation.rb
|
325
|
+
- app/models/concerns/enju_circulation/enju_profile.rb
|
326
|
+
- app/models/concerns/enju_circulation/enju_user.rb
|
327
|
+
- app/models/concerns/enju_circulation/enju_user_group.rb
|
328
|
+
- app/models/concerns/enju_circulation/enju_withdraw.rb
|
231
329
|
- app/models/demand.rb
|
232
|
-
- app/models/enju_circulation/ability.rb
|
233
330
|
- app/models/item_has_use_restriction.rb
|
234
331
|
- app/models/lending_policy.rb
|
235
332
|
- app/models/manifestation_checkout_stat.rb
|
@@ -251,11 +348,29 @@ files:
|
|
251
348
|
- app/models/user_reserve_stat.rb
|
252
349
|
- app/models/user_reserve_stat_state_machine.rb
|
253
350
|
- app/models/user_reserve_stat_transition.rb
|
351
|
+
- app/policies/carrier_type_has_checkout_type_policy.rb
|
352
|
+
- app/policies/checked_item_policy.rb
|
353
|
+
- app/policies/checkin_policy.rb
|
354
|
+
- app/policies/checkout_policy.rb
|
355
|
+
- app/policies/checkout_type_policy.rb
|
356
|
+
- app/policies/circulation_status_policy.rb
|
357
|
+
- app/policies/demand_policy.rb
|
358
|
+
- app/policies/item_has_use_restriction_policy.rb
|
359
|
+
- app/policies/item_policy.rb
|
360
|
+
- app/policies/lending_policy_policy.rb
|
361
|
+
- app/policies/manifestation_checkout_stat_policy.rb
|
362
|
+
- app/policies/manifestation_reserve_stat_policy.rb
|
363
|
+
- app/policies/reserve_policy.rb
|
364
|
+
- app/policies/use_restriction_policy.rb
|
365
|
+
- app/policies/user_checkout_stat_policy.rb
|
366
|
+
- app/policies/user_group_has_checkout_type_policy.rb
|
367
|
+
- app/policies/user_reserve_stat_policy.rb
|
254
368
|
- app/views/carrier_type_has_checkout_types/_form.html.erb
|
255
369
|
- app/views/carrier_type_has_checkout_types/edit.html.erb
|
256
370
|
- app/views/carrier_type_has_checkout_types/index.html.erb
|
257
371
|
- app/views/carrier_type_has_checkout_types/new.html.erb
|
258
372
|
- app/views/carrier_type_has_checkout_types/show.html.erb
|
373
|
+
- app/views/carrier_types/_carrier_type_has_checkout_type_fields.html.erb
|
259
374
|
- app/views/carrier_types/_checkout_form.html.erb
|
260
375
|
- app/views/checked_items/_checked_item.html.erb
|
261
376
|
- app/views/checked_items/_checkout.html.erb
|
@@ -298,7 +413,6 @@ files:
|
|
298
413
|
- app/views/circulation_statuses/index.html.erb
|
299
414
|
- app/views/circulation_statuses/new.html.erb
|
300
415
|
- app/views/circulation_statuses/show.html.erb
|
301
|
-
- app/views/circulation_statuses/show.mobile.erb
|
302
416
|
- app/views/demands/_form.html.erb
|
303
417
|
- app/views/demands/edit.html.erb
|
304
418
|
- app/views/demands/index.html.erb
|
@@ -360,16 +474,13 @@ files:
|
|
360
474
|
- app/views/user_group_has_checkout_types/new.html.erb
|
361
475
|
- app/views/user_group_has_checkout_types/show.html.erb
|
362
476
|
- app/views/user_groups/_checkout_form.html.erb
|
477
|
+
- app/views/user_groups/_user_group_has_checkout_type_fields.html.erb
|
363
478
|
- app/views/user_reserve_stats/_form.html.erb
|
364
479
|
- app/views/user_reserve_stats/edit.html.erb
|
365
480
|
- app/views/user_reserve_stats/index.html.erb
|
366
481
|
- app/views/user_reserve_stats/new.html.erb
|
367
482
|
- app/views/user_reserve_stats/show.html.erb
|
368
483
|
- app/views/user_reserve_stats/show.txt.erb
|
369
|
-
- app/workers/manifestation_checkout_stat_queue.rb
|
370
|
-
- app/workers/manifestation_reserve_stat_queue.rb
|
371
|
-
- app/workers/user_checkout_stat_queue.rb
|
372
|
-
- app/workers/user_reserve_stat_queue.rb
|
373
484
|
- config/initializers/inflections.rb
|
374
485
|
- config/locales/enju_en.yml
|
375
486
|
- config/locales/enju_ja.yml
|
@@ -418,20 +529,16 @@ files:
|
|
418
529
|
- db/migrate/20141014065831_add_shelf_id_to_checkout.rb
|
419
530
|
- db/migrate/20141020120523_add_library_id_to_checkout.rb
|
420
531
|
- db/migrate/20150106001709_create_demands.rb
|
532
|
+
- db/migrate/20160703184619_add_most_recent_to_reserve_transitions.rb
|
533
|
+
- db/migrate/20160703184650_add_most_recent_to_manifestation_checkout_stat_transitions.rb
|
534
|
+
- db/migrate/20160703184723_add_most_recent_to_manifestation_reserve_stat_transitions.rb
|
535
|
+
- db/migrate/20160703184747_add_most_recent_to_user_checkout_stat_transitions.rb
|
536
|
+
- db/migrate/20160703184805_add_most_recent_to_user_reserve_stat_transitions.rb
|
537
|
+
- db/migrate/20160703190209_add_foreign_key_on_manifestation_id_to_reserve.rb
|
421
538
|
- lib/enju_circulation.rb
|
422
|
-
- lib/enju_circulation/accept.rb
|
423
|
-
- lib/enju_circulation/basket.rb
|
424
|
-
- lib/enju_circulation/carrier_type.rb
|
425
|
-
- lib/enju_circulation/controller.rb
|
426
539
|
- lib/enju_circulation/engine.rb
|
427
540
|
- lib/enju_circulation/helper.rb
|
428
|
-
- lib/enju_circulation/item.rb
|
429
|
-
- lib/enju_circulation/manifestation.rb
|
430
|
-
- lib/enju_circulation/profile.rb
|
431
|
-
- lib/enju_circulation/user.rb
|
432
|
-
- lib/enju_circulation/user_group.rb
|
433
541
|
- lib/enju_circulation/version.rb
|
434
|
-
- lib/enju_circulation/withdraw.rb
|
435
542
|
- lib/generators/enju_circulation/setup/USAGE
|
436
543
|
- lib/generators/enju_circulation/setup/setup_generator.rb
|
437
544
|
- lib/generators/enju_circulation/setup/templates/config/schedule.rb
|
@@ -465,8 +572,6 @@ files:
|
|
465
572
|
- spec/dummy/app/assets/stylesheets/application.css
|
466
573
|
- spec/dummy/app/controllers/application_controller.rb
|
467
574
|
- spec/dummy/app/helpers/application_helper.rb
|
468
|
-
- spec/dummy/app/models/ability.rb
|
469
|
-
- spec/dummy/app/models/local_agent.rb
|
470
575
|
- spec/dummy/app/models/user.rb
|
471
576
|
- spec/dummy/app/views/layouts/application.html.erb
|
472
577
|
- spec/dummy/bin/bundle
|
@@ -475,7 +580,6 @@ files:
|
|
475
580
|
- spec/dummy/bin/setup
|
476
581
|
- spec/dummy/config.ru
|
477
582
|
- spec/dummy/config/application.rb
|
478
|
-
- spec/dummy/config/application.yml
|
479
583
|
- spec/dummy/config/boot.rb
|
480
584
|
- spec/dummy/config/database.yml
|
481
585
|
- spec/dummy/config/environment.rb
|
@@ -485,6 +589,7 @@ files:
|
|
485
589
|
- spec/dummy/config/initializers/assets.rb
|
486
590
|
- spec/dummy/config/initializers/backtrace_silencers.rb
|
487
591
|
- spec/dummy/config/initializers/devise.rb
|
592
|
+
- spec/dummy/config/initializers/enju_leaf.rb
|
488
593
|
- spec/dummy/config/initializers/friendly_id.rb
|
489
594
|
- spec/dummy/config/initializers/inflections.rb
|
490
595
|
- spec/dummy/config/initializers/mime_types.rb
|
@@ -648,6 +753,9 @@ files:
|
|
648
753
|
- spec/dummy/db/migrate/20141003181336_add_full_name_transcription_to_profile.rb
|
649
754
|
- spec/dummy/db/migrate/20141003182825_add_date_of_birth_to_profile.rb
|
650
755
|
- spec/dummy/db/migrate/20150221063719_add_settings_to_library_group.rb
|
756
|
+
- spec/dummy/db/migrate/20150924115059_create_withdraws.rb
|
757
|
+
- spec/dummy/db/migrate/20151213070943_add_translation_table_to_library_group.rb
|
758
|
+
- spec/dummy/db/migrate/20151213072705_add_footer_banner_to_library_group.rb
|
651
759
|
- spec/dummy/db/schema.rb
|
652
760
|
- spec/dummy/public/404.html
|
653
761
|
- spec/dummy/public/422.html
|
@@ -773,9 +881,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
773
881
|
version: '0'
|
774
882
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
775
883
|
requirements:
|
776
|
-
- - "
|
884
|
+
- - ">"
|
777
885
|
- !ruby/object:Gem::Version
|
778
|
-
version:
|
886
|
+
version: 1.3.1
|
779
887
|
requirements: []
|
780
888
|
rubyforge_project:
|
781
889
|
rubygems_version: 2.5.1
|
@@ -802,8 +910,6 @@ test_files:
|
|
802
910
|
- spec/dummy/app/assets/stylesheets/application.css
|
803
911
|
- spec/dummy/app/controllers/application_controller.rb
|
804
912
|
- spec/dummy/app/helpers/application_helper.rb
|
805
|
-
- spec/dummy/app/models/ability.rb
|
806
|
-
- spec/dummy/app/models/local_agent.rb
|
807
913
|
- spec/dummy/app/models/user.rb
|
808
914
|
- spec/dummy/app/views/layouts/application.html.erb
|
809
915
|
- spec/dummy/bin/bundle
|
@@ -811,7 +917,6 @@ test_files:
|
|
811
917
|
- spec/dummy/bin/rake
|
812
918
|
- spec/dummy/bin/setup
|
813
919
|
- spec/dummy/config/application.rb
|
814
|
-
- spec/dummy/config/application.yml
|
815
920
|
- spec/dummy/config/boot.rb
|
816
921
|
- spec/dummy/config/database.yml
|
817
922
|
- spec/dummy/config/environment.rb
|
@@ -821,6 +926,7 @@ test_files:
|
|
821
926
|
- spec/dummy/config/initializers/assets.rb
|
822
927
|
- spec/dummy/config/initializers/backtrace_silencers.rb
|
823
928
|
- spec/dummy/config/initializers/devise.rb
|
929
|
+
- spec/dummy/config/initializers/enju_leaf.rb
|
824
930
|
- spec/dummy/config/initializers/friendly_id.rb
|
825
931
|
- spec/dummy/config/initializers/inflections.rb
|
826
932
|
- spec/dummy/config/initializers/mime_types.rb
|
@@ -985,6 +1091,9 @@ test_files:
|
|
985
1091
|
- spec/dummy/db/migrate/20141003181336_add_full_name_transcription_to_profile.rb
|
986
1092
|
- spec/dummy/db/migrate/20141003182825_add_date_of_birth_to_profile.rb
|
987
1093
|
- spec/dummy/db/migrate/20150221063719_add_settings_to_library_group.rb
|
1094
|
+
- spec/dummy/db/migrate/20150924115059_create_withdraws.rb
|
1095
|
+
- spec/dummy/db/migrate/20151213070943_add_translation_table_to_library_group.rb
|
1096
|
+
- spec/dummy/db/migrate/20151213072705_add_footer_banner_to_library_group.rb
|
988
1097
|
- spec/dummy/db/schema.rb
|
989
1098
|
- spec/dummy/public/404.html
|
990
1099
|
- spec/dummy/public/422.html
|
@@ -1,114 +0,0 @@
|
|
1
|
-
module EnjuCirculation
|
2
|
-
class Ability
|
3
|
-
include CanCan::Ability
|
4
|
-
|
5
|
-
def initialize(user, ip_address = nil)
|
6
|
-
case user.try(:role).try(:name)
|
7
|
-
when 'Administrator'
|
8
|
-
can [:destroy, :delete], Manifestation do |manifestation|
|
9
|
-
manifestation.items.empty? and !manifestation.series_master? and !manifestation.is_reserved?
|
10
|
-
end
|
11
|
-
can [:destroy, :delete], Item do |item|
|
12
|
-
true if item.removable?
|
13
|
-
end
|
14
|
-
can :manage, [
|
15
|
-
Basket,
|
16
|
-
CarrierTypeHasCheckoutType,
|
17
|
-
CheckedItem,
|
18
|
-
Checkin,
|
19
|
-
CheckoutStatHasManifestation,
|
20
|
-
CheckoutStatHasUser,
|
21
|
-
Demand,
|
22
|
-
ItemHasUseRestriction,
|
23
|
-
ManifestationCheckoutStat,
|
24
|
-
ManifestationReserveStat,
|
25
|
-
ReserveStatHasManifestation,
|
26
|
-
ReserveStatHasUser,
|
27
|
-
UserCheckoutStat,
|
28
|
-
UserGroupHasCheckoutType,
|
29
|
-
UserReserveStat
|
30
|
-
]
|
31
|
-
can [:read, :create, :update], CheckoutType
|
32
|
-
can [:destroy, :delete], CheckoutType do |checkout_type|
|
33
|
-
true if checkout_type.items.empty?
|
34
|
-
end
|
35
|
-
can [:read, :create, :update, :remove_all], Checkout
|
36
|
-
can [:destroy, :delete], Checkout do |checkout|
|
37
|
-
checkout.checkin
|
38
|
-
end
|
39
|
-
can [:read, :create, :update], Reserve
|
40
|
-
can [:destroy, :delete], Reserve do |reserve|
|
41
|
-
true unless reserve.retained?
|
42
|
-
end
|
43
|
-
can [:read, :update], [
|
44
|
-
CirculationStatus,
|
45
|
-
LendingPolicy,
|
46
|
-
UseRestriction
|
47
|
-
]
|
48
|
-
can [:destroy, :delete], LendingPolicy
|
49
|
-
when 'Librarian'
|
50
|
-
can [:destroy, :delete], Item do |item|
|
51
|
-
true if item.removable?
|
52
|
-
end
|
53
|
-
can [:destroy, :delete], Manifestation do |manifestation|
|
54
|
-
manifestation.items.empty? and !manifestation.series_master? and !manifestation.is_reserved?
|
55
|
-
end
|
56
|
-
can :manage, [
|
57
|
-
Basket,
|
58
|
-
CheckedItem,
|
59
|
-
Checkin,
|
60
|
-
Demand,
|
61
|
-
ManifestationCheckoutStat,
|
62
|
-
ManifestationReserveStat,
|
63
|
-
Reserve
|
64
|
-
]
|
65
|
-
can [:read, :create, :update, :remove_all], Checkout
|
66
|
-
can [:destroy, :delete], Checkout do |checkout|
|
67
|
-
checkout.checkin
|
68
|
-
end
|
69
|
-
can [:read, :create, :update], UserCheckoutStat
|
70
|
-
can [:read, :create, :update], UserReserveStat
|
71
|
-
can :read, [
|
72
|
-
CarrierTypeHasCheckoutType,
|
73
|
-
CheckoutType,
|
74
|
-
CheckoutStatHasManifestation,
|
75
|
-
CheckoutStatHasUser,
|
76
|
-
CirculationStatus,
|
77
|
-
ItemHasUseRestriction,
|
78
|
-
LendingPolicy,
|
79
|
-
ReserveStatHasManifestation,
|
80
|
-
ReserveStatHasUser,
|
81
|
-
UseRestriction,
|
82
|
-
UserGroupHasCheckoutType
|
83
|
-
]
|
84
|
-
when 'User'
|
85
|
-
can [:index, :create, :remove_all], Checkout
|
86
|
-
can [:show, :update], Checkout do |checkout|
|
87
|
-
checkout.user == user
|
88
|
-
end
|
89
|
-
can [:destroy, :delete], Checkout do |checkout|
|
90
|
-
checkout.user == user && checkout.checkin
|
91
|
-
end
|
92
|
-
can :index, Reserve
|
93
|
-
can :create, Reserve do |reserve|
|
94
|
-
user.profile.user_number.try(:present?)
|
95
|
-
end
|
96
|
-
can [:show, :update, :destroy, :delete], Reserve do |reserve|
|
97
|
-
reserve.user == user
|
98
|
-
end
|
99
|
-
can :read, [
|
100
|
-
CirculationStatus,
|
101
|
-
ManifestationCheckoutStat,
|
102
|
-
ManifestationReserveStat
|
103
|
-
]
|
104
|
-
else
|
105
|
-
can :index, Checkout
|
106
|
-
can :read, [
|
107
|
-
CirculationStatus,
|
108
|
-
ManifestationCheckoutStat,
|
109
|
-
ManifestationReserveStat
|
110
|
-
]
|
111
|
-
end
|
112
|
-
end
|
113
|
-
end
|
114
|
-
end
|
@@ -1,24 +0,0 @@
|
|
1
|
-
<div data-role="header">
|
2
|
-
<a href="javascript:history.back()" data-icon="back" data-iconpos="notext" class="ui-btn-left"><%= t('page.back') %></a>
|
3
|
-
<h1 class="title"><%= t('page.showing', model: t('activerecord.models.item')) -%></h1>
|
4
|
-
</div>
|
5
|
-
<div data-role="content">
|
6
|
-
<div id="detail">
|
7
|
-
<p id="notice"><%= notice %></p>
|
8
|
-
|
9
|
-
<p>
|
10
|
-
<strong><%= t('activerecord.attributes.circulation_status.name') -%>:</strong>
|
11
|
-
<%= @circulation_status.name -%>
|
12
|
-
</p>
|
13
|
-
|
14
|
-
<p>
|
15
|
-
<strong><%= t('activerecord.attributes.circulation_status.display_name') -%>:</strong>
|
16
|
-
<%= @circulation_status.display_name.localize -%>
|
17
|
-
</p>
|
18
|
-
|
19
|
-
<p>
|
20
|
-
<strong><%= t('activerecord.attributes.circulation_status.note') -%>:</strong>
|
21
|
-
<%= @circulation_status.note -%>
|
22
|
-
</p>
|
23
|
-
</div>
|
24
|
-
</div>
|
@@ -1,23 +0,0 @@
|
|
1
|
-
module EnjuCirculation
|
2
|
-
module EnjuAccept
|
3
|
-
def self.included(base)
|
4
|
-
base.extend ClassMethods
|
5
|
-
end
|
6
|
-
|
7
|
-
module ClassMethods
|
8
|
-
def enju_circulation_accept_model
|
9
|
-
include InstanceMethods
|
10
|
-
before_save :accept!, on: :create
|
11
|
-
end
|
12
|
-
end
|
13
|
-
|
14
|
-
module InstanceMethods
|
15
|
-
def accept!
|
16
|
-
circulation_status = CirculationStatus.where(name: 'Available On Shelf').first
|
17
|
-
item.update_column(:circulation_status_id, circulation_status.id) if circulation_status
|
18
|
-
use_restriction = UseRestriction.where(name: 'Limited Circulation, Normal Loan Period').first
|
19
|
-
item.use_restriction = use_restriction if use_restriction
|
20
|
-
end
|
21
|
-
end
|
22
|
-
end
|
23
|
-
end
|