From dcd4b59d11d28f757b3513ce43650c4aa866eabc Mon Sep 17 00:00:00 2001
From: Michiel de Jong <michielbdejong@users.noreply.github.com>
Date: Tue, 26 Jun 2018 13:56:01 +0200
Subject: [PATCH] Display whodunnit and title change in point versions (#507)

---
 app/controllers/pages_controller.rb       |  3 ---
 app/helpers/application_helper.rb         | 15 +++++++++++----
 app/views/pages/home.html.erb             |  2 +-
 app/views/points/_table_versions.html.erb |  7 ++++++-
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb
index f5835331..8138fdde 100644
--- a/app/controllers/pages_controller.rb
+++ b/app/controllers/pages_controller.rb
@@ -2,8 +2,5 @@ class PagesController < ApplicationController
   def home
     @services = Service.includes(:points).with_points_featured.sample(3)
     @versions = Version.order("created_at DESC").limit(5) # .joins('INNER JOIN users ON "whodunnit"= cast(users."id" as text)')
-    @versions.each do |version|
-      version.whodunnit = User.find(version.whodunnit).username || '(User ' + version.whodunnit + ')'
-    end
   end
 end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index b35206fc..95862e52 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1,8 +1,15 @@
 module ApplicationHelper
-  def username (user_id)
-    if user_id
-      user = User.find_by_id(user_id)
-      return user.username || 'user ' + user.id.to_s
+  def username (user_str)
+    puts user_str
+    if user_str
+      user_id = user_str.to_i
+      if user_id
+        user = User.find_by_id(user_id)
+        if user
+          return user.username || 'user ' + user.id.to_s
+        end
+      end
+      return user_str
     else
       return 'someone'
     end
diff --git a/app/views/pages/home.html.erb b/app/views/pages/home.html.erb
index 991a3f99..7fea6879 100644
--- a/app/views/pages/home.html.erb
+++ b/app/views/pages/home.html.erb
@@ -33,7 +33,7 @@
       <div class="row">
         <div class="col-sm-4">
           <h5>
-            <b><%= version.whodunnit %>:</b> <%= format_time(version.created_at) %>
+            <b><%= username version.whodunnit %>:</b> <%= format_time(version.created_at) %>
           </h5>
         </div>
         <div class="col-sm-4">
diff --git a/app/views/points/_table_versions.html.erb b/app/views/points/_table_versions.html.erb
index 61ffc895..24a05bc4 100644
--- a/app/views/points/_table_versions.html.erb
+++ b/app/views/points/_table_versions.html.erb
@@ -2,6 +2,7 @@
   <% counter = 1 %>
   <% @versions.each do |version| %>
   <% event = version.event == "create" ? "Analysis created" : "Analysis updated" %>
+  <% title = version.changeset["title"] %>
   <% analysis = version.changeset["analysis"] %>
   <% status = version.changeset["status"] %>
   <% version.changeset['change_reason'].nil? ? reason = "No reason provided for previous changes" : reason = version.changeset["change_reason"].second %>
@@ -11,7 +12,7 @@
       <div class="row">
         <div class="col-sm-4">
           <h5>
-              <b>Version <%= counter - 1 %>:</b> <%= format_time(version.changeset["updated_at"].nil? ? @point.updated_at : version.changeset["updated_at"].second.time) %>
+              <b>Version <%= counter - 1 %>:</b> <%= format_time(version.changeset["updated_at"].nil? ? @point.updated_at : version.changeset["updated_at"].second.time) %> by <%= username version.whodunnit %>
           </h5>
         </div>
         <div class="col-sm-4">
@@ -33,6 +34,10 @@
     <div id="collapse<%=counter%>" class="panel-collapse collapse">
       <div class="panel-body">
         <div class="row">
+          <div class="col-sm-6">
+            <p><b>Previous Title:</b> <%= format_figures(title) %></p>
+            <p><b>Updated Title:</b> <%= format_figures(title, first = false) %></p>
+          </div>
           <div class="col-sm-6">
             <p><b>Previous Analysis:</b> <%= format_figures(analysis) %></p>
             <p><b>Updated Analysis:</b> <%= format_figures(analysis, first = false) %></p>