Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
This commit is contained in:
commit
bd97356090
|
|
@ -75,3 +75,9 @@ bundle exec rake db:migrate:up version=20140725062302
|
||||||
kw: Mysql2::Error,存储过程,CALL sp_project_status_cursor();
|
kw: Mysql2::Error,存储过程,CALL sp_project_status_cursor();
|
||||||
bundle exec rake db:migrate:down version=20130828004955
|
bundle exec rake db:migrate:down version=20130828004955
|
||||||
bundle exec rake db:migrate:up version=20130828004955
|
bundle exec rake db:migrate:up version=20130828004955
|
||||||
|
|
||||||
|
=================================[2014-08-13]====================================
|
||||||
|
kw:配置支持的图片格式
|
||||||
|
默认支持如下格式："bmp,jpeg,jpg,png,gif"
|
||||||
|
可在configuration.yml中修改，格式：pic_types: "bmp,jpeg,jpg,png,gif"(注意：pic_types若前面有#号需去掉)
|
||||||
|
配置完成后重启服务
|
||||||
|
|
|
||||||
|
|
@ -23,8 +23,8 @@
|
||||||
<% else%>
|
<% else%>
|
||||||
<%= content_tag "div", content_tag("p", rolesToLanguage(member.roles.sort.collect(&:to_s)).join(', ')), :class => "clear avatar_name" %>
|
<%= content_tag "div", content_tag("p", rolesToLanguage(member.roles.sort.collect(&:to_s)).join(', ')), :class => "clear avatar_name" %>
|
||||||
<div class="clear avatar_user">
|
<div class="clear avatar_user">
|
||||||
<p> <!--user_scores(member.user,2,@project).total_score).to_i -->
|
<p> <!--user_scores(member.user,2,@project).total_score).to_i UserGrade.find_by_user_id_and_project_id(member[:user_id], @project.id).grade).to_i-->
|
||||||
<%= l(:label_user_for_project_grade) %>: <span style="color:#ec6300"><%= format("%.2f" ,UserGrade.find_by_user_id_and_project_id(member[:user_id], @project.id).grade).to_i %></span>
|
<%= l(:label_user_for_project_grade) %>: <span style="color:#ec6300"><%= format("%.2f" ,user_scores(member.user,2,@project).total_score).to_i %></span>
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,9 @@
|
||||||
<div>技术得分：</div>
|
|
||||||
<div> 踩别人的帖子 -2</div>
|
<div> 踩别人的帖子数量 * (-2) = <%= option_num.tread %> * (-2) = <%= option_num.tread * (-2) %></div>
|
||||||
<div> 帖子被一级会员顶 +4</div>
|
<div> 帖子被一级会员顶的次数 * 4 = <%= option_num.praise_by_one %> * 4 = <%= option_num.praise_by_one * 4 %></div>
|
||||||
<div> 帖子被二级会员顶 +6</div>
|
<div> 帖子被二级会员顶的次数 * 6 = <%= option_num.praise_by_two %> * 6 = <%= option_num.praise_by_two * 6 %></div>
|
||||||
<div> 帖子被三级会员顶 +8</div>
|
<div> 帖子被三级会员顶的次数 * 8 = <%= option_num.praise_by_three %> * 8 = <%= option_num.praise_by_three * 8 %></div>
|
||||||
<div> 帖子被一级会员踩 -2</div>
|
<div> 帖子被一级会员踩的次数 * (-2) = <%= option_num.tread_by_one %> * (-2) = <%= option_num.tread_by_one * (-2) %></div>
|
||||||
<div> 帖子被二级会员踩 -4</div>
|
<div> 帖子被二级会员踩的次数 * (-4) = <%= option_num.tread_by_two %> * (-4) = <%= option_num.tread_by_two * (-4) %></div>
|
||||||
<div> 帖子被三级会员踩 -6</div>
|
<div> 帖子被三级会员踩的次数 * (-6) = <%= option_num.tread_by_three %> * (-6) = <%= option_num.tread_by_three * (-6) %></div>
|
||||||
|
<div> 技术得分 = <%= option_num.tread * (-2) %> + <%= option_num.praise_by_one * 4 %> + <%= option_num.praise_by_two * 6 %> + <%= option_num.praise_by_three * 8 %> + (<%= option_num.tread_by_one * (-2) %>) + ( <%= option_num.tread_by_two * (-4) %>) + (<%= option_num.tread_by_three * (-6) %>) = <%= skill(option_num) %> </div>
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
<div>项目贡献得分：</div>
|
|
||||||
<div> 提交代码 +4</div>
|
<div> 提交代码次数 * 4 = <%= option_num.changeset %> * 4 = <%= option_num.changeset * 4 %></div>
|
||||||
<div> 提交文档 +4</div>
|
<div> 提交文档次数 * 4 = <%= option_num.document %> * 4 = <%= option_num.document * 4 %></div>
|
||||||
<div> 提交附件 +4</div>
|
<div> 提交附件次数 * 4 = <%= option_num.attachment %> * 4 = <%= option_num.attachment * 4 %></div>
|
||||||
<div> 更新缺陷完成度 +2</div>
|
<div> 更新缺陷完成度次数 * 2 = <%= option_num.issue_done_ratio %> * 2 = <%= option_num.issue_done_ratio * 2 %></div>
|
||||||
<div> 发布缺陷 +4</div>
|
<div> 发布缺陷数量 * 4 = <%= option_num.post_issue %> * 4 = <%= option_num.post_issue * 4 %></div>
|
||||||
|
<div> 项目贡献得分 = <%= option_num.changeset * 4 %> + <%= option_num.document * 4 %> + <%= option_num.attachment * 4 %> + <%= option_num.issue_done_ratio * 2 %> + <%= option_num.post_issue * 4 %> = <%= active(option_num) %> </div>
|
||||||
|
|
@ -1,2 +1,3 @@
|
||||||
<div>影响力得分：</div>
|
|
||||||
<div> 被关注人数 +2/人</div>
|
<div> 被关注人数 * 2 = <%= option_num.follow %> * 2 = <%= option_num.follow * 2 %></div>
|
||||||
|
<div> 影响力得分 = <%= option_num.follow * 2 %></div>
|
||||||
|
|
|
||||||
|
|
@ -1,34 +1,10 @@
|
||||||
<!-- added by bai -->
|
<!-- added by bai -->
|
||||||
<%# messages_count = @user.messages.count %>
|
|
||||||
<%# messages_score = messages_count * 0.05%>
|
|
||||||
<%# finall_messages_score = messages_score %>
|
|
||||||
|
|
||||||
<%# journals_count = @user.journals.count %>
|
|
||||||
<%# journals_score = journals_count * 0.1 %>
|
|
||||||
<%# user_changesets_count = @user.changesets.count %>
|
|
||||||
<%# user_changesets_score = user_changesets_count * 0.3 %>
|
|
||||||
<%# finall_user_project_score = journals_score + user_changesets_score %>
|
|
||||||
|
|
||||||
<%# journals_for_messages_count = @user.journals_messages.count %>
|
|
||||||
<%# activities_count = @user.activities.count %>
|
|
||||||
<%# journals_for_messages_score = journals_for_messages_count * 0.05 %>
|
|
||||||
<%# activities_score = activities_count * 0.2 %>
|
|
||||||
<%# finall_activity_score = journals_for_messages_score + activities_score %>
|
|
||||||
|
|
||||||
<%# news_count = @user.news.count %>
|
|
||||||
<%# news_score = news_count * 0.1 %>
|
|
||||||
<%# wiki_contents_count = @user.wiki_contents.count %>
|
|
||||||
<%# wiki_contents_score = wiki_contents_count * 0.1 %>
|
|
||||||
<%# comments_count = @user.comments.count %>
|
|
||||||
<%# comments_score = comments_count * 0.1 %>
|
|
||||||
<%# finall_influence_score = news_score + wiki_contents_score + comments_score %>
|
|
||||||
<%# finall_user_score = finall_messages_score + finall_user_project_score + finall_activity_score + finall_influence_score %>
|
|
||||||
|
|
||||||
<div><%= l(:label_user_score) %></div>
|
<div><%= l(:label_user_score) %></div>
|
||||||
<div> = <%= l(:label_user_score_of_collaboration) %> + <%= l(:label_user_score_of_influence) %> +
|
<div> = <%= l(:label_user_score_of_collaboration) %> + <%= l(:label_user_score_of_influence) %> +
|
||||||
<%= l(:label_user_score_of_skill)%> + <%= l(:label_user_score_of_active) %></div>
|
<%= l(:label_user_score_of_skill)%> + <%= l(:label_user_score_of_active) %></div>
|
||||||
<!-- <div> + <%#= l(:label_user_score_of_influence) %></div> -->
|
<!-- <div> + <%#= l(:label_user_score_of_influence) %></div> -->
|
||||||
<div> = <%= format("%.2f" ,@user.user_score_attr.collaboration.nil? ? 0:@user.user_score_attr.collaboration).to_i %> + <%= format("%.2f" , @user.user_score_attr.influence.nil? ? 0:@user.user_score_attr.influence ).to_i %>
|
<div> = <%= format("%.2f" ,collaboration(option_num)).to_i %> + <%= format("%.2f" , influence(option_num) ).to_i %>
|
||||||
+ <%= format("%.2f" , @user.user_score_attr.skill.nil? ? 0:@user.user_score_attr.skill).to_i %> + <%= format("%.2f" , @user.user_score_attr.active.nil? ? 0:@user.user_score_attr.active).to_i %></div>
|
+ <%= "(" if skill(option_num) < 0 %> <%= format("%.2f" , skill(option_num)).to_i %> <%= ")" if skill(option_num) < 0 %> + <%= format("%.2f" , active(option_num)).to_i %></div>
|
||||||
<div> = <%= format("%.2f" ,@user.user_score_attr.total_score.nil? ? 0:@user.user_score_attr.total_score).to_i %></div>
|
<div> = <%= format("%.2f" ,option_num.total_score).to_i %></div>
|
||||||
<!-- end -->
|
<!-- end -->
|
||||||
|
|
|
||||||
|
|
@ -1,28 +1,4 @@
|
||||||
<!-- added by bai -->
|
<!-- added by bai -->
|
||||||
<%# messages_count = @user.messages.count %>
|
|
||||||
<%# messages_score = messages_count * 0.05%>
|
|
||||||
<%# finall_messages_score = messages_score %>
|
|
||||||
|
|
||||||
<%# journals_count = @user.journals.count %>
|
|
||||||
<%# journals_score = journals_count * 0.1 %>
|
|
||||||
<%# user_changesets_count = @user.changesets.count %>
|
|
||||||
<%# user_changesets_score = user_changesets_count * 0.3 %>
|
|
||||||
<%# finall_user_project_score = journals_score + user_changesets_score %>
|
|
||||||
|
|
||||||
<%# journals_for_messages_count = @user.journals_messages.count %>
|
|
||||||
<%# activities_count = @user.activities.count %>
|
|
||||||
<%# journals_for_messages_score = journals_for_messages_count * 0.05 %>
|
|
||||||
<%# activities_score = activities_count * 0.2 %>
|
|
||||||
<%# finall_activity_score = journals_for_messages_score + activities_score %>
|
|
||||||
|
|
||||||
<%# news_count = @user.news.count %>
|
|
||||||
<%# news_score = news_count * 0.1 %>
|
|
||||||
<%# wiki_contents_count = @user.wiki_contents.count %>
|
|
||||||
<%# wiki_contents_score = wiki_contents_count * 0.1 %>
|
|
||||||
<%# comments_count = @user.comments.count %>
|
|
||||||
<%# comments_score = comments_count * 0.1 %>
|
|
||||||
<%# finall_influence_score = news_score + wiki_contents_score + comments_score %>
|
|
||||||
<%# finall_user_score = finall_messages_score + finall_user_project_score + finall_activity_score + finall_influence_score %>
|
|
||||||
|
|
||||||
<h3 class="title"><%= l(:label_user_score) %></h3>
|
<h3 class="title"><%= l(:label_user_score) %></h3>
|
||||||
<div class="inf_user_image">
|
<div class="inf_user_image">
|
||||||
|
|
@ -37,8 +13,9 @@
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<table>
|
<table>
|
||||||
<tr class="info_font"><td><%= l(:label_user_score) %></td></tr>
|
<tr class="info_font"><td><%= l(:label_user_score) %></td></tr> <!--@user.user_score_attr.total_score -->
|
||||||
<tr class="buttons_for_score" style="margin-top:30px;margin-left:144px"><td><span style="color:#ec6300"><%= format("%.2f" , @user.user_score_attr.total_score).to_i %></span></td></tr>
|
<% option_num = get_option_number(@user,1) %>
|
||||||
|
<tr class="buttons_for_score" style="margin-top:30px;margin-left:144px"><td><span style="color:#ec6300"><%= format("%.2f" , option_num.total_score).to_i %></span></td></tr>
|
||||||
</table>
|
</table>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
@ -46,31 +23,57 @@
|
||||||
|
|
||||||
</table>
|
</table>
|
||||||
|
|
||||||
<table style="border-bottom: solid 0px #80a6d2;" width="100%">
|
<script type="text/javascript">
|
||||||
<tr>
|
function show_div(url)
|
||||||
<%= link_to l(:label_user_score) , {:controller => 'users', :action => 'score_new_index', :remote => true} %> :
|
{
|
||||||
<%= format("%.2f" , @user.user_score_attr.total_score).to_i %>
|
if(url == 'topic_new_score_index')
|
||||||
</tr><br>
|
{
|
||||||
<tr>
|
$('#show_score_detail').html('<%= escape_javascript(render :partial => 'users/topic_new_score_index', :locals => {:index =>0,:option_num => option_num}) %>');
|
||||||
<%= link_to l(:label_user_score_of_collaboration), {:controller => 'users',:action => 'topic_new_score_index', :remote => true} %> :
|
}
|
||||||
<%= format("%.2f" , @user.user_score_attr.collaboration.nil? ? 0:@user.user_score_attr.collaboration).to_i %>
|
else if(url == 'score_new_index')
|
||||||
</tr><br>
|
{
|
||||||
<tr>
|
$('#show_score_detail').html('<%= escape_javascript(render :partial => 'users/score_new_index', :locals => {:index =>0,:option_num => option_num}) %>');
|
||||||
<%= link_to l(:label_user_score_of_influence), {:controller => 'users',:action => 'project_new_score_index', :remote => true} %> :
|
}
|
||||||
<%= format("%.2f" , @user.user_score_attr.influence.nil? ? 0:@user.user_score_attr.influence).to_i %>
|
else if(url == 'project_new_score_index')
|
||||||
</tr><br>
|
{
|
||||||
<tr>
|
$('#show_score_detail').html('<%= escape_javascript(render :partial => 'users/project_new_score_index', :locals => {:index =>0,:option_num => option_num}) %>');
|
||||||
<%= link_to l(:label_user_score_of_skill), {:controller => 'users',:action => 'activity_new_score_index', :remote => true} %> :
|
}
|
||||||
<%= format("%.2f" , @user.user_score_attr.skill.nil? ? 0:@user.user_score_attr.skill).to_i %>
|
else if(url == 'activity_new_score_index')
|
||||||
</tr><br>
|
{
|
||||||
<tr>
|
$('#show_score_detail').html('<%= escape_javascript(render :partial => 'users/activity_new_score_index', :locals => {:index =>0,:option_num => option_num}) %>');
|
||||||
<%= link_to l(:label_user_score_of_active), {:controller => 'users',:action => 'influence_new_score_index', :remote => true} %> ：
|
}
|
||||||
<%= format("%.2f" , @user.user_score_attr.active.nil? ? 0:@user.user_score_attr.active).to_i %>
|
else if(url == 'influence_new_score_index')
|
||||||
</tr><br>
|
{
|
||||||
</table>
|
$('#show_score_detail').html('<%= escape_javascript(render :partial => 'users/influence_new_score_index', :locals => {:index =>0,:option_num => option_num}) %>');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<ul style="border-bottom: solid 0px #80a6d2;" width="100%">
|
||||||
|
<li> <!-- {:controller => 'users', :action => 'score_new_index', :remote => true} -->
|
||||||
|
<%= link_to l(:label_user_score) ,"javascript:void(0)", :onclick => "show_div('score_new_index')" %> :
|
||||||
|
<%= format("%.2f" , option_num.total_score).to_i %>
|
||||||
|
</li>
|
||||||
|
<li> <!-- {:controller => 'users',:action => 'topic_new_score_index', :remote => true,:option_num => option_num} -->
|
||||||
|
<%= link_to l(:label_user_score_of_collaboration), "javascript:void(0)", :onclick => "show_div('topic_new_score_index')" %> :
|
||||||
|
<%= format("%.2f" , collaboration(option_num)).to_i %>
|
||||||
|
</li>
|
||||||
|
<li>
|
||||||
|
<%= link_to l(:label_user_score_of_influence),"javascript:void(0)", :onclick => "show_div('project_new_score_index')" %> :
|
||||||
|
<%= format("%.2f" , influence(option_num)).to_i %>
|
||||||
|
</li>
|
||||||
|
<li>
|
||||||
|
<%= link_to l(:label_user_score_of_skill),"javascript:void(0)", :onclick => "show_div('activity_new_score_index')" %> :
|
||||||
|
<%= format("%.2f" , skill(option_num)).to_i %>
|
||||||
|
</li>
|
||||||
|
<li>
|
||||||
|
<%= link_to l(:label_user_score_of_active), "javascript:void(0)", :onclick => "show_div('influence_new_score_index')" %> ：
|
||||||
|
<%= format("%.2f" , active(option_num)).to_i %>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div id="show_score_detail" style="padding-left: 6px">
|
<div id="show_score_detail" style="padding-left: 6px">
|
||||||
<%= render :partial => 'users/score_new_index', :locals => {:index => 0 } %>
|
<%= render :partial => 'users/score_new_index', :locals => {:index => 0,:option_num => option_num } %>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
<div>协同得分：</div>
|
|
||||||
<div> 发帖 +2</div>
|
<div> 发帖数量 * 2 = <%= option_num.memo %> * 2 = <%= option_num.memo * 2 %></div>
|
||||||
<div> 对缺陷留言 +1</div>
|
<div> 对缺陷留言数量 * 1 = <%= option_num.messages_for_issues %> * 1 = <%= option_num.messages_for_issues * 1 %></div>
|
||||||
<div> 更改一次缺陷状态 +1</div>
|
<div> 更改缺陷状态次数 * 1 = <%= option_num.issues_status %> * 1= <%= option_num.issues_status * 1 %></div>
|
||||||
<div> 对留言的回复 +1</div>
|
<div> 对留言的回复数量 * 1 = <%= option_num.replay_for_message %> * 1 = <%= option_num.replay_for_message * 1 %></div>
|
||||||
<div> 对帖子的回复 +1</div>
|
<div> 对帖子的回复数量 * 1 = <%= option_num.replay_for_memo %> * 1 = <%= option_num.replay_for_memo * 1 %></div>
|
||||||
|
<div> 协同得分 = <%= option_num.memo * 2 %> + <%= option_num.messages_for_issues * 1 %> + <%= option_num.issues_status * 1 %> + <%= option_num.replay_for_message * 1 %> + <%= option_num.replay_for_memo * 1 %> = <%= collaboration(option_num) %> </div>
|
||||||
|
|
|
||||||
|
|
@ -1,28 +1,5 @@
|
||||||
<!-- added by bai -->
|
<!-- added by bai -->
|
||||||
<% messages_count = @user.messages.count %>
|
|
||||||
<% messages_score = messages_count * 0.05%>
|
|
||||||
<% finall_messages_score = messages_score %>
|
|
||||||
|
|
||||||
<% journals_count = @user.journals.count %>
|
|
||||||
<% journals_score = journals_count * 0.1 %>
|
|
||||||
<% user_changesets_count = @user.changesets.count %>
|
|
||||||
<% user_changesets_score = user_changesets_count * 0.3 %>
|
|
||||||
<% finall_user_project_score = journals_score + user_changesets_score %>
|
|
||||||
|
|
||||||
<% journals_for_messages_count = @user.journals_messages.count %>
|
|
||||||
<% activities_count = @user.activities.count %>
|
|
||||||
<% journals_for_messages_score = journals_for_messages_count * 0.05 %>
|
|
||||||
<% activities_score = activities_count * 0.2 %>
|
|
||||||
<% finall_activity_score = journals_for_messages_score + activities_score %>
|
|
||||||
|
|
||||||
<% news_count = @user.news.count %>
|
|
||||||
<% news_score = news_count * 0.1 %>
|
|
||||||
<% wiki_contents_count = @user.wiki_contents.count %>
|
|
||||||
<% wiki_contents_score = wiki_contents_count * 0.1 %>
|
|
||||||
<% comments_count = @user.comments.count %>
|
|
||||||
<% comments_score = comments_count * 0.1 %>
|
|
||||||
<% finall_influence_score = news_score + wiki_contents_score + comments_score %>
|
|
||||||
<% finall_user_score = finall_messages_score + finall_user_project_score + finall_activity_score + finall_influence_score %>
|
|
||||||
<head>
|
<head>
|
||||||
<meta charset="utf-8" />
|
<meta charset="utf-8" />
|
||||||
<title><%= h html_title %></title>
|
<title><%= h html_title %></title>
|
||||||
|
|
@ -52,8 +29,8 @@
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<table>
|
<table>
|
||||||
<tr class="info_font"><td><%= l(:label_user_score) %></td></tr>
|
<tr class="info_font"><td><%= l(:label_user_score) %></td></tr> <!-- @user.user_score_attr.total_score).to_i-->
|
||||||
<tr class="buttons_for_score" style="margin-top:30px;margin-left:144px"><td><span style="color:#ec6300"><%= format("%.2f" , @user.user_score_attr.total_score).to_i %></span></td></tr>
|
<tr class="buttons_for_score" style="margin-top:30px;margin-left:144px"><td><span style="color:#ec6300"><%= format("%.2f" , get_option_number(@user,1).total_score).to_i %></span></td></tr>
|
||||||
</table>
|
</table>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue