Merge branch 'master' of https://github.com/openHPI/codeocean

app/controllers/request_for_comments_controller.rb

@@ -1,5 +1,5 @@
 class RequestForCommentsController < ApplicationController
-  before_action :set_request_for_comment, only: [:show, :edit, :update, :destroy]
+  before_action :set_request_for_comment, only: [:show, :edit, :update, :destroy, :mark_as_solved]
 
   skip_after_action :verify_authorized
 
@@ -20,6 +20,18 @@ class RequestForCommentsController < ApplicationController
     render 'index'
   end
 
+  def mark_as_solved
+    authorize!
+    @request_for_comment.solved = true
+    respond_to do |format|
+      if @request_for_comment.save
+        format.json { render :show, status: :ok, location: @request_for_comment }
+      else
+        format.json { render json: @request_for_comment.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
   # GET /request_for_comments/1
   # GET /request_for_comments/1.json
   def show
@@ -70,6 +82,6 @@ class RequestForCommentsController < ApplicationController
 
     # Never trust parameters from the scary internet, only allow the white list through.
     def request_for_comment_params
-      params.require(:request_for_comment).permit(:exercise_id, :file_id, :question, :requested_at).merge(user_id: current_user.id, user_type: current_user.class.name)
+      params.require(:request_for_comment).permit(:exercise_id, :file_id, :question, :requested_at, :solved).merge(user_id: current_user.id, user_type: current_user.class.name)
     end
 end

app/models/code_ocean/file.rb

@@ -35,6 +35,7 @@ module CodeOcean
 
     has_many :files
     has_many :testruns
+    has_many :comments
     alias_method :descendants, :files
 
     mount_uploader :native_file, FileUploader

app/models/external_user.rb

@@ -6,8 +6,10 @@ class ExternalUser < ActiveRecord::Base
 
   def displayname
     result = name
-    if(consumer.name == 'openHPI')
-      result = Xikolo::UserClient.get(external_id.to_s)[:display_name]
+    Rails.cache.fetch("#{cache_key}/displayname", expires_in: 12.hours) do
+      if(consumer.name == 'openHPI')
+        result = Xikolo::UserClient.get(external_id.to_s)[:display_name]
+      end
     end
     result
   end

app/models/request_for_comment.rb

@@ -1,7 +1,7 @@
 class RequestForComment < ActiveRecord::Base
+  include Creation
   belongs_to :exercise
   belongs_to :file, class_name: 'CodeOcean::File'
-  belongs_to :user, polymorphic: true
 
   before_create :set_requested_timestamp
 
@@ -25,12 +25,16 @@ class RequestForComment < ActiveRecord::Base
             limit 1").first
   end
 
+  def comments_count
+    submission.files.map { |file| file.comments.size}.sum
+  end
+
   def to_s
     "RFC-" + self.id.to_s
   end
 
     private
     def self.row_number_user_sql
-      select("id, user_id, exercise_id, file_id, question, requested_at, created_at, updated_at, user_type, row_number() OVER (PARTITION BY user_id ORDER BY created_at DESC) as row_number").to_sql
+      select("id, user_id, exercise_id, file_id, question, requested_at, created_at, updated_at, user_type, solved, row_number() OVER (PARTITION BY user_id ORDER BY created_at DESC) as row_number").to_sql
     end
 end

app/policies/request_for_comment_policy.rb

@@ -1,5 +1,8 @@
 class RequestForCommentPolicy < ApplicationPolicy
-
+  def author?
+    @user == @record.author
+  end
+  private :author?
 
   def create?
     everyone
@@ -13,6 +16,10 @@ class RequestForCommentPolicy < ApplicationPolicy
     define_method(action) { admin? }
   end
 
+  def mark_as_solved?
+    admin? || author?
+  end
+
   def edit?
     admin?
   end

app/views/request_for_comments/index.html.slim

@@ -4,18 +4,28 @@ h1 = RequestForComment.model_name.human(count: 2)
   table.table.sortable
     thead
       tr
+        th
+          i class="fa fa-lightbulb-o" aria-hidden="true" title = t('request_for_comments.solved') align="right"
         th = t('activerecord.attributes.request_for_comments.exercise')
         th = t('activerecord.attributes.request_for_comments.question')
+        th
+          i class="fa fa-comment" aria-hidden="true" title = t('request_for_comments.comments') align="center"
         th = t('activerecord.attributes.request_for_comments.username')
         th = t('activerecord.attributes.request_for_comments.requested_at')
     tbody
       - @request_for_comments.each do |request_for_comment|
         tr data-id=request_for_comment.id
+          - if request_for_comment.solved?
+            td
+              span class="fa fa-check" aria-hidden="true"
+          - else
+            td = ''
           td = link_to(request_for_comment.exercise.title, request_for_comment)
           - if request_for_comment.has_attribute?(:question) && request_for_comment.question
             td = truncate(request_for_comment.question, length: 200)
           - else
             td = '-'
+          td = request_for_comment.comments_count
           td = request_for_comment.user.displayname
           td = t('shared.time.before', time: distance_of_time_in_words_to_now(request_for_comment.requested_at))
 

app/views/request_for_comments/show.html.erb

@@ -14,13 +14,24 @@
       %>
     <%= user.displayname %> | <%= @request_for_comment.requested_at %>
   </p>
+  <h5>
+    <u><%= t('activerecord.attributes.exercise.instructions') %>:</u> "<%= @request_for_comment.exercise.description %>"
+  </h5>
+
   <h5>
     <% if @request_for_comment.question and not @request_for_comment.question == '' %>
-      <%= t('activerecord.attributes.request_for_comments.question')%>: "<%= @request_for_comment.question %>"
+        <u><%= t('activerecord.attributes.request_for_comments.question')%>:</u>  "<%= @request_for_comment.question %>"
     <% else %>
-      <%= t('request_for_comments.no_question') %>
+        <u><%= t('activerecord.attributes.request_for_comments.question')%>:</u>  <%= t('request_for_comments.no_question') %>
     <% end %>
   </h5>
+  <% if (policy(@request_for_comment).mark_as_solved? and not @request_for_comment.solved?)  %>
+      <button class="btn btn-default" id="mark-as-solved-button"><%= t('request_for_comments.mark_as_solved') %></button>
+  <% elsif  (@request_for_comment.solved?) %>
+          <button type="button" class="btn btn-success"><%= t('request_for_comments.solved') %></button>
+  <% else %>
+
+  <% end %>
 </div>
 
 <!--
@@ -37,6 +48,22 @@ also, all settings from the rails model needed for the editor configuration in t
 
 <script type="text/javascript">
 
+  var solvedButton = $('#mark-as-solved-button');
+
+  solvedButton.on('click', function(event){
+    var jqrequest = $.ajax({
+      dataType: 'json',
+      method: 'GET',
+      url: location + '/mark_as_solved'
+    });
+
+    jqrequest.done(function(response){
+      if(response.solved){
+        solvedButton.hide();
+      }
+    });
+  });
+
   // set file paths for ace
   var ACE_FILES_PATH = '/assets/ace/';
   _.each(['modePath', 'themePath', 'workerPath'], function(attribute) {

app/views/request_for_comments/show.json.jbuilder

@@ -1 +1 @@
-json.extract! @request_for_comment, :id, :user_id, :exercise_id, :file_id, :requested_at, :created_at, :updated_at, :user_type
+json.extract! @request_for_comment, :id, :user_id, :exercise_id, :file_id, :requested_at, :created_at, :updated_at, :user_type, :solved

config/locales/de.yml

@@ -78,6 +78,7 @@ de:
         password_confirmation: Passwort-Bestätigung
         role: Rolle
       request_for_comments:
+        comments: Kommentare
         exercise: Aufgabe
         execution_environment: Sprache
         username: Benutzername
@@ -161,6 +162,7 @@ de:
     show:
       link: Konsument
   errors:
+    connection_refused: Verbindung abgelehnt
     index:
       count: Anzahl
   execution_environments:
@@ -350,10 +352,13 @@ de:
         body: 'Bitte besuchen Sie %{link}, sofern Sie Ihr Passwort zurücksetzen wollen.'
         subject: Anweisungen zum Zurücksetzen Ihres Passworts
   request_for_comments:
+    comments: Kommentare
     index:
       get_my_comment_requests: Meine Kommentaranfragen
       all: "Alle Kommentaranfragen"
     no_question: "Der Autor hat keine Frage zu dieser Anfrage gestellt."
+    mark_as_solved: "Diese Frage als beantwortet markieren"
+    solved: "Diese Frage wurde erfolgreich beantwortet"
   sessions:
     create:
       failure: Fehlerhafte E-Mail oder Passwort.

config/locales/en.yml

@@ -78,6 +78,7 @@ en:
         password_confirmation: Passwort Confirmation
         role: Role
       request_for_comments:
+        comments: Comments
         exercise: Exercise
         execution_environment: Language
         username: Username
@@ -161,6 +162,7 @@ en:
     show:
       link: Consumer
   errors:
+    connection_refused: Connection refused
     index:
       count: Count
   execution_environments:
@@ -350,10 +352,13 @@ en:
         body: 'Please visit %{link} if you want to reset your password.'
         subject: Password reset instructions
   request_for_comments:
+    comments: Comments
     index:
       all: All Requests for Comments
       get_my_comment_requests: My Requests for Comments
     no_question: "The author did not enter a question for this request."
+    mark_as_solved: "Mark this question as answered"
+    solved: "This question has been answered"
   sessions:
     create:
       failure: Invalid email or password.

config/routes.rb

@@ -2,13 +2,17 @@ FILENAME_REGEXP = /[\w\.]+/ unless Kernel.const_defined?(:FILENAME_REGEXP)
 
 Rails.application.routes.draw do
   resources :code_harbor_links
-  resources :request_for_comments
-    get '/my_request_for_comments', as: 'my_request_for_comments', to: 'request_for_comments#get_my_comment_requests'
+  resources :request_for_comments do
+    member do
+      get :mark_as_solved
+    end
+  end
   resources :comments, except: [:destroy] do
     collection do
       delete :destroy
     end
   end
+  get '/my_request_for_comments', as: 'my_request_for_comments', to: 'request_for_comments#get_my_comment_requests'
 
   delete '/comment_by_id', to: 'comments#destroy_by_id'
   put '/comments', to: 'comments#update'

db/migrate/20160624130951_add_solved_to_request_for_comments.rb

@@ -0,0 +1,5 @@
+class AddSolvedToRequestForComments < ActiveRecord::Migration
+  def change
+    add_column :request_for_comments, :solved, :boolean
+  end
+end

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: 20160512131539) do
+ActiveRecord::Schema.define(version: 20160624130951) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -190,6 +190,7 @@ ActiveRecord::Schema.define(version: 20160512131539) do
     t.datetime "updated_at"
     t.string   "user_type"
     t.text     "question"
+    t.boolean  "solved"
   end
 
   create_table "submissions", force: true do |t|