Merge branch 'cxt_course' into szzh

app/controllers/exercise_controller.rb

@@ -16,10 +16,7 @@ class ExerciseController < ApplicationController
         exercise.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => course.id, :viewed => false, :status => 2)
       end
     end
-    end_exercises = Exercise.where("end_time <=? and exercise_status = 2",Time.now)
+
-    end_exercises.each do |exercise|
-      exercise.update_column('exercise_status', 3)
-    end
     if @course.is_public == 0 && !(User.current.member_of_course?(@course)||User.current.admin?)
       render_403
       return
@@ -46,10 +43,7 @@ class ExerciseController < ApplicationController
         exercise.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => course.id, :viewed => false, :status => 2)
       end
     end
-    end_exercises = Exercise.where("end_time <=? and exercise_status = 2",Time.now)
+
-    end_exercises.each do |exercise|
-      exercise.update_column('exercise_status', 3)
-    end
     unless User.current.member_of_course?(@course) || User.current.admin?
       render_403
       return

app/views/boards/_course_show.html.erb

@@ -1,20 +1,3 @@
-<%= content_for(:header_tags) do %>
-    <%= import_ke(enable_at: false, prettify: false) %>
-    <%= javascript_include_tag "init_activity_KindEditor" %>
-<% end %>
-
-<style type="text/css">
-    /*回复框*/
-    .homepagePostReplyInputContainer .ke-toolbar {display: none; width: 400px; border: none; background: none; padding: 0px 0px;}
-    .homepagePostReplyInputContainer .ke-toolbar-icon {line-height: 26px; font-size: 14px; padding-left: 26px;}
-    .homepagePostReplyInputContainer .ke-toolbar-icon-url {background-image: url(/images/public_icon.png)}
-    .homepagePostReplyInputContainer .ke-outline {padding: 0px 0px; line-height: 26px; font-size: 14px;}
-    .homepagePostReplyInputContainer .ke-icon-emoticons {background-position: 0px -671px; width: 50px; height: 26px;}
-    .homepagePostReplyInputContainer .ke-icon-emoticons:hover {background-position: -79px -671px; width: 50px; height: 26px;}
-    .homepagePostReplyInputContainer .ke-outline {border: none;}
-    .homepagePostReplyInputContainer .ke-inline-block {display: none;}
-    .homepagePostReplyInputContainer .ke-container {float: left;}
-</style>
 <script type="text/javascript">
     $(function(){
         $("#RSide").removeAttr("id");
@@ -45,61 +28,8 @@
   <% if User.current.logged? %>
     <%= labelled_form_for @message, :url =>{:controller=>'messages',:action => 'new',  :board_id => @board.id, :is_board => 'true'},
                           :html => {:nhname=>'form',:multipart => true, :id => 'message-form'} do |f| %>
-        <%= render :partial => 'course_new', :locals => {:f => f, :topic => @message, :edit_mode => false, :course => course} %>
+        <%= render :partial => 'course_new', :locals => {:f => f, :topic => @message, :edit_mode => false, :course => @board.course} %>
     <% end %>
   <% end %>
-
+  <%= render :partial=> 'course_show_detail',:locals =>{:topics => @topics, :page => 0} %>
-  <% if topics%>
-  <% topics.each do |topic| %>
-      <script>
-          function expand_reply(container, btnid) {
-              var target = $(container);
-              var btn = $(btnid);
-              if (btn.data('init') == '0') {
-                  btn.data('init', 1);
-                  btn.html('收起回复');
-                  target.show();
-              } else {
-                  btn.data('init', 0);
-                  btn.html('展开更多');
-                  target.hide();
-                  target.eq(0).show();
-                  target.eq(1).show();
-                  target.eq(2).show();
-              }
-          }
-
-          function expand_reply_input(id) {
-              $(id).toggle();
-          }
-
-          $(function () {
-              init_activity_KindEditor_data(<%= topic.id%>, null, "87%");
-              showNormalImage('activity_description_<%= topic.id %>');
-              /*var description_images=$("div#activity_description_<%#= topic.id %>").find("img");
-              if (description_images.length>0) {
-                  for (var i=0; i<description_images.length; i++){
-                      var image=$(description_images[i]);
-                      var element=$("<a></a>").attr("href",image.attr('src'));
-                      image.wrap(element);
-                  }
-              }
-              $('#activity_description_<%#= topic.id %> a').colorbox({rel:'nofollow', close: "关闭", returnFocus: false});*/
-          });
-      </script>
-      <% if topic %>
-          <%= render :partial => 'users/course_message', :locals => {:activity => topic, :user_activity_id => topic.id} %>
-      <% end %>
-  <% end %>
-
-  <% if topics.count == 10 %>
-      <div id="show_more_course_topic" class="loadMore mt10 f_grey">展开更多<%= link_to "", boards_topic_path(@board, :course_id => @board.course.id ,:page => page), :id => "more_topic_link", :remote => "true", :class => "none" %></div>
-  <% end %>
-<% end%>
 </div>
-
-  <script type="text/javascript">
-      $("#show_more_course_topic").mouseover(function () {
-          $("#more_topic_link").click();
-      });
-  </script>

app/views/boards/_course_show_detail.html.erb

@@ -0,0 +1,70 @@
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false) %>
+    <%= javascript_include_tag "init_activity_KindEditor" %>
+<% end %>
+
+<style type="text/css">
+    /*回复框*/
+    .homepagePostReplyInputContainer .ke-toolbar {display: none; width: 400px; border: none; background: none; padding: 0px 0px;}
+    .homepagePostReplyInputContainer .ke-toolbar-icon {line-height: 26px; font-size: 14px; padding-left: 26px;}
+    .homepagePostReplyInputContainer .ke-toolbar-icon-url {background-image: url(/images/public_icon.png)}
+    .homepagePostReplyInputContainer .ke-outline {padding: 0px 0px; line-height: 26px; font-size: 14px;}
+    .homepagePostReplyInputContainer .ke-icon-emoticons {background-position: 0px -671px; width: 50px; height: 26px;}
+    .homepagePostReplyInputContainer .ke-icon-emoticons:hover {background-position: -79px -671px; width: 50px; height: 26px;}
+    .homepagePostReplyInputContainer .ke-outline {border: none;}
+    .homepagePostReplyInputContainer .ke-inline-block {display: none;}
+    .homepagePostReplyInputContainer .ke-container {float: left;}
+</style>
+<% if topics%>
+    <% topics.each do |topic| %>
+        <script>
+            function expand_reply(container, btnid) {
+                var target = $(container);
+                var btn = $(btnid);
+                if (btn.data('init') == '0') {
+                    btn.data('init', 1);
+                    btn.html('收起回复');
+                    target.show();
+                } else {
+                    btn.data('init', 0);
+                    btn.html('展开更多');
+                    target.hide();
+                    target.eq(0).show();
+                    target.eq(1).show();
+                    target.eq(2).show();
+                }
+            }
+
+            function expand_reply_input(id) {
+                $(id).toggle();
+            }
+
+            $(function () {
+                init_activity_KindEditor_data(<%= topic.id%>, null, "87%");
+                showNormalImage('activity_description_<%= topic.id %>');
+                /*var description_images=$("div#activity_description_<%#= topic.id %>").find("img");
+                 if (description_images.length>0) {
+                 for (var i=0; i<description_images.length; i++){
+                 var image=$(description_images[i]);
+                 var element=$("<a></a>").attr("href",image.attr('src'));
+                 image.wrap(element);
+                 }
+                 }
+                 $('#activity_description_<%#= topic.id %> a').colorbox({rel:'nofollow', close: "关闭", returnFocus: false});*/
+            });
+        </script>
+        <% if topic %>
+            <%= render :partial => 'users/course_message', :locals => {:activity => topic, :user_activity_id => topic.id} %>
+        <% end %>
+    <% end %>
+
+    <% if topics.count == 10 %>
+        <div id="show_more_course_topic" class="loadMore mt10 f_grey">展开更多<%= link_to "", boards_topic_path(@board, :course_id => @board.course.id ,:page => page), :id => "more_topic_link", :remote => "true", :class => "none" %></div>
+    <% end %>
+<% end%>
+
+<script type="text/javascript">
+    $("#show_more_course_topic").mouseover(function () {
+        $("#more_topic_link").click();
+    });
+</script>

app/views/boards/show.js.erb

@@ -1 +1 @@
-$("#show_more_course_topic").replaceWith("<%= escape_javascript( render :partial =>  'boards/course_show',:locals => {:topics => @topics, :page => @page} )%>");
+$("#show_more_course_topic").replaceWith("<%= escape_javascript( render :partial =>  'boards/course_show_detail',:locals => {:topics => @topics, :page => @page} )%>");

app/views/exercise/_student_exercise.html.erb

@@ -75,6 +75,9 @@
       <li class="hworkList130 c_grey student_work_<%= exercise.id%>">
         <% if exercise.created_at%>
             <%= Time.parse(format_time(exercise.created_at)).strftime("%m-%d %H:%M")%>&nbsp;
+            <% if @exercise.end_time <= exercise.created_at %>
+                <span class="c_red">[未答]</span>
+            <% end %>
         <% end %>
       </li>
 

app/views/student_work/_choose_group_member.html.erb

@@ -1,3 +1,4 @@
+<% if @homework.homework_detail_group %>
 <div id="popbox02">
   <div>
     <div class="relateText fl">请从<%= @homework.homework_detail_group.base_on_project == 1 ? '项目成员':'课程成员' %>中添加小组成员</div>
@@ -105,4 +106,5 @@
             <% end %>
         <% end %>
     });
-</script>
+</script>
+<% end %>

app/views/users/_course_homework.html.erb

@@ -97,11 +97,21 @@
       <div id="intro_content_show_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
       <div id="intro_content_hide_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>
       <div class="cl"></div>
-      <div class="mt5">
+
+      <div class="mt10">
         <div class="homepagePostDeadline">
+          迟交扣分：<%= activity.late_penalty%>分
+        </div>
+        <div class="homepagePostDeadline" style="float: right; margin-right: 220px;">
           匿评开启时间：<%= activity.homework_detail_manual.evaluation_start%>&nbsp;00:00
         </div>
-        <div class="homepagePostDeadline ml15">
+      </div>
+      <div class="cl"></div>
+      <div>
+        <div class="homepagePostDeadline">
+          缺评扣分：<%= activity.homework_detail_manual.absence_penalty%>分/作品
+        </div>
+        <div class="homepagePostDeadline" style="float: right; margin-right: 220px;">
           匿评关闭时间：<%= activity.homework_detail_manual.evaluation_end%>&nbsp;23:59
         </div>
       </div>

app/views/users/_user_group_attr.html.erb

@@ -10,7 +10,7 @@
 </div>
 <div class="mb10 mt10">
   <label>
-    <input type="checkbox" class="mr5" name="base_on_project" value="<%=(edit_mode && homework.is_group_homework?) ? homework.homework_detail_group.base_on_project : 0 %>" id="base_on_project"/>
+    <input type="checkbox" class="mr5" name="base_on_project" checked value="<%=(edit_mode && homework.is_group_homework?) ? homework.homework_detail_group.base_on_project : 1 %>" id="base_on_project"/>
     <span class="f14 fontGrey3 mr10">基于项目实施</span>
   </label>
   <p class="c_red">提醒：勾选后各小组必须在Trustie平台创建项目，教师可随时观察平台对各小组最新进展的实时统计。</p>

app/views/users/_user_homework_detail.html.erb

@@ -102,11 +102,21 @@
       <div id="intro_content_show_<%= homework_common.id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
       <div id="intro_content_hide_<%= homework_common.id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>
       <div class="cl"></div>
-      <div class="mt5">
+
+      <div class="mt10">
         <div class="homepagePostDeadline">
+          迟交扣分：<%= homework_common.late_penalty%>分
+        </div>
+        <div class="homepagePostDeadline" style="float: right; margin-right: 220px;">
           匿评开启时间：<%= homework_common.homework_detail_manual.evaluation_start%>&nbsp;00:00
         </div>
-        <div class="homepagePostDeadline ml15">
+      </div>
+      <div class="cl"></div>
+      <div>
+        <div class="homepagePostDeadline">
+          缺评扣分：<%= homework_common.homework_detail_manual.absence_penalty%>分/作品
+        </div>
+        <div class="homepagePostDeadline" style="float: right; margin-right: 220px;">
           匿评关闭时间：<%= homework_common.homework_detail_manual.evaluation_end%>&nbsp;23:59
         </div>
       </div>

lib/tasks/exercise_publish.rake

@@ -14,9 +14,21 @@ namespace :exercise_publish do
   end
 
   task :end => :environment do
+    include ExerciseHelper
     exercises = Exercise.where("end_time <=? and exercise_status = 2",Time.now)
     exercises.each do |exercise|
+      course = exercise.course
       exercise.update_column('exercise_status', 3)
+      course.student.each do |student|
+        if ExerciseUser.where("user_id = ? && exercise_id = ?",student.student_id,exercise.id).empty?
+          ExerciseUser.create(:user_id => student.student_id, :exercise_id => exercise.id, :start_at => exercise.end_time, :status => true,:score=>0)
+        end
+=begin
+        s_score = calculate_student_score(exercise, student.student)
+        exercise_user = ExerciseUser.where("user_id =? and exercise_id=?", student.student_id, exercise.id).first
+        exercise_user.update_attributes(:score => s_score)
+=end
+      end
     end
   end
 end