htwkmooc/codeocean
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Completely remove old hints connected to the execution environment

Browse Source
This commit is contained in:
Sebastian Serth
2018-11-27 18:15:12 +01:00
parent 5d13ee0e56
commit efacb5a6a9
29 changed files with 12 additions and 534 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/editor/editor.js.erb
View File

@@ -436,7 +436,6 @@ configureEditors: function () {
url: $('#editor').data('errors-url')
});
jqxhr.always(this.hideSpinner);
jqxhr.done(this.renderHint);
},
toggleButtonStates: function () {
@@ -482,7 +481,6 @@ configureEditors: function () {
resetOutputTab: function () {
this.clearOutput();
$('#hint').fadeOut();
$('#flowrHint').fadeOut();
this.clearHints();
this.showOutputBar();

8
app/assets/javascripts/editor/evaluation.js
View File

@@ -57,14 +57,6 @@ CodeOceanEditorEvaluation = {
}
},
renderHint: function (object) {
var hint = object.data || object.hint;
if (hint) {
$('#hint .card-body').text(hint);
$('#hint').fadeIn();
}
},
renderScore: function () {
var score = parseFloat($('#score').data('score'));
var maximum_score = parseFloat($('#score').data('maximum-score'));

4
app/assets/stylesheets/editor.css.scss
View File

@@ -64,10 +64,6 @@ button i.fa-spin {
overflow: auto;
}
#hint {
display: none;
}
#outputInformation {
#output {
max-height: 500px;

7
app/controllers/code_ocean/errors_controller.rb
View File

@@ -10,14 +10,9 @@ module CodeOcean
def create
@error = CodeOcean::Error.new(error_params)
authorize!
hint = Whistleblower.new(execution_environment: @error.execution_environment).generate_hint(@error.message)
respond_to do |format|
format.json do
if hint
render(json: {hint: hint})
else
head (@error.save ? :created : :unprocessable_entity)
end
head (@error.save ? :created : :unprocessable_entity)
end
end
end

57
app/controllers/hints_controller.rb
View File

@@ -1,57 +0,0 @@
class HintsController < ApplicationController
include CommonBehavior
before_action :set_execution_environment
before_action :set_hint, only: MEMBER_ACTIONS
def authorize!
authorize(@hint || @hints)
end
private :authorize!
def create
@hint = Hint.new(hint_params)
authorize!
create_and_respond(object: @hint, path: proc { execution_environment_hint_path(@execution_environment, @hint) })
end
def destroy
destroy_and_respond(object: @hint, path: execution_environment_hints_path(@execution_environment))
end
def edit
end
def hint_params
params[:hint].permit(:locale, :message, :name, :regular_expression).merge(execution_environment_id: @execution_environment.id) if params[:hint].present?
end
private :hint_params
def index
@hints = @execution_environment.hints.order(:name).paginate(page: params[:page])
authorize!
end
def new
@hint = Hint.new
authorize!
end
def set_execution_environment
@execution_environment = ExecutionEnvironment.find(params[:execution_environment_id])
end
private :set_execution_environment
def set_hint
@hint = Hint.find(params[:id])
authorize!
end
private :set_hint
def show
end
def update
update_and_respond(object: @hint, params: hint_params, path: execution_environment_hint_path(@execution_environment, @hint))
end
end

6
app/controllers/submissions_controller.rb
View File

@@ -128,11 +128,7 @@ class SubmissionsController < ApplicationController
# server_sent_event.write({stderr: output[:stderr]}, event: 'output') if output[:stderr]
# unless output[:stderr].nil?
# if hint = Whistleblower.new(execution_environment: @submission.execution_environment).generate_hint(output[:stderr])
# server_sent_event.write(hint, event: 'hint')
# else
# store_error(output[:stderr])
# end
# store_error(output[:stderr])
# end
# end

1
app/models/execution_environment.rb
View File

@@ -10,7 +10,6 @@ class ExecutionEnvironment < ApplicationRecord
has_many :exercises
belongs_to :file_type
has_many :hints
has_many :error_templates
scope :with_exercises, -> { where('id IN (SELECT execution_environment_id FROM exercises)') }

17
app/models/hint.rb
View File

@@ -1,17 +0,0 @@
class Hint < ApplicationRecord
belongs_to :execution_environment
validates :execution_environment_id, presence: true
validates :locale, presence: true
validates :message, presence: true
validates :name, presence: true
validates :regular_expression, presence: true
def self.nested_resource?
true
end
def to_s
name
end
end

5
app/policies/hint_policy.rb
View File

@@ -1,5 +0,0 @@
class HintPolicy < AdminOrAuthorPolicy
def author?
@user == @record.execution_environment.author
end
end

1
app/views/execution_environments/index.html.slim
View File

@@ -27,7 +27,6 @@ h1 = ExecutionEnvironment.model_name.human(count: 2)
td = link_to(t('.shell'), shell_execution_environment_path(execution_environment))
td = link_to(t('shared.statistics'), statistics_execution_environment_path(execution_environment))
td = link_to(t('activerecord.models.error.other'), execution_environment_errors_path(execution_environment.id))
td = link_to(t('activerecord.models.hint.other'), execution_environment_hints_path(execution_environment.id))
= render('shared/pagination', collection: @execution_environments)
p = render('shared/new_button', model: ExecutionEnvironment)

5
app/views/exercises/_editor_output.html.slim
View File

@@ -38,11 +38,6 @@ div.h-100 id='output_sidebar_uncollapsed' class='d-none col-sm-12 enforce-bottom
div.enforce-big-top-margin
#turtlediv
canvas#turtlecanvas.d-none width=400 height=400
div.enforce-big-top-margin
#hint
.card.bg-warning.text-white
.card-header = t('exercises.implement.hint')
.card-body
div.enforce-big-top-margin
#prompt.input-group.d-none
div.input-group-prepend

17
app/views/hints/_form.html.slim
View File

@@ -1,17 +0,0 @@
= form_for(@hint, url: execution_environment_hints_path(params[:execution_environment_id])) do |f|
= render('shared/form_errors', object: @hint)
.form-group
= f.label(:name)
= f.text_field(:name, class: 'form-control', required: true)
.form-group
= f.label(:locale)
= f.select(:locale, I18n.available_locales.map { |locale| [t("locales.#{locale}"), locale] }, {}, class: 'form-control')
.form-group
= f.label(:message)
= f.text_field(:message, class: 'form-control', placeholder: "'$2' has no method '$1'.", required: true)
.help-block.form-text = t('.hints.message')
.form-group
= f.label(:regular_expression)
= f.text_field(:regular_expression, class: 'form-control', placeholder: 'undefined method (\w+) for (\w+)', required: true)
.help-block.form-text = t('.hints.regular_expression')
.actions = render('shared/submit_button', f: f, object: @hint)

3
app/views/hints/edit.html.slim
View File

@@ -1,3 +0,0 @@
h1 = @hint
= render('form')

20
app/views/hints/index.html.slim
View File

@@ -1,20 +0,0 @@
h1 = Hint.model_name.human(count: 2)
.table-responsive
table.table
thead
tr
th = t('activerecord.attributes.hint.name')
th = t('activerecord.attributes.hint.locale')
th colspan=3 = t('shared.actions')
tbody
- @hints.each do |hint|
tr
td = hint.name
td = t("locales.#{hint.locale}")
td = link_to(t('shared.show'), execution_environment_hint_path(params[:execution_environment_id], hint.id))
td = link_to(t('shared.edit'), edit_execution_environment_hint_path(params[:execution_environment_id], hint.id))
td = link_to(t('shared.destroy'), execution_environment_hint_path(params[:execution_environment_id], hint.id), data: {confirm: t('shared.confirm_destroy')}, method: :delete)
= render('shared/pagination', collection: @hints)
p = render('shared/new_button', model: Hint, path: new_execution_environment_hint_path(params[:execution_environment_id]))

3
app/views/hints/new.html.slim
View File

@@ -1,3 +0,0 @@
h1 = t('shared.new_model', model: Hint.model_name.human)
= render('form')

8
app/views/hints/show.html.slim
View File

@@ -1,8 +0,0 @@
h1
= @hint
= render('shared/edit_button', object: @hint, path: edit_execution_environment_hint_path(params[:execution_environment_id], @hint.id))
= row(label: 'hint.name', value: @hint.name)
= row(label: 'hint.locale', value: t("locales.#{@hint.locale}"))
= row(label: 'hint.message', value: @hint.message)
= row(label: 'hint.regular_expression', value: code_tag(@hint.regular_expression))

3
app/views/tags/index.html.slim
View File

@@ -5,8 +5,7 @@ h1 = Tag.model_name.human(count: 2)
thead
tr
th = t('activerecord.attributes.hint.name')
/th = t('activerecord.attributes.hint.locale')
/th colspan=3 = t('shared.actions')
th colspan=3 = t('shared.actions')
tbody
- @tags.each do |tag|
tr