From d91d2bfa171e483433e9af444a277e4481d914f5 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 14 Apr 2016 14:45:42 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E4=B8=8B=E6=8B=89?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=98=BE=E7=A4=BA=E5=85=A8=E9=83=A8=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/homework_common_controller.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb
index e52b8434b..49e6ec290 100644
--- a/app/controllers/homework_common_controller.rb
+++ b/app/controllers/homework_common_controller.rb
@@ -18,10 +18,10 @@ class HomeworkCommonController < ApplicationController
     @is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course))
     if @is_teacher
       @homeworks = @course.homework_commons.order("updated_at desc").limit(10).offset(@page * 10)
-      @homework_commons = @course.homework_commons.order("created_at desc").limit(10).offset(@page * 10)
+      @homework_commons = @course.homework_commons.order("created_at desc")
     else
       @homeworks = @course.homework_commons.where("publish_time <= '#{Date.today}'").order("updated_at desc").limit(10).offset(@page * 10)
-      @homework_commons = @course.homework_commons.where("publish_time <= '#{Date.today}'").order("created_at desc").limit(10).offset(@page * 10)
+      @homework_commons = @course.homework_commons.where("publish_time <= '#{Date.today}'").order("created_at desc")
     end
     @is_student = User.current.logged? && (User.current.admin? || (User.current.member_of_course?(@course) && !@is_teacher))
     @is_new = params[:is_new]

From 4e4eb7b759cba1238e2a1ac0613e7b279cb743fe Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 14 Apr 2016 14:50:33 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E7=A7=AF=E5=88=86=E9=BB=98=E8=AE=A4=E6=98=BE=E7=A4=BA=E4=B8=A4?=
 =?UTF-8?q?=E4=BD=8D=E5=B0=8F=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/_show_member_score.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/courses/_show_member_score.html.erb b/app/views/courses/_show_member_score.html.erb
index a8bec9d50..1fa9339e4 100644
--- a/app/views/courses/_show_member_score.html.erb
+++ b/app/views/courses/_show_member_score.html.erb
@@ -28,7 +28,7 @@
               </span>
             </li>
        <% end %>
-      <li><span class="c_blue03 w280">作业积分（总分）</span><span class="c_red w70"><%= (@member_score.student_work_score_sum).first.score %></span></li>
+      <li><span class="c_blue03 w280">作业积分（总分）</span><span class="c_red w70"><%= format("%0.2f",(@member_score.student_work_score_sum).first.score)  %></span></li>
     </ul>
 
   </div>