Merge pull request #34 from openHPI/26_exercise_language

Theresa Zobel · Theresa Zobel · commit 0370dcc60877 · 2016-02-15T21:48:53.000+01:00
26 exercise language
diff --git a/app/models/description.rb b/app/models/description.rb
@@ -1,5 +1,6 @@
 class Description < ActiveRecord::Base
   belongs_to :exercise
 
+  LANGUAGES= ['en', 'de','fr', 'es', 'ja', 'cn']
 
 end
diff --git a/app/models/exercise.rb b/app/models/exercise.rb
@@ -57,11 +57,12 @@ def add_descriptions(description_array)
     description_array.try(:each) do |key, array|
       destroy = array[:_destroy]
       id = array[:id]
+
       if id
         description = Description.find(id)
-        destroy ? description.destroy : description.update(text: array[:text])
+        destroy ? description.destroy : description.update(text: array[:text], language: array[:language])
       else
-        descriptions << Description.create(text: array[:text]) unless destroy
+        descriptions << Description.create(text: array[:text], language: array[:language]) unless destroy
       end
     end
   end
diff --git a/app/views/comments/comments_all.html.erb b/app/views/comments/comments_all.html.erb
@@ -14,9 +14,15 @@
   <tbody>
   <% @comments.each do |comment| %>
       <tr>
-        <td><%= link_to comment.exercise.title, exercise_path(comment.exercise) %></td>
+        <% if !comment.exercise %>
+            <td> <%= 'Exercise undefined' %> </td>
+        <% else %>
+          <td><%= link_to comment.exercise.title, exercise_path(comment.exercise) %></td>
+        <% end %>
         <td><%= comment.text %></td>
-        <% if comment.user.first_name.nil? %>
+        <% if !comment.user %>
+           <td> <%= 'User undefined' %> </td>
+        <% elsif comment.user.first_name.nil?%>
             <td><%= link_to "User#{comment.user.id}", user_path(comment.user)%></td>
         <% else %>
             <td><%= link_to comment.user.name, user_path(comment.user) %></td>
diff --git a/app/views/comments/index.html.erb b/app/views/comments/index.html.erb
@@ -25,10 +25,12 @@
       <% @comments.each do |comment| %>
         <tr>
           <td><%= comment.text %></td>
-          <% if comment.user.first_name.nil? %>
-            <td><%= "User#{comment.user.id}"%></td>
+          <% if !comment.user %>
+             <td> <%= 'User undefined' %> </td>
+          <% elsif comment.user.first_name.nil?%>
+              <td><%=  "User#{comment.user.id}"%></td>
           <% else %>
-            <td><%= comment.user.name %></td>
+              <td><%= comment.user.name%></td>
           <% end %>
           <td><%= comment.created_at %>
           <td><div class="actions btn-group" role="group">
diff --git a/app/views/exercises/_form.html.erb b/app/views/exercises/_form.html.erb
@@ -30,12 +30,17 @@
         <div class="controls" style="margin-top: 10px; margin-bottom: 10px">
           <%= description.text_area :text, class:'form-control' %>
           <%= description.remove_nested_fields_link 'Remove Description', class:'btn btn-danger btn-xs' %>
+          <div class="field">
+            <%= f.label :language %><br>
+            <%= description.collection_select :language, Description::LANGUAGES, :to_s, :to_s, include_blank: false %>
+          </div>
         </div>
     <% end %>
     <%= f.add_nested_fields_link :descriptions, 'Add Description', class:'btn btn-success' %>
   </div>
 
 
+
   <div class="form-group">
     <%= f.label :public,  class: 'control-label' %>
     <div class='radio'>
@@ -51,7 +56,6 @@
       </div>
     </div>
   </div>
-
   <h4>Files:</h4>
   <%= f.nested_fields_for :exercise_files do |file| %>
     <%= render 'file_form', f: f, file: file %>
diff --git a/app/views/exercises/exercises_all.html.erb b/app/views/exercises/exercises_all.html.erb
@@ -15,14 +15,12 @@
   <% @exercises.each do |exercise| %>
       <tr>
         <td><%= link_to exercise.title, exercise %></td>
-        <% if defined? exercise.user %>
-            <% if exercise.user.first_name.nil?%>
-                <td><%= link_to "User#{exercise.user.id}", user_path(exercise.user)%></td>
-            <% else %>
-                <td><%= link_to exercise.user.name, user_path(exercise.user) %></td>
-            <% end %>
+        <% if !exercise.user %>
+            <td> <%= 'User undefined' %> </td>
+        <% elsif exercise.user.first_name.nil?%>
+            <td><%= link_to "User#{exercise.user.id}", user_path(exercise.user)%></td>
         <% else %>
-            <%= 'User undefined' %>
+            <td><%= link_to exercise.user.name, user_path(exercise.user) %></td>
         <% end %>
         <td><%= exercise.created_at %> </td>
         <td><%= exercise.public ? 'public' : 'private' %> </td>
diff --git a/app/views/exercises/show.html.erb b/app/views/exercises/show.html.erb
@@ -7,19 +7,19 @@
 <dl class="dl-horizontal">
   <dt><%= 'Title' %>:</dt>
   <dd><%= @exercise.title %></dd>
-  <dt><%= 'Description' %></dt>
-  <dd><%= @exercise.description %></dd>
+  <% @exercise.descriptions.each do |description|%>
+      <dt><%= 'Description in' %> <%= description.language %>:</dt>
+      <dd><%= description.text %></dd>
+  <% end %>
   <dt><%= 'Visibility' %>:</dt>
   <dd><%= @exercise.public ? 'public' : 'private' %></dd>
   <dt><%= 'Created by' %>:</dt>
-  <% if @exercise.user %>
-    <% if @exercise.user.first_name.nil?%>
+  <% if !@exercise.user %>
+      <dd><%= 'User undefined' %></dd>
+  <% elsif @exercise.user.first_name.nil?%>
       <dd><%= "User#{@exercise.user.id}"%></dd>
-    <% else %>
-      <dd><%= @exercise.user.name %></dd>
-    <% end %>
   <% else %>
-    <dd><%= 'User undefined' %></dd>
+      <dd><%= @exercise.user.name %></dd>
   <% end %>
   <dt><%= 'Created at' %>:</dt>
   <dd><%= @exercise.created_at %></dd>
@@ -77,7 +77,9 @@
 <div class="actions btn-group" role="group">
   <% if can? :edit, @exercise %>
     <%= link_to 'Edit', edit_exercise_path(@exercise),  class: 'btn btn-warning' %>
-  <% end %>
+    <%= link_to 'Delete', exercise_path(@exercise), class:'btn btn-danger', method: :delete, data: { confirm: 'Are you sure?' }  %>
+
+<% end %>
   <%= link_to 'Back', exercises_path,  class: 'btn btn-default' %>
 
 </div>
diff --git a/app/views/home/_exercises.html.erb b/app/views/home/_exercises.html.erb
@@ -23,7 +23,7 @@
     <div class="panel-body">
 
       <div class="col-md-10">
-        <%= exercise.description %>
+        <%= exercise.descriptions.first.text %>
       </div>
 
       <div class="btn-group-vertical pull-right" role="group" aria-label="...">
diff --git a/config/routes.rb b/config/routes.rb
@@ -15,6 +15,7 @@
   get 'sessions/destroy'
 
   get 'comments/comments_all'
+  get 'exercises/exercises_all'
 
   get 'exercises/:id/duplicate', to: 'exercises#duplicate', as: 'duplicate_exercise'
 
@@ -35,8 +36,6 @@
     end
   end
 
-  get 'exercises/exercises_all'
-
 
 
 
diff --git a/db/migrate/20160213230122_add_language_to_description.rb b/db/migrate/20160213230122_add_language_to_description.rb
@@ -0,0 +1,5 @@
+class AddLanguageToDescription < ActiveRecord::Migration
+  def change
+    add_column :descriptions, :language, :string, default: 'EN'
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20160213122258) do
+ActiveRecord::Schema.define(version: 20160213230122) do
 
   create_table "account_links", force: :cascade do |t|
     t.datetime "created_at",   null: false
@@ -89,6 +89,7 @@
   create_table "descriptions", force: :cascade do |t|
     t.string  "text"
     t.integer "exercise_id"
+    t.string  "language",    default: "EN"
   end
 
   add_index "descriptions", ["exercise_id"], name: "index_descriptions_on_exercise_id"
diff --git a/db/seeds.rb b/db/seeds.rb
@@ -29,6 +29,8 @@
 ExerciseFile.create(main: true, content: "public class HelloWorld{ public static void main String[] args) { } }", path: '', solution: false, filetype: 'java', exercise: exercise1)
 Test.create(content: "public class HelloWorld{ public static void main String[] args) {System.out.println('Hello World.'); } }", rating: 5, feedback_message: "Es wird noch nicht 'Hello World' am Bildschrim ausgegeben!", exercise: exercise1, testing_framework: test_framework)
 
+Description.create(text:"Schreibe ein Java Programm, das 'Hello World' am Bildschirm ausgibt.", language: 'de', exercise: exercise1)
+Description.create(text:"Write a Java program, which returns and prints 'Hello World'.", language: 'en', exercise: exercise1)
 
 
 Rating.create(rating: 4, exercise: exercise1, user: user5)
@@ -43,6 +45,8 @@
 exercise1.labels << l2
 exercise1.labels << l3
 
+exercise1.descriptions
+
 
 AccountLink.create(push_url: 'google.com/pushpush', account_name: 'account1000')
 
@@ -53,6 +57,8 @@
 Test.create(content: "import static org.junit.Assert.*;\nimport java.io.ByteArrayOutputStream;\nimport java.io.PrintStream;\nimport org.junit.AfterClass;\nimport org.junit.Before;\nimport org.junit.BeforeClass;\nimport org.junit.Test;\npublic class HalloWeltTest1 {\n    \n    private final static ByteArrayOutputStream outContent = new ByteArrayOutputStream();\n    private static PrintStream old;\n    @BeforeClass\n    public static void setUpStreams() {\n        old = System.out;\n        System.setOut(new PrintStream(outContent));\n    }\n    @AfterClass\n    public static void cleanUpStreams() {\n        System.setOut(old);\n    }\n    \n    @Before\n    public void resetOut(){\n        outContent.reset();\n    }\n    \n    @Test\n    public void testIfErrorFree(){\n        try{\n            HalloWelt.main(new String[] {});\n        }catch (Error e){\n            fail();\n        }\n    }\n    @Test\n    public void testSomething(){\n        assert(true);\n    }\n}", rating: 5, feedback_message: "Es existieren noch Fehler im Programm. Daher kann dieses noch nicht ausgeführt werden", exercise: exercise2, testing_framework: test_framework)
 Test.create(content: "import static org.junit.Assert.*;\nimport java.io.ByteArrayOutputStream;\nimport java.io.PrintStream;\nimport org.junit.AfterClass;\nimport org.junit.Before;\nimport org.junit.BeforeClass;\nimport org.junit.Test;\npublic class HalloWeltTest2 {\n    \n    private final static ByteArrayOutputStream outContent = new ByteArrayOutputStream();\n    private static PrintStream old;\n    @BeforeClass\n    public static void setUpStreams() {\n        old = System.out;\n        System.setOut(new PrintStream(outContent));\n    }\n    @AfterClass\n    public static void cleanUpStreams() {\n        System.setOut(old);\n    }\n    \n    @Before\n    public void resetOut(){\n        outContent.reset();\n    }\n    \n    @Test\n    public void checkForCorrectOutput(){\n        HalloWelt.main(new String[] {});\n        String separator = System.getProperty(""line.separator"");\n        assertEquals(""Hallo Welt""+separator, outContent.toString());\n    }\n    @Test\n    public void testSomething(){\n        assert(true);\n    }\n}", rating: 1, feedback_message: "Es wird ein falscher String ausgegeben, erwartet ist die Ausgabe\nHallo Welt", exercise: exercise2, testing_framework: test_framework)
 
+Description.create(text:"In diesem Programm sind zwei Fehler versteckt. Versuche diese zu finden und zu beheben. Anschließend soll das Programm ""Hallo Welt"" ausgeben.\nFinde die beiden Fehler, die wir in das Programm eingebaut haben", language: 'de', exercise: exercise2)
+
 comment5 = Comment.create(text: 'Gute Übung für Anfänger! mfg Manfred', exercise: exercise2, user: user1)
 comment6 = Comment.create(text: 'Meine Schüler fanden die Aufgabe echt toll! Viele Grüße aus der 7b in Buckdeheide!', exercise: exercise2, user: user3)
 
@@ -83,6 +89,9 @@
 }", rating: 5, feedback_message: "Dein Pattern sieht noch nicht wie das Asteriks Pattern aus. Schaue es dir nochmal genauer an!", exercise: exercise3, testing_framework: test_framework)
 
 
+Description.create(text:"Schreibe ein Java Programm, das das Asterisk Pattern ausgibt. Das Pattern sieht folgendermaßen aus: ***** ***** ***** ***** *****", language: 'de', exercise: exercise3)
+Description.create(text:"Escribir un programa en Java que imprime el patrón del asterisco. El patrón es el siguiente: ***** ***** ***** ***** *****", language: 'es', exercise: exercise3)
+
 comment7 = Comment.create(text: 'Sehr schlecht! Pattern unbekannt! Viel Erklärungsaufwand', exercise: exercise3, user: user2)
 comment8 = Comment.create(text: 'Mittelmäßig, Schüler waren verwirrd!', exercise: exercise3, user: user3)
 
@@ -107,6 +116,8 @@
 x=int(raw_input())
 print fact(x)", rating: 5, feedback_message: "In case of input data being supplied to the question, it should be assumed to be a console input.", exercise: exercise4, testing_framework: test_framework2)
 
+Description.create(text:"Write a program which can compute the factorial of a given numbers. The results should be printed in a comma-separated sequence on a single line.", language: 'en', exercise: exercise4)
+
 
 comment9 = Comment.create(text: 'Awesome, nice work!', exercise: exercise4, user: user5)
 comment10 = Comment.create(text: 'Great for beginners!', exercise: exercise4, user: user3)
