Commit bceca70

@@ -19,7 +19,7 @@
         </div>
         <div class="columns small-5">
           <p class="text-center">
-            {{target_repetitions}} x {{target_weight}} lbs
+            {{target_repetitions}} x {{target_weight}}
           </p>
         </div>
         <div class="columns small-4">

@@ -18,7 +18,7 @@ class ExerciseSet < ApplicationRecord
   def weight_per_side
     remaining_weight = target_weight - 45.lbs
     if remaining_weight > 0
-      "#{remaining_weight / 2} lb/side"
+      "#{remaining_weight / 2}/side"
     end
   end
 end

@@ -62,7 +62,7 @@ class Quantity
   end
 
   def to_s
-    to_f.to_s
+    "#{to_f} #{unit}"
   end
 
   private
@@ -93,6 +93,10 @@ class Quantity
         amount
       end
     end
+
+    def to_s
+      "lbs"
+    end
   end
 
   class Kilogram < UnitOfMeasure
@@ -104,5 +108,9 @@ class Quantity
         amount
       end
     end
+
+    def to_s
+      "kg"
+    end
   end
 end

@@ -1,5 +1,5 @@
 json.id set.id
-json.target_weight set.target_weight
+json.target_weight set.target_weight.to_s
 json.weight_per_side set.weight_per_side
 json.target_repetitions set.target_repetitions
 json.actual_repetitions set.actual_repetitions

@@ -11,7 +11,7 @@ describe ExerciseSet do
 
     it "returns 25 lbs/side" do
       subject.target_weight = 95.lbs
-      expect(subject.weight_per_side).to eql("25.0 lb/side")
+      expect(subject.weight_per_side).to eql("25.0 lbs/side")
     end
   end