Merge branch 'hotfix/0.6.1'

dodona-edu · Aug 17, 2016 · b63b2e2 · b63b2e2
2 parents 4d0611b + dfdedfa
commit b63b2e2
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 13 deletions.
diff --git a/app/helpers/renderers/feedback_table_renderer.rb b/app/helpers/renderers/feedback_table_renderer.rb
@@ -82,7 +82,7 @@ def group(g)
   end
 
   def testcase(tc)
-    @builder.div(class: "testcase #{tc[:accepted ? 'correct' : 'wrong']}") do
+    @builder.div(class: "testcase #{tc[:accepted] ? 'correct' : 'wrong'}") do
       @builder.div(class: 'col-xs-12 description') do
         @builder.div(class: 'indicator') do
           tc[:accepted] ? icon_correct : icon_wrong
@@ -112,7 +112,9 @@ def messages(msgs)
     return if msgs.nil?
     @builder.div(class: 'col-xs-12 messages') do
       msgs.each do |msg|
-        message(msg)
+        @builder.p(class: 'message') do
+          message(msg)
+        end
       end
     end
   end

diff --git a/app/runner/pythia_submission_runner.rb b/app/runner/pythia_submission_runner.rb
@@ -95,7 +95,7 @@ def compose_config
     submission['programming_language'] = @submission.exercise.programming_language
 
     # set natural language of submission
-    submission['natural_language'] = I18n.locale.to_s
+    submission['natural_language'] = @submission.user.lang
 
     # set links to resources in docker container needed for processing submission
     submission['home'] = File.join(@hidden_path, 'resources', 'judge')

diff --git a/app/views/exercises/show.html.erb b/app/views/exercises/show.html.erb
@@ -33,7 +33,7 @@
             <span class="glyphicon glyphicon-play"></span>
           </button>
           <a class="btn btn-primary btn-fab hidden-fab" id="submission-copy-btn">
-            <span class="glyphicon glyphicon-pencil"></span>
+            <span class="glyphicon glyphicon-edit"></span>
           </a>
           <% end %>
         </div>

diff --git a/app/views/exercises/users.html.erb b/app/views/exercises/users.html.erb
@@ -2,17 +2,17 @@
   <div class="col-sm-10 col-sm-offset-1 col-xs-12">
     <div class="card">
       <div class="card-title card-title-colored">
-        <h2 class="card-title-text">Overzicht <%= @exercise.name.titleize %></h2>
+        <h2 class="card-title-text"><%= t ".overview" %> <%= @exercise.name %></h2>
       </div>
       <div class="card-supporting-text">
         <table class="table table-index table-resource">
           <thead>
             <tr>
-              <th>Gebruikersnaam</th>
-              <th>Naam</th>
-              <th>Status</th>
-              <th>Oplossingen</th>
-              <th>Tijd</th>
+              <th><%= User.human_attribute_name("username") %></th>
+              <th><%= User.human_attribute_name("name") %></th>
+              <th><%= Submission.human_attribute_name("status") %></th>
+              <th><%= t ".solutions" %></th>
+              <th><%= t ".speed" %></th>
             </tr>
           </thead>
           <tbody>
@@ -24,9 +24,9 @@
                   <% if :correct == @exercise.status_for(user) %>
                     <%= link_to "correct", @exercise.last_correct_submission(user) %>
                   <% elsif :wrong == @exercise.status_for(user) %>
-                    <%= link_to @exercise.last_submission(user).result, @exercise.last_submission(user) %>
+                    <%= link_to @exercise.last_submission(user).summary, @exercise.last_submission(user) %>
                   <% else %>
-                    niet opgelost
+                    <%= t ".not_solved" %>
                   <% end %>
                 </td>
                 <td><%= @exercise.number_of_submissions_for(user) %></td>

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -117,7 +117,7 @@
         <div class='footer-spacer'></div>
         <div class="footer-block">
           <div class='footer-version'>
-            Dodona v0.6
+            Dodona v0.6.1
         </div>
         </div>
       </footer>

diff --git a/config/locales/views/exercises/en.yml b/config/locales/views/exercises/en.yml
@@ -26,3 +26,8 @@ en:
       not_found: Sorry, we can't find this exercise.
       not_accessible: This exercise isn't accessible for students.
       not_visible: This exercise isn't visible for students.
+    users:
+      overview: Overview
+      solutions: Solutions
+      speed: Solving speed
+      not_solved: not solved
diff --git a/config/locales/views/exercises/nl.yml b/config/locales/views/exercises/nl.yml
@@ -27,3 +27,8 @@ nl:
       not_found: Sorry, we kunnen deze oefening niet vinden.
       not_accessible: Deze oefening is niet toegankelijk voor studenten.
       not_visible: Deze oefening is niet zichtbaar voor studenten.
+    users:
+      overview: Overzicht
+      solutions: Oplossingen
+      speed: Snelheid
+      not_solved: niet opgelost