Rename display type & add markdown display

Author: adrien1018

app/helpers/problems_helper.rb

@@ -112,4 +112,12 @@ def visible_state_desc_map
       "invisible" => "invisible",
     }
   end
+
+  def sample_display_type_desc_map
+    {
+      "plaintext" => "Plaintext",
+      "raw_html" => "Raw HTML",
+      "markdown" => "Markdown",
+    }
+  end
 end

app/models/sample_testdatum.rb

@@ -19,5 +19,5 @@ class SampleTestdatum < ActiveRecord::Base
   default_scope { order('id ASC') }
 
   belongs_to :problem
-  enum :display_type, {plaintext: 0, markdown: 1}, prefix: :display
+  enum :display_type, {plaintext: 0, raw_html: 1, markdown: 2}, prefix: :display
 end

app/views/problems/_form.html.erb

@@ -87,7 +87,7 @@
           <%= t.link_to_remove "Remove this sample testdatum", class: "btn btn-danger pull-right", name: "testdatum_remove" %>
           <%= t.text_area :output, class: 'form-control flat code-input', rows: '7' %>
           <%= t.label :display_type, "Sample Display Type" %>
-          <%= t.select :display_type, SampleTestdatum.display_types.keys.map{|key| [key, key]}, {}, {class: 'form-control flat'} %>
+          <%= t.select :display_type, SampleTestdatum.display_types.keys.map{|key| [sample_display_type_desc_map[key], key]}, {}, {class: 'form-control flat'} %>
         </div>
       </div>
     </div>

app/views/problems/show.html.erb

@@ -158,8 +158,10 @@
           <% end %>
         </div>
         <div class="panel-body">
-          <% if sample.display_markdown? %>
+          <% if sample.display_raw_html? %>
             <div class="mathjax_ignore sample-testdata"><%= raw sample.input.gsub(/\n/, '<br/>') %></div>
+          <% elsif sample.display_markdown? %>
+            <%= markdown(sample.input) %>
           <% else %>
             <pre class="copy-group-code sample-testdata"><%= sample.input %></pre>
           <% end %>
@@ -175,8 +177,10 @@
           <% end %>
         </div>
         <div class="panel-body">
-          <% if sample.display_markdown? %>
+          <% if sample.display_raw_html? %>
             <div class="mathjax_ignore sample-testdata"><%= raw sample.output.gsub(/\n/, '<br/>') %></div>
+          <% elsif sample.display_markdown? %>
+            <%= markdown(sample.output) %>
           <% else %>
             <pre class="copy-group-code sample-testdata"><%= sample.output %></pre>
           <% end %>