Merge branch 'cxt_course' into develop

app/views/layouts/base_courses.html.erb

@@ -176,7 +176,7 @@
               <% if student_score.score.to_i != 0 %>
                   <li> <a href="javascript:void:(0);"><%=link_to image_tag(url_to_avatar(student_score.user), :width => "35", :height => "35", :class=> "rankPortrait"),user_path(student_score.user) %></a>
                     <p><a href="javascript:void:(0);"><%=link_to student_score.user.show_name, user_path(student_score.user), :title => student_score.user.show_name %></a></p>
-                    <p><span class="c_red" style="cursor:pointer" title="作业总分：<%= student_score.score  %>"><%= student_score.score.to_i %></span></p>
+                    <p><span class="c_red" style="cursor:pointer" title="作业总分：<%= format("%.1f",student_score.score<0 ? 0 : student_score.score) %>"><%= student_score.score<0 ? 0 : student_score.score.to_i %></span></p>
                   </li>
               <% end %>
           <% end %>

app/views/org_document_comments/_new.html.erb

@@ -1,8 +1,12 @@
 <%= content_for(:header_tags) do %>
     <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
+    <%= javascript_include_tag "des_KindEditor"  %>
 <% end %>
 
 <script>
+    $(function(){
+        init_des_data(150);
+    });
     function check_org_title()
     {
         if($("#document_title").val().trim() == "")
@@ -26,14 +30,14 @@
     }
     function cancel_create_org_document(){
         $("#document_title").val("");
-        org_document_description_editor.html("");
-        org_document_description_editor.sync();
+        //org_document_description_editor.html("");
+        //org_document_description_editor.sync();
         $('#org_document_editor').hide();
         $('#doc_title_hint').hide();
     }
 </script>
-<%= form_tag organization_org_document_comments_path(:organization_id => @organization.id), :id => 'new_org_document_form' do |f| %>
-    <div class="resources">
+    <div class="resources" nhname="new_topic_form">
+      <%= form_tag organization_org_document_comments_path(:organization_id => @organization.id), :id => 'new_org_document_form' do |f| %>
       <div>
         <input class="postDetailInput fl" maxlength="250" name="org_document_comment[title]" id="document_title" style="resize:none;" onfocus = "$('#org_document_editor').show();" placeholder="请输入文章标题" />
       </div>
@@ -41,10 +45,10 @@
       <div class="cl"></div>
       <div id="org_document_editor" class="mt10" style="display: none">
         <div>
-          <%= kindeditor_tag 'org_document_comment[content]','', :editor_id => 'org_document_description_editor', :height => "150px" %>
+          <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='description_textarea' name="org_document_comment[content]"></textarea>
+          <%#= kindeditor_tag 'org_document_comment[content]','', :editor_id => 'org_document_description_editor', :height => "150px" %>
         </div>
         <div class="cl"></div>
-
         <p id="homework_course_id_span" class="c_red mt5"></p>
         <div class="cl"></div>
         <div class="mt10">
@@ -54,12 +58,11 @@
         </div>
         <div class="cl"></div>
         <div class="mt5">
-          <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="create_org_document();">确定</a>
+          <a href="javascript:void(0);" class="BlueCirBtnMini fr" id="new_topic_submit_btn">确定</a>
           <span class="fr mr10 mt3">或</span>
-          <a href="javascript:void(0);" onclick="cancel_create_org_document();" class="fr mr10 mt3">取消</a>
+          <a href="javascript:void(0);" id="new_topic_cancel_btn" class="fr mr10 mt3">取消</a>
           <div class="cl"></div>
         </div>
-
       </div>
+      <% end %>
     </div>
-<% end %>

app/views/org_document_comments/edit.html.erb

@@ -31,7 +31,7 @@
       </div>
       <div id="doc_title_hint"></div>
       <div class="cl"></div>
-      <div id="org_document_editor" >
+      <div>
         <div class="mt10">
           <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='description_textarea' name="org_document_comment[content]"><%=@org_document.content.html_safe %></textarea>
           <%#= kindeditor_tag 'org_document_comment[content]','', :editor_id => 'org_document_description_editor', :height => "150px" %>

app/views/org_document_comments/new.html.erb

@@ -39,7 +39,7 @@
     </div>
     <div id="doc_title_hint">
     </div>
-    <div id="org_document_editor" class="mt15" >
+    <div class="mt15" >
       <div class="mt10">
         <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='description_textarea' name="org_document_comment[content]"></textarea>
         <%#= kindeditor_tag 'org_document_comment[content]','', :editor_id => 'org_document_description_editor', :height => "150px" %>

db/migrate/20160224074034_update_one_student_score.rb

@@ -0,0 +1,38 @@
+class UpdateOneStudentScore < ActiveRecord::Migration
+  def up
+    student_work_score = StudentWorksScore.where("user_id = 11688 AND student_work_id = 34414").first
+    student_work_score.score = 100
+    student_work_score.save
+    student_works = StudentWork.where("user_id = 6456")
+    student_works.each do |work|
+      unless work.student_works_scores.empty?
+        if work.student_works_scores.where(:reviewer_role => 2).empty?
+          work.teaching_asistant_score = nil
+        else
+          work.teaching_asistant_score = work.student_works_scores.where(:reviewer_role => 2).average(:score).try(:round, 2).to_f
+        end
+        if work.student_works_scores.where(:reviewer_role => 3).empty?
+          work.student_score = nil
+        else
+          work.student_score = work.student_works_scores.where(:reviewer_role => 3).average(:score).try(:round, 2).to_f
+        end
+      end
+      if work.teaching_asistant_score.nil?
+        work.final_score = work.student_score
+      elsif work.student_score.nil?
+        work.final_score = work.teaching_asistant_score
+      else
+        homework = HomeworkCommon.find work.homework_common_id
+        ta_proportion = homework.homework_detail_manual.ta_proportion
+        final_ta_score = BigDecimal.new("#{work.teaching_asistant_score}") * BigDecimal.new("#{ta_proportion}")
+        final_s_score = BigDecimal.new("#{work.student_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{ta_proportion}"))
+        final_score = final_ta_score + final_s_score
+        work.final_score = format("%.2f",final_score.to_f)
+      end
+      work.save
+    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 => 20160223073859) do
+ActiveRecord::Schema.define(:version => 20160224074034) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -1269,7 +1269,6 @@ ActiveRecord::Schema.define(:version => 20160223073859) do
     t.text     "description"
     t.integer  "creator_id"
     t.integer  "home_id"
-    t.string   "domain"
     t.boolean  "is_public"
     t.datetime "created_at",                             :null => false
     t.datetime "updated_at",                             :null => false

public/javascripts/des_kindEditor.js

@@ -90,7 +90,9 @@ function init_form(params){
 }
 function nh_reset_form(params){
     params.form[0].reset();
-    params.texttitle.empty();
+    $("#document_title").val("");
+    $('#org_document_editor').hide();
+    $('#doc_title_hint').hide();
     params.textarea.empty();
     if(params.editor != undefined){
         params.editor.html(params.textarea.html());
@@ -134,4 +136,8 @@ function init_des_data(){
             }
         });
     });
+
+    div_form = $("div[nhname='new_topic_form']");
+    $(".ke-edit", div_form).css("height","150px");
+    $(".ke-edit-iframe",div_form).css("height","150px");
 }

public/stylesheets/courses.css

@@ -1186,7 +1186,7 @@ a:hover.testEdit{ background:url(images/icons.png) -21px -272px  no-repeat;}
 .courseMenuSetting:hover {background:url(../images/homepage_icon2.png) -190px -407px no-repeat;}
 .rankList {width:220px; padding:10px; background-color:#ffffff; margin-top:10px;}
 .rankList li {width:73px; padding:8px 0px 0px 0px; text-align:center; float:left; position:relative;}
-.rankList li p {width:100%; overflow:hidden; white-space:normal; text-overflow:ellipsis; color:#585858;word-wrap: normal; word-break: normal;}
+.rankList li p {width:100%; overflow:hidden; white-space:nowrap; text-overflow:ellipsis; color:#585858;word-wrap: normal; word-break: normal;}
 .rankPortrait {border-radius:50%; width:35px; height:35px;}
 .numIntro {position:absolute; text-align:left; z-index:999; box-shadow:0px 2px 8px rgba(146, 153, 169, 0.5); border:1px solid #eaeaea; background-color:#ffffff; padding:3px 5px; left:15px; color:#585858; white-space: nowrap;}
 .font_cus {font-family: "微软雅黑","宋体"; font-size: 12px; line-height: 1.5;}