Merge branch 'cxt_course' into develop

Conflicts:
	app/views/layouts/new_base_user.html.erb

app/controllers/courses_controller.rb

@@ -1079,7 +1079,7 @@ class CoursesController < ApplicationController
     sql_select = ""
     if groupid == 0
       sql_select = "SELECT members.*,(
-          SELECT SUM(IF(student_works.final_score IS NULL,NULL,IF(student_works.final_score =0,0,student_works.final_score - student_works.absence_penalty - student_works.late_penalty)))
+          SELECT SUM(IF(student_works.final_score IS NULL,NULL,IF(student_works.final_score =0,0,IF((student_works.final_score - student_works.absence_penalty - student_works.late_penalty) < 0 , 0, student_works.final_score - student_works.absence_penalty - student_works.late_penalty))))
           FROM student_works,homework_commons
           WHERE student_works.homework_common_id = homework_commons.id
           AND homework_commons.course_id = #{@course.id}
@@ -1091,7 +1091,7 @@ class CoursesController < ApplicationController
         WHERE members.course_id = #{@course.id} ORDER BY score #{score_sort_by}"
     else
       sql_select = "SELECT members.*,(
-          SELECT SUM(IF(student_works.final_score IS NULL,NULL,IF(student_works.final_score =0,0,student_works.final_score - student_works.absence_penalty - student_works.late_penalty)))
+          SELECT SUM(IF(student_works.final_score IS NULL,NULL,IF(student_works.final_score =0,0,IF((student_works.final_score - student_works.absence_penalty - student_works.late_penalty) < 0 , 0, student_works.final_score - student_works.absence_penalty - student_works.late_penalty))))
           FROM student_works,homework_commons
           WHERE student_works.homework_common_id = homework_commons.id
           AND homework_commons.course_id = #{@course.id}

app/controllers/homework_common_controller.rb

@@ -17,9 +17,11 @@ class HomeworkCommonController < ApplicationController
     @page = params[:page] ? params[:page].to_i + 1 : 0
     @is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course))
     if @is_teacher
-      @homeworks = @course.homework_commons.order("created_at desc").limit(10).offset(@page * 10)
+      @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)
     else
-      @homeworks = @course.homework_commons.where("publish_time <= '#{Date.today}'").order("created_at desc").limit(10).offset(@page * 10)
+      @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)
     end
     @is_student = User.current.logged? && (User.current.admin? || (User.current.member_of_course?(@course) && !@is_teacher))
     @is_new = params[:is_new]

app/controllers/users_controller.rb

@@ -1122,13 +1122,13 @@ class UsersController < ApplicationController
   #显示更多用户课程
   def user_courses4show
     @page = params[:page].to_i + 1
-    @courses = @user.courses.visible.where("is_delete =?", 0).select("courses.*,(SELECT MAX(created_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc").limit(5).offset(@page * 5)
+    @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).offset(@page * 5)
   end
 
   #显示更多用户项目
   def user_projects4show
     @page = params[:page].to_i + 1
-    @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).offset(@page * 5)
+    @projects = @user.projects.visible.select("projects.*,(SELECT MAX(updated_at)  FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS a").order("a desc").limit(5).offset(@page * 5)
   end
 
   def user_course_activities

app/helpers/courses_helper.rb

@@ -850,7 +850,7 @@ module CoursesHelper
   # 学生按作业总分排序，取前8个
   def hero_homework_score(course, score_sort_by)
     sql_select = "SELECT members.*,(
-          SELECT SUM(IF(student_works.final_score is null,null,IF(student_works.final_score = 0, 0, student_works.final_score - student_works.absence_penalty - student_works.late_penalty)))
+          SELECT SUM(IF(student_works.final_score IS NULL,NULL,IF(student_works.final_score =0,0,IF((student_works.final_score - student_works.absence_penalty - student_works.late_penalty) < 0 , 0, student_works.final_score - student_works.absence_penalty - student_works.late_penalty))))
           FROM student_works,homework_commons
           WHERE student_works.homework_common_id = homework_commons.id
           AND homework_commons.course_id = #{course.id}

app/models/member.rb

@@ -158,7 +158,7 @@ class Member < ActiveRecord::Base
   end
 
   def student_work_score_sum
-    sql_select = "SELECT (SUM(IF(student_works.final_score IS NULL,NULL,IF(student_works.final_score =0,0,student_works.final_score - student_works.absence_penalty - student_works.late_penalty)))) as score
+    sql_select = "SELECT (SUM(IF(student_works.final_score IS NULL,NULL,IF(student_works.final_score =0,0,IF((student_works.final_score - student_works.absence_penalty - student_works.late_penalty) < 0 , 0, student_works.final_score - student_works.absence_penalty - student_works.late_penalty))))) AS score
           FROM student_works,homework_commons
           WHERE student_works.homework_common_id = homework_commons.id
           AND homework_commons.course_id = #{self.course_id}

app/views/courses/_show_member_score.html.erb

@@ -24,7 +24,7 @@
               </span>
               <span class="c_red w70">
                 <% final_score = @member_score.homework_common_score(homework_common).first%>
-                <%= final_score.nil? || final_score.final_score.nil? ? "--" : format("%0.2f", final_score.final_score) %>
+                <%= final_score.nil? || final_score.final_score.nil? ? "--" : format("%0.2f", final_score.final_score < 0 ? 0 : final_score.final_score) %>
               </span>
             </li>
        <% end %>

app/views/homework_common/index.html.erb

@@ -39,7 +39,21 @@
 
 <div class="homepageRight mt0 ml10">
   <div class="homepageRightBanner mb10">
-    <div class="NewsBannerName">作业</div>
+    <!--<div class="NewsBannerName">作业</div>-->
+    <div id="menu_r" class="NewsBannerName" style="margin-bottom: -10px;">
+      <ul class="menu_r b_w" style="padding-left: 0px; margin-top: -5px;">
+        <li>
+          <a href="javascript:void(0);" class="parent" style="font-size:16px; color:#4b4b4b; font-weight: normal; padding-left: 0px;">作业</a>
+          <ul>
+            <% @homework_commons.each_with_index do |homework_common,index |%>
+                <li class="pr10">
+                  <%= link_to "作业#{@homework_commons.count - index}：#{homework_common.name}",student_work_index_path(:homework => homework_common.id)%>
+                </li>
+            <% end%>
+          </ul>
+        </li>
+      </ul>
+    </div>
     <div id="search_div" class="fr mr10">
       <%= render :partial =>  'homework_search_form',:locals => {:course=>@course} %>
     </div>

app/views/layouts/_user_courses.html.erb

@@ -70,6 +70,6 @@
 <% if courses.size == 5%>
     <li class="homepageLeftMenuMore" id="user_show_more_course">
       <input type="hidden" value="<%= page%>" id="course_page_num">
-      <a href="javascript:void(0);" class="homepageLeftMenuMoreIcon" onclick="show_more_course('<%=  user_courses4show_user_path(user.id)%>');"></a>
+      <a href="javascript:void(0);" class="homepageLeftMenuMoreIcon" onclick="show_more_course('<%= user_courses4show_user_path(user.id)%>');"></a>
     </li>
 <% end%>

app/views/layouts/new_base_user.html.erb

@@ -229,6 +229,7 @@
               <%=link_to "", new_project_path(:host=> Setting.host_name), :class => "homepageMenuSetting fr", :style => "margin-right:10px;", :title => "新建项目"%>
           <% end%>
         </div>
+
         <% if @user.projects.visible.count > 0
            project_order_ids = "(" +
             ForgeActivity.find_by_sql("SELECT  p.project_id, p.created_at FROM
@@ -241,7 +242,7 @@
            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)%>
+        <%# projects = @user.projects.visible.select("projects.*, (SELECT MAX(updated_at)  FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS a").order("a desc").limit(5)%>
         <div class="homepageLeftMenuCourses <%= projects.empty? ? 'none' : ''%>" id="homepageLeftMenuForge">
           <ul>
             <%= render :partial => 'layouts/user_projects', :locals => {:projects => projects,:user => @user, :page => 0} %>

app/views/student_work/_evaluation_un_work.html.erb

@@ -5,8 +5,8 @@
       <li class="hworkPortrait mt15 mr10">
         <%= link_to(image_tag(url_to_avatar(student_work.user),:width =>"40",:height => "40"),user_activities_path(student_work.user)) %>
       </li>
-      <div onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;" class="student_work_<%= student_work.id%>">
-        <li class="hworkName mt15 mr15 <%= @homework.homework_type == 2 ? '' : 'width165'%>">
+      <div class="student_work_<%= student_work.id%>">
+        <li class="hworkName mt15 mr15 <%= @homework.homework_type == 2 ? '' : 'width165'%>" style="cursor: pointer;" onclick="show_student_work('<%= student_work_path(student_work)%>');">
           <% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '的作品' : student_work.name%>
           <div>
             <%= link_to student_work_name,"javascript:void(0)" ,:title => student_work_name, :class => "linkGrey f14 StudentName break_word #{@homework.homework_type == 2 ? '' : 'width165'}"%>
@@ -14,7 +14,7 @@
         </li>
         <li>
           <% if @homework.homework_type != 3 %>
-              <ul class="mt10 fl">
+              <ul class="mt10 fl" style="cursor: pointer;" onclick="show_student_work('<%= student_work_path(student_work)%>');">
                 <li class="hworkStName mr10 mt16" title="<%= student_work.user.show_name%>">
                   <%= student_work.user.show_name%>
                 </li>
@@ -24,9 +24,15 @@
               </ul>
           <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %>
               <ul class="mt10 fl">
-                <li class="hworkPrName mr10 mt12" title="项目名称">
-                  <%= student_work.project.name %>
-                </li>
+                <% if student_work.project.is_public || User.current.member_of?(student_work.project) || User.current.admin? %>
+                    <li  class="hworkPrName mr10 mt12" title="项目名称">
+                      <%= link_to( student_work.project.name, project_path(student_work.project.id))%>
+                    </li>
+                <% else %>
+                    <li class="hworkPrName mr10 mt12" title="该项目是私有的">
+                      <%= student_work.project.name %>
+                    </li>
+                <% end %>
               </ul>
           <% end %>
         </li>
@@ -57,7 +63,11 @@
 
   <% if @homework.anonymous_comment == 0%>
     <li class="hworkList50 <%= score_color student_work.student_score%> student_score_info">
-    <%= student_work.student_score.nil? ? "未参与" : format("%.1f",student_work.student_score)%>
+      <% if student_work.student_score.nil? %>
+        <span title="该作品未被匿评">未参与</span>
+      <% else %>
+        <%=format("%.1f",student_work.student_score) %>
+      <% end %>
     <% unless student_work.student_score.nil?%>
         <span class="linkBlue">
           (<%= student_work.student_works_scores.where(:reviewer_role => 3).count%>)

app/views/student_work/_evaluation_work.html.erb

@@ -18,9 +18,9 @@
               <%= link_to student_work_name, student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14 StudentName break_word w230"%>
             </div>
           </li>
-          <li onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;" class="student_work_<%= student_work.id%>">
+          <li class="student_work_<%= student_work.id%>">
             <% if @homework.homework_type != 3 %>
-                <ul class="mt10 fl">
+                <ul class="mt10 fl" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;">
                   <li class="hworkStName mr10 mt16" title="<%= student_work.user.show_name%>">
                     <%= student_work.user.show_name%>
                   </li>
@@ -30,9 +30,15 @@
                 </ul>
             <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %>
                 <ul class="mt10 fl">
-                  <li class="hworkPrName mr10 mt12" title="项目名称">
-                    <%= student_work.project.name %>
-                  </li>
+                  <% if student_work.project.is_public || User.current.member_of?(student_work.project) || User.current.admin? %>
+                      <li  class="hworkPrName mr10 mt12" title="项目名称">
+                        <%= link_to( student_work.project.name, project_path(student_work.project.id))%>
+                      </li>
+                  <% else %>
+                      <li class="hworkPrName mr10 mt12" title="该项目是私有的">
+                        <%= student_work.project.name %>
+                      </li>
+                  <% end %>
                 </ul>
             <% end %>
           </li>

app/views/users/_user_homework_form.html.erb

@@ -173,7 +173,7 @@
     </div>
     <% if !edit_mode || edit_mode && homework.homework_detail_manual.comment_status < 2 %>
         <div class="fl f14 ml10" style="margin-top: 4px;">
-          <input type="checkbox" name="homework_common[anonymous_comment]" value="<%=edit_mode ? homework.anonymous_comment : 0 %>" id="anonymous_comment"/>
+          <input type="checkbox" name="homework_common[anonymous_comment]" value="<%=edit_mode ? homework.anonymous_comment : 1 %>" id="anonymous_comment"/>
           <span class="f14 c_grey mr10">禁用匿评</span>
         </div>
     <% end %>

public/stylesheets/public.css

@@ -226,7 +226,7 @@ a.c_green{ color:#28be6c;}
 .c_dblue{ color:#09658c;}
 .b_blue{background:#64bdd9;}
 .b_green{background:#28be6c;}
-.b_w{ background:#fff;}
+.b_w{ background:#fff !important;}
 
 /*add by Tim*/
 .fontGrey {color:#cecece;}