Commit 8b26a7bc

mo khan <mo@mokhan.ca>
2014-05-17 22:42:08
tidy up the admin jobs page so that it is easier to read the error.
1 parent 1e29715
Changed files (3)
app
app/controllers/admin/jobs_controller.rb
@@ -6,7 +6,7 @@ module Admin
     end
 
     def index
-      @jobs = @repository.order(:created_at => :desc)
+      @jobs = @repository.order(created_at: :desc)
     end
 
     def show
app/views/admin/jobs/index.html.erb
@@ -1,26 +1,36 @@
 <div class="row-fluid">
   <div class="span12">
     <%= render :partial => 'admin/shared/admin_nav' %>
-    <h1>Jobs</h1>
+    <h1>Jobs <small><%= Time.now.utc %></small></h1>
     <table class="table table-condensed">
-      <% @jobs.each do |job| %>
+      <thead>
         <tr>
-          <td><%= link_to job.id, admin_job_path(job) %></td>
-          <td><%= job.attempts %></td>
-          <td>
-            <p><%= job.handler %></p>
-            <p><%= job.last_error[0...100] %>...</p>
-          </td>
-          <td>
-            <p><%= job.locked_by %></p>
-            <p>queue: <span class="pull-right"><%= job.queue %></span></p>
-            <p>run at: <span class="pull-right"><%= job.run_at %></span></p>
-            <p>locked_at: <span class="pull-right"><%= job.locked_at %></span></p>
-            <p>created_at: <span class="pull-right"><%= job.created_at %></span></p>
-            <p>updated_at: <span class="pull-right"><%= job.updated_at %></span></p>
-          </td>
+          <th>id</th>
+          <th>attempts</th>
+          <th>status</th>
+          <th>locked by</th>
+          <th>queue</th>
+          <th>run at</th>
+          <th>locked at</th>
+          <th>created at</th>
+          <th>updated at</th>
         </tr>
-      <% end %>
+      </thead>
+      <tbody>
+        <% @jobs.each do |job| %>
+          <tr>
+            <td><%= link_to job.id, admin_job_path(job) %></td>
+            <td><%= job.attempts %></td>
+            <td><%= job.last_error.present? ? link_to('FAILED', admin_job_path(job)) : 'Succeeded' %></td>
+            <td><%= job.locked_by %> </td>
+            <td><%= job.queue %></td>
+            <td><%= job.run_at %></td>
+            <td><%= job.locked_at %></td>
+            <td><%= job.created_at %></td>
+            <td><%= job.updated_at %></td>
+          </tr>
+        <% end %>
+      </tbody>
     </table>
   </div>
 </div>
app/views/admin/jobs/show.html.erb
@@ -1,17 +1,35 @@
 <div class="row-fluid">
   <div class="span12">
-    <h1>job <%= link_to @job.id, admin_job_path(@job) %></h1>
-    <p><%= link_to "back", admin_jobs_path %></p>
-    <table class="table">
-      <tr><td>queue: <span class="pull-right"><%= @job.queue %></span></td></tr>
-      <tr><td>run at: <span class="pull-right"><%= @job.run_at %></span></td></tr>
-      <tr><td>locked_at: <span class="pull-right"><%= @job.locked_at %></span></td></tr>
-      <tr><td>created_at: <span class="pull-right"><%= @job.created_at %></span></td></tr>
-      <tr><td>updated_at: <span class="pull-right"><%= @job.updated_at %></span></td></tr>
+    <h1><%= @job.handler %></h1>
+    <p><%= link_to "<< Back", admin_jobs_path %></p>
+    <table class="table table-condensed">
+      <thead>
+        <tr>
+          <th>id</th>
+          <th>attempts</th>
+          <th>status</th>
+          <th>locked by</th>
+          <th>queue</th>
+          <th>run at</th>
+          <th>locked at</th>
+          <th>created at</th>
+          <th>updated at</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <td><%= link_to @job.id, admin_job_path(@job) %></td>
+          <td><%= @job.attempts %></td>
+          <td><%= @job.last_error.present? ? link_to('FAILED', admin_job_path(@job)) : 'Succeeded' %></td>
+          <td><%= @job.locked_by %> </td>
+          <td><%= @job.queue %></td>
+          <td><%= @job.run_at %></td>
+          <td><%= @job.locked_at %></td>
+          <td><%= @job.created_at %></td>
+          <td><%= @job.updated_at %></td>
+        </tr>
+      </tbody>
     </table>
-    <p><%= @job.attempts %></p>
-    <p><%= @job.handler %></p>
-    <p><%= @job.last_error%></p>
-    <p><%= @job.locked_by %></p>
+    <%= debug @job.last_error %>
   </div>
 </div>