Merge remote-tracking branch 'origin/szzh' into szzh

app/controllers/courses_controller.rb

@@ -615,6 +615,10 @@ class CoursesController < ApplicationController
   end
 
   def show
+    #更新创建课程消息状态
+    create_course_messages = @course.course_messages.where("user_id =? and course_message_type =? and course_id =? and viewed =?", User.current.id, 'Course', @course.id, 0)
+    create_course_messages.update_all(:viewed => true)
+
     course_activities = @course.course_activities
     @canShowRealName = User.current.member_of_course? @course
     @page = params[:page] ? params[:page].to_i + 1 : 0

app/controllers/members_controller.rb

@@ -81,8 +81,12 @@ class MembersController < ApplicationController
             user_ids.each do |user_id|
               members << Member.new(:role_ids => params[:membership][:role_ids], :user_id => user_id)
               user_grades << UserGrade.new(:user_id => user_id, :project_id => @project.id)
-              ## added by nie
 
+              #给新成员发送加入项目的消息，发送者id放在ForgeMessage的forge_message_id字段中，
+              #forge_message_type设置为JoinProject
+              forge_join = ForgeMessage.new(:user_id =>user_id, :forge_message_id=>User.current.id,:project_id => @project.id,:forge_message_type=>"JoinProject", :viewed => false)
+              forge_join.save
+              ## added by nie
               if (params[:membership][:role_ids])
                 role = Role.find(params[:membership][:role_ids][0])
                 project_info << ProjectInfo.new(:user_id => user_id, :project_id => @project.id) if role.allowed_to?(:is_manager)
@@ -301,6 +305,7 @@ class MembersController < ApplicationController
             grade.destroy
           end
         end
+         ForgeMessage.create(:user_id => @member.user_id, :project_id => @project.id, :forge_message_type => "RemoveFromProject", :viewed => false, :forge_message_id => User.current.id)
       end
       respond_to do |format|
         format.html { redirect_to_settings_in_projects }

app/controllers/projects_controller.rb

@@ -534,6 +534,14 @@ class ProjectsController < ApplicationController
     project_invite_messages.each do |project_invite_message|
       project_invite_message.update_attribute(:viewed, true)
     end
+    #更新被加入项目消息的viewed字段
+    join_project_messages = ForgeMessage.where("user_id =? and project_id =? and forge_message_type=?", user, project, "JoinProject")
+    join_project_messages.each do |join_project|
+      join_project.update_attribute(:viewed, true)
+    end
+    #更新被移出项目消息的viewed字段
+    remove_project_messages = ForgeMessage.where("user_id =? and project_id =? and forge_message_type=?", user, project, "RemoveFromProject")
+    remove_project_messages.update_all(:viewed => true)
   end
 
   def message_invite(message_id, key)

app/controllers/student_work_controller.rb

@@ -62,6 +62,9 @@ class StudentWorkController < ApplicationController
     journals_for_teacher.each do |journal_for_teacher|
       journal_for_teacher.update_attributes(:viewed => true)
     end
+    #不能参与作业匿评消息状态更新
+    no_evaluation = CourseMessage.where("user_id =? and course_id =? and course_message_type =? and viewed =?", User.current.id, @homework.course, "NoEvaluation", 0)
+    no_evaluation.update_all(:viewed => true)
     # 作品留言
     # 消息end
     #设置作业对应的forge_messages表的viewed字段

app/controllers/users_controller.rb

@@ -128,12 +128,12 @@ class UsersController < ApplicationController
 
       #课程相关消息
       when 'homework'
-        @message_alls = CourseMessage.where("course_message_type in ('HomeworkCommon','StudentWorksScore','JournalsForMessage') and user_id =?",  @user).order("created_at desc")
+        @message_alls = CourseMessage.where("course_message_type in ('HomeworkCommon','StudentWorksScore','JournalsForMessage','NoEvaluation') and user_id =?",  @user).order("created_at desc")
       when 'course_message'
         @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "Message", @user).order("created_at desc")
       when 'course_news'
         # 课程通知包含发布的通知和回复的通知
-        @message_alls = CourseMessage.where("course_message_type =? or course_message_type =?", "News", "Comment").where("user_id =?", @user).order("created_at desc")
+        @message_alls = CourseMessage.where("course_message_type in (?, ? ,?)", "News", "Comment", "Course").where("user_id =?", @user).order("created_at desc")
       when 'poll'
         @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "Poll", @user).order("created_at desc")
 
@@ -145,7 +145,7 @@ class UsersController < ApplicationController
       when 'forge_news'
         @message_alls = ForgeMessage.where("forge_message_type in (?,?) and user_id =?", "News", "Comment", @user).order("created_at desc")
       when 'apply'
-        @message_alls = ForgeMessage.where("forge_message_type in ('ProjectInvite', 'AppliedProject') and user_id =?", @user).order("created_at desc")
+        @message_alls = ForgeMessage.where("forge_message_type in ('ProjectInvite', 'AppliedProject', 'JoinProject', 'RemoveFromProject') and user_id =?", @user).order("created_at desc")
 
       #贴吧消息
       when 'forum'

app/models/attachment.rb

@@ -442,7 +442,12 @@ class Attachment < ActiveRecord::Base
 
 
   def self.attach_filesex(obj, attachments,attachment_type)
-    result = obj.save_attachmentsex(attachments, User.current,attachment_type)
+    if obj.is_public?
+      public_status = true
+    else
+      public_status = false
+    end
+    result = obj.save_attachmentsex(attachments, User.current,attachment_type, public_status)
     obj.attach_saved_attachments
     result
   end

app/models/course.rb

@@ -50,7 +50,7 @@ class Course < ActiveRecord::Base
   validates_format_of  :name,:with =>/^[^ ]+[a-zA-Z0-9_\u4e00-\u9fa5\s\S]+$/
   validates_length_of :description, :maximum => 10000
   before_save :self_validate
-  after_create :create_board_sync, :act_as_course_activity
+  after_create :create_board_sync, :act_as_course_activity, :act_as_course_message
   before_destroy :delete_all_members
 
   safe_attributes 'extra',
@@ -321,6 +321,10 @@ class Course < ActiveRecord::Base
     self.course_acts << CourseActivity.new(:user_id => self.tea_id,:course_id => self.id)
   end
 
+  #创建课程后，给该用户发送消息
+  def act_as_course_message
+    self.course_messages << CourseMessage.new(:user_id => self.tea_id, :course_id => self.id, :viewed => false)
+  end
   #项目与课程分离后，很多课程的名称等信息为空，这些数据信息存储在项目表中！！就是数据兼容的问题
   #def name
   #  read_attribute('name') || Project.find_by_identifier(self.extra).try(:name)

app/models/student_work.rb

@@ -12,6 +12,7 @@ class StudentWork < ActiveRecord::Base
   before_destroy :delete_praise
   before_save :set_program_score, :set_src
 
+  after_create :act_as_message
   acts_as_attachable
 
   def delete_praise
@@ -136,4 +137,11 @@ class StudentWork < ActiveRecord::Base
       end
     end
   end
+
+  def act_as_message
+    if self.created_at > self.homework_common.end_time + 1
+      CourseMessage.create(:user_id => self.user_id, :course_id => self.homework_common.course_id,
+                             :course_message_id => self.id, :course_message_type => 'NoEvaluation',:viewed => false)
+    end
+  end
 end

app/views/files/_course_list.html.erb

@@ -33,9 +33,16 @@
                       <%= link_to("选入我的其他课程",quote_resource_show_course_file_path(@course,file),:class => "f_l re_select c_lorange",:remote => true) if has_course?(User.current,file) %>
 
                       <% if delete_allowed && file.container_id == @course.id && file.container_type == "Course"  %>
-                      <span id="is_public_<%= file.id %>">
-                        <%= link_to (file.is_public? ? "公开":"私有"), update_file_dense_attachments_path(:attachmentid=>file.id,:newtype=>(file.is_public? ? 0:1)),:remote=>true,:class=>"f_l re_open c_blue",:method => :post  %>
-                      </span>
+                        <% if @course.is_public? %>
+                          <span id="is_public_<%= file.id %>">
+                            <%= link_to (file.is_public? ? "公开":"私有"), update_file_dense_attachments_path(:attachmentid=>file.id,:newtype=>(file.is_public? ? 0:1)),:remote=>true,:class=>"f_l re_open c_blue",:method => :post  %>
+                          </span>
+                        <% else %>
+                          <span id="is_public_<%= file.id %>">
+                            <a class="f_l re_open c_blue">私有</a>
+                          </span>
+                        <% end %>
+
                       <% else %>
                           <!--  <#%= link_to (file.is_public? ? "公开":"私有"),"javascript:void(0)",:class=>"f_l re_open" %> -->
                       <% end %>

app/views/users/_selector_for_messages.html.erb

@@ -19,7 +19,7 @@
             <li><%= link_to "项目任务", user_message_path(User.current, :type => 'issue'), :class => "homepageTypePTask postTypeGrey"  %></li>
             <li><%= link_to "项目讨论", user_message_path(User.current, :type => 'forge_message'), :class => "homepagePostTypeForum postTypeGrey"  %></li>
             <li><%= link_to "项目新闻", user_message_path(User.current, :type => 'forge_news'), :class => "homepageTypePNews postTypeGrey" %></li>
-            <li><%= link_to "用户申请", user_message_path(User.current, :type => 'apply'), :class => "homepageTypeUApply postTypeGrey" %></li>
+            <li><%= link_to "加入项目", user_message_path(User.current, :type => 'apply'), :class => "homepageTypeUApply postTypeGrey" %></li>
           </ul>
         </li>
 
@@ -27,9 +27,9 @@
         <li>
           <ul class="homepagePostTypeMore">
             <li class="f14"><strong>更多</strong></li>
-            <li class="fl w100"><%= link_to "全部",user_message_path(User.current), :class => "resourcesTypeAll postTypeGrey" %></li>
+            <li class="fl w100"><%= link_to "所有消息",user_message_path(User.current), :class => "resourcesTypeAll postTypeGrey" %></li>
             <li class="fl"><%= link_to "未读消息", user_message_path(User.current, :type => 'unviewed'), :class => "homepageTypeUnread postTypeGrey" %></li>
-            <li class="fl w100"><%= link_to "系统消息", user_system_messages_path(User.current), :class => "homepageTypeSystem postTypeGrey" %></li>
+            <li class="fl w100"><%= link_to "系统消息", user_system_messages_path(User.current, :type => 'system_messages'), :class => "homepageTypeSystem postTypeGrey" %></li>
             <li class="fl"><%= link_to "贴吧帖子", user_message_path(User.current, :type => 'forum'), :class => "homepageTypePost postTypeGrey"  %></li>
             <li class="fl w100"><%= link_to "用户留言",user_message_path(User.current, :type => 'user_feedback'), :class => "homepageTypeUMessage postTypeGrey"  %></li>
           </ul>

app/views/users/_user_message_course.html.erb

@@ -37,7 +37,7 @@
           <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
         </ul>
     <% end %>
-    <% if ma.course_message_type == "HomeworkCommon" && ma.status.nil? %>
+    <% if ma.course_message_type == "HomeworkCommon" && ma.status.nil? && !ma.course_message.nil? %>
         <ul class="homepageNewsList fl">
           <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a></li>
           <li class="homepageNewsPubType fl"><%=link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "老师", user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %>
@@ -52,7 +52,7 @@
             <% if User.current.allowed_to?(:as_teacher,ma.course_message.course) %>
                 <p>
                   <%= User.current.lastname + User.current.firstname %>老师您好！
-                  <%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师刚刚发布了一个作业：
+                  <%= User.current.eql?(ma.course_message.user)?"您":(ma.course_message.user.show_name + "老师")%>刚刚发布了一个作业：
                 </p>
                 <p>课程名称：<%= ma.course_message.course.name %>
                   (<%= ma.course_message.course.term %>)</p>
@@ -66,7 +66,7 @@
                   您可以修改作业内容、评分规则、匿评过程等，谢谢！
                 </p>
             <% else %>
-                <p><%= User.current.lastname + User.current.firstname %>同学你好！<%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师刚刚发布了一个作业：</p>
+                <p><%= User.current.lastname + User.current.firstname %>同学您好！<%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师刚刚发布了一个作业：</p>
                 <p>课程名称：<%= ma.course_message.course.name %>
                   (<%= ma.course_message.course.term %>)</p>
                 <p>作业标题：<span style="color:Red;"><%= ma.course_message.name %></span></p>
@@ -102,7 +102,7 @@
                 <p>课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.term %>)</p>
                 <p>作业标题：<span style="color:Red;"><%= ma.course_message.name %></span></p>
                 <p>提交截止：<span style="color:Red;"><%= ma.course_message.end_time %>&nbsp;&nbsp;24点</span></p>
-                <p>匿评关闭：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_end %>&nbsp;@&nbsp;24点</span></p>
+                <p>匿评关闭：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_end %>&nbsp;&nbsp;24点</span></p>
                 <p>迟交扣分：<span style="color:Red;"><%= ma.course_message.late_penalty %>分</span></p>
                 <p>请同学们抓紧时间提交自己的作品，谢谢！</p>
             <% else %>
@@ -302,7 +302,7 @@
                     本次作业将在<%= ma.course_message.student_work.homework_common.homework_detail_manual.evaluation_end %>&nbsp;&nbsp;24点结束匿评，到时您将可以看到所有其他同学的作品啦！大家可以进一步互相学习。
                   </p>
                   <p>
-                    期待你取得更大的进步！
+                    期待您取得更大的进步！
                   </p>
                 </div>
             <% end %>
@@ -348,6 +348,8 @@
                             :onmouseout => "message_titile_hide($(this))" %></a>
               </li>
               <div style="display: none" class="message_title_red system_message_style">
+                <div class="fl">回复人：</div>
+                <div class="ml36"><%= ma.course_message.user.show_name  %></div>
                 <div class="fl">回复内容：</div>
                 <div class="ml60"><%= ma.course_message.notes  %></div>
                 <div class="fl">您的评论：</div>
@@ -359,4 +361,57 @@
             </ul>
         <% end %>
     <% end %>
+    <!-- 作业迟交，不能参与匿评提醒消息 -->
+    <% if ma.course_message_type == "NoEvaluation" %>
+        <ul class="homepageNewsList fl">
+          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"></a></li>
+          <li class="homepageNewsPubType fl">
+            <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">迟交作业，不能参与作业匿评！</span>
+          </li>
+          <% student_work = StudentWork.find(ma.course_message_id)%>
+          <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+            <%= link_to "由于迟交作业，您及您的作品都不能参与作业的匿评", student_work_index_path(:homework => student_work.homework_common_id),
+                        :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}",
+                        :onmouseover => "message_titile_show($(this),event)",
+                        :onmouseout => "message_titile_hide($(this))" %></a></li>
+          <div style="display: none" class="message_title_red system_message_style">
+            <p>
+              <%= User.current.lastname + User.current.firstname %>
+              <%= User.current.allowed_to?(:as_teacher,student_work.homework_common.course) ? '老师':'同学'%>您好！由于迟交作业，您及您的作品都不能参与以下作业的匿评。作业详情如下：
+            </p>
+            <p>课程名称：<%= student_work.homework_common.course.name %>(<%= student_work.homework_common.course.time.to_s + '年' + student_work.homework_common.course.term %>)</p>
+            <p>作业标题：<span style="color:Red;"><%=student_work.homework_common.name %></span></p>
+            <p>提交截止：<span style="color:Red;"><%=student_work.homework_common.end_time %>&nbsp;24:00</span></p>
+            <p>提交时间：<span style="color:Red;"><%=format_time(student_work.created_at) %></span></p>
+          </div>
+          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+        </ul>
+    <% end %>
+    <!-- 创建课程消息 -->
+    <% if ma.course_message_type == "Course" %>
+        <ul class="homepageNewsList fl">
+          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"></a></li>
+          <li class="homepageNewsPubType fl">
+            <span class="newsBlue homepageNewsPublisher">系统提示</span>
+            <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">您成功创建了课程：</span>
+          </li>
+          <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+            <%= link_to "课程名称：" + ma.course_message.name, course_path(ma.course_message),
+                        :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}",
+                        :onmouseover => "message_titile_show($(this),event)",
+                        :onmouseout => "message_titile_hide($(this))" %></a></li>
+          <div style="display: none" class="message_title_red system_message_style">
+            <p>
+              <%= User.current.lastname + User.current.firstname %>老师您好！您成功创建了一个课程，详情如下：
+            </p>
+            <p>课程名称：<%= ma.course_message.name %></p>
+            <p>开课学期：<%= ma.course_message.time.to_s + '年' + ma.course_message.term %></p>
+            <div class="fl">课程描述：</div>
+            <div class="ml60"><%= ma.course_message.description.html_safe %></div>
+            <p>学时总数：<%= ma.course_message.class_period%></p>
+            <p>创建时间：<%= format_time(ma.course_message.created_at) %></p>
+          </div>
+          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+        </ul>
+    <% end %>
 <% end %>

app/views/users/_user_message_forge.html.erb

@@ -20,6 +20,72 @@
           <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
         </ul>
     <% end %>
+    <!--被管理员拉入项目-->
+    <% if ma.forge_message_type == "JoinProject" %>
+        <ul class="homepageNewsList fl">
+          <li class="homepageNewsPortrait fl">
+            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(User.find(ma.forge_message_id)), :width => "30", :height => "30"), user_path(ma.forge_message_id) %></a>
+          </li>
+          <li class="homepageNewsPubType fl">
+            <%=link_to User.find(ma.forge_message_id), user_path(User.find(ma.forge_message_id)), :class => "newsBlue homepageNewsPublisher" %>
+            <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">将您加入了项目：</span>
+          </li>
+          <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+            <%= link_to ma.project, project_member_path(ma.project), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
+                        :onmouseover => "message_titile_show($(this),event)",
+                        :onmouseout => "message_titile_hide($(this))" %></a>
+          </li>
+          <div style="display: none" class="message_title_red system_message_style">
+            <% if ma.project.is_public? || User.current.member_of?(ma.project) %>
+                <p>
+                  项目名称：<%= ma.project.name %>
+                </p>
+
+                <p>
+                  项目描述：<%= ma.project.description %>
+                </p>
+            <% else %>
+                <p>
+                  您已经被移出该私有项目，非项目成员没有权限访问私有项目
+                </p>
+            <% end %>
+          </div>
+          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+        </ul>
+    <% end %>
+    <!-被管理员移出项目-->
+    <% if ma.forge_message_type == "RemoveFromProject" %>
+        <ul class="homepageNewsList fl">
+          <li class="homepageNewsPortrait fl">
+            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(User.find(ma.forge_message_id)), :width => "30", :height => "30"), user_path(ma.forge_message_id) %></a>
+          </li>
+          <li class="homepageNewsPubType fl">
+            <%=link_to User.find(ma.forge_message_id), user_path(User.find(ma.forge_message_id)), :class => "newsBlue homepageNewsPublisher" %>
+            <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">将您移出了项目：</span>
+          </li>
+          <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+            <%= link_to ma.project, member_project_path(ma.project), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
+                        :onmouseover => "message_titile_show($(this),event)",
+                        :onmouseout => "message_titile_hide($(this))" %></a>
+          </li>
+          <div style="display: none" class="message_title_red system_message_style">
+            <% if ma.project.is_public? || User.current.member_of?(ma.project) %>
+                <p>
+                  项目名称：<%= ma.project.name %>
+                </p>
+
+                <p>
+                  项目描述：<%= ma.project.description %>
+                </p>
+            <% else %>
+                <p>
+                  您已经被移出该私有项目，非项目成员没有权限访问私有项目
+                </p>
+            <% end %>
+          </div>
+          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+        </ul>
+    <% end %>
     <!--邀请加入项目-->
     <% if ma.forge_message_type == "ProjectInvite" %>
         <% inviter = User.find(ma.forge_message_id) %>
@@ -29,7 +95,7 @@
           </li>
           <li class="homepageNewsPubType fl">
             <%=link_to inviter, user_path(inviter), :class => "newsBlue homepageNewsPublisher" %>
-            <span class='<%= ma.viewed == 0 ? 'homepageNewsTypeNotRead fl' : 'homepageNewsType fl' %>'>邀请你加入项目</span>
+            <span class='<%= ma.viewed == 0 ? 'homepageNewsTypeNotRead fl' : 'homepageNewsType fl' %>'>邀请你加入项目：</span>
           </li>
           <% if ma.user.member_of?(ma.project) %>
               <li class="homepageNewsContent fl">

lib/plugins/acts_as_attachable/lib/acts_as_attachable.rb

@@ -93,13 +93,13 @@ module Redmine
           end
         end
 
-        def save_attachmentsex(attachments, author=User.current,attachment_type)
+        def save_attachmentsex(attachments, author=User.current,attachment_type, public_status)
           @curattachment_type = attachment_type
-          result = save_attachments(attachments,author)
+          result = save_attachments(attachments,author, public_status)
           result
         end
 
-        def save_attachments(attachments, author=User.current)
+        def save_attachments(attachments, author=User.current,public_status)
           # 清除临时文件
           if attachments
             tempAttach = attachments[:dummy]
@@ -140,11 +140,16 @@ module Redmine
                   end
                 end
               end
-              if a && !attachment['is_public_checkbox']
+              if public_status
+                if a && !attachment['is_public_checkbox']
+                  a.is_public = false
+                elsif a && attachment['is_public_checkbox']
+                  a.is_public = true
+                end
+              else
                 a.is_public = false
-              elsif a && attachment['is_public_checkbox']
-                a.is_public = true
               end
+
               set_attachment_public(a) if a
               next unless a
               a.description = attachment['description'].to_s.strip