Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

app/controllers/issues_controller.rb

@@ -386,14 +386,16 @@ class IssuesController < ApplicationController
   end
 
   def add_journal
-    jour = Journal.new
-    jour.user_id = User.current.id
-    jour.notes = params[:notes]
-    jour.journalized = @issue
-    jour.save
-    @user_activity_id = params[:user_activity_id]
-    respond_to do |format|
-      format.js
+    if User.current.logged?
+      jour = Journal.new
+      jour.user_id = User.current.id
+      jour.notes = params[:notes]
+      jour.journalized = @issue
+      jour.save
+      @user_activity_id = params[:user_activity_id]
+      respond_to do |format|
+        format.js
+      end
     end
   end
 

app/controllers/messages_controller.rb

@@ -101,27 +101,27 @@ class MessagesController < ApplicationController
           ids = params[:asset_id].split(',')
           update_kindeditor_assets_owner ids,@message.id,OwnerTypeHelper::MESSAGE
         end
-        # 与我相关动态的记录add start
-        if(@board && @board.course) #项目的先不管
-          teachers = searchTeacherAndAssistant(@board.course)
-          for teacher in teachers
-            if(teacher.user_id != User.current.id)
-              notify = ActivityNotify.new()
-              if(@board.course)
-                notify.activity_container_id = @board.course_id
-                notify.activity_container_type = 'Course'
-              else
-                notify.activity_container_id = @board.project_id
-                notify.activity_container_type = 'Project'
-              end
-              notify.activity_id = @message.id
-              notify.activity_type = 'Message'
-              notify.notify_to = teacher.user_id
-              notify.is_read = 0
-              notify.save()
-            end
-          end
-        end
+        # # 与我相关动态的记录add start
+        # if(@board && @board.course) #项目的先不管
+        #   teachers = searchTeacherAndAssistant(@board.course)
+        #   for teacher in teachers
+        #     if(teacher.user_id != User.current.id)
+        #       notify = ActivityNotify.new()
+        #       if(@board.course)
+        #         notify.activity_container_id = @board.course_id
+        #         notify.activity_container_type = 'Course'
+        #       else
+        #         notify.activity_container_id = @board.project_id
+        #         notify.activity_container_type = 'Project'
+        #       end
+        #       notify.activity_id = @message.id
+        #       notify.activity_type = 'Message'
+        #       notify.notify_to = teacher.user_id
+        #       notify.is_read = 0
+        #       notify.save()
+        #     end
+        #   end
+        # end
         # 与我相关动态的记录add end
 
         call_hook(:controller_messages_new_after_save, { :params => params, :message => @message})

app/controllers/users_controller.rb

@@ -102,22 +102,22 @@ class UsersController < ApplicationController
   # issue：问题；journal：缺陷状态更新； forum：公共贴吧: user_feedback: 用户留言; new_reply:新闻回复（comment）
   def user_messages
     unless User.current.logged?
-      render_403
+      redirect_to signin_url
       return
     end
     # 当前用户查看消息，则设置消息为已读
-    #if params[:viewed] == "all"
-    #  course_querys = @user.course_messages
-    #  forge_querys = @user.forge_messages
-    #  user_querys = @user.user_feedback_messages
-    #  forum_querys = @user.memo_messages
-    #  if User.current.id == @user.id
-    #    course_querys.update_all(:viewed => true)
-    #    forge_querys.update_all(:viewed => true)
-    #    user_querys.update_all(:viewed => true)
-    #    forum_querys.update_all(:viewed => true)
-    #  end
-    #end
+    if params[:viewed] == "all"
+      course_querys = @user.course_messages
+      forge_querys = @user.forge_messages
+      user_querys = @user.user_feedback_messages
+      forum_querys = @user.memo_messages
+      if User.current.id == @user.id
+        course_querys.update_all(:viewed => true)
+        forge_querys.update_all(:viewed => true)
+        user_querys.update_all(:viewed => true)
+        forum_querys.update_all(:viewed => true)
+      end
+    end
     # @new_message_count = forge_querys.count + forum_querys.count + course_querys.count + user_querys.count
     case params[:type]
       when nil
@@ -296,12 +296,16 @@ class UsersController < ApplicationController
 
   #用户作业列表
   def user_homeworks
-    @page = params[:page] ? params[:page].to_i + 1 : 0
-    user_course_ids = "(" + @user.courses.visible.map{|course| course.id}.join(",") + ")"
-    @homework_commons = HomeworkCommon.where("course_id in #{user_course_ids}").order("created_at desc").limit(10).offset(@page * 10)
-    respond_to do |format|
-      format.js
-      format.html {render :layout => 'new_base_user'}
+    if User.current == @user
+      @page = params[:page] ? params[:page].to_i + 1 : 0
+      user_course_ids = "(" + @user.courses.visible.map{|course| course.id}.join(",") + ")"
+      @homework_commons = HomeworkCommon.where("course_id in #{user_course_ids}").order("created_at desc").limit(10).offset(@page * 10)
+      respond_to do |format|
+        format.js
+        format.html {render :layout => 'new_base_user'}
+      end
+    else
+      render_403
     end
   end
 
@@ -345,16 +349,20 @@ class UsersController < ApplicationController
   end
 
   def new_user_commit_homework
-    @user = User.current
-    @homework = HomeworkCommon.find(params[:homework_id])
-    @is_test = params[:is_test] == 'true'
-    @student_work = @homework.student_works.where(user_id: User.current.id).first
-    if @student_work.nil?
-      @student_work = StudentWork.new
-    end
-    respond_to do |format|
-      format.js
-      format.html {render :layout => 'new_base_user'}
+    if User.current.logged?
+      @user = User.current
+      @homework = HomeworkCommon.find(params[:homework_id])
+      @is_test = params[:is_test] == 'true'
+      @student_work = @homework.student_works.where(user_id: User.current.id).first
+      if @student_work.nil?
+        @student_work = StudentWork.new
+      end
+      respond_to do |format|
+        format.js
+        format.html {render :layout => 'new_base_user'}
+      end
+    else
+      render_403
     end
   end
 
@@ -364,53 +372,57 @@ class UsersController < ApplicationController
   end
 
   def user_new_homework
-    if params[:homework_common]
-      homework = HomeworkCommon.new
-      homework.name = params[:homework_common][:name]
-      homework.description = params[:homework_common][:description]
-      homework.end_time = params[:homework_common][:end_time] || Time.now
-      homework.publish_time = Time.now
-      homework.homework_type = params[:homework_type].to_i || 1
-      homework.late_penalty = 2
-      homework.user_id = User.current.id
-      homework.course_id = params[:course_id]
-
-      homework.save_attachments(params[:attachments])
-      render_attachment_warning_if_needed(homework)
-
-      #匿评作业相关属性
-      if homework.homework_type == 1
-        homework_detail_manual = HomeworkDetailManual.new
-        homework_detail_manual.ta_proportion = params[:ta_proportion] || 0.6
-        homework_detail_manual.comment_status = 1
-        homework_detail_manual.evaluation_start = Time.now
-        homework_detail_manual.evaluation_end = Time.now
-        homework_detail_manual.evaluation_num = params[:evaluation_num] || 3
-        homework_detail_manual.absence_penalty = 2
-        homework.homework_detail_manual = homework_detail_manual
-      else
-        homework_detail_programing = HomeworkDetailPrograming.new
-        homework.homework_detail_programing = homework_detail_programing
-        homework_detail_programing.ta_proportion = params[:ta_proportion] || 0.6
-        homework_detail_programing.language = params[:program][:language].to_i
-
-        inputs = params[:program][:input]
-        if Array === inputs
-          inputs.each_with_index do |val, i|
-            homework.homework_tests << HomeworkTest.new(
-              input: val,
-              output: params[:program][:output][i]
-            )    
+    if User.current.logged?
+      if params[:homework_common]
+        homework = HomeworkCommon.new
+        homework.name = params[:homework_common][:name]
+        homework.description = params[:homework_common][:description]
+        homework.end_time = params[:homework_common][:end_time] || Time.now
+        homework.publish_time = Time.now
+        homework.homework_type = params[:homework_type].to_i || 1
+        homework.late_penalty = 2
+        homework.user_id = User.current.id
+        homework.course_id = params[:course_id]
+
+        homework.save_attachments(params[:attachments])
+        render_attachment_warning_if_needed(homework)
+
+        #匿评作业相关属性
+        if homework.homework_type == 1
+          homework_detail_manual = HomeworkDetailManual.new
+          homework_detail_manual.ta_proportion = params[:ta_proportion] || 0.6
+          homework_detail_manual.comment_status = 1
+          homework_detail_manual.evaluation_start = Time.now
+          homework_detail_manual.evaluation_end = Time.now
+          homework_detail_manual.evaluation_num = params[:evaluation_num] || 3
+          homework_detail_manual.absence_penalty = 2
+          homework.homework_detail_manual = homework_detail_manual
+        else
+          homework_detail_programing = HomeworkDetailPrograming.new
+          homework.homework_detail_programing = homework_detail_programing
+          homework_detail_programing.ta_proportion = params[:ta_proportion] || 0.6
+          homework_detail_programing.language = params[:program][:language].to_i
+
+          inputs = params[:program][:input]
+          if Array === inputs
+            inputs.each_with_index do |val, i|
+              homework.homework_tests << HomeworkTest.new(
+                  input: val,
+                  output: params[:program][:output][i]
+              )
+            end
           end
+
         end
-        
-      end
 
-      if homework.save
-        homework_detail_manual.save if homework_detail_manual
-        homework_detail_programing.save if homework_detail_programing
-        redirect_to user_homeworks_user_path(User.current.id)
+        if homework.save
+          homework_detail_manual.save if homework_detail_manual
+          homework_detail_programing.save if homework_detail_programing
+          redirect_to user_homeworks_user_path(User.current.id)
+        end
       end
+    else
+      render_403
     end
   end
 
@@ -507,6 +519,7 @@ class UsersController < ApplicationController
         att_copy = atta.copy
         att_copy.container_id = nil
         att_copy.container_type = nil
+        att_copy.author_id = User.current.id
         att_copy.copy_from = atta.id
         att_copy.save
         @attachments << att_copy
@@ -540,6 +553,10 @@ class UsersController < ApplicationController
 
 # modified by fq
   def user_newfeedback
+    unless User.current.logged?
+      redirect_to signin_url
+      return
+    end
     # 更新用户留言消息状态
     @user.journals_for_messages.each do |jour_message|
       jour_message.user_feedback_messages.each do |userfeedback_message|

app/models/course_message.rb

@@ -15,6 +15,8 @@ class CourseMessage < ActiveRecord::Base
   after_create :add_user_message
 
   def add_user_message
-    self.message_alls << MessageAll.new(:user_id => self.user_id)
+    if MessageAll.where("message_type = '#{self.class.to_s}' and message_id = '#{self.id}'").first.nil?
+      self.message_alls << MessageAll.new(:user_id => self.user_id)
+    end
   end
 end

app/models/forge_message.rb

@@ -22,6 +22,8 @@ class ForgeMessage < ActiveRecord::Base
   after_create :add_user_message
 
   def add_user_message
-    self.message_alls << MessageAll.new(:user_id => self.user_id)
+    if MessageAll.where("message_type = '#{self.class.to_s}' and message_id = '#{self.id}'").first.nil?
+      self.message_alls << MessageAll.new(:user_id => self.user_id)
+    end
   end
 end

app/models/memo_message.rb

@@ -12,6 +12,8 @@ class MemoMessage < ActiveRecord::Base
   after_create :add_user_message
 
   def add_user_message
-    self.message_alls << MessageAll.new(:user_id => self.user_id)
+    if MessageAll.where("message_type = '#{self.class.to_s}' and message_id = '#{self.id}'").first.nil?
+      self.message_alls << MessageAll.new(:user_id => self.user_id)
+    end
   end
 end

app/models/news.rb

@@ -121,7 +121,7 @@ class News < ActiveRecord::Base
   # Description 公用表中也要记录
   def act_as_forge_activity
     # 如果是project为空，那么是课程相关的，不需要保存
-    if !self.project.nil?
+    if self.project
       self.forge_acts << ForgeActivity.new(:user_id => self.author_id,
                                              :project_id => self.project.id)
     end

app/models/query.rb

@@ -492,28 +492,29 @@ class Query < ActiveRecord::Base
 
   def project_statement
     project_clauses = []
-    unless project.descendants.blank?
-      if project && !project.descendants.active.empty?
-        ids = [project.id]
-        if has_filter?("subproject_id")
-          case operator_for("subproject_id")
-            when '='
-              # include the selected subprojects
-              ids += values_for("subproject_id").each(&:to_i)
-            when '!*'
-              # main project only
-            else
-              # all subprojects
-              ids += project.descendants.collect(&:id)
-          end
-        elsif Setting.display_subprojects_issues?
-          ids += project.descendants.collect(&:id)
-        end
-        project_clauses << "#{Project.table_name}.id IN (%s)" % ids.join(',')
-      elsif project
+    # unless project.descendants.blank?
+    #   if project && project.descendants && project.descendants.active && !project.descendants.active.empty?
+        # ids = [project.id]
+        # if has_filter?("subproject_id")
+        #   case operator_for("subproject_id")
+        #     when '='
+        #       # include the selected subprojects
+        #       ids += values_for("subproject_id").each(&:to_i)
+        #     when '!*'
+        #       # main project only
+        #     else
+        #       # all subprojects
+        #       ids += project.descendants.collect(&:id)
+        #   end
+        # elsif Setting.display_subprojects_issues?
+        #   ids += project.descendants.collect(&:id)
+        # end
+        # project_clauses << "#{Project.table_name}.id IN (%s)" % ids.join(',')
+      # elsif project
+    if project
         project_clauses << "#{Project.table_name}.id = %d" % project.id
-      end
     end
+    # end
     project_clauses.any? ? project_clauses.join(' AND ') : nil
   end
 

app/models/user_feedback_message.rb

@@ -11,6 +11,8 @@ class UserFeedbackMessage < ActiveRecord::Base
   after_save :add_user_message
 
   def add_user_message
-    self.message_alls << MessageAll.new(:user_id => self.user_id)
+    if MessageAll.where("message_type = '#{self.class.to_s}' and message_id = '#{self.id}'").first.nil?
+      self.message_alls << MessageAll.new(:user_id => self.user_id)
+    end
   end
 end

app/views/layouts/base_tags.html.erb

@@ -19,12 +19,23 @@
 <%= call_hook :view_layouts_base_html_head %>
 <!-- page specific tags -->
 <%= yield :header_tags -%>
+  <%= stylesheet_link_tag 'base','header', :media => 'all'%>
 </head>
 <body class="<%=h body_css_classes %>">
+
+<div class="cl"></div>
+<div class="navContainer mb10">
+  <% if User.current.logged? %>
+      <%= render :partial => 'layouts/logined_header',:locals=>{:name=>@name,:type=>@type} %>
+  <% else%>
+      <%= render :partial => 'layouts/unlogin_header',:locals=>{:name=>@name,:type=>@type} %>
+  <% end%>
+</div>
+<div class="cl"></div>
+
 <div id="wrapper">
 <div id="wrapper2">
 <div id="wrapper3">
-<%= render :partial => 'layouts/base_header'%>
 
 <div id="main" class="">
     <div id="sidebar">
@@ -38,7 +49,6 @@
         <%= call_hook :view_layouts_base_content %>
         <div style="clear:both;"></div>
     </div>
-    <%= render :partial => 'layouts/base_footer'%>
 </div>
 </div>
 
@@ -47,6 +57,11 @@
 
 </div>
 </div>
+
+<div class="cl"></div>
+<%= render :partial => 'layouts/footer' %>
+<div class="cl"></div>
+
 <%= call_hook :view_layouts_base_body_bottom %>
 </body>
 </html>

app/views/users/_influence_new_score_index.html.erb

@@ -5,4 +5,4 @@
 <div>&nbsp;&nbsp;&nbsp; <%= l('userscore.active.update_issues')%> * 2 = <%= option_num.issue_done_ratio %> * 2 = <%= option_num.issue_done_ratio * 2 %></div>
 <div>&nbsp;&nbsp;&nbsp; <%= l('userscore.active.release_issues')%> * 4 = <%= option_num.post_issue %> * 4 = <%= option_num.post_issue * 4 %></div>
 <div>&nbsp;&nbsp;&nbsp; <%= l('userscore.active.release_messages')%> * 1 = <%= option_num.memo %> * 2 = <%=  option_num.memo * 2 %></div>
-<div>&nbsp;&nbsp;&nbsp; <%= l(:label_user_score_of_active)%> = <%= option_num.changeset * 4 %> + <%= option_num.document * 4 %> + <%= option_num.attachment * 4 %> + <%= option_num.issue_done_ratio * 2 %> + <%= option_num.post_issue * 4 %> + <%=  option_num.memo * 2 %> = <%= active(option_num) %> </div>
+<div>&nbsp;&nbsp;&nbsp; <%= l(:label_user_score_of_active)%> = <%= option_num.changeset * 4 %> + <%= option_num.document * 4 %> + <%= option_num.attachment * 4 %> + <%= option_num.issue_done_ratio * 2 %> + <%= option_num.post_issue * 4 %> + <%=  option_num.memo * 2 %> = <%= project_active(option_num) %> </div>

app/views/users/_score_new_index.html.erb

@@ -5,8 +5,8 @@
   <%= l(:label_user_score_of_skill)%> + <%= l(:label_user_score_of_active) %></div>
 <!-- <div>&nbsp;&nbsp;&nbsp;+ <%#= l(:label_user_score_of_influence) %></div> -->
 <div> = <%= format("%.2f" ,collaboration(option_num)).to_i %> +  <%= format("%.2f" , influence(option_num) ).to_i %>
-   + <%= "(" if skill(option_num) < 0 %> <%= format("%.2f" , skill(option_num)).to_i %> <%= ")" if skill(option_num) < 0 %> + <%= format("%.2f" , active(option_num)).to_i %></div>
- <% if (format("%.2f" ,collaboration(option_num)).to_i + format("%.2f" , influence(option_num) ).to_i + format("%.2f" , skill(option_num)).to_i + format("%.2f" , active(option_num)).to_i) < 0 %>
+   + <%= "(" if skill(option_num) < 0 %> <%= format("%.2f" , skill(option_num)).to_i %> <%= ")" if skill(option_num) < 0 %> + <%= format("%.2f" ,project_active(option_num)).to_i %></div>
+ <% if (format("%.2f" ,collaboration(option_num)).to_i + format("%.2f" , influence(option_num) ).to_i + format("%.2f" , skill(option_num)).to_i + format("%.2f" , project_active(option_num)).to_i) < 0 %>
     <div><%= l(:label_score_less_than_zero) %></div>
     <% else %>
     <div> = <%= format("%.2f" ,option_num.total_score).to_i %></div>

app/views/users/_show_new_score.html.erb

@@ -68,7 +68,7 @@
     </li>
     <li>
       <%= link_to l(:label_user_score_of_active), "javascript:void(0)", :onclick => "show_div('influence_new_score_index')" %> ：
-      <%= format("%.2f" , active(option_num)).to_i %>
+      <%= format("%.2f" , project_active(option_num)).to_i %>
     </li>
   </ul>
 

app/views/users/user_messages.html.erb

@@ -29,7 +29,11 @@
   </div>
 <div class="resources mt10" id="users_setting">
 <div>
-
+<% if params[:type].nil? %>
+    <div class="newsReadSetting">
+      有&nbsp;<span class="c_red"><%= User.current.count_new_message %></span>&nbsp;条未读<a href="javascript:void(0);" class="ml15"><%= link_to "全部设为已读", user_message_path(User.current, :viewed => 'all') %></a>
+    </div>
+<% end %>
 <% if @message_alls.count >0 %>
     <%# 课程消息 %>
     <% unless @message_alls.nil? %>

db/migrate/20150906025009_forge_activitues_date.rb

@@ -0,0 +1,25 @@
+class ForgeActivituesDate < ActiveRecord::Migration
+  def up
+    forge_count = ForgeActivity.all.count / 30 + 2
+    transaction do
+      for i in 1 ... forge_count do i
+      ForgeActivity.page(i).per(30).each do |activity|
+        unless activity.forge_act_type == "ProjectCreateInfo"
+          if activity.forge_act
+            unless activity.forge_act.project
+              # puts activity.id
+              activity.destroy
+            end
+          else
+            # puts activity.id.to_s + "----"
+            activity.destroy
+          end
+        end
+      end
+      end
+    end
+  end
+
+  def down
+  end
+end

db/migrate/20150906083453_delete_anonymous_jour.rb

@@ -0,0 +1,15 @@
+class DeleteAnonymousJour < ActiveRecord::Migration
+  def up
+    jour_count = Journal.all.count / 30 + 2
+    transaction do
+      for i in 1 ... jour_count do i
+      Journal.page(i).per(30).each do |jour|
+        jour.destroy if jour.user_id == 2
+      end
+      end
+    end
+  end
+
+  def down
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20150829070453) do
+ActiveRecord::Schema.define(:version => 20150906083453) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -1296,11 +1296,11 @@ ActiveRecord::Schema.define(:version => 20150829070453) do
 
   create_table "student_work_tests", :force => true do |t|
     t.integer  "student_work_id"
-    t.integer  "homework_test_id"
-    t.integer  "result"
-    t.datetime "created_at",       :null => false
-    t.datetime "updated_at",       :null => false
-    t.text     "error_msg"
+    t.datetime "created_at",                     :null => false
+    t.datetime "updated_at",                     :null => false
+    t.integer  "status",          :default => 9
+    t.text     "results"
+    t.text     "src"
   end
 
   create_table "student_works", :force => true do |t|
@@ -1317,6 +1317,7 @@ ActiveRecord::Schema.define(:version => 20150829070453) do
     t.datetime "updated_at",                                                   :null => false
     t.integer  "late_penalty",                                  :default => 0
     t.integer  "absence_penalty",                               :default => 0
+    t.integer  "system_score"
   end
 
   create_table "student_works_evaluation_distributions", :force => true do |t|
@@ -1534,7 +1535,6 @@ ActiveRecord::Schema.define(:version => 20150829070453) do
     t.string   "identity_url"
     t.string   "mail_notification",               :default => "",    :null => false
     t.string   "salt",              :limit => 64
-    t.integer  "gid"
   end
 
   add_index "users", ["auth_source_id"], :name => "index_users_on_auth_source_id"

public/stylesheets/nyan.css

@@ -210,7 +210,7 @@ span[id^=valid_user] {
 p.jRatingInfos {
     position: absolute;
     z-index: 9999;
-    background: transparent url('bg_jRatingInfos.png') no-repeat;
+    /*background: transparent url('bg_jRatingInfos.png') no-repeat;*/
     color: #CACACA;
     display: none;
     width: 91px;