From cb12147d11500a6f08a08ebcf2e84a1fd5e6dae1 Mon Sep 17 00:00:00 2001 From: cxt Date: Wed, 14 Jun 2017 09:25:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=9C=E5=93=81=E8=A1=A5=E4=BA=A4=E3=80=81?= =?UTF-8?q?=E8=A1=A5=E4=BA=A4=E9=99=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/student_work_controller.rb | 8 +-- app/views/layouts/base_edu.html.erb | 2 +- .../student_work/_upload_attachment.html.erb | 39 ++++++------ app/views/student_work/new.html.erb | 17 +---- app/views/student_work/show.html.erb | 63 ++++++++++++------- app/views/users/_homework_opr.html.erb | 4 +- public/javascripts/attachments.js | 15 +++-- public/stylesheets/css/edu-class.css | 15 +++++ public/stylesheets/css/edu-popup.css | 2 +- 9 files changed, 94 insertions(+), 71 deletions(-) diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb index d6f9b7141..1a1af7166 100644 --- a/app/controllers/student_work_controller.rb +++ b/app/controllers/student_work_controller.rb @@ -561,7 +561,7 @@ class StudentWorkController < ApplicationController student_work.homework_common_id = @homework.id student_work.user_id = User.current.id student_work.commit_time = Time.now - student_work.late_reason = params[:late_reason] if params[:late_reason] + #student_work.late_reason = params[:late_reason] if params[:late_reason] student_work.group_id = @homework.student_works.all_commit.select("distinct group_id").count + 1 student_work.save_attachments(params[:attachments]) render_attachment_warning_if_needed(student_work) @@ -713,6 +713,7 @@ class StudentWorkController < ApplicationController appeal_message.update_all(:viewed => true) end + @is_focus = params[:is_focus] if params[:is_focus] @score = student_work_score @work,User.current @is_teacher = User.current.allowed_to?(:as_teacher,@course) || User.current.admin? if (@homework.homework_detail_manual.comment_status == 3 || @homework.homework_detail_manual.comment_status == 4) && !@is_teacher && @work.user != User.current @@ -1369,10 +1370,7 @@ class StudentWorkController < ApplicationController CourseMessage.create(:user_id => student_work.homework_common.user_id, :course_id => student_work.homework_common.course_id, :viewed => false,:course_message_id=>attachment.container_id,:course_message_type=>'StudentWork',:status=>2) end @work.update_attributes(:re_commit => 1) - respond_to do |format| - format.js - end - @homework = @work.homework_common + redirect_to student_work_path(@work) end def new_student_work_project diff --git a/app/views/layouts/base_edu.html.erb b/app/views/layouts/base_edu.html.erb index 95af1a10b..0059a9bdc 100644 --- a/app/views/layouts/base_edu.html.erb +++ b/app/views/layouts/base_edu.html.erb @@ -10,7 +10,7 @@ <%= javascript_heads %> <%= heads_for_theme %> <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'css/structure','css/edu-common', 'css/edu-public','css/taskstyle', 'css/font-awesome', 'css/edu-class', 'css/edu-popup', 'css/ketang', 'css/magic-check', "css/edu-admin", "bootstrap/bootstrap-min.css" %> - <%= javascript_include_tag "edu/application",'edu/base_edu','baiduTemplate','jquery.datetimepicker.js','edu/course' %> + <%= javascript_include_tag "edu/application",'edu/base_edu','baiduTemplate','jquery.datetimepicker.js','edu/course','attachments' %> <%= call_hook :view_layouts_base_html_head %> <%= yield :header_tags -%> diff --git a/app/views/student_work/_upload_attachment.html.erb b/app/views/student_work/_upload_attachment.html.erb index 6f90a0705..7bc78f2dc 100644 --- a/app/views/student_work/_upload_attachment.html.erb +++ b/app/views/student_work/_upload_attachment.html.erb @@ -1,21 +1,23 @@ -
-
-

- 上传附件 -

- -
+<% content_for :header_tags do %> + <%= javascript_include_tag 'attachments' %> +<% end %> + +
+
+

补交附件

+
-
- <%= form_tag(revise_attachment_student_work_path(work.id), :multipart => true,:remote => !ie8?,:name=>"upload_form",:id=>'upload_form') do %> + +
+ <%= form_tag(revise_attachment_student_work_path(work.id), :multipart => true,:name=>"upload_form",:id=>'upload_form') do %>
-
+
- - 选择文件 + + 选择文件 <%= file_field_tag 'attachments[dummy][file]', :id => '_file', :class => ie8? ? '':'file_selector', @@ -35,27 +37,26 @@ :delete_all_files => l(:text_are_you_sure_all) } %>
- -
最多只能上传一个小于50MB的附件
- +

注意：暂不支持IE浏览器的上传，请更换浏览器
-
- 取消 - 确定 +
+
+ 确定 + 取消 +
<% end %>
-
\ No newline at end of file diff --git a/app/views/users/_homework_opr.html.erb b/app/views/users/_homework_opr.html.erb index eeb698492..f07ab6acc 100644 --- a/app/views/users/_homework_opr.html.erb +++ b/app/views/users/_homework_opr.html.erb @@ -14,9 +14,9 @@
<%= user_for_homework_common activity,is_teacher,work %>
-<% if !is_teacher && !work.nil? && work.user == User.current && activity.end_time < Time.now %> +<% if !is_teacher && work && work.work_status != 0 && work.user == User.current && activity.allow_late && activity.homework_detail_manual.comment_status > 1 %>
- <%=link_to "追加附件", student_work_index_url_in_org(activity.id, 2, 1), :class => 'c_blue', :title => "可追加作品修订附件" %> + <%=link_to "补交附件", student_work_path(work, :is_focus => 1), :class => 'c_blue', :title => "可追加作品修订附件" %>
<% end %> <% if activity.homework_type == 2 && is_teacher%> diff --git a/public/javascripts/attachments.js b/public/javascripts/attachments.js index 117dff04a..a468f9b37 100644 --- a/public/javascripts/attachments.js +++ b/public/javascripts/attachments.js @@ -204,12 +204,16 @@ function addReviseFile(inputEl, file, eagerUpload,btnId) { 'class': 'attachment' }); - fileSpan.append( + fileSpan.append($('').attr({ + 'class': 'fa fa-folder mr5 color-light-grey', + 'aria-hidden': true + }), $('', { 'type': 'text', - 'class': 'upload_filename readonly', + 'class': 'upload_filename readonly hidden', 'name': 'attachments[' + attachmentId + '][filename]', - 'readonly': 'readonly' + 'readonly': 'readonly', + 'style': 'border:none; max-width:980px;white-space: nowrap; text-overflow:ellipsis;' }).val(file.name), // $('', { // 'type': 'text', @@ -228,9 +232,10 @@ function addReviseFile(inputEl, file, eagerUpload,btnId) { // 'name': 'attachments[' + attachmentId + '][is_public_checkbox]', // checked: 'checked' // }).toggle(!eagerUpload), - $(' ').attr({ + $('').attr({ 'href': "#", - 'class': 'remove-upload' + 'class': 'remove-upload', + 'style': 'vertical-align:top;' }).click(function() { if (confirm($(inputEl).data('areYouSure'))) { removeReviseFile(); diff --git a/public/stylesheets/css/edu-class.css b/public/stylesheets/css/edu-class.css index 8333f3793..38f3479f4 100644 --- a/public/stylesheets/css/edu-class.css +++ b/public/stylesheets/css/edu-class.css @@ -354,3 +354,18 @@ a:hover.edu-class-inner-list{color:#3498db;} a.task-btn-line{display: inline-block;font-weight: bold;padding: 0 12px;color: #666;background: #fff;letter-spacing: 1px;text-align: center;font-size: 14px;height: 30px;line-height: 30px;border-radius: 3px; border:1px solid #ccc;} a:hover.task-btn-line{ border:1px solid #3498db;background:#3498db;color: #fff;} +/* 补交附件 */ +.uploadBoxContainer {height:33px; line-height:33px; margin-top:10px; position:relative} +.uploadBox {width:100px; height:33px; line-height:33px; text-align:center; vertical-align:middle; background-color:#3498db; border-radius:3px; float:left; margin-right:12px;} +a.uploadBoxIcon {background:url(../images/resource_icon_list.png) -35px 10px no-repeat; float:left; display:block; width:81px; height:30px; padding-left:22px; font-size:14px; color:#ffffff;} +a.uploadIcon {width:100px; height:33px;color:#ffffff;} +.chooseFile {color:#ffffff; display:block; margin-left:32px;} +.uploadResourceIntr {width:250px; height:33px; float:left; line-height:33px; font-size:12px;} +.uploadResourceName {width:250px; display:inline-block; line-height:15px; font-size:12px; color:#444444; margin-bottom:2px;} +.uploadResourceIntr2 {width:250px; display:inline-block; line-height:15px; font-size:12px; color:#444444;} +.uploadType {margin:10px 0; border:1px solid #e6e6e6; width:100px; height:30px; outline:none; font-size:12px; color:#888888;} +.uploadKeyword {margin-bottom:10px; outline:none; border:1px solid #e6e6e6; height:30px; width:280px;} +.mb10 {margin-bottom: 10px} +.mb15 {margin-bottom: 15px} +.disable_link a {background-color: #c1c1c1 !important;} +.reUploadDetail{border:1px solid #dddddd; float:left; resize:none; width:428px; height:80px; overflow-y:auto;outline: none;} diff --git a/public/stylesheets/css/edu-popup.css b/public/stylesheets/css/edu-popup.css index 076898bcb..7bca33e26 100644 --- a/public/stylesheets/css/edu-popup.css +++ b/public/stylesheets/css/edu-popup.css @@ -35,7 +35,7 @@ a:hover.task_icons_close{background: url(../images/popup/sy_icons_close.png) -40 .upload_select_box li{ height: 30px; line-height:30px;} .upload_select_box li div.mt5{ margin-top:0px;} .upload_select_box li:hover{ background:#e4eaf6;} -.task-popup-submit02{ margin:15px auto; width:110px;} +.task-popup-submit02{ margin:15px auto; width:120px;} .task-popup-submit03{ margin:15px auto; width:70px;} .task-popup-submit04{ margin:15px auto; width:85px;} /*智能课堂弹框tab 20170428byLB*/