From 82a9e0ac077f09a0efe5ae9143c10dea88e23948 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Sat, 29 Jun 2019 16:07:02 +0800 Subject: [PATCH 01/17] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=B7=AF=E7=94=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/routes.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index ff8d4137..c8ce7945 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2658,13 +2658,13 @@ RedmineApp::Application.routes.draw do ## oauth相关 resource :sso, only: [:show, :create] + get '/:sub_dir_name', :to => 'org_subfields#show', :as => 'show_subfield_without_id' + # library resources :libraries do get :publish_success, on: :collection end - get '/:sub_dir_name', :to => 'org_subfields#show', :as => 'show_subfield_without_id' - Dir.glob File.expand_path("plugins/*", Rails.root) do |plugin_dir| file = File.join(plugin_dir, "config/routes.rb") if File.exists?(file) From a61e96c6580ba1fe432f29029fd063a35403c248 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Sat, 29 Jun 2019 16:10:42 +0800 Subject: [PATCH 02/17] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=A2=98=E7=9B=AE?= =?UTF-8?q?=E5=A4=9A=E8=A1=8C=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/exercise/_exercise_student.html.erb | 4 ++-- app/views/exercise/_exercise_student_result.html.erb | 4 ++-- app/views/exercise/_show_MC.html.erb | 2 +- app/views/exercise/_show_MCQ.html.erb | 2 +- app/views/exercise/student_exercise_list.html.erb | 4 ++-- public/stylesheets/educoder/edu-all.css | 5 +++++ 6 files changed, 13 insertions(+), 8 deletions(-) diff --git a/app/views/exercise/_exercise_student.html.erb b/app/views/exercise/_exercise_student.html.erb index a63191db..6b5ecd5e 100644 --- a/app/views/exercise/_exercise_student.html.erb +++ b/app/views/exercise/_exercise_student.html.erb @@ -203,7 +203,7 @@ <% end %> @@ -250,7 +250,7 @@ <% end %> diff --git a/app/views/exercise/_exercise_student_result.html.erb b/app/views/exercise/_exercise_student_result.html.erb index 8b6f7ab6..7b78e5fc 100644 --- a/app/views/exercise/_exercise_student_result.html.erb +++ b/app/views/exercise/_exercise_student_result.html.erb @@ -156,7 +156,7 @@ <% end %> @@ -175,7 +175,7 @@ <% end %> diff --git a/app/views/exercise/_show_MC.html.erb b/app/views/exercise/_show_MC.html.erb index 1f74be73..64b1f128 100644 --- a/app/views/exercise/_show_MC.html.erb +++ b/app/views/exercise/_show_MC.html.erb @@ -23,7 +23,7 @@ <% end %> diff --git a/app/views/exercise/_show_MCQ.html.erb b/app/views/exercise/_show_MCQ.html.erb index 57c36496..4e336e91 100644 --- a/app/views/exercise/_show_MCQ.html.erb +++ b/app/views/exercise/_show_MCQ.html.erb @@ -23,7 +23,7 @@ <% end %> diff --git a/app/views/exercise/student_exercise_list.html.erb b/app/views/exercise/student_exercise_list.html.erb index e6eddc40..6ca89738 100644 --- a/app/views/exercise/student_exercise_list.html.erb +++ b/app/views/exercise/student_exercise_list.html.erb @@ -271,7 +271,7 @@ <% end %> @@ -288,7 +288,7 @@ <% end %> diff --git a/public/stylesheets/educoder/edu-all.css b/public/stylesheets/educoder/edu-all.css index 398cf669..b4500008 100644 --- a/public/stylesheets/educoder/edu-all.css +++ b/public/stylesheets/educoder/edu-all.css @@ -3414,4 +3414,9 @@ line-height: 16px;display: inline-block;color: rgba(65, 140, 205, 1) !important; } .changebtn{ width: 127px;font-size: 16px;height: 40px; line-height: 40px; +} + +.xmplist{ + margin-top:0px !important; + margin-bottom:0px !important; } \ No newline at end of file From f46301e83a9825a116b73fdc60679777069e1892 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Sat, 29 Jun 2019 16:23:10 +0800 Subject: [PATCH 03/17] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=A2=98=E7=9B=AE?= =?UTF-8?q?=E5=A4=9A=E8=A1=8C=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/exercise/_show_MC.html.erb | 2 +- app/views/exercise/_statistics_result_table.html.erb | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/views/exercise/_show_MC.html.erb b/app/views/exercise/_show_MC.html.erb index 64b1f128..546a7255 100644 --- a/app/views/exercise/_show_MC.html.erb +++ b/app/views/exercise/_show_MC.html.erb @@ -23,7 +23,7 @@ <% end %> diff --git a/app/views/exercise/_statistics_result_table.html.erb b/app/views/exercise/_statistics_result_table.html.erb index 964def05..bb0f25c6 100644 --- a/app/views/exercise/_statistics_result_table.html.erb +++ b/app/views/exercise/_statistics_result_table.html.erb @@ -18,7 +18,8 @@ <% exercise_question.exercise_choices.reorder("choice_position").each do |exercise_choice| %>

  • - <%= exercise_choice.choice_text %> + <%#= exercise_choice.choice_text %> +

    <%= exercise_choice.choice_text %>

    <% count = exercise_choice.exercise_answers.where(:user_id => @user_ids).count %>

    <%= count %>

    From 704d36b8700d44e463f2d71ccdfc7eb7ff316094 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Sat, 29 Jun 2019 16:28:31 +0800 Subject: [PATCH 04/17] =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/exercise/_statistics_result_table.html.erb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/views/exercise/_statistics_result_table.html.erb b/app/views/exercise/_statistics_result_table.html.erb index bb0f25c6..516a347e 100644 --- a/app/views/exercise/_statistics_result_table.html.erb +++ b/app/views/exercise/_statistics_result_table.html.erb @@ -18,8 +18,7 @@ <% exercise_question.exercise_choices.reorder("choice_position").each do |exercise_choice| %>

  • - <%#= exercise_choice.choice_text %> -

    <%= exercise_choice.choice_text %> + <%= exercise_choice.choice_text %>

    <% count = exercise_choice.exercise_answers.where(:user_id => @user_ids).count %>

    <%= count %>

    From 35b4b81927bd6e6c549fbdc2224d5bc46c83c569 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Sat, 29 Jun 2019 16:32:38 +0800 Subject: [PATCH 05/17] =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/exercise/_statistics_result_table.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/exercise/_statistics_result_table.html.erb b/app/views/exercise/_statistics_result_table.html.erb index 516a347e..7326ce4c 100644 --- a/app/views/exercise/_statistics_result_table.html.erb +++ b/app/views/exercise/_statistics_result_table.html.erb @@ -17,9 +17,9 @@
    • <% exercise_question.exercise_choices.reorder("choice_position").each do |exercise_choice| %>
  • -

    +

    <%= exercise_choice.choice_text %> -

    +
    <% count = exercise_choice.exercise_answers.where(:user_id => @user_ids).count %>

    <%= count %>

    From c35125b0a90a96033211260930096f34770f7125 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Sat, 29 Jun 2019 16:36:08 +0800 Subject: [PATCH 06/17] =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/exercise/_statistics_result_table.html.erb | 2 +- public/stylesheets/educoder/edu-all.css | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/views/exercise/_statistics_result_table.html.erb b/app/views/exercise/_statistics_result_table.html.erb index 7326ce4c..e1b627f2 100644 --- a/app/views/exercise/_statistics_result_table.html.erb +++ b/app/views/exercise/_statistics_result_table.html.erb @@ -17,7 +17,7 @@
    • <% exercise_question.exercise_choices.reorder("choice_position").each do |exercise_choice| %>
  • -
    +
    <%= exercise_choice.choice_text %>
    <% count = exercise_choice.exercise_answers.where(:user_id => @user_ids).count %> diff --git a/public/stylesheets/educoder/edu-all.css b/public/stylesheets/educoder/edu-all.css index b4500008..543431c5 100644 --- a/public/stylesheets/educoder/edu-all.css +++ b/public/stylesheets/educoder/edu-all.css @@ -3419,4 +3419,7 @@ line-height: 16px;display: inline-block;color: rgba(65, 140, 205, 1) !important; .xmplist{ margin-top:0px !important; margin-bottom:0px !important; +} +.width698{ + width: 698px; } \ No newline at end of file From 33dfaa7088cd8554c7f968af7f61a4a652b4110a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Sat, 29 Jun 2019 16:38:37 +0800 Subject: [PATCH 07/17] =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/exercise/_statistics_result_table.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/exercise/_statistics_result_table.html.erb b/app/views/exercise/_statistics_result_table.html.erb index e1b627f2..831cf64c 100644 --- a/app/views/exercise/_statistics_result_table.html.erb +++ b/app/views/exercise/_statistics_result_table.html.erb @@ -17,7 +17,7 @@
    • <% exercise_question.exercise_choices.reorder("choice_position").each do |exercise_choice| %>
  • -
    +
    <%= exercise_choice.choice_text %>
    <% count = exercise_choice.exercise_answers.where(:user_id => @user_ids).count %> From 4e70f7f13a6541ccdff3040f3ee409596fae5f8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Sat, 29 Jun 2019 16:40:01 +0800 Subject: [PATCH 08/17] =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/exercise/_statistics_result_table.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/exercise/_statistics_result_table.html.erb b/app/views/exercise/_statistics_result_table.html.erb index 831cf64c..6904be36 100644 --- a/app/views/exercise/_statistics_result_table.html.erb +++ b/app/views/exercise/_statistics_result_table.html.erb @@ -18,7 +18,7 @@ <% exercise_question.exercise_choices.reorder("choice_position").each do |exercise_choice| %>
  • - <%= exercise_choice.choice_text %> + <%= exercise_choice.choice_text %>
    <% count = exercise_choice.exercise_answers.where(:user_id => @user_ids).count %>

    <%= count %>

    From 61fe4efb894081c481a510dcfb66467f18ac84c0 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Sat, 29 Jun 2019 16:52:40 +0800 Subject: [PATCH 09/17] =?UTF-8?q?=E6=96=87=E5=BA=93=E8=AF=A6=E6=83=85-?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=B1=95=E5=BC=80-=E7=BB=86=E8=8A=82?= =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/libraries/show.html.erb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/views/libraries/show.html.erb b/app/views/libraries/show.html.erb index 252dddec..8c55b63a 100644 --- a/app/views/libraries/show.html.erb +++ b/app/views/libraries/show.html.erb @@ -100,8 +100,12 @@ }); $(function(){ var height=document.getElementById("private_reason_ul").offsetHeight; + var one=parseInt($("#private_reason_ul").find("li").eq(0).height())+10; + var two=parseInt($("#private_reason_ul").find("li").eq(1).height()); + var plus=one+two; if(parseInt(height)>166){ $("#actionPanel").html('点击展开'); + $(".private_reason").css({maxHeight:plus+"px"}); } }) \ No newline at end of file From b7bffd2c9935accaf01549e60a045bd68cb9dee1 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Sat, 29 Jun 2019 17:11:36 +0800 Subject: [PATCH 10/17] =?UTF-8?q?=E5=AE=9E=E8=B7=B5=E6=95=99=E5=AD=A6?= =?UTF-8?q?=E7=BB=84=E5=9B=BE=E7=89=87=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/educoder/edu-all.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/public/stylesheets/educoder/edu-all.css b/public/stylesheets/educoder/edu-all.css index 543431c5..c2338d19 100644 --- a/public/stylesheets/educoder/edu-all.css +++ b/public/stylesheets/educoder/edu-all.css @@ -706,12 +706,12 @@ li.challenge_box:last-child{ /*实践教学*/ -.second_course_1{min-height: 782px;} +.second_course_1{min-height: 776px;} .second_course_2{min-height: 823px;} .second_course_3{min-height: 690px;} -.second_course_4{min-height: 523px;} +.second_course_4{min-height: 514px;} .second_course_5{min-height: 737px;padding-top: 190px;box-sizing: border-box;position: relative} -.second_course_6{min-height: 1230px;} +.second_course_6{min-height: 1225px;} .course_competition_panel{ margin:30px 40px 40px;border:1px solid #ABDCF1;background: #F1F8FD;justify-content: center;align-items: center;display: -webkit-flex; height: 282px;text-align: center; From 8b89c6feb8a63216d071bfb12a32d4e2666d8034 Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Sat, 29 Jun 2019 17:19:21 +0800 Subject: [PATCH 11/17] =?UTF-8?q?=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/routes.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/routes.rb b/config/routes.rb index c8ce7945..af3f2a1f 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -26,7 +26,7 @@ # Example: :via => :get ====> :via => :get RedmineApp::Application.routes.draw do ## oauth相关 - + # zhushi match 'oauth', to: 'oauth#index' match 'oauth/authorize', to: 'oauth#authorize', :via => [:get, :post] match 'oauth/token', to: 'oauth#token', :via => :post From 3f42a82e9183a4726f0155d2ca09d04793facf8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Sat, 29 Jun 2019 17:23:57 +0800 Subject: [PATCH 12/17] b --- Gemfile | 4 ++-- public/react/src/modules/tpm/NewHeader.js | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index d89f9a24..ac45f360 100644 --- a/Gemfile +++ b/Gemfile @@ -64,8 +64,8 @@ gem 'elasticsearch-rails' gem 'oauth2' # xlsx -gem 'axlsx', '3.0.0.pre' -gem 'axlsx_rails', '0.3.0' +# gem 'axlsx', '3.0.0.pre' +# gem 'axlsx_rails', '0.3.0' # state machine gem 'aasm' diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js index 0251d318..79eccf2b 100644 --- a/public/react/src/modules/tpm/NewHeader.js +++ b/public/react/src/modules/tpm/NewHeader.js @@ -294,6 +294,7 @@ class NewHeader extends Component {
    • +
  • 教学案例
  • 竞赛
  • 问答
  • {ecUrl===null||ecUrl===undefined||ecUrl===""?'':'认证'}
    • From be28e6f160ab3fad6e9771ff1aa47f5659e217b7 Mon Sep 17 00:00:00 2001 From: p31729568 Date: Sat, 29 Jun 2019 17:26:40 +0800 Subject: [PATCH 13/17] modify library text --- app/helpers/application_helper.rb | 4 ++-- app/models/tiding.rb | 4 ++-- app/views/layouts/_logined_header.html.erb | 2 +- app/views/layouts/base_management.html.erb | 2 +- app/views/libraries/edit.html.erb | 2 +- app/views/libraries/index.html.erb | 4 ++-- app/views/libraries/new.html.erb | 2 +- app/views/libraries/show.html.erb | 2 +- app/views/managements/library_applies/index.html.erb | 6 +++--- config/locales/libraries/zh.yml | 2 +- config/routes.rb | 10 +++++----- lib/trustie/sms/sms.rb | 2 +- public/stylesheets/educoder/edu-all.css | 2 +- 13 files changed, 22 insertions(+), 22 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 031c4399..e7390697 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -753,7 +753,7 @@ module ApplicationHelper when 5 then '实训发布' when 6 then '实训课程发布' when 7 then '职业认证' - when 8 then '文库发布' + when 8 then '教学案例发布' else '职业认证' end when 11 @@ -4368,7 +4368,7 @@ module ApplicationHelper elsif attachment.container_type == "Bid" && attachment.container && attachment.container.courses course = attachment.container.courses.first candown = User.current.member_of_course?(attachment.container.courses.first) || (course.is_public == 1 && attachment.is_public == 1) - elsif attachment.container_type == "Library" #文库允许下载 + elsif attachment.container_type == "Library" #教学案例允许下载 candown = true else candown = (attachment.is_public == 1 || attachment.is_public == true) diff --git a/app/models/tiding.rb b/app/models/tiding.rb index 91bcf0b9..c5b2e6a3 100644 --- a/app/models/tiding.rb +++ b/app/models/tiding.rb @@ -361,10 +361,10 @@ class Tiding < ActiveRecord::Base when 'Library' library = Library.find_by_id(container_id) if tiding_type == 'Apply' - "申请发布文库：#{library.try(:title)}" + "申请发布教学案例：#{library.try(:title)}" elsif tiding_type == 'System' text = status == 1 ? "审核已通过" : "审核未通过，
    原因：#{extra}" - "你提交的发布文库申请：#{library.try(:title)}，#{text}" + "你提交的发布教学案例申请：#{library.try(:title)}，#{text}" end else logger.error "error type: 1" diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb index f33b2110..7f6e08f9 100644 --- a/app/views/layouts/_logined_header.html.erb +++ b/app/views/layouts/_logined_header.html.erb @@ -18,7 +18,7 @@ <% end %> - +
  • "><%= link_to '教学案例', libraries_path %>
  • "><%= link_to "竞赛", competitions_path %>
  • "><%= link_to "问答", forums_path %>
    • <% if User.current.ec_school.present? %> diff --git a/app/views/layouts/base_management.html.erb b/app/views/layouts/base_management.html.erb index 891cf808..423d83c6 100644 --- a/app/views/layouts/base_management.html.erb +++ b/app/views/layouts/base_management.html.erb @@ -116,7 +116,7 @@
  • <%= link_to '单位审批', unit_managements_path %>
  • <%= link_to '实训发布', shixun_authorization_managements_path %>
  • <%= link_to '实训课程发布', subject_authorization_managements_path %>
    • -
  • <%= link_to '文库发布', library_applies_path(status: :pending) %>
    • +
  • <%= link_to '教学案例发布', library_applies_path(status: :pending) %>
  • 认证+ diff --git a/app/views/libraries/edit.html.erb b/app/views/libraries/edit.html.erb index e258e1c1..cd06d519 100644 --- a/app/views/libraries/edit.html.erb +++ b/app/views/libraries/edit.html.erb @@ -1,6 +1,6 @@

    - <%= link_to '文库', libraries_path, class: 'color-grey-9' %> > + <%= link_to '教学案例', libraries_path, class: 'color-grey-9' %> > 编辑

    diff --git a/app/views/libraries/index.html.erb b/app/views/libraries/index.html.erb index 98e80cb0..84a2a9af 100644 --- a/app/views/libraries/index.html.erb +++ b/app/views/libraries/index.html.erb @@ -1,7 +1,7 @@

    - 文库 + 教学案例 <%= link_to '新建', new_library_path, class: 'fr color-blue font-16 mt3' %>

    @@ -15,7 +15,7 @@
    <%= hidden_field_tag(:type, params[:type]) %> - +
    diff --git a/app/views/libraries/new.html.erb b/app/views/libraries/new.html.erb index 987951d3..a9583823 100644 --- a/app/views/libraries/new.html.erb +++ b/app/views/libraries/new.html.erb @@ -1,6 +1,6 @@

    - <%= link_to '文库', libraries_path, class: 'color-grey-9' %> > + <%= link_to '教学案例', libraries_path, class: 'color-grey-9' %> > 新建

    diff --git a/app/views/libraries/show.html.erb b/app/views/libraries/show.html.erb index 8c55b63a..5b196712 100644 --- a/app/views/libraries/show.html.erb +++ b/app/views/libraries/show.html.erb @@ -3,7 +3,7 @@ %>

    - <%= link_to '文库', libraries_path, class: 'color-grey-9' %> > + <%= link_to '教学案例', libraries_path, class: 'color-grey-9' %> > 详情

    diff --git a/app/views/managements/library_applies/index.html.erb b/app/views/managements/library_applies/index.html.erb index 23d898c4..c83a5321 100644 --- a/app/views/managements/library_applies/index.html.erb +++ b/app/views/managements/library_applies/index.html.erb @@ -1,6 +1,6 @@

    -

    文库发布

    +

    教学案例发布

    @@ -16,7 +16,7 @@
    - +
    @@ -34,7 +34,7 @@ <%= link_to "拒绝", library_applies_path(status: :refused), :class => "edu-filter-cir-grey mr5 fl font-12", :id => "library_reject_authentication", :remote => true %>

    - +
    diff --git a/config/locales/libraries/zh.yml b/config/locales/libraries/zh.yml index 3004ecab..3dae730c 100644 --- a/config/locales/libraries/zh.yml +++ b/config/locales/libraries/zh.yml @@ -1,7 +1,7 @@ 'zh': activerecord: models: - library: '文库' + library: '教学案例' attributes: library: title: '标题' diff --git a/config/routes.rb b/config/routes.rb index af3f2a1f..5936b9b4 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -52,6 +52,11 @@ RedmineApp::Application.routes.draw do ## oauth相关 end end + # library + resources :libraries do + get :publish_success, on: :collection + end + resources :ec_course_evaluations do member do match 'import_score', :via => [:post] @@ -2660,11 +2665,6 @@ RedmineApp::Application.routes.draw do ## oauth相关 get '/:sub_dir_name', :to => 'org_subfields#show', :as => 'show_subfield_without_id' - # library - resources :libraries do - get :publish_success, on: :collection - end - Dir.glob File.expand_path("plugins/*", Rails.root) do |plugin_dir| file = File.join(plugin_dir, "config/routes.rb") if File.exists?(file) diff --git a/lib/trustie/sms/sms.rb b/lib/trustie/sms/sms.rb index 319de17c..7c2dad4c 100644 --- a/lib/trustie/sms/sms.rb +++ b/lib/trustie/sms/sms.rb @@ -58,7 +58,7 @@ module Trustie params['text'] = "【计算机实践教学】亲爱的#{user_name}老师，您已经成功报名参与了11月24日--25日在深圳大学举办的全国软件工程实践教学案例与应用研讨会，请准时参加。（如有任何参会问题，请致电咨询会务联系人汤老师13099740868）" Rails.logger.info "#{params['text']}" elsif send_type == 'publish_library' - params['text'] = "【Edu实训】亲爱的#{name}，有新的文库发布申请，请尽快处理" + params['text'] = "【Edu实训】亲爱的#{name}，有新的教学案例发布申请，请尽快处理" Rails.logger.info "#{params['text']}" end diff --git a/public/stylesheets/educoder/edu-all.css b/public/stylesheets/educoder/edu-all.css index c2338d19..db1a8de5 100644 --- a/public/stylesheets/educoder/edu-all.css +++ b/public/stylesheets/educoder/edu-all.css @@ -3376,7 +3376,7 @@ line-height: 16px;display: inline-block;color: rgba(65, 140, 205, 1) !important; right: 20px; } -/*文库*/ +/*教学案例*/ .library_nav li{ float: left;cursor: pointer;margin-right: 30px;position: relative;color: #05101A;height: 40px;line-height: 20px; font-size: 16px; From 7957ff55d7fc913a5868b14ce79fab2496d89f02 Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Sat, 29 Jun 2019 17:35:32 +0800 Subject: [PATCH 14/17] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/application_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 031c4399..dd845229 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -3080,7 +3080,7 @@ module ApplicationHelper elsif @syllabus title << (@syllabus.title.nil? ? "课堂" : @syllabus.title) else - title << (User.current.anonymous? ? "Educoder实践教学" : User.current.show_name) + title << (User.current.anonymous? ? "EduCoder实践教学" : User.current.show_name) end # if first_page.nil? || first_page.web_title.nil? # title << Setting.app_title unless Setting.app_title == title.last From 7e542c867e30dffa8cf39e1bb32241313cf986f7 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Sat, 29 Jun 2019 17:36:30 +0800 Subject: [PATCH 15/17] =?UTF-8?q?=E6=95=99=E5=AD=A6=E6=A1=88=E4=BE=8B?= =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/libraries/_form.html.erb | 6 +++--- app/views/libraries/new.html.erb | 2 +- public/stylesheets/educoder/edu-main.css | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/views/libraries/_form.html.erb b/app/views/libraries/_form.html.erb index 5bfd2610..3b0e3d33 100644 --- a/app/views/libraries/_form.html.erb +++ b/app/views/libraries/_form.html.erb @@ -1,4 +1,4 @@ -

    上传文档

    +

    上传教学案例

    <%= form_for(@library) do |f| %> <%= hidden_field_tag :apply_publish, false %> @@ -7,7 +7,7 @@
    标题
  • - <%= f.text_field :title, placeholder: '例如：软件工程教学案例', class: 'greyInput winput-240-35 mr20 fl' %> + <%= f.text_field :title, placeholder: '例如：软件工程教学案例', class: 'greyInput winput-300-35 mr20 fl' %>

    请输入标题

    • 简明扼要介绍文档&视频所包含的主要的内容 @@ -78,7 +78,7 @@ autoFocus: false, // 用于增加自定义工具栏的功能，可以直接插入HTML标签，不使用默认的元素创建图标 dialogMaskOpacity: 0.6, - placeholder: "请输入参考答案", + placeholder: "请添加描述", imageUpload: true, imageFormats: ["jpg", "jpeg", "gif", "png", "bmp", "webp", "JPG", "JPEG", "GIF", "PNG", "BMP", "WEBP"], imageUploadURL: "<%= upload_with_markdown_path(container_id: 0, container_type: 'MarkDown') %>" //url diff --git a/app/views/libraries/new.html.erb b/app/views/libraries/new.html.erb index 987951d3..a9583823 100644 --- a/app/views/libraries/new.html.erb +++ b/app/views/libraries/new.html.erb @@ -1,6 +1,6 @@

    - <%= link_to '文库', libraries_path, class: 'color-grey-9' %> > + <%= link_to '教学案例', libraries_path, class: 'color-grey-9' %> > 新建

    diff --git a/public/stylesheets/educoder/edu-main.css b/public/stylesheets/educoder/edu-main.css index fca9b02b..711a1f96 100644 --- a/public/stylesheets/educoder/edu-main.css +++ b/public/stylesheets/educoder/edu-main.css @@ -287,6 +287,7 @@ a.color-red-dd:hover{color: #C61616!important;} .greyInput:focus{background-color: #fff;} /*输入框样式---------宽度为固定长度*/ +.winput-300-35{width: 300px;height: 35px;padding: 5px;box-sizing: border-box;} .winput-240-45{width: 240px;height: 45px;padding: 5px;box-sizing: border-box;} .winput-240-40{width: 240px;height: 40px;padding: 5px;box-sizing: border-box;} .winput-240-35{width: 240px;height: 35px;padding: 5px;box-sizing: border-box;} From bca122d66922fc9f12e89f7dd386e593cb6196b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Sat, 29 Jun 2019 17:36:48 +0800 Subject: [PATCH 16/17] =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gemfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index ac45f360..d89f9a24 100644 --- a/Gemfile +++ b/Gemfile @@ -64,8 +64,8 @@ gem 'elasticsearch-rails' gem 'oauth2' # xlsx -# gem 'axlsx', '3.0.0.pre' -# gem 'axlsx_rails', '0.3.0' +gem 'axlsx', '3.0.0.pre' +gem 'axlsx_rails', '0.3.0' # state machine gem 'aasm' From 9bd9e16d3b5aee5f99d781e23889e67f1d2507d6 Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Sat, 29 Jun 2019 17:40:52 +0800 Subject: [PATCH 17/17] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/application_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 0d2a353e..5370e310 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -6490,7 +6490,7 @@ def visable_attachemnts_incourse course member = course.members.where(:user_id => User.current.id).first if member.try(:course_group_id).to_i == 0 && attachment.unified_setting result << attachment - elsif attachment.attachment_group_settings.where("course_group_id = #{member.try(:course_group_id)} and publish_time > '#{Time.now}'").count == 0 + elsif attachment.attachment_group_settings.where("course_group_id = #{member.try(:course_group_id).to_i} and publish_time > '#{Time.now}'").count == 0 result << attachment end end