enju_circulation 0.0.23 → 0.0.24

Sign up to get free protection for your applications and to get access to all the features.
Files changed (9) hide show
  1. data/app/views/checkouts/_index.html.erb +9 -6
  2. data/app/views/checkouts/_index_user.html.erb +20 -9
  3. data/app/views/checkouts/index.ics.erb +4 -3
  4. data/config/locales/translation_en.yml +1 -0
  5. data/config/locales/translation_ja.yml +3 -2
  6. data/lib/enju_circulation/version.rb +1 -1
  7. data/spec/dummy/db/development.sqlite3 +0 -0
  8. data/spec/dummy/db/test.sqlite3 +0 -0
  9. metadata +42 -40
data/app/views/checkouts/_index.html.erb CHANGED
@@ -12,12 +12,15 @@
12
12
 
13
13
  <div id="submenu" class="ui-corner-all">
14
14
  <ul>
15
+ <li><%= link_to t('checkout.my_checkout'), user_checkouts_path(current_user) -%></li>
15
16
  <li><%= link_to t('page.overdue'), checkouts_path(:view => 'overdue') -%></li>
17
+ <li>
18
+ <%= link_to 'RSS', checkouts_path(:format => :rss) -%>
19
+ <%= link_to (image_tag 'icons/feed.png', :size => '16x16', :alt => 'RSS', :class => 'icon'), checkouts_path(:format => :rss) -%>
20
+ </li>
21
+ <li>
22
+ <%= link_to 'CSV', checkouts_path(:format => :csv, :locale => @locale.to_s) -%>
23
+ <%= link_to (image_tag 'icons/page_white_excel.png', :size => '16x16', :alt => 'CSV', :class => 'icon'), checkouts_path(:format => :csv, :locale => @locale.to_s) -%>
24
+ </li>
16
25
  </ul>
17
- <p>
18
- <%= link_to (image_tag 'icons/feed.png', :size => '16x16', :alt => 'RSS', :class => 'icon'), checkouts_path(:format => :rss) -%>
19
- (<%= link_to 'RSS', checkouts_path(:format => :rss) -%>)
20
- <%= link_to (image_tag 'icons/page_white_excel.png', :size => '16x16', :alt => 'CSV', :class => 'icon'), checkouts_path(:format => :csv, :locale => @locale.to_s) -%>
21
- (<%= link_to 'CSV', checkouts_path(:format => :csv, :locale => @locale.to_s) -%>)
22
- </p>
23
26
  </div>
data/app/views/checkouts/_index_user.html.erb CHANGED
@@ -26,18 +26,29 @@
26
26
  <li><%= link_to t('checkout.all_checkout'), checkouts_path -%></li>
27
27
  <%- end -%>
28
28
  <% if current_user.checkout_icalendar_token? %>
29
- <li><%= link_to 'iCalendar', checkouts_path(:icalendar_token => user.checkout_icalendar_token, :format => :ics) -%></li>
29
+ <li>
30
+ <%= link_to 'iCalendar', checkouts_path(:icalendar_token => user.checkout_icalendar_token, :format => :ics) -%>
31
+ <%= link_to (image_tag 'icons/date.png', :size => '16x16', :alt => 'iCalendar', :class => 'icon'), user_checkouts_path(user, :format => :ics) -%>
32
+ </li>
30
33
  <% end %>
31
- </ul>
32
- <p>
33
34
  <%- if params[:view] == 'overdue' -%>
34
- <%= link_to (image_tag 'icons/feed.png', :size => '16x16', :alt => 'RSS', :class => 'icon'), user_checkouts_path(user, :format => :rss, :view => 'overdue') -%>
35
- (<%= link_to 'RSS', user_checkouts_path(user, :format => :rss, :view => 'overdue') -%>)
36
- (<%= link_to 'CSV', user_checkouts_path(user, :format => :csv, :view => 'overdue', :locale => @locale.to_s) -%>)
35
+ <li>
36
+ <%= link_to 'RSS', checkouts_path(:format => :rss, :view => 'overdue') -%>
37
+ <%= link_to (image_tag 'icons/feed.png', :size => '16x16', :alt => 'RSS', :class => 'icon'), user_checkouts_path(user, :format => :rss, :view => 'overdue') -%>
38
+ </li>
39
+ <li>
40
+ <%= link_to 'CSV', checkouts_path(:format => :csv, :view => 'overdue', :locale => @locale.to_s) -%>
41
+ <%= link_to (image_tag 'icons/page_white_excel.png', :size => '16x16', :alt => 'CSV', :class => 'icon'), user_checkouts_path(user, :format => :csv, :view => 'overdue', :locale => @locale.to_s) -%>
42
+ </li>
37
43
  <%- else -%>
38
- <%= link_to (image_tag 'icons/feed.png', :size => '16x16', :alt => 'RSS', :class => 'icon'), user_checkouts_path(user, :format => :rss) -%>
39
- (<%= link_to 'RSS', user_checkouts_path(user, :format => :rss) -%>)
40
- (<%= link_to 'CSV', user_checkouts_path(user, :format => :csv, :locale => @locale.to_s) -%>)
44
+ <li>
45
+ <%= link_to 'RSS', checkouts_path(:format => :rss) -%>
46
+ <%= link_to (image_tag 'icons/feed.png', :size => '16x16', :alt => 'RSS', :class => 'icon'), user_checkouts_path(user, :format => :rss) -%>
47
+ </li>
48
+ <li>
49
+ <%= link_to 'CSV', checkouts_path(:format => :csv, :locale => @locale.to_s) -%>
50
+ <%= link_to (image_tag 'icons/page_white_excel.png', :size => '16x16', :alt => 'CSV', :class => 'icon'), user_checkouts_path(user, :format => :csv, :locale => @locale.to_s) -%>
51
+ </li>
41
52
  <%- end -%>
42
53
  </p>
43
54
 
data/app/views/checkouts/index.ics.erb CHANGED
@@ -3,10 +3,11 @@ checkouts = @checkouts
3
3
  RiCal.Calendar do
4
4
  checkouts.each do |checkout|
5
5
  event do
6
+ summary I18n.t('activerecord.attributes.checkout.due_date')
6
7
  description checkout.item.manifestation.original_title
7
- dtstart checkout.created_at
8
- dtend checkout.due_date
9
- location checkout.item.shelf.library.address
8
+ dtstart checkout.due_date.to_date
9
+ dtend checkout.due_date.to_date
10
+ location checkout.item.shelf.library.display_name.localize
10
11
  end
11
12
  end
12
13
  end.to_s
data/config/locales/translation_en.yml CHANGED
@@ -139,6 +139,7 @@ en:
139
139
  number_of_day_overdue: "Number of days overdue"
140
140
  extend: "Extend"
141
141
  returned: "Returned"
142
+ my_checkout: "My checkout"
142
143
  checkin:
143
144
  item_not_found: "Item not found."
144
145
  enter_item_identifier: "Enter item identifier."
data/config/locales/translation_ja.yml CHANGED
@@ -28,10 +28,10 @@ ja:
28
28
  note: 注記
29
29
  lock_version: ロックバージョン
30
30
  checked_item:
31
- due_date: 期日
31
+ due_date: 返却期限
32
32
  checkin:
33
33
  checkout:
34
- due_date: 期日
34
+ due_date: 返却期限
35
35
  lock_version: ロックバージョン
36
36
  reserve:
37
37
  user: 利用者
@@ -137,6 +137,7 @@ ja:
137
137
  number_of_day_overdue: "延滞日数"
138
138
  extend: "貸出期間の延長"
139
139
  returned: "返却済み"
140
+ my_checkout: "自分の貸出"
140
141
  checkin:
141
142
  item_not_found: "資料が見つかりません。"
142
143
  enter_item_identifier: "所蔵情報番号を入力してください。"
data/lib/enju_circulation/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module EnjuCirculation
2
- VERSION = "0.0.23"
2
+ VERSION = "0.0.24"
3
3
  end
data/spec/dummy/db/development.sqlite3 ADDED
File without changes
data/spec/dummy/db/test.sqlite3 CHANGED
Binary file
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: enju_circulation
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.23
4
+ version: 0.0.24
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-04-13 00:00:00.000000000 Z
12
+ date: 2012-04-17 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rails
16
- requirement: &70250257265800 !ruby/object:Gem::Requirement
16
+ requirement: &70215445921540 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ~>
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '3.2'
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *70250257265800
24
+ version_requirements: *70215445921540
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: simple_form
27
- requirement: &70250257265340 !ruby/object:Gem::Requirement
27
+ requirement: &70215445920740 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: '0'
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *70250257265340
35
+ version_requirements: *70215445920740
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: devise
38
- requirement: &70250257264840 !ruby/object:Gem::Requirement
38
+ requirement: &70215445919900 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: '0'
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *70250257264840
46
+ version_requirements: *70215445919900
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: cancan
49
- requirement: &70250257264260 !ruby/object:Gem::Requirement
49
+ requirement: &70215445919160 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: '0'
55
55
  type: :runtime
56
56
  prerelease: false
57
- version_requirements: *70250257264260
57
+ version_requirements: *70215445919160
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: validates_timeliness
60
- requirement: &70250257263640 !ruby/object:Gem::Requirement
60
+ requirement: &70215445918320 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
65
65
  version: '0'
66
66
  type: :runtime
67
67
  prerelease: false
68
- version_requirements: *70250257263640
68
+ version_requirements: *70215445918320
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: attribute_normalizer
71
- requirement: &70250257262940 !ruby/object:Gem::Requirement
71
+ requirement: &70215445917260 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - ~>
@@ -76,10 +76,10 @@ dependencies:
76
76
  version: '1.1'
77
77
  type: :runtime
78
78
  prerelease: false
79
- version_requirements: *70250257262940
79
+ version_requirements: *70215445917260
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: inherited_resources
82
- requirement: &70250257262520 !ruby/object:Gem::Requirement
82
+ requirement: &70215445916140 !ruby/object:Gem::Requirement
83
83
  none: false
84
84
  requirements:
85
85
  - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
87
87
  version: '0'
88
88
  type: :runtime
89
89
  prerelease: false
90
- version_requirements: *70250257262520
90
+ version_requirements: *70215445916140
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: state_machine
93
- requirement: &70250257262020 !ruby/object:Gem::Requirement
93
+ requirement: &70215445915060 !ruby/object:Gem::Requirement
94
94
  none: false
95
95
  requirements:
96
96
  - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
98
98
  version: '0'
99
99
  type: :runtime
100
100
  prerelease: false
101
- version_requirements: *70250257262020
101
+ version_requirements: *70215445915060
102
102
  - !ruby/object:Gem::Dependency
103
103
  name: friendly_id
104
- requirement: &70250257261480 !ruby/object:Gem::Requirement
104
+ requirement: &70215445913620 !ruby/object:Gem::Requirement
105
105
  none: false
106
106
  requirements:
107
107
  - - ~>
@@ -109,10 +109,10 @@ dependencies:
109
109
  version: '4.0'
110
110
  type: :runtime
111
111
  prerelease: false
112
- version_requirements: *70250257261480
112
+ version_requirements: *70215445913620
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: sunspot_rails
115
- requirement: &70250257261060 !ruby/object:Gem::Requirement
115
+ requirement: &70215445928140 !ruby/object:Gem::Requirement
116
116
  none: false
117
117
  requirements:
118
118
  - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
120
120
  version: '0'
121
121
  type: :runtime
122
122
  prerelease: false
123
- version_requirements: *70250257261060
123
+ version_requirements: *70215445928140
124
124
  - !ruby/object:Gem::Dependency
125
125
  name: sunspot_solr
126
- requirement: &70250257260580 !ruby/object:Gem::Requirement
126
+ requirement: &70215445926640 !ruby/object:Gem::Requirement
127
127
  none: false
128
128
  requirements:
129
129
  - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
131
131
  version: '0'
132
132
  type: :runtime
133
133
  prerelease: false
134
- version_requirements: *70250257260580
134
+ version_requirements: *70215445926640
135
135
  - !ruby/object:Gem::Dependency
136
136
  name: will_paginate
137
- requirement: &70250257276440 !ruby/object:Gem::Requirement
137
+ requirement: &70215445924440 !ruby/object:Gem::Requirement
138
138
  none: false
139
139
  requirements:
140
140
  - - ~>
@@ -142,10 +142,10 @@ dependencies:
142
142
  version: '3.0'
143
143
  type: :runtime
144
144
  prerelease: false
145
- version_requirements: *70250257276440
145
+ version_requirements: *70215445924440
146
146
  - !ruby/object:Gem::Dependency
147
147
  name: acts_as_list
148
- requirement: &70250257275940 !ruby/object:Gem::Requirement
148
+ requirement: &70215445922960 !ruby/object:Gem::Requirement
149
149
  none: false
150
150
  requirements:
151
151
  - - ~>
@@ -153,10 +153,10 @@ dependencies:
153
153
  version: 0.1.5
154
154
  type: :runtime
155
155
  prerelease: false
156
- version_requirements: *70250257275940
156
+ version_requirements: *70215445922960
157
157
  - !ruby/object:Gem::Dependency
158
158
  name: enju_message
159
- requirement: &70250257275480 !ruby/object:Gem::Requirement
159
+ requirement: &70215445922020 !ruby/object:Gem::Requirement
160
160
  none: false
161
161
  requirements:
162
162
  - - ~>
@@ -164,10 +164,10 @@ dependencies:
164
164
  version: 0.0.13
165
165
  type: :runtime
166
166
  prerelease: false
167
- version_requirements: *70250257275480
167
+ version_requirements: *70215445922020
168
168
  - !ruby/object:Gem::Dependency
169
169
  name: enju_event
170
- requirement: &70250257274960 !ruby/object:Gem::Requirement
170
+ requirement: &70215445937420 !ruby/object:Gem::Requirement
171
171
  none: false
172
172
  requirements:
173
173
  - - ! '>='
@@ -175,10 +175,10 @@ dependencies:
175
175
  version: 0.0.12
176
176
  type: :runtime
177
177
  prerelease: false
178
- version_requirements: *70250257274960
178
+ version_requirements: *70215445937420
179
179
  - !ruby/object:Gem::Dependency
180
180
  name: sqlite3
181
- requirement: &70250257274560 !ruby/object:Gem::Requirement
181
+ requirement: &70215445936420 !ruby/object:Gem::Requirement
182
182
  none: false
183
183
  requirements:
184
184
  - - ! '>='
@@ -186,10 +186,10 @@ dependencies:
186
186
  version: '0'
187
187
  type: :development
188
188
  prerelease: false
189
- version_requirements: *70250257274560
189
+ version_requirements: *70215445936420
190
190
  - !ruby/object:Gem::Dependency
191
191
  name: rspec-rails
192
- requirement: &70250257274020 !ruby/object:Gem::Requirement
192
+ requirement: &70215445935240 !ruby/object:Gem::Requirement
193
193
  none: false
194
194
  requirements:
195
195
  - - ! '>='
@@ -197,10 +197,10 @@ dependencies:
197
197
  version: '0'
198
198
  type: :development
199
199
  prerelease: false
200
- version_requirements: *70250257274020
200
+ version_requirements: *70215445935240
201
201
  - !ruby/object:Gem::Dependency
202
202
  name: factory_girl_rails
203
- requirement: &70250257273380 !ruby/object:Gem::Requirement
203
+ requirement: &70215445933820 !ruby/object:Gem::Requirement
204
204
  none: false
205
205
  requirements:
206
206
  - - ~>
@@ -208,10 +208,10 @@ dependencies:
208
208
  version: '3.1'
209
209
  type: :development
210
210
  prerelease: false
211
- version_requirements: *70250257273380
211
+ version_requirements: *70215445933820
212
212
  - !ruby/object:Gem::Dependency
213
213
  name: sunspot-rails-tester
214
- requirement: &70250257272420 !ruby/object:Gem::Requirement
214
+ requirement: &70215445932940 !ruby/object:Gem::Requirement
215
215
  none: false
216
216
  requirements:
217
217
  - - ! '>='
@@ -219,7 +219,7 @@ dependencies:
219
219
  version: '0'
220
220
  type: :development
221
221
  prerelease: false
222
- version_requirements: *70250257272420
222
+ version_requirements: *70215445932940
223
223
  description: Circulation management for Next-L Enju
224
224
  email:
225
225
  - tanabe@mwr.mediacom.keio.ac.jp
@@ -499,6 +499,7 @@ files:
499
499
  - spec/dummy/config/locales/ja.yml
500
500
  - spec/dummy/config/routes.rb
501
501
  - spec/dummy/config.ru
502
+ - spec/dummy/db/development.sqlite3
502
503
  - spec/dummy/db/migrate/001_create_patrons.rb
503
504
  - spec/dummy/db/migrate/005_create_manifestations.rb
504
505
  - spec/dummy/db/migrate/006_create_items.rb
@@ -727,6 +728,7 @@ test_files:
727
728
  - spec/dummy/config/locales/ja.yml
728
729
  - spec/dummy/config/routes.rb
729
730
  - spec/dummy/config.ru
731
+ - spec/dummy/db/development.sqlite3
730
732
  - spec/dummy/db/migrate/001_create_patrons.rb
731
733
  - spec/dummy/db/migrate/005_create_manifestations.rb
732
734
  - spec/dummy/db/migrate/006_create_items.rb