From 08df962ee6cb8e0291df3350d87915b17c86b8c2 Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Fri, 19 Apr 2019 15:24:20 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=BD=8D=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../graduation_tasks_controller.rb | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/app/controllers/graduation_tasks_controller.rb b/app/controllers/graduation_tasks_controller.rb index 1db75db5..e023adac 100644 --- a/app/controllers/graduation_tasks_controller.rb +++ b/app/controllers/graduation_tasks_controller.rb @@ -21,19 +21,17 @@ class GraduationTasksController < ApplicationController end unless @order.blank? - case @order + if @course.is_end + @tasks = @tasks.where("0=1") + else + case @order + when '0', '1', '2', '3' + @tasks = @tasks.where(:status => @order) when '4' - if @course.is_end - @tasks = @tasks - else - @tasks = @tasks.where("0=1") - end + @tasks = @tasks.where("status > 1 and allow_late = 1 and late_time > '#{Time.now}'") else - if @course.is_end - @tasks = @tasks.where("0=1") - else - @tasks = @tasks.where(:status => @order) - end + @tasks = @tasks.where("0=1") + end end end From 26c112cbed74d21c8bc2fcf30e0c66cbf7443455 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Fri, 19 Apr 2019 17:23:07 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=9C=89=E5=85=B3=E8=AF=BE=E7=A8=8Bcss?= =?UTF-8?q?=E5=A4=8D=E7=94=A8=E6=88=96=E5=86=97=E4=BD=99=E6=83=85=E5=86=B5?= =?UTF-8?q?=E7=9A=84=E5=88=A0=E5=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/courses/settings/_choose_course_group.html.erb | 2 +- app/views/layouts/base_courses.html.erb | 6 +++++- app/views/layouts/base_edu.html.erb | 3 ++- public/stylesheets/css/courses.css | 1 - public/stylesheets/educoder/edu-all.css | 6 ++++++ 5 files changed, 14 insertions(+), 4 deletions(-) diff --git a/app/views/courses/settings/_choose_course_group.html.erb b/app/views/courses/settings/_choose_course_group.html.erb index 71f60f90..b6b434e5 100644 --- a/app/views/courses/settings/_choose_course_group.html.erb +++ b/app/views/courses/settings/_choose_course_group.html.erb @@ -12,7 +12,7 @@ 请先选择一个分班 <% end %> -
+
确定 取消
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb index 393a7139..b92f5ad1 100644 --- a/app/views/layouts/base_courses.html.erb +++ b/app/views/layouts/base_courses.html.erb @@ -16,7 +16,11 @@ <%= javascript_heads %> <%= heads_for_theme %> <%= call_hook :view_layouts_base_html_head %> - <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'css/common', 'css/public', 'css/ketang', 'css/structure', 'prettify', 'css/courses', 'css/popup', 'css/syllabus', 'css/moduel', 'css/font-awesome', 'css/contest', 'css/font-awesome', 'css/edu-class', 'css/edu-popup', 'educoder/magic-check', 'css/edu-common', "css/edu-public", 'educoder/edu-main', 'educoder/edu-all' %> + + <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'css/common', 'css/public', + 'css/font-awesome', 'css/edu-class','educoder/magic-check', 'css/edu-common', + "css/edu-public", 'educoder/edu-main', 'educoder/edu-all' %> + <%= javascript_include_tag "course", "avatars", "header", "attachments", 'prettify', "edu/application", "edu/course", 'edu/homework', 'jquery.datetimepicker.js', 'educoder/edu_application', 'educoder/edu_file', 'educoder/edu_graduation' %> <%= yield :header_tags -%> diff --git a/app/views/layouts/base_edu.html.erb b/app/views/layouts/base_edu.html.erb index 2638a1df..299b8aad 100644 --- a/app/views/layouts/base_edu.html.erb +++ b/app/views/layouts/base_edu.html.erb @@ -9,8 +9,9 @@ <%= favicon %> <%= heads_for_theme %> <%= call_hook :view_layouts_base_html_head %> + <%= 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-user', 'css/edu-popup', 'css/edu-forum', 'css/ketang', + 'css/font-awesome', 'css/edu-class', 'css/edu-user', 'css/edu-popup', 'css/edu-forum', 'css/edu-subject', 'educoder/magic-check', "css/edu-admin", 'prettify.css','educoder/edu-main', 'educoder/edu-all' %> <%= javascript_heads %> diff --git a/public/stylesheets/css/courses.css b/public/stylesheets/css/courses.css index 62d7ad4f..a4a70a08 100644 --- a/public/stylesheets/css/courses.css +++ b/public/stylesheets/css/courses.css @@ -28,7 +28,6 @@ a:hover.DropBtn{background: url(../images/homepage_icon.png) -125px -370px no-re a.link_file{ background:url(/images/pic_file.png) 0 2px no-repeat; padding-left:20px; } a:hover.link_file{ background:url(/images/pic_file.png) 0 -25px no-repeat; color:#3ca5c6;} a.FilesName{ max-width:540px;overflow:hidden; white-space:nowrap; text-overflow:ellipsis; display:block;} -a.FilesName02{ max-width:665px;overflow:hidden; white-space:nowrap; text-overflow:ellipsis; display:block;} .ProResultUl span { display:block; float:left;} .ProResultUl>div{ line-height:35px; border-bottom:1px solid #dddddd; } .DateBorder{border:1px solid #d9d9d9; border-left:none; padding:7px 6px 6px 6px;} diff --git a/public/stylesheets/educoder/edu-all.css b/public/stylesheets/educoder/edu-all.css index 13775084..49cccd8f 100644 --- a/public/stylesheets/educoder/edu-all.css +++ b/public/stylesheets/educoder/edu-all.css @@ -3139,6 +3139,12 @@ line-height: 20px;display: inline-block;color: rgba(65, 140, 205, 1) !important; #requireTable thead .td-head-child:last-child{border-right: none;} + +/*附件有关*/ +a.FilesName02{ max-width:665px;overflow:hidden; white-space:nowrap; text-overflow:ellipsis; display:block;} + + + /*用户列表*/ .managerPanels a{margin-right:24px;} .managerPanels a:nth-child(16n){margin-right: 0px;} From 0037604f9a3e405183724724b5c97aa0830d83b2 Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Fri, 19 Apr 2019 18:17:03 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E8=BF=81=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../20190419101132_update_exerise_user_end_at.rb | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 db/migrate/20190419101132_update_exerise_user_end_at.rb diff --git a/db/migrate/20190419101132_update_exerise_user_end_at.rb b/db/migrate/20190419101132_update_exerise_user_end_at.rb new file mode 100644 index 00000000..79a64443 --- /dev/null +++ b/db/migrate/20190419101132_update_exerise_user_end_at.rb @@ -0,0 +1,14 @@ +class UpdateExeriseUserEndAt < ActiveRecord::Migration + def up + exercise = Exercise.where(:id => 123).first + exercise.exercise_group_settings.each do |group| + if group.end_time.present? && group.end_time < Time.now + user_ids = exercise.course.members.where(:course_group_id => group.course_group_id).map(&:user_id) + exercise.exercise_users.where(:commit_status => 1, :user_id => user_ids).update_all(:end_at => group.end_time) + end + end + end + + def down + end +end From 3f17293079f0bad00c2a6f8f084a9cb4b35e5555 Mon Sep 17 00:00:00 2001 From: jingquan huang Date: Fri, 19 Apr 2019 18:38:06 +0800 Subject: [PATCH 4/6] ... --- app/views/exercise/_end_notice.html.erb | 1 - db/migrate/20190419101132_update_exerise_user_end_at.rb | 7 ++++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/views/exercise/_end_notice.html.erb b/app/views/exercise/_end_notice.html.erb index 25405aa3..fc273c3c 100644 --- a/app/views/exercise/_end_notice.html.erb +++ b/app/views/exercise/_end_notice.html.erb @@ -3,7 +3,6 @@ #popupWrap{left: 673.5px !important;} -
立即截止
diff --git a/db/migrate/20190419101132_update_exerise_user_end_at.rb b/db/migrate/20190419101132_update_exerise_user_end_at.rb index 79a64443..b64d1145 100644 --- a/db/migrate/20190419101132_update_exerise_user_end_at.rb +++ b/db/migrate/20190419101132_update_exerise_user_end_at.rb @@ -4,7 +4,12 @@ class UpdateExeriseUserEndAt < ActiveRecord::Migration exercise.exercise_group_settings.each do |group| if group.end_time.present? && group.end_time < Time.now user_ids = exercise.course.members.where(:course_group_id => group.course_group_id).map(&:user_id) - exercise.exercise_users.where(:commit_status => 1, :user_id => user_ids).update_all(:end_at => group.end_time) + if group.id == 1390 || group.id == 1387 # 黄颖 + exercise.exercise_users.where("end_at < '2019-04-19 01:08:00'").where(:commit_status => 1, :user_id => user_ids).update_all(:end_at => group.end_time) + elsif group.id == 1391 || group.id == 1389 # 黄颖 + exercise.exercise_users.where("end_at < '2019-04-19 02:58:00'").where(:commit_status => 1, :user_id => user_ids).update_all(:end_at => group.end_time) + end + end end end From 17a675702adb204d61a7a30e4a557e2f21c78d72 Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Sat, 20 Apr 2019 08:52:54 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E8=AF=95=E5=8D=B7=E7=9A=84=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/exercise_controller.rb | 2 +- .../20190419101132_update_exerise_user_end_at.rb | 14 -------------- 2 files changed, 1 insertion(+), 15 deletions(-) delete mode 100644 db/migrate/20190419101132_update_exerise_user_end_at.rb diff --git a/app/controllers/exercise_controller.rb b/app/controllers/exercise_controller.rb index 0daec8d6..e89646e3 100644 --- a/app/controllers/exercise_controller.rb +++ b/app/controllers/exercise_controller.rb @@ -841,7 +841,7 @@ class ExerciseController < ApplicationController exercise_users.each do |exercise_user| if exercise_user.commit_status == 0 && !exercise_user.start_at.nil? - time = (exercise_user.start_at.to_i + @exercise.time.to_i * 60) > @exercise.end_time.to_i ? @exercise.end_time : Time.at(exercise_user.start_at.to_i + @exercise.time.to_i * 60) + # time = (exercise_user.start_at.to_i + @exercise.time.to_i * 60) > @exercise.end_time.to_i ? @exercise.end_time : Time.at(exercise_user.start_at.to_i + @exercise.time.to_i * 60) exercise_user.update_attributes(:status => 1, :commit_status => 1, :end_at => time) s_score = calculate_student_score(@exercise, exercise_user.user) exercise_user.update_attributes(:objective_score => s_score, :score => (s_score + (exercise_user.subjective_score && exercise_user.subjective_score > 0 ? exercise_user.subjective_score : 0))) diff --git a/db/migrate/20190419101132_update_exerise_user_end_at.rb b/db/migrate/20190419101132_update_exerise_user_end_at.rb deleted file mode 100644 index 79a64443..00000000 --- a/db/migrate/20190419101132_update_exerise_user_end_at.rb +++ /dev/null @@ -1,14 +0,0 @@ -class UpdateExeriseUserEndAt < ActiveRecord::Migration - def up - exercise = Exercise.where(:id => 123).first - exercise.exercise_group_settings.each do |group| - if group.end_time.present? && group.end_time < Time.now - user_ids = exercise.course.members.where(:course_group_id => group.course_group_id).map(&:user_id) - exercise.exercise_users.where(:commit_status => 1, :user_id => user_ids).update_all(:end_at => group.end_time) - end - end - end - - def down - end -end From ec763da1a2e4c29b611323de7ef0e1d2ca72dccb Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Sat, 20 Apr 2019 16:31:33 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E9=9D=99=E6=80=81=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E7=9A=84=E6=95=B4=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/users_helper.rb | 4 +-- app/views/files/_hidden_file.html.erb | 18 ++++++------- app/views/files/setting.js.erb | 2 +- app/views/layouts/base_courses.html.erb | 25 +++++++++--------- app/views/layouts/base_edu_user.html.erb | 5 ++-- .../users/_user_import_resource_list.html.erb | 3 +-- .../_user_import_resource_search.html.erb | 2 +- public/stylesheets/css/common.css | 3 +-- public/stylesheets/css/edu-class.css | 26 +++++++++++++++++++ public/stylesheets/css/edu-common.css | 10 +++++++ public/stylesheets/css/edu-public.css | 23 +++++++++++++++- public/stylesheets/css/moduel.css | 10 +------ public/stylesheets/css/popup.css | 16 +----------- public/stylesheets/css/public.css | 6 +---- public/stylesheets/educoder/edu-main.css | 2 +- 15 files changed, 91 insertions(+), 64 deletions(-) diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb index 9df8dda8..e3054f8e 100644 --- a/app/helpers/users_helper.rb +++ b/app/helpers/users_helper.rb @@ -91,8 +91,7 @@ module UsersHelper attachments.map do |attach| user_name = attach.author.show_real_name create_time = format_date(attach.created_on) - file_size = (number_to_human_size(attach.filesize)).gsub("ytes", "") - resource_type = get_resource_type(attach.container_type) + file_size = (number_to_human_size(attach.filesize, :precision => 2)).gsub("ytes", "") atta_path = download_named_attachment_path(attach.id, attach.filename) atta_name = truncate(attach.filename, :length => 30) attach.attributes.dup.except("container_id", "container_type", "disk_filename", "filesize", "content_type", @@ -100,7 +99,6 @@ module UsersHelper user_name: user_name, create_time: create_time, file_size: file_size, - resource_type: resource_type, atta_path: atta_path, atta_name: atta_name, }) diff --git a/app/views/files/_hidden_file.html.erb b/app/views/files/_hidden_file.html.erb index c3f1fa96..d67789b8 100644 --- a/app/views/files/_hidden_file.html.erb +++ b/app/views/files/_hidden_file.html.erb @@ -1,5 +1,3 @@ - -