Commit 731dab4
Changed files (5)
app
models
views
profiles
training_histories
training_sessions
app/models/exercise.rb
@@ -1,4 +1,8 @@
class Exercise < ActiveRecord::Base
has_many :exercise_workouts
has_many :workouts, through: :exercise_workouts
+
+ def short_name
+ name.gsub(/[^A-Z]/, '')
+ end
end
app/views/profiles/show.html.erb
@@ -1,5 +1,4 @@
<div class="row">
-
<div class="small-12 medium-4 columns small-text-center medium-text-left">
<%= link_to profile_path(@user), class: "th [radius] gender_#{@profile.gender} social_#{@profile.social_tolerance}" do %>
<%= gravatar_for(@user, size: 128) %>
@@ -30,16 +29,12 @@
</tbody>
</table>
</div>
-
</div>
<div>
-
<div class="small-12 columns small-text-center medium-text-left">
- <h2><%= t('.training_history') %></h2>
<% @program.exercises.uniq.each do |exercise| %>
<%= render @user.history_for(exercise) %>
<% end %>
</div>
-
-</div>
\ No newline at end of file
+</div>
app/views/training_histories/_training_history.html.erb
@@ -1,2 +1,5 @@
+
+<div class="panel">
+<p class="medium-text-center"><%= training_history.exercise.name %> </p>
<%= line_chart training_history.to_line_chart %>
-<p><%= training_history.exercise.name %> </p>
+</div>
app/views/training_sessions/_training_session.html.erb
@@ -2,16 +2,16 @@
<div class="large-4 small-6 columns">
<div class="panel">
<h5>
- <%= training_session.occurred_at.strftime("%a, %d %b") %>
(<%= link_to training_session.workout, program_path(training_session.program, anchor: training_session.workout) %>)
+ <%= training_session.occurred_at.strftime("%a, %d %b. %Y") %>
</h5>
<% training_session.exercise_sessions.each do |exercise_session| %>
- <p><strong><%= exercise_session.exercise.name %></strong></p>
- <p><%= exercise_session.sets.join('/') %></p>
- <p><%= exercise_session.target_weight %> lbs </p>
+ <p>
+ <strong><%= exercise_session.exercise.short_name %></strong>
+ <%= exercise_session.sets.compact.join('/') %> @ <%= exercise_session.target_weight %> lbs
+ </p>
<% end %>
- <p><strong><%= t('.body_weight') %></strong></p>
- <p><%= training_session.body_weight %> lbs </p>
+ <p> <strong><%= t('.body_weight') %></strong> <%= training_session.body_weight %> lbs </p>
</div>
</div>
<% end %>
app/views/training_sessions/index.html.erb
@@ -1,40 +1,7 @@
<div class="row">
- <div class="large-3 small-12 columns">
- <div class="hide-for-small panel">
- <div class="row">
- <%= form_tag(upload_training_sessions_path, method: :post, multipart: true) do %>
- <div class="small-12 columns">
- <label><%= t('.backup_file') %>
- <%= file_field_tag :backup, required: true %>
- </label>
- </div> <!-- /.small-12 -->
- <div class="small-12 columns">
- <%= submit_tag t('.upload_backup_button'), class: 'button' %>
- </div> <!-- /.small-12 -->
- <% end %>
- </div>
- <div id='google-sync' class="row">
- </div>
- </div>
- <div class="panel callout radius">
- <h6><%= @training_sessions.count %> training sessions completed</h6>
- </div>
- </div>
- <div class="large-9 columns">
+ <div class="large-12 columns">
<div class="row">
<%= render @training_sessions %>
</div>
</div>
</div>
-
-<script type="text/javascript" charset="utf-8">
- $(function(){
- new Stronglifters.GoogleSyncButton({
- el: '#google-sync',
- data: {
- client_id: '<%= ENV['GOOGLE_CLIENT_ID'] %>',
- drive_upload_path: '<%= drive_upload_training_sessions_path %>'
- }
- });
- });
-</script>