Adjust time format in maintenance listing table to include year (#364)

ankane · Mar 12, 2021 · b87a064 · b87a064
1 parent 048bb39
commit b87a064
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/app/helpers/pg_hero/home_helper.rb b/app/helpers/pg_hero/home_helper.rb
@@ -26,5 +26,15 @@ def pghero_remove_index(query)
       ret << ", column: #{columns.inspect}" if columns
       ret
     end
+
+    def pghero_formatted_vacuum_times(time)
+      content_tag(:span, title: pghero_formatted_date_time(time)) do
+        "#{time_ago_in_words(time.in_time_zone(@time_zone))} ago"
+      end
+    end
+
+    def pghero_formatted_date_time(time)
+      l time.in_time_zone(@time_zone), format: :long
+    end
   end
 end
diff --git a/app/views/pg_hero/home/maintenance.html.erb b/app/views/pg_hero/home/maintenance.html.erb
@@ -24,15 +24,15 @@
           <td>
             <% time = [table[:last_autovacuum], table[:last_vacuum]].compact.max %>
             <% if time %>
-              <%= l time.in_time_zone(@time_zone), format: :short %>
+              <%= pghero_formatted_vacuum_times(time) %>
             <% else %>
               <span class="text-muted">Unknown</span>
             <% end %>
           </td>
           <td>
             <% time = [table[:last_autoanalyze], table[:last_analyze]].compact.max %>
             <% if time %>
-              <%= l time.in_time_zone(@time_zone), format: :short %>
+              <%= pghero_formatted_vacuum_times(time) %>
             <% else %>
               <span class="text-muted">Unknown</span>
             <% end %>