Commit 73cc2e2

@@ -7,7 +7,7 @@ class Progress
   end
 
   def to_sets
-    sets.pluck(:actual_repetitions).compact
+    @sets ||= sets.pluck(:actual_repetitions).compact
   end
 
   def max_weight
@@ -19,6 +19,6 @@ class Progress
   end
 
   def status
-    "#{to_sets.join('/')} @ #{max_weight} lbs"
+    "#{to_sets.join('/')} @ #{max_weight} lbs" if to_sets.any?
   end
 end

@@ -6,23 +6,36 @@
   </div>
   <div class="row">
     <div class="columns">
-      <ul class="accordion" data-accordion data-multi-expand="true" data-allow-all-closed="true">
+      <% exercises = ["Squat", "Bench Press", "Barbell Row", "Overhead Press", "Deadlift"]  %>
+      <table class="table-scroll">
+        <thead>
+          <tr>
+            <th>Routine</th>
+            <th>Date</th>
+            <th>Body weight</th>
+            <% exercises.each do |exercise_name| %>
+              <th><%= exercise_name %></th>
+            <% end %>
+          </tr>
+        </thead>
+        <tbody>
         <% @workouts.each do |workout| %>
-        <li class="accordion-item" data-accordion-item>
-          <a href="#" class="accordion-title">
-            <%= workout.name %> - <strong><%= I18n.l workout.occurred_at, format: :short %></strong> - <%= workout.body_weight.to(:lbs) %> lbs
-          </a>
-          <div class="accordion-content" data-tab-content>
-            <% workout.each_exercise do |exercise| %>
-              <p class="text-center">
-              <strong><%= exercise.name %></strong>
-              <%= workout.progress_for(exercise).status %>
-              </p>
+          <tr>
+            <td> <%= workout.name %> </td>
+            <td> <%= I18n.l workout.occurred_at, format: :short %> </td>
+            <td> <%= workout.body_weight.to(:lbs) %> lbs </td>
+            <% exercises.each do |exercise_name| %>
+              <td>
+                <% progress = workout.progress_for(Exercise.find_by(name: exercise_name)) %>
+                <p class="text-center"> <%= progress.status %> </p>
+              </td>
             <% end %>
-          </div>
-        </li>
+          </tr>
         <% end %>
-      </ul>
+        </tbody>
+        <tfoot>
+        </tfoot>
+      </table>
     </div>
   </div>
   <div class="row">