Merge branch 'develop' into szzh

app/controllers/issues_controller.rb

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

app/controllers/users_controller.rb

@@ -296,12 +296,16 @@ class UsersController < ApplicationController
 
   #用户作业列表
   def user_homeworks
-    @page = params[:page] ? params[:page].to_i + 1 : 0
+    if User.current == @user
-    user_course_ids = "(" + @user.courses.visible.map{|course| course.id}.join(",") + ")"
+      @page = params[:page] ? params[:page].to_i + 1 : 0
-    @homework_commons = HomeworkCommon.where("course_id in #{user_course_ids}").order("created_at desc").limit(10).offset(@page * 10)
+      user_course_ids = "(" + @user.courses.visible.map{|course| course.id}.join(",") + ")"
-    respond_to do |format|
+      @homework_commons = HomeworkCommon.where("course_id in #{user_course_ids}").order("created_at desc").limit(10).offset(@page * 10)
-      format.js
+      respond_to do |format|
-      format.html {render :layout => 'new_base_user'}
+        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
+    if User.current.logged?
-    @homework = HomeworkCommon.find(params[:homework_id])
+      @user = User.current
-    @is_test = params[:is_test] == 'true'
+      @homework = HomeworkCommon.find(params[:homework_id])
-    @student_work = @homework.student_works.where(user_id: User.current.id).first
+      @is_test = params[:is_test] == 'true'
-    if @student_work.nil?
+      @student_work = @homework.student_works.where(user_id: User.current.id).first
-      @student_work = StudentWork.new
+      if @student_work.nil?
-    end
+        @student_work = StudentWork.new
-    respond_to do |format|
+      end
-      format.js
+      respond_to do |format|
-      format.html {render :layout => 'new_base_user'}
+        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]
+    if User.current.logged?
-      homework = HomeworkCommon.new
+      if params[:homework_common]
-      homework.name = params[:homework_common][:name]
+        homework = HomeworkCommon.new
-      homework.description = params[:homework_common][:description]
+        homework.name = params[:homework_common][:name]
-      homework.end_time = params[:homework_common][:end_time] || Time.now
+        homework.description = params[:homework_common][:description]
-      homework.publish_time = Time.now
+        homework.end_time = params[:homework_common][:end_time] || Time.now
-      homework.homework_type = params[:homework_type].to_i || 1
+        homework.publish_time = Time.now
-      homework.late_penalty = 2
+        homework.homework_type = params[:homework_type].to_i || 1
-      homework.user_id = User.current.id
+        homework.late_penalty = 2
-      homework.course_id = params[:course_id]
+        homework.user_id = User.current.id
-
+        homework.course_id = params[:course_id]
-      homework.save_attachments(params[:attachments])
+
-      render_attachment_warning_if_needed(homework)
+        homework.save_attachments(params[:attachments])
-
+        render_attachment_warning_if_needed(homework)
-      #匿评作业相关属性
+
-      if homework.homework_type == 1
+        #匿评作业相关属性
-        homework_detail_manual = HomeworkDetailManual.new
+        if homework.homework_type == 1
-        homework_detail_manual.ta_proportion = params[:ta_proportion] || 0.6
+          homework_detail_manual = HomeworkDetailManual.new
-        homework_detail_manual.comment_status = 1
+          homework_detail_manual.ta_proportion = params[:ta_proportion] || 0.6
-        homework_detail_manual.evaluation_start = Time.now
+          homework_detail_manual.comment_status = 1
-        homework_detail_manual.evaluation_end = Time.now
+          homework_detail_manual.evaluation_start = Time.now
-        homework_detail_manual.evaluation_num = params[:evaluation_num] || 3
+          homework_detail_manual.evaluation_end = Time.now
-        homework_detail_manual.absence_penalty = 2
+          homework_detail_manual.evaluation_num = params[:evaluation_num] || 3
-        homework.homework_detail_manual = homework_detail_manual
+          homework_detail_manual.absence_penalty = 2
-      else
+          homework.homework_detail_manual = homework_detail_manual
-        homework_detail_programing = HomeworkDetailPrograming.new
+        else
-        homework.homework_detail_programing = homework_detail_programing
+          homework_detail_programing = HomeworkDetailPrograming.new
-        homework_detail_programing.ta_proportion = params[:ta_proportion] || 0.6
+          homework.homework_detail_programing = homework_detail_programing
-        homework_detail_programing.language = params[:program][:language].to_i
+          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 = params[:program][:input]
-          inputs.each_with_index do |val, i|
+          if Array === inputs
-            homework.homework_tests << HomeworkTest.new(
+            inputs.each_with_index do |val, i|
-              input: val,
+              homework.homework_tests << HomeworkTest.new(
-              output: params[:program][:output][i]
+                  input: val,
-            )    
+                  output: params[:program][:output][i]
+              )
+            end
           end
+
         end
-        
-      end
 
-      if homework.save
+        if homework.save
-        homework_detail_manual.save if homework_detail_manual
+          homework_detail_manual.save if homework_detail_manual
-        homework_detail_programing.save if homework_detail_programing
+          homework_detail_programing.save if homework_detail_programing
-        redirect_to user_homeworks_user_path(User.current.id)
+          redirect_to user_homeworks_user_path(User.current.id)
+        end
       end
+    else
+      render_403
     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 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" , active(option_num)).to_i) < 0 %>
+ <% 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>
 

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 => 20150906025009) do
+ActiveRecord::Schema.define(:version => 20150906083453) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false