From 1b988a0a7fa57307e8add15c6db854e22ca3feb9 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 5 Nov 2015 14:47:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=9C=E5=93=81=E6=8F=90=E4=BA=A4=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90=E5=90=8E=E5=BC=B9=E5=87=BA=E4=BD=9C=E5=93=81=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E5=AF=B9=E8=AF=9D=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/student_work_controller.rb    |  4 +++
 .../student_work/_work_information.html.erb   | 28 +++++++++++++++++++
 app/views/student_work/create.js.erb          |  7 +++++
 app/views/student_work/new.html.erb           |  2 +-
 4 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 app/views/student_work/_work_information.html.erb
 create mode 100644 app/views/student_work/create.js.erb

diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index 38b953732..8d50b91f1 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -193,11 +193,15 @@ class StudentWorkController < ApplicationController
           user_activity.updated_at = Time.now
           user_activity.save
         end
+        @student_work = StudentWork.where(homework_common_id: @homework.id, user_id: User.current.id).first
         respond_to do |format|
+          format.js
+=begin
           format.html {
             flash[:notice] = l(:notice_successful_create)
             redirect_to student_work_index_url(:homework => @homework.id)
           }
+=end
         end
         return
       end
diff --git a/app/views/student_work/_work_information.html.erb b/app/views/student_work/_work_information.html.erb
new file mode 100644
index 000000000..6bb1a0dd0
--- /dev/null
+++ b/app/views/student_work/_work_information.html.erb
@@ -0,0 +1,28 @@
+<div id="popbox02">
+  <div class="ni_con">
+    <h2>您刚上传的作品信息：</h2>
+    <p>
+      作品名称：<%=@student_work.name%>
+    </p>
+    <p>
+      作品描述：<%=@student_work.description%>
+    </p>
+    <p>
+      <span class="fl">附件：</span>
+      <% if @student_work.attachments.count == 0%>
+        <%= "无附件"%>
+      <% else %>
+        <div class="fl">
+            <% @student_work.attachments.each do |attachment| %>
+              <span style="display: block"><%=attachment.filename %></span>
+            <% end %>
+        </div>
+      <% end %>
+    </p>
+    <div class="ni_btn">
+      <a href="javascript:" class="tijiao" onclick="clickOK('<%= student_work_index_url(:homework => @homework.id)%>');" style="margin-bottom: 20px;" >
+        确&nbsp;&nbsp;定
+      </a>
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/views/student_work/create.js.erb b/app/views/student_work/create.js.erb
new file mode 100644
index 000000000..69dd8364d
--- /dev/null
+++ b/app/views/student_work/create.js.erb
@@ -0,0 +1,7 @@
+$('#ajax-modal').html('<%= escape_javascript(render :partial => 'student_work/work_information') %>');
+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>");
+$('#ajax-modal').parent().css("top","").css("left","");
+$('#ajax-modal').parent().addClass("anonymos");
\ No newline at end of file
diff --git a/app/views/student_work/new.html.erb b/app/views/student_work/new.html.erb
index 072c26185..db83fd432 100644
--- a/app/views/student_work/new.html.erb
+++ b/app/views/student_work/new.html.erb
@@ -73,7 +73,7 @@
                  :url => {:controller => 'student_work',
                           :action => 'create',
                           :homework => @homework.id
-                 }) do |f|%>
+                 },:remote=>true ) do |f| %>
         <div class=" c_red mb10">
           提示：作品名称和描述中不要出现真实的姓名信息
         </div>