File tree Expand file tree Collapse file tree 3 files changed +14
-12
lines changed Expand file tree Collapse file tree 3 files changed +14
-12
lines changed Original file line number Diff line number Diff line change @@ -24,18 +24,23 @@ def latest
24
24
Dojo . active . each do |dojo |
25
25
latest_event = dojo . event_histories . newest . first
26
26
27
+ link_in_note = dojo . note . match ( URI . regexp )
28
+ date_in_note = dojo . note . match ( /(\d {4}-\d {1,2}-\d {1,2})/ ) # YYYY-MM-DD
29
+ last_session_link = link_in_note . nil? ? dojo_path ( dojo . id ) : link_in_note
30
+ last_session_date = date_in_note . nil? ? dojo . created_at : Time . zone . parse ( date_in_note . to_s )
27
31
@latest_event_by_dojos << {
28
32
id : dojo . id ,
29
33
name : dojo . name ,
30
34
note : dojo . note ,
31
35
url : dojo . url ,
36
+ has_event_histories : latest_event . nil? ,
32
37
33
- # 過去のイベント開催データが無ければ、大体として掲載日を入力
38
+ # 過去のイベント開催データが無ければ、note 内にある日付または掲載日を表示
34
39
event_at : latest_event . nil? ?
35
- dojo . created_at . strftime ( "%Y-%m-%d" ) :
40
+ last_session_date . strftime ( "%Y-%m-%d" ) :
36
41
latest_event . evented_at . strftime ( "%Y-%m-%d" ) ,
37
42
event_url : latest_event . nil? ?
38
- nil :
43
+ last_session_link . to_s :
39
44
latest_event . event_url
40
45
}
41
46
end
Original file line number Diff line number Diff line change 76
76
</ td >
77
77
< td >
78
78
< small >
79
- <% if dojo [ :event_url ] . nil? %>
80
- <!-- 別サービスでイベント管理している Dojo で、"Active" の確認が無い場合はハイライトする -->
81
- < span class =<%= 'expired' if !dojo [ :note ] . include? ( 'Active' ) %> >
82
- <%= link_to dojo [ :event_at ] , dojo_path ( dojo [ :id ] ) %>
83
- </ span >
84
- <% elsif dojo [ :event_at ] <= Time . current . prev_year && !dojo [ :note ] . include? ( 'Active' ) %>
79
+ <% if dojo [ :has_event_histories ] %>
85
80
<!-- 過去1年間イベント開催していない Dojo で、"Active" の確認が無い場合はハイライトする -->
86
- < span class ='expired '>
81
+ < span class =<%= 'expired' if dojo [ :event_at ] <= Time . current . prev_year && ! dojo [ :note ] . include? ( 'Active' ) %> >
87
82
<%= link_to dojo [ :event_at ] , dojo [ :event_url ] %>
88
83
</ span >
89
84
<% else %>
90
- < span >
85
+ <!-- 別サービスでイベント管理している Dojo で、"Active" の確認が無い場合はハイライトする -->
86
+ < span class =<%= 'expired' if dojo [ :event_at ] <= Time . current . prev_year && !dojo [ :note ] . include? ( 'Active' ) %> >
91
87
<%= link_to dojo [ :event_at ] , dojo [ :event_url ] %>
92
88
</ span >
93
89
<% end %>
Original file line number Diff line number Diff line change 494
494
- Islay
495
495
- id : 8
496
496
order : ' 082244'
497
- note : ' Active for years. '
497
+ note : ' Active - 2025-04-05 http://coderdojo-moriya.com/archives/5011 '
498
498
created_at : ' 2016-07-12'
499
499
name : 守谷
500
500
prefecture_id : 8
1111
1111
- Webサイト
1112
1112
- id : 331
1113
1113
order : ' 131032'
1114
+ note : ' Active - 2025-03-09 に開催 https://note.com/coderdojo_konan/n/n63193aa2048c'
1114
1115
created_at : ' 2024-12-19'
1115
1116
name : 品川港南
1116
1117
prefecture_id : 13
You can’t perform that action at this time.
0 commit comments