From f2251daa98cd68b61d028259255bf99689211924 Mon Sep 17 00:00:00 2001
From: David Mazza <davidedwardmazza@gmail.com>
Date: Fri, 4 Dec 2015 20:41:01 -0800
Subject: [PATCH 1/2] Fix pet#form color and shape fields

---
 app/views/pets/_form.html.erb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/views/pets/_form.html.erb b/app/views/pets/_form.html.erb
index 32fe016..4c6d266 100644
--- a/app/views/pets/_form.html.erb
+++ b/app/views/pets/_form.html.erb
@@ -12,16 +12,16 @@
   <% end %>
 
       <% @colors.each do |color| %>
-        <input type="radio" value="<%= color.id %>" name="color[color_id]" id="color_color_id_<%= color.id %>"/>
-        <label style="background-color:#<%= color.hex_value %>" for="color_color_id_<%= color.id %>"><%= color.hex_value %></label>
+        <input type="radio" value="<%= color.id %>" name="pet[color_id]" id="pet_color_id_<%= color.id %>"/>
+        <label style="background-color:#<%= color.hex_value %>" for="pet_color_id_<%= color.id %>"><%= color.hex_value %></label>
       <% end %>
       <br>
       <% @shapes.each do |shape| %>
-        <input type="radio" value="<%= shape.id %>" name="shape[shape_id]" id="shape_shape_id_<%= shape.id %>" />
-        <label for="shape_shape_id_<%= shape.id %>"><%= image_tag(shape.image)%></label>
+        <input type="radio" value="<%= shape.id %>" name="pet[shape_id]" id="pet_shape_id_<%= shape.id %>" />
+        <label for="pet_shape_id_<%= shape.id %>"><%= image_tag(shape.image)%></label>
       <% end %>
       <br>
-      
+
     <div class="field">
       <%= f.label :last_name %><br>
       <%= f.text_field :last_name %>

From 25b6dfb244e9dda940f6f8f849eaf544f916f696 Mon Sep 17 00:00:00 2001
From: David Mazza <davidedwardmazza@gmail.com>
Date: Fri, 4 Dec 2015 21:04:45 -0800
Subject: [PATCH 2/2] Generate a lucky number on the Pet model, add it to
 pets#index

---
 app/models/pet.rb             | 9 +++++++++
 app/views/pets/index.html.erb | 2 ++
 2 files changed, 11 insertions(+)

diff --git a/app/models/pet.rb b/app/models/pet.rb
index 13c8a55..0cb1c6f 100644
--- a/app/models/pet.rb
+++ b/app/models/pet.rb
@@ -9,4 +9,13 @@ def first_name
   def full_name
     first_name + " " + last_name
   end
+
+  def expression_id
+    3 # lacking a model for now, default to the higest possible ID
+  end
+
+  def lucky_number
+    binary_string = ("%05b" % color_id) + ("%03b" % shape_id) + ("%02b" % expression_id)
+    binary_string.to_i(2)
+  end
 end
diff --git a/app/views/pets/index.html.erb b/app/views/pets/index.html.erb
index 493f02d..508f8bf 100644
--- a/app/views/pets/index.html.erb
+++ b/app/views/pets/index.html.erb
@@ -8,6 +8,7 @@
       <th>Color</th>
       <th>Shape</th>
       <th>Name</th>
+      <th>Lucky Number</th>
       <th colspan="3"></th>
     </tr>
   </thead>
@@ -18,6 +19,7 @@
         <td bgcolor="#<%= pet.color.hex_value %>"></td>
         <td bgcolor="#<%= pet.color.hex_value %>"><%= image_tag(pet.shape.image)%></td>
         <td><%= pet.full_name %></td>
+        <td><%= pet.lucky_number %></td>
         <td><%= link_to 'Show', pet %></td>
         <td><%= link_to 'Edit', edit_pet_path(pet) %></td>
         <td><%= link_to 'Destroy', pet, method: :delete, data: { confirm: 'Are you sure?' } %></td>