Commit b45869a
Changed files (6)
app
controllers
models
views
training_sessions
app/controllers/training_sessions_controller.rb
@@ -2,7 +2,7 @@ require 'temporary_storage'
class TrainingSessionsController < ApplicationController
def index
- @training_sessions = current_user.training_sessions
+ @training_sessions = current_user.training_sessions.order(occurred_at: :desc)
end
def upload
app/models/training_session.rb
@@ -2,7 +2,6 @@ class TrainingSession < ActiveRecord::Base
belongs_to :user
belongs_to :workout
has_many :exercise_sessions
- attr_accessor :occurred_at
def self.create_workout_from(workout_row)
program = Program.find_by(name: "StrongLifts 5×5")
app/views/training_sessions/_training_session.html.erb
@@ -0,0 +1,8 @@
+<div class="large-4 small-6 columns">
+ <img src="http://placehold.it/1000x1000&text=Thumbnail">
+
+ <div class="panel">
+ <h5><%= training_session.created_at %></h5>
+ <h6 class="subheader"><%= distance_of_time_in_words_to_now training_session.occurred_at %></h6>
+ </div>
+</div>
app/views/training_sessions/index.html.erb
@@ -26,16 +26,7 @@
<!-- Thumbnails -->
<div class="large-8 columns">
<div class="row">
- <% @training_sessions.each do |training_session| %>
- <div class="large-4 small-6 columns">
- <img src="http://placehold.it/1000x1000&text=Thumbnail">
-
- <div class="panel">
- <h5><%= training_session.created_at %></h5>
- <h6 class="subheader"><%= training_session.created_at %></h6>
- </div>
- </div>
- <% end %>
+ <%= render @training_sessions %>
</div>
<!-- End Thumbnails -->
</div>
db/migrate/20150522040632_add_occurred_at_to_training_sessions.rb
@@ -0,0 +1,5 @@
+class AddOccurredAtToTrainingSessions < ActiveRecord::Migration
+ def change
+ add_column :training_sessions, :occurred_at, :datetime, null: false
+ 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: 20150522004907) do
+ActiveRecord::Schema.define(version: 20150522040632) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@@ -47,10 +47,11 @@ ActiveRecord::Schema.define(version: 20150522004907) do
end
create_table "training_sessions", id: :uuid, default: "uuid_generate_v4()", force: :cascade do |t|
- t.uuid "user_id", null: false
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
- t.uuid "workout_id", null: false
+ t.uuid "user_id", null: false
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ t.uuid "workout_id", null: false
+ t.datetime "occurred_at", null: false
end
add_index "training_sessions", ["user_id"], name: "index_training_sessions_on_user_id", using: :btree