更改:活跃度查询时间区间
This commit is contained in:
parent
1c8811fda6
commit
ed81ce5927
|
@ -11,11 +11,11 @@ class Admins::IssuesRankController < Admins::BaseController
|
||||||
|
|
||||||
private
|
private
|
||||||
def begin_date
|
def begin_date
|
||||||
params.fetch(:begin_date, (Date.today-7.days).to_s)
|
params.fetch(:begin_date, (Date.yesterday-7.days).to_s)
|
||||||
end
|
end
|
||||||
|
|
||||||
def end_date
|
def end_date
|
||||||
params.fetch(:end_date, Date.today.to_s)
|
params.fetch(:end_date, Date.yesterday.to_s)
|
||||||
end
|
end
|
||||||
|
|
||||||
def sort_by
|
def sort_by
|
||||||
|
|
|
@ -17,11 +17,11 @@ class Admins::ProjectsRankController < Admins::BaseController
|
||||||
private
|
private
|
||||||
|
|
||||||
def begin_date
|
def begin_date
|
||||||
params.fetch(:begin_date, (Date.today-7.days).to_s)
|
params.fetch(:begin_date, (Date.yesterday-7.days).to_s)
|
||||||
end
|
end
|
||||||
|
|
||||||
def end_date
|
def end_date
|
||||||
params.fetch(:end_date, Date.today.to_s)
|
params.fetch(:end_date, Date.yesterday.to_s)
|
||||||
end
|
end
|
||||||
|
|
||||||
def sort_by
|
def sort_by
|
||||||
|
|
|
@ -7,11 +7,11 @@
|
||||||
<%= form_tag(admins_issues_rank_index_path, method: :get, class: 'form-inline search-form flex-1', id: 'issue-rank-date-form') do %>
|
<%= form_tag(admins_issues_rank_index_path, method: :get, class: 'form-inline search-form flex-1', id: 'issue-rank-date-form') do %>
|
||||||
<div class="input-group">
|
<div class="input-group">
|
||||||
<span class="input-group-text">开始日期</span>
|
<span class="input-group-text">开始日期</span>
|
||||||
<input class="form-control datetimepicker" type="text" name="begin_date" value="<%= params[:begin_date] || (Date.today - 7.days).to_s%>" aria-label="选择日期">
|
<input class="form-control datetimepicker" type="text" name="begin_date" value="<%= params[:begin_date] || (Date.yesterday - 7.days).to_s%>" aria-label="选择日期">
|
||||||
</div>
|
</div>
|
||||||
<div class="input-group">
|
<div class="input-group">
|
||||||
<span class="input-group-text">截止日期</span>
|
<span class="input-group-text">截止日期</span>
|
||||||
<input class="form-control datetimepicker" type="text" name="end_date" value="<%= params[:end_date] || Date.today.to_s%>" aria-label="选择日期">
|
<input class="form-control datetimepicker" type="text" name="end_date" value="<%= params[:end_date] || Date.yesterday.to_s%>" aria-label="选择日期">
|
||||||
</div>
|
</div>
|
||||||
<% end %>
|
<% end %>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
</td>
|
</td>
|
||||||
<td><%= item&.issues %></td>
|
<td><%= item&.issues %></td>
|
||||||
<td><%= item&.closed_issues %></td>
|
<td><%= item&.closed_issues %></td>
|
||||||
<td><%= item&.issues_count %></td>
|
<td><%= item&.project&.issues&.issue_issue.count %></td>
|
||||||
</tr>
|
</tr>
|
||||||
<% end %>
|
<% end %>
|
||||||
</tbody>
|
</tbody>
|
||||||
|
|
|
@ -7,11 +7,11 @@
|
||||||
<%= form_tag(admins_projects_rank_index_path, method: :get, class: 'form-inline search-form flex-1', id: 'project-rank-date-form') do %>
|
<%= form_tag(admins_projects_rank_index_path, method: :get, class: 'form-inline search-form flex-1', id: 'project-rank-date-form') do %>
|
||||||
<div class="input-group">
|
<div class="input-group">
|
||||||
<span class="input-group-text">开始日期</span>
|
<span class="input-group-text">开始日期</span>
|
||||||
<input class="form-control datetimepicker" type="text" name="begin_date" value="<%= params[:begin_date] || (Date.today - 7.days).to_s%>" aria-label="选择日期">
|
<input class="form-control datetimepicker" type="text" name="begin_date" value="<%= params[:begin_date] || (Date.yesterday - 7.days).to_s%>" aria-label="选择日期">
|
||||||
</div>
|
</div>
|
||||||
<div class="input-group">
|
<div class="input-group">
|
||||||
<span class="input-group-text">截止日期</span>
|
<span class="input-group-text">截止日期</span>
|
||||||
<input class="form-control datetimepicker" type="text" name="end_date" value="<%= params[:end_date] || Date.today.to_s%>" aria-label="选择日期">
|
<input class="form-control datetimepicker" type="text" name="end_date" value="<%= params[:end_date] || Date.yesterday.to_s%>" aria-label="选择日期">
|
||||||
</div>
|
</div>
|
||||||
<% end %>
|
<% end %>
|
||||||
<%= link_to '导出', "/项目活跃度排行.xls", class: 'btn btn-primary mr-3' %>
|
<%= link_to '导出', "/项目活跃度排行.xls", class: 'btn btn-primary mr-3' %>
|
||||||
|
|
|
@ -81,7 +81,7 @@
|
||||||
<%= sidebar_item_group('#rank-submenu', '活跃度排行', icon: 'calendar') do %>
|
<%= sidebar_item_group('#rank-submenu', '活跃度排行', icon: 'calendar') do %>
|
||||||
<li><%= sidebar_item(admins_users_rank_index_path, '用户活跃度排行', icon: 'user', controller: 'admins-users_rank') %></li>
|
<li><%= sidebar_item(admins_users_rank_index_path, '用户活跃度排行', icon: 'user', controller: 'admins-users_rank') %></li>
|
||||||
<li><%= sidebar_item(admins_projects_rank_index_path, '项目活跃度排行', icon: 'database', controller: 'admins-projects_rank') %></li>
|
<li><%= sidebar_item(admins_projects_rank_index_path, '项目活跃度排行', icon: 'database', controller: 'admins-projects_rank') %></li>
|
||||||
<li><%= sidebar_item(admins_issues_rank_index_path, '疑修活跃度排行', icon: 'database', controller: 'admins-issues_rank') %></li>
|
<li><%= sidebar_item(admins_issues_rank_index_path, '疑修活跃度排行', icon: 'calendar', controller: 'admins-issues_rank') %></li>
|
||||||
<% end %>
|
<% end %>
|
||||||
</li>
|
</li>
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue