Make error template UI usable

This commit is contained in:
Maximilian Grundke
2017-07-12 11:04:29 +02:00
parent 4d38195c99
commit 9eadc3a4db
16 changed files with 76 additions and 69 deletions

View File

@ -1,3 +0,0 @@
// Place all the styles related to the error_templates controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/

View File

@ -9,7 +9,7 @@ class ErrorTemplatesController < ApplicationController
# GET /error_templates # GET /error_templates
# GET /error_templates.json # GET /error_templates.json
def index def index
@error_templates = ErrorTemplate.all @error_templates = ErrorTemplate.all.order(:execution_environment_id, :name).paginate(page: params[:page])
authorize! authorize!
end end
@ -33,8 +33,8 @@ class ErrorTemplatesController < ApplicationController
# POST /error_templates # POST /error_templates
# POST /error_templates.json # POST /error_templates.json
def create def create
authorize!
@error_template = ErrorTemplate.new(error_template_params) @error_template = ErrorTemplate.new(error_template_params)
authorize!
respond_to do |format| respond_to do |format|
if @error_template.save if @error_template.save
@ -81,6 +81,6 @@ class ErrorTemplatesController < ApplicationController
# Never trust parameters from the scary internet, only allow the white list through. # Never trust parameters from the scary internet, only allow the white list through.
def error_template_params def error_template_params
params.fetch(:error_template, {}) params[:error_template].permit(:name, :execution_environment_id, :signature, :description, :hint)
end end
end end

View File

@ -1,17 +0,0 @@
<%= form_for(@error_template) do |f| %>
<% if @error_template.errors.any? %>
<div id="error_explanation">
<h2><%= pluralize(@error_template.errors.count, "error") %> prohibited this error_template from being saved:</h2>
<ul>
<% @error_template.errors.full_messages.each do |message| %>
<li><%= message %></li>
<% end %>
</ul>
</div>
<% end %>
<div class="actions">
<%= f.submit %>
</div>
<% end %>

View File

@ -0,0 +1,19 @@
= form_for(@error_template) do |f|
= render('shared/form_errors', object: @error_template)
.form-group
= f.label(:name)
= f.text_field(:name, class: 'form-control', required: true)
.form-group
= f.label(:execution_environment_id)
= f.collection_select(:execution_environment_id, ExecutionEnvironment.all.order(:name), :id, :name, {include_blank: false}, class: 'form-control')
.form-group
= f.label(:signature)
= f.text_field(:signature, class: 'form-control')
.help-block == t('error_templates.hints.signature')
.form-group
= f.label(:description)
= f.text_field(:description, class: 'form-control')
.form-group
= f.label(:hint)
= f.text_field(:hint, class: 'form-control')
.actions = render('shared/submit_button', f: f, object: @error_template)

View File

@ -1,6 +0,0 @@
<h1>Editing Error Template</h1>
<%= render 'form' %>
<%= link_to 'Show', @error_template %> |
<%= link_to 'Back', error_templates_path %>

View File

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

View File

@ -1,25 +0,0 @@
<p id="notice"><%= notice %></p>
<h1>Listing Error Templates</h1>
<table>
<thead>
<tr>
<th colspan="3"></th>
</tr>
</thead>
<tbody>
<% @error_templates.each do |error_template| %>
<tr>
<td><%= link_to 'Show', error_template %></td>
<td><%= link_to 'Edit', edit_error_template_path(error_template) %></td>
<td><%= link_to 'Destroy', error_template, method: :delete, data: { confirm: 'Are you sure?' } %></td>
</tr>
<% end %>
</tbody>
</table>
<br>
<%= link_to 'New Error template', new_error_template_path %>

View File

@ -0,0 +1,22 @@
h1 = ErrorTemplate.model_name.human(count: 2)
.table-responsive
table.sortable.table
thead
tr
th = t('activerecord.attributes.error_template.name')
th = t('activerecord.attributes.error_template.description')
th = t('activerecord.attributes.exercise.execution_environment')
th colspan=5 = t('shared.actions')
tbody
- @error_templates.each do |error_template|
tr
td = error_template.name
td = error_template.description
td = link_to(error_template.execution_environment)
td = link_to(t('shared.show'), error_template)
td = link_to(t('shared.edit'), edit_error_template_path(error_template))
td = link_to(t('shared.destroy'), error_template, data: {confirm: t('shared.confirm_destroy')}, method: :delete)
= render('shared/pagination', collection: @error_templates)
p = render('shared/new_button', model: ErrorTemplate)

View File

@ -1,4 +0,0 @@
json.array!(@error_templates) do |error_template|
json.extract! error_template, :id
json.url error_template_url(error_template, format: :json)
end

View File

@ -1,5 +0,0 @@
<h1>New Error Template</h1>
<%= render 'form' %>
<%= link_to 'Back', error_templates_path %>

View File

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

View File

@ -1,4 +0,0 @@
<p id="notice"><%= notice %></p>
<%= link_to 'Edit', edit_error_template_path(@error_template) %> |
<%= link_to 'Back', error_templates_path %>

View File

@ -0,0 +1,10 @@
h1
= @error_template
= render('shared/edit_button', object: @error_template)
= row(label: 'error_template.name', value: @error_template.name)
= row(label: 'exercise.execution_environment', value: link_to(@error_template.execution_environment))
- [:signature, :description, :hint].each do |attribute|
= row(label: "error_template.#{attribute}", value: @error_template.send(attribute))
//todo: list attributes

View File

@ -1 +0,0 @@
json.extract! @error_template, :id, :created_at, :updated_at

View File

@ -109,6 +109,11 @@ de:
name: "Name" name: "Name"
file_type: "Dateityp" file_type: "Dateityp"
content: "Code" content: "Code"
error_template:
name: Name
signature: Regulärer Ausdruck
description: Beschreibung
hint: Hinweis
models: models:
code_harbor_link: code_harbor_link:
one: CodeHarbor-Link one: CodeHarbor-Link
@ -580,4 +585,6 @@ de:
estimated_time_20_to_30: "zwischen 20 und 30 Minuten" estimated_time_20_to_30: "zwischen 20 und 30 Minuten"
estimated_time_more_30: "mehr als 30 Minuten" estimated_time_more_30: "mehr als 30 Minuten"
working_time: "Geschätze Bearbeitungszeit für diese Aufgabe:" working_time: "Geschätze Bearbeitungszeit für diese Aufgabe:"
error_templates:
hints:
signature: "Ein regulärer Ausdruck in Ruby-Syntax und ohne führende und schließende \"/\""

View File

@ -130,6 +130,11 @@ en:
name: "Name" name: "Name"
file_type: "File Type" file_type: "File Type"
content: "Content" content: "Content"
error_template:
name: Name
signature: Signature Regular Expression
description: Description
hint: Hint
models: models:
code_harbor_link: code_harbor_link:
one: CodeHarbor Link one: CodeHarbor Link
@ -601,3 +606,6 @@ en:
estimated_time_20_to_30: "between 20 and 30 minutes" estimated_time_20_to_30: "between 20 and 30 minutes"
estimated_time_more_30: "more than 30 minutes" estimated_time_more_30: "more than 30 minutes"
working_time: "Estimated time working on this exercise:" working_time: "Estimated time working on this exercise:"
error_templates:
hints:
signature: "A regular expression in Ruby syntax without leading and trailing \"/\""