学生提交作品后可点击重试重新上传作品

app/controllers/student_work_controller.rb

@@ -3,8 +3,8 @@ class StudentWorkController < ApplicationController
   include StudentWorkHelper
   require 'bigdecimal'
   require "base64"
-  before_filter :find_homework, :only => [:new, :index, :create, :student_work_absence_penalty, :absence_penalty_list, :evaluation_list, :program_test,:set_score_rule,:forbidden_anonymous_comment]
-  before_filter :find_work, :only => [:edit, :update, :show, :destroy, :add_score, :praise_student_work]
+  before_filter :find_homework, :only => [:new, :index, :create, :student_work_absence_penalty, :absence_penalty_list, :evaluation_list, :program_test,:set_score_rule,:forbidden_anonymous_comment,:delete_work]
+  before_filter :find_work, :only => [:edit, :update, :show, :destroy, :add_score, :praise_student_work,:retry_work]
   before_filter :member_of_course, :only => [:index, :new, :create, :show, :add_score, :praise_student_work]
   before_filter :author_of_work, :only => [:edit, :update, :destroy]
   before_filter :teacher_of_course, :only => [:student_work_absence_penalty, :absence_penalty_list, :evaluation_list, :set_score_rule, :forbidden_anonymous_comment]
@@ -222,7 +222,7 @@ class StudentWorkController < ApplicationController
 
   def edit
     @user = User.current
-    if !User.current.admin? && @homework.homework_type == 2   #编程作业不能修改作业
+    if (!User.current.admin? && @homework.homework_type == 2) || Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.now.strftime("%Y-%m-%d")   #编程作业不能修改作业|| 截止日期已到不能修改作业
       render_403
     else
       respond_to do |format|
@@ -284,6 +284,23 @@ class StudentWorkController < ApplicationController
     end
   end
 
+  def delete_work
+    @work = StudentWork.where("user_id =? and homework_common_id =?", User.current.id, @homework.id).first
+    if @work
+      @work.destroy
+    end
+    redirect_to user_homeworks_user_path(User.current.id)
+  end
+
+  def retry_work
+    if @work.destroy
+      @student_work = StudentWork.new
+      respond_to do |format|
+        format.js
+      end
+    end
+  end
+
   #添加评分，已评分则为修改评分
   def add_score
     @is_last = params[:is_last] == "true"

app/views/student_work/_work_information.html.erb

@@ -19,9 +19,10 @@
     </p>
     <div class="cl"></div>
     <div class="ni_btn mt10">
-      <a href="javascript:" class="tijiao" onclick="clickOK();" style="margin-bottom: 15px; margin-left: 55px;" >
+      <a href="javascript:" class="tijiao" onclick="clickOK();" style="margin-bottom: 15px;margin-top:15px;" >
         确&nbsp;&nbsp;定
       </a>
+      <%= link_to("重试", retry_work_student_work_path(@student_work.id),:class => "tijiao",:style =>"margin-bottom: 15px;margin-top:15px;",:remote => true)%>
     </div>
   </div>
 </div>

app/views/student_work/create.js.erb

@@ -11,7 +11,7 @@
     showModal('ajax-modal', '500px');
     $('#ajax-modal').siblings().remove();
     $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
-            "<a href='javascript:' onclick='clickCanel();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
+            "<a href='/student_work/"+ <%=@student_work.id%> +"/retry_work' class='upload_btn' data-remote='true'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
     $('#ajax-modal').parent().css("top","").css("left","");
     $('#ajax-modal').parent().addClass("anonymos");
 <% else %>

app/views/student_work/new.html.erb

@@ -111,9 +111,9 @@
         </div>
 
         <div class="mt5">
-          <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="popupRegex();new_student_work();">确定</a>
+          <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="popupRegex();new_student_work();">提交</a>
           <span class="fr mr10 mt3">或</span>
-          <%= link_to "取消",  user_homeworks_user_path(User.current.id), :class => "fr mr10 mt3"%>
+          <%= link_to "取消",  delete_work_student_work_index_path(:homework =>@homework.id), :class => "fr mr10 mt3"%>
         </div>
         <div class="cl"></div>
     <% end%>

app/views/student_work/retry_work.js.erb

@@ -0,0 +1,2 @@
+hideModal('#popbox02');
+$("#homework_attachments").html("<%= escape_javascript(render :partial => 'users/user_homework_attachment', :locals => {:container => @student_work, :has_program=>false})%>");

config/routes.rb

@@ -206,11 +206,13 @@ RedmineApp::Application.routes.draw do
   resources :student_work do
     member do
       post 'add_score'
+      get 'retry_work'
       get 'praise_student_work'
       get 'forbidden_anonymous_comment'
     end
     collection do
       post 'add_score_reply'
+      get 'delete_work'
       get 'destroy_score_reply'
       get 'student_work_absence_penalty'
       get 'absence_penalty_list'