Merge pull request #2138 from dodona-edu/feature/programming-language…

…-icons

Feature/programming language icons

app/models/programming_language.rb

@@ -5,12 +5,15 @@
 #  id          :bigint           not null, primary key
 #  name        :string(255)      not null
 #  editor_name :string(255)      not null
+#  icon        :string(255)
 #  extension   :string(255)      not null
 #  created_at  :datetime         not null
 #  updated_at  :datetime         not null
 #
 
 class ProgrammingLanguage < ApplicationRecord
+  DEFAULT_ICON = 'file-document-edit-outline'.freeze
+
   before_save :fill_fields
 
   has_many :exercises, dependent: :restrict_with_error
@@ -19,4 +22,8 @@ def fill_fields
     self.editor_name ||= name
     self.extension ||= 'txt'
   end
+
+  def icon
+    self[:icon] || DEFAULT_ICON
+  end
 end

app/views/activities/_activities_table.html.erb

@@ -47,7 +47,7 @@
 
         <td class='type-icon'>
           <% if activity.exercise? %>
-            <i class="mdi mdi-file-document-edit-outline mdi-18" title="<%= t "activities.index.type.exercise" %>"></i>
+            <i class="<%= "mdi mdi-#{activity.programming_language&.icon} mdi-18" %>" title="<%= "#{t "activities.index.type.exercise_language", language: activity.programming_language.name.titleize}" %>"></i>
           <% elsif activity.content_page? %>
             <i class="mdi mdi-book-open-variant mdi-18" title="<%= t "activities.index.type.content" %>"></i>
           <% end %>

app/views/activities/_series_activities_table.html.erb

@@ -20,8 +20,7 @@
         <%= raw "<i class='mdi mdi-eye-off mdi-18' title='#{t("activities.index.private")}'></i>" if activity.access_private? %>
         <%= raw "<i class='mdi mdi-delete mdi-18' title='#{t("activities.index.removed")}'></i>" if activity.removed? %>
         <%= raw "<i class='mdi mdi-alert-circle mdi-18' title='#{t("activities.index.invalid")}'></i>" if activity.not_valid? %>
-
-        <%= raw "<i class='mdi mdi-file-document-edit-outline mdi-18' title='#{t("activities.index.type.exercise")}'></i>" if activity.exercise? %>
+        <%= raw "<i class='mdi mdi-#{ activity.programming_language&.icon} mdi-18' title='#{t "activities.index.type.exercise_language", language: activity.programming_language.name.titleize}'></i>" if activity.exercise? %>
         <%= raw "<i class='mdi mdi-book-open-variant mdi-18' title='#{t("activities.index.type.content")}'></i>" if activity.content_page? %>
       </td>
       <td class="link">

app/views/evaluations/_exercises_progress_table.html.erb

@@ -12,7 +12,7 @@
     <% local_assigns[:metadata][:per_exercise].each do |meta| %>
       <tr>
         <td class='type-icon'>
-          <i class="mdi mdi-file-document-edit-outline mdi-18" title="<%= t "activities.index.type.exercise" %>"></i>
+          <i class="<%="mdi mdi-#{meta[:exercise].programming_language&.icon} mdi-18"%>" title="<%= "#{t "activities.index.type.exercise_language", language: meta[:exercise].programming_language.name.titleize}" %>"></i>
         </td>
 
         <td>

app/views/evaluations/_exercises_table.html.erb

@@ -11,7 +11,7 @@
     <% local_assigns[:exercises].each do |exercise| %>
       <tr>
         <td class='type-icon'>
-          <i class="mdi mdi-file-document-edit-outline mdi-18" title="<%= t "activities.index.type.exercise" %>"></i>
+          <i class="<%= "mdi mdi-#{exercise.programming_language&.icon} mdi-18"%>" title="<%= "#{t "activities.index.type.exercise_language", language: exercise.programming_language.name.titleize}" %>"></i>
         </td>
 
         <td>

config/locales/views/activities/en.yml

@@ -51,6 +51,7 @@ en:
         other: "%{count} users read this."
       type:
         exercise: Exercise
+        exercise_language: "%{language} exercise"
         content: Reading activity
     show:
       code: Code

config/locales/views/activities/nl.yml

@@ -51,6 +51,7 @@ nl:
         other: "%{count} gebruikers hebben dit gelezen."
       type:
         exercise: Oefening
+        exercise_language: "%{language} oefening"
         content: Leesactiviteit
     show:
       code: Code

db/migrate/20200803125737_add_icon_to_programming_languages.rb

@@ -0,0 +1,22 @@
+class AddIconToProgrammingLanguages < ActiveRecord::Migration[6.0]
+
+  ICON_MAP = {
+    'python' => 'language-python',
+    'sh' => 'bash',
+    'javascript' => 'language-javascript',
+    'bash' => 'bash',
+    'java' => 'language-java',
+    'prolog' => 'owl',
+    'haskell' => 'language-haskell',
+    'R' => 'language-r',
+    'csharp' => 'language-csharp',
+    'text' => nil
+  }
+  def change
+    add_column :programming_languages, :icon, :string
+
+    ProgrammingLanguage.all.each do |language|
+      language.update(icon: ICON_MAP[language.name])
+    end
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2020_07_01_135727) do
+ActiveRecord::Schema.define(version: 2020_08_03_125737) do
 
   create_table "active_storage_attachments", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
     t.string "name", null: false
@@ -304,6 +304,7 @@
     t.string "extension", null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.string "icon"
     t.index ["name"], name: "index_programming_languages_on_name", unique: true
   end
 

db/seeds.rb

@@ -74,6 +74,23 @@
                     user: user
   end
 
+  puts 'Creating programming languages'
+  ICON_MAP = {
+    'python' => 'language-python',
+    'sh' => 'bash',
+    'javascript' => 'language-javascript',
+    'bash' => 'bash',
+    'java' => 'language-java',
+    'prolog' => 'owl',
+    'haskell' => 'language-haskell',
+    'R' => 'language-r',
+    'csharp' => 'language-csharp',
+    'text' => nil
+  }
+  ICON_MAP.each do |language, icon|
+    ProgrammingLanguage.create name: language, icon: icon
+  end
+
   puts 'Creating courses'
 
   courses = []