From 29e9c38553c3c6f916333bd96254049a592ae59e Mon Sep 17 00:00:00 2001 From: huang Date: Sun, 27 Aug 2017 10:29:50 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E4=B8=93?= =?UTF-8?q?=E4=B8=9A=E8=BF=81=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/migrate/20170825113413_modify_support_shixuns_for_major.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/db/migrate/20170825113413_modify_support_shixuns_for_major.rb b/db/migrate/20170825113413_modify_support_shixuns_for_major.rb index f29f16808..7dcb922d7 100644 --- a/db/migrate/20170825113413_modify_support_shixuns_for_major.rb +++ b/db/migrate/20170825113413_modify_support_shixuns_for_major.rb @@ -1,6 +1,7 @@ class ModifySupportShixunsForMajor < ActiveRecord::Migration def up sql = "SELECT distinct(major_id) FROM `major_courses`" + MajorCourse.where("0=0").update_all(:support_shixuns, 0) MajorCourse.find_by_sql(sql).each do |mc| Major.where(:id => mc.try(:major_id)).first.update_column(:support_shixuns, 1) end From d2915df75994fce29d54814d377b831d53566cea Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Sun, 27 Aug 2017 10:34:10 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E5=92=8C=E4=BD=9C=E4=B8=9A=E5=88=97=E8=A1=A8tab?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/student_work/index.html.erb | 29 ++++++++++++----------- app/views/subjects/_subject_list.html.erb | 8 +++---- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/app/views/student_work/index.html.erb b/app/views/student_work/index.html.erb index 36c01a508..41e994f54 100644 --- a/app/views/student_work/index.html.erb +++ b/app/views/student_work/index.html.erb @@ -37,29 +37,25 @@
-
-
-
<% if @is_teacher%> -
+
    <% if @homework.homework_type != 4 %> -
  • - <%= link_to l(:button_edit), edit_homework_common_path(@homework) %> -
    • +
  • + <%= link_to l(:button_edit), edit_homework_common_path(@homework) %> +
    • <% end %>
  • <%= link_to "设置", setting_homework_common_path(@homework) %> @@ -97,10 +93,15 @@ <% else %> <%= user_work_status @homework %> <% if @homework.homework_type == 4 && !@homework.student_works.where(:user_id => User.current.id, :work_status => 0).blank? %> - <%= link_to "开始实战", shixun_path(@homework.homework_commons_shixuns.shixun),:class => 'task-btn task-btn-blue fr mr10',:target => "_blank" %> + <%= link_to "开始实战", shixun_path(@homework.homework_commons_shixuns.shixun),:class => 'task-btn task-btn-blue fr mr10',:target => "_blank" %> <% end %> <%= link_to "查看设置", setting_homework_common_path(@homework), :class => 'edu-btn fr mr10' %> <% end %> +
+
+
+
+
<%= @homework.description.html_safe %> @@ -191,7 +192,7 @@ <%= render :partial => 'student_work_replies' %>
-
+
<% if @is_teacher %> diff --git a/app/views/subjects/_subject_list.html.erb b/app/views/subjects/_subject_list.html.erb index 7d6660142..f5d199aa6 100644 --- a/app/views/subjects/_subject_list.html.erb +++ b/app/views/subjects/_subject_list.html.erb @@ -34,10 +34,10 @@ <%= subject.description.blank? ? "轻松学习#{subject.name}~" : subject.description %>

- <%= subject.stages.count %> - <%= subject.stage_shixuns.count %> - <%= subject.subject_score %> - <%= subject.subject_challenges %> + <%= subject.stages.count %> + <%= subject.stage_shixuns.count %> + <%= subject.subject_score %> + <%= subject.subject_challenges %>

<%= image_tag(url_to_avatar(subject.user), :width =>"40", :height => "40", :class => "bor-radius-all mr10 fl mt8", :alt=>"头像") %> From 70b28f07bb60e3e87f3907f1e742e302cdb7e316 Mon Sep 17 00:00:00 2001 From: huang Date: Sun, 27 Aug 2017 10:34:59 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E4=B8=93=E4=B8=9A=E6=B7=BB=E5=8A=A0=E6=96=B0=E7=9A=84?= =?UTF-8?q?=E8=BF=81=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/migrate/20170827023117_managements_zhuanye.rb | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 db/migrate/20170827023117_managements_zhuanye.rb diff --git a/db/migrate/20170827023117_managements_zhuanye.rb b/db/migrate/20170827023117_managements_zhuanye.rb new file mode 100644 index 000000000..38c270f63 --- /dev/null +++ b/db/migrate/20170827023117_managements_zhuanye.rb @@ -0,0 +1,12 @@ +class ManagementsZhuanye < ActiveRecord::Migration + def up + sql = "SELECT distinct(major_id) FROM `major_courses`" + MajorCourse.where("0=0").update_all(:support_shixuns, 0) + MajorCourse.find_by_sql(sql).each do |mc| + Major.where(:id => mc.try(:major_id)).first.update_column(:support_shixuns, 1) + end + end + + def down + end +end From f6240f7d596afef37eadfa7604b79831141faea7 Mon Sep 17 00:00:00 2001 From: huang Date: Sun, 27 Aug 2017 10:55:46 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=E5=A1=AB=E5=85=A5=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/homework_common_controller.rb | 2 +- db/migrate/20170825113413_modify_support_shixuns_for_major.rb | 2 +- db/migrate/20170827023117_managements_zhuanye.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb index a4f092d31..70aec8ffc 100644 --- a/app/controllers/homework_common_controller.rb +++ b/app/controllers/homework_common_controller.rb @@ -190,7 +190,7 @@ class HomeworkCommonController < ApplicationController # homework_bank.save # homework.update_attributes(:homework_bank_id => homework_bank.id) # end - redirect_to setting_homework_common_path(homework, :is_new => 1) + redirect_to student_work_index_path(:homework => homework.id, :host=> Setting.host_course) end end end diff --git a/db/migrate/20170825113413_modify_support_shixuns_for_major.rb b/db/migrate/20170825113413_modify_support_shixuns_for_major.rb index 7dcb922d7..da9ffd985 100644 --- a/db/migrate/20170825113413_modify_support_shixuns_for_major.rb +++ b/db/migrate/20170825113413_modify_support_shixuns_for_major.rb @@ -1,7 +1,7 @@ class ModifySupportShixunsForMajor < ActiveRecord::Migration def up sql = "SELECT distinct(major_id) FROM `major_courses`" - MajorCourse.where("0=0").update_all(:support_shixuns, 0) + Major.where("0=0").update_all(:support_shixuns, 0) MajorCourse.find_by_sql(sql).each do |mc| Major.where(:id => mc.try(:major_id)).first.update_column(:support_shixuns, 1) end diff --git a/db/migrate/20170827023117_managements_zhuanye.rb b/db/migrate/20170827023117_managements_zhuanye.rb index 38c270f63..2f3871da7 100644 --- a/db/migrate/20170827023117_managements_zhuanye.rb +++ b/db/migrate/20170827023117_managements_zhuanye.rb @@ -1,7 +1,7 @@ class ManagementsZhuanye < ActiveRecord::Migration def up sql = "SELECT distinct(major_id) FROM `major_courses`" - MajorCourse.where("0=0").update_all(:support_shixuns, 0) + Major.where("0=0").update_all(:support_shixuns => 0) MajorCourse.find_by_sql(sql).each do |mc| Major.where(:id => mc.try(:major_id)).first.update_column(:support_shixuns, 1) end From 325f3f536f4ab1580cbeab8163d62e8530c07daf Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Sun, 27 Aug 2017 11:06:47 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=8F=B3=E4=B8=8A=E8=A7=92=E4=B8=8B=E6=8B=89=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E5=AD=97=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/css/edu-class.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/stylesheets/css/edu-class.css b/public/stylesheets/css/edu-class.css index a21d1b3bf..8c91ddd45 100644 --- a/public/stylesheets/css/edu-class.css +++ b/public/stylesheets/css/edu-class.css @@ -305,7 +305,7 @@ img.ui-datepicker-trigger {display:block;background:url(../images/public_icon.pn /* 班级 */ .edu-position-hide{ position: absolute; top:15px; left:-20px; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); background:#fff;z-index:1001; padding:5px 0;} -.edu-position-hide li a{ display:inline-block; height: 30px; width: 100px; line-height: 30px; text-align: center; font-size:12px; } +.edu-position-hide li a{ display:inline-block; height: 30px; width: 100px; line-height: 30px; text-align: center; font-size:12px!important; } .edu-position-hide li a:hover{ background:#eee; color:#666;} .edu-position-hidebox{ } .edu-position-hidebox i{ color:#bcbcbc;} From 7e03296bea16921888a04ef0d80b32e8c16be5a0 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Sun, 27 Aug 2017 11:18:18 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E5=8F=AA?= =?UTF-8?q?=E7=9C=8B=E6=94=AF=E6=92=91=E5=AE=9E=E8=AE=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/managements_controller.rb | 8 ++++---- app/models/major.rb | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/controllers/managements_controller.rb b/app/controllers/managements_controller.rb index 13026f591..8bed7cf57 100644 --- a/app/controllers/managements_controller.rb +++ b/app/controllers/managements_controller.rb @@ -157,17 +157,17 @@ class ManagementsController < ApplicationController discipline_category_option = params[:discipline_category_id] if params[:discipline_category_id] first_level_discipline_option = params[:first_level_discipline_id] if params[:first_level_discipline_id] if major_level_option && major_level_option != '0' - @major = @major.where(:major_level=>major_level_option) + @major = @major.where(:major_level => major_level_option) end if discipline_category_option && discipline_category_option != '0' - @major=@major.where(:discipline_category_id=>discipline_category_option) + @major=@major.where(:discipline_category_id => discipline_category_option) end if first_level_discipline_option && first_level_discipline_option != '0' - @major=@major.where(:first_level_discipline_id=>first_level_discipline_option) + @major=@major.where(:first_level_discipline_id => first_level_discipline_option) end if params[:support_shixuns] - @major = @major.where(:support_shixuns => params[:support_shixuns].to_i) + @major = @major.where(:support_shixuns => params[:support_shixuns].to_i, :major_level => 2) end @major = @major.order("created_at #{@sx_order}") diff --git a/app/models/major.rb b/app/models/major.rb index d24c67efd..4fe0abff5 100644 --- a/app/models/major.rb +++ b/app/models/major.rb @@ -1,4 +1,5 @@ # encoding: utf-8 +# major_level 1 研究生 2 本科生 3 专科生 class Major < ActiveRecord::Base belongs_to :first_level_discipline belongs_to :discipline_category From 0076291c9da9c01f9eec641539d3c9ec2aee2949 Mon Sep 17 00:00:00 2001 From: huang Date: Sun, 27 Aug 2017 11:46:55 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/student_work_helper.rb | 2 +- app/views/student_work/index.html.erb | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/helpers/student_work_helper.rb b/app/helpers/student_work_helper.rb index 215ed4ccc..b4ab956e3 100644 --- a/app/helpers/student_work_helper.rb +++ b/app/helpers/student_work_helper.rb @@ -124,7 +124,7 @@ module StudentWorkHelper elsif homework.end_time >= Time.now && work.user_id == User.current.id link_to "修改作品", edit_student_work_url_without_domain(work.id),:class => 'task-btn task-btn-blue fr' else - link_to "查看作品", student_work_path(work), :class => 'task-btn task-btn-blue fr', :title => "作业截止后不可修改作品" + link_to "查看作品", student_work_path(work), :class => 'task-btn task-btn-blue fr mt8 mr15', :title => "作业截止后不可修改作品" end end end diff --git a/app/views/student_work/index.html.erb b/app/views/student_work/index.html.erb index 41e994f54..487191987 100644 --- a/app/views/student_work/index.html.erb +++ b/app/views/student_work/index.html.erb @@ -95,7 +95,7 @@ <% if @homework.homework_type == 4 && !@homework.student_works.where(:user_id => User.current.id, :work_status => 0).blank? %> <%= link_to "开始实战", shixun_path(@homework.homework_commons_shixuns.shixun),:class => 'task-btn task-btn-blue fr mr10',:target => "_blank" %> <% end %> - <%= link_to "查看设置", setting_homework_common_path(@homework), :class => 'edu-btn fr mr10' %> + <%= link_to "查看设置", setting_homework_common_path(@homework), :class => 'edu-btn fr mr10 mt8' %> <% end %>
@@ -262,9 +262,9 @@ <% else %> 你未提交 <% end %> - <% if @homework.homework_detail_manual.comment_status < 3 %> - <%= user_work_status @homework %> - <% end %> + <%# if @homework.homework_detail_manual.comment_status < 3 %> + <%#= user_work_status @homework %> + <%# end %> <% if @homework.homework_type == 4 && !@homework.student_works.where(:user_id => User.current.id, :work_status => 0).blank? %> <%= link_to "开始实战", shixun_path(@homework.homework_commons_shixuns.shixun),:class => 'task-btn task-btn-blue fr mr10',:target => "_blank" %> <% end %>