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/_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| %> - - + + <% end %>
<% @shapes.each do |shape| %> - - + + <% end %>
- +
<%= f.label :last_name %>
<%= f.text_field :last_name %> 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 @@ Color Shape Name + Lucky Number @@ -18,6 +19,7 @@ <%= image_tag(pet.shape.image)%> <%= pet.full_name %> + <%= pet.lucky_number %> <%= link_to 'Show', pet %> <%= link_to 'Edit', edit_pet_path(pet) %> <%= link_to 'Destroy', pet, method: :delete, data: { confirm: 'Are you sure?' } %>