enju_circulation 0.3.5 → 0.3.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/README.md +4 -8
- data/app/controllers/user_group_has_checkout_types_controller.rb +1 -1
- data/app/models/checked_item.rb +1 -1
- data/app/views/manifestations/_circulation_status.html.erb +1 -1
- data/app/views/user_group_has_checkout_types/edit.html.erb +2 -2
- data/app/views/user_group_has_checkout_types/new.html.erb +2 -2
- data/app/views/user_group_has_checkout_types/show.html.erb +2 -2
- data/app/views/user_groups/_user_group_has_checkout_type_fields.html.erb +2 -2
- data/config/locales/translation_en.yml +2 -1
- data/config/locales/translation_ja.yml +2 -1
- data/lib/enju_circulation/version.rb +1 -1
- data/spec/system/user_group_has_checkout_types.rb +14 -0
- metadata +4 -6
- data/spec/dummy/private/system/carrier_types/attachments/000/000/001/original/book.png +0 -0
- data/spec/dummy/private/system/carrier_types/attachments/000/000/001/thumb/book.png +0 -0
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: d49cd3e266a1dfe580a83e9b82e41b4581cda8a3ec7d726c29821e855f635740
|
|
4
|
+
data.tar.gz: 064d69bb9eabbd9beb87d731adcd0a9ff054bcb21cb2d4ae50ca5a56dffc8761
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: a19ae780a2148b722c51b29d9406775525ccaffcb303d15a6789f8bdcd42563c4e3d4adacd8c9ebebf248db187e619219c271a5a5a7135ea3b0bfc9e7bbd1afd
|
|
7
|
+
data.tar.gz: cd2fa9b9572b89b8a71bf83daa872592914834e7883d7412584c18202063e7e4d4835685d87fcc1b9ba4467622de0f484041e25971081f462e93bf0574508e27
|
data/README.md
CHANGED
|
@@ -1,14 +1,10 @@
|
|
|
1
1
|
# EnjuCirculation
|
|
2
|
-
[
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
ervice=github" alt="Coverage Status"
|
|
6
|
-
/>](https://coveralls.io/github/next-l/enju_circulation?branch=1.3) [<img
|
|
7
|
-
src="https://hakiri.io/github/next-l/enju_circulation/1.3.svg" alt="security"
|
|
8
|
-
/>](https://hakiri.io/github/next-l/enju_circulation/1.3)
|
|
2
|
+
[](https://travis-ci.com/next-l/enju_circulation)
|
|
3
|
+
[](https://coveralls.io/github/next-l/enju_circulation?branch=1.3)
|
|
4
|
+
[](https://hakiri.io/github/next-l/enju_circulation/1.3)
|
|
9
5
|
|
|
10
6
|
This project rocks and uses MIT-LICENSE.
|
|
11
7
|
|
|
12
8
|
## 製作者・貢献者 (Authors and contributors)
|
|
13
9
|
* [TANABE, Kosuke](https://github.com/nabeta) ([@nabeta](https://twitter.com/nabeta))
|
|
14
|
-
*
|
|
10
|
+
* [Project Next-L](https://www.next-l.jp) ([@ProjectNextL](https://twitter.com/ProjectNextL))
|
|
@@ -101,7 +101,7 @@ class UserGroupHasCheckoutTypesController < ApplicationController
|
|
|
101
101
|
:user_group_id, :checkout_type_id,
|
|
102
102
|
:checkout_limit, :checkout_period, :checkout_renewal_limit,
|
|
103
103
|
:reservation_limit, :reservation_expired_period,
|
|
104
|
-
:
|
|
104
|
+
:set_due_date_before_closing_day, :fixed_due_date, :note, :position,
|
|
105
105
|
:user_group, :checkout_type
|
|
106
106
|
)
|
|
107
107
|
end
|
data/app/models/checked_item.rb
CHANGED
|
@@ -94,7 +94,7 @@ class CheckedItem < ApplicationRecord
|
|
|
94
94
|
end
|
|
95
95
|
# 返却期限日が閉館日の場合
|
|
96
96
|
while item.shelf.library.closed?(due_date)
|
|
97
|
-
if item_checkout_type.
|
|
97
|
+
if item_checkout_type.set_due_date_before_closing_day
|
|
98
98
|
self.due_date = due_date.yesterday.end_of_day
|
|
99
99
|
else
|
|
100
100
|
self.due_date = due_date.tomorrow.end_of_day
|
|
@@ -34,8 +34,8 @@
|
|
|
34
34
|
</div>
|
|
35
35
|
|
|
36
36
|
<div class="field">
|
|
37
|
-
<%= f.label :
|
|
38
|
-
<%= f.check_box :
|
|
37
|
+
<%= f.label :set_due_date_before_closing_day -%>
|
|
38
|
+
<%= f.check_box :set_due_date_before_closing_day -%>
|
|
39
39
|
</div>
|
|
40
40
|
|
|
41
41
|
<div class="field">
|
|
@@ -34,8 +34,8 @@
|
|
|
34
34
|
</div>
|
|
35
35
|
|
|
36
36
|
<div class="field">
|
|
37
|
-
<%= f.label :
|
|
38
|
-
<%= f.check_box :
|
|
37
|
+
<%= f.label :set_due_date_before_closing_day -%>
|
|
38
|
+
<%= f.check_box :set_due_date_before_closing_day -%>
|
|
39
39
|
</div>
|
|
40
40
|
|
|
41
41
|
<div class="field">
|
|
@@ -39,8 +39,8 @@
|
|
|
39
39
|
</p>
|
|
40
40
|
|
|
41
41
|
<p>
|
|
42
|
-
<strong><%= t('activerecord.attributes.user_group_has_checkout_type.
|
|
43
|
-
<%= localized_boolean(@user_group_has_checkout_type.
|
|
42
|
+
<strong><%= t('activerecord.attributes.user_group_has_checkout_type.set_due_date_before_closing_day') -%>:</strong>
|
|
43
|
+
<%= localized_boolean(@user_group_has_checkout_type.set_due_date_before_closing_day) -%>
|
|
44
44
|
</p>
|
|
45
45
|
|
|
46
46
|
<p>
|
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
<br />
|
|
9
9
|
<%= f.label :reservation_limit -%>
|
|
10
10
|
<%= f.text_field :reservation_limit, class: 'resource_integer' %>
|
|
11
|
-
<%= f.label :
|
|
12
|
-
<%= f.check_box :
|
|
11
|
+
<%= f.label :set_due_date_before_closing_day -%>
|
|
12
|
+
<%= f.check_box :set_due_date_before_closing_day %>
|
|
13
13
|
<%= link_to_remove_association t('page.remove'), f, data: {confirm: t('page.are_you_sure')} %>
|
|
14
14
|
</div>
|
|
@@ -32,6 +32,7 @@ en:
|
|
|
32
32
|
lock_version: Lock version
|
|
33
33
|
checked_item:
|
|
34
34
|
due_date: Due date
|
|
35
|
+
item: Item
|
|
35
36
|
checkin:
|
|
36
37
|
item_id: Item
|
|
37
38
|
checkout:
|
|
@@ -72,7 +73,7 @@ en:
|
|
|
72
73
|
checkout_renewal_limit: Checkout renewal limit
|
|
73
74
|
reservation_limit: Reservation limit
|
|
74
75
|
reservation_expired_period: Reservation expired period
|
|
75
|
-
|
|
76
|
+
set_due_date_before_closing_day: Set due date before the closing day
|
|
76
77
|
fixed_due_date: Fixed due date
|
|
77
78
|
note: Note
|
|
78
79
|
position: Position
|
|
@@ -30,6 +30,7 @@ ja:
|
|
|
30
30
|
lock_version: ロックバージョン
|
|
31
31
|
checked_item:
|
|
32
32
|
due_date: 返却期限
|
|
33
|
+
item: 個別資料
|
|
33
34
|
checkin:
|
|
34
35
|
item_id: 個別資料
|
|
35
36
|
checkout:
|
|
@@ -70,7 +71,7 @@ ja:
|
|
|
70
71
|
checkout_renewal_limit: 貸出更新回数の上限
|
|
71
72
|
reservation_limit: 予約数の上限
|
|
72
73
|
reservation_expired_period: 予約の期限切れまでの期間
|
|
73
|
-
|
|
74
|
+
set_due_date_before_closing_day: 返却日を閉館日の前日にする
|
|
74
75
|
fixed_due_date: 固定貸出期限
|
|
75
76
|
note: 注記
|
|
76
77
|
position: 位置
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
require 'rails_helper'
|
|
2
|
+
|
|
3
|
+
RSpec.describe 'UserGroupHasCheckoutType', type: :system do
|
|
4
|
+
include Devise::Test::IntegrationHelpers
|
|
5
|
+
fixtures :all
|
|
6
|
+
|
|
7
|
+
describe 'When logged in as Librarian' do
|
|
8
|
+
it 'should render' do
|
|
9
|
+
sign_in users(:librarian1)
|
|
10
|
+
visit edit_user_group_has_checkout_path(user_group_has_checkout_types(:user_group_has_checkout_type_00001))
|
|
11
|
+
expect(page).to have_field :user_group_id
|
|
12
|
+
end
|
|
13
|
+
end
|
|
14
|
+
end
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: enju_circulation
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.3.
|
|
4
|
+
version: 0.3.6
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Kosuke Tanabe
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2019-08-
|
|
11
|
+
date: 2019-08-18 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: enju_biblio
|
|
@@ -821,8 +821,6 @@ files:
|
|
|
821
821
|
- spec/dummy/db/migrate/20180107161347_add_constraints_to_most_recent_for_resource_export_file_transitions.rb
|
|
822
822
|
- spec/dummy/db/migrate/20180107161410_add_constraints_to_most_recent_for_import_request_transitions.rb
|
|
823
823
|
- spec/dummy/db/schema.rb
|
|
824
|
-
- spec/dummy/private/system/carrier_types/attachments/000/000/001/original/book.png
|
|
825
|
-
- spec/dummy/private/system/carrier_types/attachments/000/000/001/thumb/book.png
|
|
826
824
|
- spec/dummy/public/404.html
|
|
827
825
|
- spec/dummy/public/422.html
|
|
828
826
|
- spec/dummy/public/500.html
|
|
@@ -938,6 +936,7 @@ files:
|
|
|
938
936
|
- spec/system/checkouts_spec.rb
|
|
939
937
|
- spec/system/manifestations_spec.rb
|
|
940
938
|
- spec/system/reserves_spec.rb
|
|
939
|
+
- spec/system/user_group_has_checkout_types.rb
|
|
941
940
|
- spec/tasks/export_checkout_spec.rb
|
|
942
941
|
- spec/views/checked_items/new.html.erb_spec.rb
|
|
943
942
|
- spec/views/checkout_types/edit.html.erb_spec.rb
|
|
@@ -1033,8 +1032,6 @@ test_files:
|
|
|
1033
1032
|
- spec/dummy/public/422.html
|
|
1034
1033
|
- spec/dummy/public/500.html
|
|
1035
1034
|
- spec/dummy/public/404.html
|
|
1036
|
-
- spec/dummy/private/system/carrier_types/attachments/000/000/001/original/book.png
|
|
1037
|
-
- spec/dummy/private/system/carrier_types/attachments/000/000/001/thumb/book.png
|
|
1038
1035
|
- spec/dummy/db/schema.rb
|
|
1039
1036
|
- spec/dummy/db/migrate/20170305064014_add_csv_charset_conversion_to_library_group.rb
|
|
1040
1037
|
- spec/dummy/db/migrate/20180107161347_add_constraints_to_most_recent_for_resource_export_file_transitions.rb
|
|
@@ -1248,6 +1245,7 @@ test_files:
|
|
|
1248
1245
|
- spec/models/user_spec.rb
|
|
1249
1246
|
- spec/models/basket_spec.rb
|
|
1250
1247
|
- spec/policies/manifestation_policy_spec.rb
|
|
1248
|
+
- spec/system/user_group_has_checkout_types.rb
|
|
1251
1249
|
- spec/system/manifestations_spec.rb
|
|
1252
1250
|
- spec/system/checkouts_spec.rb
|
|
1253
1251
|
- spec/system/reserves_spec.rb
|
|
Binary file
|