From 7a90c0ea1090cecc7f4e92802979b11498711da9 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 21 Apr 2016 10:51:43 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E8=AF=84=E5=88=86=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=9A=E9=A1=B9=E6=97=B6=E4=B8=8D=E5=BA=94?=
 =?UTF-8?q?=E5=8F=91=E5=A4=9A=E6=9D=A1=E6=A8=A1=E6=9D=BF=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/student_work_controller.rb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index cd7aa39bc..0d1fb9462 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -771,8 +771,6 @@ class StudentWorkController < ApplicationController
         student_work.late_penalty = @homework.late_penalty
         student_work.save
       end
-
-      @homework.save
     end
 
     if params[:absence_penalty] && homework_detail_manual.absence_penalty.to_s != params[:absence_penalty].to_s
@@ -795,7 +793,6 @@ class StudentWorkController < ApplicationController
       homework_detail_programing.ta_proportion = params[:sy_proportion] if homework_detail_programing
       @homework.teacher_priority = teacher_priority
 
-      @homework.save
       homework_detail_manual.save if homework_detail_manual
       homework_detail_programing.save if homework_detail_programing
 
@@ -804,6 +801,8 @@ class StudentWorkController < ApplicationController
         student_work.save
       end
     end
+    
+    @homework.save
     if params[:student_path]
       redirect_to student_work_index_url(:homework => @homework.id)
     else

From 9b4c275869f0eb3809067c712ee399acf20da867 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 22 Apr 2016 11:27:30 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BD=9C=E5=93=81=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=BF=BD=E5=8A=A0=E9=99=84=E4=BB=B6=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/student_work_controller.rb            | 1 +
 app/helpers/application_helper.rb                     | 8 ++++++--
 app/views/organizations/_org_course_homework.html.erb | 9 +++++++--
 app/views/student_work/_programing_work_show.html.erb | 5 +++++
 app/views/student_work/_revise_attachment.html.erb    | 4 ++--
 app/views/student_work/_show.html.erb                 | 5 ++++-
 app/views/student_work/_student_work_list.html.erb    | 6 +++---
 app/views/users/_course_homework.html.erb             | 7 ++++++-
 app/views/users/_user_homework_detail.html.erb        | 6 ++++++
 9 files changed, 40 insertions(+), 11 deletions(-)

diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index 0d1fb9462..24fbed982 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -355,6 +355,7 @@ class StudentWorkController < ApplicationController
     end
 
     @score = @b_sort == "desc" ? "asc" : "desc"
+    @is_focus = params[:is_focus] ? params[:is_focus].to_i : 0
     # 消息传过来的ID
     @message_student_work_id = params[:student_work_id]
     respond_to do |format|
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 366cea06b..50b117da2 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -2990,8 +2990,12 @@ def homework_common_index_url_in_org(course_id)
   Setting.protocol + "://" + Setting.host_name + "/homework_common?course=" + course_id.to_s
 end
 
-def student_work_index_url_in_org(homework_id)
-  Setting.protocol + "://" + Setting.host_name + "/student_work?homework=" + homework_id.to_s
+def student_work_index_url_in_org(homework_id, is_focus = '')
+  if is_focus != ''
+    Setting.protocol + "://" + Setting.host_name + "/student_work?homework=" + homework_id.to_s + "&is_focus=" + is_focus.to_s
+  else
+    Setting.protocol + "://" + Setting.host_name + "/student_work?homework=" + homework_id.to_s
+  end
 end
 
 def course_url_in_org(course_id)
diff --git a/app/views/organizations/_org_course_homework.html.erb b/app/views/organizations/_org_course_homework.html.erb
index 025bb48af..4ac2ebcbf 100644
--- a/app/views/organizations/_org_course_homework.html.erb
+++ b/app/views/organizations/_org_course_homework.html.erb
@@ -66,11 +66,16 @@
                 </div>
             <% end %>
         <% end %>
+        <% is_teacher = User.current.allowed_to?(:as_teacher,activity.course) %>
         <div class="homepagePostSubmit">
-          <% is_teacher = User.current.allowed_to?(:as_teacher,activity.course) %>
           <%= user_for_homework_common activity,is_teacher %>
         </div>
-
+        <% work = cur_user_works_for_homework activity %>
+        <% if activity.end_time < Date.today && !is_teacher && !work.nil? %>
+            <div class="homepagePostSubmit">
+              <%=link_to "追加附件", student_work_index_url_in_org(activity.id, 1), :class => 'c_blue', :title => "可追加作品修订附件" %>
+            </div>
+        <% end %>
         <% if activity.homework_type == 2 && is_teacher%>
             <div class="homepagePostSubmit">
               <%= link_to "模拟答题", Setting.protocol + "://" + Setting.host_name + "/users/new_user_commit_homework?homework_id="+activity.id.to_s + "&is_test=true", class: 'c_blue test-program-btn', title: '教师可以通过模拟答题设置作业的标准答案' %>
diff --git a/app/views/student_work/_programing_work_show.html.erb b/app/views/student_work/_programing_work_show.html.erb
index 997d28f6d..75cd392d1 100644
--- a/app/views/student_work/_programing_work_show.html.erb
+++ b/app/views/student_work/_programing_work_show.html.erb
@@ -120,6 +120,11 @@
   <div class="cl"></div>
 </div>
 <script type="text/javascript">
+    $(function(){
+        <% if defined?(is_focus) && is_focus.to_i == 1 %>
+        $("#upload_revise_attachment").click();
+        <% end %>
+    });
     function show_upload(){
         $("#ajax-modal").html('<%= escape_javascript( render :partial => 'student_work/upload_attachment' ,:locals => {:work=>work})%>');
         showModal('ajax-modal', '452px');
diff --git a/app/views/student_work/_revise_attachment.html.erb b/app/views/student_work/_revise_attachment.html.erb
index dabf9715a..cd7ddc917 100644
--- a/app/views/student_work/_revise_attachment.html.erb
+++ b/app/views/student_work/_revise_attachment.html.erb
@@ -30,7 +30,7 @@
         <% end %>
         <div class="cl"></div>
         <div class="mb10 mt5">
-          <a href="javascript:void(0);" onclick="show_upload();" class="blueCir ml5" title="请选择文件上传">上传附件</a>
+          <a href="javascript:void(0);" id="upload_revise_attachment" onclick="show_upload();" class="blueCir ml5" title="请选择文件上传">上传附件</a>
         </div>
     <% end %>
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/app/views/student_work/_show.html.erb b/app/views/student_work/_show.html.erb
index dc2fdafb6..b059e37fb 100644
--- a/app/views/student_work/_show.html.erb
+++ b/app/views/student_work/_show.html.erb
@@ -88,7 +88,7 @@
   </ul>
 
   <div id="revise_attachment">
-    <%= render :partial => 'student_work/revise_attachment', :locals => {:work => work} %>
+    <%= render :partial => 'student_work/revise_attachment', :locals => {:work => work,:is_focus => is_focus} %>
   </div>
   <div class="cl"></div>
 
@@ -107,6 +107,9 @@
 <script type="text/javascript">
     $(function(){
         showNormalImage('student_work_img_<%=work.id %>');
+        <% if defined?(is_focus) && is_focus.to_i == 1 %>
+            $("#upload_revise_attachment").click();
+        <% end %>
     });
     function show_upload(){
         $("#ajax-modal").html('<%= escape_javascript( render :partial => 'student_work/upload_attachment' ,:locals => {:work=>work})%>');
diff --git a/app/views/student_work/_student_work_list.html.erb b/app/views/student_work/_student_work_list.html.erb
index 8b2f57723..3dd95ea93 100644
--- a/app/views/student_work/_student_work_list.html.erb
+++ b/app/views/student_work/_student_work_list.html.erb
@@ -50,7 +50,7 @@
           <% work= params[:show_work_id].nil? ? @homework.student_works.where("user_id = ?",User.current.id).first : StudentWork.find(params[:show_work_id]) %>
           <% unless work.nil? %>
               <% if @homework.homework_type == 2 %>
-                  $("#about_hwork_<%= work.id%>").html("<%= escape_javascript(render :partial => 'programing_work_show',:locals => {:work =>work,:score =>student_work_score(work,User.current),:student_work_scores => work.student_works_scores.order("updated_at desc")}) %>");
+                  $("#about_hwork_<%= work.id%>").html("<%= escape_javascript(render :partial => 'programing_work_show',:locals => {:work =>work,:score =>student_work_score(work,User.current),:student_work_scores => work.student_works_scores.order("updated_at desc"),:is_focus => @is_focus}) %>");
 
                   var program_name = "text/x-csrc";
                   var language = <%= @homework.language %>;
@@ -74,11 +74,11 @@
                               value: $("#work-src_<%= work.id%>").text()
                           });
               <% elsif @homework.homework_type == 1 %>
-                  $("#about_hwork_<%= work.id%>").html("<%= escape_javascript(render :partial => 'show',:locals => {:work => work, :score =>student_work_score(work,User.current),:student_work_scores => work.student_works_scores.order("updated_at desc")}) %>");
+                  $("#about_hwork_<%= work.id%>").html("<%= escape_javascript(render :partial => 'show',:locals => {:work => work, :score =>student_work_score(work,User.current),:student_work_scores => work.student_works_scores.order("updated_at desc"),:is_focus => @is_focus}) %>");
               <% elsif @homework.homework_type == 3 %>
                   <% pro = @homework.student_work_projects.where(:user_id => User.current.id).first %>
                   <% if pro && pro.student_work_id == work.id %>
-                      $("#about_hwork_<%= work.id%>").html("<%= escape_javascript(render :partial => 'show',:locals => {:work => work, :score =>student_work_score(work,User.current),:student_work_scores => work.student_works_scores.order("updated_at desc")}) %>");
+                      $("#about_hwork_<%= work.id%>").html("<%= escape_javascript(render :partial => 'show',:locals => {:work => work, :score =>student_work_score(work,User.current),:student_work_scores => work.student_works_scores.order("updated_at desc"),:is_focus => @is_focus}) %>");
                   <% end %>
               <% end %>
             $('#score_<%= work.id%>').peSlider({range: 'min'});
diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb
index e14132e85..2a4704c24 100644
--- a/app/views/users/_course_homework.html.erb
+++ b/app/views/users/_course_homework.html.erb
@@ -70,7 +70,12 @@
           <% is_teacher = User.current.allowed_to?(:as_teacher,activity.course) %>
           <%= user_for_homework_common activity,is_teacher %>
         </div>
-
+        <% work = cur_user_works_for_homework activity %>
+        <% if activity.end_time < Date.today && !is_teacher && !work.nil? %>
+            <div class="homepagePostSubmit">
+                <%=link_to "追加附件", student_work_index_url_in_org(activity.id, 1), :class => 'c_blue', :title => "可追加作品修订附件" %>
+            </div>
+        <% end %>
         <% if activity.homework_type == 2 && is_teacher%>
             <div class="homepagePostSubmit">
               <%= link_to "模拟答题", new_user_commit_homework_users_path(homework_id: activity.id, is_test: true), class: 'c_blue test-program-btn', title: '教师可以通过模拟答题设置作业的标准答案' %>
diff --git a/app/views/users/_user_homework_detail.html.erb b/app/views/users/_user_homework_detail.html.erb
index 780b1c6eb..2b39f25a1 100644
--- a/app/views/users/_user_homework_detail.html.erb
+++ b/app/views/users/_user_homework_detail.html.erb
@@ -70,6 +70,12 @@
         <div class="homepagePostSubmit">
           <%= user_for_homework_common homework_common,is_teacher %>
         </div>
+        <% work = cur_user_works_for_homework homework_common %>
+        <% if homework_common.end_time < Date.today && !is_teacher && !work.nil? %>
+            <div class="homepagePostSubmit">
+              <%=link_to "追加附件", student_work_index_url_in_org(homework_common.id, 1), :class => 'c_blue', :title => "可追加作品修订附件" %>
+            </div>
+        <% end %>
         <% if homework_common.homework_type == 2 && is_teacher%>
             <div class="homepagePostSubmit">
               <%= link_to "模拟答题", new_user_commit_homework_users_path(homework_id: homework_common.id, is_test: true), class: 'c_blue test-program-btn', title: '教师可以通过模拟答题设置作业的标准答案' %>

From 7673fc41fb86eec79df8bcde3dba1f74d546efcf Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 22 Apr 2016 12:37:13 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BD=9C=E5=93=81=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=A2=9E=E5=8A=A0=E6=8F=90=E4=BA=A4=E4=BD=9C?=
 =?UTF-8?q?=E5=93=81=E7=9A=84=E5=85=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/student_work/_student_work_list.html.erb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/views/student_work/_student_work_list.html.erb b/app/views/student_work/_student_work_list.html.erb
index 3dd95ea93..29fc95f6c 100644
--- a/app/views/student_work/_student_work_list.html.erb
+++ b/app/views/student_work/_student_work_list.html.erb
@@ -7,6 +7,7 @@
     <% my_work = @homework.student_works.where("user_id = #{User.current.id}").first %>
     <% if !@is_teacher && my_work.nil? && User.current.member_of_course?(@course) %>
        <span class="f12 c_red">您尚未提交作品</span>
+        <%=link_to "提交作品",  new_student_work_url_without_domain(@homework.id),:class => 'blueCir ml5 f12' %>
     <% elsif !@is_teacher && my_work &&Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(Time.now.to_s).strftime("%Y-%m-%d") && !@stundet_works.empty?%>
        <span class="f12 c_red">您已提交且不可再修改，因为截止日期已过</span>
     <% elsif !@is_teacher && my_work &&Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.parse(Time.now.to_s).strftime("%Y-%m-%d") && !@stundet_works.empty?%>