From 0a80c0c91527c96f9ca22373a4befc470f59d3c1 Mon Sep 17 00:00:00 2001 From: p31729568 Date: Sat, 29 Jun 2019 15:55:12 +0800 Subject: [PATCH 1/8] fix --- config/routes.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/config/routes.rb b/config/routes.rb index 5d523390..ff8d4137 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2658,6 +2658,7 @@ RedmineApp::Application.routes.draw do ## oauth相关 resource :sso, only: [:show, :create] + # library resources :libraries do get :publish_success, on: :collection end 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 2/8] =?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 3/8] =?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 4/8] =?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 5/8] =?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 6/8] =?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 7/8] =?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 8/8] =?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 %>