質問編集履歴
2
内容修正
test
CHANGED
|
File without changes
|
test
CHANGED
|
@@ -14,9 +14,9 @@
|
|
|
14
14
|
|
|
15
15
|
```controller
|
|
16
16
|
|
|
17
|
-
@week_in_user = WeekInUser.where(user_id: @user.id).group("DATE(created_at)").select("DATE(created_at)").count
|
|
17
|
+
@week_in_user = WeekInUser.where(user_id: @user.id, created_at: 1.week.ago.beginning_of_day..Time.zone.now.end_of_day).group("DATE(created_at)").select("DATE(created_at)").count
|
|
18
18
|
|
|
19
|
-
@week_out_user = WeekOutUser.where(user_id: @user.id).group("DATE(created_at)").select("DATE(created_at)").count
|
|
19
|
+
@week_out_user = WeekOutUser.where(user_id: @user.id, created_at: 1.week.ago.beginning_of_day..Time.zone.now.end_of_day).group("DATE(created_at)").select("DATE(created_at)").count
|
|
20
20
|
|
|
21
21
|
```
|
|
22
22
|
|
1
内容修正
test
CHANGED
|
File without changes
|
test
CHANGED
|
@@ -40,7 +40,7 @@
|
|
|
40
40
|
|
|
41
41
|
<% @week_in_user.each do |day, in| %>
|
|
42
42
|
|
|
43
|
-
<t
|
|
43
|
+
<td><%= in %></td>
|
|
44
44
|
|
|
45
45
|
<% end %>
|
|
46
46
|
|
|
@@ -48,9 +48,9 @@
|
|
|
48
48
|
|
|
49
49
|
<tr>
|
|
50
50
|
|
|
51
|
-
<% @week_out_user.each do |day,
|
|
51
|
+
<% @week_out_user.each do |day, out| %>
|
|
52
52
|
|
|
53
|
-
<t
|
|
53
|
+
<td><%= out %></td>
|
|
54
54
|
|
|
55
55
|
<% end %>
|
|
56
56
|
|