diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb index a61a9f580..f663bc272 100644 --- a/app/controllers/admin_controller.rb +++ b/app/controllers/admin_controller.rb @@ -63,6 +63,33 @@ class AdminController < ApplicationController end end + #精品课程下的全部课程 + def excellent_all_courses + @name = params[:name] + @courses = Course.like(@name).order('created_at desc') + @courses = paginateHelper @courses,30 + @page = (params['page'] || 1).to_i - 1 + respond_to do |format| + format.html + end + end + + #设为精品 + def set_excellent_course + @course = Course.find params[:id] + unless @course.nil? + if @course.is_excellent == 1 || @course.excellent_option == 1 + @course.update_column('is_excellent', 0) + @course.update_column('excellent_option', 0) + else + @course.update_column('is_excellent', 1) + end + respond_to do |format| + format.js + end + end + end + #管理员界面课程资源列表 def course_resource_list @@ -559,7 +586,8 @@ class AdminController < ApplicationController #代码测试列表 def code_work_tests - @code_work_tests = StudentWorkTest.find_by_sql("select a.* ,b.id as homeworkid,d.language from student_work_tests as a , homework_commons as b ,student_works as c, homework_detail_programings as d where a.student_work_id = c.id and b.id = c.homework_common_id and c.homework_common_id = d.homework_common_id order by a.created_at desc") + @code_work_tests = StudentWorkTest.find_by_sql("select status,results,created_at, student_work_id from student_work_tests order by id desc ") + #@code_work_tests = StudentWorkTest.find_by_sql("select a.status,a.results,a.created_at ,b.id as homeworkid,d.language from student_work_tests as a , homework_commons as b ,student_works as c, homework_detail_programings as d where a.student_work_id = c.id and b.id = c.homework_common_id and c.homework_common_id = d.homework_common_id order by a.id desc ") #@code_work_tests = StudentWorkTest.order('created_at desc') @code_work_tests = paginateHelper @code_work_tests,30 @page = (params['page'] || 1).to_i - 1 diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index a2d165492..89f4dd3b0 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -187,7 +187,7 @@ class CoursesController < ApplicationController end @canShowCode = User.current.allowed_to?(:as_teacher,@course) && params[:role] != '1' @is_remote = true - + @members = student_homework_score(0,0, 10,"desc") @course_groups = @course.course_groups end @@ -209,7 +209,7 @@ class CoursesController < ApplicationController end @canShowCode = isCourseTeacher(User.current.id,@course) && params[:role] != '1' @is_remote = true - + @members = student_homework_score(0,0, 10,"desc") @course_groups = @course.course_groups end @@ -334,7 +334,7 @@ class CoursesController < ApplicationController def export_course_member_excel @all_members = student_homework_score(0,0,0,"desc") - @homeworks = @course.homework_commons.order("created_at desc") + @homeworks = @course.homework_commons.order("created_at asc") filename="#{@course.teacher.lastname.to_s + @course.teacher.firstname.to_s }_#{@course.name}_#{@course.time.to_s + @course.term}#{l(:excel_member_list)}"; respond_to do |format| @@ -942,6 +942,12 @@ class CoursesController < ApplicationController @order,@b_sort,@name,@group = params[:order] || "score",params[:sort] || "desc",params[:name] || "",params[:group] @is_teacher = User.current.allowed_to?(:as_teacher,@course) || User.current.admin? + + if !@is_teacher + render_403 + return + end + @homework = HomeworkCommon.find params[:homework] #order("#{@order} #{@b_sort}" @student_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").order("simi_value desc"),@name @@ -962,10 +968,19 @@ class CoursesController < ApplicationController src_id = params[:src_id] dst_id = params[:dst_id] + @is_teacher = User.current.allowed_to?(:as_teacher,@course) || User.current.admin? + + if !@is_teacher + render_403 + return + end + src_work = StudentWork.where("id =?", src_id).first @homework = HomeworkCommon.find params[:homework_id] + @simi_value = src_work.simi_value.to_i + @src_code = src_work.description src_user = User.where("id =?", src_work.user_id).first diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb index e52b8434b..49e6ec290 100644 --- a/app/controllers/homework_common_controller.rb +++ b/app/controllers/homework_common_controller.rb @@ -18,10 +18,10 @@ class HomeworkCommonController < ApplicationController @is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course)) if @is_teacher @homeworks = @course.homework_commons.order("updated_at desc").limit(10).offset(@page * 10) - @homework_commons = @course.homework_commons.order("created_at desc").limit(10).offset(@page * 10) + @homework_commons = @course.homework_commons.order("created_at desc") else @homeworks = @course.homework_commons.where("publish_time <= '#{Date.today}'").order("updated_at desc").limit(10).offset(@page * 10) - @homework_commons = @course.homework_commons.where("publish_time <= '#{Date.today}'").order("created_at desc").limit(10).offset(@page * 10) + @homework_commons = @course.homework_commons.where("publish_time <= '#{Date.today}'").order("created_at desc") end @is_student = User.current.logged? && (User.current.admin? || (User.current.member_of_course?(@course) && !@is_teacher)) @is_new = params[:is_new] diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb index 25dfd4876..9597a35cf 100644 --- a/app/controllers/student_work_controller.rb +++ b/app/controllers/student_work_controller.rb @@ -254,14 +254,11 @@ class StudentWorkController < ApplicationController logger.debug "time3 is #{Time.now.usec} " result['results'].each do |key,value| - if value['simiworkid'].to_i > 0 @student_work = StudentWork.where("id =?", key.to_i).first @student_work.update_column('simi_id', value['simiworkid'].to_i) @student_work.update_column('simi_value', value['simivalue'].to_i) - end # sqlstr = "update student_works set simi_id=#{value['simiworkid']},simi_value=#{value['simivalue']} where id=#{key.to_i} " # dbh.execute(sqlstr) - end logger.debug "time4 is #{Time.now.usec} " end @@ -281,7 +278,7 @@ class StudentWorkController < ApplicationController if @homework.simi_time != nil resultObj[:comparetime] = Time.parse(@homework.simi_time.to_s).strftime("%Y-%m-%d %H:%M") else - resultObj[:comparetime] = @homework.simi_time + resultObj[:comparetime] = 0 end render :json => resultObj diff --git a/app/models/member.rb b/app/models/member.rb index e19e1f0df..cc227cf31 100644 --- a/app/models/member.rb +++ b/app/models/member.rb @@ -145,7 +145,7 @@ class Member < ActiveRecord::Base #当前课程的作业列表 def homework_common_list - HomeworkCommon.where(:course_id => self.course_id) + HomeworkCommon.where("course_id = ? and publish_time is not null and publish_time <= '#{Date.today}'", self.course_id) end #当前学生在指定作业内的得分 diff --git a/app/views/admin/_course_detail_tr.html.erb b/app/views/admin/_course_detail_tr.html.erb new file mode 100644 index 000000000..ca15a6696 --- /dev/null +++ b/app/views/admin/_course_detail_tr.html.erb @@ -0,0 +1,32 @@ + + <%= course.id %> + + + + <%= link_to(course.name, course_path(course.id)) %> + + + + <%= link_to(course.try(:teacher).try(:realname).truncate(6, omission: '...'), user_path(course.teacher)) %> + + + <%= studentCount(course) %> + + + <%= course.homework_commons.count%> + + + <%= student_works_num(course) %> + + + <%= visable_attachemnts_incourse(course).count%> + + + <%= course.boards.first.topics.count + Message.where("board_id =? and parent_id is not ?", course.boards.first.id, nil).count %> + + + <%= course.course_activities.count%> + + + <%= link_to( course.is_excellent == 1 || course.excellent_option == 1 ? "取消精品" : "设为精品", { :controller => 'admin', :action => 'set_excellent_course', :id => course.id },:remote=>true, :class => 'icon-del') %> + diff --git a/app/views/admin/_tab_excellent_courses.erb b/app/views/admin/_tab_excellent_courses.erb new file mode 100644 index 000000000..844648c0b --- /dev/null +++ b/app/views/admin/_tab_excellent_courses.erb @@ -0,0 +1,7 @@ +
+ +
\ No newline at end of file diff --git a/app/views/admin/code_work_tests.html.erb b/app/views/admin/code_work_tests.html.erb index df7de6bf0..29fb588c2 100644 --- a/app/views/admin/code_work_tests.html.erb +++ b/app/views/admin/code_work_tests.html.erb @@ -37,53 +37,57 @@ <% @code_work_tests.each do |test| %> - "> - - <%=link_to(test.homeworkid, student_work_index_path(:homework => test.homeworkid))%> - - - <% if test.status != -2 && test.results.first['user_wait'] %> - <% wait_time = 0 %> - <% test.results.each do |result| wait_time = wait_time + result['user_wait'] end %> - <%=(wait_time/test.results.count).to_s+"毫秒" %> + <% infos = StudentWorkTest.find_by_sql("select a.homework_common_id as homeworkid,b.language from student_works as a, homework_detail_programings as b where a.id = #{test.student_work_id} and a.homework_common_id = b.homework_common_id + ").first %> + <% if infos != nil %> + "> + + <%=link_to(infos.homeworkid, student_work_index_path(:homework => infos.homeworkid))%> + + + <% if test.status != -2 && test.results.first['user_wait'] %> + <% wait_time = 0 %> + <% test.results.each do |result| wait_time = wait_time + result['user_wait'] end %> + <%=(wait_time/test.results.count).to_s+"毫秒" %> + <% else %> + <%="未记录"%> + <% end %> + + + <%=%W(C C++ Python Java).at(infos.language.to_i - 1)%> + + + <%=Time.parse(test.created_at.to_s).strftime("%Y-%m-%d %H:%M:%S")%> + + + <% if test.status == 0 %> + <%= "答题正确" %> + <% elsif test.status == -2 %> + <%= "编译错误" %> + <% elsif test.status == 2 || test.results.last['status'] == 2 %> + <%= "超时" %> <% else %> - <%="未记录"%> + <%= "答题错误" %> <% end %> - - - <%=%W(C C++ Python Java).at(test.language.to_i - 1)%> - - - <%=Time.parse(test.created_at.to_s).strftime("%Y-%m-%d %H:%M:%S")%> - - - <% if test.status == 0 %> - <%= "答题正确" %> - <% elsif test.status == -2 %> - <%= "编译错误" %> - <% elsif test.status == 2 || test.results.last['status'] == 2 %> - <%= "超时" %> - <% else %> - <%= "答题错误" %> - <% end %> - - - <% if test.status != -2 %> - <%=test.results.count%> - <% end %> - - - <% if test.status != -2 %> - <%test.results = test.results.sort_by {|result| result['time_used'] }%> - <%=test.results.first['time_used'] == 0 ? "1毫秒":test.results.first['time_used'].to_s+"毫秒"%> - <% end %> - - - <% if test.status != -2 %> - <%=test.results.last['time_used'] == 0 ? "1毫秒":test.results.last['time_used'].to_s+"毫秒"%> - <% end %> - - + + + <% if test.status != -2 %> + <%=test.results.count%> + <% end %> + + + <% if test.status != -2 %> + <%test.results = test.results.sort_by {|result| result['time_used'] }%> + <%=test.results.first['time_used'] == 0 ? "1毫秒":test.results.first['time_used'].to_s+"毫秒"%> + <% end %> + + + <% if test.status != -2 %> + <%=test.results.last['time_used'] == 0 ? "1毫秒":test.results.last['time_used'].to_s+"毫秒"%> + <% end %> + + + <% end %> <% end %> diff --git a/app/views/admin/courses.html.erb b/app/views/admin/courses.html.erb index 2505b3d06..8e2f146a0 100644 --- a/app/views/admin/courses.html.erb +++ b/app/views/admin/courses.html.erb @@ -13,9 +13,7 @@ <%= text_field_tag 'name', params[:name], :size => 30, :placeholder => '课程名称' %> <%= submit_tag l(:button_apply), :class => "small", :name => nil %> - - <%= l(:button_clear)%> - + <%= link_to l(:button_clear), {:controller => 'admin', :action => 'courses'},:remote => true, :class => 'icon icon-reload' %> <% end %>   diff --git a/app/views/admin/excellent_all_courses.html.erb b/app/views/admin/excellent_all_courses.html.erb new file mode 100644 index 000000000..7554885a9 --- /dev/null +++ b/app/views/admin/excellent_all_courses.html.erb @@ -0,0 +1,71 @@ +<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', :media => 'all' %> +

+ 精品课程列表 +

+<%= render 'tab_excellent_courses' %> + +

+ 全部课程列表 +

+ +<%= form_tag({}, :method => :get) do %> +
+ + <%= text_field_tag 'name', params[:name], :size => 30, :placeholder => '课程名称' %> + <%= submit_tag l(:button_apply), :class => "small", :name => nil %> + <%= link_to l(:button_clear), {:controller => 'admin', :action => 'excellent_all_courses'}, :class => 'icon icon-reload' %> +
+<% end %> +  + +
+ + + + + + + + + + + + + + + + + <% @courses.each do |course| %> + " id="tr_<%= course.id %>"> + <%= render :partial => 'course_detail_tr', :locals => {:course => course} %> + + <% end %> + +
+ 序号 + + 课程名 + + 主讲老师 + + 学生数 + + 作业数 + + 作品数 + + 资源数 + + 帖子数 + + 动态数 + +
+
+ + +<% html_title(l(:label_excellent_courses_list)) -%> \ No newline at end of file diff --git a/app/views/admin/excellent_courses.html.erb b/app/views/admin/excellent_courses.html.erb index 59426455a..fef6da84d 100644 --- a/app/views/admin/excellent_courses.html.erb +++ b/app/views/admin/excellent_courses.html.erb @@ -1,3 +1,9 @@ +<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', :media => 'all' %> +

+ <%=l(:label_excellent_courses_list)%> +

+<%= render 'tab_excellent_courses' %> +

<%=l(:label_excellent_courses_list)%>

diff --git a/app/views/admin/set_excellent_course.js.erb b/app/views/admin/set_excellent_course.js.erb new file mode 100644 index 000000000..7b3ade139 --- /dev/null +++ b/app/views/admin/set_excellent_course.js.erb @@ -0,0 +1 @@ +$("#tr_<%=@course.id %>").html("<%=escape_javascript(render :partial => 'course_detail_tr', :locals => {:course => @course}) %>"); \ No newline at end of file diff --git a/app/views/courses/_compare_code_tips_1.html.erb b/app/views/courses/_compare_code_tips_1.html.erb index 696c40a48..4dc073797 100644 --- a/app/views/courses/_compare_code_tips_1.html.erb +++ b/app/views/courses/_compare_code_tips_1.html.erb @@ -1,8 +1,6 @@
- <%if @homework.simi_time != nil %> -

<%="您上次查重的时间为"+Time.parse(@homework.simi_time.to_s).strftime("%Y-%m-%d %H:%M")%>

- <%end%> +

重新查重 查看结果 @@ -39,7 +37,7 @@ console.log(data); if (data.status == 0) { - $("#ajax-modal").html('<%= escape_javascript( render :partial => 'courses/compare_code_tips_2',:locals => {:des=>"查重完成是否立即查看结果?",:status=>1, :homework=> homework,:courseid=> courseid})%>'); + $("#ajax-modal").html('<%= escape_javascript( render :partial => 'courses/compare_code_tips_2',:locals => {:des=>"查重完成,是否立即查看结果?",:status=>1, :homework=> homework,:courseid=> courseid})%>'); showModal('ajax-modal', '580px'); $('#ajax-modal').siblings().remove(); $('#ajax-modal').before(""); diff --git a/app/views/courses/_show_compare_code.html.erb b/app/views/courses/_show_compare_code.html.erb index 39f8e0565..00bea362e 100644 --- a/app/views/courses/_show_compare_code.html.erb +++ b/app/views/courses/_show_compare_code.html.erb @@ -8,8 +8,13 @@ <% end %>
-

<%=src_name%>

-

<%=dst_name%>

+

<%=src_name%>

+ <% if @simi_value.to_i >= 90 %> +
相似度<%=@simi_value.to_i%>%
+ <% else %> +
相似度<%=@simi_valu.to_i%>%
+ <% end %> +

<%=dst_name%>

diff --git a/app/views/courses/_show_member_score.html.erb b/app/views/courses/_show_member_score.html.erb index a8bec9d50..1fa9339e4 100644 --- a/app/views/courses/_show_member_score.html.erb +++ b/app/views/courses/_show_member_score.html.erb @@ -28,7 +28,7 @@ <% end %> -
  • 作业积分（总分）<%= (@member_score.student_work_score_sum).first.score %>
    • +
  • 作业积分（总分）<%= format("%0.2f",(@member_score.student_work_score_sum).first.score) %>
    • diff --git a/app/views/courses/addgroups.js.erb b/app/views/courses/addgroups.js.erb index cb7e1fbb1..f0c0f4be3 100644 --- a/app/views/courses/addgroups.js.erb +++ b/app/views/courses/addgroups.js.erb @@ -1 +1,2 @@ -$("#st_groups").html("<%= escape_javascript( render :partial => 'new_groups_name', locals: {:course_groups => @course_groups})%>"); \ No newline at end of file +$("#st_groups").html("<%= escape_javascript( render :partial => 'new_groups_name', locals: {:course_groups => @course_groups})%>"); +$("#member_content").html("<%= escape_javascript( render :partial => 'new_member_list', :locals => {:members => @members})%>"); \ No newline at end of file diff --git a/app/views/courses/code_repeat.html.erb b/app/views/courses/code_repeat.html.erb index 9e026c293..ccca72a20 100644 --- a/app/views/courses/code_repeat.html.erb +++ b/app/views/courses/code_repeat.html.erb @@ -2,16 +2,17 @@

    查重结果

      -
    • 全部作品
      • -
    • 对比作品
      • +
    • 被查作品
      • +
    • 疑被抄袭作品
      -
    • 作品名称
      • +
    • 序号
      • +
    • 作品名称
    • 姓名
    • 学号
    • 时间
      • -
    • 作品名称
      • +
    • 作品名称
    • 姓名
    • 学号
    • 时间
      • @@ -20,38 +21,39 @@
    <%if @homework.homework_type == 2 %> - <% @student_works.each do |student_work|%> + <% @student_works.each_with_index do |student_work,index|%>
      +
    • <%=index+1%>
      • <% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '的作品' : student_work.name%> - -
    • <%=student_work_name%>
      • +
    • <%=student_work_name%>
    • <%=student_work.user.show_name%>
    • <%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%>
    • <%= Time.parse(format_time(student_work.created_at)).strftime("%m-%d %H:%M")%>
      • - <% if student_work.simi_id > 0 && @works_hash[student_work.simi_id] %> - <% simi_student_work = @works_hash[student_work.simi_id] %> + <% if student_work.simi_id.to_i > 0 && @works_hash[student_work.simi_id.to_i] %> + <% simi_student_work = @works_hash[student_work.simi_id.to_i] %> <% simi_student_work_name = simi_student_work.name.nil? || simi_student_work.name.empty? ? simi_student_work.user.show_name + '的作品' : simi_student_work.name%> -
    • <%=simi_student_work_name%>
      • +
    • <%=simi_student_work_name%>
    • <%=simi_student_work.user.show_name%>
    • <%= simi_student_work.user.user_extensions.nil? ? "--" : simi_student_work.user.user_extensions.student_id%>
    • <%= Time.parse(format_time(simi_student_work.created_at)).strftime("%m-%d %H:%M")%>
      • - <% if student_work.simi_value >= 90 %> -
    • <%=student_work.simi_value%>%
      • + <% if student_work.simi_value.to_i >= 90 %> +
    • <%=student_work.simi_value.to_i%>%
      • <% else %> -
    • <%=student_work.simi_value%>%
      • +
    • <%=student_work.simi_value.to_i%>%
      • <% end %>
    • - <%= link_to("查看", show_comparecode_course_path(:homework_id => @homework.id,:src_id => student_work.id,:dst_id => student_work.simi_id),:class => "cha-btn",:remote => true ) %> + <%= link_to("查看", show_comparecode_course_path(:homework_id => @homework.id,:src_id => student_work.id,:dst_id => student_work.simi_id.to_i),:class => "cha-btn",:remote => true ) %>
      • <%else%> -
    • 无
      • +
    • 无
    • --
    • --
    • --
    • --
      • +
      • <% end %>
    <%end%> diff --git a/app/views/courses/show_comparecode.js.erb b/app/views/courses/show_comparecode.js.erb index 5cfae9428..be98db344 100644 --- a/app/views/courses/show_comparecode.js.erb +++ b/app/views/courses/show_comparecode.js.erb @@ -1,10 +1,10 @@ -$("#ajax-modal").html('<%= escape_javascript( render :partial => 'courses/show_compare_code' ,:locals => {:src_code=> @src_code,:src_name=> @src_username,:dst_name=> @dst_username, :dst_code=> @dst_code,})%>'); +$("#ajax-modal").html('<%= escape_javascript( render :partial => 'courses/show_compare_code' ,:locals => {:src_code=> @src_code,:src_name=> @src_username,:dst_name=> @dst_username, :dst_code=> @dst_code, :simivalue=> @simi_value })%>'); showModal('ajax-modal', '1250px'); $('#ajax-modal').siblings().remove(); -$('#ajax-modal').before(""); -$('#ajax-modal').parent().css("top","20%").css("left","20%").css("position","absolute"); +$('#ajax-modal').before(""); +$('#ajax-modal').parent().css("top","30%").css("left","20%").css("padding-top","20px").css("position","fixed"); //$('#ajax-modal').parent().addClass("resourceUploadPopup"); -$('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px").css("padding-top","10px"); +$('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px"); function closeModal(){ hideModal($(".program-compare-code")); diff --git a/app/views/courses/updategroupname.js.erb b/app/views/courses/updategroupname.js.erb index 8dd142557..18fe909fb 100644 --- a/app/views/courses/updategroupname.js.erb +++ b/app/views/courses/updategroupname.js.erb @@ -1,4 +1,5 @@ /** * Created by Administrator on 2014/12/3. */ -$("#st_groups").html("<%= escape_javascript( render :partial => 'new_groups_name', locals: {:course_groups => @course_groups})%>"); \ No newline at end of file +$("#st_groups").html("<%= escape_javascript( render :partial => 'new_groups_name', locals: {:course_groups => @course_groups})%>"); +$("#member_content").html("<%= escape_javascript( render :partial => 'new_member_list', :locals => {:members => @members})%>"); \ No newline at end of file diff --git a/app/views/homework_common/index.html.erb b/app/views/homework_common/index.html.erb index 6a3528e51..e4b63a536 100644 --- a/app/views/homework_common/index.html.erb +++ b/app/views/homework_common/index.html.erb @@ -43,8 +43,8 @@ - <% if @user.courses.visible.count > 0 + <%# if @user.courses.visible.count > 0 course_order_ids = "(" + CourseActivity.find_by_sql("SELECT c.course_id, updated_at FROM (SELECT ca.course_id, MAX(ca.updated_at) AS updated_at FROM course_activities ca WHERE ca.course_id IN (" + @user.courses.visible.select('courses.id').map{|c| c.id}.join(',') + ") @@ -221,7 +221,11 @@ end %> - <%# courses = @user.courses.visible.where("is_delete =?", 0).select("courses.*,(SELECT MAX(updated_at) FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc").limit(5) %> + <% if @user.courses.visible.count > 0 + courses = @user.courses.visible.where("is_delete =?", 0).select("courses.*,(SELECT MAX(updated_at) FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc").limit(5) + else + courses = [] + end %>
      <%= render :partial => 'layouts/user_courses', :locals => {:courses => courses,:user => @user, :page => 0} %> @@ -234,7 +238,7 @@ <%=link_to "", new_project_path(:host=> Setting.host_name), :class => "homepageMenuSetting fr", :style => "margin-right:10px;", :title => "新建项目"%> <% end%>
    - <% if @user.projects.visible.count > 0 + <%# if @user.projects.visible.count > 0 project_order_ids = "(" + ForgeActivity.find_by_sql("SELECT p.project_id, p.updated_at FROM (SELECT fa.project_id, MAX(fa.updated_at) AS updated_at FROM forge_activities fa WHERE fa.project_id IN (" + @user.projects.visible.select('projects.id').map{|p| p.id}.join(',') + ") @@ -246,7 +250,12 @@ end %> - <%# projects = @user.projects.visible.select("projects.*, (SELECT MAX(created_at) FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS a").order("a desc").limit(5)%> + <% if @user.projects.visible.count > 0 + projects = @user.projects.visible.select("projects.*, (SELECT MAX(created_at) FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS a").order("a desc").limit(5) + else + projects = [] + end + %>
      <%= render :partial => 'layouts/user_projects', :locals => {:projects => projects,:user => @user, :page => 0} %> diff --git a/app/views/student_work/_student_work_list.html.erb b/app/views/student_work/_student_work_list.html.erb index db15e94fb..f6d310269 100644 --- a/app/views/student_work/_student_work_list.html.erb +++ b/app/views/student_work/_student_work_list.html.erb @@ -123,7 +123,7 @@ if (data.status == 0) { var homework_simi_time = data.comparetime; - if (!homework_simi_time){ + if (homework_simi_time == 0){ //没进行过代码查重则直接查重 test_repeat(); } diff --git a/config/routes.rb b/config/routes.rb index 0e6472a68..c15d3dac4 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -952,7 +952,9 @@ RedmineApp::Application.routes.draw do match 'admin', :to => 'admin#index', :via => :get match 'admin/projects', :via => :get get 'admin/courses' - get 'admin/excellent_courses' + get 'admin/excellent_courses', as: :excellent_courses + get 'admin/excellent_all_courses', as: :excellent_all_courses + match 'admin/set_excellent_course/:id', :to => 'admin#set_excellent_course' get 'admin/course_resource_list' get 'admin/project_resource_list' match 'admin/users', :via => :get diff --git a/db/migrate/20160330094039_add_simi_id_to_homeworks.rb b/db/migrate/20160330094039_add_simi_id_to_homeworks.rb deleted file mode 100644 index bf1a8a645..000000000 --- a/db/migrate/20160330094039_add_simi_id_to_homeworks.rb +++ /dev/null @@ -1,6 +0,0 @@ -class AddSimiIdToStudentWorks < ActiveRecord::Migration - def change - add_column :student_works, :simi_id, :integer, :default => false - add_column :student_works, :simi_value, :integer, :default => false - end -end diff --git a/db/migrate/20160414055511_add_simi_id_to_student_works.rb b/db/migrate/20160414055511_add_simi_id_to_student_works.rb new file mode 100644 index 000000000..396f93dee --- /dev/null +++ b/db/migrate/20160414055511_add_simi_id_to_student_works.rb @@ -0,0 +1,6 @@ +class AddSimiIdToStudentWorks < ActiveRecord::Migration + def change + add_column :student_works, :simi_id, :integer + add_column :student_works, :simi_value, :integer + end +end diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 3a20dfa04..5162bcb16 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -2850,19 +2850,21 @@ img.school_avatar { a.btn_message_free{ background:#15BCCF; display:block; text-align:center; color:#fff; padding:3px 0; width:60px; margin-bottom:10px;margin-left: 58px;} /*20160401袁可------------------ 查重结果样式*/ -.conbox{ width:1000px; margin:0 auto; border:1px solid #f0f0f0; background:#fff;} +.conbox{ width:1000px; margin:0 auto; border:3px solid #f0f0f0; background:#fff;} .conbox-h2{ font-size:16px; padding:10px 0; padding-left:25px;} .chabox{ width:1000px;} -.chabox ul li{ float:left; width:87px; text-align:center; display:block;white-space:nowrap; overflow:hidden; text-overflow:ellipsis;} -.chabox ul li.chabox-w-151{ width:151px; display:block;white-space:nowrap; overflow:hidden; text-overflow:ellipsis;} +.chabox ul li{ float:left; width:82px; text-align:center; display:block;white-space:nowrap; overflow:hidden; text-overflow:ellipsis;} +.chabox ul li.chabox-w-401{ width:151px; display:block;white-space:nowrap; overflow:hidden; text-overflow:ellipsis;} .chabox ul li.chabox-r-line{ border-right:1px solid #D1D1D1;} .chabox-top{ width:1000px; } .chabox-top li{ font-size:14px; font-weight:bold; line-height:40px; height:40px; background:#E4E4E4; color:#000;} -.chabox-con li{font-size:12px; line-height:35px; height:35px; color:#000; border-bottom:1px solid #DFDFDF;} +.chabox-con li{font-size:12px; line-height:35px; height:35px; color:#888; border-bottom:1px solid #DFDFDF;} a.cha-btn{ display:block; width:50px; height:20px; line-height:20px; margin:0 auto; border:1px solid #269ac9; color:#269ac9;-webkit-border-radius: 3px;border-radius:3px; margin-top:8px;} a:hover.cha-btn{ background:#269ac9; color:#fff;} .chabox-header li{ font-size:14px; font-weight:bold; line-height:40px; height:40px; border-top:1px solid #E4E4E4; border-right:1px solid #E4E4E4; color:#000;} .chabox ul li.chabox-w-500{ width:499px;} +.chabox ul li.chabox-w-40{ width:39px; border-right:1px solid #D1D1D1;} +.chabox ul li.chabox-txt-left{ text-align:left;text-indent:1em; } .contrast-box{ width:1200px;box-shadow: 0 0 5px #6B6B6B; background:#fff; margin:0 auto; } .contrast-con{ width:599px; border-right:1px solid #D1D1D1; float:left;} diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index d10517f79..21d6f9e92 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -737,6 +737,8 @@ div#menu_r ul a.parent {background: url(../images/item.png) -30px -30px no-rep div#menu_r ul a.parent:hover {background: url(../images/item.png) -30px -60px no-repeat;} div#menu_r ul ul a.parent {background: url(../images/item.png) -20px 6px no-repeat;} div#menu_r ul ul a.parent:hover {background: url(../images/item.png) -20px -11px no-repeat;} +.menu_arrow {background: url(../images/sort_desc.png) 40px 17px no-repeat; width:50px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;} +.menu_arrow:hover {background: url(../images/sort_asc.png) 40px 17px no-repeat;} /* menu::level1 */ div#menu_r a { padding: 5px 12px 0 10px;line-height: 30px; color: #fff;} /*div#menu_r li { background: url(images/main-delimiter.png) 98% 4px no-repeat; }*/