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

Conflicts:
	app/views/users/_new_user_message.html.erb
	public/stylesheets/css/user.css

app/controllers/users_controller.rb

@@ -1838,7 +1838,7 @@ class UsersController < ApplicationController
 =end
       @unsolved_issues_count = Issue.where(:assigned_to_id => @user.id, :status_id => [1, 2, 4, 6]).includes(:author, :project).order("updated_on desc").count
       # 用户待完成的作业
-      my_course_ids = StudentsForCourse.where(:student_id => @user.id).blank? ? "(-1)" : "(" + StudentsForCourse.where(:student_id => @user.id).map{|sc| sc.course_id}.join(",") + ")"
+      my_course_ids = StudentsForCourse.includes(:course).where("student_id = #{@user.id} and courses.is_delete = 0").blank? ? "(-1)" : "(" + StudentsForCourse.includes(:course).where("student_id = #{@user.id} and courses.is_delete = 0").map{|sc| sc.course_id}.join(",") + ")"
       homeworks = HomeworkCommon.where("course_id in #{my_course_ids} and publish_time <= '#{Date.today}'")
       homework_ids = homeworks.blank? ? "(-1)" : "(" + homeworks.map{|homework| homework.id}.join(",") + ")"
       student_works = StudentWork.where("user_id = #{@user.id} and homework_common_id in #{homework_ids} and work_status != 0")
@@ -2020,12 +2020,17 @@ class UsersController < ApplicationController
 
   # 待匿评的作业
   def anonymous_evaluation_list
-    student_work_evaluations = @user.student_works_evaluation_distributions
-    student_work_ids = student_work_evaluations.blank? ? "(-1)" : "(" + student_work_evaluations.map{|st| st.student_work_id}.join(",") + ")"
-    student_work_scores = @user.student_works_scores.where("student_work_id in #{student_work_ids} and reviewer_role = 3")
+    student_work_scores = @user.student_works_scores.where("reviewer_role = 3")
     anonymous_evaluation_ids = student_work_scores.blank? ? "(-1)" : "(" + student_work_scores.map{|st| st.student_work_id}.join(",") + ")"
-    @anonymous_evaluation =  @user.student_works_evaluation_distributions.where("student_work_id not in #{anonymous_evaluation_ids}")
-
+    unfinished_evaluations = @user.student_works_evaluation_distributions.where("student_work_id not in #{anonymous_evaluation_ids}")
+    unfinished_evaluations_work_ids = unfinished_evaluations.blank? ? "(-1)" : "(" + unfinished_evaluations.map{|st| st.student_work_id}.join(",") + ")"
+    homework_ids = StudentWork.where("id in #{unfinished_evaluations_work_ids}").blank? ? "(-1)" : "(" + StudentWork.where("id in #{unfinished_evaluations_work_ids}").map{|st| st.homework_common_id}.join(",") + ")"
+    @anonymous_evaluation = HomeworkCommon.where("id in #{homework_ids}").includes(:course).where("courses.is_delete = 0")
+    @anonymous_evaluation_count = @anonymous_evaluation.count
+    @limit = 20
+    @anonymous_evaluation_pages = Paginator.new @anonymous_evaluation_count, @limit, params['page'] || 1
+    @offset ||= @anonymous_evaluation_pages.offset
+    @anonymous_evaluation = paginateHelper @anonymous_evaluation, @limit
     respond_to do |format|
       format.js
     end

app/models/poll.rb

@@ -44,7 +44,9 @@ class Poll < ActiveRecord::Base
   def act_as_course_activity
     if self.polls_type == "Course"
       if self.polls_status == 2 #问卷是发布状态
-        self.course_acts << CourseActivity.new(:user_id => self.user_id,:course_id => self.polls_group_id)
+        if CourseActivity.where(:course_id => self.polls_group_id, :user_id => self.user_id, :course_act_id => self.id, :course_act_type => 'Poll').count == 0
+          self.course_acts << CourseActivity.new(:user_id => self.user_id,:course_id => self.polls_group_id)
+        end
       elsif self.polls_status == 1 #问卷是新建状态
         self.course_acts.destroy_all
       end

app/views/users/_anonymous_evaluation_list.html.erb

@@ -10,16 +10,16 @@
       </tr>
       </thead>
       <tbody>
-      <%# @anonymous_evaluation.student_common.each do |ae| %>
+      <% @anonymous_evaluation.each do |ae| %>
           <tr>
             <th>
               <li class="homepageTabTitle">
-               1 <%#= link_to ae.name.to_s, "", :target => "_blank", :class => "homepageTabTitle fl ml5" %>
+               1 <%= link_to ae.name.to_s, "", :target => "_blank", :class => "homepageTabTitle fl ml5" %>
               </li>
             </th>
             <th>
               <li class="homepageTabProjectName ml5">
-               1 <%#=  link_to uh.course.try(:name),"", :target => "_blank", :class => "homepageTabTitle ml5"%>
+               1 <%=  link_to uh.course.try(:name),"", :target => "_blank", :class => "homepageTabTitle ml5"%>
               <li>
             </th>
             <th>
@@ -30,21 +30,21 @@
             <th>
               <li class="homepageTabTime ml5" >
                 1
-<!--                <%# if uh.end_time >  Time.now.to_i %>
-                    <span class="c_red"><%#= (uh.end_time - Time.now.to_i) / (24*60*60) %></span> 天
-                    <span class="c_red"><%#= ((uh.end_time - Time.now.to_i) % (24*60*60)) / (60*60)%></span> 小时
-                    <span class="c_red"><%#= (((uh.end_time - Time.now.to_i) % (24*60*60)) % (60*60)) / 60%></span> 分
-                <%# else %>
+                <% if uh.end_time >  Time.now.to_i %>
+                    <span class="c_red"><%= (uh.end_time - Time.now.to_i) / (24*60*60) %></span> 天
+                    <span class="c_red"><%= ((uh.end_time - Time.now.to_i) % (24*60*60)) / (60*60)%></span> 小时
+                    <span class="c_red"><%= (((uh.end_time - Time.now.to_i) % (24*60*60)) % (60*60)) / 60%></span> 分
+                <% else %>
                     <span class="c_red">已截止</span>
-                <%# end %>-->
+                <% end %>
               </li>
             </th>
           </tr>
-      <%# end %>
+      <% end %>
       </tbody>
     </table>
     <ul class="pages" style="width: auto;display: table;margin-left: auto;margin-right: auto; padding-top: 10px">
-      <%#= pagination_links_full @unfinished_homework_pages, @unfinished_homeworks_count, :per_page_links => false, :remote => true,  :flag => true, :is_new => true %>
+      <%= pagination_links_full @anonymous_evaluation_pages, @anonymous_evaluation_count, :per_page_links => false, :remote => true,  :flag => true, :is_new => true %>
     </ul>
   </div>
 </div>

app/views/users/_new_user_message.html.erb

@@ -1,27 +1,27 @@
-<% message_alls.each do |ma| %>
-    <%# 系统消息 %>
-    <%= render :partial => 'users/user_message_system', :locals => {:ma => ma}  %>
-
-    <%= render :partial => 'users/user_at_message', :locals => {:ma => ma}  %>
-
-    <%# 课程消息 %>
-    <%= render :partial => 'users/user_message_course', :locals => {:ma => ma}  %>
-
-    <!--项目消息-->
-    <%= render :partial => 'users/user_message_forge', :locals => {:ma => ma}  %>
-
-    <!--公共贴吧-->
-    <%= render :partial => 'users/user_message_forum', :locals => {:ma => ma}  %>
-
-    <!--用户留言-->
-    <%= render :partial => 'users/user_message_userfeedaback', :locals => {:ma => ma}  %>
-
-    <%= render :partial => 'users/user_message_org', :locals => {:ma => ma} %>
-
-    <%# 申请类消息 %>
-    <%= render :partial => 'users/user_message_applied', :locals => {:ma => ma} %>
-<% end %>
-
-<ul class="pages" style="width: auto;display: table;margin-left: auto;margin-right: auto; padding-top: 10px">
-  <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => true,  :flag => true, :is_new => true %>
+<% message_alls.each do |ma| %>
+    <%# 系统消息 %>
+    <%= render :partial => 'users/user_message_system', :locals => {:ma => ma}  %>
+
+    <%= render :partial => 'users/user_at_message', :locals => {:ma => ma}  %>
+
+    <%# 课程消息 %>
+    <%= render :partial => 'users/user_message_course', :locals => {:ma => ma}  %>
+
+    <!--项目消息-->
+    <%= render :partial => 'users/user_message_forge', :locals => {:ma => ma}  %>
+
+    <!--公共贴吧-->
+    <%= render :partial => 'users/user_message_forum', :locals => {:ma => ma}  %>
+
+    <!--用户留言-->
+    <%= render :partial => 'users/user_message_userfeedaback', :locals => {:ma => ma}  %>
+
+    <%= render :partial => 'users/user_message_org', :locals => {:ma => ma} %>
+
+    <%# 申请类消息 %>
+    <%= render :partial => 'users/user_message_applied', :locals => {:ma => ma} %>
+<% end %>
+
+<ul class="pages" style="width: auto;display: table;margin-left: auto;margin-right: auto; padding-top: 10px">
+  <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => true,  :flag => true, :is_new => true %>
 </ul>

db/migrate/20161216031906_delete_course_activities.rb

@@ -0,0 +1,14 @@
+class DeleteCourseActivities < ActiveRecord::Migration
+  def up
+    course_acts = CourseActivity.where(:course_id => 844, :user_id => 10096, :course_act_id => 436, :course_act_type => 'Poll')
+
+    if course_acts.count > 1
+      course_acts.limit(course_acts.count - 1).each do |act|
+        act.delete
+      end
+    end
+  end
+
+  def down
+  end
+end

public/stylesheets/css/user.css

@@ -168,7 +168,7 @@ a.user_navmorebox .user_icons_closeclass{display:block;position: absolute;top:5p
 .user_navmore_txt li a.user_navmore_li {font-size:12px;color:#888; display:block; width:75px;height:24px;line-height:24px;	}
 .user_navmore_txt li a.user_navmore_add{ width:10px;color:#888; padding:0 5px; }
 .user_navmore_txt li:hover,.user_navmore_txt li a:hover{background-color:#f0f0f0;}
-
+
 /* 新版个人主页 */
 #messageTabList li { float:left; padding:10px 15px; text-align:center; }
 .homepageTabTitle { max-width:330px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;}