Merge remote-tracking branch 'origin/develop' into standalone_develop

This commit is contained in:
“xxq250” 2022-09-20 09:43:20 +08:00
commit b07e5d6993
2 changed files with 24 additions and 2 deletions

View File

@ -8,6 +8,9 @@ class Admins::NpsController < Admins::BaseController
@user_nps = @user_nps.where(sql, keyword: "%#{keyword}%")
end
@user_nps = @user_nps.where("action_type != 'close'") if params[:done_score].present?
@min_score = @user_nps.where("action_type != 'close'").minimum("score")
@max_score = @user_nps.where("action_type != 'close'").maximum("score")
@score_total_count = UserNp.where("action_type !='close'").count
@user_nps = paginate @user_nps.includes(:user)
end

View File

@ -13,12 +13,31 @@
<%= submit_tag('搜索', class: 'btn btn-primary ml-3', 'data-disable-with': '搜索中...') %>
<span style="margin-left: 50px;margin-right: 10px;">NPS系统开关</span>
<input type="checkbox" <% if @on_off_switch %>checked<%end %> data-toggle="toggle" data-onstyle="primary" id="nps_toggle" data-on="开" data-off="关" data-size="small">
<input type="checkbox"
<% if @on_off_switch %>checked
<% end %> data-toggle="toggle" data-onstyle="primary" id="nps_toggle" data-on="开" data-off="关" data-size="small">
<% end %>
</div>
<div class="box py-0 pt-4 pl-4 daily-school-statistic-title" >
<p style="font-weight: bold">数据统计:</p>
<p>
评分用户数/用户总数:<span class="text-danger"><%= @score_total_count %>/<%= UserNp.count %></span>
平均评分:<span class="text-danger"><%= UserNp.where("action_type !='close'").average(:score).to_f.round(1) %></span>
<% @user_nps_mid = @score_total_count % 2 == 0 ? @score_total_count / 2 : (@score_total_count + 1) / 2 %>
评分中位数:<span class="text-danger"><%= UserNp.where("action_type !='close'").order("score").pluck(:score)[@user_nps_mid - 1].to_i %></span>
最低评分/评分人数:<span class="text-danger"><%=@min_score.to_i %>/<%= UserNp.where("action_type !='close'").where(score: @min_score).count %></span>
最高评分/评分人数:<span class="text-danger"><%=@max_score.to_i %>/<%= UserNp.where("action_type !='close'").where(score: @max_score).count %></span>
</p>
<p style="padding-bottom: 10px !important;">
填写意见用户数/用户总数:<span class="text-danger"><%= UserNp.where("memo is not null").count %>/<%= UserNp.count %></span>
期待更加丰富的功能:<span class="text-danger"><%= UserNp.where("memo like '%期待更加丰富的功能%'").count %></span>
希望有新手引导:<span class="text-danger"><%= UserNp.where("memo like '%希望有新手引导%'").count %></span>
提升用户体验:<span class="text-danger"><%= UserNp.where("memo like '%用户体验需进一步提升%'").count %></span>
其他:<span class="text-danger"><%= UserNp.where("memo is not null").where.not(id: UserNp.where("memo like '%期待更加丰富的功能%' or memo like '%希望有新手引导%' or memo like '%用户体验需进一步提升%' ").ids).count %></span>
</p>
</div>
<div class="box admin-list-container users-list-container">
<%= render partial: 'admins/nps/user_np_list', locals: { user_nps: @user_nps } %>
</div>