jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop

This commit is contained in:
cxt 2017-01-06 18:59:32 +08:00
parent 20581a68c7 f4cc2fca62
commit 57565a122e
6 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/controllers/users_controller.rb
View File

@ -1842,11 +1842,11 @@ end
if params[:property]
all_homework_ids = @homeworks.empty? ? "(-1)" : "(" + @homeworks.map{|h| h.id}.join(",") + ")"
if params[:property] == "1"
@homeworks = HomeworkCommon.find_by_sql("select * from homework_commons where id in #{all_homework_ids} and homework_type = 1")
@homeworks = HomeworkCommon.find_by_sql("select * from homework_commons where id in #{all_homework_ids} and homework_type = 1 order by created_at desc")
elsif params[:property] == "2"
@homeworks = HomeworkCommon.find_by_sql("select * from homework_commons where id in #{all_homework_ids} and homework_type = 2")
@homeworks = HomeworkCommon.find_by_sql("select * from homework_commons where id in #{all_homework_ids} and homework_type = 2 order by created_at desc")
elsif params[:property] == "3"
@homeworks = HomeworkCommon.find_by_sql("select * from homework_commons where id in #{all_homework_ids} and homework_type = 3")
@homeworks = HomeworkCommon.find_by_sql("select * from homework_commons where id in #{all_homework_ids} and homework_type = 3 order by created_at desc")
end
end
@limit = 10
@ -1875,11 +1875,11 @@ end
if params[:property]
all_homework_ids = @homeworks.empty? ? "(-1)" : "(" + @homeworks.map{|h| h.id}.join(",") + ")"
if params[:property] == "1"
@homeworks = HomeworkCommon.find_by_sql("select * from homework_commons where id in #{all_homework_ids} and homework_type = 1")
@homeworks = HomeworkCommon.find_by_sql("select * from homework_commons where id in #{all_homework_ids} and homework_type = 1 order by created_at desc")
elsif params[:property] == "2"
@homeworks = HomeworkCommon.find_by_sql("select * from homework_commons where id in #{all_homework_ids} and homework_type = 2")
@homeworks = HomeworkCommon.find_by_sql("select * from homework_commons where id in #{all_homework_ids} and homework_type = 2 order by created_at desc")
elsif params[:property] == "3"
@homeworks = HomeworkCommon.find_by_sql("select * from homework_commons where id in #{all_homework_ids} and homework_type = 3")
@homeworks = HomeworkCommon.find_by_sql("select * from homework_commons where id in #{all_homework_ids} and homework_type = 3 order by created_at desc")
end
end
@limit = 10

2
app/views/pull_requests/_form.html.erb
View File

@ -29,7 +29,7 @@
<%= render :partial => "tip" %>
</div>
<div class="alert alert-blue mb10" id ="pull_request_branch_error" style="display: none">
<span class="c_orange">您选择的源分支和目标分支为似乎没有差异，请将新改动提交至源分支或者切换到其它目标分支</span>
<span class="c_orange">您选择的源分支和目标分支似乎没有差异，请将新改动提交至源分支或者切换到其它目标分支</span>
</div>
<li class="mb10 clear">
<label class=" fl PullReques_label"><span class="c_red f12">*</span>&nbsp;标题&nbsp;&nbsp;:&nbsp;</label>

2
app/views/pull_requests/_tip.html.erb
View File

@ -1,5 +1,5 @@
<% if @tip %>
<div class="alert alert-blue mb10">
<span class="c_orange">您选择的源分支和目标分支为似乎没有差异，请将新改动提交至源分支或者切换到其它目标分支</span>
<span class="c_orange">您选择的源分支和目标分支似乎没有差异，请将新改动提交至源分支或者切换到其它目标分支</span>
</div>
<% end %>

6
app/views/users/_manage_homework_list.html.erb
View File

@ -14,11 +14,11 @@
<p class="sy_cgrey clear">
<span class="mr15 fl"><%= (cur_homework_end_time homework).html_safe %></span>
<span class="fl">未交：</span>
<span class="sy_cgrey hw_w30 fl mr15"><%= homework.homework_type == 3 ? '--' : (homework.course.student.count - homework.student_works.has_committed.count) %></span>
<span class="sy_cgrey hw_w30 fl mr15"><%= homework.course.student.count - homework.student_works.has_committed.count %></span>
<span class="fl c_green">已评：</span>
<span class="sy_cgrey hw_w30 fl mr15"><%= homework.student_works.has_committed.count - homework.student_works.has_committed.where("teacher_score is null and teaching_asistant_score is null").count %></span>
<span class="sy_cgrey hw_w30 fl mr15"><%= homework.student_works.where("work_status != 0 and (teacher_score is not null or teaching_asistant_score is not null)").count %></span>
<span class="fl c_red">未评：</span>
<span class="sy_cgrey hw_w30 fl mr15"><%= homework.student_works.has_committed.count %></span>
<span class="sy_cgrey hw_w30 fl mr15"><%= homework.student_works.where("work_status != 0 and teacher_score is null and teaching_asistant_score is null").count %></span>
</p>
</div>
<% if homework.student_works.has_committed.count == 0 %>

4
app/views/users/_user_message_course.html.erb
View File

@ -727,9 +727,9 @@
</div>
<li class="messageOperateContents fl">
<% if ma.status == 1 %>
<%= User.find(ma.course_message_id).show_name%>已通过
<span class="user_hiddent fl" title="<%=User.find(ma.course_message_id).show_name %>"><%= User.find(ma.course_message_id).show_name %></span><span>已通过</span>
<% else %>
<%= User.find(ma.course_message_id).show_name%>已拒绝
<span class="user_hiddent fl" title="<%=User.find(ma.course_message_id).show_name %>"><%= User.find(ma.course_message_id).show_name %></span><span>已拒绝</span>
<% end %>
</li>
<li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>

5
public/stylesheets/css/public.css
View File

@ -1551,4 +1551,7 @@ a.syllabusbox_a_blue{
.pages_new_404_txt{ font-size: 16px; color: #888; text-align: center;}
.feedbackText{box-shadow:none; width:550px; height:80px; border-color: #DFDFDF; background:#fff; color:#999; padding:3px; font-size:12px;overflow:auto; background-attachment:fixed;border-style:solid;}
._notice_box{border:solid 1px #f6d0b1; background:#fff9e9; padding:4px; color:#ee4a20;}
._notice_box{border:solid 1px #f6d0b1; background:#fff9e9; padding:4px; color:#ee4a20;}
/*针对名字过长的用户定义公共样式*/
.user_hiddent{width: 55px;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;display: inline-block;}